Changeset 5630 for trunk/src

Timestamp:

Apr 29, 2001, 12:30:59 PM (24 years ago)

Author:

sandervl

Message:

wine resync

Location:

trunk/src/comctl32

Files:

• animate.c (modified) (36 diffs)
• cctl_De.orc (modified) (2 diffs)
• comboex.c (modified) (23 diffs)
• comctl32.def (modified) (3 diffs)
• comctl32.h (modified) (2 diffs)
• comctl32undoc.cpp (modified) (2 diffs)
• makefile (modified) (2 diffs)
• rebar.c (added)
• rebar.cpp (deleted)
• status.c (added)
• status.cpp (deleted)
• tab.c (added)
• tab.cpp (deleted)

trunk/src/comctl32/animate.c

@@ -4 +4 @@
  *
  * Copyright 1998, 1999 Eric Kohl
- *         1999 Eric Pouech
+ *                 1999 Eric Pouech
  *
  * NOTES
@@ -15 +15 @@
  */
 
-
+#include <string.h>
 #include "winbase.h"
 #include "commctrl.h"
 #include "vfw.h"
 #include "mmsystem.h"
-#include "services.h"
 #include "debugtools.h"
 #ifdef __WIN32OS2__
@@ -31 +30 @@
 {
 #ifdef __WIN32OS2__
-    COMCTL32_HEADER header;
-#endif
-
-   /* pointer to msvideo functions. it's easier to put them here.
-    * to be correct, they should be defined on a per process basis, but
-    * this would required a per process storage. We're using a per object
-    * storage instead, which is not efficient on memory usage, but
-    * will lead to less bugs in the future
-    */
-#ifdef __WIN32OS2__
-   HIC      (* WINAPI fnICOpen)(DWORD, DWORD, UINT);
-   LRESULT  (* WINAPI fnICClose)(HIC);
-   LRESULT  (* WINAPI fnICSendMessage)(HIC, UINT, DWORD, DWORD);
-   DWORD    (* WINAPIV fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
-
-    HMMIO (* WINAPI fnmmioOpenA)(LPSTR,MMIOINFO*,DWORD);
-    HMMIO (* WINAPI fnmmioOpenW)(LPSTR,MMIOINFO*,DWORD);
-    MMRESULT (* WINAPI fnmmioClose)(HMMIO,UINT);
-    UINT  (* WINAPI fnmmioAscend)(HMMIO,MMCKINFO*,UINT);
-    UINT  (* WINAPI fnmmioDescend)(HMMIO,MMCKINFO*,const MMCKINFO*,UINT);
-    LONG  (* WINAPI fnmmioSeek)(HMMIO,LONG,INT);
-    LONG  (* WINAPI fnmmioRead)(HMMIO,HPSTR,LONG);
-#else
-   HIC      WINAPI  (*fnICOpen)(DWORD, DWORD, UINT);
-   LRESULT  WINAPI  (*fnICClose)(HIC);
-   LRESULT  WINAPI  (*fnICSendMessage)(HIC, UINT, DWORD, DWORD);
-   DWORD    WINAPIV (*fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
-
-    HMMIO WINAPI (*fnmmioOpenA)(LPSTR,MMIOINFO*,DWORD);
-    MMRESULT WINAPI (*fnmmioClose)(HMMIO,UINT);
-    UINT  WINAPI (*fnmmioAscend)(HMMIO,MMCKINFO*,UINT);
-    UINT  WINAPI (*fnmmioDescend)(HMMIO,MMCKINFO*,const MMCKINFO*,UINT);
-    LONG  WINAPI (*fnmmioSeek)(HMMIO,LONG,INT);
-    LONG  WINAPI (*fnmmioRead)(HMMIO,HPSTR,LONG);
-#endif
-
+   COMCTL32_HEADER      header;
+#endif
    /* reference to input stream (file or resource) */
-   HGLOBAL      hRes;
-   HMMIO            hMMio;  /* handle to mmio stream */
-   HWND         hWnd;
+   HGLOBAL              hRes;
+   HMMIO                hMMio;  /* handle to mmio stream */
+   HWND                 hWnd;
    /* information on the loaded AVI file */
-   MainAVIHeader    mah;
-   AVIStreamHeader  ash;
-   LPBITMAPINFOHEADER   inbih;
-   LPDWORD      lpIndex;
+   MainAVIHeader        mah;
+   AVIStreamHeader      ash;
+   LPBITMAPINFOHEADER   inbih;
+   LPDWORD              lpIndex;
    /* data for the decompressor */
-   HIC          hic;
-   LPBITMAPINFOHEADER   outbih;
-   LPVOID       indata;
-   LPVOID       outdata;
+   HIC                  hic;
+   LPBITMAPINFOHEADER   outbih;
+   LPVOID               indata;
+   LPVOID               outdata;
    /* data for the background mechanism */
-   CRITICAL_SECTION cs;
-   HANDLE       hThread;
-   UINT         uTimer;
+   CRITICAL_SECTION     cs;
+   HANDLE               hThread;
+   UINT                 uTimer;
    /* data for playing the file */
-   int          nFromFrame;
-   int          nToFrame;
-   int          nLoop;
-   int          currFrame;
+   int                  nFromFrame;
+   int                  nToFrame;
+   int                  nLoop;
+   int                  currFrame;
    /* tranparency info*/
-   COLORREF             transparentColor;
-   HBRUSH               hbrushBG;
-   HBITMAP              hbmPrevFrame;
+   COLORREF             transparentColor;   
+   HBRUSH               hbrushBG;
+   HBITMAP              hbmPrevFrame;
 } ANIMATE_INFO;
 
 #define ANIMATE_GetInfoPtr(hWnd) ((ANIMATE_INFO *)GetWindowLongA(hWnd, 0))
-#define ANIMATE_COLOR_NONE      0xffffffff
-
-HMODULE hModWinmm;
+#define ANIMATE_COLOR_NONE      0xffffffff
 
 static void ANIMATE_Notify(ANIMATE_INFO* infoPtr, UINT notif)
 {
-    SendMessageA(GetParent(infoPtr->hWnd), WM_COMMAND,
-         MAKEWPARAM(GetDlgCtrlID(infoPtr->hWnd), notif),
-         (LPARAM)infoPtr->hWnd);
+    SendMessageA(GetParent(infoPtr->hWnd), WM_COMMAND, 
+                 MAKEWPARAM(GetDlgCtrlID(infoPtr->hWnd), notif), 
+                 (LPARAM)infoPtr->hWnd);
 }
 
@@ -114 +77 @@
 #endif
 {
-    HRSRC   hrsrc;
-    MMIOINFO    mminfo;
-    LPVOID  lpAvi;
-
+    HRSRC       hrsrc;
+    MMIOINFO    mminfo;
+    LPVOID      lpAvi;
+    
 #ifdef __WIN32OS2__
     if (unicode)
@@ -127 +90 @@
 #endif
     if (!hrsrc)
-    return FALSE;
-
+        return FALSE;
+    
     infoPtr->hRes = LoadResource(hInst, hrsrc);
     if (!infoPtr->hRes)
-    return FALSE;
-
+        return FALSE;
+    
     lpAvi = LockResource(infoPtr->hRes);
     if (!lpAvi)
-    return FALSE;
-
+        return FALSE;
+    
     memset(&mminfo, 0, sizeof(mminfo));
     mminfo.fccIOProc = FOURCC_MEM;
     mminfo.pchBuffer = (LPSTR)lpAvi;
     mminfo.cchBuffer = SizeofResource(hInst, hrsrc);
-    infoPtr->hMMio = infoPtr->fnmmioOpenA(NULL, &mminfo, MMIO_READ);
-
+    infoPtr->hMMio = mmioOpenA(NULL, &mminfo, MMIO_READ);
     if (!infoPtr->hMMio) {
-    GlobalFree((HGLOBAL)lpAvi);
-    return FALSE;
+        GlobalFree((HGLOBAL)lpAvi);
+        return FALSE;
     }
 
@@ -160 +122 @@
 #ifdef __WIN32OS2__
     if (unicode)
-      infoPtr->hMMio = infoPtr->fnmmioOpenW(lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+      infoPtr->hMMio = mmioOpenW(lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
     else
-      infoPtr->hMMio = infoPtr->fnmmioOpenA((LPSTR)lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+      infoPtr->hMMio = mmioOpenA((LPSTR)lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
 #else
-    infoPtr->hMMio = infoPtr->fnmmioOpenA((LPSTR)lpName, NULL,
-                   MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
-#endif
-
+    infoPtr->hMMio = mmioOpenA((LPSTR)lpName, NULL,
+                               MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+#endif
     if (!infoPtr->hMMio)
-    return FALSE;
-
+        return FALSE;
+    
     return TRUE;
 }
@@ -180 +141 @@
 
     /* should stop playing */
-    if (infoPtr->hThread)
+    if (infoPtr->hThread) 
     {
         if (!TerminateThread(infoPtr->hThread,0))
             WARN("could not destroy animation thread!\n");
-        infoPtr->hThread = 0;
+            infoPtr->hThread = 0;
     }
     if (infoPtr->uTimer) {
-    KillTimer(infoPtr->hWnd, infoPtr->uTimer);
-    infoPtr->uTimer = 0;
+        KillTimer(infoPtr->hWnd, infoPtr->uTimer);
+        infoPtr->uTimer = 0;
     }
 
@@ -202 +163 @@
 {
     if (infoPtr->hMMio) {
-    ANIMATE_DoStop(infoPtr);
-    infoPtr->fnmmioClose(infoPtr->hMMio, 0);
-    if (infoPtr->hRes) {
-        FreeResource(infoPtr->hRes);
-        infoPtr->hRes = 0;
-    }
-    if (infoPtr->lpIndex) {
-        HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex);
-        infoPtr->lpIndex = NULL;
-    }
-    if (infoPtr->hic) {
-        (infoPtr->fnICClose)(infoPtr->hic);
-        infoPtr->hic = 0;
-    }
-    if (infoPtr->inbih) {
-        HeapFree(GetProcessHeap(), 0, infoPtr->inbih);
-        infoPtr->inbih = NULL;
-    }
-    if (infoPtr->outbih) {
-        HeapFree(GetProcessHeap(), 0, infoPtr->outbih);
-        infoPtr->outbih = NULL;
-    }
+        ANIMATE_DoStop(infoPtr);
+        mmioClose(infoPtr->hMMio, 0);
+        if (infoPtr->hRes) {
+            FreeResource(infoPtr->hRes);
+            infoPtr->hRes = 0;
+        }
+        if (infoPtr->lpIndex) {
+            HeapFree(GetProcessHeap(), 0, infoPtr->lpIndex);
+            infoPtr->lpIndex = NULL;
+        }
+        if (infoPtr->hic) {
+            ICClose(infoPtr->hic);
+            infoPtr->hic = 0;
+        }
+        if (infoPtr->inbih) {
+            HeapFree(GetProcessHeap(), 0, infoPtr->inbih);
+            infoPtr->inbih = NULL;
+        }
+        if (infoPtr->outbih) {
+            HeapFree(GetProcessHeap(), 0, infoPtr->outbih);
+            infoPtr->outbih = NULL;
+        }
         if( infoPtr->indata )
         {
-    HeapFree(GetProcessHeap(), 0, infoPtr->indata);
+        HeapFree(GetProcessHeap(), 0, infoPtr->indata);
             infoPtr->indata = NULL;
         }
-        if( infoPtr->outdata )
+        if( infoPtr->outdata )
         {
-    HeapFree(GetProcessHeap(), 0, infoPtr->outdata);
+        HeapFree(GetProcessHeap(), 0, infoPtr->outdata);
             infoPtr->outdata = NULL;
         }
-        if( infoPtr->hbmPrevFrame )
+        if( infoPtr->hbmPrevFrame )
         {
-        DeleteObject(infoPtr->hbmPrevFrame);
+            DeleteObject(infoPtr->hbmPrevFrame);
             infoPtr->hbmPrevFrame = 0;
         }
-    infoPtr->indata = infoPtr->outdata = NULL;
-    infoPtr->hWnd = 0;
-    infoPtr->hMMio = 0;
-
-    memset(&infoPtr->mah, 0, sizeof(infoPtr->mah));
-    memset(&infoPtr->ash, 0, sizeof(infoPtr->ash));
-    infoPtr->nFromFrame = infoPtr->nToFrame = infoPtr->nLoop = infoPtr->currFrame = 0;
-    }
-    infoPtr->transparentColor = ANIMATE_COLOR_NONE;
+        infoPtr->indata = infoPtr->outdata = NULL;
+        infoPtr->hWnd = 0;
+        infoPtr->hMMio = 0;
+        
+        memset(&infoPtr->mah, 0, sizeof(infoPtr->mah));
+        memset(&infoPtr->ash, 0, sizeof(infoPtr->ash));
+        infoPtr->nFromFrame = infoPtr->nToFrame = infoPtr->nLoop = infoPtr->currFrame = 0;
+    }
+    infoPtr->transparentColor = ANIMATE_COLOR_NONE;    
 }
 
 static void ANIMATE_TransparentBlt(ANIMATE_INFO* infoPtr, HDC hdcDest, HDC hdcSource)
-{
+{       
     HDC hdcMask;
     HBITMAP hbmMask;
-    HBITMAP hbmOld;
-
+    HBITMAP hbmOld;            
+    
     /* create a transparency mask */
     hdcMask = CreateCompatibleDC(hdcDest);
-    hbmMask = CreateBitmap(infoPtr->inbih->biWidth, infoPtr->inbih->biHeight, 1,1,NULL);
-    hbmOld = SelectObject(hdcMask, hbmMask);
+    hbmMask = CreateBitmap(infoPtr->inbih->biWidth, infoPtr->inbih->biHeight, 1,1,NULL);   
+    hbmOld = SelectObject(hdcMask, hbmMask);             
 
     SetBkColor(hdcSource,infoPtr->transparentColor);
     BitBlt(hdcMask,0,0,infoPtr->inbih->biWidth, infoPtr->inbih->biHeight,hdcSource,0,0,SRCCOPY);
-
+            
     /* mask the source bitmap */
-    SetBkColor(hdcSource, RGB(0,0,0));
-    SetTextColor(hdcSource, RGB(255,255,255));
+    SetBkColor(hdcSource, RGB(0,0,0));          
+    SetTextColor(hdcSource, RGB(255,255,255)); 
     BitBlt(hdcSource, 0, 0, infoPtr->inbih->biWidth, infoPtr->inbih->biHeight, hdcMask, 0, 0, SRCAND);
 
     /* mask the destination bitmap */
-    SetBkColor(hdcDest, RGB(255,255,255));
-    SetTextColor(hdcDest, RGB(0,0,0));
+    SetBkColor(hdcDest, RGB(255,255,255));   
+    SetTextColor(hdcDest, RGB(0,0,0));         
     BitBlt(hdcDest, 0, 0, infoPtr->inbih->biWidth, infoPtr->inbih->biHeight, hdcMask, 0, 0, SRCAND);
 
@@ -297 +258 @@
 
     if (!hDC || !infoPtr->inbih)
-    return TRUE;
+        return TRUE;
 
     if (infoPtr->hic )
@@ -305 +266 @@
 
         nWidth = infoPtr->outbih->biWidth;
-        nHeight = infoPtr->outbih->biHeight;
+        nHeight = infoPtr->outbih->biHeight;  
     } else
-    {
+    {  
         pBitmapData = infoPtr->indata;
         pBitmapInfo = (LPBITMAPINFO)infoPtr->inbih;
 
         nWidth = infoPtr->inbih->biWidth;
-        nHeight = infoPtr->inbih->biHeight;
-    }
+        nHeight = infoPtr->inbih->biHeight;  
+    }  
 
     if(!infoPtr->hbmPrevFrame)
@@ -320 +281 @@
     }
 
-    SetDIBits(hDC, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, (LPBITMAPINFO)pBitmapInfo, DIB_RGB_COLORS);
-
+    SetDIBits(hDC, infoPtr->hbmPrevFrame, 0, nHeight, pBitmapData, (LPBITMAPINFO)pBitmapInfo, DIB_RGB_COLORS); 
+    
     hdcMem = CreateCompatibleDC(hDC);
     hbmOld = SelectObject(hdcMem, infoPtr->hbmPrevFrame);
 
-    /*
-     * we need to get the transparent color even without ACS_TRANSPARENT,
+    /* 
+     * we need to get the transparent color even without ACS_TRANSPARENT, 
      * because the style can be changed later on and the color should always
-     * be obtained in the first frame
+     * be obtained in the first frame 
      */
     if(infoPtr->transparentColor == ANIMATE_COLOR_NONE)
     {
         infoPtr->transparentColor = GetPixel(hdcMem,0,0);
-    }
-
-    if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT)
-    {
+    } 
+
+    if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT) 
+    { 
         HDC hdcFinal = CreateCompatibleDC(hDC);
         HBITMAP hbmFinal = CreateCompatibleBitmap(hDC,nWidth, nHeight);
         HBITMAP hbmOld2 = SelectObject(hdcFinal, hbmFinal);
         RECT rect;
-
+        
         rect.left = 0;
         rect.top = 0;
         rect.right = nWidth;
         rect.bottom = nHeight;
-
+        
         if(!infoPtr->hbrushBG)
             infoPtr->hbrushBG = GetCurrentObject(hDC, OBJ_BRUSH);
@@ -359 +320 @@
         infoPtr->hbmPrevFrame = hbmFinal;
          }
-
-    if (GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_CENTER)
+    
+    if (GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_CENTER) 
     {
-       RECT rect;
+       RECT rect;   
 
        GetWindowRect(infoPtr->hWnd, &rect);
-       nOffsetX = ((rect.right - rect.left) - nWidth)/2;
-       nOffsetY = ((rect.bottom - rect.top) - nHeight)/2;
-    }
-    BitBlt(hDC, nOffsetX, nOffsetY, nWidth, nHeight, hdcMem, 0, 0, SRCCOPY);
+       nOffsetX = ((rect.right - rect.left) - nWidth)/2; 
+       nOffsetY = ((rect.bottom - rect.top) - nHeight)/2;  
+    }
+    BitBlt(hDC, nOffsetX, nOffsetY, nWidth, nHeight, hdcMem, 0, 0, SRCCOPY);    
 
     SelectObject(hdcMem, hbmOld);
@@ -377 +338 @@
 static LRESULT ANIMATE_DrawFrame(ANIMATE_INFO* infoPtr)
 {
-    HDC     hDC;
+    HDC         hDC;
 
     TRACE("Drawing frame %d (loop %d)\n", infoPtr->currFrame, infoPtr->nLoop);
@@ -383 +344 @@
     EnterCriticalSection(&infoPtr->cs);
 
-    infoPtr->fnmmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET);
-    infoPtr->fnmmioRead(infoPtr->hMMio, infoPtr->indata, infoPtr->ash.dwSuggestedBufferSize);
-
+    mmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET);
+    mmioRead(infoPtr->hMMio, infoPtr->indata, infoPtr->ash.dwSuggestedBufferSize);
+    
     if (infoPtr->hic &&
-    (infoPtr->fnICDecompress)(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata,
-                  infoPtr->outbih, infoPtr->outdata) != ICERR_OK) {
+        ICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata, 
+                     infoPtr->outbih, infoPtr->outdata) != ICERR_OK) {
+        LeaveCriticalSection(&infoPtr->cs);
+        WARN("Decompression error\n");
+        return FALSE;
+    }
+
+    if ((hDC = GetDC(infoPtr->hWnd)) != 0) {
+        ANIMATE_PaintFrame(infoPtr, hDC);
+        ReleaseDC(infoPtr->hWnd, hDC);
+    }
+
+    if (infoPtr->currFrame++ >= infoPtr->nToFrame) {
+        infoPtr->currFrame = infoPtr->nFromFrame;
+        if (infoPtr->nLoop != -1) {
+            if (--infoPtr->nLoop == 0) {
+                ANIMATE_DoStop(infoPtr);
+            }
+        }
+    }
     LeaveCriticalSection(&infoPtr->cs);
-    WARN("Decompression error\n");
-    return FALSE;
-    }
-
-    if ((hDC = GetDC(infoPtr->hWnd)) != 0) {
-    ANIMATE_PaintFrame(infoPtr, hDC);
-    ReleaseDC(infoPtr->hWnd, hDC);
-    }
-
-    if (infoPtr->currFrame++ >= infoPtr->nToFrame) {
-    infoPtr->currFrame = infoPtr->nFromFrame;
-    if (infoPtr->nLoop != -1) {
-        if (--infoPtr->nLoop == 0) {
-        ANIMATE_DoStop(infoPtr);
-        }
-    }
-    }
-    LeaveCriticalSection(&infoPtr->cs);
 
     return TRUE;
@@ -414 +375 @@
 static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_)
 {
-    ANIMATE_INFO*   infoPtr = (ANIMATE_INFO*)ptr_;
+    ANIMATE_INFO*       infoPtr = (ANIMATE_INFO*)ptr_;
     HDC hDC;
-
+    
     if(!infoPtr)
     {
@@ -424 +385 @@
 
     while(1)
-    {
-        if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT)
+    {    
+        if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT) 
         {
             hDC = GetDC(infoPtr->hWnd);
+            /* sometimes the animation window will be destroyed in between
+             * by the main program, so a ReleaseDC() error msg is possible */
             infoPtr->hbrushBG = SendMessageA(GetParent(infoPtr->hWnd),WM_CTLCOLORSTATIC,hDC, infoPtr->hWnd);
             ReleaseDC(infoPtr->hWnd,hDC);
         }
-
-    EnterCriticalSection(&infoPtr->cs);
-    ANIMATE_DrawFrame(infoPtr);
-    LeaveCriticalSection(&infoPtr->cs);
-
+        
+        EnterCriticalSection(&infoPtr->cs);
+        ANIMATE_DrawFrame(infoPtr);
+        LeaveCriticalSection(&infoPtr->cs);
+    
         /* time is in microseconds, we should convert it to milliseconds */
         Sleep((infoPtr->mah.dwMicroSecPerFrame+500)/1000);
-}
+    }
     return TRUE;
 }
@@ -448 +411 @@
     /* nothing opened */
     if (!infoPtr->hMMio)
-    return FALSE;
+        return FALSE;
 
     if (infoPtr->hThread || infoPtr->uTimer) {
-    FIXME("Already playing ? what should I do ??\n");
-    ANIMATE_DoStop(infoPtr);
+        FIXME("Already playing ? what should I do ??\n");
+        ANIMATE_DoStop(infoPtr);
     }
 
@@ -460 +423 @@
 
     if (infoPtr->nToFrame == 0xFFFF)
-    infoPtr->nToFrame = infoPtr->mah.dwTotalFrames - 1;
-
-    TRACE("(repeat=%d from=%d to=%d);\n",
-      infoPtr->nLoop, infoPtr->nFromFrame, infoPtr->nToFrame);
+        infoPtr->nToFrame = infoPtr->mah.dwTotalFrames - 1;
+
+    TRACE("(repeat=%d from=%d to=%d);\n", 
+          infoPtr->nLoop, infoPtr->nFromFrame, infoPtr->nToFrame);
 
     if (infoPtr->nFromFrame >= infoPtr->nToFrame ||
-    infoPtr->nToFrame >= infoPtr->mah.dwTotalFrames)
-    return FALSE;
+        infoPtr->nToFrame >= infoPtr->mah.dwTotalFrames)
+        return FALSE;
 
     infoPtr->currFrame = infoPtr->nFromFrame;
 
     if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TIMER) {
-    TRACE("Using a timer\n");
-    /* create a timer to display AVI */
-    infoPtr->uTimer = SetTimer(hWnd, 1, infoPtr->mah.dwMicroSecPerFrame / 1000, NULL);
+        TRACE("Using a timer\n");
+        /* create a timer to display AVI */
+        infoPtr->uTimer = SetTimer(hWnd, 1, infoPtr->mah.dwMicroSecPerFrame / 1000, NULL);
     } else {
         DWORD threadID;
 
-    TRACE("Using an animation thread\n");
+        TRACE("Using an animation thread\n");
         infoPtr->hThread = CreateThread(0,0,ANIMATE_AnimationThread,(LPVOID)infoPtr,0,0 &threadID);
         if(!infoPtr->hThread)
@@ -485 +448 @@
            return FALSE;
     }
-
-    }
-
+        
+    }
+        
     ANIMATE_Notify(infoPtr, ACN_START);
 
@@ -496 +459 @@
 static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
 {
-    MMCKINFO        ckMainRIFF;
-    MMCKINFO        mmckHead;
-    MMCKINFO        mmckList;
-    MMCKINFO        mmckInfo;
-    DWORD       numFrame;
-    DWORD       insize;
-
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &ckMainRIFF, NULL, 0) != 0) {
-    WARN("Can't find 'RIFF' chunk\n");
-    return FALSE;
+    MMCKINFO            ckMainRIFF;
+    MMCKINFO            mmckHead;
+    MMCKINFO            mmckList;
+    MMCKINFO            mmckInfo;
+    DWORD               numFrame;
+    DWORD               insize;
+
+    if (mmioDescend(infoPtr->hMMio, &ckMainRIFF, NULL, 0) != 0) {
+        WARN("Can't find 'RIFF' chunk\n");
+        return FALSE;
     }
 
     if ((ckMainRIFF.ckid != FOURCC_RIFF) ||
-    (ckMainRIFF.fccType != mmioFOURCC('A', 'V', 'I', ' '))) {
-    WARN("Can't find 'AVI ' chunk\n");
-    return FALSE;
+        (ckMainRIFF.fccType != mmioFOURCC('A', 'V', 'I', ' '))) {
+        WARN("Can't find 'AVI ' chunk\n");
+        return FALSE;
     }
 
     mmckHead.fccType = mmioFOURCC('h', 'd', 'r', 'l');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckHead, &ckMainRIFF, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'hdrl' list\n");
-    return FALSE;
+    if (mmioDescend(infoPtr->hMMio, &mmckHead, &ckMainRIFF, MMIO_FINDLIST) != 0) {
+        WARN("Can't find 'hdrl' list\n");
+        return FALSE;
     }
 
     mmckInfo.ckid = mmioFOURCC('a', 'v', 'i', 'h');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckInfo, &mmckHead, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'avih' chunk\n");
-    return FALSE;
-    }
-
-    infoPtr->fnmmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah));
-    TRACE("mah.dwMicroSecPerFrame=%ld\n",   infoPtr->mah.dwMicroSecPerFrame);
-    TRACE("mah.dwMaxBytesPerSec=%ld\n",     infoPtr->mah.dwMaxBytesPerSec);
-    TRACE("mah.dwPaddingGranularity=%ld\n",     infoPtr->mah.dwPaddingGranularity);
-    TRACE("mah.dwFlags=%ld\n",          infoPtr->mah.dwFlags);
-    TRACE("mah.dwTotalFrames=%ld\n",        infoPtr->mah.dwTotalFrames);
-    TRACE("mah.dwInitialFrames=%ld\n",      infoPtr->mah.dwInitialFrames);
-    TRACE("mah.dwStreams=%ld\n",        infoPtr->mah.dwStreams);
-    TRACE("mah.dwSuggestedBufferSize=%ld\n",    infoPtr->mah.dwSuggestedBufferSize);
-    TRACE("mah.dwWidth=%ld\n",          infoPtr->mah.dwWidth);
-    TRACE("mah.dwHeight=%ld\n",         infoPtr->mah.dwHeight);
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckInfo, 0);
+    if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckHead, MMIO_FINDCHUNK) != 0) {
+        WARN("Can't find 'avih' chunk\n");
+        return FALSE;
+    }
+
+    mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->mah, sizeof(infoPtr->mah));
+
+    TRACE("mah.dwMicroSecPerFrame=%ld\n",       infoPtr->mah.dwMicroSecPerFrame);
+    TRACE("mah.dwMaxBytesPerSec=%ld\n",         infoPtr->mah.dwMaxBytesPerSec);
+    TRACE("mah.dwPaddingGranularity=%ld\n",     infoPtr->mah.dwPaddingGranularity);
+    TRACE("mah.dwFlags=%ld\n",                  infoPtr->mah.dwFlags);
+    TRACE("mah.dwTotalFrames=%ld\n",            infoPtr->mah.dwTotalFrames);
+    TRACE("mah.dwInitialFrames=%ld\n",          infoPtr->mah.dwInitialFrames);
+    TRACE("mah.dwStreams=%ld\n",                infoPtr->mah.dwStreams);
+    TRACE("mah.dwSuggestedBufferSize=%ld\n",    infoPtr->mah.dwSuggestedBufferSize);
+    TRACE("mah.dwWidth=%ld\n",                  infoPtr->mah.dwWidth);
+    TRACE("mah.dwHeight=%ld\n",                 infoPtr->mah.dwHeight);
+
+    mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
 
     mmckList.fccType = mmioFOURCC('s', 't', 'r', 'l');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'strl' list\n");
-    return FALSE;
+    if (mmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) != 0) {
+        WARN("Can't find 'strl' list\n");
+        return FALSE;
     }
 
     mmckInfo.ckid = mmioFOURCC('s', 't', 'r', 'h');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'strh' chunk\n");
-    return FALSE;
-    }
-
-    infoPtr->fnmmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->ash, sizeof(infoPtr->ash));
-    TRACE("ash.fccType='%c%c%c%c'\n",       LOBYTE(LOWORD(infoPtr->ash.fccType)),
-                                            HIBYTE(LOWORD(infoPtr->ash.fccType)),
-                                            LOBYTE(HIWORD(infoPtr->ash.fccType)),
-                                            HIBYTE(HIWORD(infoPtr->ash.fccType)));
-    TRACE("ash.fccHandler='%c%c%c%c'\n",    LOBYTE(LOWORD(infoPtr->ash.fccHandler)),
-                                            HIBYTE(LOWORD(infoPtr->ash.fccHandler)),
-                                            LOBYTE(HIWORD(infoPtr->ash.fccHandler)),
-                                            HIBYTE(HIWORD(infoPtr->ash.fccHandler)));
-    TRACE("ash.dwFlags=%ld\n",          infoPtr->ash.dwFlags);
-    TRACE("ash.wPriority=%d\n",         infoPtr->ash.wPriority);
-    TRACE("ash.wLanguage=%d\n",         infoPtr->ash.wLanguage);
-    TRACE("ash.dwInitialFrames=%ld\n",      infoPtr->ash.dwInitialFrames);
-    TRACE("ash.dwScale=%ld\n",          infoPtr->ash.dwScale);
-    TRACE("ash.dwRate=%ld\n",           infoPtr->ash.dwRate);
-    TRACE("ash.dwStart=%ld\n",          infoPtr->ash.dwStart);
-    TRACE("ash.dwLength=%ld\n",         infoPtr->ash.dwLength);
-    TRACE("ash.dwSuggestedBufferSize=%ld\n",    infoPtr->ash.dwSuggestedBufferSize);
-    TRACE("ash.dwQuality=%ld\n",        infoPtr->ash.dwQuality);
-    TRACE("ash.dwSampleSize=%ld\n",         infoPtr->ash.dwSampleSize);
-    TRACE("ash.rcFrame=(%d,%d,%d,%d)\n",    infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
-      infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckInfo, 0);
+    if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
+        WARN("Can't find 'strh' chunk\n");
+        return FALSE;
+    }
+
+    mmioRead(infoPtr->hMMio, (LPSTR)&infoPtr->ash, sizeof(infoPtr->ash));
+
+    TRACE("ash.fccType='%c%c%c%c'\n",           LOBYTE(LOWORD(infoPtr->ash.fccType)), 
+                                                HIBYTE(LOWORD(infoPtr->ash.fccType)), 
+                                                LOBYTE(HIWORD(infoPtr->ash.fccType)), 
+                                                HIBYTE(HIWORD(infoPtr->ash.fccType)));
+    TRACE("ash.fccHandler='%c%c%c%c'\n",        LOBYTE(LOWORD(infoPtr->ash.fccHandler)), 
+                                                HIBYTE(LOWORD(infoPtr->ash.fccHandler)), 
+                                                LOBYTE(HIWORD(infoPtr->ash.fccHandler)), 
+                                                HIBYTE(HIWORD(infoPtr->ash.fccHandler)));
+    TRACE("ash.dwFlags=%ld\n",                  infoPtr->ash.dwFlags);
+    TRACE("ash.wPriority=%d\n",                 infoPtr->ash.wPriority);
+    TRACE("ash.wLanguage=%d\n",                 infoPtr->ash.wLanguage);
+    TRACE("ash.dwInitialFrames=%ld\n",          infoPtr->ash.dwInitialFrames);
+    TRACE("ash.dwScale=%ld\n",                  infoPtr->ash.dwScale);
+    TRACE("ash.dwRate=%ld\n",                   infoPtr->ash.dwRate);
+    TRACE("ash.dwStart=%ld\n",                  infoPtr->ash.dwStart);
+    TRACE("ash.dwLength=%ld\n",                 infoPtr->ash.dwLength);
+    TRACE("ash.dwSuggestedBufferSize=%ld\n",    infoPtr->ash.dwSuggestedBufferSize);
+    TRACE("ash.dwQuality=%ld\n",                infoPtr->ash.dwQuality);
+    TRACE("ash.dwSampleSize=%ld\n",             infoPtr->ash.dwSampleSize);
+    TRACE("ash.rcFrame=(%d,%d,%d,%d)\n",        infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left, 
+          infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
+
+    mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
 
     mmckInfo.ckid = mmioFOURCC('s', 't', 'r', 'f');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'strh' chunk\n");
-    return FALSE;
+    if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
+        WARN("Can't find 'strh' chunk\n");
+        return FALSE;
     }
 
     infoPtr->inbih = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize);
     if (!infoPtr->inbih) {
-    WARN("Can't alloc input BIH\n");
-    return FALSE;
-    }
-
-    infoPtr->fnmmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize);
-    TRACE("bih.biSize=%ld\n",       infoPtr->inbih->biSize);
-    TRACE("bih.biWidth=%ld\n",      infoPtr->inbih->biWidth);
-    TRACE("bih.biHeight=%ld\n",     infoPtr->inbih->biHeight);
-    TRACE("bih.biPlanes=%d\n",      infoPtr->inbih->biPlanes);
-    TRACE("bih.biBitCount=%d\n",    infoPtr->inbih->biBitCount);
-    TRACE("bih.biCompression=%ld\n",    infoPtr->inbih->biCompression);
-    TRACE("bih.biSizeImage=%ld\n",  infoPtr->inbih->biSizeImage);
-    TRACE("bih.biXPelsPerMeter=%ld\n",  infoPtr->inbih->biXPelsPerMeter);
-    TRACE("bih.biYPelsPerMeter=%ld\n",  infoPtr->inbih->biYPelsPerMeter);
-    TRACE("bih.biClrUsed=%ld\n",    infoPtr->inbih->biClrUsed);
-    TRACE("bih.biClrImportant=%ld\n",   infoPtr->inbih->biClrImportant);
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckInfo, 0);
-
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckList, 0);
-
+        WARN("Can't alloc input BIH\n");
+        return FALSE;
+    }
+
+    mmioRead(infoPtr->hMMio, (LPSTR)infoPtr->inbih, mmckInfo.cksize);
+
+    TRACE("bih.biSize=%ld\n",           infoPtr->inbih->biSize);
+    TRACE("bih.biWidth=%ld\n",          infoPtr->inbih->biWidth);
+    TRACE("bih.biHeight=%ld\n",         infoPtr->inbih->biHeight);
+    TRACE("bih.biPlanes=%d\n",          infoPtr->inbih->biPlanes);
+    TRACE("bih.biBitCount=%d\n",        infoPtr->inbih->biBitCount);
+    TRACE("bih.biCompression=%ld\n",    infoPtr->inbih->biCompression);
+    TRACE("bih.biSizeImage=%ld\n",      infoPtr->inbih->biSizeImage);
+    TRACE("bih.biXPelsPerMeter=%ld\n",  infoPtr->inbih->biXPelsPerMeter);
+    TRACE("bih.biYPelsPerMeter=%ld\n",  infoPtr->inbih->biYPelsPerMeter);
+    TRACE("bih.biClrUsed=%ld\n",        infoPtr->inbih->biClrUsed);
+    TRACE("bih.biClrImportant=%ld\n",   infoPtr->inbih->biClrImportant);
+
+    mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
+
+    mmioAscend(infoPtr->hMMio, &mmckList, 0);
+    
 #if 0
     /* an AVI has 0 or 1 video stream, and to be animated should not contain
-     * an audio stream, so only one strl is allowed
+     * an audio stream, so only one strl is allowed 
      */
     mmckList.fccType = mmioFOURCC('s', 't', 'r', 'l');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) == 0) {
-    WARN("There should be a single 'strl' list\n");
-    return FALSE;
-    }
-#endif
-
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckHead, 0);
+    if (mmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) == 0) {
+        WARN("There should be a single 'strl' list\n");
+        return FALSE;
+    }
+#endif
+
+    mmioAscend(infoPtr->hMMio, &mmckHead, 0);
 
     /* no need to read optional JUNK chunk */
 
     mmckList.fccType = mmioFOURCC('m', 'o', 'v', 'i');
-    if (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckList, &ckMainRIFF, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'movi' list\n");
-    return FALSE;
+    if (mmioDescend(infoPtr->hMMio, &mmckList, &ckMainRIFF, MMIO_FINDLIST) != 0) {
+        WARN("Can't find 'movi' list\n");
+        return FALSE;
     }
 
     /* FIXME: should handle the 'rec ' LIST when present */
 
-    infoPtr->lpIndex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-                 infoPtr->mah.dwTotalFrames * sizeof(DWORD));
+    infoPtr->lpIndex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 
+                                 infoPtr->mah.dwTotalFrames * sizeof(DWORD));
     if (!infoPtr->lpIndex) {
-    WARN("Can't alloc index array\n");
-    return FALSE;
+        WARN("Can't alloc index array\n");
+        return FALSE;
     }
 
     numFrame = insize = 0;
-    while (infoPtr->fnmmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, 0) == 0 &&
-       numFrame < infoPtr->mah.dwTotalFrames) {
-    infoPtr->lpIndex[numFrame] = mmckInfo.dwDataOffset;
-    if (insize < mmckInfo.cksize)
-        insize = mmckInfo.cksize;
-    numFrame++;
-    infoPtr->fnmmioAscend(infoPtr->hMMio, &mmckInfo, 0);
+    while (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, 0) == 0 && 
+           numFrame < infoPtr->mah.dwTotalFrames) {
+        infoPtr->lpIndex[numFrame] = mmckInfo.dwDataOffset;
+        if (insize < mmckInfo.cksize)
+            insize = mmckInfo.cksize;
+        numFrame++;
+        mmioAscend(infoPtr->hMMio, &mmckInfo, 0);
     }
     if (numFrame != infoPtr->mah.dwTotalFrames) {
-    WARN("Found %ld frames (/%ld)\n", numFrame, infoPtr->mah.dwTotalFrames);
-    return FALSE;
+        WARN("Found %ld frames (/%ld)\n", numFrame, infoPtr->mah.dwTotalFrames);
+        return FALSE;
     }
     if (insize > infoPtr->ash.dwSuggestedBufferSize) {
-    WARN("insize=%ld suggestedSize=%ld\n", insize, infoPtr->ash.dwSuggestedBufferSize);
-    infoPtr->ash.dwSuggestedBufferSize = insize;
+        WARN("insize=%ld suggestedSize=%ld\n", insize, infoPtr->ash.dwSuggestedBufferSize);
+        infoPtr->ash.dwSuggestedBufferSize = insize;
     }
 
     infoPtr->indata = HeapAlloc(GetProcessHeap(), 0, infoPtr->ash.dwSuggestedBufferSize);
     if (!infoPtr->indata) {
-    WARN("Can't alloc input buffer\n");
-    return FALSE;
+        WARN("Can't alloc input buffer\n");
+        return FALSE;
     }
 
@@ -663 +632 @@
 static BOOL    ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr)
 {
-    DWORD   outSize;
+    DWORD       outSize;
 
     /* check uncompressed AVI */
@@ -669 +638 @@
        (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')))
     {
-        infoPtr->hic = 0;
-    return TRUE;
+        infoPtr->hic = 0;             
+        return TRUE;
     }
 
     /* try to get a decompressor for that type */
-    infoPtr->hic = (infoPtr->fnICOpen)(ICTYPE_VIDEO,
-                       infoPtr->ash.fccHandler,
-                       ICMODE_DECOMPRESS);
+    infoPtr->hic = ICOpen(ICTYPE_VIDEO, infoPtr->ash.fccHandler, ICMODE_DECOMPRESS);
     if (!infoPtr->hic) {
-    WARN("Can't load codec for the file\n");
-    return FALSE;
-    }
-
-    outSize = (infoPtr->fnICSendMessage)(infoPtr->hic,
-                     ICM_DECOMPRESS_GET_FORMAT,
-                     (DWORD)infoPtr->inbih, 0L);
+        WARN("Can't load codec for the file\n");
+        return FALSE;
+    }
+    
+    outSize = ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
+                            (DWORD)infoPtr->inbih, 0L);
+
     infoPtr->outbih = HeapAlloc(GetProcessHeap(), 0, outSize);
     if (!infoPtr->outbih) {
-    WARN("Can't alloc output BIH\n");
-    return FALSE;
-    }
-
-    if ((infoPtr->fnICSendMessage)(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT,
-                   (DWORD)infoPtr->inbih,
-                   (DWORD)infoPtr->outbih) != ICERR_OK) {
-    WARN("Can't get output BIH\n");
-    return FALSE;
+        WARN("Can't alloc output BIH\n");
+        return FALSE;
+    }
+
+    if (ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
+                      (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
+        WARN("Can't get output BIH\n");
+        return FALSE;
     }
 
     infoPtr->outdata = HeapAlloc(GetProcessHeap(), 0, infoPtr->outbih->biSizeImage);
     if (!infoPtr->outdata) {
-    WARN("Can't alloc output buffer\n");
-    return FALSE;
-    }
-
-    if ((infoPtr->fnICSendMessage)(infoPtr->hic, ICM_DECOMPRESS_BEGIN,
-                   (DWORD)infoPtr->inbih,
-                   (DWORD)infoPtr->outbih) != ICERR_OK) {
-    WARN("Can't begin decompression\n");
-    return FALSE;
+        WARN("Can't alloc output buffer\n");
+        return FALSE;
+    }
+
+    if (ICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, 
+                      (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
+        WARN("Can't begin decompression\n");
+        return FALSE;
     }
 
@@ -726 +691 @@
 
     if (!lParam) {
-    TRACE("Closing avi!\n");
-    return TRUE;
-    }
-
+        TRACE("Closing avi!\n");
+        return TRUE;
+    }
+    
     if (!hInstance)
        hInstance = GetWindowLongA(hWnd, GWL_HINSTANCE);
@@ -738 +703 @@
 
         if (!ANIMATE_LoadRes(infoPtr, hInstance, (LPWSTR)lParam,unicode)) {
-            //TRACE("No AVI resource found!\n");
+            TRACE("No AVI resource found!\n");
             if (!ANIMATE_LoadFile(infoPtr, (LPWSTR)lParam,unicode)) {
-                //WARN("No AVI file found!\n");
+                WARN("No AVI file found!\n");
                 return FALSE;
             }
@@ -748 +713 @@
 
         if (!ANIMATE_LoadRes(infoPtr,hInstance,unicode ? MAKEINTRESOURCEW((INT)lParam):(LPWSTR)MAKEINTRESOURCEA((INT)lParam),unicode)) {
-            //WARN("No AVI resource found!\n");
+            WARN("No AVI resource found!\n");
             return FALSE;
         }
@@ -773 +738 @@
     }
 #endif
-
     if (!ANIMATE_GetAviInfo(infoPtr)) {
-    WARN("Can't get AVI information\n");
-    ANIMATE_Free(infoPtr);
-    return FALSE;
+        WARN("Can't get AVI information\n");
+        ANIMATE_Free(infoPtr);
+        return FALSE;
     }
 
     if (!ANIMATE_GetAviCodec(infoPtr)) {
-    WARN("Can't get AVI Codec\n");
-    ANIMATE_Free(infoPtr);
-    return FALSE;
+        WARN("Can't get AVI Codec\n");
+        ANIMATE_Free(infoPtr);
+        return FALSE;
     }
 
     if (!GetWindowLongA(hWnd, GWL_STYLE) & ACS_CENTER) {
-    SetWindowPos(hWnd, 0, 0, 0, infoPtr->mah.dwWidth, infoPtr->mah.dwHeight,
-             SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
+        SetWindowPos(hWnd, 0, 0, 0, infoPtr->mah.dwWidth, infoPtr->mah.dwHeight,
+                     SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
     }
 
     if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_AUTOPLAY) {
-    return ANIMATE_Play(hWnd, -1, (LPARAM)MAKELONG(0, infoPtr->mah.dwTotalFrames-1));
+        return ANIMATE_Play(hWnd, -1, (LPARAM)MAKELONG(0, infoPtr->mah.dwTotalFrames-1));
     }
 
@@ -807 +771 @@
     /* nothing opened */
     if (!infoPtr->hMMio)
-    return FALSE;
+        return FALSE;
 
     ANIMATE_DoStop(infoPtr);
@@ -816 +780 @@
 static LRESULT ANIMATE_Create(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-    ANIMATE_INFO*   infoPtr;
-    HMODULE     hModule = LoadLibraryA("msvfw32.dll");
-
-    if (!hModule)
-        return FALSE;
+    ANIMATE_INFO*       infoPtr;
 
     /* allocate memory for info structure */
@@ -829 +789 @@
 #endif
     if (!infoPtr) {
-        ERR("could not allocate info memory!\n");
-        return 0;
-    }
-
-    /* Temporary hack until we get dllglue up and running */
-    infoPtr->fnICOpen        = (void*)GetProcAddress(hModule, "ICOpen");
-    infoPtr->fnICClose       = (void*)GetProcAddress(hModule, "ICClose");
-    infoPtr->fnICSendMessage = (void*)GetProcAddress(hModule, "ICSendMessage");
-    infoPtr->fnICDecompress  = (void*)GetProcAddress(hModule, "ICDecompress");
+        ERR("could not allocate info memory!\n");
+        return 0;
+    }
 
     TRACE("Animate style=0x%08lx, parent=%08lx\n", GetWindowLongA(hWnd, GWL_STYLE), (DWORD)GetParent(hWnd));
@@ -846 +800 @@
     infoPtr->transparentColor = ANIMATE_COLOR_NONE;
     infoPtr->hbmPrevFrame = 0;
-    hModWinmm = LoadLibraryA("WINMM");
-
-    infoPtr->fnmmioOpenA = (void*)GetProcAddress(hModWinmm, "mmioOpenA");
-#ifdef __WIN32OS2__
-    infoPtr->fnmmioOpenW = (void*)GetProcAddress(hModWinmm, "mmioOpenW");
-#endif
-    infoPtr->fnmmioClose = (void*)GetProcAddress(hModWinmm, "mmioClose");
-    infoPtr->fnmmioAscend = (void*)GetProcAddress(hModWinmm, "mmioAscend");
-    infoPtr->fnmmioDescend = (void*)GetProcAddress(hModWinmm, "mmioDescend");
-    infoPtr->fnmmioSeek = (void*)GetProcAddress(hModWinmm, "mmioSeek");
-    infoPtr->fnmmioRead = (void*)GetProcAddress(hModWinmm, "mmioRead");
 
     InitializeCriticalSection(&infoPtr->cs);
-
+    
     return 0;
 }
@@ -876 +819 @@
     SetWindowLongA(hWnd, 0, 0);
 
-    FreeLibrary(hModWinmm);
     return 0;
 }
@@ -884 +826 @@
 {
     RECT rect;
-    HBRUSH hBrush = 0;
-
-    if(GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
+    HBRUSH hBrush = 0;       
+
+    if(GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT) 
     {
-        hBrush = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);
+        hBrush = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);    
     }
 
@@ -900 +842 @@
 {
     if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_CENTER) {
-    InvalidateRect(hWnd, NULL, TRUE);
+        InvalidateRect(hWnd, NULL, TRUE);
     }
     return TRUE;
@@ -909 +851 @@
     TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
     if (!ANIMATE_GetInfoPtr(hWnd) && (uMsg != WM_NCCREATE))
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
     switch (uMsg)
     {
 #ifdef __WIN32OS2__
-        case ACM_OPENA:
-          return ANIMATE_Open(hWnd,wParam,lParam,FALSE);
-
-        case ACM_OPENW:
-          return ANIMATE_Open(hWnd,wParam,lParam,TRUE);
+    case ACM_OPENA:
+        return ANIMATE_Open(hWnd,wParam,lParam,FALSE);
+
+    case ACM_OPENW:
+        return ANIMATE_Open(hWnd,wParam,lParam,TRUE);
 #else
     case ACM_OPENA:
-    return ANIMATE_OpenA(hWnd, wParam, lParam);
-
-    /*  case ACM_OPEN32W: FIXME!! */
-    /*      return ANIMATE_Open32W(hWnd, wParam, lParam); */
-#endif
-
+        return ANIMATE_OpenA(hWnd, wParam, lParam);
+        
+        /*      case ACM_OPEN32W: FIXME!! */
+        /*          return ANIMATE_Open32W(hWnd, wParam, lParam); */
+#endif
+        
     case ACM_PLAY:
-    return ANIMATE_Play(hWnd, wParam, lParam);
-
+        return ANIMATE_Play(hWnd, wParam, lParam);
+        
     case ACM_STOP:
-    return ANIMATE_Stop(hWnd, wParam, lParam);
-
+        return ANIMATE_Stop(hWnd, wParam, lParam);
+        
     case WM_NCCREATE:
-    ANIMATE_Create(hWnd, wParam, lParam);
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-
+        ANIMATE_Create(hWnd, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+        
     case WM_NCHITTEST:
-    return HTTRANSPARENT;
+        return HTTRANSPARENT;
 
     case WM_DESTROY:
-    ANIMATE_Destroy(hWnd, wParam, lParam);
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-
+        ANIMATE_Destroy(hWnd, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+        
     case WM_ERASEBKGND:
-    ANIMATE_EraseBackground(hWnd, wParam, lParam);
-    break;
-
-    /*  case WM_STYLECHANGED: FIXME shall we do something ?? */
+        ANIMATE_EraseBackground(hWnd, wParam, lParam);
+        break;
+
+    /*  case WM_STYLECHANGED: FIXME shall we do something ?? */
 
     case WM_TIMER:
-        if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
+        if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
         {
             ANIMATE_INFO* infoPtr = ANIMATE_GetInfoPtr(hWnd);
             infoPtr->hbrushBG = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);
         }
-    return ANIMATE_DrawFrame(ANIMATE_GetInfoPtr(hWnd));
-
+        return ANIMATE_DrawFrame(ANIMATE_GetInfoPtr(hWnd));
+        
     case WM_CLOSE:
-    ANIMATE_Free(ANIMATE_GetInfoPtr(hWnd));
-    return TRUE;
+        ANIMATE_Free(ANIMATE_GetInfoPtr(hWnd));
+        return TRUE;
 
     case WM_PAINT:
         {
             ANIMATE_INFO* infoPtr = ANIMATE_GetInfoPtr(hWnd);
-
+                
             /* the animation isn't playing, don't paint */
-        if(!infoPtr->uTimer && !infoPtr->hThread)
-        /* default paint handling */
-            return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-
+            if(!infoPtr->uTimer && !infoPtr->hThread)
+                /* default paint handling */
+                return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+            
             if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
                 infoPtr->hbrushBG = SendMessageA(GetParent(hWnd), WM_CTLCOLORSTATIC,
-                                         (HDC)wParam, hWnd);
-
+                                                 (HDC)wParam, hWnd);
+    
             if (wParam)
             {
@@ -982 +924 @@
             else
             {
-            PAINTSTRUCT ps;
-            HDC hDC = BeginPaint(hWnd, &ps);
+                PAINTSTRUCT ps;
+                HDC hDC = BeginPaint(hWnd, &ps);
 
                 EnterCriticalSection(&infoPtr->cs);
                 ANIMATE_PaintFrame(infoPtr, hDC);
                 LeaveCriticalSection(&infoPtr->cs);
-
-            EndPaint(hWnd, &ps);
+    
+                EndPaint(hWnd, &ps);
+            }
         }
-        }
-    break;
+        break;
 
     case WM_SIZE:
-    ANIMATE_Size(hWnd, wParam, lParam);
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+        ANIMATE_Size(hWnd, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
 
     default:
-    if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
-
-#ifdef __WIN32OS2__
-            return defComCtl32ProcA (hWnd, uMsg, wParam, lParam);
+        if (uMsg >= WM_USER)
+            ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
+        
+#ifdef __WIN32OS2__
+        return defComCtl32ProcA (hWnd, uMsg, wParam, lParam);
 #else
-    return DefWindowProcA(hWnd, uMsg, wParam, lParam);
+        return DefWindowProcA(hWnd, uMsg, wParam, lParam);
 #endif
     }
@@ -1024 +966 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = ANIMATE_CLASSA;
-
+ 
     RegisterClassA(&wndClass);
 }

trunk/src/comctl32/cctl_De.orc

@@ -1 +1 @@
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
-IDD_PROPSHEET DIALOG DISCARDABLE 0,0,223,140
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE 
-CAPTION "Eigenschaften für:"
+STRINGTABLE DISCARDABLE
+{
+     IDS_CLOSE    "Schließen"
+}
+ 
+STRINGTABLE DISCARDABLE 
+{
+     IDM_TODAY    "Heute:"
+     IDM_GOTODAY  "Gehe zu Heute"
+}
+
+STRINGTABLE DISCARDABLE
+{
+    IDS_SEPARATOR "Trennzeichen"
+}
+
+IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Eigenschaften für "
 FONT 8, "MS Sans Serif"
 BEGIN
-        DEFPUSHBUTTON "Ok",IDOK,4,122,50,14
-        PUSHBUTTON "Abbrechen",IDCANCEL,58,122,50,14
-        PUSHBUTTON "Ubernehmen",IDC_APPLY_BUTTON,112,122,50,14
-        PUSHBUTTON "Hilfe",IDHELP,166,122,50,14, WS_TABSTOP | WS_GROUP 
-        CONTROL "Tabstopp",IDC_TABCONTROL,"SysTabControl32", WS_CLIPSIBLINGS | WS_TABSTOP ,4,4,215,114
+  DEFPUSHBUTTON "&OK",        IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP
+  PUSHBUTTON    "A&bbrechen", IDCANCEL,58,122,50,14
+  PUSHBUTTON    "&Anwenden",  IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED
+  PUSHBUTTON    "&Hilfe",     IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP
+  CONTROL       "Tab",        IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP,4,4,212,114
 END
 
 
-IDD_WIZARD DIALOG DISCARDABLE 20,20,292,46
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE 
-CAPTION "Assistent"
+IDD_WIZARD DIALOG DISCARDABLE 0, 0, 290, 159
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE
+CAPTION "Wizard"
 FONT 8, "MS Sans Serif"
 BEGIN
-        DEFPUSHBUTTON "Fertig",IDC_FINISH_BUTTON,119,26,50,14
-        DEFPUSHBUTTON "&Weiter >",IDC_NEXT_BUTTON,62,26,50,14
-        PUSHBUTTON "< &Zurück",IDC_BACK_BUTTON,12,26,50,14
-        PUSHBUTTON "Abbrechen",IDCANCEL,176,26,50,14
-        PUSHBUTTON "Hilfe",IDHELP,233,26,50,14, WS_GROUP 
-        LTEXT "",IDC_SUNKEN_LINE,7,17,276,1, SS_SUNKEN 
-        CONTROL "Tabstopp",IDC_TABCONTROL,"SysTabControl32", WS_CLIPSIBLINGS | WS_DISABLED ,7,7,276,3
+  DEFPUSHBUTTON "&Beenden",   IDC_FINISH_BUTTON,121,138,50,14
+  DEFPUSHBUTTON "&Weiter >", IDC_NEXT_BUTTON,121,138,50,14
+  PUSHBUTTON    "< &Zurück", IDC_BACK_BUTTON,71,138,50,14
+  PUSHBUTTON    "Abbrechen", IDCANCEL,178,138,50,14
+  PUSHBUTTON    "&Hilfe",     IDHELP,235,138,50,14,WS_GROUP
+  LTEXT         "",          IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN
+  CONTROL       "Tab",       IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5
 END
 
 
-IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10,20,362,125
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU 
-CAPTION "Symbolleiste anpassen"
+IDD_TBCUSTOMIZE DIALOG DISCARDABLE 10, 20, 357, 125
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Toolbar einrichten"
 FONT 8, "MS Sans Serif"
 BEGIN
-        DEFPUSHBUTTON "S&chließen",IDCANCEL,309,6,49,14
-        PUSHBUTTON "Zurücksetzen",IDC_RESET_BTN,309,23,49,14
-        PUSHBUTTON "&Hilfe",IDC_HELP_BTN,309,40,49,14
-        PUSHBUTTON "Nach &oben",IDC_MOVEUP_BTN,309,74,49,14
-        PUSHBUTTON "&Nach unten",IDC_MOVEDN_BTN,309,91,49,14
-        LTEXT "&Verfügbare Schaltflächen:",-1,4,5,84,10
-        LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP 
-        PUSHBUTTON "Hinz&ufügen ->",IDOK,129,42,49,14
-        PUSHBUTTON "<- &Entfernen",IDC_REMOVE_BTN,129,62,49,14
-        LTEXT "&Schaltflächen auf Symbolleiste:",-1,183,5,101,10
-        LISTBOX IDC_TOOLBARBTN_LBOX,183,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP 
+  DEFPUSHBUTTON "&Schließen",               IDCANCEL,308,6,44,14
+  PUSHBUTTON    "&Zurücksetzen",            IDC_RESET_BTN,308,23,44,14
+  PUSHBUTTON    "&Hilfe",                   IDC_HELP_BTN,308,40,44,14
+  PUSHBUTTON    "Nach &Oben verschieben",   IDC_MOVEUP_BTN,308,74,44,14
+  PUSHBUTTON    "Nach &Unten verschieben",  IDC_MOVEDN_BTN,308,91,44,14
+  LTEXT         "&Vorhandene Knöpfe:", -1,4,5,84,10
+  LISTBOX       IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
+  PUSHBUTTON    "H&inzufügen ->",           IDOK, 131, 42, 44, 14
+  PUSHBUTTON    "<- &Löschen",              IDC_REMOVE_BTN,131,62,44,14
+  LTEXT         "&Toolbarknöpfe:", -1,182,5,78,10
+  LISTBOX       IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
 END
 
@@ -66 +82 @@
 }
 
-STRINGTABLE DISCARDABLE 
-{
-        IDS_CLOSE       "Schließen"
-}
 

trunk/src/comctl32/comboex.c

@@ -19 +19 @@
 
 /*
- * ComboBoxEx control v2 (mod4)
+ * ComboBoxEx control v2 (mod5)
  *
  * Copyright 1998, 1999 Eric Kohl
@@ -59 +59 @@
  *   5. The LBN_SELCHANGE is just for documentation purposes.
  *
+ *  mod 5
+ *   1. Add support for CB_GETITEMDATA to a Comboex. Returns the LPARAM
+ *      passed during insert of item.
+ *   2. Remember selected item and don't issue CB_SETCURSEL unless needed.
+ *   3. Add initial support for WM_NCCREATE to remove unwanted window styles
+ *      (Currently just WS_VSCROLL and WS_HSCROLL, but probably should be
+ *       more.)
+ *   4. Improve some traces.
+ *   5. Add support for CB_SETITEMDATA sets LPARAM value from item.
+ *
  * Test vehicals were the ControlSpy modules (rebar.exe and comboboxex.exe),
- *  and IE 4.0.
+ *  WinRAR, and IE 4.0.
  *
  */
@@ -69 +79 @@
 #include "debugtools.h"
 #include "wine/unicode.h"
-
 #ifdef __WIN32OS2__
 #include "ccbase.h"
@@ -109 +118 @@
     WNDPROC      prevComboWndProc;   /* previous Combo WNDPROC value */
     DWORD        dwExtStyle;
+    INT          selected;         /* index of selected item */
     DWORD        flags;            /* WINE internal flags */
     HFONT        font;
@@ -882 +892 @@
 
 static LRESULT
+COMBOEX_GetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    INT index = wParam;
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+    CBE_ITEMDATA *item1, *item2;
+    LRESULT lret = 0;
+
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
+                                             wParam, lParam);
+    if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
+        item2 = COMBOEX_FindItem (infoPtr, index);
+        if (item2 != item1) {
+            ERR("data structures damaged!\n");
+            return CB_ERR;
+        }
+        if (item1->mask & CBEIF_LPARAM)
+            lret = (LRESULT) item1->lParam;
+        TRACE("returning 0x%08lx\n", lret);
+        return lret;
+    }
+    lret = (LRESULT)item1;
+    TRACE("non-valid result from combo, returning 0x%08lx\n", lret);
+    return lret;
+}
+
+
+static LRESULT
 COMBOEX_SetCursel (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -896 +933 @@
     TRACE("selecting item %d text=%s\n", index, (item->pszText) ?
           debugstr_w(item->pszText) : "<null>");
+    infoPtr->selected = index;
 
     lret = SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, wParam, lParam);
     COMBOEX_SetEditText (infoPtr, item);
     return lret;
+}
+
+
+static LRESULT
+COMBOEX_SetItemData (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    INT index = wParam;
+    COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
+    CBE_ITEMDATA *item1, *item2;
+
+    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA, 
+                                             wParam, lParam);
+    if ((item1 != NULL) && ((LRESULT)item1 != CB_ERR)) {
+        item2 = COMBOEX_FindItem (infoPtr, index);
+        if (item2 != item1) {
+            ERR("data structures damaged!\n");
+            return CB_ERR;
+        }
+        item1->mask |= CBEIF_LPARAM;
+        item1->lParam = lParam;
+        TRACE("setting lparam to 0x%08lx\n", lParam);
+        return 0;
+    }
+    TRACE("non-valid result from combo 0x%08lx\n", (DWORD)item1);
+    return (LRESULT)item1;
 }
 
@@ -968 +1031 @@
     infoPtr->nb_items = 0;
     infoPtr->hwndSelf = hwnd;
+    infoPtr->selected = -1;
 
     SetWindowLongA (hwnd, 0, (DWORD)infoPtr);
@@ -975 +1039 @@
                         (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
-    TRACE("combo style=%08lx, additional style=%08lx\n", dwComboStyle,
+    GetWindowRect(hwnd, &wnrc1);
+    GetClientRect(hwnd, &clrc1);
+    TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n",
+          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom);
+    TRACE("combo style=%08lx, adding style=%08lx\n", dwComboStyle,
           WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
           CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
@@ -1077 +1146 @@
     GetClientRect(hwnd, &clrc1);
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
-    TRACE("Ex wnd=(%d,%d)-(%d,%d) Ex clt=(%d,%d)-(%d,%d) Cb wnd=(%d,%d)-(%d,%d)\n",
+    TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n",
           wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
           clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
@@ -1086 +1155 @@
 
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
-    TRACE("Ex wnd=(%d,%d)-(%d,%d)\n",
+    TRACE("CB window=(%d,%d)-(%d,%d)\n",
           cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
     SetWindowPos(hwnd, HWND_TOP, 
@@ -1118 +1187 @@
     INT cursel, n, oldItem;
     NMCBEENDEDITA cbeend;
+    DWORD oldflags;
 
     TRACE("for command %d\n", command);
@@ -1171 +1241 @@
             }
         }
-        if (infoPtr->flags & WCBE_ACTEDIT) {
+
+        /* Save flags for testing and reset them */
+        oldflags = infoPtr->flags;
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+        if (oldflags & WCBE_ACTEDIT) {
             WideCharToMultiByte (CP_ACP, 0, item->pszText, -1,
                                  cbeend.szText, sizeof(cbeend.szText),
                                  NULL, NULL);
-            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+            cbeend.fChanged = (oldflags & WCBE_EDITCHG);
             cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
                                                  CB_GETCURSEL, 0, 0);
             cbeend.iWhy = CBENF_DROPDOWN;
 
-            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
             if (COMBOEX_Notify (infoPtr, CBEN_ENDEDITA, 
                                 (NMHDR *)&cbeend, FALSE)) {
@@ -1188 +1262 @@
             }
         }
-        SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
-        SetFocus(infoPtr->hwndCombo);
+
+        /* if selection has changed the set the new current selection */
+        cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+        if ((oldflags & WCBE_EDITCHG) || (cursel != infoPtr->selected)) {
+            infoPtr->selected = cursel;
+            SendMessageW (hwnd, CB_SETCURSEL, cursel, 0);
+            SetFocus(infoPtr->hwndCombo);
+        }
         return 0;
 
@@ -1210 +1290 @@
             ERR("item %d not found. Problem!\n", oldItem);
             break;
-        }  
+        }
+        infoPtr->selected = oldItem;
         COMBOEX_SetEditText (infoPtr, item);
         return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
@@ -1619 +1700 @@
 
 static LRESULT
+COMBOEX_NCCreate (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    /* WARNING: The COMBOEX_INFO structure is not yet created */
+    DWORD oldstyle, newstyle;
+
+    oldstyle = (DWORD)GetWindowLongA (hwnd, GWL_STYLE);
+    newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
+    if (newstyle != oldstyle) {
+        TRACE("req style %08lx, reseting style %08lx\n",
+              oldstyle, newstyle);
+        SetWindowLongA (hwnd, GWL_STYLE, newstyle);
+    }
+    return 1;
+}
+
+
+static LRESULT
 COMBOEX_Size (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1656 +1754 @@
             - (cbx_crect.right-cbx_crect.left); 
 
+    TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n",
+          wp->x, wp->y, wp->cx, wp->cy, wp->flags);
     TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n",
           cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
@@ -1771 +1871 @@
                     break;
                 }
-                  
+                infoPtr->selected = oldItem;              
                 COMBOEX_SetEditText (infoPtr, item);
                 RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
@@ -2110 +2210 @@
 {
     TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx\n", hwnd, uMsg, wParam, lParam);
-    if (!COMBOEX_GetInfoPtr (hwnd) && (uMsg != WM_CREATE))
+
+    if (!COMBOEX_GetInfoPtr (hwnd)) {
+        if (uMsg == WM_CREATE)
+            return COMBOEX_Create (hwnd, wParam, lParam);
+        if (uMsg == WM_NCCREATE)
+            COMBOEX_NCCreate (hwnd, wParam, lParam);
         return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+    }
 
     switch (uMsg)
@@ -2167 +2273 @@
 /*   Combo messages we are not sure if we need to process or just forward */
         case CB_GETDROPPEDCONTROLRECT:
-        case CB_GETITEMDATA:
         case CB_GETITEMHEIGHT:
         case CB_GETLBTEXT:
@@ -2175 +2280 @@
         case CB_RESETCONTENT:
         case CB_SELECTSTRING:
-        case CB_SETITEMDATA:
         case WM_SETTEXT:
         case WM_GETTEXT:
-            FIXME("(0x%x 0x%x 0x%lx): possible missing fucntion\n", 
+            FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
                   uMsg, wParam, lParam);
             return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
@@ -2196 +2300 @@
                                             wParam, lParam);
 
+        case CB_GETITEMDATA:
+            return COMBOEX_GetItemData (hwnd, wParam, lParam);
+
         case CB_SETCURSEL:
             return COMBOEX_SetCursel (hwnd, wParam, lParam);
+
+        case CB_SETITEMDATA:
+            return COMBOEX_SetItemData (hwnd, wParam, lParam);
 
         case CB_SETITEMHEIGHT:
@@ -2213 +2323 @@
 
 /*   Window messages we need to process */
-        case WM_CREATE:
-            return COMBOEX_Create (hwnd, wParam, lParam);
-
         case WM_DELETEITEM:
             return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
@@ -2241 +2348 @@
             return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
 #else
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }

trunk/src/comctl32/comctl32.def

@@ -1 @@
-; $Id: comctl32.def,v 1.21 2001-03-31 13:25:26 sandervl Exp $
+; $Id: comctl32.def,v 1.22 2001-04-29 10:30:56 sandervl Exp $
 LIBRARY COMCTL32 INITINSTANCE
 DESCRIPTION 'Odin32 System DLL - ComCtl32 - Common Controls Library'
@@ -103 +103 @@
 ; ordinals????
   FreeMRUListA        = _FreeMRUListA@4            @152
-  AddMRUData          = _AddMRUData@12             @153
-  FindMRUData         = _FindMRUData@16            @154
-  CreateMRUListLazyA  = _CreateMRUListLazyA@16     @155
+  AddMRUStringA       = _AddMRUStringA@8           @153
+  EnumMRUListA        = _EnumMRUListA@16           @154
+  FindMRUStringA      = _FindMRUStringA@12         @155
+  DelMRUString        = _DelMRUString@8            @156
+  CreateMRUListLazyA  = _CreateMRUListLazyA@16     @157
+
+  AddMRUData          = _AddMRUData@12             @167
+  FindMRUData         = _FindMRUData@16            @169
 
   Str_GetPtrA         = _Str_GetPtrA@12            @233
@@ -164 +169 @@
   StrSpnW             = _COMCTL32_StrSpnW@8        @364
 
-  comctl32_410        = _comctl32_410@16           @410
-  comctl32_411        = _comctl32_411@12           @411
-  comctl32_412        = _comctl32_412@12           @412
-  comctl32_413        = _comctl32_413@16           @413
+                        _comctl32_410@16           @410 NONAME
+                        _comctl32_411@12           @411 NONAME
+                        _comctl32_412@12           @412 NONAME
+                        _comctl32_413@16           @413 NONAME
+                        _COMCTL32_415@20           @415 NONAME

trunk/src/comctl32/comctl32.h

@@ -1 @@
-/* $Id: comctl32.h,v 1.19 2001-03-31 13:25:26 sandervl Exp $ */
+/* $Id: comctl32.h,v 1.20 2001-04-29 10:30:56 sandervl Exp $ */
 /*
  * Win32 common controls implementation
@@ -208 +208 @@
 void UPDOWN_Unregister(void);
 
+
+INT  Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen);
+BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc);
+
 #ifdef __cplusplus
 }

trunk/src/comctl32/comctl32undoc.cpp

@@ -1 @@
-/* $Id: comctl32undoc.cpp,v 1.8 2001-03-31 13:25:26 sandervl Exp $ */
+/* $Id: comctl32undoc.cpp,v 1.9 2001-04-29 10:30:56 sandervl Exp $ */
 /*
  * Undocumented functions from COMCTL32.DLL
@@ -2545 +2545 @@
 }
 
-
+/**************************************************************************
+ * COMCTL32_415 [COMCTL32.415]
+ *
+ * FIXME: What's this supposed to do?
+ *        Parameter 1 is an HWND, you're on your own for the rest.
+ */
+
+BOOL WINAPI COMCTL32_415( HWND hwnd, DWORD b, DWORD c, DWORD d, DWORD e)
+{
+
+   FIXME("(%x, %lx, %lx, %lx, %lx): stub!\n", hwnd, b, c, d, e);
+
+   return TRUE;
+}
+
+/**************************************************************************
+ * Str_GetPtrWtoA [internal]
+ *
+ * Converts a unicode string into a multi byte string
+ *
+ * PARAMS
+ *     lpSrc   [I] Pointer to the unicode source string
+ *     lpDest  [O] Pointer to caller supplied storage for the multi byte string
+ *     nMaxLen [I] Size, in bytes, of the destination buffer
+ *
+ * RETURNS
+ *     Length, in bytes, of the converted string.
+ */
+
+INT
+Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen)
+{
+    INT len;
+
+    TRACE("(%s %p %d)\n", debugstr_w(lpSrc), lpDest, nMaxLen);
+
+    if (!lpDest && lpSrc)
+        return WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, 0, 0, NULL, NULL);
+
+    if (nMaxLen == 0)
+        return 0;
+
+    if (lpSrc == NULL) {
+        lpDest[0] = '\0';
+        return 0;
+    }
+
+    len = WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, 0, 0, NULL, NULL);
+    if (len >= nMaxLen)
+        len = nMaxLen - 1;
+
+    WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, lpDest, len, NULL, NULL);
+    lpDest[len] = '\0';
+
+    return len;
+}
+
+
+/**************************************************************************
+ * Str_SetPtrAtoW [internal]
+ *
+ * Converts a multi byte string to a unicode string.
+ * If the pointer to the destination buffer is NULL a buffer is allocated.
+ * If the destination buffer is too small to keep the converted multi byte
+ * string the destination buffer is reallocated. If the source pointer is
+ * NULL, the destination buffer is freed.
+ *
+ * PARAMS
+ *     lppDest [I/O] pointer to a pointer to the destination buffer
+ *     lpSrc   [I] pointer to a multi byte string
+ *
+ * RETURNS
+ *     TRUE: conversion successful
+ *     FALSE: error
+ */
+
+BOOL
+Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc)
+{
+    TRACE("(%p %s)\n", lppDest, lpSrc);
+
+    if (lpSrc) {
+        INT len = MultiByteToWideChar(CP_ACP,0,lpSrc,-1,NULL,0);
+        LPWSTR ptr = (LPWSTR)COMCTL32_ReAlloc (*lppDest, len*sizeof(WCHAR));
+
+        if (!ptr)
+            return FALSE;
+        MultiByteToWideChar(CP_ACP,0,lpSrc,-1,ptr,len);
+        *lppDest = ptr;
+    }
+    else {
+        if (*lppDest) {
+            COMCTL32_Free (*lppDest);
+            *lppDest = NULL;
+        }
+    }
+
+    return TRUE;
+}

trunk/src/comctl32/makefile

@@ -1 @@
-# $Id: makefile,v 1.31 2000-12-02 23:37:13 bird Exp $
+# $Id: makefile,v 1.32 2001-04-29 10:30:56 sandervl Exp $
 
 #
@@ -57 +57 @@
 $(ODIN32_LIB)/user32.lib \
 $(ODIN32_LIB)/msvfw32.lib \
+$(ODIN32_LIB)/winmm.lib \
 $(ODIN32_LIB)/$(ODINCRT).lib \
 os2386.lib \