Changeset 6709 for trunk/src/comctl32

Timestamp:

Sep 15, 2001, 11:26:26 AM (24 years ago)

Author:

sandervl

Message:

restored old version

Location:

trunk/src/comctl32

Files:

• animate.c (modified) (38 diffs)
• comboex.c (modified) (74 diffs)
• comctl32.c (modified) (33 diffs)
• comctl32undoc.c (modified) (72 diffs)
• datetime.c (modified) (39 diffs)
• flatsb.c (modified) (14 diffs)
• imagelist.c (modified) (108 diffs)
• monthcal.c (modified) (94 diffs)
• status.c (modified) (50 diffs)
• tab.c (modified) (104 diffs)

trunk/src/comctl32/animate.c

@@ -4 +4 @@
  *
  * Copyright 1998, 1999 Eric Kohl
- *         1999 Eric Pouech
+ *                 1999 Eric Pouech
  *
  * NOTES
@@ -33 +33 @@
 #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
+#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);
 }
 
@@ -77 +77 @@
 #endif
 {
-    HRSRC   hrsrc;
-    MMIOINFO    mminfo;
-    LPVOID  lpAvi;
-
+    HRSRC       hrsrc;
+    MMIOINFO    mminfo;
+    LPVOID      lpAvi;
+    
 #ifdef __WIN32OS2__
     if (unicode)
@@ -90 +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;
@@ -106 +106 @@
     infoPtr->hMMio = mmioOpenA(NULL, &mminfo, MMIO_READ);
     if (!infoPtr->hMMio) {
-    GlobalFree((HGLOBAL)lpAvi);
-    return FALSE;
+        GlobalFree((HGLOBAL)lpAvi);
+        return FALSE;
     }
 
@@ -127 +127 @@
 #else
     infoPtr->hMMio = mmioOpenA((LPSTR)lpName, NULL,
-                   MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+                               MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
 #endif
     if (!infoPtr->hMMio)
-    return FALSE;
-
+        return FALSE;
+    
     return TRUE;
 }
@@ -141 +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;
     }
 
@@ -163 +163 @@
 {
     if (infoPtr->hMMio) {
-    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;
-    }
+        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);
 
@@ -258 +258 @@
 
     if (!hDC || !infoPtr->inbih)
-    return TRUE;
+        return TRUE;
 
     if (infoPtr->hic )
@@ -266 +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)
@@ -281 +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);
@@ -320 +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);
@@ -338 +338 @@
 static LRESULT ANIMATE_DrawFrame(ANIMATE_INFO* infoPtr)
 {
-    HDC     hDC;
+    HDC         hDC;
 
     TRACE("Drawing frame %d (loop %d)\n", infoPtr->currFrame, infoPtr->nLoop);
@@ -346 +346 @@
     mmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET);
     mmioRead(infoPtr->hMMio, infoPtr->indata, infoPtr->ash.dwSuggestedBufferSize);
-
+    
     if (infoPtr->hic &&
-    ICDecompress(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;
@@ -375 +375 @@
 static DWORD CALLBACK ANIMATE_AnimationThread(LPVOID ptr_)
 {
-    ANIMATE_INFO*   infoPtr = (ANIMATE_INFO*)ptr_;
+    ANIMATE_INFO*       infoPtr = (ANIMATE_INFO*)ptr_;
     HDC hDC;
-
+    
     if(!infoPtr)
     {
@@ -385 +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 */
+            /* 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);
-
+    
         /* time is in microseconds, we should convert it to milliseconds */
         Sleep((infoPtr->mah.dwMicroSecPerFrame+500)/1000);
@@ -411 +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);
     }
 
@@ -423 +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)
@@ -448 +448 @@
            return FALSE;
     }
-
-    }
-
+        
+    }
+        
     ANIMATE_Notify(infoPtr, ACN_START);
 
@@ -459 +459 @@
 static BOOL ANIMATE_GetAviInfo(ANIMATE_INFO *infoPtr)
 {
-    MMCKINFO        ckMainRIFF;
-    MMCKINFO        mmckHead;
-    MMCKINFO        mmckList;
-    MMCKINFO        mmckInfo;
-    DWORD       numFrame;
-    DWORD       insize;
+    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;
+        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 (mmioDescend(infoPtr->hMMio, &mmckHead, &ckMainRIFF, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'hdrl' list\n");
-    return FALSE;
+        WARN("Can't find 'hdrl' list\n");
+        return FALSE;
     }
 
     mmckInfo.ckid = mmioFOURCC('a', 'v', 'i', 'h');
     if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckHead, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'avih' chunk\n");
-    return FALSE;
+        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);
+    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);
@@ -506 +506 @@
     mmckList.fccType = mmioFOURCC('s', 't', 'r', 'l');
     if (mmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'strl' list\n");
-    return FALSE;
+        WARN("Can't find 'strl' list\n");
+        return FALSE;
     }
 
     mmckInfo.ckid = mmioFOURCC('s', 't', 'r', 'h');
     if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'strh' chunk\n");
-    return FALSE;
+        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);
+    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);
@@ -544 +544 @@
     mmckInfo.ckid = mmioFOURCC('s', 't', 'r', 'f');
     if (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, MMIO_FINDCHUNK) != 0) {
-    WARN("Can't find 'strh' chunk\n");
-    return FALSE;
+        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;
+        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);
+    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 (mmioDescend(infoPtr->hMMio, &mmckList, &mmckHead, MMIO_FINDLIST) == 0) {
-    WARN("There should be a single 'strl' list\n");
-    return FALSE;
+        WARN("There should be a single 'strl' list\n");
+        return FALSE;
     }
 #endif
@@ -589 +589 @@
     mmckList.fccType = mmioFOURCC('m', 'o', 'v', 'i');
     if (mmioDescend(infoPtr->hMMio, &mmckList, &ckMainRIFF, MMIO_FINDLIST) != 0) {
-    WARN("Can't find 'movi' list\n");
-    return FALSE;
+        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 (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);
+    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;
     }
 
@@ -632 +632 @@
 static BOOL    ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr)
 {
-    DWORD   outSize;
+    DWORD       outSize;
 
     /* check uncompressed AVI */
@@ -638 +638 @@
        (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')))
     {
-        infoPtr->hic = 0;
-    return TRUE;
+        infoPtr->hic = 0;             
+        return TRUE;
     }
 
@@ -645 +645 @@
     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 = ICSendMessage(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 (ICSendMessage(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 (ICSendMessage(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;
     }
 
@@ -691 +691 @@
 
     if (!lParam) {
-    TRACE("Closing avi!\n");
-    return TRUE;
-    }
-
+        TRACE("Closing avi!\n");
+        return TRUE;
+    }
+    
     if (!hInstance)
        hInstance = GetWindowLongA(hWnd, GWL_HINSTANCE);
@@ -719 +719 @@
 #else
     if (HIWORD(lParam)) {
-    TRACE("(\"%s\");\n", (LPSTR)lParam);
-
-    if (!ANIMATE_LoadResA(infoPtr, hInstance, (LPSTR)lParam)) {
-        TRACE("No AVI resource found!\n");
-        if (!ANIMATE_LoadFileA(infoPtr, (LPSTR)lParam)) {
-        WARN("No AVI file found!\n");
-        return FALSE;
-        }
-    }
+        TRACE("(\"%s\");\n", (LPSTR)lParam);
+
+        if (!ANIMATE_LoadResA(infoPtr, hInstance, (LPSTR)lParam)) {
+            TRACE("No AVI resource found!\n");
+            if (!ANIMATE_LoadFileA(infoPtr, (LPSTR)lParam)) {
+                WARN("No AVI file found!\n");
+                return FALSE;
+            }
+        }
     } else {
-    TRACE("(%u);\n", (WORD)LOWORD(lParam));
-
-    if (!ANIMATE_LoadResA(infoPtr, hInstance,
-                  MAKEINTRESOURCEA((INT)lParam))) {
-        WARN("No AVI resource found!\n");
-        return FALSE;
-    }
+        TRACE("(%u);\n", (WORD)LOWORD(lParam));
+
+        if (!ANIMATE_LoadResA(infoPtr, hInstance,
+                              MAKEINTRESOURCEA((INT)lParam))) {
+            WARN("No AVI resource found!\n");
+            return FALSE;
+        }
     }
 #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));
     }
 
@@ -771 +771 @@
     /* nothing opened */
     if (!infoPtr->hMMio)
-    return FALSE;
+        return FALSE;
 
     ANIMATE_DoStop(infoPtr);
@@ -780 +780 @@
 static LRESULT ANIMATE_Create(HWND hWnd, WPARAM wParam, LPARAM lParam)
 {
-    ANIMATE_INFO*   infoPtr;
+    ANIMATE_INFO*       infoPtr;
 
     /* allocate memory for info structure */
@@ -789 +789 @@
 #endif
     if (!infoPtr) {
-    ERR("could not allocate info memory!\n");
-    return 0;
+        ERR("could not allocate info memory!\n");
+        return 0;
     }
 
@@ -802 +802 @@
 
     InitializeCriticalSection(&infoPtr->cs);
-
+    
     return 0;
 }
@@ -826 +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);    
     }
 
@@ -842 +842 @@
 {
     if (GetWindowLongA(hWnd, GWL_STYLE) & ACS_CENTER) {
-    InvalidateRect(hWnd, NULL, TRUE);
+        InvalidateRect(hWnd, NULL, TRUE);
     }
     return TRUE;
@@ -851 +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)
     {
@@ -862 +862 @@
 #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)
             {
@@ -924 +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);
-
+        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
     }
@@ -966 +966 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = ANIMATE_CLASSA;
-
+ 
     RegisterClassA(&wndClass);
 }

trunk/src/comctl32/comboex.c

@@ -4 +4 @@
  *     result in a FIXME:
  *           CBES_EX_NOEDITIMAGEINDENT
- *       CBES_EX_PATHWORDBREAKPROC
- *       CBES_EX_NOSIZELIMIT
- *       CBES_EX_CASESENSITIVE
+ *           CBES_EX_PATHWORDBREAKPROC
+ *           CBES_EX_NOSIZELIMIT
+ *           CBES_EX_CASESENSITIVE
  *  2. None of the following callback items are implemented. Therefor
  *     no CBEN_GETDISPINFO notifies are issued. Use in either CBEM_INSERTITEM
@@ -37 +37 @@
  *      generate message sequence similar to native DLL.
  *   2. Handle case where CBEM_SETITEM is called to display data in EDIT
- *      Control.
+ *      Control. 
  *   3. Add override for WNDPROC for the EDIT control (reqed for VK_RETURN).
  *   4. Dump input data for things using COMBOBOXEXITEM{A|W}.
@@ -55 +55 @@
  *   3. Lock image selected status to focus state of edit control if
  *      edit control exists. Mimics native actions.
- *   4. Implemented WM_SETFOCUS in EditWndProc to track status of
+ *   4. Implemented WM_SETFOCUS in EditWndProc to track status of 
  *      focus for 3 above.
  *   5. The LBN_SELCHANGE is just for documentation purposes.
@@ -70 +70 @@
  *
  *  mod 6
- *   1. Add support for WM_NOTIFYFORMAT (both incoming and outgoing) and do
+ *   1. Add support for WM_NOTIFYFORMAT (both incoming and outgoing) and do 
  *      WM_NOTIFY correctly based on results.
  *   2. Fix memory leaks of text strings in COMBOEX_WM_DELETEITEM.
  *   3. Add routines to handle special cases of NMCBEENDEDIT and NMCOMBOXEX
- *      so translation to ANSI is done correctly.
+ *      so translation to ANSI is done correctly. 
  *   4. Fix some issues with COMBOEX_DrawItem.
  *
@@ -150 +150 @@
 /*
  * Special flag set in DRAWITEMSTRUCT itemState field. It is set by
- * the ComboEx version of the Combo Window Proc so that when the
- * WM_DRAWITEM message is then passed to ComboEx, we know that this
+ * the ComboEx version of the Combo Window Proc so that when the 
+ * WM_DRAWITEM message is then passed to ComboEx, we know that this 
  * particular WM_DRAWITEM message is for listbox only items. Any messasges
  * without this flag is then for the Edit control field.
  *
- * We really cannot use the ODS_COMBOBOXEDIT flag because MSDN states that
+ * We really cannot use the ODS_COMBOBOXEDIT flag because MSDN states that 
  * only version 4.0 applications will have ODS_COMBOBOXEDIT set.
  */
@@ -189 +189 @@
     if (TRACE_ON(comboex)){
       TRACE("item %p - mask=%08x, pszText=%p, cchTM=%d, iImage=%d\n",
-        item, item->mask, item->pszText, item->cchTextMax,
-        item->iImage);
+            item, item->mask, item->pszText, item->cchTextMax,
+            item->iImage);
       TRACE("item %p - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-        item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
+            item, item->iSelectedImage, item->iOverlay, item->iIndent, item->lParam);
       if ((item->mask & CBEIF_TEXT) && item->pszText)
-      TRACE("item %p - pszText=%s\n",
-        item, debugstr_w((const WCHAR *)item->pszText));
+          TRACE("item %p - pszText=%s\n",
+                item, debugstr_w((const WCHAR *)item->pszText));
     }
 }
@@ -205 +205 @@
     if (TRACE_ON(comboex)){
       TRACE("input - mask=%08x, iItem=%d, pszText=%p, cchTM=%d, iImage=%d\n",
-        input->mask, input->iItem, input->pszText, input->cchTextMax,
-        input->iImage);
+            input->mask, input->iItem, input->pszText, input->cchTextMax,
+            input->iImage);
       if ((input->mask & CBEIF_TEXT) && input->pszText) {
-      if (true_for_w)
-          TRACE("input - pszText=<%s>\n",
-            debugstr_w((const WCHAR *)input->pszText));
-      else
-          TRACE("input - pszText=<%s>\n",
-            debugstr_a((const char *)input->pszText));
+          if (true_for_w)
+              TRACE("input - pszText=<%s>\n", 
+                    debugstr_w((const WCHAR *)input->pszText));
+          else 
+              TRACE("input - pszText=<%s>\n", 
+                    debugstr_a((const char *)input->pszText));
       }
       TRACE("input - iSelectedImage=%d, iOverlay=%d, iIndent=%d, lParam=%08lx\n",
-        input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
+            input->iSelectedImage, input->iOverlay, input->iIndent, input->lParam);
     }
 }
@@ -226 +226 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    if (infoPtr->hwndCombo)
-    return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
+    if (infoPtr->hwndCombo)    
+        return SendMessageA (infoPtr->hwndCombo, uMsg, wParam, lParam);
 
     return 0;
@@ -241 +241 @@
     hdr->code = code;
     if (infoPtr->NtfUnicode)
-    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                 (LPARAM)hdr);
+        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                             (LPARAM)hdr);
     else
-    return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                 (LPARAM)hdr);
+        return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                             (LPARAM)hdr);
 }
 
@@ -259 +259 @@
     hdr->hdr.code = code;
     if (infoPtr->NtfUnicode)
-    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                 (LPARAM)hdr);
+        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                             (LPARAM)hdr);
     else {
-    LPWSTR str, ostr = NULL;
-    INT ret, len = 0;
-
-    if (hdr->ceItem.mask & CBEIF_TEXT) {
-        ostr = hdr->ceItem.pszText;
-        str = ostr;
-        if (!str) str = (LPWSTR)L"";
-        len = WideCharToMultiByte (CP_ACP, 0, str, -1, 0, 0, NULL, NULL);
-        if (len > 0) {
-        hdr->ceItem.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
-        WideCharToMultiByte (CP_ACP, 0, str, -1, (LPSTR)hdr->ceItem.pszText,
-                     len, NULL, NULL);
-        }
-    }
-
-    ret = SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                (LPARAM)hdr);
-    if (hdr->ceItem.mask & CBEIF_TEXT) {
-        if (len > 0)
-        COMCTL32_Free (hdr->ceItem.pszText);
-        hdr->ceItem.pszText = ostr;
-    }
-    return ret;
+        LPWSTR str, ostr = NULL;
+        INT ret, len = 0;
+
+        if (hdr->ceItem.mask & CBEIF_TEXT) {
+            ostr = hdr->ceItem.pszText;
+            str = ostr;
+            if (!str) str = (LPWSTR)L"";
+            len = WideCharToMultiByte (CP_ACP, 0, str, -1, 0, 0, NULL, NULL);
+            if (len > 0) {
+                hdr->ceItem.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(CHAR));
+                WideCharToMultiByte (CP_ACP, 0, str, -1, (LPSTR)hdr->ceItem.pszText,
+                                     len, NULL, NULL);
+            }
+        }
+
+        ret = SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                            (LPARAM)hdr);
+        if (hdr->ceItem.mask & CBEIF_TEXT) {
+            if (len > 0)
+                COMCTL32_Free (hdr->ceItem.pszText);
+            hdr->ceItem.pszText = ostr;
+        }
+        return ret;
     }
 }
@@ -299 +299 @@
     hdr->hdr.code = (infoPtr->NtfUnicode) ? CBEN_ENDEDITW : CBEN_ENDEDITA;
     if (infoPtr->NtfUnicode)
-    return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                 (LPARAM)hdr);
+        return SendMessageW (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                             (LPARAM)hdr);
     else {
-    NMCBEENDEDITA ansi;
-
-    memcpy (&ansi.hdr, &hdr->hdr, sizeof(NMHDR));
-    ansi.fChanged = hdr->fChanged;
-    ansi.iNewSelection = hdr->iNewSelection;
-    WideCharToMultiByte (CP_ACP, 0, itemText, -1,
-                 (LPSTR)&ansi.szText, CBEMAXSTRLEN, NULL, NULL);
-    ansi.iWhy = hdr->iWhy;
-    return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
-                 (LPARAM)&ansi);
+        NMCBEENDEDITA ansi;
+
+        memcpy (&ansi.hdr, &hdr->hdr, sizeof(NMHDR));
+        ansi.fChanged = hdr->fChanged;
+        ansi.iNewSelection = hdr->iNewSelection;
+        WideCharToMultiByte (CP_ACP, 0, itemText, -1,
+                             (LPSTR)&ansi.szText, CBEMAXSTRLEN, NULL, NULL);
+        ansi.iWhy = hdr->iWhy;
+        return SendMessageA (GetParent(infoPtr->hwndSelf), WM_NOTIFY, 0,
+                             (LPARAM)&ansi);
     }
 }
@@ -340 +340 @@
     }
     if (cit->mask & CBEIF_IMAGE)
-    cit->iImage         = item->iImage;
+        cit->iImage         = item->iImage;
     if (cit->mask & CBEIF_SELECTEDIMAGE)
-    cit->iSelectedImage = item->iSelectedImage;
+        cit->iSelectedImage = item->iSelectedImage;
     if (cit->mask & CBEIF_OVERLAY)
-    cit->iOverlay       = item->iOverlay;
+        cit->iOverlay       = item->iOverlay;
     if (cit->mask & CBEIF_INDENT)
-    cit->iIndent        = item->iIndent;
+        cit->iIndent        = item->iIndent;
     if (cit->mask & CBEIF_LPARAM)
-    cit->lParam         = item->lParam;
+        cit->lParam         = item->lParam;
 
 }
@@ -364 +364 @@
     iinfo.rcImage.left = iinfo.rcImage.right = 0;
     if (infoPtr->himl) {
-    ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
-    xoff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
+        ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+        xoff = iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP;
     }
     GetClientRect (infoPtr->hwndCombo, &rect);
@@ -380 +380 @@
 
     TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n",
-      rect.left, rect.top, rect.right, rect.bottom,
-      x, y, x + w, y + h);
+          rect.left, rect.top, rect.right, rect.bottom,
+          x, y, x + w, y + h);
     SetWindowPos(infoPtr->hwndEdit, HWND_TOP,
-         x, y,
-         w, h,
-         SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER);
+                 x, y,
+                 w, h,
+                 SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER);
 }
 
@@ -399 +399 @@
     cy = mysize.cy + CBE_EXTRA;
     if (infoPtr->himl) {
-    ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
-    cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
-    TRACE("upgraded height due to image:  height=%d\n", cy);
+        ImageList_GetImageInfo(infoPtr->himl, 0, &iinfo);
+        cy = max (iinfo.rcImage.bottom - iinfo.rcImage.top, cy);
+        TRACE("upgraded height due to image:  height=%d\n", cy);
     }
     SendMessageW (hwnd, CB_SETITEMHEIGHT, (WPARAM) -1, (LPARAM) cy);
     if (infoPtr->hwndCombo)
         SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT,
-              (WPARAM) 0, (LPARAM) cy);
+                      (WPARAM) 0, (LPARAM) cy);
 }
 
@@ -419 +419 @@
     /*      EM_SETSEL32 (0,-1)      */
     if (item->mask & CBEIF_TEXT) {
-    SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)item->pszText);
-    SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
-    SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
-    }
-}
-
-
+        SendMessageW (infoPtr->hwndEdit, WM_SETTEXT, 0, (LPARAM)item->pszText);
+        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
+        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
+    }
+}
+
+ 
 static CBE_ITEMDATA *
 COMBOEX_FindItem(COMBOEX_INFO *infoPtr, INT index)
@@ -433 +433 @@
 
     if ((index > infoPtr->nb_items) || (index < -1))
-    return 0;
+        return 0;
     if (index == -1)
-    return infoPtr->edit;
+        return infoPtr->edit;
     item = infoPtr->items;
     i = infoPtr->nb_items - 1;
@@ -441 +441 @@
     /* find the item in the list */
     while (item && (i > index)) {
-    item = (CBE_ITEMDATA *)item->next;
-    i--;
+        item = (CBE_ITEMDATA *)item->next;
+        i--;
     }
     if (!item || (i != index)) {
-    FIXME("COMBOBOXEX item structures broken. Please report!\n");
-    return 0;
+        FIXME("COMBOBOXEX item structures broken. Please report!\n");
+        return 0;
     }
     return item;
@@ -456 +456 @@
 {
     if (item->pszText == LPSTR_TEXTCALLBACKW)
-    FIXME("Callback not implemented yet for pszText\n");
+        FIXME("Callback not implemented yet for pszText\n");
     if (item->iImage == I_IMAGECALLBACK)
-    FIXME("Callback not implemented yet for iImage\n");
+        FIXME("Callback not implemented yet for iImage\n");
     if (item->iSelectedImage == I_IMAGECALLBACK)
-    FIXME("Callback not implemented yet for iSelectedImage\n");
+        FIXME("Callback not implemented yet for iSelectedImage\n");
     if (item->iOverlay == I_IMAGECALLBACK)
-    FIXME("Callback not implemented yet for iOverlay\n");
+        FIXME("Callback not implemented yet for iOverlay\n");
     if (item->iIndent == I_INDENTCALLBACK)
-    FIXME("Callback not implemented yet for iIndent\n");
+        FIXME("Callback not implemented yet for iIndent\n");
 }
 
@@ -482 +482 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < 0)) {
-    ERR("attempt to delete item that does not exist\n");
-    return CB_ERR;
+        ERR("attempt to delete item that does not exist\n");
+        return CB_ERR;
     }
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-    ERR("attempt to delete item that was not found!\n");
-    return CB_ERR;
+        ERR("attempt to delete item that was not found!\n");
+        return CB_ERR;
     }
 
@@ -515 +515 @@
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-    return 0;
+        return 0;
 
     TRACE("-- 0x%x\n", infoPtr->hwndEdit);
@@ -560 +560 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < -1)) {
-    ERR("attempt to get item that does not exist\n");
-    return 0;
+        ERR("attempt to get item that does not exist\n");
+        return 0;
     }
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) &&
+    if ((index == -1) && 
         ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-        return 0;
+            return 0;
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-    ERR("attempt to get item that was not found!\n");
-    return 0;
+        ERR("attempt to get item that was not found!\n");
+        return 0;
     }
 
@@ -594 +594 @@
 
     len = WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 0, 0, NULL, NULL);
-    if (len > 0)
-    WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1,
-                 cit->pszText, cit->cchTextMax, NULL, NULL);
+    if (len > 0) 
+        WideCharToMultiByte (CP_ACP, 0, tmpcit.pszText, -1, 
+                             cit->pszText, cit->cchTextMax, NULL, NULL);
 
     cit->iImage = tmpcit.iImage;
@@ -613 +613 @@
     COMBOEX_INFO *infoPtr = COMBOEX_GetInfoPtr (hwnd);
 
-    TRACE("%s hwnd=0x%x\n",
-       infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
+    TRACE("%s hwnd=0x%x\n", 
+           infoPtr->bUnicode ? "TRUE" : "FALSE", hwnd);
 
     return infoPtr->bUnicode;
@@ -626 +626 @@
 
     if ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN)
-    return FALSE;
-    if ((infoPtr->flags & (WCBE_ACTEDIT | WCBE_EDITCHG)) ==
-    (WCBE_ACTEDIT | WCBE_EDITCHG))
-    return TRUE;
+        return FALSE;
+    if ((infoPtr->flags & (WCBE_ACTEDIT | WCBE_EDITCHG)) == 
+        (WCBE_ACTEDIT | WCBE_EDITCHG))
+        return TRUE;
     return FALSE;
 }
@@ -661 +661 @@
         /* fast path for iItem = -1 */
         item->next = infoPtr->items;
-    infoPtr->items = item;
+        infoPtr->items = item;
     }
     else {
         INT i = infoPtr->nb_items-1;
-    CBE_ITEMDATA *moving = infoPtr->items;
-
-    while ((i > index) && moving) {
-        moving = (CBE_ITEMDATA *)moving->next;
-        i--;
-    }
-    if (!moving) {
-        FIXME("COMBOBOXEX item structures broken. Please report!\n");
-        COMCTL32_Free(item);
-        return -1;
-    }
-    item->next = moving->next;
-    moving->next = item;
+        CBE_ITEMDATA *moving = infoPtr->items;
+
+        while ((i > index) && moving) {
+            moving = (CBE_ITEMDATA *)moving->next;
+            i--;
+        }
+        if (!moving) {
+            FIXME("COMBOBOXEX item structures broken. Please report!\n");
+            COMCTL32_Free(item);
+            return -1;
+        }
+        item->next = moving->next;
+        moving->next = item;
     }
 
@@ -684 +684 @@
     if (item->mask & CBEIF_TEXT) {
         LPWSTR str;
-    INT len;
+        INT len;
 
         str = cit->pszText;
         if (!str) str = (LPWSTR) L"";
-    len = strlenW (str);
-    if (len > 0) {
-        item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        strcpyW (item->pszText, str);
-    }
-    else
-        item->pszText = NULL;
+        len = strlenW (str);
+        if (len > 0) {
+            item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            strcpyW (item->pszText, str);
+        }
+        else
+            item->pszText = NULL;
         item->cchTextMax   = cit->cchTextMax;
     }
@@ -713 +713 @@
     COMBOEX_DumpItem (item);
 
-    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING,
-          (WPARAM)cit->iItem, (LPARAM)item);
+    SendMessageW (infoPtr->hwndCombo, CB_INSERTSTRING, 
+                  (WPARAM)cit->iItem, (LPARAM)item);
 
     COMBOEX_CopyItem (infoPtr, item, &nmcit.ceItem);
@@ -727 +727 @@
 COMBOEX_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    COMBOBOXEXITEMA *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW citW;
-    LRESULT     ret;
+    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
+    COMBOBOXEXITEMW     citW;
+    LRESULT             ret;
 
     memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
     if (cit->mask & CBEIF_TEXT) {
         LPSTR str;
-    INT len;
+        INT len;
 
         str = cit->pszText;
         if (!str) str="";
-    len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-    if (len > 0) {
-        citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-    }
+        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+        if (len > 0) {
+            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
+        }
     }
     ret = COMBOEX_InsertItemW(hwnd,wParam,(LPARAM)&citW);;
 
     if (cit->mask & CBEIF_TEXT)
-    COMCTL32_Free(citW.pszText);
+        COMCTL32_Free(citW.pszText);
     return ret;
 }
@@ -763 +763 @@
 
     if (lParam & (CBES_EX_NOEDITIMAGEINDENT |
-          CBES_EX_PATHWORDBREAKPROC |
-          CBES_EX_NOSIZELIMIT |
-          CBES_EX_CASESENSITIVE))
-    FIXME("Extended style not implemented %08lx\n", lParam);
+                  CBES_EX_PATHWORDBREAKPROC |
+                  CBES_EX_NOSIZELIMIT |
+                  CBES_EX_CASESENSITIVE))
+        FIXME("Extended style not implemented %08lx\n", lParam);
 
     if ((DWORD)wParam) {
-    infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
+        infoPtr->dwExtStyle = (infoPtr->dwExtStyle & ~(DWORD)wParam) | (DWORD)lParam;
     }
     else
-    infoPtr->dwExtStyle = (DWORD)lParam;
+        infoPtr->dwExtStyle = (DWORD)lParam;
 
     /*
@@ -778 +778 @@
      */
     if ((infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE) ^
-    (dwTemp & CBES_EX_NOEDITIMAGE)) {
-    /* if state of EX_NOEDITIMAGE changes, invalidate all */
-    TRACE("EX_NOEDITIMAGE state changed to %ld\n",
-        infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
-    InvalidateRect (hwnd, NULL, TRUE);
-    COMBOEX_AdjustEditPos (infoPtr);
-    if (infoPtr->hwndEdit)
-        InvalidateRect (infoPtr->hwndEdit, NULL, TRUE);
+        (dwTemp & CBES_EX_NOEDITIMAGE)) {
+        /* if state of EX_NOEDITIMAGE changes, invalidate all */
+        TRACE("EX_NOEDITIMAGE state changed to %ld\n",
+            infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE);
+        InvalidateRect (hwnd, NULL, TRUE);
+        COMBOEX_AdjustEditPos (infoPtr);
+        if (infoPtr->hwndEdit)
+            InvalidateRect (infoPtr->hwndEdit, NULL, TRUE);
     }
 
@@ -826 +826 @@
     /* if item number requested does not exist then return failure */
     if ((index > infoPtr->nb_items) || (index < -1)) {
-    ERR("attempt to set item that does not exist yet!\n");
-    return 0;
+        ERR("attempt to set item that does not exist yet!\n");
+        return 0;
     }
 
     /* if the item is the edit control and there is no edit control, skip */
-    if ((index == -1) &&
+    if ((index == -1) && 
         ((GetWindowLongA (hwnd, GWL_STYLE) & CBS_DROPDOWNLIST) != CBS_DROPDOWN))
-        return 0;
+            return 0;
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-    ERR("attempt to set item that was not found!\n");
-    return 0;
-    }
-
-    /* add/change stuff to the internal item structure */
+        ERR("attempt to set item that was not found!\n");
+        return 0;
+    }
+
+    /* add/change stuff to the internal item structure */ 
     item->mask |= cit->mask;
     if (cit->mask & CBEIF_TEXT) {
         LPWSTR str;
-    INT len;
-    WCHAR emptystr[1] = {0};
+        INT len;
+        WCHAR emptystr[1] = {0};
 
         str = cit->pszText;
         if (!str) str=emptystr;
-    len = strlenW(str);
-    if (len > 0) {
-        item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        strcpyW(item->pszText,str);
-    }
+        len = strlenW(str);
+        if (len > 0) {
+            item->pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            strcpyW(item->pszText,str);
+        }
         item->cchTextMax   = cit->cchTextMax;
     }
@@ -873 +873 @@
     /* if original request was to update edit control, do some fast foot work */
     if (cit->iItem == -1) {
-    COMBOEX_SetEditText (infoPtr, item);
-    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE);
+        COMBOEX_SetEditText (infoPtr, item);
+        RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | RDW_INVALIDATE);
     }
     return TRUE;
@@ -882 +882 @@
 COMBOEX_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    COMBOBOXEXITEMA *cit = (COMBOBOXEXITEMA *) lParam;
-    COMBOBOXEXITEMW citW;
-    LRESULT     ret;
+    COMBOBOXEXITEMA     *cit = (COMBOBOXEXITEMA *) lParam;
+    COMBOBOXEXITEMW     citW;
+    LRESULT             ret;
 
     memcpy(&citW,cit,sizeof(COMBOBOXEXITEMA));
     if (cit->mask & CBEIF_TEXT) {
         LPSTR str;
-    INT len;
+        INT len;
 
         str = cit->pszText;
         if (!str) str="";
-    len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-    if (len > 0) {
-        citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
-    }
+        len = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+        if (len > 0) {
+            citW.pszText = (LPWSTR)COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            MultiByteToWideChar (CP_ACP, 0, str, -1, citW.pszText, len);
+        }
     }
     ret = COMBOEX_SetItemW(hwnd,wParam,(LPARAM)&citW);;
 
     if (cit->mask & CBEIF_TEXT)
-    COMCTL32_Free(citW.pszText);
+        COMCTL32_Free(citW.pszText);
     return ret;
 }
@@ -913 +913 @@
     BOOL bTemp = infoPtr->bUnicode;
 
-    TRACE("to %s hwnd=0x%04x, was %s\n",
-      ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd,
-      (bTemp) ? "TRUE" : "FALSE");
+    TRACE("to %s hwnd=0x%04x, was %s\n", 
+          ((BOOL)wParam) ? "TRUE" : "FALSE", hwnd,
+          (bTemp) ? "TRUE" : "FALSE");
 
     infoPtr->bUnicode = (BOOL)wParam;
@@ -937 +937 @@
     i = MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, NULL, 0);
     if (i > 0) {
-    desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
-    MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, desired, i);
+        desired = (LPWSTR)COMCTL32_Alloc ((i + 1)*sizeof(WCHAR));
+        MultiByteToWideChar (CP_ACP, 0, (LPSTR)lParam, -1, desired, i);
     }
 
@@ -945 +945 @@
     /* now search from after starting loc and wrapping back to start */
     for(i=start+1; i<count; i++) {
-    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-              CB_GETITEMDATA, (WPARAM)i, 0);
-    TRACE("desired=%s, item=%s\n",
-          debugstr_w(desired), debugstr_w(item->pszText));
-    if (lstrcmpiW(item->pszText, desired) == 0) {
-        COMCTL32_Free (desired);
-        return i;
-    }
+        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
+                          CB_GETITEMDATA, (WPARAM)i, 0);
+        TRACE("desired=%s, item=%s\n", 
+              debugstr_w(desired), debugstr_w(item->pszText));
+        if (lstrcmpiW(item->pszText, desired) == 0) {
+            COMCTL32_Free (desired);
+            return i;
+        }
     }
     for(i=0; i<=start; i++) {
-    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-              CB_GETITEMDATA, (WPARAM)i, 0);
-    TRACE("desired=%s, item=%s\n",
-          debugstr_w(desired), debugstr_w(item->pszText));
-    if (lstrcmpiW(item->pszText, desired) == 0) {
-        COMCTL32_Free (desired);
-        return i;
-    }
+        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
+                          CB_GETITEMDATA, (WPARAM)i, 0);
+        TRACE("desired=%s, item=%s\n", 
+              debugstr_w(desired), debugstr_w(item->pszText));
+        if (lstrcmpiW(item->pszText, desired) == 0) {
+            COMCTL32_Free (desired);
+            return i;
+        }
     }
     COMCTL32_Free(desired);
@@ -977 +977 @@
     LRESULT lret = 0;
 
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA,
-                         wParam, lParam);
+    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;
+        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;
@@ -1005 +1005 @@
 
     if (!(item = COMBOEX_FindItem(infoPtr, index))) {
-    /* FIXME: need to clear selection */
-    return CB_ERR;
+        /* FIXME: need to clear selection */
+        return CB_ERR;
     }
 
     TRACE("selecting item %d text=%s\n", index, (item->pszText) ?
-      debugstr_w(item->pszText) : "<null>");
+          debugstr_w(item->pszText) : "<null>");
     infoPtr->selected = index;
 
@@ -1026 +1026 @@
     CBE_ITEMDATA *item1, *item2;
 
-    item1 = (CBE_ITEMDATA *)COMBOEX_Forward (hwnd, CB_GETITEMDATA,
-                         wParam, lParam);
+    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;
+        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);
@@ -1054 +1054 @@
     /* First, lets forward the message to the normal combo control
        just like Windows.     */
-    if (infoPtr->hwndCombo)
+    if (infoPtr->hwndCombo)    
        SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, wParam, lParam);
 
@@ -1060 +1060 @@
     GetWindowRect (hwnd, &cbx_wrect);
     GetClientRect (hwnd, &cbx_crect);
-    /* the height of comboex as height of the combo + comboex border */
+    /* the height of comboex as height of the combo + comboex border */ 
     height = cb_wrect.bottom-cb_wrect.top
              + cbx_wrect.bottom-cbx_wrect.top
              - (cbx_crect.bottom-cbx_crect.top);
     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,
-      cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
+          cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
+          cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
     TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
-      cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
-      cbx_wrect.right-cbx_wrect.left, height);
+          cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
+          cbx_wrect.right-cbx_wrect.left, height);
     SetWindowPos (hwnd, HWND_TOP, 0, 0,
-          cbx_wrect.right-cbx_wrect.left,
-          height,
-          SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
+                  cbx_wrect.right-cbx_wrect.left,
+                  height,
+                  SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 
     return ret;
@@ -1101 +1101 @@
 #endif
     if (infoPtr == NULL) {
-    ERR("could not allocate info memory!\n");
-    return 0;
+        ERR("could not allocate info memory!\n");
+        return 0;
     }
 
@@ -1115 +1115 @@
 
     i = SendMessageA(GetParent (hwnd),
-             WM_NOTIFYFORMAT, hwnd, NF_QUERY);
+                     WM_NOTIFYFORMAT, hwnd, NF_QUERY);
     if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-    ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-        i);
-    i = NFR_ANSI;
+        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+            i);
+        i = NFR_ANSI;
     }
     infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
@@ -1127 +1127 @@
     /* create combo box */
     dwComboStyle = GetWindowLongA (hwnd, GWL_STYLE) &
-            (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
+                        (CBS_SIMPLE|CBS_DROPDOWN|CBS_DROPDOWNLIST|WS_CHILD);
 
     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);
+          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 |
-      WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED);
+          WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED);
 
     /* Native version of ComboEx creates the ComboBox with DROPDOWNLIST */
@@ -1147 +1147 @@
 
     infoPtr->hwndCombo = CreateWindowA ("ComboBox", "",
-             /* following line added to match native */
+                         /* following line added to match native */
                          WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_VSCROLL |
-                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST |
-             /* was base and is necessary */
-             WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
-             cs->y, cs->x, cs->cx, cs->cy, hwnd,
-             (HMENU) GetWindowLongA (hwnd, GWL_ID),
-             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
-
-    /*
+                         CBS_NOINTEGRALHEIGHT | CBS_DROPDOWNLIST | 
+                         /* was base and is necessary */
+                         WS_CHILD | WS_VISIBLE | CBS_OWNERDRAWFIXED | dwComboStyle,
+                         cs->y, cs->x, cs->cx, cs->cy, hwnd,
+                         (HMENU) GetWindowLongA (hwnd, GWL_ID),
+                         GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+
+    /* 
      * native does the following at this point according to trace:
      *  GetWindowThreadProcessId(hwndCombo,0)
@@ -1165 +1165 @@
 
     /*
-     * Setup a property to hold the pointer to the COMBOBOXEX
+     * Setup a property to hold the pointer to the COMBOBOXEX 
      * data structure.
      */
     test = GetPropA(infoPtr->hwndCombo, (LPCSTR)(LONG)ComboExInfo);
     if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-    SetPropA(infoPtr->hwndCombo, "CC32SubclassInfo", (LONG)infoPtr);
-    }
-    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndCombo,
-                            GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
+        SetPropA(infoPtr->hwndCombo, "CC32SubclassInfo", (LONG)infoPtr);
+    }
+    infoPtr->prevComboWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndCombo, 
+                                GWL_WNDPROC, (LONG)COMBOEX_ComboWndProc);
     infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
 
@@ -1182 +1182 @@
      */
     if ((cs->style & CBS_DROPDOWNLIST) == CBS_DROPDOWN) {
-    infoPtr->hwndEdit = CreateWindowExA (0, "EDIT", "",
-            WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
-            0, 0, 0, 0,  /* will set later */
-            infoPtr->hwndCombo,
-            (HMENU) GetWindowLongA (hwnd, GWL_ID),
-            GetWindowLongA (hwnd, GWL_HINSTANCE),
-            NULL);
-
-    /* native does the following at this point according to trace:
-     *  GetWindowThreadProcessId(hwndEdit,0)
-     *  GetCurrentThreadId()
-     *  GetWindowThreadProcessId(hwndEdit, &???)
-     *  GetCurrentProcessId()
-     */
-
-    /*
-     * Setup a property to hold the pointer to the COMBOBOXEX
-     * data structure.
-     */
-    test = GetPropA(infoPtr->hwndEdit, (LPCSTR)(LONG)ComboExInfo);
-    if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
-        SetPropA(infoPtr->hwndEdit, "CC32SubclassInfo", (LONG)infoPtr);
-    }
-    infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndEdit,
-                 GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
-    infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
+        infoPtr->hwndEdit = CreateWindowExA (0, "EDIT", "",
+                    WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | ES_AUTOHSCROLL,
+                    0, 0, 0, 0,  /* will set later */
+                    infoPtr->hwndCombo, 
+                    (HMENU) GetWindowLongA (hwnd, GWL_ID),
+                    GetWindowLongA (hwnd, GWL_HINSTANCE),
+                    NULL);
+
+        /* native does the following at this point according to trace:
+         *  GetWindowThreadProcessId(hwndEdit,0)
+         *  GetCurrentThreadId()
+         *  GetWindowThreadProcessId(hwndEdit, &???)
+         *  GetCurrentProcessId()
+         */
+
+        /*
+         * Setup a property to hold the pointer to the COMBOBOXEX 
+         * data structure.
+         */
+        test = GetPropA(infoPtr->hwndEdit, (LPCSTR)(LONG)ComboExInfo);
+        if (!test || ((COMBOEX_INFO *)test != infoPtr)) {
+            SetPropA(infoPtr->hwndEdit, "CC32SubclassInfo", (LONG)infoPtr);
+        }
+        infoPtr->prevEditWndProc = (WNDPROC)SetWindowLongA(infoPtr->hwndEdit, 
+                                 GWL_WNDPROC, (LONG)COMBOEX_EditWndProc);
+        infoPtr->font = SendMessageW (infoPtr->hwndCombo, WM_GETFONT, 0, 0);
     }
     else {
-    infoPtr->hwndEdit = 0;
-    infoPtr->font = 0;
+        infoPtr->hwndEdit = 0;
+        infoPtr->font = 0;
     }
 
@@ -1219 +1219 @@
      */
     if (!infoPtr->font) {
-    SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont),
-                   &mylogfont, 0);
-    infoPtr->font = CreateFontIndirectA (&mylogfont);
+        SystemParametersInfoA (SPI_GETICONTITLELOGFONT, sizeof(mylogfont), 
+                               &mylogfont, 0);
+        infoPtr->font = CreateFontIndirectA (&mylogfont);
     }
     SendMessageW (infoPtr->hwndCombo, WM_SETFONT, (WPARAM)infoPtr->font, 0);
     if (infoPtr->hwndEdit) {
-    SendMessageW (infoPtr->hwndEdit, WM_SETFONT, (WPARAM)infoPtr->font, 0);
-    SendMessageW (infoPtr->hwndEdit, EM_SETMARGINS, (WPARAM)EC_USEFONTINFO, 0);
+        SendMessageW (infoPtr->hwndEdit, WM_SETFONT, (WPARAM)infoPtr->font, 0);
+        SendMessageW (infoPtr->hwndEdit, EM_SETMARGINS, (WPARAM)EC_USEFONTINFO, 0);
     }
 
@@ -1237 +1237 @@
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
     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,
-      cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(infoPtr->hwndCombo, HWND_TOP,
-         0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top,
-         SWP_NOACTIVATE | SWP_NOREDRAW);
+          wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom,
+          clrc1.left, clrc1.top, clrc1.right, clrc1.bottom,
+          cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
+    SetWindowPos(infoPtr->hwndCombo, HWND_TOP, 
+                 0, 0, wnrc1.right-wnrc1.left, wnrc1.bottom-wnrc1.top,
+                 SWP_NOACTIVATE | SWP_NOREDRAW);
 
     GetWindowRect(infoPtr->hwndCombo, &cmbwrc);
     TRACE("CB window=(%d,%d)-(%d,%d)\n",
-      cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
-    SetWindowPos(hwnd, HWND_TOP,
-         0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
-         SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
+          cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom);
+    SetWindowPos(hwnd, HWND_TOP, 
+                 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top,
+                 SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOMOVE);
 
     COMBOEX_AdjustEditPos (infoPtr);
 
     /*
-     * Create an item structure to represent the data in the
+     * Create an item structure to represent the data in the 
      * EDIT control.
      */
@@ -1284 +1284 @@
     {
     case CBN_DROPDOWN:
-    SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
-                 (LPARAM)hwnd);
-    /*
-     * from native trace of first dropdown after typing in URL in IE4
-     *  CB_GETCURSEL(Combo)
-     *  GetWindowText(Edit)
-     *  CB_GETCURSEL(Combo)
-     *  CB_GETCOUNT(Combo)
-     *  CB_GETITEMDATA(Combo, n)
-     *  WM_NOTIFY(parent, CBEN_ENDEDITA|W)
-     *  CB_GETCURSEL(Combo)
-     *  CB_SETCURSEL(COMBOEX, n)
-     *  SetFocus(Combo)
-     * the rest is supposition
-     */
-    cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
-    if (cursel == -1) {
-        /* find match from edit against those in Combobox */
-        GetWindowTextW (infoPtr->hwndEdit, wintext, 520);
-        n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
-        for (cursel = 0; cursel < n; cursel++){
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-                             CB_GETITEMDATA,
-                             cursel, 0);
-        if ((INT)item == CB_ERR) break;
-        if (lstrcmpiW(item->pszText, wintext) == 0) break;
-        }
-        if ((cursel == n) || ((INT)item == CB_ERR)) {
-        TRACE("failed to find match??? item=%p cursel=%d\n",
-              item, cursel);
-        if (infoPtr->hwndEdit)
-            SetFocus(infoPtr->hwndEdit);
-        return 0;
-        }
-    }
-    else {
-        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-                         CB_GETITEMDATA,
-                         cursel, 0);
-        if ((INT)item == CB_ERR) {
-        TRACE("failed to find match??? item=%p cursel=%d\n",
-              item, cursel);
-        if (infoPtr->hwndEdit)
-            SetFocus(infoPtr->hwndEdit);
-        return 0;
-        }
-    }
-
-    /* Save flags for testing and reset them */
-    oldflags = infoPtr->flags;
-    infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-
-    if (oldflags & WCBE_ACTEDIT) {
-        cbeend.fChanged = (oldflags & WCBE_EDITCHG);
-        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                         CB_GETCURSEL, 0, 0);
-        cbeend.iWhy = CBENF_DROPDOWN;
-
-        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, item->pszText)) {
-        /* abort the change */
-        TRACE("Notify requested abort of change\n");
-        return 0;
-        }
-    }
-
-    /* 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;
+        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
+                             (LPARAM)hwnd);
+        /*
+         * from native trace of first dropdown after typing in URL in IE4 
+         *  CB_GETCURSEL(Combo)
+         *  GetWindowText(Edit)
+         *  CB_GETCURSEL(Combo)
+         *  CB_GETCOUNT(Combo)
+         *  CB_GETITEMDATA(Combo, n)
+         *  WM_NOTIFY(parent, CBEN_ENDEDITA|W)
+         *  CB_GETCURSEL(Combo)
+         *  CB_SETCURSEL(COMBOEX, n)
+         *  SetFocus(Combo)
+         * the rest is supposition  
+         */
+        cursel = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+        if (cursel == -1) {
+            /* find match from edit against those in Combobox */
+            GetWindowTextW (infoPtr->hwndEdit, wintext, 520);
+            n = SendMessageW (infoPtr->hwndCombo, CB_GETCOUNT, 0, 0);
+            for (cursel = 0; cursel < n; cursel++){
+                item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
+                                                     CB_GETITEMDATA, 
+                                                     cursel, 0);
+                if ((INT)item == CB_ERR) break;
+                if (lstrcmpiW(item->pszText, wintext) == 0) break;
+            }
+            if ((cursel == n) || ((INT)item == CB_ERR)) {
+                TRACE("failed to find match??? item=%p cursel=%d\n",
+                      item, cursel);
+                if (infoPtr->hwndEdit)
+                    SetFocus(infoPtr->hwndEdit);
+                return 0;
+            }
+        }
+        else {
+            item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo, 
+                                                 CB_GETITEMDATA, 
+                                                 cursel, 0);
+            if ((INT)item == CB_ERR) {
+                TRACE("failed to find match??? item=%p cursel=%d\n",
+                      item, cursel);
+                if (infoPtr->hwndEdit)
+                    SetFocus(infoPtr->hwndEdit);
+                return 0;
+            }
+        }
+
+        /* Save flags for testing and reset them */
+        oldflags = infoPtr->flags;
+        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+        if (oldflags & WCBE_ACTEDIT) {
+            cbeend.fChanged = (oldflags & WCBE_EDITCHG);
+            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                                                 CB_GETCURSEL, 0, 0);
+            cbeend.iWhy = CBENF_DROPDOWN;
+
+            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, item->pszText)) {
+                /* abort the change */
+                TRACE("Notify requested abort of change\n");
+                return 0;
+            }
+        }
+
+        /* 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;
 
     case CBN_SELCHANGE:
-    /*
-     * CB_GETCURSEL(Combo)
-     * CB_GETITEMDATA(Combo)   < simulated by COMBOEX_FindItem
-     * lstrlenA
-     * WM_SETTEXT(Edit)
-     * WM_GETTEXTLENGTH(Edit)
-     * WM_GETTEXT(Edit)
-     * EM_SETSEL(Edit, 0,0)
-     * WM_GETTEXTLENGTH(Edit)
-     * WM_GETTEXT(Edit)
-     * EM_SETSEL(Edit, 0,len)
-     * return WM_COMMAND to parent
-     */
-    oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
-    if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
-        ERR("item %d not found. Problem!\n", oldItem);
-        break;
-    }
-    infoPtr->selected = oldItem;
-    COMBOEX_SetEditText (infoPtr, item);
-    return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
-                 (LPARAM)hwnd);
+        /*
+         * CB_GETCURSEL(Combo)
+         * CB_GETITEMDATA(Combo)   < simulated by COMBOEX_FindItem
+         * lstrlenA
+         * WM_SETTEXT(Edit)
+         * WM_GETTEXTLENGTH(Edit)
+         * WM_GETTEXT(Edit)
+         * EM_SETSEL(Edit, 0,0)
+         * WM_GETTEXTLENGTH(Edit)
+         * WM_GETTEXT(Edit)
+         * EM_SETSEL(Edit, 0,len)
+         * return WM_COMMAND to parent
+         */
+        oldItem = SendMessageW (infoPtr->hwndCombo, CB_GETCURSEL, 0, 0);
+        if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
+            ERR("item %d not found. Problem!\n", oldItem);
+            break;
+        }
+        infoPtr->selected = oldItem;
+        COMBOEX_SetEditText (infoPtr, item);
+        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
+                             (LPARAM)hwnd);
 
     case CBN_SELENDOK:
-    /*
-     * We have to change the handle since we are the control
-     * issuing the message. IE4 depends on this.
-     */
-    return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
-                 (LPARAM)hwnd);
+        /* 
+         * We have to change the handle since we are the control
+         * issuing the message. IE4 depends on this.
+         */
+        return SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
+                             (LPARAM)hwnd);
 
     case CBN_KILLFOCUS:
-    /*
-     * from native trace:
-     *
-     *  pass to parent
-     *  WM_GETTEXT(Edit, 104)
-     *  CB_GETCURSEL(Combo) rets -1
-     *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
-     *  CB_GETCURSEL(Combo)
-     *  InvalidateRect(Combo, 0, 0)
-     *  return 0
-     */
-    SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
-                 (LPARAM)hwnd);
-    if (infoPtr->flags & WCBE_ACTEDIT) {
-        GetWindowTextW (infoPtr->hwndEdit, wintext, 260);
-        cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
-        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                         CB_GETCURSEL, 0, 0);
-        cbeend.iWhy = CBENF_KILLFOCUS;
-
-        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) {
-        /* abort the change */
-        TRACE("Notify requested abort of change\n");
-        return 0;
-        }
-    }
-    /* possible CB_GETCURSEL */
-    InvalidateRect (infoPtr->hwndCombo, 0, 0);
-    return 0;
+        /*
+         * from native trace:
+         *
+         *  pass to parent
+         *  WM_GETTEXT(Edit, 104)
+         *  CB_GETCURSEL(Combo) rets -1
+         *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
+         *  CB_GETCURSEL(Combo)
+         *  InvalidateRect(Combo, 0, 0)
+         *  return 0
+         */
+        SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
+                             (LPARAM)hwnd);
+        if (infoPtr->flags & WCBE_ACTEDIT) {
+            GetWindowTextW (infoPtr->hwndEdit, wintext, 260);
+            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                                                 CB_GETCURSEL, 0, 0);
+            cbeend.iWhy = CBENF_KILLFOCUS;
+
+            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, wintext)) {
+                /* abort the change */
+                TRACE("Notify requested abort of change\n");
+                return 0;
+            }
+        }
+        /* possible CB_GETCURSEL */
+        InvalidateRect (infoPtr->hwndCombo, 0, 0);
+        return 0;
 
     case CBN_CLOSEUP:
     default:
-    /*
-     * We have to change the handle since we are the control
-     * issuing the message. IE4 depends on this.
-     * We also need to set the focus back to the Edit control
-     * after passing the command to the parent of the ComboEx.
-     */
-    lret = SendMessageW (GetParent (hwnd), WM_COMMAND, wParam,
-                 (LPARAM)hwnd);
-    if (infoPtr->hwndEdit)
-        SetFocus(infoPtr->hwndEdit);
-    return lret;
+        /* 
+         * We have to change the handle since we are the control
+         * issuing the message. IE4 depends on this.
+         * We also need to set the focus back to the Edit control
+         * after passing the command to the parent of the ComboEx.
+         */
+        lret = SendMessageW (GetParent (hwnd), WM_COMMAND, wParam, 
+                             (LPARAM)hwnd);
+        if (infoPtr->hwndEdit)
+            SetFocus(infoPtr->hwndEdit);
+        return lret;
     }
     return 0;
@@ -1450 +1450 @@
 
     TRACE("CtlType=%08x, CtlID=%08x, itemID=%08x, hwnd=%x, data=%08lx\n",
-      dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
+          dis->CtlType, dis->CtlID, dis->itemID, dis->hwndItem, dis->itemData);
 
     if ((dis->itemID >= infoPtr->nb_items) || (dis->itemID < 0)) return FALSE;
@@ -1458 +1458 @@
 
     if (i == dis->itemID) {
-    infoPtr->items = infoPtr->items->next;
+        infoPtr->items = infoPtr->items->next;
     }
     else {
-    item = olditem;
-    i--;
-
-    /* find the prior item in the list */
-    while (item->next && (i > dis->itemID)) {
-        item = (CBE_ITEMDATA *)item->next;
-        i--;
-    }
-    if (!item->next || (i != dis->itemID)) {
-        FIXME("COMBOBOXEX item structures broken. Please report!\n");
-        return FALSE;
-    }
-    olditem = item->next;
-    item->next = (CBE_ITEMDATA *)((CBE_ITEMDATA *)item->next)->next;
+        item = olditem;
+        i--;
+
+        /* find the prior item in the list */
+        while (item->next && (i > dis->itemID)) {
+            item = (CBE_ITEMDATA *)item->next;
+            i--;
+        }
+        if (!item->next || (i != dis->itemID)) {
+            FIXME("COMBOBOXEX item structures broken. Please report!\n");
+            return FALSE;
+        }
+        olditem = item->next;
+        item->next = (CBE_ITEMDATA *)((CBE_ITEMDATA *)item->next)->next;
     }
     infoPtr->nb_items--;
@@ -1482 +1482 @@
 
     if (olditem->pszText)
-    COMCTL32_Free(olditem->pszText);
+        COMCTL32_Free(olditem->pszText);
     COMCTL32_Free(olditem);
 
@@ -1510 +1510 @@
     /* dump the DRAWITEMSTRUCT if tracing "comboex" but not "message" */
     if (!TRACE_ON(message)) {
-    TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n",
-          dis->CtlType, dis->CtlID);
-    TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n",
-          dis->itemID, dis->itemAction, dis->itemState);
-    TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
-          dis->hwndItem, dis->hDC, dis->rcItem.left,
-          dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom,
-          dis->itemData);
+        TRACE("DRAWITEMSTRUCT: CtlType=0x%08x CtlID=0x%08x\n", 
+              dis->CtlType, dis->CtlID);
+        TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", 
+              dis->itemID, dis->itemAction, dis->itemState);
+        TRACE("hWnd=0x%04x hDC=0x%04x (%d,%d)-(%d,%d) itemData=0x%08lx\n",
+              dis->hwndItem, dis->hDC, dis->rcItem.left, 
+              dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, 
+              dis->itemData);
     }
 
@@ -1532 +1532 @@
     /*      though the list box or combo box has the focus.             */
     if (dis->itemID == 0xffffffff) {
-    if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) ||
-         ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) {
-
-        TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n",
-          dis->rcItem.left, dis->rcItem.top,
-          dis->rcItem.right, dis->rcItem.bottom);
-    }
-    else if ((dis->CtlType == ODT_COMBOBOX) &&
-         (dis->itemAction == ODA_DRAWENTIRE)) {
-        /* draw of edit control data */
-
-        /* testing */
-        {
-        RECT exrc, cbrc, edrc;
-        GetWindowRect (hwnd, &exrc);
-        GetWindowRect (infoPtr->hwndCombo, &cbrc);
-        edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
-        if (infoPtr->hwndEdit)
-            GetWindowRect (infoPtr->hwndEdit, &edrc);
-        TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n",
-              exrc.left, exrc.top, exrc.right, exrc.bottom,
-              cbrc.left, cbrc.top, cbrc.right, cbrc.bottom,
-              edrc.left, edrc.top, edrc.right, edrc.bottom);
-        }
-    }
-    else {
-        ERR("NOT drawing item  -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n",
-        dis->rcItem.left, dis->rcItem.top,
-        dis->rcItem.right, dis->rcItem.bottom,
-        dis->itemAction, dis->itemState);
-        return 0;
-    }
+        if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) ||
+             ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { 
+
+            TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n",
+                  dis->rcItem.left, dis->rcItem.top,
+                  dis->rcItem.right, dis->rcItem.bottom);
+        }
+        else if ((dis->CtlType == ODT_COMBOBOX) && 
+                 (dis->itemAction == ODA_DRAWENTIRE)) {
+            /* draw of edit control data */
+
+            /* testing */
+            {
+                RECT exrc, cbrc, edrc;
+                GetWindowRect (hwnd, &exrc);
+                GetWindowRect (infoPtr->hwndCombo, &cbrc);
+                edrc.left=edrc.top=edrc.right=edrc.bottom=-1;
+                if (infoPtr->hwndEdit)
+                    GetWindowRect (infoPtr->hwndEdit, &edrc);
+                TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n",
+                      exrc.left, exrc.top, exrc.right, exrc.bottom,
+                      cbrc.left, cbrc.top, cbrc.right, cbrc.bottom,
+                      edrc.left, edrc.top, edrc.right, edrc.bottom);
+            }
+        }
+        else {
+            ERR("NOT drawing item  -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n",
+                dis->rcItem.left, dis->rcItem.top,
+                dis->rcItem.right, dis->rcItem.bottom,
+                dis->itemAction, dis->itemState);
+            return 0;
+        }
     }
 
     /* If draw item is -1 (edit control) setup the item pointer */
     if (dis->itemID == 0xffffffff) {
-    CHAR str[260];
-    INT wlen, alen;
-
-    item = infoPtr->edit;
-
-    if (infoPtr->hwndEdit) {
-
-        /* free previous text of edit item */
-        if (item->pszText) {
-        COMCTL32_Free(item->pszText);
-        item->pszText = 0;
-        item->mask &= ~CBEIF_TEXT;
-        }
-        alen = SendMessageA (infoPtr->hwndEdit, WM_GETTEXT, 260, (LPARAM)&str);
-        TRACE("edit control hwndEdit=%0x, text len=%d str=<%s>\n",
-          infoPtr->hwndEdit, alen, str);
-        if (alen > 0) {
-        item->mask |= CBEIF_TEXT;
-        wlen = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
-        if (wlen > 0) {
-            item->pszText = (LPWSTR)COMCTL32_Alloc ((wlen + 1)*sizeof(WCHAR));
-            MultiByteToWideChar (CP_ACP, 0, str, -1, item->pszText, wlen);
-        }
-        }
-    }
+        CHAR str[260];
+        INT wlen, alen;
+
+        item = infoPtr->edit;
+
+        if (infoPtr->hwndEdit) {
+
+            /* free previous text of edit item */
+            if (item->pszText) {
+                COMCTL32_Free(item->pszText);
+                item->pszText = 0;
+                item->mask &= ~CBEIF_TEXT;
+            }
+            alen = SendMessageA (infoPtr->hwndEdit, WM_GETTEXT, 260, (LPARAM)&str);
+            TRACE("edit control hwndEdit=%0x, text len=%d str=<%s>\n",
+                  infoPtr->hwndEdit, alen, str);
+            if (alen > 0) {
+                item->mask |= CBEIF_TEXT;
+                wlen = MultiByteToWideChar (CP_ACP, 0, str, -1, NULL, 0);
+                if (wlen > 0) {
+                    item->pszText = (LPWSTR)COMCTL32_Alloc ((wlen + 1)*sizeof(WCHAR));
+                    MultiByteToWideChar (CP_ACP, 0, str, -1, item->pszText, wlen);
+                }
+            }
+        }
     }
 
     /* if the item pointer is not set, then get the data and locate it */
     if (!item) {
-    item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
-                 CB_GETITEMDATA, (WPARAM)dis->itemID, 0);
-    if (item == (CBE_ITEMDATA *)CB_ERR)
-        {
-        FIXME("invalid item for id %d \n",dis->itemID);
-        return 0;
-        }
+        item = (CBE_ITEMDATA *)SendMessageW (infoPtr->hwndCombo,
+                             CB_GETITEMDATA, (WPARAM)dis->itemID, 0);
+        if (item == (CBE_ITEMDATA *)CB_ERR)
+            {
+                FIXME("invalid item for id %d \n",dis->itemID);
+                return 0;
+            }
     }
 
@@ -1612 +1612 @@
         xbase += (item->iIndent * CBE_INDENT);
     if (item->mask & CBEIF_IMAGE) {
-    ImageList_GetImageInfo(infoPtr->himl, item->iImage, &iinfo);
-    xioff = (iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP);
+        ImageList_GetImageInfo(infoPtr->himl, item->iImage, &iinfo);
+        xioff = (iinfo.rcImage.right - iinfo.rcImage.left + CBE_SEP);
     }
 
@@ -1619 +1619 @@
     case ODA_FOCUS:
         if (dis->itemState & ODS_SELECTED /*1*/) {
-        if ((item->mask & CBEIF_TEXT) && item->pszText) {
-        RECT rect2;
-
-            len = strlenW (item->pszText);
-        GetTextExtentPointW (dis->hDC, item->pszText, len, &txtsize);
-        rect.left = xbase + xioff - 1;
-        rect.right = rect.left + txtsize.cx + 2;
-        rect.top = dis->rcItem.top;
-        rect.bottom = dis->rcItem.bottom;
-        GetClipBox (dis->hDC, &rect2);
-        TRACE("drawing item %d focus, rect=(%d,%d)-(%d,%d)\n",
-              dis->itemID, rect.left, rect.top,
-              rect.right, rect.bottom);
-        TRACE("                      clip=(%d,%d)-(%d,%d)\n",
-              rect2.left, rect2.top,
-              rect2.right, rect2.bottom);
-
-        DrawFocusRect(dis->hDC, &rect);
-        }
-        else {
-        FIXME("ODA_FOCUS and ODS_SELECTED but no text\n");
-        }
-    }
-    else {
-        FIXME("ODA_FOCUS but not ODS_SELECTED\n");
-    }
+            if ((item->mask & CBEIF_TEXT) && item->pszText) {
+                RECT rect2;
+
+                len = strlenW (item->pszText);
+                GetTextExtentPointW (dis->hDC, item->pszText, len, &txtsize);
+                rect.left = xbase + xioff - 1;
+                rect.right = rect.left + txtsize.cx + 2;
+                rect.top = dis->rcItem.top;
+                rect.bottom = dis->rcItem.bottom;
+                GetClipBox (dis->hDC, &rect2);
+                TRACE("drawing item %d focus, rect=(%d,%d)-(%d,%d)\n",
+                      dis->itemID, rect.left, rect.top,
+                      rect.right, rect.bottom);
+                TRACE("                      clip=(%d,%d)-(%d,%d)\n",
+                      rect2.left, rect2.top,
+                      rect2.right, rect2.bottom);
+
+                DrawFocusRect(dis->hDC, &rect);
+            }
+            else {
+                FIXME("ODA_FOCUS and ODS_SELECTED but no text\n");
+            }
+        }
+        else {
+            FIXME("ODA_FOCUS but not ODS_SELECTED\n");
+        }
         break;
     case ODA_SELECT:
     case ODA_DRAWENTIRE:
         drawimage = -1;
-    drawstate = ILD_NORMAL;
-    if (!(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE)) {
-        if (item->mask & CBEIF_IMAGE)
-        drawimage = item->iImage;
-        if (dis->itemState & ODS_COMBOEXLBOX) {
-        /* drawing listbox entry */
-        if (dis->itemState & ODS_SELECTED) {
-            if (item->mask & CBEIF_SELECTEDIMAGE)
-            drawimage = item->iSelectedImage;
-            drawstate = ILD_SELECTED;
-        }
-        }
-        else {
-        /* drawing combo/edit entry */
-        if (infoPtr->hwndEdit) {
-            /* if we have an edit control, the slave the
-                     * selection state to the Edit focus state
-             */
-            if (infoPtr->flags & WCBE_EDITFOCUSED) {
-            if (item->mask & CBEIF_SELECTEDIMAGE)
-                drawimage = item->iSelectedImage;
-            drawstate = ILD_SELECTED;
-            }
-        }
-        else {
-            /* if we don't have an edit control, use
-             * the requested state.
-             */
-            if (dis->itemState & ODS_SELECTED) {
-            if (item->mask & CBEIF_SELECTEDIMAGE)
-                drawimage = item->iSelectedImage;
-            drawstate = ILD_SELECTED;
-            }
-        }
-        }
-    }
-    if (drawimage != -1) {
-        TRACE("drawing image state=%d\n", dis->itemState & ODS_SELECTED);
-        ImageList_Draw (infoPtr->himl, drawimage, dis->hDC,
-                xbase, dis->rcItem.top, drawstate);
-    }
-
-    /* setup pointer to text to be drawn */
-    if ((item->mask & CBEIF_TEXT) && item->pszText)
-        str = item->pszText;
-    else
-        str = (LPWSTR) L"";
-
-    /* now draw the text */
-    len = lstrlenW (str);
-    GetTextExtentPointW (dis->hDC, str, len, &txtsize);
-    nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                COLOR_HIGHLIGHT : COLOR_WINDOW);
-    SetBkColor (dis->hDC, nbkc);
-    ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
-                COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
-    SetTextColor (dis->hDC, ntxc);
-    x = xbase + xioff;
-    y = dis->rcItem.top +
-        (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
-    rect.left = x;
-    rect.right = x + txtsize.cx;
-    rect.top = dis->rcItem.top + 1;
-    rect.bottom = dis->rcItem.bottom - 1;
-    TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
-          dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-    ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
-             &rect, str, len, 0);
-    if (dis->itemState & ODS_FOCUS) {
-        rect.top -= 1;
-        rect.bottom += 1;
-        rect.left -= 1;
-        rect.right += 1;
-        TRACE("drawing item %d focus after text, rect=(%d,%d)-(%d,%d)\n",
-          dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
-        DrawFocusRect (dis->hDC, &rect);
-    }
-    break;
+        drawstate = ILD_NORMAL;
+        if (!(infoPtr->dwExtStyle & CBES_EX_NOEDITIMAGE)) {
+            if (item->mask & CBEIF_IMAGE) 
+                drawimage = item->iImage;
+            if (dis->itemState & ODS_COMBOEXLBOX) {
+                /* drawing listbox entry */
+                if (dis->itemState & ODS_SELECTED) {
+                    if (item->mask & CBEIF_SELECTEDIMAGE)
+                        drawimage = item->iSelectedImage;
+                    drawstate = ILD_SELECTED;
+                }
+            }
+            else {
+                /* drawing combo/edit entry */
+                if (infoPtr->hwndEdit) {
+                    /* if we have an edit control, the slave the 
+                     * selection state to the Edit focus state 
+                     */
+                    if (infoPtr->flags & WCBE_EDITFOCUSED) {
+                        if (item->mask & CBEIF_SELECTEDIMAGE)
+                            drawimage = item->iSelectedImage;
+                        drawstate = ILD_SELECTED;
+                    }
+                }
+                else {
+                    /* if we don't have an edit control, use 
+                     * the requested state.
+                     */
+                    if (dis->itemState & ODS_SELECTED) {
+                        if (item->mask & CBEIF_SELECTEDIMAGE)
+                            drawimage = item->iSelectedImage;
+                        drawstate = ILD_SELECTED;
+                    }
+                }
+            }
+        }
+        if (drawimage != -1) {
+            TRACE("drawing image state=%d\n", dis->itemState & ODS_SELECTED);
+            ImageList_Draw (infoPtr->himl, drawimage, dis->hDC, 
+                            xbase, dis->rcItem.top, drawstate);
+        }
+
+        /* setup pointer to text to be drawn */
+        if ((item->mask & CBEIF_TEXT) && item->pszText)
+            str = item->pszText;
+        else
+            str = (LPWSTR) L"";
+
+        /* now draw the text */
+        len = lstrlenW (str);
+        GetTextExtentPointW (dis->hDC, str, len, &txtsize);
+        nbkc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                            COLOR_HIGHLIGHT : COLOR_WINDOW);
+        SetBkColor (dis->hDC, nbkc);
+        ntxc = GetSysColor ((dis->itemState & ODS_SELECTED) ?
+                            COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT);
+        SetTextColor (dis->hDC, ntxc);
+        x = xbase + xioff;
+        y = dis->rcItem.top +
+            (dis->rcItem.bottom - dis->rcItem.top - txtsize.cy) / 2;
+        rect.left = x;
+        rect.right = x + txtsize.cx;
+        rect.top = dis->rcItem.top + 1;
+        rect.bottom = dis->rcItem.bottom - 1;
+        TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n",
+              dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
+        ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED,
+                     &rect, str, len, 0);
+        if (dis->itemState & ODS_FOCUS) {
+            rect.top -= 1;
+            rect.bottom += 1;
+            rect.left -= 1;
+            rect.right += 1;
+            TRACE("drawing item %d focus after text, rect=(%d,%d)-(%d,%d)\n",
+                  dis->itemID, rect.left, rect.top, rect.right, rect.bottom);
+            DrawFocusRect (dis->hDC, &rect);
+        }
+        break;
     default:
-        FIXME("unknown action hwnd=%08x, wparam=%08x, lparam=%08lx, action=%d\n",
-          hwnd, wParam, lParam, dis->itemAction);
+        FIXME("unknown action hwnd=%08x, wparam=%08x, lparam=%08lx, action=%d\n", 
+              hwnd, wParam, lParam, dis->itemAction);
     }
 
@@ -1742 +1742 @@
 
     if (infoPtr->hwndCombo)
-    DestroyWindow (infoPtr->hwndCombo);
+        DestroyWindow (infoPtr->hwndCombo);
 
     if (infoPtr->edit) {
-    COMCTL32_Free (infoPtr->edit);
-    infoPtr->edit = 0;
+        COMCTL32_Free (infoPtr->edit);
+        infoPtr->edit = 0;
     }
 
@@ -1752 +1752 @@
         CBE_ITEMDATA *this, *next;
 
-    this = infoPtr->items;
-    while (this) {
-        next = (CBE_ITEMDATA *)this->next;
-        if ((this->mask & CBEIF_TEXT) && this->pszText)
-            COMCTL32_Free (this->pszText);
-        COMCTL32_Free (this);
-        this = next;
-    }
+        this = infoPtr->items;
+        while (this) {
+            next = (CBE_ITEMDATA *)this->next;
+            if ((this->mask & CBEIF_TEXT) && this->pszText)
+                COMCTL32_Free (this->pszText);
+            COMCTL32_Free (this);
+            this = next;
+        }
     }
 
@@ -1785 +1785 @@
 
     TRACE("adjusted height hwnd=%08x, height=%d\n",
-      hwnd, mis->itemHeight);
+          hwnd, mis->itemHeight);
 
     return 0;
@@ -1800 +1800 @@
     newstyle = oldstyle & ~(WS_VSCROLL | WS_HSCROLL);
     if (newstyle != oldstyle) {
-    TRACE("req style %08lx, reseting style %08lx\n",
-          oldstyle, newstyle);
-    SetWindowLongA (hwnd, GWL_STYLE, newstyle);
+        TRACE("req style %08lx, reseting style %08lx\n",
+              oldstyle, newstyle);
+        SetWindowLongA (hwnd, GWL_STYLE, newstyle);
     }
     return 1;
@@ -1815 +1815 @@
 
     if (lParam == NF_REQUERY) {
-    i = SendMessageA(GetParent (hwnd),
-             WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
-    if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
-        ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
-        i);
-        i = NFR_ANSI;
-    }
-    infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
-    return (LRESULT)i;
+        i = SendMessageA(GetParent (hwnd),
+                         WM_NOTIFYFORMAT, infoPtr->hwndSelf, NF_QUERY);
+        if ((i < NFR_ANSI) || (i > NFR_UNICODE)) {
+            ERR("wrong response to WM_NOTIFYFORMAT (%d), assuming ANSI\n",
+                i);
+            i = NFR_ANSI;
+        }
+        infoPtr->NtfUnicode = (i == NFR_UNICODE) ? 1 : 0;
+        return (LRESULT)i;
     }
     return (LRESULT)((infoPtr->bUnicode) ? NFR_UNICODE : NFR_ANSI);
@@ -1837 +1837 @@
     GetWindowRect (hwnd, &rect);
     TRACE("my rect (%d,%d)-(%d,%d)\n",
-      rect.left, rect.top, rect.right, rect.bottom);
+          rect.left, rect.top, rect.right, rect.bottom);
 
     MoveWindow (infoPtr->hwndCombo, 0, 0, rect.right -rect.left,
-          rect.bottom - rect.top, TRUE);
+                  rect.bottom - rect.top, TRUE);
 
     COMBOEX_AdjustEditPos (infoPtr);
@@ -1862 +1862 @@
     /* width is winpos value + border width of comboex */
     width = wp->cx
-        + (cbx_wrect.right-cbx_wrect.left)
-            - (cbx_crect.right-cbx_crect.left);
+            + (cbx_wrect.right-cbx_wrect.left) 
+            - (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);
+          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,
-      cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
+          cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom,
+          cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom);
     TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n",
-      cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
-      width, cb_wrect.bottom-cb_wrect.top);
+          cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom,
+          width, cb_wrect.bottom-cb_wrect.top);
 
     if (width) SetWindowPos (infoPtr->hwndCombo, HWND_TOP, 0, 0,
-                 width,
-                 cb_wrect.bottom-cb_wrect.top,
-                 SWP_NOACTIVATE);
+                             width,
+                             cb_wrect.bottom-cb_wrect.top,
+                             SWP_NOACTIVATE);
 
     GetWindowRect (infoPtr->hwndCombo, &cb_wrect);
@@ -1883 +1883 @@
     /* height is combo window height plus border width of comboex */
     height =   (cb_wrect.bottom-cb_wrect.top)
-         + (cbx_wrect.bottom-cbx_wrect.top)
+             + (cbx_wrect.bottom-cbx_wrect.top)
              - (cbx_crect.bottom-cbx_crect.top);
     if (wp->cy < height) wp->cy = height;
     if (infoPtr->hwndEdit) {
-    COMBOEX_AdjustEditPos (infoPtr);
-    InvalidateRect (infoPtr->hwndCombo, 0, TRUE);
+        COMBOEX_AdjustEditPos (infoPtr);
+        InvalidateRect (infoPtr->hwndCombo, 0, TRUE);
     }
 
@@ -1906 +1906 @@
     LRESULT lret;
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
-      hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
+          hwnd, uMsg, wParam, lParam, infoPtr);
 
     if (!infoPtr) return 0;
@@ -1915 +1915 @@
 
     case WM_CHAR:
-        /* handle (ignore) the return character */
-        if (wParam == VK_RETURN) return 0;
-        /* all other characters pass into the real Edit */
-        return CallWindowProcA (infoPtr->prevEditWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            /* handle (ignore) the return character */
+            if (wParam == VK_RETURN) return 0;
+            /* all other characters pass into the real Edit */
+            return CallWindowProcA (infoPtr->prevEditWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
 
     case WM_ERASEBKGND:
-        /*
-         * The following was determined by traces of the native
-         */
+            /*
+             * The following was determined by traces of the native 
+             */
             hDC = (HDC) wParam;
-        nbkc = GetSysColor (COLOR_WINDOW);
-        obkc = SetBkColor (hDC, nbkc);
+            nbkc = GetSysColor (COLOR_WINDOW);
+            obkc = SetBkColor (hDC, nbkc);
             GetClientRect (hwnd, &rect);
-        TRACE("erasing (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom);
-        ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
+            TRACE("erasing (%d,%d)-(%d,%d)\n",
+                  rect.left, rect.top, rect.right, rect.bottom);
+            ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-        return CallWindowProcA (infoPtr->prevEditWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            return CallWindowProcA (infoPtr->prevEditWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
 
     case WM_KEYDOWN: {
-        INT oldItem, selected;
-        CBE_ITEMDATA *item;
-
-        switch ((INT)wParam)
-        {
-        case VK_ESCAPE:
-        /* native version seems to do following for COMBOEX */
-        /*
-         *   GetWindowTextA(Edit,&?, 0x104)             x
-         *   CB_GETCURSEL to Combo rets -1              x
-         *   WM_NOTIFY to COMBOEX parent (rebar)        x
-         *     (CBEN_ENDEDIT{A|W}
-         *      fChanged = FALSE                        x
-         *      inewSelection = -1                      x
-         *      txt="www.hoho"                          x
-         *      iWhy = 3                                x
-         *   CB_GETCURSEL to Combo rets -1              x
-         *   InvalidateRect(Combo, 0)                   x
-         *   WM_SETTEXT to Edit                         x
-         *   EM_SETSEL to Edit (0,0)                    x
-         *   EM_SETSEL to Edit (0,-1)                   x
-         *   RedrawWindow(Combo, 0, 0, 5)               x
-         */
-        TRACE("special code for VK_ESCAPE\n");
-
-        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-
-        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-        cbeend.fChanged = FALSE;
-        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                             CB_GETCURSEL, 0, 0);
-        cbeend.iWhy = CBENF_ESCAPE;
-
-        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-            /* abort the change */
-            TRACE("Notify requested abort of change\n");
-            return 0;
-        }
-        oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
-        InvalidateRect (infoPtr->hwndCombo, 0, 0);
-        if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
-            ERR("item %d not found. Problem!\n", oldItem);
-            break;
-        }
-        infoPtr->selected = oldItem;
-        COMBOEX_SetEditText (infoPtr, item);
-        RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
-                  RDW_INVALIDATE);
-        break;
-
-        case VK_RETURN:
-        /* native version seems to do following for COMBOEX */
-        /*
-         *   GetWindowTextA(Edit,&?, 0x104)             x
-         *   CB_GETCURSEL to Combo  rets -1             x
-         *   CB_GETCOUNT to Combo  rets 0
-         *   if >0 loop
-         *       CB_GETITEMDATA to match
-         * *** above 3 lines simulated by FindItem      x
-         *   WM_NOTIFY to COMBOEX parent (rebar)        x
-         *     (CBEN_ENDEDIT{A|W}                       x
-         *        fChanged = TRUE (-1)                  x
-         *        iNewSelection = -1 or selected        x
-         *        txt=                                  x
-         *        iWhy = 2 (CBENF_RETURN)               x
-         *   CB_GETCURSEL to Combo  rets -1             x
-         *   if -1 send CB_SETCURSEL to Combo -1        x
-         *   InvalidateRect(Combo, 0, 0)                x
-         *   SetFocus(Edit)                             x
-         *   CallWindowProc(406615a8, Edit, 0x100, 0xd, 0x1c0001)
-         */
-
-        TRACE("special code for VK_RETURN\n");
-
-        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-
-        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-        selected = SendMessageW (infoPtr->hwndCombo,
-                     CB_GETCURSEL, 0, 0);
-
-        if (selected != -1) {
-            item = COMBOEX_FindItem (infoPtr, selected);
-            TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
-              selected, debugstr_w(item->pszText));
-            TRACE("handling VK_RETURN, edittext=%s\n",
-              debugstr_w(edit_text));
-            if (lstrcmpiW (item->pszText, edit_text)) {
-            /* strings not equal -- indicate edit has changed */
-            selected = -1;
+            INT oldItem, selected;
+            CBE_ITEMDATA *item;
+
+            switch ((INT)wParam)
+            {
+            case VK_ESCAPE:
+                /* native version seems to do following for COMBOEX */
+                /*
+                 *   GetWindowTextA(Edit,&?, 0x104)             x
+                 *   CB_GETCURSEL to Combo rets -1              x
+                 *   WM_NOTIFY to COMBOEX parent (rebar)        x
+                 *     (CBEN_ENDEDIT{A|W} 
+                 *      fChanged = FALSE                        x
+                 *      inewSelection = -1                      x
+                 *      txt="www.hoho"                          x
+                 *      iWhy = 3                                x
+                 *   CB_GETCURSEL to Combo rets -1              x
+                 *   InvalidateRect(Combo, 0)                   x
+                 *   WM_SETTEXT to Edit                         x
+                 *   EM_SETSEL to Edit (0,0)                    x
+                 *   EM_SETSEL to Edit (0,-1)                   x
+                 *   RedrawWindow(Combo, 0, 0, 5)               x
+                 */
+                TRACE("special code for VK_ESCAPE\n");
+
+                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+
+                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+                cbeend.fChanged = FALSE;
+                cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                                                     CB_GETCURSEL, 0, 0);
+                cbeend.iWhy = CBENF_ESCAPE;
+
+                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+                    /* abort the change */
+                    TRACE("Notify requested abort of change\n");
+                    return 0;
+                }
+                oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
+                InvalidateRect (infoPtr->hwndCombo, 0, 0);
+                if (!(item = COMBOEX_FindItem(infoPtr, oldItem))) {
+                    ERR("item %d not found. Problem!\n", oldItem);
+                    break;
+                }
+                infoPtr->selected = oldItem;              
+                COMBOEX_SetEditText (infoPtr, item);
+                RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
+                              RDW_INVALIDATE);
+                break;
+
+            case VK_RETURN:
+                /* native version seems to do following for COMBOEX */
+                /*
+                 *   GetWindowTextA(Edit,&?, 0x104)             x
+                 *   CB_GETCURSEL to Combo  rets -1             x
+                 *   CB_GETCOUNT to Combo  rets 0
+                 *   if >0 loop 
+                 *       CB_GETITEMDATA to match
+                 * *** above 3 lines simulated by FindItem      x  
+                 *   WM_NOTIFY to COMBOEX parent (rebar)        x
+                 *     (CBEN_ENDEDIT{A|W}                       x
+                 *        fChanged = TRUE (-1)                  x
+                 *        iNewSelection = -1 or selected        x
+                 *        txt=                                  x
+                 *        iWhy = 2 (CBENF_RETURN)               x
+                 *   CB_GETCURSEL to Combo  rets -1             x
+                 *   if -1 send CB_SETCURSEL to Combo -1        x
+                 *   InvalidateRect(Combo, 0, 0)                x
+                 *   SetFocus(Edit)                             x
+                 *   CallWindowProc(406615a8, Edit, 0x100, 0xd, 0x1c0001)
+                 */
+
+                TRACE("special code for VK_RETURN\n");
+
+                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+
+                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+                selected = SendMessageW (infoPtr->hwndCombo,
+                                         CB_GETCURSEL, 0, 0);
+
+                if (selected != -1) {
+                    item = COMBOEX_FindItem (infoPtr, selected);
+                    TRACE("handling VK_RETURN, selected = %d, selected_text=%s\n",
+                          selected, debugstr_w(item->pszText));
+                    TRACE("handling VK_RETURN, edittext=%s\n",
+                          debugstr_w(edit_text));
+                    if (lstrcmpiW (item->pszText, edit_text)) {
+                        /* strings not equal -- indicate edit has changed */
+                        selected = -1;
+                    }
+                }
+
+                cbeend.iNewSelection = selected;
+                cbeend.fChanged = TRUE; 
+                cbeend.iWhy = CBENF_RETURN;
+                if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+                    /* abort the change, restore previous */
+                    TRACE("Notify requested abort of change\n");
+                    COMBOEX_SetEditText (infoPtr, infoPtr->edit);
+                    RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE | 
+                                  RDW_INVALIDATE);
+                    return 0;
+                }
+                oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
+                if (oldItem != -1) {
+                    /* if something is selected, then deselect it */
+                    SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL, 
+                                  (WPARAM)-1, 0);
+                }
+                InvalidateRect (infoPtr->hwndCombo, 0, 0);
+                SetFocus(infoPtr->hwndEdit);
+                break;
+
+            default:
+                return CallWindowProcA (infoPtr->prevEditWndProc,
+                                       hwnd, uMsg, wParam, lParam);
+            }
+            return 0;
             }
-        }
-
-        cbeend.iNewSelection = selected;
-        cbeend.fChanged = TRUE;
-        cbeend.iWhy = CBENF_RETURN;
-        if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-            /* abort the change, restore previous */
-            TRACE("Notify requested abort of change\n");
-            COMBOEX_SetEditText (infoPtr, infoPtr->edit);
-            RedrawWindow (infoPtr->hwndCombo, 0, 0, RDW_ERASE |
-                  RDW_INVALIDATE);
-            return 0;
-        }
-        oldItem = SendMessageW (infoPtr->hwndCombo,CB_GETCURSEL, 0, 0);
-        if (oldItem != -1) {
-            /* if something is selected, then deselect it */
-            SendMessageW (infoPtr->hwndCombo, CB_SETCURSEL,
-                  (WPARAM)-1, 0);
-        }
-        InvalidateRect (infoPtr->hwndCombo, 0, 0);
-        SetFocus(infoPtr->hwndEdit);
-        break;
-
-        default:
-        return CallWindowProcA (infoPtr->prevEditWndProc,
-                       hwnd, uMsg, wParam, lParam);
-        }
-        return 0;
-            }
 
     case WM_SETFOCUS:
-        /* remember the focus to set state of icon */
-        lret = CallWindowProcA (infoPtr->prevEditWndProc,
-                   hwnd, uMsg, wParam, lParam);
-        infoPtr->flags |= WCBE_EDITFOCUSED;
-        return lret;
+            /* remember the focus to set state of icon */
+            lret = CallWindowProcA (infoPtr->prevEditWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
+            infoPtr->flags |= WCBE_EDITFOCUSED;
+            return lret;
 
     case WM_KILLFOCUS:
-        /*
-         * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
-         */
-        infoPtr->flags &= ~WCBE_EDITFOCUSED;
-        if (infoPtr->flags & WCBE_ACTEDIT) {
-        infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-
-        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-        cbeend.fChanged = FALSE;
-        cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                             CB_GETCURSEL, 0, 0);
-        cbeend.iWhy = CBENF_KILLFOCUS;
-
-        COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text);
-        }
-        /* fall through */
+            /* 
+             * do NOTIFY CBEN_ENDEDIT with CBENF_KILLFOCUS
+             */
+            infoPtr->flags &= ~WCBE_EDITFOCUSED;
+            if (infoPtr->flags & WCBE_ACTEDIT) {
+                infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+
+                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+                cbeend.fChanged = FALSE;
+                cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                                                     CB_GETCURSEL, 0, 0);
+                cbeend.iWhy = CBENF_KILLFOCUS;
+
+                COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text);
+            }
+            /* fall through */
 
     default:
-        return CallWindowProcA (infoPtr->prevEditWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            return CallWindowProcA (infoPtr->prevEditWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2102 +2102 @@
     WCHAR edit_text[260];
 
-    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n",
-      hwnd, uMsg, wParam, lParam, infoPtr);
+    TRACE("hwnd=%x msg=%x wparam=%x lParam=%lx, info_ptr=%p\n", 
+          hwnd, uMsg, wParam, lParam, infoPtr);
 
     if (!infoPtr) return 0;
@@ -2111 +2111 @@
 
     case CB_FINDSTRINGEXACT:
-        return COMBOEX_FindStringExact (infoPtr, wParam, lParam);
+            return COMBOEX_FindStringExact (infoPtr, wParam, lParam);
 
     case WM_DRAWITEM:
-        /*
-         * The only way this message should come is from the
-         * child Listbox issuing the message. Flag this so
-         * that ComboEx knows this is listbox.
-         */
-        ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
-        return CallWindowProcA (infoPtr->prevComboWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            /*
+             * The only way this message should come is from the
+             * child Listbox issuing the message. Flag this so
+             * that ComboEx knows this is listbox.
+             */
+            ((DRAWITEMSTRUCT *)lParam)->itemState |= ODS_COMBOEXLBOX;
+            return CallWindowProcA (infoPtr->prevComboWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
 
     case WM_ERASEBKGND:
-        /*
-         * The following was determined by traces of the native
-         */
+            /*
+             * The following was determined by traces of the native 
+             */
             hDC = (HDC) wParam;
-        nbkc = GetSysColor (COLOR_WINDOW);
-        obkc = SetBkColor (hDC, nbkc);
+            nbkc = GetSysColor (COLOR_WINDOW);
+            obkc = SetBkColor (hDC, nbkc);
             GetClientRect (hwnd, &rect);
-        TRACE("erasing (%d,%d)-(%d,%d)\n",
-          rect.left, rect.top, rect.right, rect.bottom);
-        ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
+            TRACE("erasing (%d,%d)-(%d,%d)\n",
+                  rect.left, rect.top, rect.right, rect.bottom);
+            ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0);
             SetBkColor (hDC, obkc);
-        return CallWindowProcA (infoPtr->prevComboWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            return CallWindowProcA (infoPtr->prevComboWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
 
     case WM_SETCURSOR:
-        /*
-         *  WM_NOTIFY to comboex parent (rebar)
-         *   with NM_SETCURSOR with extra words of 0,0,0,0,0x02010001
-         *  CallWindowProc (previous)
-         */
-        nmmse.dwItemSpec = 0;
-        nmmse.dwItemData = 0;
-        nmmse.pt.x = 0;
-        nmmse.pt.y = 0;
-        nmmse.dwHitInfo = lParam;
-        COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
-        return CallWindowProcA (infoPtr->prevComboWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            /*
+             *  WM_NOTIFY to comboex parent (rebar)
+             *   with NM_SETCURSOR with extra words of 0,0,0,0,0x02010001
+             *  CallWindowProc (previous)
+             */
+            nmmse.dwItemSpec = 0;
+            nmmse.dwItemData = 0;
+            nmmse.pt.x = 0;
+            nmmse.pt.y = 0;
+            nmmse.dwHitInfo = lParam;
+            COMBOEX_Notify (infoPtr, NM_SETCURSOR, (NMHDR *)&nmmse);
+            return CallWindowProcA (infoPtr->prevComboWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
 
     case WM_COMMAND:
-        switch (HIWORD(wParam)) {
-
-        case EN_UPDATE:
-        /* traces show that COMBOEX does not issue CBN_EDITUPDATE
-         * on the EN_UPDATE
-         */
-        return 0;
-
-        case EN_KILLFOCUS:
-        /*
-         * Native does:
-         *
-         *  GetFocus() retns AA
-         *  GetWindowTextA(Edit)
-         *  CB_GETCURSEL(Combo) (got -1)
-         *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
-         *  CB_GETCURSEL(Combo) (got -1)
-         *  InvalidateRect(Combo, 0, 0)
-         *  WM_KILLFOCUS(Combo, AA)
-         *  return 0;
-         */
-        focusedhwnd = GetFocus();
-        if (infoPtr->flags & WCBE_ACTEDIT) {
-            GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-            cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
-            cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
-                             CB_GETCURSEL, 0, 0);
-            cbeend.iWhy = CBENF_KILLFOCUS;
-
-            infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
-            if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
-            /* abort the change */
-            TRACE("Notify requested abort of change\n");
-            return 0;
-            }
-        }
-        /* possible CB_GETCURSEL */
-        InvalidateRect (infoPtr->hwndCombo, 0, 0);
-        if (focusedhwnd)
-            SendMessageW (infoPtr->hwndCombo, WM_KILLFOCUS,
-                  (WPARAM)focusedhwnd, 0);
-        return 0;
-
-        case EN_SETFOCUS: {
-        /*
-         * For EN_SETFOCUS this issues the same calls and messages
-         *  as the native seems to do.
-         *
-         * for some cases however native does the following:
-         *   (noticed after SetFocus during LBUTTONDOWN on
-         *    on dropdown arrow)
-         *  WM_GETTEXTLENGTH (Edit);
-         *  WM_GETTEXT (Edit, len+1, str);
-         *  EM_SETSEL (Edit, 0, 0);
-         *  WM_GETTEXTLENGTH (Edit);
-         *  WM_GETTEXT (Edit, len+1, str);
-         *  EM_SETSEL (Edit, 0, len);
-         *  WM_NOTIFY (parent, CBEN_BEGINEDIT)
-         */
-        NMHDR hdr;
-
-        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
-        SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
-        COMBOEX_Notify (infoPtr, CBEN_BEGINEDIT, &hdr);
-        infoPtr->flags |= WCBE_ACTEDIT;
-        infoPtr->flags &= ~WCBE_EDITCHG; /* no change yet */
-        return 0;
-            }
-
-        case EN_CHANGE: {
-        /*
-         * For EN_CHANGE this issues the same calls and messages
-         *  as the native seems to do.
-         */
-        WCHAR edit_text[260];
-        WCHAR *lastwrk;
-        INT selected, cnt;
-        CBE_ITEMDATA *item;
-
-        selected = SendMessageW (infoPtr->hwndCombo,
-                     CB_GETCURSEL, 0, 0);
-
-        /* lstrlenA( lastworkingURL ) */
-
-        GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
-        if (selected == -1) {
-            lastwrk = infoPtr->edit->pszText;
-            cnt = lstrlenW (lastwrk);
-            if (cnt >= 259) cnt = 259;
-        }
-        else {
-            item = COMBOEX_FindItem (infoPtr, selected);
-            cnt = lstrlenW (item->pszText);
-            lastwrk = item->pszText;
-            if (cnt >= 259) cnt = 259;
-        }
-
-        TRACE("handling EN_CHANGE, selected = %d, selected_text=%s\n",
-            selected, debugstr_w(lastwrk));
-        TRACE("handling EN_CHANGE, edittext=%s\n",
-              debugstr_w(edit_text));
-
-        /* lstrcmpiW is between lastworkingURL and GetWindowText */
-
-        if (lstrcmpiW (lastwrk, edit_text)) {
-            /* strings not equal -- indicate edit has changed */
-            infoPtr->flags |= WCBE_EDITCHG;
-        }
-        SendMessageW ( GetParent(infoPtr->hwndSelf), WM_COMMAND,
-                   MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
-                      CBN_EDITCHANGE),
-                   infoPtr->hwndSelf);
-        return 0;
-            }
-
-        case LBN_SELCHANGE:
-        /*
-         * Therefore from traces there is no additional code here
-         */
-
-        /*
-         * Using native COMCTL32 gets the following:
-         *  1 == SHDOCVW.DLL  issues call/message
-         *  2 == COMCTL32.DLL  issues call/message
-         *  3 == WINE  issues call/message
-         *
-         *
-         * for LBN_SELCHANGE:
-         *    1  CB_GETCURSEL(ComboEx)
-         *    1  CB_GETDROPPEDSTATE(ComboEx)
-         *    1  CallWindowProc( *2* for WM_COMMAND(LBN_SELCHANGE)
-         *    2  CallWindowProc( *3* for WM_COMMAND(LBN_SELCHANGE)
-         **   call CBRollUp( xxx, TRUE for LBN_SELCHANGE, TRUE)
-         *    3  WM_COMMAND(ComboEx, CBN_SELENDOK)
-         *      WM_USER+49(ComboLB, 1,0)  <=============!!!!!!!!!!!
-         *    3  ShowWindow(ComboLB, SW_HIDE)
-         *    3  RedrawWindow(Combo,  RDW_UPDATENOW)
-         *    3  WM_COMMAND(ComboEX, CBN_CLOSEUP)
-         **   end of CBRollUp
-         *    3  WM_COMMAND(ComboEx, CBN_SELCHANGE)  (echo to parent)
-         *    ?  LB_GETCURSEL              <==|
-         *    ?  LB_GETTEXTLEN                |
-         *    ?  LB_GETTEXT                   | Needs to be added to
-         *    ?  WM_CTLCOLOREDIT(ComboEx)     | Combo processing
-         *    ?  LB_GETITEMDATA               |
-         *    ?  WM_DRAWITEM(ComboEx)      <==|
-         */
-        default:
-        break;
-        }/* fall through */
+            switch (HIWORD(wParam)) {
+
+            case EN_UPDATE:
+                /* traces show that COMBOEX does not issue CBN_EDITUPDATE
+                 * on the EN_UPDATE
+                 */
+                return 0;
+
+            case EN_KILLFOCUS:
+                /*
+                 * Native does:
+                 *
+                 *  GetFocus() retns AA
+                 *  GetWindowTextA(Edit)
+                 *  CB_GETCURSEL(Combo) (got -1)
+                 *  WM_NOTIFY(CBEN_ENDEDITA) with CBENF_KILLFOCUS
+                 *  CB_GETCURSEL(Combo) (got -1)
+                 *  InvalidateRect(Combo, 0, 0)
+                 *  WM_KILLFOCUS(Combo, AA)
+                 *  return 0;
+                 */
+                focusedhwnd = GetFocus();
+                if (infoPtr->flags & WCBE_ACTEDIT) {
+                    GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+                    cbeend.fChanged = (infoPtr->flags & WCBE_EDITCHG);
+                    cbeend.iNewSelection = SendMessageW (infoPtr->hwndCombo,
+                                                         CB_GETCURSEL, 0, 0);
+                    cbeend.iWhy = CBENF_KILLFOCUS;
+
+                    infoPtr->flags &= ~(WCBE_ACTEDIT | WCBE_EDITCHG);
+                    if (COMBOEX_NotifyEndEdit (infoPtr, &cbeend, edit_text)) {
+                        /* abort the change */
+                        TRACE("Notify requested abort of change\n");
+                        return 0;
+                    }
+                }
+                /* possible CB_GETCURSEL */
+                InvalidateRect (infoPtr->hwndCombo, 0, 0);
+                if (focusedhwnd)
+                    SendMessageW (infoPtr->hwndCombo, WM_KILLFOCUS,
+                                  (WPARAM)focusedhwnd, 0); 
+                return 0;
+
+            case EN_SETFOCUS: {
+                /* 
+                 * For EN_SETFOCUS this issues the same calls and messages
+                 *  as the native seems to do.
+                 *
+                 * for some cases however native does the following:
+                 *   (noticed after SetFocus during LBUTTONDOWN on
+                 *    on dropdown arrow)
+                 *  WM_GETTEXTLENGTH (Edit);
+                 *  WM_GETTEXT (Edit, len+1, str);
+                 *  EM_SETSEL (Edit, 0, 0);
+                 *  WM_GETTEXTLENGTH (Edit);
+                 *  WM_GETTEXT (Edit, len+1, str);
+                 *  EM_SETSEL (Edit, 0, len);
+                 *  WM_NOTIFY (parent, CBEN_BEGINEDIT)
+                 */
+                NMHDR hdr;
+
+                SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, 0);
+                SendMessageW (infoPtr->hwndEdit, EM_SETSEL, 0, -1);
+                COMBOEX_Notify (infoPtr, CBEN_BEGINEDIT, &hdr);
+                infoPtr->flags |= WCBE_ACTEDIT;
+                infoPtr->flags &= ~WCBE_EDITCHG; /* no change yet */
+                return 0;
+                }
+
+            case EN_CHANGE: {
+                /* 
+                 * For EN_CHANGE this issues the same calls and messages
+                 *  as the native seems to do.
+                 */
+                WCHAR edit_text[260];
+                WCHAR *lastwrk;
+                INT selected, cnt;
+                CBE_ITEMDATA *item;
+
+                selected = SendMessageW (infoPtr->hwndCombo,
+                                         CB_GETCURSEL, 0, 0);
+
+                /* lstrlenA( lastworkingURL ) */
+
+                GetWindowTextW (infoPtr->hwndEdit, edit_text, 260);
+                if (selected == -1) {
+                    lastwrk = infoPtr->edit->pszText;
+                    cnt = lstrlenW (lastwrk);
+                    if (cnt >= 259) cnt = 259;
+                }
+                else {
+                    item = COMBOEX_FindItem (infoPtr, selected);
+                    cnt = lstrlenW (item->pszText);
+                    lastwrk = item->pszText;
+                    if (cnt >= 259) cnt = 259;
+                }
+
+                TRACE("handling EN_CHANGE, selected = %d, selected_text=%s\n",
+                    selected, debugstr_w(lastwrk));
+                TRACE("handling EN_CHANGE, edittext=%s\n",
+                      debugstr_w(edit_text));
+
+                /* lstrcmpiW is between lastworkingURL and GetWindowText */
+
+                if (lstrcmpiW (lastwrk, edit_text)) {
+                    /* strings not equal -- indicate edit has changed */
+                    infoPtr->flags |= WCBE_EDITCHG;
+                }
+                SendMessageW ( GetParent(infoPtr->hwndSelf), WM_COMMAND,
+                               MAKEWPARAM(GetDlgCtrlID (infoPtr->hwndSelf),
+                                          CBN_EDITCHANGE),
+                               infoPtr->hwndSelf);
+                return 0;
+                }
+
+            case LBN_SELCHANGE:
+                /*
+                 * Therefore from traces there is no additional code here
+                 */
+
+                /*
+                 * Using native COMCTL32 gets the following:
+                 *  1 == SHDOCVW.DLL  issues call/message
+                 *  2 == COMCTL32.DLL  issues call/message
+                 *  3 == WINE  issues call/message
+                 *
+                 *
+                 * for LBN_SELCHANGE:
+                 *    1  CB_GETCURSEL(ComboEx)
+                 *    1  CB_GETDROPPEDSTATE(ComboEx)
+                 *    1  CallWindowProc( *2* for WM_COMMAND(LBN_SELCHANGE)
+                 *    2  CallWindowProc( *3* for WM_COMMAND(LBN_SELCHANGE)
+                 **   call CBRollUp( xxx, TRUE for LBN_SELCHANGE, TRUE)
+                 *    3  WM_COMMAND(ComboEx, CBN_SELENDOK)
+                 *      WM_USER+49(ComboLB, 1,0)  <=============!!!!!!!!!!!
+                 *    3  ShowWindow(ComboLB, SW_HIDE)
+                 *    3  RedrawWindow(Combo,  RDW_UPDATENOW)
+                 *    3  WM_COMMAND(ComboEX, CBN_CLOSEUP)
+                 **   end of CBRollUp
+                 *    3  WM_COMMAND(ComboEx, CBN_SELCHANGE)  (echo to parent)
+                 *    ?  LB_GETCURSEL              <==|
+                 *    ?  LB_GETTEXTLEN                |
+                 *    ?  LB_GETTEXT                   | Needs to be added to
+                 *    ?  WM_CTLCOLOREDIT(ComboEx)     | Combo processing
+                 *    ?  LB_GETITEMDATA               |
+                 *    ?  WM_DRAWITEM(ComboEx)      <==|
+                 */
+            default:
+                break;
+            }/* fall through */
     default:
-        return CallWindowProcA (infoPtr->prevComboWndProc,
-                   hwnd, uMsg, wParam, lParam);
+            return CallWindowProcA (infoPtr->prevComboWndProc, 
+                                   hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -2320 +2320 @@
 
     if (!COMBOEX_GetInfoPtr (hwnd)) {
-    if (uMsg == WM_CREATE)
-        return COMBOEX_Create (hwnd, wParam, lParam);
-    if (uMsg == WM_NCCREATE)
-        COMBOEX_NCCreate (hwnd, wParam, lParam);
+        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);
     }
@@ -2330 +2330 @@
     {
         case CBEM_DELETEITEM:  /* maps to CB_DELETESTRING */
-        return COMBOEX_DeleteItem (hwnd, wParam, lParam);
-
-    case CBEM_GETCOMBOCONTROL:
-        return COMBOEX_GetComboControl (hwnd, wParam, lParam);
-
-    case CBEM_GETEDITCONTROL:
-        return COMBOEX_GetEditControl (hwnd, wParam, lParam);
-
-    case CBEM_GETEXTENDEDSTYLE:
-        return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
-
-    case CBEM_GETIMAGELIST:
-        return COMBOEX_GetImageList (hwnd, wParam, lParam);
-
-    case CBEM_GETITEMA:
-        return COMBOEX_GetItemA (hwnd, wParam, lParam);
-
-    case CBEM_GETITEMW:
-        return COMBOEX_GetItemW (hwnd, wParam, lParam);
-
-    case CBEM_GETUNICODEFORMAT:
-        return COMBOEX_GetUnicodeFormat (hwnd, wParam, lParam);
-
-    case CBEM_HASEDITCHANGED:
-        return COMBOEX_HasEditChanged (hwnd, wParam, lParam);
-
-    case CBEM_INSERTITEMA:
-        return COMBOEX_InsertItemA (hwnd, wParam, lParam);
-
-    case CBEM_INSERTITEMW:
-        return COMBOEX_InsertItemW (hwnd, wParam, lParam);
-
-    case CBEM_SETEXSTYLE:   /* FIXME: obsoleted, should be the same as: */
-    case CBEM_SETEXTENDEDSTYLE:
-        return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
-
-    case CBEM_SETIMAGELIST:
-        return COMBOEX_SetImageList (hwnd, wParam, lParam);
-
-    case CBEM_SETITEMA:
-        return COMBOEX_SetItemA (hwnd, wParam, lParam);
-
-    case CBEM_SETITEMW:
-        return COMBOEX_SetItemW (hwnd, wParam, lParam);
-
-    case CBEM_SETUNICODEFORMAT:
-        return COMBOEX_SetUnicodeFormat (hwnd, wParam, lParam);
+            return COMBOEX_DeleteItem (hwnd, wParam, lParam);
+
+        case CBEM_GETCOMBOCONTROL:
+            return COMBOEX_GetComboControl (hwnd, wParam, lParam);
+
+        case CBEM_GETEDITCONTROL:
+            return COMBOEX_GetEditControl (hwnd, wParam, lParam);
+
+        case CBEM_GETEXTENDEDSTYLE:
+            return COMBOEX_GetExtendedStyle (hwnd, wParam, lParam);
+
+        case CBEM_GETIMAGELIST:
+            return COMBOEX_GetImageList (hwnd, wParam, lParam);
+
+        case CBEM_GETITEMA:
+            return COMBOEX_GetItemA (hwnd, wParam, lParam);
+
+        case CBEM_GETITEMW:
+            return COMBOEX_GetItemW (hwnd, wParam, lParam);
+
+        case CBEM_GETUNICODEFORMAT:
+            return COMBOEX_GetUnicodeFormat (hwnd, wParam, lParam);
+
+        case CBEM_HASEDITCHANGED:
+            return COMBOEX_HasEditChanged (hwnd, wParam, lParam);
+
+        case CBEM_INSERTITEMA:
+            return COMBOEX_InsertItemA (hwnd, wParam, lParam);
+
+        case CBEM_INSERTITEMW:
+            return COMBOEX_InsertItemW (hwnd, wParam, lParam);
+
+        case CBEM_SETEXSTYLE:   /* FIXME: obsoleted, should be the same as: */
+        case CBEM_SETEXTENDEDSTYLE:
+            return COMBOEX_SetExtendedStyle (hwnd, wParam, lParam);
+
+        case CBEM_SETIMAGELIST:
+            return COMBOEX_SetImageList (hwnd, wParam, lParam);
+
+        case CBEM_SETITEMA:
+            return COMBOEX_SetItemA (hwnd, wParam, lParam);
+
+        case CBEM_SETITEMW:
+            return COMBOEX_SetItemW (hwnd, wParam, lParam);
+
+        case CBEM_SETUNICODEFORMAT:
+            return COMBOEX_SetUnicodeFormat (hwnd, wParam, lParam);
 
 
 /*   Combo messages we are not sure if we need to process or just forward */
-    case CB_GETDROPPEDCONTROLRECT:
-    case CB_GETITEMHEIGHT:
-    case CB_GETLBTEXT:
-    case CB_GETLBTEXTLEN:
-    case CB_GETEXTENDEDUI:
-    case CB_LIMITTEXT:
-    case CB_RESETCONTENT:
-    case CB_SELECTSTRING:
-    case WM_SETTEXT:
-    case WM_GETTEXT:
-        FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
-          uMsg, wParam, lParam);
-        return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+        case CB_GETDROPPEDCONTROLRECT:
+        case CB_GETITEMHEIGHT:
+        case CB_GETLBTEXT:
+        case CB_GETLBTEXTLEN:
+        case CB_GETEXTENDEDUI:
+        case CB_LIMITTEXT:
+        case CB_RESETCONTENT:
+        case CB_SELECTSTRING:
+        case WM_SETTEXT:
+        case WM_GETTEXT:
+            FIXME("(0x%x 0x%x 0x%lx): possibly missing function\n",
+                  uMsg, wParam, lParam);
+            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
 
 /*   Combo messages OK to just forward to the regular COMBO */
-    case CB_GETCOUNT:
-    case CB_GETCURSEL:
-    case CB_GETDROPPEDSTATE:
+        case CB_GETCOUNT:        
+        case CB_GETCURSEL:
+        case CB_GETDROPPEDSTATE:
         case CB_SETDROPPEDWIDTH:
         case CB_SETEXTENDEDUI:
         case CB_SHOWDROPDOWN:
-        return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
+            return COMBOEX_Forward (hwnd, uMsg, wParam, lParam);
 
 /*   Combo messages we need to process specially */
         case CB_FINDSTRINGEXACT:
-        return COMBOEX_FindStringExact (COMBOEX_GetInfoPtr (hwnd),
-                        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:
-        return COMBOEX_SetItemHeight (hwnd, wParam, lParam);
+            return COMBOEX_FindStringExact (COMBOEX_GetInfoPtr (hwnd), 
+                                            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:
+            return COMBOEX_SetItemHeight (hwnd, wParam, lParam);
 
 
 
 /*   Window messages passed to parent */
-    case WM_COMMAND:
-        return COMBOEX_Command (hwnd, wParam, lParam);
-
-    case WM_NOTIFY:
-        if (infoPtr->NtfUnicode)
-        return SendMessageW (GetParent (hwnd),
-                     uMsg, wParam, lParam);
-        else
-        return SendMessageA (GetParent (hwnd),
-                     uMsg, wParam, lParam);
+        case WM_COMMAND:
+            return COMBOEX_Command (hwnd, wParam, lParam);
+
+        case WM_NOTIFY:
+            if (infoPtr->NtfUnicode)
+                return SendMessageW (GetParent (hwnd),
+                                     uMsg, wParam, lParam);
+            else
+                return SendMessageA (GetParent (hwnd),
+                                     uMsg, wParam, lParam);
 
 
 /*   Window messages we need to process */
         case WM_DELETEITEM:
-        return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
+            return COMBOEX_WM_DeleteItem (hwnd, wParam, lParam);
 
         case WM_DRAWITEM:
             return COMBOEX_DrawItem (hwnd, wParam, lParam);
 
-    case WM_DESTROY:
-        return COMBOEX_Destroy (hwnd, wParam, lParam);
+        case WM_DESTROY:
+            return COMBOEX_Destroy (hwnd, wParam, lParam);
 
         case WM_MEASUREITEM:
@@ -2449 +2449 @@
 
         case WM_NOTIFYFORMAT:
-        return COMBOEX_NotifyFormat (hwnd, wParam, lParam);
-
-    case WM_SIZE:
-        return COMBOEX_Size (hwnd, wParam, lParam);
+            return COMBOEX_NotifyFormat (hwnd, wParam, lParam);
+
+        case WM_SIZE:
+            return COMBOEX_Size (hwnd, wParam, lParam);
 
         case WM_WINDOWPOSCHANGING:
-        return COMBOEX_WindowPosChanging (hwnd, wParam, lParam);
-
-    default:
-        if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-             uMsg, wParam, lParam);
+            return COMBOEX_WindowPosChanging (hwnd, 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);
 #else
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }
@@ -2484 +2484 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = WC_COMBOBOXEXA;
-
+ 
     RegisterClassA (&wndClass);
 

trunk/src/comctl32/comctl32.c

@@ -1 @@
-/*
+/*              
  * Common controls functions
  *
@@ -99 +99 @@
 
     switch (fdwReason) {
-    case DLL_PROCESS_ATTACH:
+        case DLL_PROCESS_ATTACH:
             COMCTL32_hModule = (HMODULE)hinstDLL;
 
@@ -130 +130 @@
             break;
 
-    case DLL_PROCESS_DETACH:
+        case DLL_PROCESS_DETACH:
             /* unregister all common control classes */
             ANIMATE_Unregister ();
@@ -204 +204 @@
 VOID WINAPI
 MenuHelp (UINT uMsg, WPARAM wParam, LPARAM lParam, HMENU hMainMenu,
-      HINSTANCE hInst, HWND hwndStatus, LPUINT lpwIDs)
+          HINSTANCE hInst, HWND hwndStatus, LPUINT lpwIDs)
 {
     UINT uMenuID = 0;
 
     if (!IsWindow (hwndStatus))
-    return;
+        return;
 
     switch (uMsg) {
-    case WM_MENUSELECT:
-        TRACE("WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
-           wParam, lParam);
+        case WM_MENUSELECT:
+            TRACE("WM_MENUSELECT wParam=0x%X lParam=0x%lX\n",
+                   wParam, lParam);
 
             if ((HIWORD(wParam) == 0xFFFF) && (lParam == 0)) {
                 /* menu was closed */
-        TRACE("menu was closed!\n");
+                TRACE("menu was closed!\n");
                 SendMessageA (hwndStatus, SB_SIMPLE, FALSE, 0);
             }
-        else {
-        /* menu item was selected */
-        if (HIWORD(wParam) & MF_POPUP)
-            uMenuID = (UINT)*(lpwIDs+1);
-        else
-            uMenuID = (UINT)LOWORD(wParam);
-        TRACE("uMenuID = %u\n", uMenuID);
-
-        if (uMenuID) {
-            CHAR szText[256];
-
-            if (!LoadStringA (hInst, uMenuID, szText, 256))
-            szText[0] = '\0';
-
-            SendMessageA (hwndStatus, SB_SETTEXTA,
-                    255 | SBT_NOBORDERS, (LPARAM)szText);
-            SendMessageA (hwndStatus, SB_SIMPLE, TRUE, 0);
-        }
-        }
-        break;
+            else {
+                /* menu item was selected */
+                if (HIWORD(wParam) & MF_POPUP)
+                    uMenuID = (UINT)*(lpwIDs+1);
+                else
+                    uMenuID = (UINT)LOWORD(wParam);
+                TRACE("uMenuID = %u\n", uMenuID);
+
+                if (uMenuID) {
+                    CHAR szText[256];
+
+                    if (!LoadStringA (hInst, uMenuID, szText, 256))
+                        szText[0] = '\0';
+
+                    SendMessageA (hwndStatus, SB_SETTEXTA,
+                                    255 | SBT_NOBORDERS, (LPARAM)szText);
+                    SendMessageA (hwndStatus, SB_SIMPLE, TRUE, 0);
+                }
+            }
+            break;
 
         case WM_COMMAND :
-        TRACE("WM_COMMAND wParam=0x%X lParam=0x%lX\n",
-           wParam, lParam);
-        /* WM_COMMAND is not invalid since it is documented
-         * in the windows api reference. So don't output
+            TRACE("WM_COMMAND wParam=0x%X lParam=0x%lX\n",
+                   wParam, lParam);
+            /* WM_COMMAND is not invalid since it is documented
+             * in the windows api reference. So don't output
              * any FIXME for WM_COMMAND
              */
-        WARN("We don't care about the WM_COMMAND\n");
-        break;
-
-    default:
-        FIXME("Invalid Message 0x%x!\n", uMsg);
-        break;
-    }
-}
-
-
-/***********************************************************************
- * ShowHideMenuCtl [COMCTL32.3]
+            WARN("We don't care about the WM_COMMAND\n");
+            break;
+
+        default:
+            FIXME("Invalid Message 0x%x!\n", uMsg);
+            break;
+    }
+}
+
+
+/***********************************************************************
+ * ShowHideMenuCtl [COMCTL32.3] 
  *
  * Shows or hides controls and updates the corresponding menu item.
@@ -297 +297 @@
 
     if (lpInfo == NULL)
-    return FALSE;
+        return FALSE;
 
     if (!(lpInfo[0]) || !(lpInfo[1]))
-    return FALSE;
+        return FALSE;
 
     /* search for control */
     lpMenuId = &lpInfo[2];
     while (*lpMenuId != uFlags)
-    lpMenuId += 2;
+        lpMenuId += 2;
 
     if (GetMenuState (lpInfo[1], uFlags, MF_BYCOMMAND) & MFS_CHECKED) {
-    /* uncheck menu item */
-    CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
-
-    /* hide control */
-    lpMenuId++;
-    SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
-            SWP_HIDEWINDOW);
+        /* uncheck menu item */
+        CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_UNCHECKED);
+
+        /* hide control */
+        lpMenuId++;
+        SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
+                        SWP_HIDEWINDOW);
     }
     else {
-    /* check menu item */
-    CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
-
-    /* show control */
-    lpMenuId++;
-    SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
-            SWP_SHOWWINDOW);
+        /* check menu item */
+        CheckMenuItem (lpInfo[0], *lpMenuId, MF_BYCOMMAND | MF_CHECKED);
+
+        /* show control */
+        lpMenuId++;
+        SetWindowPos (GetDlgItem (hwnd, *lpMenuId), 0, 0, 0, 0, 0,
+                        SWP_SHOWWINDOW);
     }
 
@@ -357 +357 @@
 
     TRACE("(0x%08lx 0x%08lx 0x%08lx)\n",
-       (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
+           (DWORD)hwnd, (DWORD)lpRect, (DWORD)lpInfo);
 
     GetClientRect (hwnd, lpRect);
@@ -363 +363 @@
 
     do {
-    lpRun += 2;
-    if (*lpRun == 0)
-        return;
-    lpRun++;
-    hwndCtrl = GetDlgItem (hwnd, *lpRun);
-    if (GetWindowLongA (hwndCtrl, GWL_STYLE) & WS_VISIBLE) {
-        TRACE("control id 0x%x\n", *lpRun);
-        GetWindowRect (hwndCtrl, &rcCtrl);
-        MapWindowPoints ((HWND)0, hwnd, (LPPOINT)&rcCtrl, 2);
-        SubtractRect (lpRect, lpRect, &rcCtrl);
-    }
-    lpRun++;
+        lpRun += 2;
+        if (*lpRun == 0)
+            return;
+        lpRun++;
+        hwndCtrl = GetDlgItem (hwnd, *lpRun);
+        if (GetWindowLongA (hwndCtrl, GWL_STYLE) & WS_VISIBLE) {
+            TRACE("control id 0x%x\n", *lpRun);
+            GetWindowRect (hwndCtrl, &rcCtrl);
+            MapWindowPoints ((HWND)0, hwnd, (LPPOINT)&rcCtrl, 2);
+            SubtractRect (lpRect, lpRect, &rcCtrl);
+        }
+        lpRun++;
     } while (*lpRun);
 }
@@ -416 +416 @@
       r.left += 3;
       DrawTextA (hdc, text, lstrlenA(text),
-           &r, DT_LEFT|DT_VCENTER|DT_SINGLELINE);
+                   &r, DT_LEFT|DT_VCENTER|DT_SINGLELINE);  
       if (oldbkmode != TRANSPARENT)
-    SetBkMode(hdc, oldbkmode);
+        SetBkMode(hdc, oldbkmode);
     }
 }
@@ -466 +466 @@
 CreateStatusWindowA (INT style, LPCSTR text, HWND parent, UINT wid)
 {
-    return CreateWindowA(STATUSCLASSNAMEA, text, style,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               parent, wid, 0, 0);
+    return CreateWindowA(STATUSCLASSNAMEA, text, style, 
+                           CW_USEDEFAULT, CW_USEDEFAULT,
+                           CW_USEDEFAULT, CW_USEDEFAULT, 
+                           parent, wid, 0, 0);
 }
 
@@ -491 +491 @@
 {
     return CreateWindowW(STATUSCLASSNAMEW, text, style,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               parent, wid, 0, 0);
+                           CW_USEDEFAULT, CW_USEDEFAULT,
+                           CW_USEDEFAULT, CW_USEDEFAULT,
+                           parent, wid, 0, 0);
 }
 
@@ -521 +521 @@
 HWND WINAPI
 CreateUpDownControl (DWORD style, INT x, INT y, INT cx, INT cy,
-             HWND parent, INT id, HINSTANCE inst,
-             HWND buddy, INT maxVal, INT minVal, INT curVal)
+                     HWND parent, INT id, HINSTANCE inst,
+                     HWND buddy, INT maxVal, INT minVal, INT curVal)
 {
     HWND hUD =
-    CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
-             parent, id, inst, 0);
+        CreateWindowA (UPDOWN_CLASSA, 0, style, x, y, cx, cy,
+                         parent, id, inst, 0);
     if (hUD) {
-    SendMessageA (hUD, UDM_SETBUDDY, buddy, 0);
-    SendMessageA (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
-    SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));
+        SendMessageA (hUD, UDM_SETBUDDY, buddy, 0);
+        SendMessageA (hUD, UDM_SETRANGE, 0, MAKELONG(maxVal, minVal));
+        SendMessageA (hUD, UDM_SETPOS, 0, MAKELONG(curVal, 0));     
     }
 
@@ -584 +584 @@
 
     if (!lpInitCtrls)
-    return FALSE;
+        return FALSE;
     if (lpInitCtrls->dwSize != sizeof(INITCOMMONCONTROLSEX))
-    return FALSE;
+        return FALSE;
 
     TRACE("(0x%08lx)\n", lpInitCtrls->dwICC);
 
     for (cCount = 0; cCount < 32; cCount++) {
-    dwMask = 1 << cCount;
-    if (!(lpInitCtrls->dwICC & dwMask))
-        continue;
-
-    switch (lpInitCtrls->dwICC & dwMask) {
-        /* dummy initialization */
-        case ICC_ANIMATE_CLASS:
-        case ICC_BAR_CLASSES:
-        case ICC_LISTVIEW_CLASSES:
-        case ICC_TREEVIEW_CLASSES:
-        case ICC_TAB_CLASSES:
-        case ICC_UPDOWN_CLASS:
-        case ICC_PROGRESS_CLASS:
-        case ICC_HOTKEY_CLASS:
-        break;
-
-        /* advanced classes - not included in Win95 */
-        case ICC_DATE_CLASSES:
-        MONTHCAL_Register ();
-        DATETIME_Register ();
-        break;
-
-        case ICC_USEREX_CLASSES:
-        COMBOEX_Register ();
-        break;
-
-        case ICC_COOL_CLASSES:
-        REBAR_Register ();
-        break;
-
-        case ICC_INTERNET_CLASSES:
-        IPADDRESS_Register ();
-        break;
-
-        case ICC_PAGESCROLLER_CLASS:
-        PAGER_Register ();
-        break;
-
-        case ICC_NATIVEFNTCTL_CLASS:
-        NATIVEFONT_Register ();
-        break;
-
-        default:
-        FIXME("Unknown class! dwICC=0x%lX\n", dwMask);
-        break;
-    }
+        dwMask = 1 << cCount;
+        if (!(lpInitCtrls->dwICC & dwMask))
+            continue;
+
+        switch (lpInitCtrls->dwICC & dwMask) {
+            /* dummy initialization */
+            case ICC_ANIMATE_CLASS:
+            case ICC_BAR_CLASSES:
+            case ICC_LISTVIEW_CLASSES:
+            case ICC_TREEVIEW_CLASSES:
+            case ICC_TAB_CLASSES:
+            case ICC_UPDOWN_CLASS:
+            case ICC_PROGRESS_CLASS:
+            case ICC_HOTKEY_CLASS:
+                break;
+
+            /* advanced classes - not included in Win95 */
+            case ICC_DATE_CLASSES:
+                MONTHCAL_Register ();
+                DATETIME_Register ();
+                break;
+
+            case ICC_USEREX_CLASSES:
+                COMBOEX_Register ();
+                break;
+
+            case ICC_COOL_CLASSES:
+                REBAR_Register ();
+                break;
+
+            case ICC_INTERNET_CLASSES:
+                IPADDRESS_Register ();
+                break;
+
+            case ICC_PAGESCROLLER_CLASS:
+                PAGER_Register ();
+                break;
+
+            case ICC_NATIVEFNTCTL_CLASS:
+                NATIVEFONT_Register ();
+                break;
+
+            default:
+                FIXME("Unknown class! dwICC=0x%lX\n", dwMask);
+                break;
+        }
     }
 
@@ -681 +681 @@
     hwndTB =
         CreateWindowExA (0, TOOLBARCLASSNAMEA, "", style|WS_CHILD, 0, 0, 0, 0,
-               hwnd, (HMENU)wID, 0, NULL);
+                           hwnd, (HMENU)wID, 0, NULL);
     if(hwndTB) {
-    TBADDBITMAP tbab;
+        TBADDBITMAP tbab;
 
         SendMessageA (hwndTB, TB_BUTTONSTRUCTSIZE,
-            (WPARAM)uStructSize, 0);
+                        (WPARAM)uStructSize, 0);
 
        /* set bitmap and button size */
@@ -705 +705 @@
 
 
-    /* add bitmaps */
-    if (nBitmaps > 0)
-    {
-    tbab.hInst = hBMInst;
-    tbab.nID   = wBMID;
-
-    SendMessageA (hwndTB, TB_ADDBITMAP,
-            (WPARAM)nBitmaps, (LPARAM)&tbab);
-    }
-    /* add buttons */
-    if(iNumButtons > 0)
-    SendMessageA (hwndTB, TB_ADDBUTTONSA,
-            (WPARAM)iNumButtons, (LPARAM)lpButtons);
+        /* add bitmaps */
+        if (nBitmaps > 0)
+        {
+        tbab.hInst = hBMInst;
+        tbab.nID   = wBMID;
+
+        SendMessageA (hwndTB, TB_ADDBITMAP,
+                        (WPARAM)nBitmaps, (LPARAM)&tbab);
+        }
+        /* add buttons */
+        if(iNumButtons > 0)
+        SendMessageA (hwndTB, TB_ADDBUTTONSA,
+                        (WPARAM)iNumButtons, (LPARAM)lpButtons);
     }
 
@@ -741 +741 @@
 HBITMAP WINAPI
 CreateMappedBitmap (HINSTANCE hInstance, INT idBitmap, UINT wFlags,
-            LPCOLORMAP lpColorMap, INT iNumMaps)
+                    LPCOLORMAP lpColorMap, INT iNumMaps)
 {
     HGLOBAL hglb;
@@ -754 +754 @@
     COLORREF cRef;
     COLORMAP internalColorMap[4] =
-    {{0x000000, 0}, {0x808080, 0}, {0xC0C0C0, 0}, {0xFFFFFF, 0}};
+        {{0x000000, 0}, {0x808080, 0}, {0xC0C0C0, 0}, {0xFFFFFF, 0}};
 
     /* initialize pointer to colortable and default color table */
     if (lpColorMap) {
-    iMaps = iNumMaps;
-    sysColorMap = lpColorMap;
+        iMaps = iNumMaps;
+        sysColorMap = lpColorMap;
     }
     else {
-    internalColorMap[0].to = GetSysColor (COLOR_BTNTEXT);
-    internalColorMap[1].to = GetSysColor (COLOR_BTNSHADOW);
-    internalColorMap[2].to = GetSysColor (COLOR_BTNFACE);
-    internalColorMap[3].to = GetSysColor (COLOR_BTNHIGHLIGHT);
-    iMaps = 4;
-    sysColorMap = (LPCOLORMAP)internalColorMap;
+        internalColorMap[0].to = GetSysColor (COLOR_BTNTEXT);
+        internalColorMap[1].to = GetSysColor (COLOR_BTNSHADOW);
+        internalColorMap[2].to = GetSysColor (COLOR_BTNFACE);
+        internalColorMap[3].to = GetSysColor (COLOR_BTNHIGHLIGHT);
+        iMaps = 4;
+        sysColorMap = (LPCOLORMAP)internalColorMap;
     }
 
     hRsrc = FindResourceA (hInstance, (LPSTR)idBitmap, RT_BITMAPA);
     if (hRsrc == 0)
-    return 0;
+        return 0;
     hglb = LoadResource (hInstance, hRsrc);
     if (hglb == 0)
-    return 0;
+        return 0;
     lpBitmap = (LPBITMAPINFOHEADER)LockResource (hglb);
     if (lpBitmap == NULL)
-    return 0;
+        return 0;
 
     nColorTableSize = (1 << lpBitmap->biBitCount);
@@ -784 +784 @@
     lpBitmapInfo = (LPBITMAPINFOHEADER)GlobalAlloc (GMEM_FIXED, nSize);
     if (lpBitmapInfo == NULL)
-    return 0;
+        return 0;
     RtlMoveMemory (lpBitmapInfo, lpBitmap, nSize);
 
@@ -790 +790 @@
 
     for (iColor = 0; iColor < nColorTableSize; iColor++) {
-    for (i = 0; i < iMaps; i++) {
+        for (i = 0; i < iMaps; i++) {
             cRef = RGB(pColorTable[iColor].rgbRed,
                        pColorTable[iColor].rgbGreen,
                        pColorTable[iColor].rgbBlue);
-        if ( cRef  == sysColorMap[i].from) {
+            if ( cRef  == sysColorMap[i].from) {
 #if 0
-        if (wFlags & CBS_MASKED) {
-            if (sysColorMap[i].to != COLOR_BTNTEXT)
-            pColorTable[iColor] = RGB(255, 255, 255);
-        }
-        else
+                if (wFlags & CBS_MASKED) {
+                    if (sysColorMap[i].to != COLOR_BTNTEXT)
+                        pColorTable[iColor] = RGB(255, 255, 255);
+                }
+                else
 #endif
                     pColorTable[iColor].rgbBlue  = GetBValue(sysColorMap[i].to);
                     pColorTable[iColor].rgbGreen = GetGValue(sysColorMap[i].to);
                     pColorTable[iColor].rgbRed   = GetRValue(sysColorMap[i].to);
-        break;
-        }
-    }
+                break;
+            }
+        }
     }
     nWidth  = (INT)lpBitmapInfo->biWidth;
@@ -814 +814 @@
     hbm = CreateCompatibleBitmap (hdcScreen, nWidth, nHeight);
     if (hbm) {
-    HDC hdcDst = CreateCompatibleDC (hdcScreen);
-    HBITMAP hbmOld = SelectObject (hdcDst, hbm);
-    LPBYTE lpBits = (LPBYTE)(lpBitmap + 1);
-    lpBits += (1 << (lpBitmapInfo->biBitCount)) * sizeof(RGBQUAD);
-    StretchDIBits (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight,
-                 lpBits, (LPBITMAPINFO)lpBitmapInfo, DIB_RGB_COLORS,
-                 SRCCOPY);
-    SelectObject (hdcDst, hbmOld);
-    DeleteDC (hdcDst);
+        HDC hdcDst = CreateCompatibleDC (hdcScreen);
+        HBITMAP hbmOld = SelectObject (hdcDst, hbm);
+        LPBYTE lpBits = (LPBYTE)(lpBitmap + 1);
+        lpBits += (1 << (lpBitmapInfo->biBitCount)) * sizeof(RGBQUAD);
+        StretchDIBits (hdcDst, 0, 0, nWidth, nHeight, 0, 0, nWidth, nHeight,
+                         lpBits, (LPBITMAPINFO)lpBitmapInfo, DIB_RGB_COLORS,
+                         SRCCOPY);
+        SelectObject (hdcDst, hbmOld);
+        DeleteDC (hdcDst);
     }
     ReleaseDC ((HWND)0, hdcScreen);
@@ -855 +855 @@
 HWND WINAPI
 CreateToolbar (HWND hwnd, DWORD style, UINT wID, INT nBitmaps,
-           HINSTANCE hBMInst, UINT wBMID,
-           LPCOLDTBBUTTON lpButtons,INT iNumButtons)
+               HINSTANCE hBMInst, UINT wBMID,
+               LPCOLDTBBUTTON lpButtons,INT iNumButtons)
 {
     return CreateToolbarEx (hwnd, style | CCS_NODIVIDER, wID, nBitmaps,
-                hBMInst, wBMID, (LPCTBBUTTON)lpButtons,
-                iNumButtons, 0, 0, 0, 0, sizeof (OLDTBBUTTON));
+                            hBMInst, wBMID, (LPCTBBUTTON)lpButtons,
+                            iNumButtons, 0, 0, 0, 0, sizeof (OLDTBBUTTON));
 }
 
@@ -885 +885 @@
     if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) {
         WARN("wrong DLLVERSIONINFO size from app");
-    return E_INVALIDARG;
+        return E_INVALIDARG;
     }
 
@@ -894 +894 @@
 
     TRACE("%lu.%lu.%lu.%lu\n",
-       pdvi->dwMajorVersion, pdvi->dwMinorVersion,
-       pdvi->dwBuildNumber, pdvi->dwPlatformID);
+           pdvi->dwMajorVersion, pdvi->dwMinorVersion,
+           pdvi->dwBuildNumber, pdvi->dwPlatformID);
 
     return S_OK;
@@ -901 +901 @@
 
 /***********************************************************************
- *      DllInstall (COMCTL32.@)
+ *              DllInstall (COMCTL32.@)
  */
 HRESULT WINAPI COMCTL32_DllInstall(BOOL bInstall, LPCWSTR cmdline)
 {
-  FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE",
-    debugstr_w(cmdline));
+  FIXME("(%s, %s): stub\n", bInstall?"TRUE":"FALSE", 
+        debugstr_w(cmdline));
 
   return S_OK;
@@ -916 +916 @@
     POINT pos; /* center of hover rectangle */
     INT iHoverTime; /* elapsed time the cursor has been inside of the hover rect */
-} _TRACKINGLIST;
+} _TRACKINGLIST; 
 
 static _TRACKINGLIST TrackingList[10];
@@ -955 +955 @@
         if(TrackingList[i].tme.dwFlags & TME_HOVER) {
             /* add the timer interval to the hovering time */
-            TrackingList[i].iHoverTime+=iTimerInterval;
-
+            TrackingList[i].iHoverTime+=iTimerInterval;  
+     
             /* has the cursor moved outside the rectangle centered around pos? */
             if((abs(pos.x - TrackingList[i].pos.x) > (hoverwidth / 2.0))
@@ -985 +985 @@
         }
     }
-
+        
     /* stop the timer if the tracking list is empty */
     if(iTrackMax == 0) {
@@ -1036 +1036 @@
 
     flags = ptme->dwFlags;
-
+    
     /* if HOVER_DEFAULT was specified replace this with the systems current value */
     if(ptme->dwHoverTime == HOVER_DEFAULT)
@@ -1042 +1042 @@
 
     GetCursorPos(&pos);
-    hwnd = WindowFromPoint(pos);
+    hwnd = WindowFromPoint(pos);    
 
     if ( flags & TME_CANCEL ) {
@@ -1048 +1048 @@
         cancel = 1;
     }
-
+    
     if ( flags & TME_HOVER  ) {
         flags &= ~ TME_HOVER;
         hover = 1;
     }
-
+    
     if ( flags & TME_LEAVE ) {
         flags &= ~ TME_LEAVE;
@@ -1075 +1075 @@
         else
             ptme->dwFlags = 0;
-
+    
         return TRUE; /* return here, TME_QUERY is retrieving information */
     }
@@ -1098 +1098 @@
             {
                 TrackingList[i] = TrackingList[--iTrackMax];
-
+        
                 if(iTrackMax == 0) {
                     KillTimer(0, timer);
@@ -1119 +1119 @@
                         TrackingList[i].tme.dwHoverTime = ptme->dwHoverTime;
                     }
-
+ 
                     if(leave)
                         TrackingList[i].tme.dwFlags |= TME_LEAVE;
 
                     /* reset iHoverTime as per winapi specs */
-                    TrackingList[i].iHoverTime = 0;
-
+                    TrackingList[i].iHoverTime = 0;                  
+  
                     return TRUE;
                 }
-            }
+            }           
 
             /* if the tracking list is full return FALSE */
@@ -1198 +1198 @@
 
     hwndToolTip = CreateWindowExA(0, TOOLTIPS_CLASSA, NULL, 0,
-                  CW_USEDEFAULT, CW_USEDEFAULT,
-                  CW_USEDEFAULT, CW_USEDEFAULT, hwndOwner,
-                  0, 0, 0);
+                                  CW_USEDEFAULT, CW_USEDEFAULT,
+                                  CW_USEDEFAULT, CW_USEDEFAULT, hwndOwner,
+                                  0, 0, 0);
 
     /* Send NM_TOOLTIPSCREATED notification */
     if (hwndToolTip)
     {
-    NMTOOLTIPSCREATED nmttc;
+        NMTOOLTIPSCREATED nmttc;
         /* true owner can be different if hwndOwner is a child window */
         HWND hwndTrueOwner = GetWindow(hwndToolTip, GW_OWNER);
         nmttc.hdr.hwndFrom = hwndTrueOwner;
         nmttc.hdr.idFrom = GetWindowLongA(hwndTrueOwner, GWL_ID);
-    nmttc.hdr.code = NM_TOOLTIPSCREATED;
-    nmttc.hwndToolTips = hwndToolTip;
+        nmttc.hdr.code = NM_TOOLTIPSCREATED;
+        nmttc.hwndToolTips = hwndToolTip;
 
        SendMessageA(GetParent(hwndTrueOwner), WM_NOTIFY,
                     (WPARAM)GetWindowLongA(hwndTrueOwner, GWL_ID),
-             (LPARAM)&nmttc);
+                     (LPARAM)&nmttc);
     }
 

trunk/src/comctl32/comctl32undoc.c

@@ -98 +98 @@
 
     FIXME ("phDpa=%p loadProc=%p pStream=%p lParam=%lx\n",
-       phDpa, loadProc, pStream, lParam);
+           phDpa, loadProc, pStream, lParam);
 
     if (!phDpa || !loadProc || !pStream)
-    return E_INVALIDARG;
+        return E_INVALIDARG;
 
     *phDpa = (HDPA)NULL;
@@ -110 +110 @@
     errCode = IStream_Seek (pStream, position, STREAM_SEEK_CUR, &newPosition);
     if (errCode != S_OK)
-    return errCode;
+        return errCode;
 
     errCode = IStream_Read (pStream, &streamData, sizeof(STREAMDATA), &ulRead);
     if (errCode != S_OK)
-    return errCode;
+        return errCode;
 
     FIXME ("dwSize=%lu dwData2=%lu dwItems=%lu\n",
-       streamData.dwSize, streamData.dwData2, streamData.dwItems);
+           streamData.dwSize, streamData.dwData2, streamData.dwItems);
 
     if (lParam < sizeof(STREAMDATA) ||
-    streamData.dwSize < sizeof(STREAMDATA) ||
-    streamData.dwData2 < 1) {
-    errCode = E_FAIL;
+        streamData.dwSize < sizeof(STREAMDATA) ||
+        streamData.dwData2 < 1) {
+        errCode = E_FAIL;
     }
 
@@ -128 +128 @@
     hDpa = DPA_Create (streamData.dwItems);
     if (!hDpa)
-    return E_OUTOFMEMORY;
+        return E_OUTOFMEMORY;
 
     if (!DPA_Grow (hDpa, streamData.dwItems))
-    return E_OUTOFMEMORY;
+        return E_OUTOFMEMORY;
 
     /* load data from the stream into the dpa */
@@ -137 +137 @@
     for (loadData.nCount = 0; loadData.nCount < streamData.dwItems; loadData.nCount++) {
         errCode = (loadProc)(&loadData, pStream, lParam);
-    if (errCode != S_OK) {
-        errCode = S_FALSE;
-        break;
-    }
-
-    *ptr = loadData.ptr;
-    ptr++;
+        if (errCode != S_OK) {
+            errCode = S_FALSE;
+            break;
+        }
+
+        *ptr = loadData.ptr;
+        ptr++;
     }
 
@@ -177 +177 @@
 
     FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n",
-       hDpa, loadProc, pStream, lParam);
+           hDpa, loadProc, pStream, lParam);
 
     return E_FAIL;
@@ -200 +200 @@
 BOOL WINAPI
 DPA_Merge (const HDPA hdpa1, const HDPA hdpa2, DWORD dwFlags,
-       PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam)
+           PFNDPACOMPARE pfnCompare, PFNDPAMERGE pfnMerge, LPARAM lParam)
 {
     INT nCount;
@@ -208 +208 @@
 
     TRACE("%p %p %08lx %p %p %08lx)\n",
-       hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
+           hdpa1, hdpa2, dwFlags, pfnCompare, pfnMerge, lParam);
 
     if (IsBadWritePtr (hdpa1, sizeof(DPA)))
-    return FALSE;
+        return FALSE;
 
     if (IsBadWritePtr (hdpa2, sizeof(DPA)))
-    return FALSE;
+        return FALSE;
 
     if (IsBadCodePtr ((FARPROC)pfnCompare))
-    return FALSE;
+        return FALSE;
 
     if (IsBadCodePtr ((FARPROC)pfnMerge))
-    return FALSE;
+        return FALSE;
 
     if (dwFlags & DPAM_SORT) {
-    TRACE("sorting dpa's!\n");
-    if (hdpa1->nItemCount > 0)
-    DPA_Sort (hdpa1, pfnCompare, lParam);
-    TRACE ("dpa 1 sorted!\n");
-    if (hdpa2->nItemCount > 0)
-    DPA_Sort (hdpa2, pfnCompare, lParam);
-    TRACE ("dpa 2 sorted!\n");
+        TRACE("sorting dpa's!\n");
+        if (hdpa1->nItemCount > 0)
+        DPA_Sort (hdpa1, pfnCompare, lParam);
+        TRACE ("dpa 1 sorted!\n");
+        if (hdpa2->nItemCount > 0)
+        DPA_Sort (hdpa2, pfnCompare, lParam);
+        TRACE ("dpa 2 sorted!\n");
     }
 
     if (hdpa2->nItemCount < 1)
-    return TRUE;
+        return TRUE;
 
     TRACE("hdpa1->nItemCount=%d hdpa2->nItemCount=%d\n",
-       hdpa1->nItemCount, hdpa2->nItemCount);
+           hdpa1->nItemCount, hdpa2->nItemCount);
 
 
@@ -250 +250 @@
     {
         if (nIndex < 0) break;
-    nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
-    TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n",
-          nResult, nIndex, nCount);
-
-    if (nResult == 0)
-    {
-        PVOID ptr;
-
-        ptr = (pfnMerge)(1, *pWork1, *pWork2, lParam);
-        if (!ptr)
-        return FALSE;
-
-        nCount--;
-        pWork2--;
-        *pWork1 = ptr;
-        nIndex--;
-        pWork1--;
-    }
-    else if (nResult < 0)
-    {
-        if (!dwFlags & 8)
-        {
-        PVOID ptr;
-
-        ptr = DPA_DeletePtr (hdpa1, hdpa1->nItemCount - 1);
-
-        (pfnMerge)(2, ptr, NULL, lParam);
-        }
-        nIndex--;
-        pWork1--;
-    }
-    else
-    {
-        if (!dwFlags & 4)
-        {
-        PVOID ptr;
-
-        ptr = (pfnMerge)(3, *pWork2, NULL, lParam);
-        if (!ptr)
-            return FALSE;
-        DPA_InsertPtr (hdpa1, nIndex, ptr);
-        }
-        nCount--;
-        pWork2--;
-    }
+        nResult = (pfnCompare)(*pWork1, *pWork2, lParam);
+        TRACE("compare result=%d, dpa1.cnt=%d, dpa2.cnt=%d\n", 
+              nResult, nIndex, nCount);
+
+        if (nResult == 0)
+        {
+            PVOID ptr;
+
+            ptr = (pfnMerge)(1, *pWork1, *pWork2, lParam);
+            if (!ptr)
+                return FALSE;
+
+            nCount--;
+            pWork2--;
+            *pWork1 = ptr;
+            nIndex--;
+            pWork1--;
+        }
+        else if (nResult < 0)
+        {
+            if (!dwFlags & 8)
+            {
+                PVOID ptr;
+
+                ptr = DPA_DeletePtr (hdpa1, hdpa1->nItemCount - 1);
+
+                (pfnMerge)(2, ptr, NULL, lParam);
+            }
+            nIndex--;
+            pWork1--;
+        }
+        else
+        {
+            if (!dwFlags & 4)
+            {
+                PVOID ptr;
+
+                ptr = (pfnMerge)(3, *pWork2, NULL, lParam);
+                if (!ptr)
+                    return FALSE;
+                DPA_InsertPtr (hdpa1, nIndex, ptr);
+            }
+            nCount--;
+            pWork2--;
+        }
 
     }
@@ -358 +358 @@
 
     if (lpSrc)
-    lpDest = HeapReAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, lpSrc, dwSize);
+        lpDest = HeapReAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, lpSrc, dwSize);
     else
-    lpDest = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
+        lpDest = HeapAlloc (COMCTL32_hHeap, HEAP_ZERO_MEMORY, dwSize);
 
     TRACE("-- ret=%p\n", lpDest);
@@ -458 +458 @@
 HANDLE WINAPI
 CreateMRUListLazyA (LPCREATEMRULIST lpcml, DWORD dwParam2,
-            DWORD dwParam3, DWORD dwParam4);
+                    DWORD dwParam3, DWORD dwParam4);
 
 
@@ -490 +490 @@
 #if 0
     if (!(hmru->dwParam1 & 1001)) {
-    RegSetValueExA (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
-              hmru->lpszMRUString,
-              strlen (hmru->lpszMRUString));
+        RegSetValueExA (hmru->hKeyMRU, "MRUList", 0, REG_SZ,
+                          hmru->lpszMRUString,
+                          strlen (hmru->lpszMRUString));
     }
 
@@ -506 +506 @@
 /**************************************************************************
  *              AddMRUData [COMCTL32.167]
- *
+ * 
  * Add item to MRU binary list.  If item already exists in list then it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -530 +530 @@
 /**************************************************************************
  *              AddMRUStringA [COMCTL32.153]
- *
+ * 
  * Add item to MRU string list.  If item already exists in list them it is
  * simply moved up to the top of the list and not added again.  If list is
@@ -572 +572 @@
 /**************************************************************************
  *                  FindMRUData [COMCTL32.169]
- *
+ * 
  * Searches binary list for item that matches lpData of length cbData.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -590 +590 @@
 {
     FIXME("(%08x, %p, %ld, %p) empty stub!\n",
-       hList, lpData, cbData, lpRegNum);
+           hList, lpData, cbData, lpRegNum);
 
     return 0;
@@ -597 +597 @@
 /**************************************************************************
  *                  FindMRUStringA [COMCTL32.155]
- *
+ * 
  * Searches string list for item that matches lpszString.
  * Returns position in list order 0 -> MRU and if lpRegNum != NULL then value
@@ -614 +614 @@
 {
     FIXME("(%08x, %s, %p) empty stub!\n", hList, debugstr_a(lpszString),
-      lpRegNum);
+          lpRegNum);
 
     return 0;
@@ -640 +640 @@
 
     if (lpcml == NULL)
-    return 0;
+        return 0;
 
     if (lpcml->cbSize < sizeof(CREATEMRULIST))
-    return 0;
+        return 0;
 
     FIXME("(%lu %lu %lx %lx \"%s\" %p)\n",
-      lpcml->cbSize, lpcml->nMaxItems, lpcml->dwFlags,
-      (DWORD)lpcml->hKey, lpcml->lpszSubKey, lpcml->lpfnCompare);
+          lpcml->cbSize, lpcml->nMaxItems, lpcml->dwFlags,
+          (DWORD)lpcml->hKey, lpcml->lpszSubKey, lpcml->lpfnCompare);
 
     /* dummy pointer creation */
@@ -659 +659 @@
 /**************************************************************************
  *                EnumMRUListA [COMCTL32.154]
- *
+ * 
  * Enumerate item in a list
  *
@@ -673 +673 @@
  *    of list returns -1.
  *    If lpBuffer == NULL or nItemPos is -ve return value is no. of items in
- *    the list.
+ *    the list. 
  */
 INT WINAPI EnumMRUListA(HANDLE hList, INT nItemPos, LPVOID lpBuffer,
@@ -679 +679 @@
 {
     FIXME("(%08x, %d, %p, %ld): stub\n", hList, nItemPos, lpBuffer,
-      nBufferSize);
+          nBufferSize);
     return 0;
 }
@@ -702 +702 @@
 
     if (!lpDest && lpSrc)
-    return strlen (lpSrc);
+        return strlen (lpSrc);
 
     if (nMaxLen == 0)
-    return 0;
+        return 0;
 
     if (lpSrc == NULL) {
-    lpDest[0] = '\0';
-    return 0;
+        lpDest[0] = '\0';
+        return 0;
     }
 
     len = strlen (lpSrc);
     if (len >= nMaxLen)
-    len = nMaxLen - 1;
+        len = nMaxLen - 1;
 
     RtlMoveMemory (lpDest, lpSrc, len);
@@ -737 +737 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
-
+ 
     if (lpSrc) {
-    LPSTR ptr = COMCTL32_ReAlloc (*lppDest, strlen (lpSrc) + 1);
-    if (!ptr)
-        return FALSE;
-    strcpy (ptr, lpSrc);
-    *lppDest = ptr;
+        LPSTR ptr = COMCTL32_ReAlloc (*lppDest, strlen (lpSrc) + 1);
+        if (!ptr)
+            return FALSE;
+        strcpy (ptr, lpSrc);
+        *lppDest = ptr;
     }
     else {
-    if (*lppDest) {
-        COMCTL32_Free (*lppDest);
-        *lppDest = NULL;
-    }
+        if (*lppDest) {
+            COMCTL32_Free (*lppDest);
+            *lppDest = NULL;
+        }
     }
 
@@ -775 +775 @@
 
     if (!lpDest && lpSrc)
-    return strlenW (lpSrc);
+        return strlenW (lpSrc);
 
     if (nMaxLen == 0)
-    return 0;
+        return 0;
 
     if (lpSrc == NULL) {
-    lpDest[0] = L'\0';
-    return 0;
+        lpDest[0] = L'\0';
+        return 0;
     }
 
     len = strlenW (lpSrc);
     if (len >= nMaxLen)
-    len = nMaxLen - 1;
+        len = nMaxLen - 1;
 
     RtlMoveMemory (lpDest, lpSrc, len*sizeof(WCHAR));
@@ -810 +810 @@
 {
     TRACE("(%p %p)\n", lppDest, lpSrc);
-
+ 
     if (lpSrc) {
-    INT len = strlenW (lpSrc) + 1;
-    LPWSTR ptr = COMCTL32_ReAlloc (*lppDest, len * sizeof(WCHAR));
-    if (!ptr)
-        return FALSE;
-    strcpyW (ptr, lpSrc);
-    *lppDest = ptr;
+        INT len = strlenW (lpSrc) + 1;
+        LPWSTR ptr = COMCTL32_ReAlloc (*lppDest, len * sizeof(WCHAR));
+        if (!ptr)
+            return FALSE;
+        strcpyW (ptr, lpSrc);
+        *lppDest = ptr;
     }
     else {
-    if (*lppDest) {
-        COMCTL32_Free (*lppDest);
-        *lppDest = NULL;
-    }
+        if (*lppDest) {
+            COMCTL32_Free (*lppDest);
+            *lppDest = NULL;
+        }
     }
 
@@ -852 +852 @@
 
     if (!lpDest && lpSrc)
-    return WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, 0, 0, NULL, NULL);
+        return WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, 0, 0, NULL, NULL);
 
     if (nMaxLen == 0)
-    return 0;
+        return 0;
 
     if (lpSrc == NULL) {
-    lpDest[0] = '\0';
-    return 0;
+        lpDest[0] = '\0';
+        return 0;
     }
 
     len = WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, 0, 0, NULL, NULL);
     if (len >= nMaxLen)
-    len = nMaxLen - 1;
+        len = nMaxLen - 1;
 
     WideCharToMultiByte(CP_ACP, 0, lpSrc, -1, lpDest, len, NULL, NULL);
@@ -897 +897 @@
 
     if (lpSrc) {
-    INT len = MultiByteToWideChar(CP_ACP,0,lpSrc,-1,NULL,0);
-    LPWSTR ptr = COMCTL32_ReAlloc (*lppDest, len*sizeof(WCHAR));
-
-    if (!ptr)
-        return FALSE;
-    MultiByteToWideChar(CP_ACP,0,lpSrc,-1,ptr,len);
-    *lppDest = ptr;
+        INT len = MultiByteToWideChar(CP_ACP,0,lpSrc,-1,NULL,0);
+        LPWSTR ptr = 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;
-    }
+        if (*lppDest) {
+            COMCTL32_Free (*lppDest);
+            *lppDest = NULL;
+        }
     }
 
@@ -944 +944 @@
     if (hdsa)
     {
-    hdsa->nItemCount = 0;
+        hdsa->nItemCount = 0;
         hdsa->pData = NULL;
-    hdsa->nMaxCount = 0;
-    hdsa->nItemSize = nSize;
-    hdsa->nGrow = max(1, nGrow);
+        hdsa->nMaxCount = 0;
+        hdsa->nItemSize = nSize;
+        hdsa->nGrow = max(1, nGrow);
     }
 
@@ -972 +972 @@
 
     if (!hdsa)
-    return FALSE;
+        return FALSE;
 
     if (hdsa->pData && (!COMCTL32_Free (hdsa->pData)))
-    return FALSE;
+        return FALSE;
 
     return COMCTL32_Free (hdsa);
@@ -982 +982 @@
 
 /**************************************************************************
- * DSA_GetItem [COMCTL32.322]
+ * DSA_GetItem [COMCTL32.322] 
  *
  * PARAMS
@@ -1000 +1000 @@
 
     TRACE("(%p %d %p)\n", hdsa, nIndex, pDest);
-
+    
     if (!hdsa)
-    return FALSE;
+        return FALSE;
     if ((nIndex < 0) || (nIndex >= hdsa->nItemCount))
-    return FALSE;
+        return FALSE;
 
     pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
@@ -1014 +1014 @@
 
 /**************************************************************************
- * DSA_GetItemPtr [COMCTL32.323]
+ * DSA_GetItemPtr [COMCTL32.323] 
  *
  * Retrieves a pointer to the specified item.
@@ -1035 +1035 @@
 
     if (!hdsa)
-    return NULL;
+        return NULL;
     if ((nIndex < 0) || (nIndex >= hdsa->nItemCount))
-    return NULL;
+        return NULL;
 
     pSrc = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
-
+    
     TRACE("-- ret=%p\n", pSrc);
 
@@ -1048 +1048 @@
 
 /**************************************************************************
- * DSA_SetItem [COMCTL32.325]
+ * DSA_SetItem [COMCTL32.325] 
  *
  * Sets the contents of an item in the array.
@@ -1067 +1067 @@
     INT  nSize, nNewItems;
     LPVOID pDest, lpTemp;
-
+    
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
     if ((!hdsa) || nIndex < 0)
-    return FALSE;
-
+        return FALSE;
+      
     if (hdsa->nItemCount <= nIndex) {
-    /* within the old array */
-    if (hdsa->nMaxCount > nIndex) {
-        /* within the allocated space, set a new boundary */
-        hdsa->nItemCount = nIndex + 1;
-    }
-    else {
-        /* resize the block of memory */
-        nNewItems =
-        hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1);
-        nSize = hdsa->nItemSize * nNewItems;
-
-        lpTemp = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
-        if (!lpTemp)
-        return FALSE;
-
-        hdsa->nMaxCount = nNewItems;
-        hdsa->nItemCount = nIndex + 1;
-        hdsa->pData = lpTemp;
-    }
+        /* within the old array */
+        if (hdsa->nMaxCount > nIndex) {
+            /* within the allocated space, set a new boundary */
+            hdsa->nItemCount = nIndex + 1;
+        }
+        else {
+            /* resize the block of memory */
+            nNewItems =
+                hdsa->nGrow * ((INT)(((nIndex + 1) - 1) / hdsa->nGrow) + 1);
+            nSize = hdsa->nItemSize * nNewItems;
+
+            lpTemp = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
+            if (!lpTemp)
+                return FALSE;
+
+            hdsa->nMaxCount = nNewItems;
+            hdsa->nItemCount = nIndex + 1;
+            hdsa->pData = lpTemp;
+        }    
     }
 
@@ -1098 +1098 @@
     pDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
     TRACE("-- move dest=%p src=%p size=%d\n",
-       pDest, pSrc, hdsa->nItemSize);
+           pDest, pSrc, hdsa->nItemSize);
     memmove (pDest, pSrc, hdsa->nItemSize);
 
@@ -1106 +1106 @@
 
 /**************************************************************************
- * DSA_InsertItem [COMCTL32.324]
+ * DSA_InsertItem [COMCTL32.324] 
  *
  * PARAMS
@@ -1124 +1124 @@
     LPVOID  lpTemp, lpDest;
     LPDWORD p;
-
+    
     TRACE("(%p %d %p)\n", hdsa, nIndex, pSrc);
 
     if ((!hdsa) || nIndex < 0)
-    return -1;
+        return -1;
 
     for (i = 0; i < hdsa->nItemSize; i += 4) {
-    p = *(DWORD**)((char *) pSrc + i);
-    if (IsBadStringPtrA ((char*)p, 256))
-        TRACE("-- %d=%p\n", i, (DWORD*)p);
-    else
-        TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
-    }
-
+        p = *(DWORD**)((char *) pSrc + i);
+        if (IsBadStringPtrA ((char*)p, 256))
+            TRACE("-- %d=%p\n", i, (DWORD*)p);
+        else
+            TRACE("-- %d=%p [%s]\n", i, p, debugstr_a((char*)p));
+    }
+   
     /* when nIndex >= nItemCount then append */
     if (nIndex >= hdsa->nItemCount)
-    nIndex = hdsa->nItemCount;
+        nIndex = hdsa->nItemCount;
 
     /* do we need to resize ? */
     if (hdsa->nItemCount >= hdsa->nMaxCount) {
-    nNewItems = hdsa->nMaxCount + hdsa->nGrow;
-    nSize = hdsa->nItemSize * nNewItems;
-
-    lpTemp = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
-    if (!lpTemp)
-        return -1;
-
-    hdsa->nMaxCount = nNewItems;
-    hdsa->pData = lpTemp;
+        nNewItems = hdsa->nMaxCount + hdsa->nGrow;
+        nSize = hdsa->nItemSize * nNewItems;
+
+        lpTemp = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
+        if (!lpTemp)
+            return -1;
+
+        hdsa->nMaxCount = nNewItems;
+        hdsa->pData = lpTemp;         
     }
 
     /* do we need to move elements ? */
     if (nIndex < hdsa->nItemCount) {
-    lpTemp = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
-    lpDest = (char *) lpTemp + hdsa->nItemSize;
-    nSize = (hdsa->nItemCount - nIndex) * hdsa->nItemSize;
-    TRACE("-- move dest=%p src=%p size=%d\n",
-           lpDest, lpTemp, nSize);
-    memmove (lpDest, lpTemp, nSize);
+        lpTemp = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
+        lpDest = (char *) lpTemp + hdsa->nItemSize;
+        nSize = (hdsa->nItemCount - nIndex) * hdsa->nItemSize;
+        TRACE("-- move dest=%p src=%p size=%d\n",
+               lpDest, lpTemp, nSize);
+        memmove (lpDest, lpTemp, nSize);
     }
 
@@ -1169 +1169 @@
     lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
     TRACE("-- move dest=%p src=%p size=%d\n",
-       lpDest, pSrc, hdsa->nItemSize);
+           lpDest, pSrc, hdsa->nItemSize);
     memmove (lpDest, pSrc, hdsa->nItemSize);
 
@@ -1177 +1177 @@
 
 /**************************************************************************
- * DSA_DeleteItem [COMCTL32.326]
+ * DSA_DeleteItem [COMCTL32.326] 
  *
  * PARAMS
@@ -1193 +1193 @@
     LPVOID lpDest,lpSrc;
     INT  nSize;
-
+    
     TRACE("(%p %d)\n", hdsa, nIndex);
 
     if (!hdsa)
-    return -1;
+        return -1;
     if (nIndex < 0 || nIndex >= hdsa->nItemCount)
-    return -1;
+        return -1;
 
     /* do we need to move ? */
     if (nIndex < hdsa->nItemCount - 1) {
-    lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
-    lpSrc = (char *) lpDest + hdsa->nItemSize;
-    nSize = hdsa->nItemSize * (hdsa->nItemCount - nIndex - 1);
-    TRACE("-- move dest=%p src=%p size=%d\n",
-           lpDest, lpSrc, nSize);
-    memmove (lpDest, lpSrc, nSize);
-    }
-
+        lpDest = (char *) hdsa->pData + (hdsa->nItemSize * nIndex);
+        lpSrc = (char *) lpDest + hdsa->nItemSize;
+        nSize = hdsa->nItemSize * (hdsa->nItemCount - nIndex - 1);
+        TRACE("-- move dest=%p src=%p size=%d\n",
+               lpDest, lpSrc, nSize);
+        memmove (lpDest, lpSrc, nSize);
+    }
+    
     hdsa->nItemCount--;
-
+    
     /* free memory ? */
     if ((hdsa->nMaxCount - hdsa->nItemCount) >= hdsa->nGrow) {
-    nSize = hdsa->nItemSize * hdsa->nItemCount;
-
-    lpDest = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
-    if (!lpDest)
-        return -1;
-
-    hdsa->nMaxCount = hdsa->nItemCount;
-    hdsa->pData = lpDest;
+        nSize = hdsa->nItemSize * hdsa->nItemCount;
+
+        lpDest = (LPVOID)COMCTL32_ReAlloc (hdsa->pData, nSize);
+        if (!lpDest)
+            return -1;
+
+        hdsa->nMaxCount = hdsa->nItemCount;
+        hdsa->pData = lpDest;
     }
 
@@ -1247 +1247 @@
     TRACE("(%p)\n", hdsa);
 
-    if (!hdsa)
-    return FALSE;
+    if (!hdsa) 
+        return FALSE;
     if (hdsa->pData && (!COMCTL32_Free (hdsa->pData)))
-    return FALSE;
+        return FALSE;
 
     hdsa->nItemCount = 0;
@@ -1285 +1285 @@
     hdpa = (HDPA)COMCTL32_Alloc (sizeof(DPA));
     if (hdpa) {
-    hdpa->nGrow = max(8, nGrow);
-    hdpa->hHeap = COMCTL32_hHeap;
-    hdpa->nMaxCount = hdpa->nGrow * 2;
-    hdpa->ptrs =
-        (LPVOID*)COMCTL32_Alloc (hdpa->nMaxCount * sizeof(LPVOID));
+        hdpa->nGrow = max(8, nGrow);
+        hdpa->hHeap = COMCTL32_hHeap;
+        hdpa->nMaxCount = hdpa->nGrow * 2;
+        hdpa->ptrs =
+            (LPVOID*)COMCTL32_Alloc (hdpa->nMaxCount * sizeof(LPVOID));
     }
 
@@ -1315 +1315 @@
 
     if (!hdpa)
-    return FALSE;
+        return FALSE;
 
     if (hdpa->ptrs && (!HeapFree (hdpa->hHeap, 0, hdpa->ptrs)))
-    return FALSE;
+        return FALSE;
 
     return HeapFree (hdpa->hHeap, 0, hdpa);
@@ -1344 +1344 @@
 
     if (!hdpa)
-    return FALSE;
+        return FALSE;
 
     hdpa->nGrow = max(8, nGrow);
@@ -1379 +1379 @@
 
     if (!hdpa)
-    return NULL;
+        return NULL;
 
     TRACE("(%p %p)\n", hdpa, hdpaNew);
 
     if (!hdpaNew) {
-    /* create a new DPA */
-    hdpaTemp = (HDPA)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                    sizeof(DPA));
-    hdpaTemp->hHeap = hdpa->hHeap;
-    hdpaTemp->nGrow = hdpa->nGrow;
+        /* create a new DPA */
+        hdpaTemp = (HDPA)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                    sizeof(DPA));
+        hdpaTemp->hHeap = hdpa->hHeap;
+        hdpaTemp->nGrow = hdpa->nGrow;
     }
     else
-    hdpaTemp = hdpaNew;
+        hdpaTemp = hdpaNew;
 
     if (hdpaTemp->ptrs) {
-    /* remove old pointer array */
-    HeapFree (hdpaTemp->hHeap, 0, hdpaTemp->ptrs);
-    hdpaTemp->ptrs = NULL;
-    hdpaTemp->nItemCount = 0;
-    hdpaTemp->nMaxCount = 0;
+        /* remove old pointer array */
+        HeapFree (hdpaTemp->hHeap, 0, hdpaTemp->ptrs);
+        hdpaTemp->ptrs = NULL;
+        hdpaTemp->nItemCount = 0;
+        hdpaTemp->nMaxCount = 0;
     }
 
     /* create a new pointer array */
     nNewItems = hdpaTemp->nGrow *
-        ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
+                ((INT)((hdpa->nItemCount - 1) / hdpaTemp->nGrow) + 1);
     nSize = nNewItems * sizeof(LPVOID);
     hdpaTemp->ptrs =
-    (LPVOID*)HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
+        (LPVOID*)HeapAlloc (hdpaTemp->hHeap, HEAP_ZERO_MEMORY, nSize);
     hdpaTemp->nMaxCount = nNewItems;
 
@@ -1412 +1412 @@
     hdpaTemp->nItemCount = hdpa->nItemCount;
     memmove (hdpaTemp->ptrs, hdpa->ptrs,
-         hdpaTemp->nItemCount * sizeof(LPVOID));
+             hdpaTemp->nItemCount * sizeof(LPVOID));
 
     return hdpaTemp;
@@ -1438 +1438 @@
 
     if (!hdpa)
-    return NULL;
+        return NULL;
     if (!hdpa->ptrs) {
-    WARN("no pointer array.\n");
-    return NULL;
+        WARN("no pointer array.\n");
+        return NULL;
     }
     if ((i < 0) || (i >= hdpa->nItemCount)) {
-    WARN("not enough pointers in array (%d vs %d).\n",i,hdpa->nItemCount);
-    return NULL;
+        WARN("not enough pointers in array (%d vs %d).\n",i,hdpa->nItemCount);
+        return NULL;
     }
 
@@ -1474 +1474 @@
 
     if (!hdpa->ptrs)
-    return -1;
+        return -1;
 
     for (i = 0; i < hdpa->nItemCount; i++) {
-    if (hdpa->ptrs[i] == p)
-        return i;
+        if (hdpa->ptrs[i] == p)
+            return i;
     }
 
@@ -1509 +1509 @@
 
     if ((!hdpa) || (i < 0))
-    return -1;
+        return -1;
 
     if (!hdpa->ptrs) {
-    hdpa->ptrs =
-        (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                2 * hdpa->nGrow * sizeof(LPVOID));
-    if (!hdpa->ptrs)
-        return -1;
-    hdpa->nMaxCount = hdpa->nGrow * 2;
+        hdpa->ptrs =
+            (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                2 * hdpa->nGrow * sizeof(LPVOID));
+        if (!hdpa->ptrs)
+            return -1;
+        hdpa->nMaxCount = hdpa->nGrow * 2;
         nIndex = 0;
     }
     else {
-    if (hdpa->nItemCount >= hdpa->nMaxCount) {
-        TRACE("-- resizing\n");
-        nNewItems = hdpa->nMaxCount + hdpa->nGrow;
-        nSize = nNewItems * sizeof(LPVOID);
-
-        lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                       hdpa->ptrs, nSize);
-        if (!lpTemp)
-        return -1;
-        hdpa->nMaxCount = nNewItems;
-        hdpa->ptrs = lpTemp;
-    }
-
-    if (i >= hdpa->nItemCount) {
-        nIndex = hdpa->nItemCount;
-        TRACE("-- appending at %d\n", nIndex);
-    }
-    else {
-        TRACE("-- inserting at %d\n", i);
-        lpTemp = hdpa->ptrs + i;
-        lpDest = lpTemp + 1;
-        nSize  = (hdpa->nItemCount - i) * sizeof(LPVOID);
-        TRACE("-- move dest=%p src=%p size=%x\n",
-           lpDest, lpTemp, nSize);
-        memmove (lpDest, lpTemp, nSize);
-        nIndex = i;
-    }
+        if (hdpa->nItemCount >= hdpa->nMaxCount) {
+            TRACE("-- resizing\n");
+            nNewItems = hdpa->nMaxCount + hdpa->nGrow;
+            nSize = nNewItems * sizeof(LPVOID);
+
+            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                           hdpa->ptrs, nSize);
+            if (!lpTemp)
+                return -1;
+            hdpa->nMaxCount = nNewItems;
+            hdpa->ptrs = lpTemp;
+        }
+
+        if (i >= hdpa->nItemCount) {
+            nIndex = hdpa->nItemCount;
+            TRACE("-- appending at %d\n", nIndex);
+        }
+        else {
+            TRACE("-- inserting at %d\n", i);
+            lpTemp = hdpa->ptrs + i;
+            lpDest = lpTemp + 1;
+            nSize  = (hdpa->nItemCount - i) * sizeof(LPVOID);
+            TRACE("-- move dest=%p src=%p size=%x\n",
+                   lpDest, lpTemp, nSize);
+            memmove (lpDest, lpTemp, nSize);
+            nIndex = i;
+        }
     }
 
@@ -1577 +1577 @@
 {
     LPVOID *lpTemp;
-
+    
     TRACE("(%p %d %p)\n", hdpa, i, p);
 
     if ((!hdpa) || i < 0)
-    return FALSE;
-
+        return FALSE;
+      
     if (hdpa->nItemCount <= i) {
-    /* within the old array */
-    if (hdpa->nMaxCount > i) {
-        /* within the allocated space, set a new boundary */
-        hdpa->nItemCount = i+1;
-    }
-    else {
-        /* resize the block of memory */
-        INT nNewItems =
-        hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1);
-        INT nSize = nNewItems * sizeof(LPVOID);
-
-        lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                       hdpa->ptrs, nSize);
-        if (!lpTemp)
-        return FALSE;
-
-        hdpa->nItemCount = nNewItems;
-        hdpa->ptrs = lpTemp;
-    }
+        /* within the old array */
+        if (hdpa->nMaxCount > i) {
+            /* within the allocated space, set a new boundary */
+            hdpa->nItemCount = i+1;
+        }
+        else {
+            /* resize the block of memory */
+            INT nNewItems =
+                hdpa->nGrow * ((INT)(((i+1) - 1) / hdpa->nGrow) + 1);
+            INT nSize = nNewItems * sizeof(LPVOID);
+
+            lpTemp = (LPVOID*)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                           hdpa->ptrs, nSize);
+            if (!lpTemp)
+                return FALSE;
+
+            hdpa->nItemCount = nNewItems;
+            hdpa->ptrs = lpTemp;        
+        }    
     }
 
@@ -1631 +1631 @@
     LPVOID *lpDest, *lpSrc, lpTemp = NULL;
     INT  nSize;
-
+    
     TRACE("(%p %d)\n", hdpa, i);
 
     if ((!hdpa) || i < 0 || i >= hdpa->nItemCount)
-    return NULL;
+        return NULL;
 
     lpTemp = hdpa->ptrs[i];
@@ -1641 +1641 @@
     /* do we need to move ?*/
     if (i < hdpa->nItemCount - 1) {
-    lpDest = hdpa->ptrs + i;
-    lpSrc = lpDest + 1;
-    nSize = (hdpa->nItemCount - i - 1) * sizeof(LPVOID);
-    TRACE("-- move dest=%p src=%p size=%x\n",
-           lpDest, lpSrc, nSize);
-    memmove (lpDest, lpSrc, nSize);
-    }
-
+        lpDest = hdpa->ptrs + i;
+        lpSrc = lpDest + 1;
+        nSize = (hdpa->nItemCount - i - 1) * sizeof(LPVOID);
+        TRACE("-- move dest=%p src=%p size=%x\n",
+               lpDest, lpSrc, nSize);
+        memmove (lpDest, lpSrc, nSize);
+    }
+    
     hdpa->nItemCount --;
-
+    
     /* free memory ?*/
     if ((hdpa->nMaxCount - hdpa->nItemCount) >= hdpa->nGrow) {
-    INT nNewItems = max(hdpa->nGrow * 2, hdpa->nItemCount);
-    nSize = nNewItems * sizeof(LPVOID);
-    lpDest = (LPVOID)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                      hdpa->ptrs, nSize);
-    if (!lpDest)
-        return NULL;
-
-    hdpa->nMaxCount = nNewItems;
-    hdpa->ptrs = (LPVOID*)lpDest;
+        INT nNewItems = max(hdpa->nGrow * 2, hdpa->nItemCount);
+        nSize = nNewItems * sizeof(LPVOID);
+        lpDest = (LPVOID)HeapReAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
+                                      hdpa->ptrs, nSize);
+        if (!lpDest)
+            return NULL;
+
+        hdpa->nMaxCount = nNewItems;
+        hdpa->ptrs = (LPVOID*)lpDest;         
     }
 
@@ -1686 +1686 @@
     TRACE("(%p)\n", hdpa);
 
-    if (!hdpa)
-    return FALSE;
+    if (!hdpa) 
+        return FALSE;
 
     if (hdpa->ptrs && (!HeapFree (hdpa->hHeap, 0, hdpa->ptrs)))
-    return FALSE;
+        return FALSE;
 
     hdpa->nItemCount = 0;
     hdpa->nMaxCount = hdpa->nGrow * 2;
     hdpa->ptrs = (LPVOID*)HeapAlloc (hdpa->hHeap, HEAP_ZERO_MEMORY,
-                     hdpa->nMaxCount * sizeof(LPVOID));
+                                     hdpa->nMaxCount * sizeof(LPVOID));
 
     return TRUE;
@@ -1719 +1719 @@
 static VOID
 DPA_QuickSort (LPVOID *lpPtrs, INT l, INT r,
-           PFNDPACOMPARE pfnCompare, LPARAM lParam)
+               PFNDPACOMPARE pfnCompare, LPARAM lParam)
 {
     INT m;
@@ -1725 +1725 @@
 
     TRACE("l=%i r=%i\n", l, r);
-
+ 
     if (l==r)    /* one element is always sorted */
         return;
     if (r<l)     /* oops, got it in the wrong order */
-    {
+        {
         DPA_QuickSort(lpPtrs, r, l, pfnCompare, lParam);
         return;
-    }
+        }
     m = (l+r)/2; /* divide by two */
     DPA_QuickSort(lpPtrs, l, m, pfnCompare, lParam);
@@ -1738 +1738 @@
 
     /* join the two sides */
-    while( (l<=m) && (m<r) )
+    while( (l<=m) && (m<r) ) 
     {
         if(pfnCompare(lpPtrs[l],lpPtrs[m+1],lParam)>0)
@@ -1772 +1772 @@
 {
     if (!hdpa || !pfnCompare)
-    return FALSE;
+        return FALSE;
 
     TRACE("(%p %p 0x%lx)\n", hdpa, pfnCompare, lParam);
 
     if ((hdpa->nItemCount > 1) && (hdpa->ptrs))
-    DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1,
-               pfnCompare, lParam);
+        DPA_QuickSort (hdpa->ptrs, 0, hdpa->nItemCount - 1,
+                       pfnCompare, lParam);
 
     return TRUE;
@@ -1809 +1809 @@
 INT WINAPI
 DPA_Search (const HDPA hdpa, LPVOID pFind, INT nStart,
-        PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions)
+            PFNDPACOMPARE pfnCompare, LPARAM lParam, UINT uOptions)
 {
     if (!hdpa || !pfnCompare || !pFind)
-    return -1;
+        return -1;
 
     TRACE("(%p %p %d %p 0x%08lx 0x%08x)\n",
-       hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
+           hdpa, pFind, nStart, pfnCompare, lParam, uOptions);
 
     if (uOptions & DPAS_SORTED) {
-    /* array is sorted --> use binary search */
-    INT l, r, x, n;
-    LPVOID *lpPtr;
-
-    TRACE("binary search\n");
-
-    l = (nStart == -1) ? 0 : nStart;
-    r = hdpa->nItemCount - 1;
-    lpPtr = hdpa->ptrs;
-    while (r >= l) {
-        x = (l + r) / 2;
-        n = (pfnCompare)(pFind, lpPtr[x], lParam);
-        if (n < 0)
-        r = x - 1;
-        else
-        l = x + 1;
-        if (n == 0) {
-        TRACE("-- ret=%d\n", n);
-        return n;
-        }
-    }
-
-    if (uOptions & DPAS_INSERTBEFORE) {
-        TRACE("-- ret=%d\n", r);
-        return r;
-    }
-
-    if (uOptions & DPAS_INSERTAFTER) {
-        TRACE("-- ret=%d\n", l);
-        return l;
-    }
+        /* array is sorted --> use binary search */
+        INT l, r, x, n;
+        LPVOID *lpPtr;
+
+        TRACE("binary search\n");
+
+        l = (nStart == -1) ? 0 : nStart;
+        r = hdpa->nItemCount - 1;
+        lpPtr = hdpa->ptrs;
+        while (r >= l) {
+            x = (l + r) / 2;
+            n = (pfnCompare)(pFind, lpPtr[x], lParam);
+            if (n < 0)
+                r = x - 1;
+            else
+                l = x + 1;
+            if (n == 0) {
+                TRACE("-- ret=%d\n", n);
+                return n;
+            }
+        }
+
+        if (uOptions & DPAS_INSERTBEFORE) {
+            TRACE("-- ret=%d\n", r);
+            return r;
+        }
+
+        if (uOptions & DPAS_INSERTAFTER) {
+            TRACE("-- ret=%d\n", l);
+            return l;
+        }
     }
     else {
-    /* array is not sorted --> use linear search */
-    LPVOID *lpPtr;
-    INT  nIndex;
-
-    TRACE("linear search\n");
-
-    nIndex = (nStart == -1)? 0 : nStart;
-    lpPtr = hdpa->ptrs;
-    for (; nIndex < hdpa->nItemCount; nIndex++) {
-        if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) {
-        TRACE("-- ret=%d\n", nIndex);
-        return nIndex;
-        }
-    }
+        /* array is not sorted --> use linear search */
+        LPVOID *lpPtr;
+        INT  nIndex;
+
+        TRACE("linear search\n");
+        
+        nIndex = (nStart == -1)? 0 : nStart;
+        lpPtr = hdpa->ptrs;
+        for (; nIndex < hdpa->nItemCount; nIndex++) {
+            if ((pfnCompare)(pFind, lpPtr[nIndex], lParam) == 0) {
+                TRACE("-- ret=%d\n", nIndex);
+                return nIndex;
+            }
+        }
     }
 
@@ -1894 +1894 @@
 
     if (hHeap)
-    hdpa = (HDPA)HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(DPA));
+        hdpa = (HDPA)HeapAlloc (hHeap, HEAP_ZERO_MEMORY, sizeof(DPA));
     else
-    hdpa = (HDPA)COMCTL32_Alloc (sizeof(DPA));
+        hdpa = (HDPA)COMCTL32_Alloc (sizeof(DPA));
 
     if (hdpa) {
-    hdpa->nGrow = min(8, nGrow);
-    hdpa->hHeap = hHeap ? hHeap : COMCTL32_hHeap;
-    hdpa->nMaxCount = hdpa->nGrow * 2;
-    hdpa->ptrs =
-        (LPVOID*)HeapAlloc (hHeap, HEAP_ZERO_MEMORY,
-                hdpa->nMaxCount * sizeof(LPVOID));
+        hdpa->nGrow = min(8, nGrow);
+        hdpa->hHeap = hHeap ? hHeap : COMCTL32_hHeap;
+        hdpa->nMaxCount = hdpa->nGrow * 2;
+        hdpa->ptrs =
+            (LPVOID*)HeapAlloc (hHeap, HEAP_ZERO_MEMORY,
+                                hdpa->nMaxCount * sizeof(LPVOID));
     }
 
@@ -1940 +1940 @@
 
     TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
-       lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
-       lpNotify->dwParam5);
+           lpNotify->hwndFrom, lpNotify->hwndTo, uCode, lpHdr,
+           lpNotify->dwParam5);
 
     if (!lpNotify->hwndTo)
-    return 0;
+        return 0;
 
     if (lpNotify->hwndFrom == -1) {
-    lpNmh = lpHdr;
-    idFrom = lpHdr->idFrom;
+        lpNmh = lpHdr;
+        idFrom = lpHdr->idFrom;
     }
     else {
-    if (lpNotify->hwndFrom) {
-        HWND hwndParent = GetParent (lpNotify->hwndFrom);
-        if (hwndParent) {
-        hwndParent = GetWindow (lpNotify->hwndFrom, GW_OWNER);
-        if (hwndParent)
-            idFrom = GetDlgCtrlID (lpNotify->hwndFrom);
-        }
-    }
-
-    lpNmh = (lpHdr) ? lpHdr : &nmhdr;
-
-    lpNmh->hwndFrom = lpNotify->hwndFrom;
-    lpNmh->idFrom = idFrom;
-    lpNmh->code = uCode;
+        if (lpNotify->hwndFrom) {
+            HWND hwndParent = GetParent (lpNotify->hwndFrom);
+            if (hwndParent) {
+                hwndParent = GetWindow (lpNotify->hwndFrom, GW_OWNER);
+                if (hwndParent)
+                    idFrom = GetDlgCtrlID (lpNotify->hwndFrom);
+            }
+        }
+
+        lpNmh = (lpHdr) ? lpHdr : &nmhdr;
+
+        lpNmh->hwndFrom = lpNotify->hwndFrom;
+        lpNmh->idFrom = idFrom;
+        lpNmh->code = uCode;
     }
 
@@ -1987 +1987 @@
 LRESULT WINAPI
 COMCTL32_SendNotify (HWND hwndFrom, HWND hwndTo,
-             UINT uCode, LPNMHDR lpHdr)
+                     UINT uCode, LPNMHDR lpHdr)
 {
     NOTIFYDATA notify;
 
     TRACE("(0x%04x 0x%04x %d %p)\n",
-       hwndFrom, hwndTo, uCode, lpHdr);
+           hwndFrom, hwndTo, uCode, lpHdr);
 
     notify.hwndFrom = hwndFrom;
@@ -2020 +2020 @@
 LRESULT WINAPI
 COMCTL32_SendNotifyEx (HWND hwndTo, HWND hwndFrom, UINT uCode,
-               LPNMHDR lpHdr, DWORD dwParam5)
+                       LPNMHDR lpHdr, DWORD dwParam5)
 {
     NOTIFYDATA notify;
@@ -2026 +2026 @@
 
     TRACE("(0x%04x 0x%04x %d %p 0x%08lx)\n",
-       hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
+           hwndFrom, hwndTo, uCode, lpHdr, dwParam5);
 
     hwndNotify = hwndTo;
     if (!hwndTo) {
-    if (IsWindow (hwndFrom)) {
-        hwndNotify = GetParent (hwndFrom);
-        if (!hwndNotify)
-        return 0;
-    }
+        if (IsWindow (hwndFrom)) {
+            hwndNotify = GetParent (hwndFrom);
+            if (!hwndNotify)
+                return 0;
+        }
     }
 
@@ -2069 +2069 @@
 
     if (*lpStr2 == 0)
-    return ((LPSTR)lpStr1);
+        return ((LPSTR)lpStr1);
     len1 = 0;
     while (lpStr1[len1] != 0) ++len1;
@@ -2075 +2075 @@
     while (lpStr2[len2] != 0) ++len2;
     if (len2 == 0)
-    return ((LPSTR)(lpStr1 + len1));
+        return ((LPSTR)(lpStr1 + len1));
     first = tolower (*lpStr2);
     while (len1 >= len2) {
-    if (tolower(*lpStr1) == first) {
-        for (i = 1; i < len2; ++i)
-        if (tolower (lpStr1[i]) != tolower(lpStr2[i]))
-            break;
-        if (i >= len2)
-        return ((LPSTR)lpStr1);
+        if (tolower(*lpStr1) == first) {
+            for (i = 1; i < len2; ++i)
+                if (tolower (lpStr1[i]) != tolower(lpStr2[i]))
+                    break;
+            if (i >= len2)
+                return ((LPSTR)lpStr1);
         }
-    ++lpStr1; --len1;
+        ++lpStr1; --len1;
     }
     return (NULL);
@@ -2116 +2116 @@
  *
  * Enumerates all items in a dynamic pointer array.
+ *
+ * PARAMS
+ *     hdpa     [I] handle to the dynamic pointer array
+ *     enumProc [I]
+ *     lParam   [I] 
+ *
+ * RETURNS
+ *     none
+ */
+
+VOID WINAPI
+DPA_EnumCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
+{
+    INT i;
+
+    TRACE("(%p %p %08lx)\n", hdpa, enumProc, lParam);
+
+    if (!hdpa)
+        return;
+    if (hdpa->nItemCount <= 0)
+        return;
+
+    for (i = 0; i < hdpa->nItemCount; i++) {
+        if ((enumProc)(hdpa->ptrs[i], lParam) == 0)
+            return;
+    }
+
+    return;
+}
+
+
+/**************************************************************************
+ * DPA_DestroyCallback [COMCTL32.386]
+ *
+ * Enumerates all items in a dynamic pointer array and destroys it.
  *
  * PARAMS
@@ -2123 +2158 @@
  *
  * RETURNS
- *     none
- */
-
-VOID WINAPI
-DPA_EnumCallback (const HDPA hdpa, DPAENUMPROC enumProc, LPARAM lParam)
-{
-    INT i;
-
-    TRACE("(%p %p %08lx)\n", hdpa, enumProc, lParam);
-
-    if (!hdpa)
-    return;
-    if (hdpa->nItemCount <= 0)
-    return;
-
-    for (i = 0; i < hdpa->nItemCount; i++) {
-    if ((enumProc)(hdpa->ptrs[i], lParam) == 0)
-        return;
-    }
-
-    return;
-}
-
-
-/**************************************************************************
- * DPA_DestroyCallback [COMCTL32.386]
- *
- * Enumerates all items in a dynamic pointer array and destroys it.
- *
- * PARAMS
- *     hdpa     [I] handle to the dynamic pointer array
- *     enumProc [I]
- *     lParam   [I]
- *
- * RETURNS
  *     Success: TRUE
  *     Failure: FALSE
@@ -2195 +2195 @@
 
     if (!hdsa)
-    return;
+        return;
     if (hdsa->nItemCount <= 0)
-    return;
+        return;
 
     for (i = 0; i < hdsa->nItemCount; i++) {
-    LPVOID lpItem = DSA_GetItemPtr (hdsa, i);
-    if ((enumProc)(lpItem, lParam) == 0)
-        return;
+        LPVOID lpItem = DSA_GetItemPtr (hdsa, i);
+        if ((enumProc)(lpItem, lParam) == 0)
+            return;
     }
 
@@ -2301 +2301 @@
         if (dbcs && lpStart[1] != HIBYTE(wMatch)) continue;
         lpGotIt = lpStart;
-    }
+    }    
     return (LPSTR)lpGotIt;
 }
@@ -2355 +2355 @@
     if( strchrW(lpSet, *(WORD*)lpLoop))
       return (INT)(lpLoop-lpStr);
-
+  
   return (INT)(lpLoop-lpStr);
 }
@@ -2399 +2399 @@
 
     if (IsWindow (hwnd) == FALSE)
-    return FALSE;
+        return FALSE;
 
     if (b == 0)
-    return FALSE;
+        return FALSE;
 
 

trunk/src/comctl32/datetime.c

@@ -34 +34 @@
         COMCTL32_HEADER header;
 #endif
-    HWND hMonthCal;
-    HWND hUpdown;
-    SYSTEMTIME date;
-    BOOL dateValid;
-    HWND hwndCheckbut;
-    RECT rcClient; /* rect around the edge of the window */
-    RECT rcDraw; /* rect inside of the border */
-    RECT checkbox;  /* checkbox allowing the control to be enabled/disabled */
-    RECT calbutton; /* button that toggles the dropdown of the monthcal control */
-    BOOL bCalDepressed; /* TRUE = cal button is depressed */
-    int  select;
-    HFONT hFont;
-    int nrFieldsAllocated;
-    int nrFields;
-    int haveFocus;
-    int *fieldspec;
-    RECT *fieldRect;
-    int  *buflen;
-    char textbuf[256];
+        HWND hMonthCal;
+        HWND hUpdown;
+        SYSTEMTIME date;
+        BOOL dateValid;
+        HWND hwndCheckbut;
+        RECT rcClient; /* rect around the edge of the window */
+        RECT rcDraw; /* rect inside of the border */
+        RECT checkbox;  /* checkbox allowing the control to be enabled/disabled */
+        RECT calbutton; /* button that toggles the dropdown of the monthcal control */
+        BOOL bCalDepressed; /* TRUE = cal button is depressed */
+        int  select;
+        HFONT hFont;
+        int nrFieldsAllocated;
+        int nrFields;
+        int haveFocus;
+        int *fieldspec;
+        RECT *fieldRect;
+        int  *buflen;           
+        char textbuf[256];
         POINT monthcal_pos;
 } DATETIME_INFO, *LPDATETIME_INFO;
@@ -61 +61 @@
 /* this list of defines is closely related to `allowedformatchars' defined
  * in datetime.c; the high nibble indicates the `base type' of the format
- * specifier.
+ * specifier. 
  * Do not change without first reading DATETIME_UseFormat.
- *
+ * 
  */
 
-#define DT_END_FORMAT      0
-#define ONEDIGITDAY     0x01
-#define TWODIGITDAY     0x02
-#define THREECHARDAY    0x03
+#define DT_END_FORMAT      0 
+#define ONEDIGITDAY     0x01
+#define TWODIGITDAY     0x02
+#define THREECHARDAY    0x03
 #define FULLDAY         0x04
 #define ONEDIGIT12HOUR  0x11
@@ -94 +94 @@
 #define FORMATCALLBACK  0x81      /* -> maximum of 0x80 callbacks possible */
 #define FORMATCALLMASK  0x80
-#define DT_STRING   0x0100
+#define DT_STRING       0x0100
 
 #define DTHT_DATEFIELD  0xff      /* for hit-testing */
 
 #define DTHT_NONE     0
-#define DTHT_CHECKBOX 0x200 /* these should end at '00' , to make */
+#define DTHT_CHECKBOX 0x200     /* these should end at '00' , to make */
 #define DTHT_MCPOPUP  0x300     /* & DTHT_DATEFIELD 0 when DATETIME_KeyDown */
 #define DTHT_GOTFOCUS 0x400     /* tests for date-fields */
@@ -126 +126 @@
   if (!lParam) return GDT_NONE;
 
-  if ((dwStyle & DTS_SHOWNONE) &&
+  if ((dwStyle & DTS_SHOWNONE) && 
        (SendMessageA (infoPtr->hwndCheckbut, BM_GETCHECK, 0, 0)))
         return GDT_NONE;
@@ -145 +145 @@
   if (!lParam) return 0;
 
-  if (lParam==GDT_VALID)
-    MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
+  if (lParam==GDT_VALID) 
+        MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
   if (lParam==GDT_NONE) {
-    infoPtr->dateValid=FALSE;
+        infoPtr->dateValid=FALSE;
     SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 0, 0);
-    }
+        }
   return 1;
 }
@@ -228 +228 @@
 
 
-/*
-   Split up a formattxt in actions.
+/* 
+   Split up a formattxt in actions. 
    See ms documentation for the meaning of the letter codes/'specifiers'.
 
-   Notes:
+   Notes: 
    *'dddddd' is handled as 'dddd' plus 'dd'.
-   *unrecognized formats are strings (here given the type DT_STRING;
+   *unrecognized formats are strings (here given the type DT_STRING; 
    start of the string is encoded in lower bits of DT_STRING.
    Therefore, 'string' ends finally up as '<show seconds>tring'.
@@ -241 +241 @@
 
 
-static void
+static void 
 DATETIME_UseFormat (DATETIME_INFO *infoPtr, const char *formattxt)
 {
@@ -256 +256 @@
 
  for (i=0; i<strlen (formattxt); i++)  {
-    TRACE ("\n%d %c:",i, formattxt[i]);
-    for (j=0; j<len; j++) {
-        if (allowedformatchars[j]==formattxt[i]) {
-            TRACE ("%c[%d,%x]",allowedformatchars[j], *nrFields,
-                             infoPtr->fieldspec[*nrFields]);
-            if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) {
-                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
-                break;
-            }
-            if (infoPtr->fieldspec[*nrFields]>>4!=j) {
-                (*nrFields)++;
-                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
-                break;
-            }
-            if ((infoPtr->fieldspec[*nrFields] & 0x0f)==maxrepetition[j]) {
-                (*nrFields)++;
-                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
-                break;
-            }
-            infoPtr->fieldspec[*nrFields]++;
-            break;
-        }   /* if allowedformatchar */
-     } /* for j */
-
-
-            /* char is not a specifier: handle char like a string */
-    if (j==len) {
-        if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) {
-            infoPtr->fieldspec[*nrFields]=DT_STRING+k;
-            infoPtr->buflen[*nrFields]=0;
-        } else
-        if ((infoPtr->fieldspec[*nrFields] & DT_STRING)!=DT_STRING)  {
-            (*nrFields)++;
-            infoPtr->fieldspec[*nrFields]=DT_STRING+k;
-            infoPtr->buflen[*nrFields]=0;
-        }
-        infoPtr->textbuf[k]=formattxt[i];
-        k++;
-        infoPtr->buflen[*nrFields]++;
-    }   /* if j=len */
-
-    if (*nrFields==infoPtr->nrFieldsAllocated) {
-        FIXME ("out of memory; should reallocate. crash ahead.\n");
-    }
+        TRACE ("\n%d %c:",i, formattxt[i]);
+        for (j=0; j<len; j++) {
+                if (allowedformatchars[j]==formattxt[i]) {   
+                        TRACE ("%c[%d,%x]",allowedformatchars[j], *nrFields,
+                                                         infoPtr->fieldspec[*nrFields]);
+                        if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) {
+                                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
+                                break;
+                        }
+                        if (infoPtr->fieldspec[*nrFields]>>4!=j) {   
+                                (*nrFields)++;  
+                                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
+                                break;
+                        }
+                        if ((infoPtr->fieldspec[*nrFields] & 0x0f)==maxrepetition[j]) {
+                                (*nrFields)++;  
+                                infoPtr->fieldspec[*nrFields]=(j<<4) +1;
+                                break;
+                        }
+                        infoPtr->fieldspec[*nrFields]++;
+                        break;
+                }   /* if allowedformatchar */
+         } /* for j */
+
+
+                        /* char is not a specifier: handle char like a string */
+        if (j==len) {
+                if ((*nrFields==0) && (infoPtr->fieldspec[*nrFields]==0)) {
+                        infoPtr->fieldspec[*nrFields]=DT_STRING+k;
+                        infoPtr->buflen[*nrFields]=0;
+        } else 
+                if ((infoPtr->fieldspec[*nrFields] & DT_STRING)!=DT_STRING)  {
+                        (*nrFields)++;
+                        infoPtr->fieldspec[*nrFields]=DT_STRING+k;
+                        infoPtr->buflen[*nrFields]=0;
+                } 
+                infoPtr->textbuf[k]=formattxt[i];
+                k++;
+                infoPtr->buflen[*nrFields]++;
+        }   /* if j=len */
+
+        if (*nrFields==infoPtr->nrFieldsAllocated) {
+                FIXME ("out of memory; should reallocate. crash ahead.\n");
+        }
 
   } /* for i */
@@ -309 +309 @@
 
 
-static LRESULT
+static LRESULT 
 DATETIME_SetFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -318 +318 @@
  TRACE("%04x %08lx\n",wParam,lParam);
  if (!lParam) {
-    DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
-
-    if (dwStyle & DTS_LONGDATEFORMAT)
-        format_item=LOCALE_SLONGDATE;
-    else if (dwStyle & DTS_TIMEFORMAT)
-        format_item=LOCALE_STIMEFORMAT;
+        DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
+
+        if (dwStyle & DTS_LONGDATEFORMAT) 
+                format_item=LOCALE_SLONGDATE;
+        else if (dwStyle & DTS_TIMEFORMAT) 
+                format_item=LOCALE_STIMEFORMAT;
         else /* DTS_SHORTDATEFORMAT */
-        format_item=LOCALE_SSHORTDATE;
-    GetLocaleInfoA( GetSystemDefaultLCID(), format_item,format_buf,sizeof(format_buf));
-    DATETIME_UseFormat (infoPtr, format_buf);
- }
+                format_item=LOCALE_SSHORTDATE;
+        GetLocaleInfoA( GetSystemDefaultLCID(), format_item,format_buf,sizeof(format_buf));
+        DATETIME_UseFormat (infoPtr, format_buf);
+ }      
  else
-    DATETIME_UseFormat (infoPtr, (char *) lParam);
+        DATETIME_UseFormat (infoPtr, (char *) lParam);
 
  return infoPtr->nrFields;
@@ -336 +336 @@
 
 
-static LRESULT
+static LRESULT 
 DATETIME_SetFormatW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
@@ -342 +342 @@
  TRACE("%04x %08lx\n",wParam,lParam);
  if (lParam) {
-    LPSTR buf;
-    int retval;
+        LPSTR buf;
+        int retval;
         int len = WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, NULL, 0, NULL, NULL );
 
-    buf = (LPSTR) COMCTL32_Alloc (len);
+        buf = (LPSTR) COMCTL32_Alloc (len);
         WideCharToMultiByte( CP_ACP, 0, (LPWSTR)lParam, -1, buf, len, NULL, NULL );
-    retval=DATETIME_SetFormat (hwnd, 0, (LPARAM) buf);
-    COMCTL32_Free (buf);
-    return retval;
- }
+        retval=DATETIME_SetFormat (hwnd, 0, (LPARAM) buf);
+        COMCTL32_Free (buf);
+        return retval;
+ } 
  else
-    return DATETIME_SetFormat (hwnd, 0, 0);
-
-}
-
-
-static void
+        return DATETIME_SetFormat (hwnd, 0, 0);
+
+}
+
+
+static void 
 DATETIME_ReturnTxt (DATETIME_INFO *infoPtr, int count, char *result)
 {
@@ -368 +368 @@
  TRACE ("%d,%d\n", infoPtr->nrFields, count);
  if ((count>infoPtr->nrFields) || (count<0)) {
-    WARN ("buffer overrun, have %d want %d\n", infoPtr->nrFields, count);
-    return;
+        WARN ("buffer overrun, have %d want %d\n", infoPtr->nrFields, count);
+        return;
  }
 
  if (!infoPtr->fieldspec) return;
-
+ 
  spec=infoPtr->fieldspec[count];
  if (spec & DT_STRING) {
-    int txtlen=infoPtr->buflen[count];
-
-    strncpy (result, infoPtr->textbuf + (spec &~ DT_STRING), txtlen);
-    result[txtlen]=0;
-    TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
-    return;
+        int txtlen=infoPtr->buflen[count];
+
+        strncpy (result, infoPtr->textbuf + (spec &~ DT_STRING), txtlen);
+        result[txtlen]=0;
+        TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
+        return;
  }
 
-
+                
  switch (spec) {
-    case DT_END_FORMAT:
-        *result=0;
-        break;
-    case ONEDIGITDAY:
-        sprintf (result,"%d",date.wDay);
-        break;
-    case TWODIGITDAY:
-        sprintf (result,"%.2d",date.wDay);
-        break;
-    case THREECHARDAY:
-            GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1+(date.wDayOfWeek+6)%7,
-                result,4);
-        /*sprintf (result,"%.3s",days[date.wDayOfWeek]);*/
-        break;
-    case FULLDAY:
-            GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SDAYNAME1+ (date.wDayOfWeek+6)%7,
-                buffer,sizeof(buffer));
-        strcpy  (result,buffer);
-        break;
-    case ONEDIGIT12HOUR:
-        if (date.wHour>12)
-            sprintf (result,"%d",date.wHour-12);
-        else
-            sprintf (result,"%d",date.wHour);
-        break;
-    case TWODIGIT12HOUR:
-        if (date.wHour>12)
-            sprintf (result,"%.2d",date.wHour-12);
-        else
-            sprintf (result,"%.2d",date.wHour);
-        break;
-    case ONEDIGIT24HOUR:
-        sprintf (result,"%d",date.wHour);
-        break;
-    case TWODIGIT24HOUR:
-        sprintf (result,"%.2d",date.wHour);
-        break;
-    case ONEDIGITSECOND:
-        sprintf (result,"%d",date.wSecond);
-        break;
-    case TWODIGITSECOND:
-        sprintf (result,"%.2d",date.wSecond);
-        break;
-    case ONEDIGITMINUTE:
-        sprintf (result,"%d",date.wMinute);
-        break;
-    case TWODIGITMINUTE:
-        sprintf (result,"%.2d",date.wMinute);
-        break;
-    case ONEDIGITMONTH:
-        sprintf (result,"%d",date.wMonth);
-        break;
-    case TWODIGITMONTH:
-        sprintf (result,"%.2d",date.wMonth);
-        break;
-    case THREECHARMONTH:
-        GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
-          buffer,sizeof(buffer));
-        sprintf (result,"%.3s",buffer);
-        break;
-    case FULLMONTH:
-        GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
+        case DT_END_FORMAT: 
+                *result=0;
+                break;
+        case ONEDIGITDAY: 
+                sprintf (result,"%d",date.wDay);
+                break;
+        case TWODIGITDAY: 
+                sprintf (result,"%.2d",date.wDay);
+                break;
+        case THREECHARDAY: 
+                GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1+(date.wDayOfWeek+6)%7,
+                                result,4);
+                /*sprintf (result,"%.3s",days[date.wDayOfWeek]);*/
+                break;
+        case FULLDAY:
+                GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SDAYNAME1+ (date.wDayOfWeek+6)%7,
+                                buffer,sizeof(buffer));
+                strcpy  (result,buffer);
+                break;
+        case ONEDIGIT12HOUR: 
+                if (date.wHour>12) 
+                        sprintf (result,"%d",date.wHour-12);
+                else 
+                        sprintf (result,"%d",date.wHour);
+                break;
+        case TWODIGIT12HOUR: 
+                if (date.wHour>12) 
+                        sprintf (result,"%.2d",date.wHour-12);
+                else 
+                        sprintf (result,"%.2d",date.wHour);
+                break;
+        case ONEDIGIT24HOUR: 
+                sprintf (result,"%d",date.wHour);
+                break;
+        case TWODIGIT24HOUR: 
+                sprintf (result,"%.2d",date.wHour);
+                break;
+        case ONEDIGITSECOND: 
+                sprintf (result,"%d",date.wSecond);
+                break;
+        case TWODIGITSECOND: 
+                sprintf (result,"%.2d",date.wSecond);
+                break;
+        case ONEDIGITMINUTE: 
+                sprintf (result,"%d",date.wMinute);
+                break;
+        case TWODIGITMINUTE: 
+                sprintf (result,"%.2d",date.wMinute);
+                break;
+        case ONEDIGITMONTH: 
+                sprintf (result,"%d",date.wMonth);
+                break;
+        case TWODIGITMONTH: 
+                sprintf (result,"%.2d",date.wMonth);
+                break;
+        case THREECHARMONTH: 
+                GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
+                  buffer,sizeof(buffer));
+                sprintf (result,"%.3s",buffer);
+                break;
+        case FULLMONTH:   
+                GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
 #ifdef __WIN32OS2__
-                buffer,sizeof(buffer));
-        strcpy  (result,buffer);
+                                buffer,sizeof(buffer));
+                strcpy  (result,buffer);
 #else
-          result,sizeof(result));
+                  result,sizeof(result));
 #endif
-        break;
-    case ONELETTERAMPM:
-        if (date.wHour<12)
-            strcpy (result,"A");
-        else
-            strcpy (result,"P");
-        break;
-    case TWOLETTERAMPM:
-        if (date.wHour<12)
-            strcpy (result,"AM");
-        else
-            strcpy (result,"PM");
-        break;
-    case FORMATCALLBACK:
-        FIXME ("Not implemented\n");
-        strcpy (result,"xxx");
-        break;
-    case ONEDIGITYEAR:
-        sprintf (result,"%d",date.wYear-10* (int) floor(date.wYear/10));
-        break;
-    case TWODIGITYEAR:
-        sprintf (result,"%.2d",date.wYear-100* (int) floor(date.wYear/100));
-        break;
-    case FULLYEAR:
-        sprintf (result,"%d",date.wYear);
-        break;
+                break;
+        case ONELETTERAMPM:   
+                if (date.wHour<12) 
+                        strcpy (result,"A");
+                else 
+                        strcpy (result,"P");
+                break;
+        case TWOLETTERAMPM:   
+                if (date.wHour<12) 
+                        strcpy (result,"AM");
+                else 
+                        strcpy (result,"PM");
+                break;
+        case FORMATCALLBACK:   
+                FIXME ("Not implemented\n");
+                strcpy (result,"xxx");
+                break;
+        case ONEDIGITYEAR: 
+                sprintf (result,"%d",date.wYear-10* (int) floor(date.wYear/10));
+                break;
+        case TWODIGITYEAR: 
+                sprintf (result,"%.2d",date.wYear-100* (int) floor(date.wYear/100));
+                break;
+        case FULLYEAR:   
+                sprintf (result,"%d",date.wYear);
+                break;
     }
-
-    TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
-}
-
-
-static void
+        
+        TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
+}
+
+
+static void 
 DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number)
 {
@@ -497 +497 @@
  spec=infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-
+                
  switch (spec) {
-    case ONEDIGITDAY:
-    case TWODIGITDAY:
-    case THREECHARDAY:
-    case FULLDAY:
-        date->wDay++;
-        if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
-          date->wDay=1;
-        break;
-    case ONEDIGIT12HOUR:
-    case TWODIGIT12HOUR:
-    case ONEDIGIT24HOUR:
-    case TWODIGIT24HOUR:
-        date->wHour++;
-        if (date->wHour>23) date->wHour=0;
-        break;
-    case ONEDIGITSECOND:
-    case TWODIGITSECOND:
-        date->wSecond++;
-        if (date->wSecond>59) date->wSecond=0;
-        break;
-    case ONEDIGITMINUTE:
-    case TWODIGITMINUTE:
-        date->wMinute++;
-        if (date->wMinute>59) date->wMinute=0;
-        break;
-    case ONEDIGITMONTH:
-    case TWODIGITMONTH:
-    case THREECHARMONTH:
-    case FULLMONTH:
-        date->wMonth++;
-        if (date->wMonth>12) date->wMonth=1;
-        if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
-            date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
-        break;
-    case ONELETTERAMPM:
-    case TWOLETTERAMPM:
-        date->wHour+=12;
-        if (date->wHour>23) date->wHour-=24;
-        break;
-    case FORMATCALLBACK:
-        FIXME ("Not implemented\n");
-        break;
-    case ONEDIGITYEAR:
-    case TWODIGITYEAR:
-    case FULLYEAR:
-        date->wYear++;
-        break;
-    }
-
-}
-
-
-static void
+        case ONEDIGITDAY: 
+        case TWODIGITDAY: 
+        case THREECHARDAY: 
+        case FULLDAY:
+                date->wDay++;
+                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
+                  date->wDay=1; 
+                break;
+        case ONEDIGIT12HOUR: 
+        case TWODIGIT12HOUR: 
+        case ONEDIGIT24HOUR: 
+        case TWODIGIT24HOUR: 
+                date->wHour++;
+                if (date->wHour>23) date->wHour=0;
+                break;
+        case ONEDIGITSECOND: 
+        case TWODIGITSECOND: 
+                date->wSecond++;
+                if (date->wSecond>59) date->wSecond=0;
+                break;
+        case ONEDIGITMINUTE: 
+        case TWODIGITMINUTE: 
+                date->wMinute++;
+                if (date->wMinute>59) date->wMinute=0;
+                break;
+        case ONEDIGITMONTH: 
+        case TWODIGITMONTH: 
+        case THREECHARMONTH: 
+        case FULLMONTH:   
+                date->wMonth++;
+                if (date->wMonth>12) date->wMonth=1;
+                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear)) 
+                        date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
+                break;
+        case ONELETTERAMPM:   
+        case TWOLETTERAMPM:   
+                date->wHour+=12;
+                if (date->wHour>23) date->wHour-=24;
+                break;
+        case FORMATCALLBACK:   
+                FIXME ("Not implemented\n");
+                break;
+        case ONEDIGITYEAR: 
+        case TWODIGITYEAR: 
+        case FULLYEAR:   
+                date->wYear++;
+                break;
+        }
+
+}
+
+
+static void 
 DATETIME_DecreaseField (DATETIME_INFO *infoPtr, int number)
 {
@@ -562 +562 @@
  spec = infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-
+                
  TRACE ("%x\n",spec);
 
  switch (spec) {
-    case ONEDIGITDAY:
-    case TWODIGITDAY:
-    case THREECHARDAY:
-    case FULLDAY:
-        date->wDay--;
-        if (date->wDay<1)
-          date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
-        break;
-    case ONEDIGIT12HOUR:
-    case TWODIGIT12HOUR:
-    case ONEDIGIT24HOUR:
-    case TWODIGIT24HOUR:
-        if (date->wHour)
-            date->wHour--;
-        else
-            date->wHour=23;
-        break;
-    case ONEDIGITSECOND:
-    case TWODIGITSECOND:
-        if (date->wHour)
-            date->wSecond--;
-        else
-            date->wHour=59;
-        break;
-    case ONEDIGITMINUTE:
-    case TWODIGITMINUTE:
-        if (date->wMinute)
-            date->wMinute--;
-        else
-            date->wMinute=59;
-        break;
-    case ONEDIGITMONTH:
-    case TWODIGITMONTH:
-    case THREECHARMONTH:
-    case FULLMONTH:
-        if (date->wMonth>1)
-            date->wMonth--;
-        else
-            date->wMonth=12;
-        if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
-            date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
-        break;
-    case ONELETTERAMPM:
-    case TWOLETTERAMPM:
-        if (date->wHour<12)
-            date->wHour+=12;
-        else
-            date->wHour-=12;
-        break;
-    case FORMATCALLBACK:
-        FIXME ("Not implemented\n");
-        break;
-    case ONEDIGITYEAR:
-    case TWODIGITYEAR:
-    case FULLYEAR:
-        date->wYear--;
-        break;
-    }
-
-}
-
-
-static void
+        case ONEDIGITDAY: 
+        case TWODIGITDAY: 
+        case THREECHARDAY: 
+        case FULLDAY:
+                date->wDay--;
+                if (date->wDay<1) 
+                  date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
+                break;
+        case ONEDIGIT12HOUR: 
+        case TWODIGIT12HOUR: 
+        case ONEDIGIT24HOUR: 
+        case TWODIGIT24HOUR: 
+                if (date->wHour) 
+                        date->wHour--;
+                else
+                        date->wHour=23;
+                break;
+        case ONEDIGITSECOND: 
+        case TWODIGITSECOND: 
+                if (date->wHour) 
+                        date->wSecond--;
+                else
+                        date->wHour=59;
+                break;
+        case ONEDIGITMINUTE: 
+        case TWODIGITMINUTE: 
+                if (date->wMinute) 
+                        date->wMinute--;
+                else
+                        date->wMinute=59;
+                break;
+        case ONEDIGITMONTH: 
+        case TWODIGITMONTH: 
+        case THREECHARMONTH: 
+        case FULLMONTH:   
+                if (date->wMonth>1) 
+                        date->wMonth--;
+                else
+                        date->wMonth=12;
+                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear)) 
+                        date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
+                break;
+        case ONELETTERAMPM:   
+        case TWOLETTERAMPM:   
+                if (date->wHour<12) 
+                        date->wHour+=12;
+                else
+                        date->wHour-=12;
+                break;
+        case FORMATCALLBACK:   
+                FIXME ("Not implemented\n");
+                break;
+        case ONEDIGITYEAR: 
+        case TWODIGITYEAR: 
+        case FULLYEAR:   
+                date->wYear--;
+                break;
+        }
+
+}
+
+
+static void 
 DATETIME_ResetFieldDown (DATETIME_INFO *infoPtr, int number)
 {
@@ -639 +639 @@
  spec = infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-
+                
 
  switch (spec) {
-    case ONEDIGITDAY:
-    case TWODIGITDAY:
-    case THREECHARDAY:
-    case FULLDAY:
-        date->wDay = 1;
-        break;
-    case ONEDIGIT12HOUR:
-    case TWODIGIT12HOUR:
-    case ONEDIGIT24HOUR:
-    case TWODIGIT24HOUR:
-    case ONELETTERAMPM:
-    case TWOLETTERAMPM:
-        date->wHour = 0;
-        break;
-    case ONEDIGITSECOND:
-    case TWODIGITSECOND:
-        date->wSecond = 0;
-        break;
-    case ONEDIGITMINUTE:
-    case TWODIGITMINUTE:
-        date->wMinute = 0;
-        break;
-    case ONEDIGITMONTH:
-    case TWODIGITMONTH:
-    case THREECHARMONTH:
-    case FULLMONTH:
-        date->wMonth = 1;
-    case FORMATCALLBACK:
-        FIXME ("Not implemented\n");
-        break;
-    case ONEDIGITYEAR:
-    case TWODIGITYEAR:
+        case ONEDIGITDAY: 
+        case TWODIGITDAY: 
+        case THREECHARDAY: 
+        case FULLDAY:
+                date->wDay = 1;
+                break;
+        case ONEDIGIT12HOUR: 
+        case TWODIGIT12HOUR: 
+        case ONEDIGIT24HOUR: 
+        case TWODIGIT24HOUR: 
+        case ONELETTERAMPM:   
+        case TWOLETTERAMPM:   
+                date->wHour = 0;
+                break;
+        case ONEDIGITSECOND: 
+        case TWODIGITSECOND: 
+                date->wSecond = 0;
+                break;
+        case ONEDIGITMINUTE: 
+        case TWODIGITMINUTE: 
+                date->wMinute = 0;
+                break;
+        case ONEDIGITMONTH: 
+        case TWODIGITMONTH: 
+        case THREECHARMONTH: 
+        case FULLMONTH:   
+                date->wMonth = 1;
+        case FORMATCALLBACK:   
+                FIXME ("Not implemented\n");
+                break;
+        case ONEDIGITYEAR: 
+        case TWODIGITYEAR: 
         /* FYI: On 9/14/1752 the calender changed and England and the American */
         /* colonies changed to the Gregorian calender.  This change involved */
         /* having September 14th following September 2nd.  So no date algorithms */
         /* work before that date. */
-    case FULLYEAR:
-        date->wSecond = 0;
-        date->wMinute = 0;
-        date->wHour = 0;
-        date->wDay = 14;        /* overactive ms-programmers..*/
-        date->wMonth = 9;
-        date->wYear = 1752;
-        break;
-    }
-
-}
-
-
-static void
+        case FULLYEAR:   
+                date->wSecond = 0;
+                date->wMinute = 0;
+                date->wHour = 0;
+                date->wDay = 14;                /* overactive ms-programmers..*/
+                date->wMonth = 9;
+                date->wYear = 1752;
+                break;
+        }
+
+}
+
+
+static void 
 DATETIME_ResetFieldUp (DATETIME_INFO *infoPtr, int number)
 {
@@ -702 +702 @@
  spec=infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-
+                
  switch (spec) {
-    case ONEDIGITDAY:
-    case TWODIGITDAY:
-    case THREECHARDAY:
-    case FULLDAY:
-        date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
-        break;
-    case ONEDIGIT12HOUR:
-    case TWODIGIT12HOUR:
-    case ONEDIGIT24HOUR:
-    case TWODIGIT24HOUR:
-    case ONELETTERAMPM:
-    case TWOLETTERAMPM:
-        date->wHour=23;
-        break;
-    case ONEDIGITSECOND:
-    case TWODIGITSECOND:
-        date->wSecond=59;
-        break;
-    case ONEDIGITMINUTE:
-    case TWODIGITMINUTE:
-        date->wMinute=59;
-        break;
-    case ONEDIGITMONTH:
-    case TWODIGITMONTH:
-    case THREECHARMONTH:
-    case FULLMONTH:
-        date->wMonth=12;
-    case FORMATCALLBACK:
-        FIXME ("Not implemented\n");
-        break;
-    case ONEDIGITYEAR:
-    case TWODIGITYEAR:
-    case FULLYEAR:
-        date->wYear=9999;    /* Y10K problem? naaah. */
-        break;
-    }
+        case ONEDIGITDAY: 
+        case TWODIGITDAY: 
+        case THREECHARDAY: 
+        case FULLDAY:
+                date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
+                break;
+        case ONEDIGIT12HOUR: 
+        case TWODIGIT12HOUR: 
+        case ONEDIGIT24HOUR: 
+        case TWODIGIT24HOUR: 
+        case ONELETTERAMPM:   
+        case TWOLETTERAMPM:   
+                date->wHour=23;
+                break;
+        case ONEDIGITSECOND: 
+        case TWODIGITSECOND: 
+                date->wSecond=59;
+                break;
+        case ONEDIGITMINUTE: 
+        case TWODIGITMINUTE: 
+                date->wMinute=59;
+                break;
+        case ONEDIGITMONTH: 
+        case TWODIGITMONTH: 
+        case THREECHARMONTH: 
+        case FULLMONTH:   
+                date->wMonth=12;
+        case FORMATCALLBACK:   
+                FIXME ("Not implemented\n");
+                break;
+        case ONEDIGITYEAR: 
+        case TWODIGITYEAR: 
+        case FULLYEAR:   
+                date->wYear=9999;    /* Y10K problem? naaah. */
+                break;
+        }
 
 }
@@ -758 +758 @@
   SIZE size;
   COLORREF oldBk, oldTextColor;
-
+  
   /* draw control edge */
   TRACE("\n");
@@ -764 +764 @@
   FillRect(hdc, rcClient, hbr);
   DrawEdge(hdc, rcClient, EDGE_SUNKEN, BF_RECT);
-  DeleteObject(hbr);
-
+  DeleteObject(hbr);   
+        
   if (infoPtr->dateValid) {
     char txt[80];
@@ -798 +798 @@
               DT_RIGHT | DT_VCENTER | DT_SINGLELINE );
         SetBkColor (hdc, oldBk);
-        SetTextColor (hdc, oldTextColor);
+                SetTextColor (hdc, oldTextColor);
       }
       else
@@ -832 +832 @@
     if (PtInRect (&infoPtr->fieldRect[i], pt)) {
       retval = i;
-      TRACE("Hit in date text in field %d\n", i);
+      TRACE("Hit in date text in field %d\n", i);           
       break;
     }
@@ -845 +845 @@
 DATETIME_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);  
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
   int old, new;
@@ -874 +874 @@
       infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
                                 infoPtr->calbutton.left) + 145);
-    else
+    else 
       infoPtr->monthcal_pos.x = 8;
 
@@ -888 +888 @@
 
     TRACE ("dt:%x mc:%x mc parent:%x, desktop:%x, mcpp:%x\n",
-              hwnd,infoPtr->hMonthCal,
+              hwnd,infoPtr->hMonthCal, 
               GetParent (infoPtr->hMonthCal),
               GetDesktopWindow (),
@@ -904 +904 @@
 DATETIME_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);  
 
   TRACE("\n");
-
+  
   if(infoPtr->bCalDepressed == TRUE) {
     infoPtr->bCalDepressed = FALSE;
@@ -934 +934 @@
 DATETIME_ParentNotify (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
  LPNMHDR lpnmh = (LPNMHDR) lParam;
 
@@ -954 +954 @@
 
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
  LPNMHDR lpnmh = (LPNMHDR) lParam;
 
@@ -964 +964 @@
 
 
-static LRESULT
+static LRESULT 
 DATETIME_KeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -978 +978 @@
 
  if (infoPtr->select & FORMATCALLMASK) {
-    FIXME ("Callbacks not implemented yet\n");
+        FIXME ("Callbacks not implemented yet\n");
  }
 
  switch (wParam) {
-    case VK_ADD:
-        case VK_UP:
-        DATETIME_IncreaseField (infoPtr,FieldNum);
-        DATETIME_SendDateTimeChangeNotify (hwnd);
-        break;
-    case VK_SUBTRACT:
-    case VK_DOWN:
-        DATETIME_DecreaseField (infoPtr,FieldNum);
-        DATETIME_SendDateTimeChangeNotify (hwnd);
-        break;
-    case VK_HOME:
-        DATETIME_ResetFieldDown (infoPtr,FieldNum);
-        DATETIME_SendDateTimeChangeNotify (hwnd);
-        break;
-    case VK_END:
-        DATETIME_ResetFieldUp(infoPtr,FieldNum);
-        DATETIME_SendDateTimeChangeNotify (hwnd);
-        break;
-    case VK_LEFT:
-        do {
-            if (infoPtr->select==0) {
-                infoPtr->select = infoPtr->nrFields - 1;
-                wrap++;
-            } else
-            infoPtr->select--;
-        }
-        while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
-        break;
-    case VK_RIGHT:
-        do {
-            infoPtr->select++;
-            if (infoPtr->select==infoPtr->nrFields) {
-                infoPtr->select = 0;
-                wrap++;
-            }
-            }
-        while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
-        break;
+        case VK_ADD:
+        case VK_UP: 
+                DATETIME_IncreaseField (infoPtr,FieldNum);
+                DATETIME_SendDateTimeChangeNotify (hwnd);
+                break;
+        case VK_SUBTRACT:
+        case VK_DOWN:
+                DATETIME_DecreaseField (infoPtr,FieldNum);
+                DATETIME_SendDateTimeChangeNotify (hwnd);
+                break;
+        case VK_HOME:
+                DATETIME_ResetFieldDown (infoPtr,FieldNum);
+                DATETIME_SendDateTimeChangeNotify (hwnd);
+                break;
+        case VK_END:
+                DATETIME_ResetFieldUp(infoPtr,FieldNum);
+                DATETIME_SendDateTimeChangeNotify (hwnd);
+                break;
+        case VK_LEFT: 
+                do {
+                        if (infoPtr->select==0) {
+                                infoPtr->select = infoPtr->nrFields - 1;
+                                wrap++;
+                        } else 
+                        infoPtr->select--;
+                }
+                while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
+                break;
+        case VK_RIGHT:  
+                do {
+                        infoPtr->select++;
+                        if (infoPtr->select==infoPtr->nrFields) {
+                                infoPtr->select = 0;
+                                wrap++;
+                        }
+                        }
+                while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
+                break;
+        }
+
+  InvalidateRect(hwnd, NULL, FALSE);
+
+  return 0;
+}
+
+
+static LRESULT
+DATETIME_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);        
+
+    TRACE ("\n");
+
+    if (infoPtr->haveFocus) {
+        DATETIME_SendSimpleNotify (hwnd, NM_KILLFOCUS);
+        infoPtr->haveFocus = 0;
     }
 
-  InvalidateRect(hwnd, NULL, FALSE);
-
-  return 0;
-}
-
-
-static LRESULT
-DATETIME_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+    InvalidateRect (hwnd, NULL, TRUE);
+
+    return 0;
+}
+
+
+static LRESULT
+DATETIME_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);        
 
     TRACE ("\n");
 
-    if (infoPtr->haveFocus) {
-    DATETIME_SendSimpleNotify (hwnd, NM_KILLFOCUS);
-    infoPtr->haveFocus = 0;
-    }
-
-    InvalidateRect (hwnd, NULL, TRUE);
-
-    return 0;
-}
-
-
-static LRESULT
-DATETIME_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
-    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
-
-    TRACE ("\n");
-
     if (infoPtr->haveFocus==0) {
-    DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);
-    infoPtr->haveFocus = DTHT_GOTFOCUS;
+        DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);  
+        infoPtr->haveFocus = DTHT_GOTFOCUS;
     }
 
@@ -1068 +1068 @@
 
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
  NMDATETIMECHANGE dtdtc;
 
@@ -1136 +1136 @@
     infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
                                 infoPtr->calbutton.left) + 145);
-  else
+  else 
     infoPtr->monthcal_pos.x = 8;
 
@@ -1172 +1172 @@
 
   if (dwStyle & DTS_SHOWNONE) {
-    infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0,
-         WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
+    infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0, 
+         WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 
          2,2,13,13,
-         hwnd,
+         hwnd, 
          0, GetWindowLongA  (hwnd, GWL_HINSTANCE), 0);
          SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);
@@ -1196 +1196 @@
 
   /* create the monthcal control */
-    infoPtr->hMonthCal = CreateWindowExA (0,"SysMonthCal32", 0,
-    WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS,
-    0, 0, 0, 0,
-    GetParent(hwnd),
-    0, 0, 0);
+    infoPtr->hMonthCal = CreateWindowExA (0,"SysMonthCal32", 0, 
+        WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS,
+        0, 0, 0, 0,
+        GetParent(hwnd), 
+        0, 0, 0);
 
   /* initialize info structure */
@@ -1214 +1214 @@
 {
     DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
-
+        
     TRACE("\n");
     COMCTL32_Free (infoPtr);
@@ -1227 +1227 @@
 
     if (!DATETIME_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
-    return DefWindowProcA( hwnd, uMsg, wParam, lParam );
-
+        return DefWindowProcA( hwnd, uMsg, wParam, lParam );
+    
     switch (uMsg)
     {
@@ -1236 +1236 @@
 
     case DTM_SETSYSTEMTIME:
-    return DATETIME_SetSystemTime (hwnd, wParam, lParam);
+        return DATETIME_SetSystemTime (hwnd, wParam, lParam);
 
     case DTM_GETRANGE:
@@ -1266 +1266 @@
 
     case WM_PARENTNOTIFY:
-    return DATETIME_ParentNotify (hwnd, wParam, lParam);
+        return DATETIME_ParentNotify (hwnd, wParam, lParam);
 
     case WM_NOTIFY:
-    return DATETIME_Notify (hwnd, wParam, lParam);
+        return DATETIME_Notify (hwnd, wParam, lParam);
 
     case WM_GETDLGCODE:
@@ -1296 +1296 @@
 
     case WM_CREATE:
-    return DATETIME_Create (hwnd, wParam, lParam);
+        return DATETIME_Create (hwnd, wParam, lParam);
 
     case WM_DESTROY:
-    return DATETIME_Destroy (hwnd, wParam, lParam);
+        return DATETIME_Destroy (hwnd, wParam, lParam);
 
     default:
-    if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
-             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
     }
@@ -1329 +1329 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = DATETIMEPICK_CLASSA;
-
+ 
     RegisterClassA (&wndClass);
 }

trunk/src/comctl32/flatsb.c

@@ -39 +39 @@
 
 /***********************************************************************
- *      InitializeFlatSB
- *
- *  returns nonzero if successful, zero otherwise
+ *              InitializeFlatSB
+ *
+ *      returns nonzero if successful, zero otherwise
  *
  */
@@ -52 +52 @@
 
 /***********************************************************************
- *      UninitializeFlatSB
- *
- *  returns:
- *  E_FAIL      if one of the scroll bars is currently in use
- *  S_FALSE     if InitializeFlatSB was never called on this hwnd
- *  S_OK        otherwise
+ *              UninitializeFlatSB
+ *
+ *      returns:
+ *      E_FAIL          if one of the scroll bars is currently in use
+ *      S_FALSE         if InitializeFlatSB was never called on this hwnd
+ *      S_OK            otherwise
  *
  */
@@ -68 +68 @@
 
 /***********************************************************************
- *      FlatSB_GetScrollProp
- *
- *  Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE,
- *  the return is nonzero if InitializeFlatSB has been called for this window, or
- *  zero otherwise.
- *
- */
-BOOL WINAPI
+ *              FlatSB_GetScrollProp
+ *
+ *      Returns nonzero if successful, or zero otherwise. If index is WSB_PROP_HSTYLE,
+ *      the return is nonzero if InitializeFlatSB has been called for this window, or
+ *      zero otherwise. 
+ *
+ */
+BOOL WINAPI 
 FlatSB_GetScrollProp(HWND hwnd, INT propIndex, LPINT prop)
 {
@@ -84 +84 @@
 
 /***********************************************************************
- *      FlatSB_SetScrollProp
- */
-BOOL WINAPI
+ *              FlatSB_SetScrollProp
+ */
+BOOL WINAPI 
 FlatSB_SetScrollProp(HWND hwnd, UINT index, INT newValue, BOOL flag)
 {
@@ -95 +95 @@
 
 /***********************************************************************
- *  From the Microsoft docs:
- *  "If flat scroll bars haven't been initialized for the
- *  window, the flat scroll bar APIs will defer to the corresponding
- *  standard APIs.  This allows the developer to turn flat scroll
- *  bars on and off without having to write conditional code."
- *
- *  So, if we just call the standard functions until we implement
- *  the flat scroll bar functions, flat scroll bars will show up and
- *  behave properly, as though they had simply not been setup to
- *  have flat properties.
- *
- *  Susan <sfarley@codeweavers.com>
- *
- */
-
-/***********************************************************************
- *      FlatSB_EnableScrollBar
- */
-BOOL WINAPI
+ *      From the Microsoft docs:
+ *      "If flat scroll bars haven't been initialized for the
+ *      window, the flat scroll bar APIs will defer to the corresponding
+ *      standard APIs.  This allows the developer to turn flat scroll
+ *      bars on and off without having to write conditional code."
+ *
+ *      So, if we just call the standard functions until we implement
+ *      the flat scroll bar functions, flat scroll bars will show up and 
+ *      behave properly, as though they had simply not been setup to
+ *      have flat properties.
+ *
+ *      Susan <sfarley@codeweavers.com>
+ *
+ */
+
+/***********************************************************************
+ *              FlatSB_EnableScrollBar
+ */
+BOOL WINAPI 
 FlatSB_EnableScrollBar(HWND hwnd, int nBar, UINT flags)
 {
@@ -120 +120 @@
 
 /***********************************************************************
- *      FlatSB_ShowScrollBar
- */
-BOOL WINAPI
+ *              FlatSB_ShowScrollBar
+ */
+BOOL WINAPI 
 FlatSB_ShowScrollBar(HWND hwnd, int nBar, BOOL fShow)
 {
@@ -129 +129 @@
 
 /***********************************************************************
- *      FlatSB_GetScrollRange
- */
-BOOL WINAPI
+ *              FlatSB_GetScrollRange
+ */
+BOOL WINAPI 
 FlatSB_GetScrollRange(HWND hwnd, int nBar, LPINT min, LPINT max)
 {
@@ -138 +138 @@
 
 /***********************************************************************
- *      FlatSB_GetScrollInfo
- */
-BOOL WINAPI
+ *              FlatSB_GetScrollInfo
+ */
+BOOL WINAPI 
 FlatSB_GetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info)
 {
@@ -147 +147 @@
 
 /***********************************************************************
- *      FlatSB_GetScrollPos
- */
-INT WINAPI
+ *              FlatSB_GetScrollPos
+ */
+INT WINAPI 
 FlatSB_GetScrollPos(HWND hwnd, int nBar)
 {
@@ -156 +156 @@
 
 /***********************************************************************
- *      FlatSB_SetScrollPos
- */
-INT WINAPI
+ *              FlatSB_SetScrollPos
+ */
+INT WINAPI 
 FlatSB_SetScrollPos(HWND hwnd, int nBar, INT pos, BOOL bRedraw)
 {
@@ -165 +165 @@
 
 /***********************************************************************
- *      FlatSB_SetScrollInfo
- */
-INT WINAPI
+ *              FlatSB_SetScrollInfo
+ */
+INT WINAPI 
 FlatSB_SetScrollInfo(HWND hwnd, int nBar, LPSCROLLINFO info, BOOL bRedraw)
 {
@@ -174 +174 @@
 
 /***********************************************************************
- *      FlatSB_SetScrollRange
- */
-INT WINAPI
+ *              FlatSB_SetScrollRange
+ */
+INT WINAPI 
 FlatSB_SetScrollRange(HWND hwnd, int nBar, INT min, INT max, BOOL bRedraw)
 {
@@ -212 +212 @@
     switch (uMsg)
     {
-    case WM_CREATE:
-        return FlatSB_Create (hwnd, wParam, lParam);
-
-    case WM_DESTROY:
-        return FlatSB_Destroy (hwnd, wParam, lParam);
-
-    default:
-        if (uMsg >= WM_USER)
-        ERR("unknown msg %04x wp=%08x lp=%08lx\n",
+        case WM_CREATE:
+            return FlatSB_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return FlatSB_Destroy (hwnd, 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);
 #else
-        return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
 #endif
     }
@@ -245 +245 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = FLATSB_CLASSA;
-
+ 
     RegisterClassA (&wndClass);
 }

trunk/src/comctl32/imagelist.c

@@ -20 +20 @@
  *    - ImageList_Draw, ImageList_DrawEx and ImageList_GetIcon use
  *      ImageList_DrawIndirect. Since ImageList_DrawIndirect is still
- *      partially implemented, the functions mentioned above will be
+ *      partially implemented, the functions mentioned above will be 
  *      limited in functionality too.
  */
@@ -69 +69 @@
 
 /*************************************************************************
- * IMAGELIST_InternalExpandBitmaps [Internal]
+ * IMAGELIST_InternalExpandBitmaps [Internal] 
  *
  * Expands the bitmaps of an image list by the given number of images.
@@ -92 +92 @@
     if ((himl->cCurImage + nImageCount < himl->cMaxImage)
         && (himl->cy >= cy))
-    return;
+        return;
 
     if (cy == 0) cy = himl->cy;
@@ -116 +116 @@
 
     if (himl->hbmMask) {
-        hbmNewBitmap =
+        hbmNewBitmap = 
             CreateBitmap (nNewWidth, cy, 1, 1, NULL);
 
@@ -138 +138 @@
 
 /*************************************************************************
- * IMAGELIST_InternalDraw [Internal]
+ * IMAGELIST_InternalDraw [Internal] 
  *
  * Draws the image in the ImageList (without the mask)
@@ -151 +151 @@
  *
  * NOTES
- *     This function is used by ImageList_DrawIndirect, when it is
+ *     This function is used by ImageList_DrawIndirect, when it is 
  *     required to draw only the Image (without the mask) to the screen.
  *
@@ -164 +164 @@
     hImageDC = CreateCompatibleDC(0);
     hOldBitmap = SelectObject(hImageDC, pimldp->himl->hbmImage);
-    BitBlt(pimldp->hdcDst,
+    BitBlt(pimldp->hdcDst, 
         pimldp->x, pimldp->y, cx, cy,
-        hImageDC,
-        pimldp->himl->cx * pimldp->i, 0,
+        hImageDC, 
+        pimldp->himl->cx * pimldp->i, 0, 
         SRCCOPY);
 
@@ -176 +176 @@
 
 /*************************************************************************
- * IMAGELIST_InternalDrawMask [Internal]
+ * IMAGELIST_InternalDrawMask [Internal] 
  *
  * Draws the image in the ImageList with the mask
@@ -189 +189 @@
  *
  * NOTES
- *     This function is used by ImageList_DrawIndirect, when it is
+ *     This function is used by ImageList_DrawIndirect, when it is 
  *     required to draw the Image with the mask to the screen.
  *
@@ -205 +205 @@
     UINT fStyle = pimldp->fStyle & (~ILD_OVERLAYMASK);
 
-    /*
-     * We need a dc and bitmap to draw on that is
+    /* 
+     * We need a dc and bitmap to draw on that is 
      * not on the screen.
      */
@@ -221 +221 @@
     hOffScreenDC = CreateCompatibleDC( pimldp->hdcDst );
 
-    if ( hOffScreenDC )
+    if ( hOffScreenDC ) 
     {
         hOffScreenBmp = CreateCompatibleBitmap( pimldp->hdcDst, cx, cy );
 
-        if ( hOffScreenBmp )
+        if ( hOffScreenBmp ) 
             SelectObject( hOffScreenDC, hOffScreenBmp  );
         else
@@ -235 +235 @@
     hOldBitmapImage = SelectObject(hImageDC, himlLocal->hbmImage);
     hOldBitmapMask = SelectObject(hMaskDC, himlLocal->hbmMask);
-
-    /*
-     * Get a copy of the image for the masking operations.
+    
+    /* 
+     * Get a copy of the image for the masking operations. 
      * We will use the copy, and this dc for all the various
      * blitting, and then do one final blit to the screen dc.
      * This should clean up most of the flickering.
      */
-    BitBlt( hOffScreenDC, 0, 0, cx, cy, pimldp->hdcDst, pimldp->x,
+    BitBlt( hOffScreenDC, 0, 0, cx, cy, pimldp->hdcDst, pimldp->x, 
             pimldp->y, SRCCOPY);
 
-    /*
+    /* 
      * Draw the Background for the appropriate Styles
      */
-    if( bUseCustomBackground && (fStyle == ILD_NORMAL || fStyle & ILD_IMAGE
+    if( bUseCustomBackground && (fStyle == ILD_NORMAL || fStyle & ILD_IMAGE 
          || bBlendFlag) )
     {
-
+        
         hBrush = CreateSolidBrush (himlLocal->clrBk);
         hOldBrush = SelectObject (pimldp->hdcDst, hBrush);
-
+        
         PatBlt( hOffScreenDC, pimldp->x, pimldp->y, cx, cy, PATCOPY );
 
@@ -260 +260 @@
     }
 
-    /*
+    /* 
      * Draw Image Transparently over the current background
      */
-    if(fStyle == ILD_NORMAL || (fStyle & ILD_TRANSPARENT) ||
-       ((fStyle & ILD_IMAGE) && bUseCustomBackground) || bBlendFlag)
-    {   /*
+    if(fStyle == ILD_NORMAL || (fStyle & ILD_TRANSPARENT) || 
+       ((fStyle & ILD_IMAGE) && bUseCustomBackground) || bBlendFlag) 
+    {   /* 
          * To obtain a transparent look, background color should be set
-         * to white and foreground color to black when blting the
-         * monochrome mask.
+         * to white and foreground color to black when blting the 
+         * monochrome mask. 
          */
-
-        oldBkColor = SetBkColor( hOffScreenDC, RGB( 0xff, 0xff, 0xff ) );
+        
+        oldBkColor = SetBkColor( hOffScreenDC, RGB( 0xff, 0xff, 0xff ) ); 
         oldFgColor = SetTextColor( hOffScreenDC, RGB( 0, 0, 0 ) );
 
@@ -279 +279 @@
         BitBlt( hOffScreenDC, 0, 0, cx, cy, hImageDC,himlLocal->cx * pimldp->i,
                 0, SRCPAINT );
-
-    }
-
+    
+    }
+    
     /*
      * Draw the image when no Background is specified
@@ -287 +287 @@
     else if((fStyle & ILD_IMAGE) && !bUseCustomBackground)
     {
-        BitBlt( hOffScreenDC, 0, 0, cx, cy, hImageDC,
+        BitBlt( hOffScreenDC, 0, 0, cx, cy, hImageDC, 
                 himlLocal->cx * pimldp->i, 0, SRCCOPY);
     }
-    /*
+    /* 
      * Draw the mask with or without a background
      */
@@ -298 +298 @@
                 0, bUseCustomBackground ? SRCCOPY : SRCAND);
     }
-
+    
     /*
      * Blit the bitmap to the screen now.
@@ -305 +305 @@
             hOffScreenDC, 0, 0, SRCCOPY);
 
-
+    
     SelectObject(hImageDC, hOldBitmapImage);
     SelectObject(hMaskDC, hOldBitmapMask);
-
+    
 cleanup:
-
+    
     DeleteDC(hImageDC);
     DeleteDC(hMaskDC);
-
+    
     DeleteDC( hOffScreenDC );
     DeleteObject( hOffScreenBmp );
-
+    
     return;
 }
 
 /*************************************************************************
- * IMAGELIST_InternalDrawBlend [Internal]
- *
- * Draws the Blend over the current image
+ * IMAGELIST_InternalDrawBlend [Internal] 
+ *
+ * Draws the Blend over the current image 
  *
  * PARAMS
@@ -334 +334 @@
  *
  * NOTES
- *     This functions is used by ImageList_DrawIndirect, when it is
- *     required to add the blend to the current image.
- *
+ *     This functions is used by ImageList_DrawIndirect, when it is 
+ *     required to add the blend to the current image.  
+ *     
  */
 static VOID
@@ -375 +375 @@
 
         BitBlt(hBlendMaskDC,
-            0,0, cx, cy,
+            0,0, cx, cy, 
             hMaskDC,
             himlLocal->cx * pimldp->i,0,
@@ -381 +381 @@
 
         BitBlt(hBlendMaskDC,
-            0,0, cx, cy,
+            0,0, cx, cy, 
             hBlendMaskDC,
-            0,0,
+            0,0, 
             NOTSRCCOPY);
 
@@ -397 +397 @@
     hOldBrush = (HBRUSH) SelectObject (pimldp->hdcDst, hBlendColorBrush);
 
-    BitBlt (pimldp->hdcDst,
-        pimldp->x, pimldp->y, cx, cy,
-        hBlendMaskDC,
-        0, 0,
+    BitBlt (pimldp->hdcDst, 
+        pimldp->x, pimldp->y, cx, cy, 
+        hBlendMaskDC, 
+        0, 0, 
         0xB8074A); /* PSDPxax */
 
@@ -413 +413 @@
 
 /*************************************************************************
- * IMAGELIST_InternalDrawOverlay [Internal]
- *
- * Draws the overlay image
+ * IMAGELIST_InternalDrawOverlay [Internal] 
+ *
+ * Draws the overlay image 
  *
  * PARAMS
@@ -426 +426 @@
  *
  * NOTES
- *     This functions is used by ImageList_DrawIndirect, when it is
+ *     This functions is used by ImageList_DrawIndirect, when it is 
  *     required to draw the overlay
  *
- *
- */
-static VOID
+ *     
+ */
+static VOID 
 IMAGELIST_InternalDrawOverlay(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
 {
@@ -447 +447 @@
             if (pimldp->himl->hbmMask)
             {
-                hOldBitmap = (HBITMAP) SelectObject (hImageDC,
+                hOldBitmap = (HBITMAP) SelectObject (hImageDC, 
                     pimldp->himl->hbmMask);
 
-                BitBlt (pimldp->hdcDst,
+                BitBlt (pimldp->hdcDst, 
                     pimldp->x, pimldp->y, cx, cy,
                     hImageDC, pimldp->himl->cx * nOvlIdx, 0,
@@ -457 +457 @@
                 SelectObject(hImageDC, hOldBitmap);
             }
-            hOldBitmap = (HBITMAP) SelectObject (hImageDC,
+            hOldBitmap = (HBITMAP) SelectObject (hImageDC, 
                 pimldp->himl->hbmImage);
 
-            BitBlt (pimldp->hdcDst,
-                pimldp->x, pimldp->y, cx, cy,
+            BitBlt (pimldp->hdcDst, 
+                pimldp->x, pimldp->y, cx, cy, 
                 hImageDC,
                 pimldp->himl->cx * nOvlIdx, 0,
@@ -492 +492 @@
 
 INT WINAPI
-ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
+ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
 {
     HDC     hdcImage, hdcBitmap;
@@ -531 +531 @@
         hOldBitmapTemp = (HBITMAP) SelectObject(hdcTemp, hbmMask);
 
-        BitBlt (hdcMask,
+        BitBlt (hdcMask, 
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
-            hdcTemp,
-            0, 0,
+            hdcTemp, 
+            0, 0, 
             SRCCOPY);
 
@@ -542 +542 @@
         /* Remove the background from the image
         */
-        BitBlt (hdcImage,
+        BitBlt (hdcImage, 
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
-            hdcMask,
-            nStartX, 0,
+            hdcMask, 
+            nStartX, 0, 
             0x220326); /* NOTSRCAND */
 
@@ -586 +586 @@
 
 /*************************************************************************
- * ImageList_AddMasked [COMCTL32.42]
+ * ImageList_AddMasked [COMCTL32.42] 
  *
  * Adds an image or images to an image list and creates a mask from the
@@ -651 +651 @@
         GetPixel (hdcBitmap, 0, 0);
     SetBkColor (hdcBitmap, bkColor);
-    BitBlt (hdcMask,
+    BitBlt (hdcMask, 
         nMaskXOffset, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcBitmap, 0, 0,
+        hdcBitmap, 0, 0, 
         SRCCOPY);
 
@@ -668 +668 @@
         This is here in case some apps rely on this bug
     */
-    BitBlt(hdcBitmap,
+    BitBlt(hdcBitmap, 
         0, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcMask,
-        nMaskXOffset, 0,
+        hdcMask, 
+        nMaskXOffset, 0, 
         0x220326); /* NOTSRCAND */
     /* Copy result to the imagelist
     */
-    BitBlt (hdcImage,
+    BitBlt (hdcImage, 
         nIndex * himl->cx, 0, bmp.bmWidth, bmp.bmHeight,
-        hdcBitmap,
-        0, 0,
+        hdcBitmap, 
+        0, 0, 
         SRCCOPY);
     /* Clean up
@@ -698 +698 @@
 
 /*************************************************************************
- * ImageList_BeginDrag [COMCTL32.43]
+ * ImageList_BeginDrag [COMCTL32.43] 
  *
  * Creates a temporary image list that contains one image. It will be used
@@ -716 +716 @@
 BOOL WINAPI
 ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
-                 INT dxHotspot, INT dyHotspot)
+                     INT dxHotspot, INT dyHotspot)
 {
     HDC hdcSrc, hdcDst;
@@ -723 +723 @@
 
     if (himlTrack == NULL)
-    return FALSE;
+        return FALSE;
 
     if (himlInternalDrag)
@@ -729 +729 @@
 
     himlInternalDrag =
-    ImageList_Create (himlTrack->cx, himlTrack->cy,
-              himlTrack->flags, 1, 1);
+        ImageList_Create (himlTrack->cx, himlTrack->cy,
+                          himlTrack->flags, 1, 1);
     if (himlInternalDrag == NULL) {
         ERR("Error creating drag image list!\n");
@@ -764 +764 @@
 
 /*************************************************************************
- * ImageList_Copy [COMCTL32.44]
- *
- *  Copies an image of the source image list to an image of the
+ * ImageList_Copy [COMCTL32.44] 
+ *
+ *  Copies an image of the source image list to an image of the 
  *  destination image list. Images can be copied or swapped.
  *
@@ -787 +787 @@
 
 BOOL WINAPI
-ImageList_Copy (HIMAGELIST himlDst, INT iDst,   HIMAGELIST himlSrc,
-        INT iSrc, INT uFlags)
-{
-    HDC hdcSrc, hdcDst;
+ImageList_Copy (HIMAGELIST himlDst, INT iDst,   HIMAGELIST himlSrc,
+                INT iSrc, INT uFlags)
+{
+    HDC hdcSrc, hdcDst;    
 
     TRACE("iDst=%d  iSrc=%d\n", iDst, iSrc);
 
     if ((himlSrc == NULL) || (himlDst == NULL))
-    return FALSE;
+        return FALSE;
     if ((iDst < 0) || (iDst >= himlDst->cCurImage))
-    return FALSE;
+        return FALSE;
     if ((iSrc < 0) || (iSrc >= himlSrc->cCurImage))
-    return FALSE;
+        return FALSE;
 
     hdcSrc = CreateCompatibleDC (0);
@@ -815 +815 @@
                                        himlSrc->uBitsPixel, NULL);
         hbmTempMask = CreateBitmap (himlSrc->cx, himlSrc->cy, 1,
-                      1, NULL);
+                                      1, NULL);
 
         /* copy (and stretch) destination to temporary bitmaps.(save) */
@@ -908 +908 @@
 HIMAGELIST WINAPI
 ImageList_Create (INT cx, INT cy, UINT flags,
-          INT cInitial, INT cGrow)
+                  INT cInitial, INT cGrow)
 {
     HIMAGELIST himl;
@@ -914 +914 @@
     INT      nCount;
     HBITMAP  hbmTemp;
-    static WORD aBitBlend25[] =
+    static WORD aBitBlend25[] = 
         {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00};
 
@@ -948 +948 @@
     if (himl->cMaxImage > 0) {
         himl->hbmImage =
-      CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
+          CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
                         1, himl->uBitsPixel, NULL);
-    if (himl->hbmImage == 0) {
-        ERR("Error creating image bitmap!\n");
-        return NULL;
-    }
+        if (himl->hbmImage == 0) {
+            ERR("Error creating image bitmap!\n");
+            return NULL;
+        }
     }
     else
         himl->hbmImage = 0;
-
+    
     if ( (himl->cMaxImage > 0) && (himl->flags & ILC_MASK)) {
         himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
-                    1, 1, NULL);
+                                        1, 1, NULL);
         if (himl->hbmMask == 0) {
             ERR("Error creating mask bitmap!\n");
@@ -986 +986 @@
 
 /*************************************************************************
- * ImageList_Destroy [COMCTL32.46]
+ * ImageList_Destroy [COMCTL32.46] 
  *
  * Destroys an image list.
@@ -1000 +1000 @@
 BOOL WINAPI
 ImageList_Destroy (HIMAGELIST himl)
-{
+{ 
     if (!himl)
-    return FALSE;
+        return FALSE;
 
     /* delete image bitmaps */
@@ -1015 +1015 @@
     if (himl->hbrBlend50)
         DeleteObject (himl->hbrBlend50);
-
+        
     COMCTL32_Free (himl);
 
@@ -1023 +1023 @@
 
 /*************************************************************************
- * ImageList_DragEnter [COMCTL32.47]
+ * ImageList_DragEnter [COMCTL32.47] 
  *
  * Locks window update and displays the drag image at the given position.
@@ -1045 +1045 @@
 {
     if (himlInternalDrag == NULL)
-    return FALSE;
+        return FALSE;
 
     if (hwndLock)
-    hwndInternalDrag = hwndLock;
+        hwndInternalDrag = hwndLock;
     else
-    hwndInternalDrag = GetDesktopWindow ();
+        hwndInternalDrag = GetDesktopWindow ();
 
     xInternalPos = x;
@@ -1057 +1057 @@
     hdcBackBuffer = CreateCompatibleDC (0);
     hbmBackBuffer = CreateCompatibleBitmap (hdcBackBuffer,
-        himlInternalDrag->cx, himlInternalDrag->cy);
+                himlInternalDrag->cx, himlInternalDrag->cy);
 
     ImageList_DragShowNolock (TRUE);
@@ -1066 +1066 @@
 
 /*************************************************************************
- * ImageList_DragLeave [COMCTL32.48]
+ * ImageList_DragLeave [COMCTL32.48] 
  *
  * Unlocks window update and hides the drag image.
@@ -1082 +1082 @@
 {
     if (hwndLock)
-    hwndInternalDrag = hwndLock;
+        hwndInternalDrag = hwndLock;
     else
-    hwndInternalDrag = GetDesktopWindow ();
+        hwndInternalDrag = GetDesktopWindow ();
 
     ImageList_DragShowNolock (FALSE);
@@ -1096 +1096 @@
 
 /*************************************************************************
- * ImageList_DragMove [COMCTL32.49]
+ * ImageList_DragMove [COMCTL32.49] 
  *
  * Moves the drag image.
@@ -1128 +1128 @@
 
 /*************************************************************************
- * ImageList_DragShowNolock [COMCTL32.50]
+ * ImageList_DragShowNolock [COMCTL32.50] 
  *
  * Shows or hides the drag image.
@@ -1152 +1152 @@
 
     hdcDrag = GetDCEx (hwndInternalDrag, 0,
-             DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
+                         DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
 
     if (bShow) {
-    /* show drag image */
-
-    /* save background */
-
-    /* draw drag image */
+        /* show drag image */
+
+        /* save background */
+
+        /* draw drag image */
 
     }
     else {
-    /* hide drag image */
-
-    /* restore background */
+        /* hide drag image */
+
+        /* restore background */
 
     }
@@ -1199 +1199 @@
 BOOL WINAPI
 ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc,
-        INT x, INT y, UINT fStyle)
+                INT x, INT y, UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
@@ -1252 +1252 @@
 BOOL WINAPI
 ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y,
-          INT dx, INT dy, COLORREF rgbBk, COLORREF rgbFg,
-          UINT fStyle)
+                  INT dx, INT dy, COLORREF rgbBk, COLORREF rgbFg,
+                  UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
@@ -1277 +1277 @@
 
 /*************************************************************************
- * ImageList_DrawIndirect [COMCTL32.53]
+ * ImageList_DrawIndirect [COMCTL32.53] 
  *
  * Draws an image using ...
@@ -1292 +1292 @@
 ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp)
 {
-    INT      cx, cy;
-    /*
+    INT      cx, cy;    
+    /* 
         Do some Error Checking
     */
@@ -1303 +1303 @@
         return FALSE;
     if ((pimldp->i < 0) || (pimldp->i >= pimldp->himl->cCurImage)) {
-    ERR("%d not within range (max %d)\n",pimldp->i,pimldp->himl->cCurImage-1);
+        ERR("%d not within range (max %d)\n",pimldp->i,pimldp->himl->cCurImage-1);
         return FALSE;
     }
@@ -1322 +1322 @@
         IMAGELIST_InternalDraw(pimldp, cx, cy);
     }
-    /*
+    /* 
         Apply the blend if needed to the Image
     */
@@ -1387 +1387 @@
         DeleteDC (hdcSrc);
 
-    himlDst->cCurImage = himlSrc->cCurImage;
-    himlDst->cMaxImage = himlSrc->cMaxImage;
+        himlDst->cCurImage = himlSrc->cCurImage;
+        himlDst->cMaxImage = himlSrc->cMaxImage;
     }
     return himlDst;
@@ -1447 +1447 @@
 {
     if (himl == NULL)
-    return CLR_NONE;
+        return CLR_NONE;
 
     return himl->clrBk;
@@ -1483 +1483 @@
 
 /*************************************************************************
- * ImageList_GetIcon [COMCTL32.59]
+ * ImageList_GetIcon [COMCTL32.59] 
  *
  * Creates an icon from a masked image of an image list.
@@ -1506 +1506 @@
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage)) {
-    FIXME("(%p,%d,%x), params out of range!\n",himl,i,fStyle);
-    return 0;
+        FIXME("(%p,%d,%x), params out of range!\n",himl,i,fStyle);
+        return 0;
    }
 
@@ -1519 +1519 @@
     hOldDstBitmap = (HBITMAP)SelectObject (hdcDst, ii.hbmMask);
     if (himl->hbmMask) {
-    SelectObject (hdcSrc, himl->hbmMask);
-    BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-          hdcSrc, i * himl->cx, 0, SRCCOPY);
+        SelectObject (hdcSrc, himl->hbmMask);
+        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
+                  hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-    PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
 
     /* draw image*/
@@ -1531 +1531 @@
     SelectObject (hdcDst, ii.hbmColor);
     BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-          hdcSrc, i * himl->cx, 0, SRCCOPY);
+              hdcSrc, i * himl->cx, 0, SRCCOPY);
 
     /*
      * CreateIconIndirect requires us to deselect the bitmaps from
-     * the DCs before calling
+     * the DCs before calling 
      */
     SelectObject(hdcSrc, hOldSrcBitmap);
     SelectObject(hdcDst, hOldDstBitmap);
 
-    hIcon = CreateIconIndirect (&ii);
+    hIcon = CreateIconIndirect (&ii);    
 
     DeleteDC (hdcSrc);
@@ -1573 +1573 @@
 {
     if (himl == NULL)
-    return FALSE;
+        return FALSE;
     if ((himl->cx <= 0) || (himl->cy <= 0))
-    return FALSE;
+        return FALSE;
 
     if (cx)
-    *cx = himl->cx;
+        *cx = himl->cx;
     if (cy)
-    *cy = himl->cy;
+        *cy = himl->cy;
 
     return TRUE;
@@ -1603 +1603 @@
 {
     if (himl == NULL)
-    return 0;
+        return 0;
 
     return himl->cCurImage;
@@ -1628 +1628 @@
 {
     if ((himl == NULL) || (pImageInfo == NULL))
-    return FALSE;
+        return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
-    return FALSE;
+        return FALSE;
 
     pImageInfo->hbmImage = himl->hbmImage;
     pImageInfo->hbmMask  = himl->hbmMask;
-
+    
     pImageInfo->rcImage.top    = 0;
     pImageInfo->rcImage.bottom = himl->cy;
     pImageInfo->rcImage.left   = i * himl->cx;
     pImageInfo->rcImage.right  = (i+1) * himl->cx;
-
+    
     return TRUE;
 }
@@ -1645 +1645 @@
 
 /*************************************************************************
- * ImageList_GetImageRect [COMCTL32.63]
+ * ImageList_GetImageRect [COMCTL32.63] 
  *
  * Retrieves the rectangle of the specified image in an image list.
@@ -1666 +1666 @@
 {
     if ((himl == NULL) || (lpRect == NULL))
-    return FALSE;
+        return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
-    return FALSE;
+        return FALSE;
 
     lpRect->left   = i * himl->cx;
@@ -1704 +1704 @@
 HIMAGELIST WINAPI
 ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx, INT cGrow,
-            COLORREF clrMask, UINT uType, UINT uFlags)
+                        COLORREF clrMask, UINT uType, UINT uFlags)
 {
     HIMAGELIST himl = NULL;
@@ -1744 +1744 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1752 +1752 @@
 
     DeleteObject (handle);
-
+    
     return himl;
 }
@@ -1781 +1781 @@
 HIMAGELIST WINAPI
 ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
-            COLORREF clrMask, UINT uType,   UINT uFlags)
+                        COLORREF clrMask, UINT uType,   UINT uFlags)
 {
     HIMAGELIST himl = NULL;
@@ -1808 +1808 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1816 +1816 @@
 
     DeleteObject (handle);
-
+    
     return himl;
 }
@@ -1822 +1822 @@
 
 /*************************************************************************
- * ImageList_Merge [COMCTL32.67]
+ * ImageList_Merge [COMCTL32.67] 
  *
  * Creates a new image list that contains a merged image from the specified
@@ -1842 +1842 @@
 HIMAGELIST WINAPI
 ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
-         INT dx, INT dy)
+                 INT dx, INT dy)
 {
     HIMAGELIST himlDst = NULL;
@@ -1851 +1851 @@
 
     if ((himl1 == NULL) || (himl2 == NULL))
-    return NULL;
+        return NULL;
 
     /* check indices */
@@ -1903 +1903 @@
         nX1 = i1 * himl1->cx;
         nX2 = i2 * himl2->cx;
-
+        
         /* copy image */
         SelectObject (hdcSrcImage, himl1->hbmImage);
         SelectObject (hdcDstImage, himlDst->hbmImage);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
                   hdcSrcImage, 0, 0, BLACKNESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCAND);
 
         SelectObject (hdcSrcImage, himl2->hbmImage);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCPAINT);
 
@@ -1923 +1923 @@
         SelectObject (hdcSrcImage, himl1->hbmMask);
         SelectObject (hdcDstImage, himlDst->hbmMask);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
                   hdcSrcImage, 0, 0, WHITENESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
                   hdcSrcImage, nX2, 0, SRCAND);
 
@@ -1935 +1935 @@
         DeleteDC (hdcDstImage);
     }
-
+   
     return himlDst;
 }
@@ -1945 +1945 @@
     int bitspixel = GetDeviceCaps(hdc,BITSPIXEL)*GetDeviceCaps(hdc,PLANES);
     if (bitspixel>8)
-    return TRUE;
+        return TRUE;
     if (bitspixel<=4)
-    return FALSE;
+        return FALSE;
     return GetDeviceCaps(hdc,CAPS1) & C1_DIBENGINE;
 }
@@ -1954 +1954 @@
 /* helper for ImageList_Read, see comments below */
 static HBITMAP _read_bitmap(LPSTREAM pstm,int ilcFlag,int cx,int cy) {
-    HDC         xdc = 0;
-    BITMAPFILEHEADER    bmfh;
-    BITMAPINFOHEADER    bmih;
-    int         bitsperpixel,palspace,longsperline,width,height;
-    LPBITMAPINFOHEADER  bmihc = NULL;
-    int         result = 0;
-    HBITMAP     hbitmap = 0;
-    LPBYTE      bits = NULL,nbits = NULL;
-    int         nbytesperline,bytesperline;
-
-    if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL)) ||
-        (bmfh.bfType != (('M'<<8)|'B'))                 ||
-        !SUCCEEDED(IStream_Read ( pstm, &bmih, sizeof(bmih), NULL)) ||
-        (bmih.biSize != sizeof(bmih))
+    HDC                 xdc = 0;
+    BITMAPFILEHEADER    bmfh;
+    BITMAPINFOHEADER    bmih;
+    int                 bitsperpixel,palspace,longsperline,width,height;
+    LPBITMAPINFOHEADER  bmihc = NULL;
+    int                 result = 0;
+    HBITMAP             hbitmap = 0;
+    LPBYTE              bits = NULL,nbits = NULL;
+    int                 nbytesperline,bytesperline;
+
+    if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))     ||
+        (bmfh.bfType != (('M'<<8)|'B'))                                 ||
+        !SUCCEEDED(IStream_Read ( pstm, &bmih, sizeof(bmih), NULL))     ||
+        (bmih.biSize != sizeof(bmih))
     )
-    return 0;
+        return 0;
 
     bitsperpixel = bmih.biPlanes * bmih.biBitCount;
     if (bitsperpixel<=8)
-        palspace = (1<<bitsperpixel)*sizeof(RGBQUAD);
+        palspace = (1<<bitsperpixel)*sizeof(RGBQUAD);
     else
-        palspace = 0;
+        palspace = 0;
     width = bmih.biWidth;
     height = bmih.biHeight;
     bmihc = (LPBITMAPINFOHEADER)LocalAlloc(LMEM_ZEROINIT,sizeof(bmih)+palspace);
     memcpy(bmihc,&bmih,sizeof(bmih));
-    longsperline    = ((width*bitsperpixel+31)&~0x1f)>>5;
-    bmihc->biSizeImage  = (longsperline*height)<<2;
+    longsperline        = ((width*bitsperpixel+31)&~0x1f)>>5;
+    bmihc->biSizeImage  = (longsperline*height)<<2;
 
     /* read the palette right after the end of the bitmapinfoheader */
     if (palspace)
-    if (!SUCCEEDED(IStream_Read ( pstm, bmihc+1, palspace, NULL)))
-        goto ret1;
+        if (!SUCCEEDED(IStream_Read ( pstm, bmihc+1, palspace, NULL)))
+            goto ret1;
 
     xdc = GetDC(0);
 #if 0 /* Magic for NxM -> 1x(N*M) not implemented for DIB Sections */
     if ((bitsperpixel>1) &&
-    ((ilcFlag!=ILC_COLORDDB) && (!ilcFlag || may_use_dibsection(xdc)))
+        ((ilcFlag!=ILC_COLORDDB) && (!ilcFlag || may_use_dibsection(xdc)))
      ) {
-    hbitmap = CreateDIBSection(xdc,(BITMAPINFO*)bmihc,0,(LPVOID*)&bits,0,0);
-    if (!hbitmap)
-        goto ret1;
-    if (!SUCCEEDED(IStream_Read( pstm, bits, bmihc->biSizeImage, NULL)))
-        goto ret1;
-    result = 1;
+        hbitmap = CreateDIBSection(xdc,(BITMAPINFO*)bmihc,0,(LPVOID*)&bits,0,0);
+        if (!hbitmap)
+            goto ret1;
+        if (!SUCCEEDED(IStream_Read( pstm, bits, bmihc->biSizeImage, NULL)))
+            goto ret1;
+        result = 1;
     } else
 #endif
     {
-    int i,nwidth,nheight;
-
-    nwidth  = width*(height/cy);
-    nheight = cy;
-
-    if (bitsperpixel==1)
-        hbitmap = CreateBitmap(nwidth,nheight,1,1,NULL);
-    else
-        hbitmap = CreateCompatibleBitmap(xdc,nwidth,nheight);
-
-    /* Might be a bit excessive memory use here */
-    bits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-    nbits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-    if (!SUCCEEDED(IStream_Read ( pstm, bits, bmihc->biSizeImage, NULL)))
-        goto ret1;
-
-    /* Copy the NxM bitmap into a 1x(N*M) bitmap we need, linewise */
-    /* Do not forget that windows bitmaps are bottom->top */
-    bytesperline    = longsperline*4;
-    nbytesperline   = (height/cy)*bytesperline;
-    for (i=0;i<height;i++) {
-        memcpy(
-        nbits+((height-1-i)%cy)*nbytesperline+(i/cy)*bytesperline,
-        bits+bytesperline*(height-1-i),
-        bytesperline
-        );
-    }
-    bmihc->biWidth  = nwidth;
-    bmihc->biHeight = nheight;
-    if (!SetDIBits(xdc,hbitmap,0,nheight,nbits,(BITMAPINFO*)bmihc,0))
-        goto ret1;
-    LocalFree((HLOCAL)nbits);
-    LocalFree((HLOCAL)bits);
-    result = 1;
+        int i,nwidth,nheight;
+
+        nwidth  = width*(height/cy);
+        nheight = cy;
+
+        if (bitsperpixel==1)
+            hbitmap = CreateBitmap(nwidth,nheight,1,1,NULL);
+        else
+            hbitmap = CreateCompatibleBitmap(xdc,nwidth,nheight);
+
+        /* Might be a bit excessive memory use here */
+        bits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
+        nbits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
+        if (!SUCCEEDED(IStream_Read ( pstm, bits, bmihc->biSizeImage, NULL)))
+                goto ret1;
+
+        /* Copy the NxM bitmap into a 1x(N*M) bitmap we need, linewise */
+        /* Do not forget that windows bitmaps are bottom->top */
+        bytesperline    = longsperline*4;
+        nbytesperline   = (height/cy)*bytesperline;
+        for (i=0;i<height;i++) {
+            memcpy(
+                nbits+((height-1-i)%cy)*nbytesperline+(i/cy)*bytesperline,
+                bits+bytesperline*(height-1-i),
+                bytesperline
+            );
+        }
+        bmihc->biWidth  = nwidth;
+        bmihc->biHeight = nheight;
+        if (!SetDIBits(xdc,hbitmap,0,nheight,nbits,(BITMAPINFO*)bmihc,0))
+                goto ret1;
+        LocalFree((HLOCAL)nbits);
+        LocalFree((HLOCAL)bits);
+        result = 1;
     }
 ret1:
-    if (xdc)    ReleaseDC(0,xdc);
-    if (bmihc)  LocalFree((HLOCAL)bmihc);
+    if (xdc)    ReleaseDC(0,xdc);
+    if (bmihc)  LocalFree((HLOCAL)bmihc);
     if (!result) {
-    if (hbitmap) {
-        DeleteObject(hbitmap);
-        hbitmap = 0;
-    }
+        if (hbitmap) {
+            DeleteObject(hbitmap);
+            hbitmap = 0;
+        }
     }
     return hbitmap;
@@ -2062 +2062 @@
  *
  * The format is like this:
- *  ILHEAD          ilheadstruct;
+ *      ILHEAD                  ilheadstruct;
  *
  * for the color image part:
- *  BITMAPFILEHEADER    bmfh;
- *  BITMAPINFOHEADER    bmih;
+ *      BITMAPFILEHEADER        bmfh; 
+ *      BITMAPINFOHEADER        bmih;
  * only if it has a palette:
- *  RGBQUAD     rgbs[nr_of_paletted_colors];
- *
- *  BYTE            colorbits[imagesize];
+ *      RGBQUAD         rgbs[nr_of_paletted_colors]; 
+ *
+ *      BYTE                    colorbits[imagesize];
  *
  * the following only if the ILC_MASK bit is set in ILHEAD.ilFlags:
- *  BITMAPFILEHEADER    bmfh_mask;
- *  BITMAPINFOHEADER    bmih_mask;
+ *      BITMAPFILEHEADER        bmfh_mask;
+ *      BITMAPINFOHEADER        bmih_mask;
  * only if it has a palette (it usually does not):
- *  RGBQUAD     rgbs[nr_of_paletted_colors];
- *
- *  BYTE            maskbits[imagesize];
+ *      RGBQUAD         rgbs[nr_of_paletted_colors]; 
+ *
+ *      BYTE                    maskbits[imagesize];
  *
  * CAVEAT: Those images are within a NxM bitmap, not the 1xN we expect.
@@ -2085 +2085 @@
 HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
 {
-    ILHEAD  ilHead;
-    HIMAGELIST  himl;
-    HBITMAP hbmColor=0,hbmMask=0;
-    int     i;
+    ILHEAD      ilHead;
+    HIMAGELIST  himl;
+    HBITMAP     hbmColor=0,hbmMask=0;
+    int         i;
 
     if (!SUCCEEDED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL)))
-        return NULL;
+        return NULL;
     if (ilHead.usMagic != (('L' << 8) | 'I'))
-    return NULL;
+        return NULL;
     if (ilHead.usVersion != 0x101) /* probably version? */
-    return NULL;
+        return NULL;
 
 #if 0
-    FIXME(" ilHead.cCurImage = %d\n",ilHead.cCurImage);
-    FIXME(" ilHead.cMaxImage = %d\n",ilHead.cMaxImage);
-    FIXME(" ilHead.cGrow = %d\n",ilHead.cGrow);
-    FIXME(" ilHead.cx = %d\n",ilHead.cx);
-    FIXME(" ilHead.cy = %d\n",ilHead.cy);
-    FIXME(" ilHead.flags = %x\n",ilHead.flags);
-    FIXME(" ilHead.ovls[0] = %d\n",ilHead.ovls[0]);
-    FIXME(" ilHead.ovls[1] = %d\n",ilHead.ovls[1]);
-    FIXME(" ilHead.ovls[2] = %d\n",ilHead.ovls[2]);
-    FIXME(" ilHead.ovls[3] = %d\n",ilHead.ovls[3]);
+    FIXME("     ilHead.cCurImage = %d\n",ilHead.cCurImage);
+    FIXME("     ilHead.cMaxImage = %d\n",ilHead.cMaxImage);
+    FIXME("     ilHead.cGrow = %d\n",ilHead.cGrow);
+    FIXME("     ilHead.cx = %d\n",ilHead.cx);
+    FIXME("     ilHead.cy = %d\n",ilHead.cy);
+    FIXME("     ilHead.flags = %x\n",ilHead.flags);
+    FIXME("     ilHead.ovls[0] = %d\n",ilHead.ovls[0]);
+    FIXME("     ilHead.ovls[1] = %d\n",ilHead.ovls[1]);
+    FIXME("     ilHead.ovls[2] = %d\n",ilHead.ovls[2]);
+    FIXME("     ilHead.ovls[3] = %d\n",ilHead.ovls[3]);
 #endif
 
     hbmColor = _read_bitmap(pstm,ilHead.flags & ~ILC_MASK,ilHead.cx,ilHead.cy);
     if (!hbmColor)
-    return NULL;
+        return NULL;
     if (ilHead.flags & ILC_MASK) {
-    hbmMask = _read_bitmap(pstm,0,ilHead.cx,ilHead.cy);
-    if (!hbmMask) {
-        DeleteObject(hbmColor);
-        return NULL;
-    }
+        hbmMask = _read_bitmap(pstm,0,ilHead.cx,ilHead.cy);
+        if (!hbmMask) {
+            DeleteObject(hbmColor);
+            return NULL;
+        }
     }
 
     himl = ImageList_Create (
-            ilHead.cx,
-            ilHead.cy,
-            ilHead.flags,
-            1,      /* initial */
-            ilHead.cGrow
+                    ilHead.cx,
+                    ilHead.cy,
+                    ilHead.flags,
+                    1,          /* initial */
+                    ilHead.cGrow
     );
     if (!himl) {
-    DeleteObject(hbmColor);
-    DeleteObject(hbmMask);
-    return NULL;
+        DeleteObject(hbmColor);
+        DeleteObject(hbmMask);
+        return NULL;
     }
     himl->hbmImage = hbmColor;
@@ -2140 +2140 @@
     ImageList_SetBkColor(himl,ilHead.bkcolor);
     for (i=0;i<4;i++)
-        ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
+        ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
     return himl;
 }
@@ -2168 +2168 @@
         return FALSE;
     }
-
+    
     if ((i < -1) || (i >= himl->cCurImage)) {
         ERR("index out of range! %d\n", i);
@@ -2211 +2211 @@
         TRACE(" - Max. number of images: %d / %d (Old/New)\n",
                  himl->cMaxImage, himl->cCurImage + himl->cGrow - 1);
-
+        
         hbmNewImage =
             CreateBitmap (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
@@ -2226 +2226 @@
         if (i > 0) {
             TRACE("Pre image copy: Copy %d images\n", i);
-
+       
             SelectObject (hdcSrc, himl->hbmImage);
             SelectObject (hdcDst, hbmNewImage);
@@ -2277 +2277 @@
 
 /*************************************************************************
- * ImageList_Replace [COMCTL32.70]
+ * ImageList_Replace [COMCTL32.70] 
  *
  * Replaces an image in an image list with a new image.
@@ -2294 +2294 @@
 BOOL WINAPI
 ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage,
-           HBITMAP hbmMask)
+                   HBITMAP hbmMask)
 {
     HDC hdcImageList, hdcImage;
@@ -2303 +2303 @@
         return FALSE;
     }
-
+    
     if ((i >= himl->cMaxImage) || (i < 0)) {
         ERR("Invalid image index!\n");
@@ -2333 +2333 @@
         */
         SelectObject (hdcImageList, himl->hbmImage);
-        StretchBlt (hdcImageList,
+        StretchBlt (hdcImageList, 
             i*himl->cx, 0, himl->cx, himl->cy,
-            hdcImage,
-            0, 0, bmp.bmWidth, bmp.bmHeight,
+            hdcImage, 
+            0, 0, bmp.bmWidth, bmp.bmHeight, 
             0x220326); /* NOTSRCAND */
     }
@@ -2375 +2375 @@
 
     if (himl == NULL)
-    return -1;
+        return -1;
     if ((i >= himl->cMaxImage) || (i < -1))
-    return -1;
+        return -1;
 
     hBestFitIcon = CopyImage(
-        hIcon, IMAGE_ICON,
-        himl->cx, himl->cy,
+        hIcon, IMAGE_ICON, 
+        himl->cx, himl->cy, 
         LR_COPYFROMRESOURCE);
 
     GetIconInfo (hBestFitIcon, &ii);
     if (ii.hbmMask == 0)
-    ERR("no mask!\n");
+        ERR("no mask!\n");
     if (ii.hbmColor == 0)
-    ERR("no color!\n");
+        ERR("no color!\n");
     GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
 
@@ -2404 +2404 @@
     TRACE("hdcImageList=0x%x!\n", hdcImageList);
     if (hdcImageList == 0)
-    ERR("invalid hdcImageList!\n");
+        ERR("invalid hdcImageList!\n");
 
     hdcImage = CreateCompatibleDC (0);
     TRACE("hdcImage=0x%x!\n", hdcImage);
     if (hdcImage == 0)
-    ERR("invalid hdcImage!\n");
+        ERR("invalid hdcImage!\n");
 
     hbmOldDst = SelectObject (hdcImageList, himl->hbmImage);
@@ -2429 +2429 @@
 
     if(hBestFitIcon)
-    DestroyIcon(hBestFitIcon);
+        DestroyIcon(hBestFitIcon);
     if (hdcImageList)
-    DeleteDC (hdcImageList);
+        DeleteDC (hdcImageList);
     if (hdcImage)
-    DeleteDC (hdcImage);
+        DeleteDC (hdcImage);
     if (ii.hbmColor)
-    DeleteObject (ii.hbmColor);
+        DeleteObject (ii.hbmColor);
     if (ii.hbmMask)
-    DeleteObject (ii.hbmMask);
+        DeleteObject (ii.hbmMask);
 
     return nIndex;
@@ -2444 +2444 @@
 
 /*************************************************************************
- * ImageList_SetBkColor [COMCTL32.76]
+ * ImageList_SetBkColor [COMCTL32.76] 
  *
  * Sets the background color of an image list.
@@ -2463 +2463 @@
 
     if (himl == NULL)
-    return CLR_NONE;
+        return CLR_NONE;
 
     clrOldBk = himl->clrBk;
@@ -2492 +2492 @@
 BOOL WINAPI
 ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
-                  INT dxHotspot, INT dyHotspot)
+                              INT dxHotspot, INT dyHotspot)
 {
     HIMAGELIST himlTemp;
@@ -2499 +2499 @@
 
     if (himlInternalDrag == NULL)
-    return FALSE;
+        return FALSE;
 
     TRACE(" dxH=%d dyH=%d nX=%d nY=%d\n",
-       dxHotspot, dyHotspot, nInternalDragHotspotX, nInternalDragHotspotY);
+           dxHotspot, dyHotspot, nInternalDragHotspotX, nInternalDragHotspotY);
 
     himlTemp = ImageList_Merge (himlInternalDrag, 0, himlDrag, iDrag,
-                dxHotspot, dyHotspot);
+                                dxHotspot, dyHotspot);
 
     ImageList_Destroy (himlInternalDrag);
@@ -2518 +2518 @@
 
 /*************************************************************************
- * ImageList_SetFilter [COMCTL32.78]
+ * ImageList_SetFilter [COMCTL32.78] 
  *
  * Sets a filter (or does something completely different)!!???
@@ -2540 +2540 @@
 {
     FIXME("(%p 0x%x 0x%lx):empty stub!\n",
-       himl, i, dwFilter);
+           himl, i, dwFilter);
 
     return FALSE;
@@ -2567 +2567 @@
 
     if (!himl)
-    return FALSE;
+        return FALSE;
 
     /* remove all images */
@@ -2617 +2617 @@
 
     if (!himl)
-    return FALSE;
+        return FALSE;
     if (himl->cCurImage >= iImageCount)
-    return FALSE;
+        return FALSE;
     if (himl->cMaxImage > iImageCount)
-    return TRUE;
+        return TRUE;
 
     nNewCount = iImageCount + himl->cGrow;
@@ -2636 +2636 @@
         SelectObject (hdcBitmap, hbmNewBitmap);
 
-    /* copy images */
+        /* copy images */
         BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
 #if 0
-    /* delete 'empty' image space */
-    SetBkColor (hdcBitmap, RGB(255, 255, 255));
-    SetTextColor (hdcBitmap, RGB(0, 0, 0));
-    PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
-          (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
+        /* delete 'empty' image space */
+        SetBkColor (hdcBitmap, RGB(255, 255, 255));
+        SetTextColor (hdcBitmap, RGB(0, 0, 0));
+        PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
+                  (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
-    DeleteObject (himl->hbmImage);
-    himl->hbmImage = hbmNewBitmap;
+        DeleteObject (himl->hbmImage);
+        himl->hbmImage = hbmNewBitmap;
     }
     else
-    ERR("Could not create new image bitmap !\n");
+        ERR("Could not create new image bitmap !\n");
 
     if (himl->hbmMask)
@@ -2661 +2661 @@
             SelectObject (hdcBitmap, hbmNewBitmap);
 
-        /* copy images */
+            /* copy images */
             BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                       hdcImageList, 0, 0, SRCCOPY);
 #if 0
-        /* delete 'empty' image space */
-        SetBkColor (hdcBitmap, RGB(255, 255, 255));
-        SetTextColor (hdcBitmap, RGB(0, 0, 0));
-            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
-              (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
+            /* delete 'empty' image space */
+            SetBkColor (hdcBitmap, RGB(255, 255, 255));
+            SetTextColor (hdcBitmap, RGB(0, 0, 0));
+            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
+                      (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
             DeleteObject (himl->hbmMask);
@@ -2709 +2709 @@
 {
     if (!himl)
-    return FALSE;
+        return FALSE;
     if ((iOverlay < 1) || (iOverlay > MAX_OVERLAYIMAGE))
-    return FALSE;
+        return FALSE;
     if ((iImage!=-1) && ((iImage < 0) || (iImage > himl->cCurImage)))
-    return FALSE;
+        return FALSE;
     himl->nOvlIdx[iOverlay - 1] = iImage;
     return TRUE;
@@ -2744 +2744 @@
 {
     if (!himl)
+        return FALSE;
+
+    FIXME("empty stub!\n");
+
     return FALSE;
-
-    FIXME("empty stub!\n");
-
-    return FALSE;
-}
-
+}
+

trunk/src/comctl32/monthcal.c

@@ -1 +1 @@
 /* Month calendar control
- *
+
  *
  * Copyright 1998, 1999 Eric Kohl (ekohl@abo.rhein-zeitung.de)
  * Copyright 1999 Alex Priem (alexp@sci.kun.nl)
  * Copyright 1999 Chris Morgan <cmorgan@wpi.edu> and
- *        James Abbatiello <abbeyj@wpi.edu>
+ *                James Abbatiello <abbeyj@wpi.edu>
  * Copyright 2000 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de>
  *
@@ -13 +13 @@
  *
  *  FIXME: handle resources better (doesn't work now); also take care
- *         of internationalization.
+           of internationalization. 
  *  FIXME: keyboard handling.
  */
@@ -43 +43 @@
 DEFAULT_DEBUG_CHANNEL(monthcal);
 
-#define MC_SEL_LBUTUP       1   /* Left button released */
-#define MC_SEL_LBUTDOWN     2   /* Left button pressed in calendar */
+#define MC_SEL_LBUTUP       1   /* Left button released */
+#define MC_SEL_LBUTDOWN     2   /* Left button pressed in calendar */
 #define MC_PREVPRESSED      4   /* Prev month button pressed */
 #define MC_NEXTPRESSED      8   /* Next month button pressed */
-#define MC_NEXTMONTHDELAY   350 /* when continuously pressing `next */
-                                        /* month', wait 500 ms before going */
-                                        /* to the next month */
-#define MC_NEXTMONTHTIMER   1           /* Timer ID's */
-#define MC_PREVMONTHTIMER   2
+#define MC_NEXTMONTHDELAY   350 /* when continuously pressing `next */
+                                                                                /* month', wait 500 ms before going */
+                                                                                /* to the next month */
+#define MC_NEXTMONTHTIMER   1                   /* Timer ID's */
+#define MC_PREVMONTHTIMER   2                   
 
 typedef struct
@@ -58 +58 @@
     COMCTL32_HEADER header;
 #endif
-    COLORREF    bk;
-    COLORREF    txt;
-    COLORREF    titlebk;
-    COLORREF    titletxt;
-    COLORREF    monthbk;
-    COLORREF    trailingtxt;
-    HFONT   hFont;
-    HFONT   hBoldFont;
-    int     textHeight;
-    int     textWidth;
-    int     height_increment;
-    int     width_increment;
-    int     left_offset;
-    int     top_offset;
-    int     firstDayplace; /* place of the first day of the current month */
-    int     delta;  /* scroll rate; # of months that the */
+    COLORREF    bk;
+    COLORREF    txt;
+    COLORREF    titlebk;
+    COLORREF    titletxt;
+    COLORREF    monthbk;
+    COLORREF    trailingtxt;
+    HFONT       hFont;
+    HFONT       hBoldFont;
+    int         textHeight;
+    int         textWidth;
+    int         height_increment;
+    int         width_increment;
+    int         left_offset;
+    int         top_offset;
+    int         firstDayplace; /* place of the first day of the current month */
+    int         delta;  /* scroll rate; # of months that the */
                         /* control moves when user clicks a scroll button */
-    int     visible;    /* # of months visible */
-    int     firstDay;   /* Start month calendar with firstDay's day */
-    int     monthRange;
+    int         visible;        /* # of months visible */
+    int         firstDay;       /* Start month calendar with firstDay's day */
+    int         monthRange;
     MONTHDAYSTATE *monthdayState;
-    SYSTEMTIME  todaysDate;
-    DWORD   currentMonth;
-    DWORD   currentYear;
-    int     status;     /* See MC_SEL flags */
-    int     curSelDay;  /* current selected day */
-    int     firstSelDay;    /* first selected day */
-    int     maxSelCount;
-    SYSTEMTIME  minSel;
-    SYSTEMTIME  maxSel;
-    DWORD   rangeValid;
-    SYSTEMTIME  minDate;
-    SYSTEMTIME  maxDate;
-
-    RECT rcClient;  /* rect for whole client area */
-    RECT rcDraw;    /* rect for drawable portion of client area */
-    RECT title;     /* rect for the header above the calendar */
-    RECT titlebtnnext;  /* the `next month' button in the header */
-    RECT titlebtnprev;  /* the `prev month' button in the header */
-    RECT titlemonth;    /* the `month name' txt in the header */
-    RECT titleyear; /* the `year number' txt in the header */
-    RECT wdays;     /* week days at top */
-    RECT days;      /* calendar area */
-    RECT weeknums;  /* week numbers at left side */
-    RECT todayrect; /* `today: xx/xx/xx' text rect */
+    SYSTEMTIME  todaysDate;
+    DWORD       currentMonth;
+    DWORD       currentYear;
+    int         status;         /* See MC_SEL flags */
+    int         curSelDay;      /* current selected day */
+    int         firstSelDay;    /* first selected day */
+    int         maxSelCount;
+    SYSTEMTIME  minSel;
+    SYSTEMTIME  maxSel;
+    DWORD       rangeValid;
+    SYSTEMTIME  minDate;
+    SYSTEMTIME  maxDate;
+                
+    RECT rcClient;      /* rect for whole client area */
+    RECT rcDraw;        /* rect for drawable portion of client area */
+    RECT title;         /* rect for the header above the calendar */
+    RECT titlebtnnext;  /* the `next month' button in the header */
+    RECT titlebtnprev;  /* the `prev month' button in the header */     
+    RECT titlemonth;    /* the `month name' txt in the header */
+    RECT titleyear;     /* the `year number' txt in the header */
+    RECT wdays;         /* week days at top */
+    RECT days;          /* calendar area */
+    RECT weeknums;      /* week numbers at left side */
+    RECT todayrect;     /* `today: xx/xx/xx' text rect */
     HWND hWndYearEdit;  /* Window Handle of edit box to handle years */
     HWND hWndYearUpDown;/* Window Handle of updown box to handle years */
@@ -141 +141 @@
 
 /* make sure that time is valid */
-static int MONTHCAL_ValidateTime(SYSTEMTIME time)
+static int MONTHCAL_ValidateTime(SYSTEMTIME time) 
 {
   if(time.wMonth > 12) return FALSE;
   if(time.wDayOfWeek > 6) return FALSE;
   if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear))
-      return FALSE;
+          return FALSE;
   if(time.wHour > 23) return FALSE;
   if(time.wMinute > 59) return FALSE;
@@ -156 +156 @@
 
 
-void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to)
+void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) 
 {
   to->wYear = from->wYear;
@@ -169 +169 @@
 
 
-/* Note:Depending on DST, this may be offset by a day.
+/* Note:Depending on DST, this may be offset by a day. 
    Need to find out if we're on a DST place & adjust the clock accordingly.
    Above function assumes we have a valid data.
@@ -182 +182 @@
   year-=(month < 3);
 
-  return((year + year/4 - year/100 + year/400 +
+  return((year + year/4 - year/100 + year/400 + 
          DayOfWeekTable[month-1] + day - 1 ) % 7);
 }
@@ -189 +189 @@
    and day in the calendar. day== 0 mean the last day of tha last month
 */
-static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y,
-                   int *daypos,int *weekpos)
+static int MONTHCAL_CalcDayFromPos(MONTHCAL_INFO *infoPtr, int x, int y, 
+                                   int *daypos,int *weekpos) 
 {
   int retval, firstDay;
@@ -202 +202 @@
   *daypos = (x - infoPtr->days.left ) / infoPtr->width_increment;
   *weekpos = (y - infoPtr->days.top ) / infoPtr->height_increment;
-
+    
   firstDay = (MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear)+6 - infoPtr->firstDay)%7;
   retval = *daypos + (7 * *weekpos) - firstDay;
@@ -211 +211 @@
 /* sets x and y to be the position of the day */
 /* x == day, y == week where(0,0) == firstDay, 1st week */
-static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month,
+static void MONTHCAL_CalcDayXY(MONTHCAL_INFO *infoPtr, int day, int month, 
                                  int *x, int *y)
 {
@@ -227 +227 @@
     if(prevMonth==0)
        prevMonth = 12;
-
+   
     *x = (MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear) - firstDay) % 7;
     *y = 0;
@@ -240 +240 @@
 
 /* x: column(day), y: row(week) */
-static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y)
+static void MONTHCAL_CalcDayRect(MONTHCAL_INFO *infoPtr, RECT *r, int x, int y) 
 {
   r->left = infoPtr->days.left + x * infoPtr->width_increment;
@@ -252 +252 @@
 /* day is the day value of the month(1 == 1st), month is the month */
 /* value(january == 1, december == 12) */
-static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr,
+static inline void MONTHCAL_CalcPosFromDay(MONTHCAL_INFO *infoPtr, 
                                             int day, int month, RECT *r)
 {
@@ -278 +278 @@
   x = day_rect.left;
   y = day_rect.top;
-
+        
   points[0].x = x;
   points[0].y = y - 1;
@@ -287 +287 @@
   points[3].x = x + infoPtr->width_increment;
   points[3].y = y + 0.5 * infoPtr->height_increment;
-
+        
   points[4].x = x + infoPtr->width_increment;
   points[4].y = y + 0.9 * infoPtr->height_increment;
@@ -294 +294 @@
   points[6].x = x + 0.5 * infoPtr->width_increment;
   points[6].y = y + 0.9 * infoPtr->height_increment; /* bring the bottom up just
-                a hair to fit inside the day rectangle */
-
+                                a hair to fit inside the day rectangle */
+        
   points[7].x = x + 0.2 * infoPtr->width_increment;
   points[7].y = y + 0.8 * infoPtr->height_increment;
@@ -309 +309 @@
   points[12].x = x + 0.4 * infoPtr->width_increment;
   points[12].y = y + 0.2 * infoPtr->height_increment;
-
+  
   PolyBezier(hdc, points, 13);
   DeleteObject(hRedPen);
@@ -329 +329 @@
   sprintf(buf, "%d", day);
 
-/* No need to check styles: when selection is not valid, it is set to zero.
+/* No need to check styles: when selection is not valid, it is set to zero. 
  * 1<day<31, so evertyhing's OK.
  */
@@ -349 +349 @@
 
     /* FIXME: this may need to be changed now b/c of the other
-    drawing changes 11/3/99 CMM */
+        drawing changes 11/3/99 CMM */
     r2.left   = r.left - 0.25 * infoPtr->textWidth;
     r2.top    = r.top;
@@ -390 +390 @@
 
 /* CHECKME: For `todays date', do we need to check the locale?*/
-static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps)
+static void MONTHCAL_Refresh(HWND hwnd, HDC hdc, PAINTSTRUCT* ps) 
 {
   MONTHCAL_INFO *infoPtr=MONTHCAL_GetInfoPtr(hwnd);
@@ -425 +425 @@
   hbr = CreateSolidBrush (infoPtr->bk);
   FillRect(hdc, rcClient, hbr);
-  DeleteObject(hbr);
+  DeleteObject(hbr);       
 
   /* draw header */
@@ -434 +434 @@
     DeleteObject(hbr);
   }
-
+        
   /* if the previous button is pressed draw it depressed */
   if(IntersectRect(&rcTemp, &(ps->rcPaint), prev))
-  {
+  {  
     if((infoPtr->status & MC_PREVPRESSED))
         DrawFrameControl(hdc, prev, DFC_SCROLL,
-       DFCS_SCROLLLEFT | DFCS_PUSHED |
+           DFCS_SCROLLLEFT | DFCS_PUSHED |
           (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
     else /* if the previous button is pressed draw it depressed */
       DrawFrameControl(hdc, prev, DFC_SCROLL,
-       DFCS_SCROLLLEFT |(dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
-  }
-
-  /* if next button is depressed draw it depressed */
+           DFCS_SCROLLLEFT |(dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
+  }
+
+  /* if next button is depressed draw it depressed */   
   if(IntersectRect(&rcTemp, &(ps->rcPaint), next))
   {
     if((infoPtr->status & MC_NEXTPRESSED))
       DrawFrameControl(hdc, next, DFC_SCROLL,
-           DFCS_SCROLLRIGHT | DFCS_PUSHED |
+           DFCS_SCROLLRIGHT | DFCS_PUSHED |
            (dwStyle & WS_DISABLED ? DFCS_INACTIVE : 0));
     else /* if the next button is pressed draw it depressed */
@@ -466 +466 @@
   titlemonth->left   = title->left;
   titlemonth->right  = title->right;
-
+ 
   GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+infoPtr->currentMonth -1,
-          buf1,sizeof(buf1));
+                  buf1,sizeof(buf1));
   sprintf(buf, "%s %ld", buf1, infoPtr->currentYear);
-
+ 
   if(IntersectRect(&rcTemp, &(ps->rcPaint), titlemonth))
   {
-    DrawTextA(hdc, buf, strlen(buf), titlemonth,
+    DrawTextA(hdc, buf, strlen(buf), titlemonth, 
                         DT_CENTER | DT_VCENTER | DT_SINGLELINE);
   }
@@ -481 +481 @@
 /* titlemonth left/right contained rect for whole titletxt('June  1999')
   * MCM_HitTestInfo wants month & year rects, so prepare these now.
-  *(no, we can't draw them separately; the whole text is centered)
+  *(no, we can't draw them separately; the whole text is centered) 
   */
   GetTextExtentPoint32A(hdc, buf, strlen(buf), &size);
@@ -489 +489 @@
   titlemonth->right = titlemonth->left + size.cx;
   titleyear->left = titlemonth->right;
-
+ 
   /* draw month area */
   rcTemp.top=infoPtr->wdays.top;
@@ -501 +501 @@
     DeleteObject(hbr);
   }
-
+        
 /* draw line under day abbreviatons */
 
   MoveToEx(hdc, infoPtr->days.left + 3, title->bottom + textHeight + 1, NULL);
-
+     
   LineTo(hdc, rcDraw->right - 3, title->bottom + textHeight + 1);
-
+  
   prevMonth = infoPtr->currentMonth - 1;
   if(prevMonth == 0) /* if currentMonth is january(1) prevMonth is */
@@ -529 +529 @@
   for(j=0; j<7; j++) {
     GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SABBREVDAYNAME1 + (i +j)%7,
-            buf,sizeof(buf));
+                    buf,sizeof(buf));
     DrawTextA(hdc, buf, strlen(buf), days,
                          DT_CENTER | DT_VCENTER | DT_SINGLELINE );
@@ -537 +537 @@
 
 /* draw day numbers; first, the previous month */
-
+  
   firstDay = MONTHCAL_CalculateDayOfWeek(1, infoPtr->currentMonth, infoPtr->currentYear);
-
-  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  +
+  
+  day = MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear)  + 
     (infoPtr->firstDay + 7  - firstDay)%7 + 1;
   if (day > MONTHCAL_MonthLength(prevMonth, infoPtr->currentYear))
@@ -553 +553 @@
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
     {
-      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0,
+      MONTHCAL_DrawDay(hdc, infoPtr, day, prevMonth, i, 0, 
           infoPtr->monthdayState[m] & mask);
     }
@@ -577 +577 @@
     {
 
-      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0,
-    infoPtr->monthdayState[m] & mask);
+      MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth, i, 0, 
+        infoPtr->monthdayState[m] & mask);
 
       if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
           (day==infoPtr->todaysDate.wDay) &&
-      (infoPtr->currentYear == infoPtr->todaysDate.wYear)) {
+          (infoPtr->currentYear == infoPtr->todaysDate.wYear)) {
         if(!(dwStyle & MCS_NOTODAYCIRCLE))
-      MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
+          MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
       }
     }
@@ -595 +595 @@
   j = 1; /* move to the 2nd week of the current month */
   i = 0; /* move back to sunday */
-  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {
+  while(day <= MONTHCAL_MonthLength(infoPtr->currentMonth, infoPtr->currentYear)) {     
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
@@ -604 +604 @@
       if((infoPtr->currentMonth==infoPtr->todaysDate.wMonth) &&
           (day==infoPtr->todaysDate.wDay) &&
-          (infoPtr->currentYear == infoPtr->todaysDate.wYear))
-        if(!(dwStyle & MCS_NOTODAYCIRCLE))
-      MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
+          (infoPtr->currentYear == infoPtr->todaysDate.wYear)) 
+        if(!(dwStyle & MCS_NOTODAYCIRCLE))  
+          MONTHCAL_CircleDay(hdc, infoPtr, day, infoPtr->currentMonth);
     }
     mask<<=1;
@@ -627 +627 @@
     MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, j);
     if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay))
-    {
+    {   
       MONTHCAL_DrawDay(hdc, infoPtr, day, infoPtr->currentMonth + 1, i, j,
-        infoPtr->monthdayState[m] & mask);
+                infoPtr->monthdayState[m] & mask);
     }
 
     mask<<=1;
     day++;
-    i++;
+    i++;        
     if(i==7) { /* past saturday, go to next week's sunday */
       i = 0;
@@ -650 +650 @@
     if(!(dwStyle & MCS_NOTODAYCIRCLE))  {
       /*day is the number of days from nextmonth we put on the calendar */
-      MONTHCAL_CircleDay(hdc, infoPtr,
-             day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear),
-             infoPtr->currentMonth);
+      MONTHCAL_CircleDay(hdc, infoPtr, 
+                         day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), 
+                         infoPtr->currentMonth);
       offset+=textWidth;
     }
     if (!LoadStringA(COMCTL32_hModule,IDM_TODAY,buf1,sizeof(buf1)))
       {
-    WARN("Can't load resource\n");
-    strcpy(buf1,"Today:");
+        WARN("Can't load resource\n");
+        strcpy(buf1,"Today:");
       }
     MONTHCAL_CalcDayRect(infoPtr, &rtoday, 1, 6);
@@ -674 +674 @@
   }
 
-/*eventually draw week numbers*/
+/*eventually draw week numbers*/   
   if(dwStyle & MCS_WEEKNUMBERS)  {
     /* display weeknumbers*/
@@ -682 +682 @@
        LOCALE_IFIRSTWEEKOFYEAR == 0 (e.g US?):
        The week containing Jan 1 is the first week of year
-       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany):
+       LOCALE_IFIRSTWEEKOFYEAR == 2 (e.g. Germany): 
        First week of year must contain 4 days of the new year
        LOCALE_IFIRSTWEEKOFYEAR == 1  (what contries?)
@@ -688 +688 @@
     */
     GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTWEEKOFYEAR,
-             buf, sizeof(buf));
+                     buf, sizeof(buf));
     sscanf(buf, "%d", &weeknum);
     switch (weeknum)
       {
       case 1: mindays = 6;
-    break;
+        break;
       case 2: mindays = 3;
-    break;
+        break;
       case 0:
       default:
-    mindays = 0;
+        mindays = 0;
       }
     if (infoPtr->currentMonth < 2)
       {
-    /* calculate all those exceptions for january */
-    weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
-    if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays)
-        weeknum =1;
-    else
-      {
-        weeknum = 0;
-        for(i=0; i<11; i++)
-          weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear-1);
-        weeknum +=startofprescal+ 7;
-        weeknum /=7;
-        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear-1);
-        if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
-          weeknum++;
-      }
+        /* calculate all those exceptions for january */
+        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
+        if ((infoPtr->firstDay +7 - weeknum1)%7 > mindays) 
+            weeknum =1;
+        else
+          {
+            weeknum = 0;
+            for(i=0; i<11; i++) 
+              weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear-1);
+            weeknum +=startofprescal+ 7;
+            weeknum /=7;
+            weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear-1);
+            if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
+              weeknum++;
+          }
       }
     else
       {
-    weeknum = 0;
-    for(i=0; i<prevMonth-1; i++)
-      weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear);
-    weeknum +=startofprescal+ 7;
-    weeknum /=7;
-    weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
-    if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
-      weeknum++;
+        weeknum = 0;
+        for(i=0; i<prevMonth-1; i++) 
+          weeknum+=MONTHCAL_MonthLength(i+1, infoPtr->currentYear);
+        weeknum +=startofprescal+ 7;
+        weeknum /=7;
+        weeknum1=MONTHCAL_CalculateDayOfWeek(1,1,infoPtr->currentYear);
+        if ((infoPtr->firstDay + 7 - weeknum1)%7 > mindays)
+          weeknum++;
       }
     days->left = infoPtr->weeknums.left;
@@ -735 +735 @@
     for(i=0; i<6; i++) {
       if((i==0)&&(weeknum>50))
-    {
-      sprintf(buf, "%d", weeknum);
-      weeknum=0;
-    }
+        {
+          sprintf(buf, "%d", weeknum);
+          weeknum=0;
+        }
       else if((i==5)&&(weeknum>47))
-    {
-      sprintf(buf, "%d", 1);
-    }
+        {
+          sprintf(buf, "%d", 1);
+        }
       else
-    sprintf(buf, "%d", weeknum + i);
+        sprintf(buf, "%d", weeknum + i);
       DrawTextA(hdc, buf, -1, days, DT_CENTER | DT_VCENTER | DT_SINGLELINE );
       days->top+=infoPtr->height_increment;
       days->bottom+=infoPtr->height_increment;
     }
-
+                        
     MoveToEx(hdc, infoPtr->weeknums.right, infoPtr->weeknums.top + 3 , NULL);
     LineTo(hdc,   infoPtr->weeknums.right, infoPtr->weeknums.bottom );
-
+                
   }
   /* currentFont was font at entering Refresh */
 
   SetBkColor(hdc, oldBkColor);
-  SelectObject(hdc, currentFont);
+  SelectObject(hdc, currentFont);     
   SetTextColor(hdc, oldTextColor);
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMinReqRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -768 +768 @@
   LPRECT lpRect = (LPRECT) lParam;
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   /* validate parameters */
 
@@ -781 +781 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -807 +807 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetColor(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -847 +847 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -853 +853 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+  
   if(infoPtr->delta)
     return infoPtr->delta;
@@ -861 +861 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetMonthDelta(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -868 +868 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   infoPtr->delta = (int)wParam;
   return prev;
@@ -874 +874 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
-
+        
   return infoPtr->firstDay;
 }
@@ -887 +887 @@
 /* FIXME: this needs to be implemented properly in MONTHCAL_Refresh() */
 /* FIXME: we need more error checking here */
-static LRESULT
+static LRESULT 
 MONTHCAL_SetFirstDayOfWeek(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -903 +903 @@
     {
       GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK,
-             buf, sizeof(buf));
+                     buf, sizeof(buf));
       TRACE("%s %d\n", buf, strlen(buf));
       if(sscanf(buf, "%d", &day) == 1)
-    infoPtr->firstDay = day;
+        infoPtr->firstDay = day;
       else
-    infoPtr->firstDay = 0;
+        infoPtr->firstDay = 0;
     }
   return prev;
@@ -916 +916 @@
 /* FIXME: fill this in */
 static LRESULT
-MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
+MONTHCAL_GetMonthRange(HWND hwnd, WPARAM wParam, LPARAM lParam) 
 {
   MONTHCAL_INFO *infoPtr = MONTHCAL_GetInfoPtr(hwnd);
@@ -937 +937 @@
 
 /* FIXME: are validated times taken from current date/time or simply
- * copied?
+ * copied? 
  * FIXME:    check whether MCM_GETMONTHRANGE shows correct result after
  *            adjusting range with MCM_SETRANGE
@@ -950 +950 @@
 
   TRACE("%x %lx\n", wParam, lParam);
-
+  
   if(wParam & GDTR_MAX) {
     if(MONTHCAL_ValidateTime(lprgSysTimeArray[1])){
@@ -973 +973 @@
   infoPtr->monthRange = infoPtr->maxDate.wMonth - infoPtr->minDate.wMonth;
 
-  if(infoPtr->monthRange!=prev) {
-    COMCTL32_ReAlloc(infoPtr->monthdayState,
-        infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+  if(infoPtr->monthRange!=prev) { 
+        COMCTL32_ReAlloc(infoPtr->monthdayState, 
+                infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   }
 
@@ -983 +983 @@
 
 /* CHECKME: At the moment, we copy ranges anyway,regardless of
- * infoPtr->rangeValid; a invalid range is simply filled with zeros in
+ * infoPtr->rangeValid; a invalid range is simply filled with zeros in 
  * SetRange.  Is this the right behavior?
 */
@@ -1015 +1015 @@
   if(iMonths!=infoPtr->monthRange) return 0;
 
-  for(i=0; i<iMonths; i++)
+  for(i=0; i<iMonths; i++) 
     infoPtr->monthdayState[i] = dayStates[i];
   return 1;
 }
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1036 +1036 @@
 /* FIXME: if the specified date is not visible, make it visible */
 /* FIXME: redraw? */
-static LRESULT
+static LRESULT 
 MONTHCAL_SetCurSel(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1057 +1057 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1067 +1067 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetMaxSelCount(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1081 +1081 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1100 +1100 @@
     return TRUE;
   }
-
+ 
   return FALSE;
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetSelRange(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1124 +1124 @@
     return TRUE;
   }
-
+ 
   return FALSE;
 }
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_GetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1145 +1145 @@
 
 
-static LRESULT
+static LRESULT 
 MONTHCAL_SetToday(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -1170 +1170 @@
   DWORD retval;
   int day,wday,wnum;
-
-
+  
+  
   x = lpht->pt.x;
   y = lpht->pt.y;
   retval = MCHT_NOWHERE;
-
-
-  /* Comment in for debugging...
-  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y,
-    infoPtr->wdays.left, infoPtr->wdays.right,
-    infoPtr->wdays.top, infoPtr->wdays.bottom,
-    infoPtr->days.left, infoPtr->days.right,
-    infoPtr->days.top, infoPtr->days.bottom,
-    infoPtr->todayrect.left, infoPtr->todayrect.right,
-    infoPtr->todayrect.top, infoPtr->todayrect.bottom,
-    infoPtr->weeknums.left, infoPtr->weeknums.right,
-    infoPtr->weeknums.top, infoPtr->weeknums.bottom);
+  
+
+  /* Comment in for debugging... 
+  TRACE("%d %d wd[%d %d %d %d] d[%d %d %d %d] t[%d %d %d %d] wn[%d %d %d %d]\n", x, y, 
+        infoPtr->wdays.left, infoPtr->wdays.right,
+        infoPtr->wdays.top, infoPtr->wdays.bottom,
+        infoPtr->days.left, infoPtr->days.right,
+        infoPtr->days.top, infoPtr->days.bottom,
+        infoPtr->todayrect.left, infoPtr->todayrect.right,
+        infoPtr->todayrect.top, infoPtr->todayrect.bottom,
+        infoPtr->weeknums.left, infoPtr->weeknums.right,
+        infoPtr->weeknums.top, infoPtr->weeknums.bottom);
   */
 
   /* are we in the header? */
-
+  
   if(PtInRect(&infoPtr->title, lpht->pt)) {
     if(PtInRect(&infoPtr->titlebtnprev, lpht->pt)) {
@@ -1208 +1208 @@
       goto done;
     }
-
+    
     retval = MCHT_TITLE;
     goto done;
   }
-
+  
   day = MONTHCAL_CalcDayFromPos(infoPtr,x,y,&wday,&wnum);
   if(PtInRect(&infoPtr->wdays, lpht->pt)) {
@@ -1218 +1218 @@
     lpht->st.wYear  = infoPtr->currentYear;
     lpht->st.wMonth = (day < 1)? infoPtr->currentMonth -1 : infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1)?
+    lpht->st.wDay   = (day < 1)? 
       MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : day;
     goto done;
   }
-  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {
-    retval = MCHT_CALENDARWEEKNUM;
+  if(PtInRect(&infoPtr->weeknums, lpht->pt)) {  
+    retval = MCHT_CALENDARWEEKNUM; 
     lpht->st.wYear  = infoPtr->currentYear;
-    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 :
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
+    lpht->st.wMonth = (day < 1) ? infoPtr->currentMonth -1 : 
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
       infoPtr->currentMonth +1 :infoPtr->currentMonth;
-    lpht->st.wDay   = (day < 1 ) ?
-      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day :
-      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ?
+    lpht->st.wDay   = (day < 1 ) ? 
+      MONTHCAL_MonthLength(infoPtr->currentMonth-1,infoPtr->currentYear) -day : 
+      (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear)) ? 
       day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) : day;
-    goto done;
-  }
-  if(PtInRect(&infoPtr->days, lpht->pt))
+    goto done;                              
+  }
+  if(PtInRect(&infoPtr->days, lpht->pt)) 
     {
       lpht->st.wYear  = infoPtr->currentYear;
-      if ( day < 1)
-    {
-      retval = MCHT_CALENDARDATEPREV;
-      lpht->st.wMonth = infoPtr->currentMonth - 1;
-      if (lpht->st.wMonth <1)
-        {
-          lpht->st.wMonth = 12;
-          lpht->st.wYear--;
-        }
-      lpht->st.wDay   = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) -day;
-    }
+      if ( day < 1) 
+        {
+          retval = MCHT_CALENDARDATEPREV;
+          lpht->st.wMonth = infoPtr->currentMonth - 1;
+          if (lpht->st.wMonth <1)
+            {
+              lpht->st.wMonth = 12;
+              lpht->st.wYear--;
+            }
+          lpht->st.wDay   = MONTHCAL_MonthLength(lpht->st.wMonth,lpht->st.wYear) -day;
+        }
       else if (day > MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear))
-    {
-      retval = MCHT_CALENDARDATENEXT;
-      lpht->st.wMonth = infoPtr->currentMonth + 1;
-      if (lpht->st.wMonth <12)
-        {
-          lpht->st.wMonth = 1;
-          lpht->st.wYear++;
-        }
-      lpht->st.wDay   = day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) ;
-    }
+        {
+          retval = MCHT_CALENDARDATENEXT;
+          lpht->st.wMonth = infoPtr->currentMonth + 1;
+          if (lpht->st.wMonth <12)
+            {
+              lpht->st.wMonth = 1;
+              lpht->st.wYear++;
+            }
+          lpht->st.wDay   = day - MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear) ;
+        }
       else {
-    retval = MCHT_CALENDARDATE;
-    lpht->st.wMonth = infoPtr->currentMonth;
-    lpht->st.wDay   = day;
+        retval = MCHT_CALENDARDATE;
+        lpht->st.wMonth = infoPtr->currentMonth;
+        lpht->st.wDay   = day;
       }
       goto done;
     }
   if(PtInRect(&infoPtr->todayrect, lpht->pt)) {
-    retval = MCHT_TODAYLINK;
+    retval = MCHT_TODAYLINK; 
     goto done;
   }
-
-
+  
+  
   /* Hit nothing special? What's left must be background :-) */
-
-  retval = MCHT_CALENDARBK;
- done:
+  
+  retval = MCHT_CALENDARBK;       
+ done: 
   lpht->uHit = retval;
   return retval;
@@ -1300 +1300 @@
     nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
     nmds.nmhdr.code     = MCN_GETDAYSTATE;
-    nmds.cDayState  = infoPtr->monthRange;
-    nmds.prgDayState    = COMCTL32_Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
+    nmds.cDayState      = infoPtr->monthRange;
+    nmds.prgDayState    = COMCTL32_Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
     SendMessageA(GetParent(hwnd), WM_NOTIFY,
@@ -1330 +1330 @@
     nmds.nmhdr.idFrom   = GetWindowLongA(hwnd, GWL_ID);
     nmds.nmhdr.code     = MCN_GETDAYSTATE;
-    nmds.cDayState  = infoPtr->monthRange;
-    nmds.prgDayState    = COMCTL32_Alloc
+    nmds.cDayState      = infoPtr->monthRange;
+    nmds.prgDayState    = COMCTL32_Alloc 
                         (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
 
@@ -1348 +1348 @@
   POINT menupoint;
   char buf[32];
-
+  
   hMenu = CreatePopupMenu();
   if (!LoadStringA(COMCTL32_hModule,IDM_GOTODAY,buf,sizeof(buf)))
@@ -1360 +1360 @@
   ClientToScreen(hwnd, &menupoint);
   if( TrackPopupMenu(hMenu,TPM_RIGHTBUTTON| TPM_NONOTIFY|TPM_RETURNCMD,
-             menupoint.x,menupoint.y,0,hwnd,NULL))
+                     menupoint.x,menupoint.y,0,hwnd,NULL))
     {
       infoPtr->currentMonth=infoPtr->todaysDate.wMonth;
       infoPtr->currentYear=infoPtr->todaysDate.wYear;
       InvalidateRect(hwnd, NULL, FALSE);
-    }
+    }   
   return 0;
 }
@@ -1381 +1381 @@
   POINT menupoint;
   TRACE("%x %lx\n", wParam, lParam);
-
+        
   if (infoPtr->hWndYearUpDown)
     {
       infoPtr->currentYear=SendMessageA( infoPtr->hWndYearUpDown, UDM_SETPOS,   (WPARAM) 0,(LPARAM)0);
       if(!DestroyWindow(infoPtr->hWndYearUpDown))
-    {
-      FIXME("Can't destroy Updown Control\n");
-    }
+        {
+          FIXME("Can't destroy Updown Control\n");
+        }
       else
-    infoPtr->hWndYearUpDown=0;
+        infoPtr->hWndYearUpDown=0;
       if(!DestroyWindow(infoPtr->hWndYearEdit))
-    {
-      FIXME("Can't destroy Updown Control\n");
-    }
+        {
+          FIXME("Can't destroy Updown Control\n");
+        }
       else
-    infoPtr->hWndYearEdit=0;
+        infoPtr->hWndYearEdit=0;
       InvalidateRect(hwnd, NULL, FALSE);
     }
-
+  
   ht.pt.x = (INT)LOWORD(lParam);
   ht.pt.y = (INT)HIWORD(lParam);
@@ -1414 +1414 @@
     return TRUE;
   }
-  if(hit == MCHT_TITLEBTNPREV){
+  if(hit == MCHT_TITLEBTNPREV){ 
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     infoPtr->status = MC_PREVPRESSED;
@@ -1424 +1424 @@
   if(hit == MCHT_TITLEMONTH) {
     hMenu = CreatePopupMenu();
-
+    
     for (i=0; i<12;i++)
       {
-    GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+i,
-          buf,sizeof(buf));
-    AppendMenuA(hMenu, MF_STRING|MF_ENABLED,i+1, buf);
+        GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SMONTHNAME1+i,
+                  buf,sizeof(buf));
+        AppendMenuA(hMenu, MF_STRING|MF_ENABLED,i+1, buf);
       }
     menupoint.x=infoPtr->titlemonth.right;
@@ -1435 +1435 @@
     ClientToScreen(hwnd, &menupoint);
     i= TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD,
-              menupoint.x,menupoint.y,0,hwnd,NULL);
+                      menupoint.x,menupoint.y,0,hwnd,NULL);
     if ((i>0) && (i<13))
       {
-    infoPtr->currentMonth=i;
-    InvalidateRect(hwnd, NULL, FALSE);
+        infoPtr->currentMonth=i;
+        InvalidateRect(hwnd, NULL, FALSE);
       }
   }
   if(hit == MCHT_TITLEYEAR) {
     infoPtr->hWndYearEdit=CreateWindowExA(0,
-             "EDIT",
-               0,
-             WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT,
-             infoPtr->titleyear.left+3,infoPtr->titlebtnnext.top,
-             infoPtr->titleyear.right-infoPtr->titleyear.left,
-             infoPtr->textHeight,
-             hwnd,
-             (HMENU)NULL,
-             (HINSTANCE)NULL,
-             NULL);
+                         "EDIT",
+                           0,
+                         WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT,
+                         infoPtr->titleyear.left+3,infoPtr->titlebtnnext.top,
+                         infoPtr->titleyear.right-infoPtr->titleyear.left,
+                         infoPtr->textHeight,
+                         hwnd,
+                         (HMENU)NULL, 
+                         (HINSTANCE)NULL, 
+                         NULL);
     infoPtr->hWndYearUpDown=CreateWindowExA(0,
-             UPDOWN_CLASSA,
-               0,
-             WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT|UDS_NOTHOUSANDS|UDS_ARROWKEYS,
-             infoPtr->titleyear.right+6,infoPtr->titlebtnnext.top,
-             20,
-             infoPtr->textHeight,
-             hwnd,
-             (HMENU)NULL,
-             (HINSTANCE)NULL,
-             NULL);
+                         UPDOWN_CLASSA,
+                           0,
+                         WS_VISIBLE | WS_CHILD |UDS_SETBUDDYINT|UDS_NOTHOUSANDS|UDS_ARROWKEYS,
+                         infoPtr->titleyear.right+6,infoPtr->titlebtnnext.top,
+                         20,
+                         infoPtr->textHeight,
+                         hwnd,
+                         (HMENU)NULL, 
+                         (HINSTANCE)NULL, 
+                         NULL);
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETRANGE, (WPARAM) 0, MAKELONG (9999, 1753));
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM) infoPtr->hWndYearEdit, (LPARAM)0 );
     SendMessageA( infoPtr->hWndYearUpDown, UDM_SETPOS,   (WPARAM) 0,(LPARAM)infoPtr->currentYear );
     return TRUE;
-
+         
   }
   if(hit == MCHT_TODAYLINK) {
@@ -1487 +1487 @@
     MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
     MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-
+        
     SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom,(LPARAM)&nmsc);
@@ -1493 +1493 @@
     MONTHCAL_CopyTime(&ht.st, &selArray[0]);
     MONTHCAL_CopyTime(&ht.st, &selArray[1]);
-    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray);
+    MONTHCAL_SetSelRange(hwnd,0,(LPARAM) &selArray); 
 
     /* redraw both old and new days if the selected day changed */
@@ -1546 +1546 @@
     return TRUE;
   }
-  if(hit == MCHT_CALENDARDATEPREV){
+  if(hit == MCHT_CALENDARDATEPREV){ 
     MONTHCAL_GoToPrevMonth(hwnd, infoPtr);
     InvalidateRect(hwnd, NULL, FALSE);
@@ -1564 +1564 @@
   MONTHCAL_CopyTime(&nmsc.stSelStart, &infoPtr->minSel);
   MONTHCAL_CopyTime(&nmsc.stSelEnd, &infoPtr->maxSel);
-
+        
   SendMessageA(GetParent(hwnd), WM_NOTIFY,
            (WPARAM)nmsc.nmhdr.idFrom, (LPARAM)&nmsc);
-
+  
   /* redraw if necessary */
   if(redraw)
     InvalidateRect(hwnd, NULL, FALSE);
-
+        
   return 0;
 }
@@ -1586 +1586 @@
 
   switch(wParam) {
-  case MC_NEXTMONTHTIMER:
+  case MC_NEXTMONTHTIMER: 
     redraw = TRUE;
     MONTHCAL_GoToNextMonth(hwnd, infoPtr);
@@ -1618 +1618 @@
   ht.pt.x = LOWORD(lParam);
   ht.pt.y = HIWORD(lParam);
-
+        
   hit = MONTHCAL_HitTest(hwnd, (LPARAM)&ht);
-
+  
   /* not on the calendar date numbers? bail out */
   TRACE("hit:%x\n",hit);
@@ -1638 +1638 @@
     if(infoPtr->firstSelDay==selArray[0].wDay) i=1;
     TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-    if(infoPtr->firstSelDay==selArray[1].wDay) {
+    if(infoPtr->firstSelDay==selArray[1].wDay) {  
       /* 1st time we get here: selArray[0]=selArray[1])  */
       /* if we're still at the first selected date, return */
@@ -1644 +1644 @@
       if(selday<infoPtr->firstSelDay) i = 0;
     }
-
+                        
     if(abs(infoPtr->firstSelDay - selday) >= infoPtr->maxSelCount) {
       if(selday>infoPtr->firstSelDay)
@@ -1651 +1651 @@
         selday = infoPtr->firstSelDay - infoPtr->maxSelCount;
     }
-
+                
     if(selArray[i].wDay!=selday) {
       TRACE("newRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i);
-
+                        
       selArray[i].wDay = selday;
 
@@ -1712 +1712 @@
 {
   TRACE("\n");
-
+  
   InvalidateRect(hwnd, NULL, FALSE);
 
@@ -1769 +1769 @@
 
   /* recalculate the height and width increments and offsets */
-  /* FIXME: We use up all available width. This will inhibit having multiple
-     calendars in a row, like win doesn
+  /* FIXME: We use up all available width. This will inhibit having multiple 
+     calendars in a row, like win doesn 
   */
   if(dwStyle & MCS_WEEKNUMBERS)
@@ -1776 +1776 @@
   else
     xdiv=7.0;
-  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv;
-  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0;
+  infoPtr->width_increment = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) / xdiv; 
+  infoPtr->height_increment = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) / 10.0; 
   infoPtr->left_offset = (infoPtr->rcDraw.right - infoPtr->rcDraw.left) - (infoPtr->width_increment * xdiv);
   infoPtr->top_offset = (infoPtr->rcDraw.bottom - infoPtr->rcDraw.top) - (infoPtr->height_increment * 10.0);
@@ -1790 +1790 @@
     rcDraw->bottom = rcDraw->top + 9 * infoPtr->textHeight + 5;
     }*/
-
+   
   /* calculate title area */
   title->top    = rcClient->top;
@@ -1805 +1805 @@
   next->right  = title->right - 6;
   next->left   = next->right - (title->bottom - title->top);
-
+  
   /* titlemonth->left and right change based upon the current month */
   /* and are recalculated in refresh as the current month may change */
@@ -1811 +1811 @@
   titlemonth->top    = titleyear->top    = title->top    + (infoPtr->height_increment)/2;
   titlemonth->bottom = titleyear->bottom = title->bottom - (infoPtr->height_increment)/2;
-
+  
   /* setup the dimensions of the rectangle we draw the names of the */
   /* days of the week in */
   weeknumrect->left =infoPtr->left_offset;
-  if(dwStyle & MCS_WEEKNUMBERS)
+  if(dwStyle & MCS_WEEKNUMBERS)  
     weeknumrect->right=prev->right;
   else
@@ -1823 +1823 @@
   wdays->top    = title->bottom ;
   wdays->bottom = wdays->top + infoPtr->height_increment;
-
+  
   days->top    = weeknumrect->top = wdays->bottom ;
   days->bottom = weeknumrect->bottom = days->top     + 6 * infoPtr->height_increment;
-
+  
   todayrect->left   = rcClient->left;
   todayrect->right  = rcClient->right;
@@ -1832 +1832 @@
   todayrect->bottom = days->bottom + infoPtr->height_increment;
 
-  /* uncomment for excessive debugging
+  /* uncomment for excessive debugging 
   TRACE("dx=%d dy=%d rcC[%d %d %d %d] t[%d %d %d %d] wd[%d %d %d %d] w[%d %d %d %d] t[%d %d %d %d]\n",
-    infoPtr->width_increment,infoPtr->height_increment,
-     rcClient->left, rcClient->right, rcClient->top, rcClient->bottom,
-        title->left,    title->right,    title->top,    title->bottom,
-        wdays->left,    wdays->right,    wdays->top,    wdays->bottom,
-         days->left,     days->right,     days->top,     days->bottom,
-    todayrect->left,todayrect->right,todayrect->top,todayrect->bottom);
+        infoPtr->width_increment,infoPtr->height_increment,
+         rcClient->left, rcClient->right, rcClient->top, rcClient->bottom,
+            title->left,    title->right,    title->top,    title->bottom,
+            wdays->left,    wdays->right,    wdays->top,    wdays->bottom,
+             days->left,     days->right,     days->top,     days->bottom,
+        todayrect->left,todayrect->right,todayrect->top,todayrect->bottom);
   */
-
+  
   /* restore the originally selected font */
-  SelectObject(hdc, currentFont);
+  SelectObject(hdc, currentFont);     
 
   ReleaseDC(hwnd, hdc);
@@ -1865 +1865 @@
 {
   MONTHCAL_INFO *infoPtr;
-  LOGFONTA  logFont;
+  LOGFONTA      logFont;
 
   /* allocate memory for info structure */
@@ -1900 +1900 @@
   infoPtr->maxSelCount  = 7;
   infoPtr->monthRange = 3;
-  infoPtr->monthdayState = COMCTL32_Alloc
+  infoPtr->monthdayState = COMCTL32_Alloc 
                          (infoPtr->monthRange * sizeof(MONTHDAYSTATE));
   infoPtr->titlebk     = GetSysColor(COLOR_ACTIVECAPTION);
@@ -1907 +1907 @@
   infoPtr->trailingtxt = GetSysColor(COLOR_GRAYTEXT);
   infoPtr->bk          = GetSysColor(COLOR_WINDOW);
-  infoPtr->txt         = GetSysColor(COLOR_WINDOWTEXT);
+  infoPtr->txt         = GetSysColor(COLOR_WINDOWTEXT);
 
   /* call MONTHCAL_UpdateSize to set all of the dimensions */
@@ -2062 +2062 @@
   wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
   wndClass.lpszClassName = MONTHCAL_CLASSA;
-
+ 
   RegisterClassA(&wndClass);
 }

trunk/src/comctl32/status.c

@@ -26 +26 @@
 typedef struct
 {
-    INT x;
-    INT style;
-    RECT    bound;
-    LPWSTR  text;
+    INT x;
+    INT style;
+    RECT        bound;
+    LPWSTR      text;
     HICON     hIcon;
 } STATUSWINDOWPART;
@@ -48 +48 @@
     COLORREF            clrBk;     /* background color */
     BOOL              bUnicode;  /* unicode flag */
-    STATUSWINDOWPART    part0;     /* simple window */
+    STATUSWINDOWPART    part0;     /* simple window */
     STATUSWINDOWPART   *parts;
 } STATUSWINDOWINFO;
@@ -93 +93 @@
     SelectObject (hdc, GetSysColorPen (COLOR_3DSHADOW));
     for (i = 1; i < 11; i += 4) {
-    MoveToEx (hdc, pt.x - i, pt.y, NULL);
-    LineTo (hdc, pt.x, pt.y - i);
-
-    MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
-    LineTo (hdc, pt.x, pt.y - i-1);
+        MoveToEx (hdc, pt.x - i, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i);
+
+        MoveToEx (hdc, pt.x - i-1, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i-1);
     }
 
     SelectObject (hdc, GetSysColorPen (COLOR_3DHIGHLIGHT));
     for (i = 3; i < 13; i += 4) {
-    MoveToEx (hdc, pt.x - i, pt.y, NULL);
-    LineTo (hdc, pt.x, pt.y - i);
+        MoveToEx (hdc, pt.x - i, pt.y, NULL);
+        LineTo (hdc, pt.x, pt.y - i);
     }
 
@@ -110 +110 @@
 
 
-static void
+static void 
 STATUSBAR_DrawPart (HDC hdc, STATUSWINDOWPART *part)
 {
@@ -126 +126 @@
     /* draw the icon */
     if (part->hIcon) {
-    INT cy = r.bottom - r.top;
-
-    r.left += 2;
-    DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
-    r.left += cy;
+        INT cy = r.bottom - r.top;
+
+        r.left += 2;
+        DrawIconEx (hdc, r.left, r.top, part->hIcon, cy, cy, 0, 0, DI_NORMAL);
+        r.left += cy;
     }
 
@@ -139 +139 @@
       UINT align = DT_LEFT;
       if (*p == L'\t') {
-    p++;
-    align = DT_CENTER;
-
-    if (*p == L'\t') {
-      p++;
-      align = DT_RIGHT;
-    }
+        p++;
+        align = DT_CENTER;
+
+        if (*p == L'\t') {
+          p++;
+          align = DT_RIGHT;
+        }
       }
       r.left += 3;
@@ -151 +151 @@
       DrawTextW (hdc, p, -1, &r, align|DT_VCENTER|DT_SINGLELINE);
       if (oldbkmode != TRANSPARENT)
-    SetBkMode(hdc, oldbkmode);
+        SetBkMode(hdc, oldbkmode);
     }
 }
@@ -169 +169 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-    hbrBk = CreateSolidBrush (infoPtr->clrBk);
+        hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-    hbrBk = GetSysColorBrush (COLOR_3DFACE);
+        hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &part->bound, hbrBk);
 
@@ -177 +177 @@
 
     if (part->style & SBT_OWNERDRAW) {
-    DRAWITEMSTRUCT dis;
-
-    dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-    dis.itemID = itemID;
-    dis.hwndItem = hwnd;
-    dis.hDC = hdc;
-    dis.rcItem = part->bound;
-    dis.itemData = (INT)part->text;
-    SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-        (WPARAM)dis.CtlID, (LPARAM)&dis);
+        DRAWITEMSTRUCT dis;
+
+        dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
+        dis.itemID = itemID;
+        dis.hwndItem = hwnd;
+        dis.hDC = hdc;
+        dis.rcItem = part->bound;
+        dis.itemData = (INT)part->text;
+        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
+                (WPARAM)dis.CtlID, (LPARAM)&dis);
     } else
-    STATUSBAR_DrawPart (hdc, part);
+        STATUSBAR_DrawPart (hdc, part);
 
     SelectObject (hdc, hOldFont);
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-    DeleteObject (hbrBk);
+        DeleteObject (hbrBk);
 
     if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
-    RECT rect;
-
-    GetClientRect (hwnd, &rect);
-    STATUSBAR_DrawSizeGrip (hdc, &rect);
+        RECT rect;
+
+        GetClientRect (hwnd, &rect);
+        STATUSBAR_DrawSizeGrip (hdc, &rect);
     }
 }
@@ -221 +221 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-    hbrBk = CreateSolidBrush (infoPtr->clrBk);
+        hbrBk = CreateSolidBrush (infoPtr->clrBk);
     else
-    hbrBk = GetSysColorBrush (COLOR_3DFACE);
+        hbrBk = GetSysColorBrush (COLOR_3DFACE);
     FillRect(hdc, &rect, hbrBk);
 
@@ -229 +229 @@
 
     if (infoPtr->simple) {
-    STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->part0, hdc, 0);
+        STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->part0, hdc, 0);
     } else {
-    for (i = 0; i < infoPtr->numParts; i++) {
-        if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
-        DRAWITEMSTRUCT dis;
-
-        dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
-        dis.itemID = i;
-        dis.hwndItem = hwnd;
-        dis.hDC = hdc;
-        dis.rcItem = infoPtr->parts[i].bound;
-        dis.itemData = (INT)infoPtr->parts[i].text;
-        SendMessageA (GetParent (hwnd), WM_DRAWITEM,
-            (WPARAM)dis.CtlID, (LPARAM)&dis);
-        } else
-        STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->parts[i], hdc, i);
-    }
+        for (i = 0; i < infoPtr->numParts; i++) {
+            if (infoPtr->parts[i].style & SBT_OWNERDRAW) {
+                DRAWITEMSTRUCT dis;
+
+                dis.CtlID = GetWindowLongA (hwnd, GWL_ID);
+                dis.itemID = i;
+                dis.hwndItem = hwnd;
+                dis.hDC = hdc;
+                dis.rcItem = infoPtr->parts[i].bound;
+                dis.itemData = (INT)infoPtr->parts[i].text;
+                SendMessageA (GetParent (hwnd), WM_DRAWITEM,
+                        (WPARAM)dis.CtlID, (LPARAM)&dis);
+            } else
+                STATUSBAR_RefreshPart (infoPtr, hwnd, &infoPtr->parts[i], hdc, i);
+        }
     }
 
@@ -251 +251 @@
 
     if (infoPtr->clrBk != CLR_DEFAULT)
-    DeleteObject (hbrBk);
+        DeleteObject (hbrBk);
 
     if (GetWindowLongA(hwnd, GWL_STYLE) & SBARS_SIZEGRIP)
-    STATUSBAR_DrawSizeGrip (hdc, &rect);
+        STATUSBAR_DrawSizeGrip (hdc, &rect);
 
     return TRUE;
@@ -265 +265 @@
     STATUSWINDOWPART *part;
     RECT rect, *r;
-    int i;
+    int i;
 
     /* get our window size */
@@ -278 +278 @@
     /* set bounds for non-simple rectangles */
     for (i = 0; i < infoPtr->numParts; i++) {
-    part = &infoPtr->parts[i];
-    r = &infoPtr->parts[i].bound;
-    r->top = rect.top;
-    r->bottom = rect.bottom;
-    if (i == 0)
-        r->left = 0;
-    else
-        r->left = infoPtr->parts[i-1].bound.right + HORZ_GAP;
-    if (part->x == -1)
-        r->right = rect.right;
-    else
-        r->right = part->x;
-
-    if (infoPtr->hwndToolTip) {
-        TTTOOLINFOA ti;
-
-        ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        ti.uId = i;
-        ti.rect = *r;
-        SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
-                0, (LPARAM)&ti);
-    }
+        part = &infoPtr->parts[i];
+        r = &infoPtr->parts[i].bound;
+        r->top = rect.top;
+        r->bottom = rect.bottom;
+        if (i == 0)
+            r->left = 0;
+        else
+            r->left = infoPtr->parts[i-1].bound.right + HORZ_GAP;
+        if (part->x == -1)
+            r->right = rect.right;
+        else
+            r->right = part->x;
+
+        if (infoPtr->hwndToolTip) {
+            TTTOOLINFOA ti;
+
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            ti.uId = i;
+            ti.rect = *r;
+            SendMessageA (infoPtr->hwndToolTip, TTM_NEWTOOLRECTA,
+                            0, (LPARAM)&ti);
+        }
     }
 }
@@ -307 +307 @@
 static VOID
 STATUSBAR_RelayEvent (HWND hwndTip, HWND hwndMsg, UINT uMsg,
-              WPARAM wParam, LPARAM lParam)
+                      WPARAM wParam, LPARAM lParam)
 {
     MSG msg;
@@ -345 +345 @@
     TRACE("%d\n", nPart);
     if ((nPart < -1) || (nPart >= infoPtr->numParts))
-    return 0;
+        return 0;
 
     if (nPart == -1)
@@ -365 +365 @@
     parts = (LPINT) lParam;
     if (parts) {
-    for (i = 0; i < num_parts; i++) {
-        parts[i] = infoPtr->parts[i].x;
-    }
+        for (i = 0; i < num_parts; i++) {
+            parts[i] = infoPtr->parts[i].x;
+        }
     }
     return (infoPtr->numParts);
@@ -376 +376 @@
 STATUSBAR_GetRect (STATUSWINDOWINFO *infoPtr, HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    int nPart;
+    int nPart;
     LPRECT  rect;
 
@@ -383 +383 @@
     rect = (LPRECT) lParam;
     if (infoPtr->simple)
-    *rect = infoPtr->part0.bound;
+        *rect = infoPtr->part0.bound;
     else
-    *rect = infoPtr->parts[nPart].bound;
+        *rect = infoPtr->parts[nPart].bound;
     return TRUE;
 }
@@ -400 +400 @@
     TRACE("part %d\n", nPart);
     if (infoPtr->simple)
-    part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
 #ifdef __WIN32OS2__
     {
         if (nPart >= infoPtr->numParts)
-        return FALSE;
-    part = &infoPtr->parts[nPart];
+            return FALSE;
+        part = &infoPtr->parts[nPart];
     }
 #else
-    part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 #endif
 
     if (part->style & SBT_OWNERDRAW)
-    result = (LRESULT)part->text;
+        result = (LRESULT)part->text;
     else {
         DWORD len = part->text ? WideCharToMultiByte( CP_ACP, 0, part->text, -1,
@@ -435 +435 @@
     TRACE("part %d\n", nPart);
     if (infoPtr->simple)
-    part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
 #ifdef __WIN32OS2__
     {
         if (nPart >= infoPtr->numParts)
-        return FALSE;
-    part = &infoPtr->parts[nPart];
+            return FALSE;
+        part = &infoPtr->parts[nPart];
     }
 #else
-    part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 #endif
 
     if (part->style & SBT_OWNERDRAW)
-    result = (LRESULT)part->text;
+        result = (LRESULT)part->text;
     else {
-    result = part->text ? strlenW (part->text) : 0;
-    result |= (part->style << 16);
-    if (part->text && lParam)
-        strcpyW ((LPWSTR)lParam, part->text);
+        result = part->text ? strlenW (part->text) : 0;
+        result |= (part->style << 16);
+        if (part->text && lParam)
+            strcpyW ((LPWSTR)lParam, part->text);
     }
     return result;
@@ -471 +471 @@
 
     if (infoPtr->simple)
-    part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
 #ifdef __WIN32OS2__
     {
         if (nPart >= infoPtr->numParts)
-        return FALSE;
-    part = &infoPtr->parts[nPart];
+            return FALSE;
+        part = &infoPtr->parts[nPart];
     }
 #else
-    part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 #endif
 
     if (part->text)
-    result = strlenW(part->text);
+        result = strlenW(part->text);
     else
-    result = 0;
+        result = 0;
 
     result |= (part->style << 16);
@@ -526 +526 @@
         buf[0]=0;
 
-    if (infoPtr->hwndToolTip) {
-        TTTOOLINFOW ti;
-        ti.cbSize = sizeof(TTTOOLINFOW);
-        ti.hwnd = hwnd;
-        ti.uId = LOWORD(wParam);
+        if (infoPtr->hwndToolTip) {
+            TTTOOLINFOW ti;
+            ti.cbSize = sizeof(TTTOOLINFOW);
+            ti.hwnd = hwnd;
+            ti.uId = LOWORD(wParam);
             ti.lpszText = buf;
-        SendMessageW(infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
-    }
-    lstrcpynW(tip, buf, HIWORD(wParam));
+            SendMessageW(infoPtr->hwndToolTip, TTM_GETTEXTW, 0, (LPARAM)&ti);
+        }
+        lstrcpynW(tip, buf, HIWORD(wParam));
     }
 
@@ -575 +575 @@
 
     if ((nPart < -1) || (nPart >= infoPtr->numParts))
-    return FALSE;
+        return FALSE;
 
     TRACE("setting part %d, icon %lx\n",nPart,lParam);
 
     if (nPart == -1) {
-    if (infoPtr->part0.hIcon == (HICON)lParam) /* same as - no redraw */
-        return TRUE;
-    infoPtr->part0.hIcon = (HICON)lParam;
-    if (infoPtr->simple)
+        if (infoPtr->part0.hIcon == (HICON)lParam) /* same as - no redraw */
+            return TRUE;
+        infoPtr->part0.hIcon = (HICON)lParam;
+        if (infoPtr->simple)
             InvalidateRect(hwnd, &infoPtr->part0.bound, FALSE);
     } else {
-    if (infoPtr->parts[nPart].hIcon == (HICON)lParam) /* same as - no redraw */
-        return TRUE;
-
-    infoPtr->parts[nPart].hIcon = (HICON)lParam;
-    if (!(infoPtr->simple))
+        if (infoPtr->parts[nPart].hIcon == (HICON)lParam) /* same as - no redraw */
+            return TRUE;
+
+        infoPtr->parts[nPart].hIcon = (HICON)lParam;
+        if (!(infoPtr->simple))
             InvalidateRect(hwnd, &infoPtr->parts[nPart].bound, FALSE);
     }
@@ -603 +603 @@
     TRACE("\n");
     if (IsWindowVisible (hwnd)) {
-    HWND parent = GetParent (hwnd);
-    INT  width, x, y;
-    RECT parent_rect;
-
-    GetClientRect (parent, &parent_rect);
-    infoPtr->height = (INT)wParam + VERT_BORDER;
-    width = parent_rect.right - parent_rect.left;
-    x = parent_rect.left;
-    y = parent_rect.bottom - infoPtr->height;
-    MoveWindow (hwnd, parent_rect.left,
-              parent_rect.bottom - infoPtr->height,
-              width, infoPtr->height, TRUE);
-    STATUSBAR_SetPartBounds (infoPtr, hwnd);
+        HWND parent = GetParent (hwnd);
+        INT  width, x, y;
+        RECT parent_rect;
+
+        GetClientRect (parent, &parent_rect);
+        infoPtr->height = (INT)wParam + VERT_BORDER;
+        width = parent_rect.right - parent_rect.left;
+        x = parent_rect.left;
+        y = parent_rect.bottom - infoPtr->height;
+        MoveWindow (hwnd, parent_rect.left,
+                      parent_rect.bottom - infoPtr->height,
+                      width, infoPtr->height, TRUE);
+        STATUSBAR_SetPartBounds (infoPtr, hwnd);
     }
 
@@ -627 +627 @@
     STATUSWINDOWPART *tmp;
     LPINT parts;
-    int i;
-    int oldNumParts;
+    int i;
+    int oldNumParts;
 
     TRACE("(%d,%p)\n",wParam,(LPVOID)lParam);
@@ -634 +634 @@
     /* FIXME: should return FALSE sometimes (maybe when wParam == 0 ?) */
     if (infoPtr->simple)
-    infoPtr->simple = FALSE;
+        infoPtr->simple = FALSE;
 
     oldNumParts = infoPtr->numParts;
@@ -640 +640 @@
     parts = (LPINT) lParam;
     if (oldNumParts > infoPtr->numParts) {
-    for (i = infoPtr->numParts ; i < oldNumParts; i++) {
-        if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
-        COMCTL32_Free (infoPtr->parts[i].text);
-    }
+        for (i = infoPtr->numParts ; i < oldNumParts; i++) {
+            if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
+                COMCTL32_Free (infoPtr->parts[i].text);
+        }
     }
     if (oldNumParts < infoPtr->numParts) {
-    tmp = COMCTL32_Alloc (sizeof(STATUSWINDOWPART) * infoPtr->numParts);
-    for (i = 0; i < oldNumParts; i++) {
-        tmp[i] = infoPtr->parts[i];
-    }
-    if (infoPtr->parts)
-        COMCTL32_Free (infoPtr->parts);
-    infoPtr->parts = tmp;
+        tmp = COMCTL32_Alloc (sizeof(STATUSWINDOWPART) * infoPtr->numParts);
+        for (i = 0; i < oldNumParts; i++) {
+            tmp[i] = infoPtr->parts[i];
+        }
+        if (infoPtr->parts)
+            COMCTL32_Free (infoPtr->parts);
+        infoPtr->parts = tmp;
     }
     if (oldNumParts == infoPtr->numParts) {
-    for (i=0;i<oldNumParts;i++)
-        if (infoPtr->parts[i].x != parts[i])
-        break;
-    if (i==oldNumParts) /* Unchanged? no need to redraw! */
-        return TRUE;
-    }
-
+        for (i=0;i<oldNumParts;i++)
+            if (infoPtr->parts[i].x != parts[i])
+                break;
+        if (i==oldNumParts) /* Unchanged? no need to redraw! */
+            return TRUE;
+    }
+    
     for (i = 0; i < infoPtr->numParts; i++)
-    infoPtr->parts[i].x = parts[i];
+        infoPtr->parts[i].x = parts[i];
 
     if (infoPtr->hwndToolTip) {
-    INT nTipCount =
-        SendMessageA (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
-
-    if (nTipCount < infoPtr->numParts) {
-        /* add tools */
-        TTTOOLINFOA ti;
-        INT i;
-
-        ZeroMemory (&ti, sizeof(TTTOOLINFOA));
-        ti.cbSize = sizeof(TTTOOLINFOA);
-        ti.hwnd = hwnd;
-        for (i = nTipCount; i < infoPtr->numParts; i++) {
-        TRACE("add tool %d\n", i);
-        ti.uId = i;
-        SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
-                0, (LPARAM)&ti);
-        }
-    }
-    else if (nTipCount > infoPtr->numParts) {
-        /* delete tools */
-        INT i;
-
-        for (i = nTipCount - 1; i >= infoPtr->numParts; i--) {
-        FIXME("delete tool %d\n", i);
-        }
-    }
+        INT nTipCount =
+            SendMessageA (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0);
+
+        if (nTipCount < infoPtr->numParts) {
+            /* add tools */
+            TTTOOLINFOA ti;
+            INT i;
+
+            ZeroMemory (&ti, sizeof(TTTOOLINFOA));
+            ti.cbSize = sizeof(TTTOOLINFOA);
+            ti.hwnd = hwnd;
+            for (i = nTipCount; i < infoPtr->numParts; i++) {
+                TRACE("add tool %d\n", i);
+                ti.uId = i;
+                SendMessageA (infoPtr->hwndToolTip, TTM_ADDTOOLA,
+                                0, (LPARAM)&ti);
+            }
+        }
+        else if (nTipCount > infoPtr->numParts) {
+            /* delete tools */
+            INT i;
+
+            for (i = nTipCount - 1; i >= infoPtr->numParts; i--) {
+                FIXME("delete tool %d\n", i);
+            }
+        }
     }
     STATUSBAR_SetPartBounds (infoPtr, hwnd);
@@ -703 +703 @@
 {
     STATUSWINDOWPART *part=NULL;
-    int nPart;
-    int style;
+    int nPart;
+    int style;
     LPSTR text;
-    BOOL    changed = FALSE;
+    BOOL        changed = FALSE;
 
     text = (LPSTR) lParam;
@@ -715 +715 @@
 
     if (nPart==255)
-    part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else if (!infoPtr->simple && infoPtr->parts!=NULL)
 #ifdef __WIN32OS2__
     {
         if (nPart >= infoPtr->numParts)
-        return FALSE;
-    part = &infoPtr->parts[nPart];
+            return FALSE;
+        part = &infoPtr->parts[nPart];
     }
 #else
-    part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 #endif
     if (!part) return FALSE;
 
     if (part->style != style)
-    changed = TRUE;
+        changed = TRUE;
 
     part->style = style;
     if (style & SBT_OWNERDRAW) {
-    if (part->text == (LPWSTR)text)
-        return TRUE;
-    part->text = (LPWSTR)text;
+        if (part->text == (LPWSTR)text)
+            return TRUE;
+        part->text = (LPWSTR)text;
     } else {
-    LPWSTR ntext;
-
-    /* check if text is unchanged -> no need to redraw */
-    if (text) {
+        LPWSTR ntext;
+
+        /* check if text is unchanged -> no need to redraw */
+        if (text) {
             DWORD len = MultiByteToWideChar( CP_ACP, 0, text, -1, NULL, 0 );
-        LPWSTR tmptext = COMCTL32_Alloc(len*sizeof(WCHAR));
+            LPWSTR tmptext = COMCTL32_Alloc(len*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, text, -1, tmptext, len );
 
-        if (!changed && part->text && !lstrcmpW(tmptext,part->text)) {
-        COMCTL32_Free(tmptext);
-        return TRUE;
-        }
-        ntext = tmptext;
-    } else {
-        if (!changed && !part->text)
-        return TRUE;
-        ntext = 0;
-    }
-
-    if (part->text)
-        COMCTL32_Free (part->text);
-    part->text = ntext;
+            if (!changed && part->text && !lstrcmpW(tmptext,part->text)) {
+                COMCTL32_Free(tmptext);
+                return TRUE;
+            }
+            ntext = tmptext;
+        } else {
+            if (!changed && !part->text) 
+                return TRUE;
+            ntext = 0;
+        }
+
+        if (part->text)
+            COMCTL32_Free (part->text);
+        part->text = ntext;
     }
     InvalidateRect(hwnd, &part->bound, FALSE);
@@ -780 +780 @@
     TRACE("part %d -> '%s' with style %04x\n", nPart, debugstr_w(text), style);
     if ((infoPtr->simple) || (infoPtr->parts==NULL) || (nPart==255))
-    part = &infoPtr->part0;
+        part = &infoPtr->part0;
     else
 #ifdef __WIN32OS2__
     {
         if (nPart >= infoPtr->numParts)
-        return FALSE;
-    part = &infoPtr->parts[nPart];
+            return FALSE;
+        part = &infoPtr->parts[nPart];
     }
 #else
-    part = &infoPtr->parts[nPart];
+        part = &infoPtr->parts[nPart];
 #endif
     if (!part) return FALSE;
@@ -801 +801 @@
     if (style & SBT_OWNERDRAW)
     {
-    part->text = text;
+        part->text = text;
         bRedraw = TRUE;
     } else if(!text)
@@ -813 +813 @@
     } else if(!part->text || strcmpW(part->text, text)) /* see if the new string differs from the existing string */
     {
-    if(part->text) COMCTL32_Free(part->text);
+        if(part->text) COMCTL32_Free(part->text);
 
         len = strlenW(text);
         part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-    strcpyW(part->text, text);
+        strcpyW(part->text, text);
         bRedraw = TRUE;
     }
@@ -833 +833 @@
     TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-    TTTOOLINFOA ti;
-    ti.cbSize = sizeof(TTTOOLINFOA);
-    ti.hwnd = hwnd;
-    ti.uId = (INT)wParam;
-    ti.hinst = 0;
-    ti.lpszText = (LPSTR)lParam;
-    SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
-            0, (LPARAM)&ti);
+        TTTOOLINFOA ti;
+        ti.cbSize = sizeof(TTTOOLINFOA);
+        ti.hwnd = hwnd;
+        ti.uId = (INT)wParam;
+        ti.hinst = 0;
+        ti.lpszText = (LPSTR)lParam;
+        SendMessageA (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTA,
+                        0, (LPARAM)&ti);
     }
 
@@ -852 +852 @@
     TRACE("part %d: \"%s\"\n", (INT)wParam, (LPSTR)lParam);
     if (infoPtr->hwndToolTip) {
-    TTTOOLINFOW ti;
-    ti.cbSize = sizeof(TTTOOLINFOW);
-    ti.hwnd = hwnd;
-    ti.uId = (INT)wParam;
-    ti.hinst = 0;
-    ti.lpszText = (LPWSTR)lParam;
-    SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
-            0, (LPARAM)&ti);
+        TTTOOLINFOW ti;
+        ti.cbSize = sizeof(TTTOOLINFOW);
+        ti.hwnd = hwnd;
+        ti.uId = (INT)wParam;
+        ti.hinst = 0;
+        ti.lpszText = (LPWSTR)lParam;
+        SendMessageW (infoPtr->hwndToolTip, TTM_UPDATETIPTEXTW,
+                        0, (LPARAM)&ti);
     }
 
@@ -885 +885 @@
     TRACE("(is simple: %d)\n", wParam);
     if (infoPtr->simple == wParam) /* no need to change */
-    return TRUE;
+        return TRUE;
 
     infoPtr->simple = (BOOL)wParam;
@@ -905 +905 @@
     NONCLIENTMETRICSA nclm;
     DWORD dwStyle;
-    RECT    rect;
-    int         width, len;
-    HDC hdc;
+    RECT        rect;
+    int         width, len;
+    HDC hdc;
     STATUSWINDOWINFO *infoPtr;
 
@@ -951 +951 @@
 
     if (IsWindowUnicode (hwnd)) {
-    infoPtr->bUnicode = TRUE;
-    if (lpCreate->lpszName &&
-        (len = strlenW ((LPCWSTR)lpCreate->lpszName))) {
-        infoPtr->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
-        strcpyW (infoPtr->parts[0].text, (LPCWSTR)lpCreate->lpszName);
-    }
+        infoPtr->bUnicode = TRUE;
+        if (lpCreate->lpszName &&
+            (len = strlenW ((LPCWSTR)lpCreate->lpszName))) {
+            infoPtr->parts[0].text = COMCTL32_Alloc ((len + 1)*sizeof(WCHAR));
+            strcpyW (infoPtr->parts[0].text, (LPCWSTR)lpCreate->lpszName);
+        }
     }
     else {
-    if (lpCreate->lpszName &&
-        (len = strlen((LPCSTR)lpCreate->lpszName))) {
+        if (lpCreate->lpszName &&
+            (len = strlen((LPCSTR)lpCreate->lpszName))) {
             DWORD lenW = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1, NULL, 0 );
-        infoPtr->parts[0].text = COMCTL32_Alloc (lenW*sizeof(WCHAR));
+            infoPtr->parts[0].text = COMCTL32_Alloc (lenW*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lpCreate->lpszName, -1,
                                  infoPtr->parts[0].text, lenW );
-    }
+        }
     }
 
@@ -977 +977 @@
 #endif
     if ((hdc = GetDC (0))) {
-    TEXTMETRICA tm;
-    HFONT hOldFont;
-
-    hOldFont = SelectObject (hdc,infoPtr->hDefaultFont);
-    GetTextMetricsA(hdc, &tm);
-    infoPtr->textHeight = tm.tmHeight;
-    SelectObject (hdc, hOldFont);
-    ReleaseDC(0, hdc);
+        TEXTMETRICA tm;
+        HFONT hOldFont;
+
+        hOldFont = SelectObject (hdc,infoPtr->hDefaultFont);
+        GetTextMetricsA(hdc, &tm);
+        infoPtr->textHeight = tm.tmHeight;
+        SelectObject (hdc, hOldFont);
+        ReleaseDC(0, hdc);
     }
 
     if (dwStyle & SBT_TOOLTIPS) {
-    infoPtr->hwndToolTip =
-        CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-                   CW_USEDEFAULT, CW_USEDEFAULT,
-                   CW_USEDEFAULT, CW_USEDEFAULT,
-                 hwnd, 0,
-                 GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
-
-    if (infoPtr->hwndToolTip) {
-        NMTOOLTIPSCREATED nmttc;
-
-        nmttc.hdr.hwndFrom = hwnd;
-        nmttc.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
-        nmttc.hdr.code = NM_TOOLTIPSCREATED;
-        nmttc.hwndToolTips = infoPtr->hwndToolTip;
-
-        SendMessageA (lpCreate->hwndParent, WM_NOTIFY,
-                (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
-    }
+        infoPtr->hwndToolTip =
+            CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                               CW_USEDEFAULT, CW_USEDEFAULT,
+                             hwnd, 0,
+                             GetWindowLongA (hwnd, GWL_HINSTANCE), NULL);
+
+        if (infoPtr->hwndToolTip) {
+            NMTOOLTIPSCREATED nmttc;
+
+            nmttc.hdr.hwndFrom = hwnd;
+            nmttc.hdr.idFrom = GetWindowLongA (hwnd, GWL_ID);
+            nmttc.hdr.code = NM_TOOLTIPSCREATED;
+            nmttc.hwndToolTips = infoPtr->hwndToolTip;
+
+            SendMessageA (lpCreate->hwndParent, WM_NOTIFY,
+                            (WPARAM)nmttc.hdr.idFrom, (LPARAM)&nmttc);
+        }
     }
 
@@ -1014 +1014 @@
         infoPtr->height = infoPtr->textHeight + 4 + VERT_BORDER;
         SetWindowPos(hwnd, 0, lpCreate->x, lpCreate->y - 1,
-            width, infoPtr->height, SWP_NOZORDER);
+                        width, infoPtr->height, SWP_NOZORDER);
         STATUSBAR_SetPartBounds (infoPtr, hwnd);
     }
@@ -1025 +1025 @@
 STATUSBAR_WMDestroy (STATUSWINDOWINFO *infoPtr, HWND hwnd)
 {
-    int i;
+    int i;
 
     TRACE("\n");
     for (i = 0; i < infoPtr->numParts; i++) {
-    if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
-        COMCTL32_Free (infoPtr->parts[i].text);
+        if (infoPtr->parts[i].text && !(infoPtr->parts[i].style & SBT_OWNERDRAW))
+            COMCTL32_Free (infoPtr->parts[i].text);
     }
     if (infoPtr->part0.text && !(infoPtr->part0.style & SBT_OWNERDRAW))
-    COMCTL32_Free (infoPtr->part0.text);
+        COMCTL32_Free (infoPtr->part0.text);
     COMCTL32_Free (infoPtr->parts);
 
     /* delete default font */
     if (infoPtr->hDefaultFont)
-    DeleteObject (infoPtr->hDefaultFont);
+        DeleteObject (infoPtr->hDefaultFont);
 
     /* delete tool tip control */
     if (infoPtr->hwndToolTip)
-    DestroyWindow (infoPtr->hwndToolTip);
+        DestroyWindow (infoPtr->hwndToolTip);
 
     COMCTL32_Free (infoPtr);
@@ -1074 +1074 @@
 
     if (wParam > len) {
-    if (infoPtr->bUnicode)
-        strcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
-    else
+        if (infoPtr->bUnicode)
+            strcpyW ((LPWSTR)lParam, infoPtr->parts[0].text);
+        else
             WideCharToMultiByte( CP_ACP, 0, infoPtr->parts[0].text, -1,
                                  (LPSTR)lParam, len+1, NULL, NULL );
-    return len;
+        return len;
     }
 
@@ -1090 +1090 @@
 {
     if (infoPtr->hwndToolTip)
-    STATUSBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
-                  WM_MOUSEMOVE, wParam, lParam);
+        STATUSBAR_RelayEvent (infoPtr->hwndToolTip, hwnd,
+                              WM_MOUSEMOVE, wParam, lParam);
     return 0;
 }
@@ -1100 +1100 @@
 {
     if (GetWindowLongA (hwnd, GWL_STYLE) & SBARS_SIZEGRIP) {
-    RECT  rect;
-    POINT pt;
-
-    GetClientRect (hwnd, &rect);
-
-    pt.x = (INT)LOWORD(lParam);
-    pt.y = (INT)HIWORD(lParam);
-    ScreenToClient (hwnd, &pt);
-
-    rect.left = rect.right - 13;
-    rect.top += 2;
-
-    if (PtInRect (&rect, pt))
-        return HTBOTTOMRIGHT;
+        RECT  rect;
+        POINT pt;
+
+        GetClientRect (hwnd, &rect);
+
+        pt.x = (INT)LOWORD(lParam);
+        pt.y = (INT)HIWORD(lParam);
+        ScreenToClient (hwnd, &pt);
+
+        rect.left = rect.right - 13;
+        rect.top += 2;
+
+        if (PtInRect (&rect, pt))
+            return HTBOTTOMRIGHT;
     }
 
@@ -1149 +1149 @@
     STATUSBAR_Refresh (infoPtr, hwnd, hdc);
     if (!wParam)
-    EndPaint (hwnd, &ps);
+        EndPaint (hwnd, &ps);
 
     return 0;
@@ -1194 +1194 @@
     TRACE("\n");
     if (infoPtr->numParts == 0)
-    return FALSE;
+        return FALSE;
 
     part = &infoPtr->parts[0];
@@ -1202 +1202 @@
     part->text = 0;
     if (infoPtr->bUnicode) {
-    if (lParam && (len = strlenW((LPCWSTR)lParam))) {
-        part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
-        strcpyW (part->text, (LPCWSTR)lParam);
-    }
+        if (lParam && (len = strlenW((LPCWSTR)lParam))) {
+            part->text = COMCTL32_Alloc ((len+1)*sizeof(WCHAR));
+            strcpyW (part->text, (LPCWSTR)lParam);
+        }
     }
     else {
-    if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
+        if (lParam && (len = lstrlenA((LPCSTR)lParam))) {
             DWORD lenW = MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lParam, -1, NULL, 0 );
             part->text = COMCTL32_Alloc (lenW*sizeof(WCHAR));
             MultiByteToWideChar( CP_ACP, 0, (LPCSTR)lParam, -1, part->text, lenW );
-    }
+        }
     }
 
@@ -1240 +1240 @@
     {
         if (flags == SIZE_RESTORED) {
-        /* width and height don't apply */
-        GetClientRect (infoPtr->hwndParent, &parent_rect);
-        width = parent_rect.right - parent_rect.left;
-        x = parent_rect.left;
-        y = parent_rect.bottom - infoPtr->height;
-        MoveWindow (hwnd, parent_rect.left,
-              parent_rect.bottom - infoPtr->height,
-              width, infoPtr->height, TRUE);
-        STATUSBAR_SetPartBounds (infoPtr, hwnd);
+            /* width and height don't apply */
+            GetClientRect (infoPtr->hwndParent, &parent_rect);
+            width = parent_rect.right - parent_rect.left;
+            x = parent_rect.left;
+            y = parent_rect.bottom - infoPtr->height;
+            MoveWindow (hwnd, parent_rect.left, 
+                      parent_rect.bottom - infoPtr->height,
+                      width, infoPtr->height, TRUE);
+            STATUSBAR_SetPartBounds (infoPtr, hwnd);
         }
-    return 0; /* FIXME: ok to return here ? */
+        return 0; /* FIXME: ok to return here ? */
     }
 
@@ -1283 +1283 @@
 
     switch (msg) {
-    case SB_GETBORDERS:
-        return STATUSBAR_GetBorders (lParam);
-
-    case SB_GETICON:
-        return STATUSBAR_GetIcon (infoPtr, hwnd, wParam);
-
-    case SB_GETPARTS:
-        return STATUSBAR_GetParts (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETRECT:
-        return STATUSBAR_GetRect (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETTEXTA:
-        return STATUSBAR_GetTextA (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETTEXTW:
-        return STATUSBAR_GetTextW (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETTEXTLENGTHA:
-    case SB_GETTEXTLENGTHW:
-        return STATUSBAR_GetTextLength (infoPtr, hwnd, wParam);
-
-    case SB_GETTIPTEXTA:
-        return STATUSBAR_GetTipTextA (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETTIPTEXTW:
-        return STATUSBAR_GetTipTextW (infoPtr, hwnd, wParam, lParam);
-
-    case SB_GETUNICODEFORMAT:
-        return STATUSBAR_GetUnicodeFormat (infoPtr, hwnd);
-
-    case SB_ISSIMPLE:
-        return STATUSBAR_IsSimple (infoPtr, hwnd);
-
-    case SB_SETBKCOLOR:
-        return STATUSBAR_SetBkColor (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETICON:
-        return STATUSBAR_SetIcon (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETMINHEIGHT:
-        return STATUSBAR_SetMinHeight (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETPARTS:
-        return STATUSBAR_SetParts (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETTEXTA:
-        return STATUSBAR_SetTextA (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETTEXTW:
-        return STATUSBAR_SetTextW (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETTIPTEXTA:
-        return STATUSBAR_SetTipTextA (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETTIPTEXTW:
-        return STATUSBAR_SetTipTextW (infoPtr, hwnd, wParam, lParam);
-
-    case SB_SETUNICODEFORMAT:
-        return STATUSBAR_SetUnicodeFormat (infoPtr, hwnd, wParam);
-
-    case SB_SIMPLE:
-        return STATUSBAR_Simple (infoPtr, hwnd, wParam, lParam);
-
-
-    case WM_CREATE:
-        return STATUSBAR_WMCreate (hwnd, wParam, lParam);
-
-    case WM_DESTROY:
-        return STATUSBAR_WMDestroy (infoPtr, hwnd);
-
-    case WM_GETFONT:
+        case SB_GETBORDERS:
+            return STATUSBAR_GetBorders (lParam);
+
+        case SB_GETICON:
+            return STATUSBAR_GetIcon (infoPtr, hwnd, wParam);
+
+        case SB_GETPARTS:
+            return STATUSBAR_GetParts (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETRECT:
+            return STATUSBAR_GetRect (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETTEXTA:
+            return STATUSBAR_GetTextA (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETTEXTW:
+            return STATUSBAR_GetTextW (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETTEXTLENGTHA:
+        case SB_GETTEXTLENGTHW:
+            return STATUSBAR_GetTextLength (infoPtr, hwnd, wParam);
+
+        case SB_GETTIPTEXTA:
+            return STATUSBAR_GetTipTextA (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETTIPTEXTW:
+            return STATUSBAR_GetTipTextW (infoPtr, hwnd, wParam, lParam);
+
+        case SB_GETUNICODEFORMAT:
+            return STATUSBAR_GetUnicodeFormat (infoPtr, hwnd);
+
+        case SB_ISSIMPLE:
+            return STATUSBAR_IsSimple (infoPtr, hwnd);
+
+        case SB_SETBKCOLOR:
+            return STATUSBAR_SetBkColor (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETICON:
+            return STATUSBAR_SetIcon (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETMINHEIGHT:
+            return STATUSBAR_SetMinHeight (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETPARTS:       
+            return STATUSBAR_SetParts (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETTEXTA:
+            return STATUSBAR_SetTextA (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETTEXTW:
+            return STATUSBAR_SetTextW (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETTIPTEXTA:
+            return STATUSBAR_SetTipTextA (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETTIPTEXTW:
+            return STATUSBAR_SetTipTextW (infoPtr, hwnd, wParam, lParam);
+
+        case SB_SETUNICODEFORMAT:
+            return STATUSBAR_SetUnicodeFormat (infoPtr, hwnd, wParam);
+
+        case SB_SIMPLE:
+            return STATUSBAR_Simple (infoPtr, hwnd, wParam, lParam);
+
+
+        case WM_CREATE:
+            return STATUSBAR_WMCreate (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return STATUSBAR_WMDestroy (infoPtr, hwnd);
+
+        case WM_GETFONT:
             return STATUSBAR_WMGetFont (infoPtr, hwnd);
 
-    case WM_GETTEXT:
+        case WM_GETTEXT:
             return STATUSBAR_WMGetText (infoPtr, hwnd, wParam, lParam);
 
-    case WM_GETTEXTLENGTH:
-        return STATUSBAR_GetTextLength (infoPtr, hwnd, 0);
-
-    case WM_LBUTTONDBLCLK:
+        case WM_GETTEXTLENGTH:
+            return STATUSBAR_GetTextLength (infoPtr, hwnd, 0);
+
+        case WM_LBUTTONDBLCLK:
             return STATUSBAR_SendNotify (hwnd, NM_DBLCLK);
 
-    case WM_LBUTTONUP:
-        return STATUSBAR_SendNotify (hwnd, NM_CLICK);
-
-    case WM_MOUSEMOVE:
+        case WM_LBUTTONUP:
+            return STATUSBAR_SendNotify (hwnd, NM_CLICK);
+
+        case WM_MOUSEMOVE:
             return STATUSBAR_WMMouseMove (infoPtr, hwnd, wParam, lParam);
 
-    case WM_NCHITTEST:
+        case WM_NCHITTEST:
             return STATUSBAR_WMNCHitTest (hwnd, wParam, lParam);
 
-    case WM_NCLBUTTONDOWN:
-        return STATUSBAR_WMNCLButtonDown (hwnd, wParam, lParam);
-
-    case WM_NCLBUTTONUP:
-        return STATUSBAR_WMNCLButtonUp (hwnd, wParam, lParam);
-
-    case WM_PAINT:
-        return STATUSBAR_WMPaint (infoPtr, hwnd, wParam);
-
-    case WM_RBUTTONDBLCLK:
-        return STATUSBAR_SendNotify (hwnd, NM_RDBLCLK);
-
-    case WM_RBUTTONUP:
-        return STATUSBAR_SendNotify (hwnd, NM_RCLICK);
-
-    case WM_SETFONT:
-        return STATUSBAR_WMSetFont (infoPtr, hwnd, wParam, lParam);
-
-    case WM_SETTEXT:
-        return STATUSBAR_WMSetText (infoPtr, hwnd, wParam, lParam);
-
-    case WM_SIZE:
-        return STATUSBAR_WMSize (infoPtr, hwnd, wParam, lParam);
-
-    default:
-        if (msg >= WM_USER)
-        ERR("unknown msg %04x wp=%04x lp=%08lx\n",
-             msg, wParam, lParam);
+        case WM_NCLBUTTONDOWN:
+            return STATUSBAR_WMNCLButtonDown (hwnd, wParam, lParam);
+
+        case WM_NCLBUTTONUP:
+            return STATUSBAR_WMNCLButtonUp (hwnd, wParam, lParam);
+
+        case WM_PAINT:
+            return STATUSBAR_WMPaint (infoPtr, hwnd, wParam);
+
+        case WM_RBUTTONDBLCLK:
+            return STATUSBAR_SendNotify (hwnd, NM_RDBLCLK);
+
+        case WM_RBUTTONUP:
+            return STATUSBAR_SendNotify (hwnd, NM_RCLICK);
+
+        case WM_SETFONT:
+            return STATUSBAR_WMSetFont (infoPtr, hwnd, wParam, lParam);
+
+        case WM_SETTEXT:
+            return STATUSBAR_WMSetText (infoPtr, hwnd, wParam, lParam);
+
+        case WM_SIZE:
+            return STATUSBAR_WMSize (infoPtr, hwnd, wParam, lParam);
+
+        default:
+            if (msg >= WM_USER)
+                ERR("unknown msg %04x wp=%04x lp=%08lx\n",
+                     msg, wParam, lParam);
 #ifdef __WIN32OS2__
             return defComCtl32ProcA (hwnd, msg, wParam, lParam);
 #else
-        return DefWindowProcA (hwnd, msg, wParam, lParam);
+            return DefWindowProcA (hwnd, msg, wParam, lParam);
 #endif
     }
@@ -1432 +1432 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_3DFACE + 1);
     wndClass.lpszClassName = STATUSCLASSNAMEA;
-
+ 
     RegisterClassA (&wndClass);
 }

trunk/src/comctl32/tab.c

@@ -36 +36 @@
   LPARAM lParam;
   RECT   rect;    /* bounding rectangle of the item relative to the
-           * leftmost item (the leftmost item, 0, would have a
-           * "left" member of 0 in this rectangle)
-                   *
+                   * leftmost item (the leftmost item, 0, would have a 
+                   * "left" member of 0 in this rectangle) 
+                   *  
                    * additionally the top member hold the row number
                    * and bottom is unused and should be 0 */
@@ -49 +49 @@
 #endif
   UINT       uNumItem;        /* number of tab items */
-  UINT       uNumRows;        /* number of tab rows */
+  UINT       uNumRows;        /* number of tab rows */
   INT        tabHeight;       /* height of the tab row */
   INT        tabWidth;        /* width of tabs */
@@ -57 +57 @@
   HWND       hwndToolTip;     /* handle to tab's tooltip */
   INT        leftmostVisible; /* Used for scrolling, this member contains
-                   * the index of the first visible item */
+                               * the index of the first visible item */
   INT        iSelected;       /* the currently selected item */
   INT        iHotTracked;     /* the highlighted item under the mouse */
@@ -63 +63 @@
   TAB_ITEM*  items;           /* pointer to an array of TAB_ITEM's */
   BOOL       DoRedraw;        /* flag for redrawing when tab contents is changed*/
-  BOOL       needsScrolling;  /* TRUE if the size of the tabs is greater than
-                   * the size of the control */
-  BOOL       fSizeSet;        /* was the size of the tabs explicitly set? */
+  BOOL       needsScrolling;  /* TRUE if the size of the tabs is greater than 
+                               * the size of the control */
+  BOOL       fSizeSet;        /* was the size of the tabs explicitly set? */
   BOOL       bUnicode;        /* Unicode control? */
   HWND       hwndUpDown;      /* Updown control used for scrolling */
@@ -81 +81 @@
 #define CONTROL_BORDER_SIZEX    2
 #define CONTROL_BORDER_SIZEY    2
-#define BUTTON_SPACINGX         4
+#define BUTTON_SPACINGX         4 
 #define BUTTON_SPACINGY         4
 #define FLAT_BTN_SPACINGX       8
@@ -137 +137 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-
+ 
     return infoPtr->iSelected;
 }
@@ -145 +145 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-
+ 
     return infoPtr->uFocus;
 }
@@ -164 +164 @@
   INT iItem = (INT)wParam;
   INT prevItem;
-
+ 
   prevItem = -1;
   if ((iItem >= 0) && (iItem < infoPtr->uNumItem)) {
@@ -180 +180 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   INT iItem=(INT) wParam;
-
+ 
   if ((iItem < 0) || (iItem >= infoPtr->uNumItem)) return 0;
 
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS) {
     FIXME("Should set input focus\n");
-  } else {
+  } else { 
     int oldFocus = infoPtr->uFocus;
     if (infoPtr->iSelected != iItem || infoPtr->uFocus == -1 ) {
@@ -232 +232 @@
   RECT tmpItemRect,clientRect;
   LONG        lStyle  = GetWindowLongA(hwnd, GWL_STYLE);
-
+  
   /* Perform a sanity check and a trivial visibility check. */
   if ( (infoPtr->uNumItem <= 0) ||
@@ -245 +245 @@
   if (itemRect == NULL)
     itemRect = &tmpItemRect;
-
+  
   /* Retrieve the unmodified item rect. */
   *itemRect = infoPtr->items[itemIndex].rect;
@@ -280 +280 @@
   else if(!(lStyle & TCS_VERTICAL) && !(lStyle & TCS_BOTTOM)) /* not TCS_BOTTOM and not TCS_VERTICAL */
   {
-    itemRect->bottom = clientRect.top +
+    itemRect->bottom = clientRect.top + 
                       infoPtr->tabHeight +
                       itemRect->top * (infoPtr->tabHeight - 2) +
                       ((lStyle & TCS_BUTTONS) ? itemRect->top * BUTTON_SPACINGY : 0);
-    itemRect->top = clientRect.top +
+    itemRect->top = clientRect.top + 
                    SELECTED_TAB_OFFSET +
                    itemRect->top * (infoPtr->tabHeight - 2) +
@@ -291 +291 @@
 
   /*
-   * "scroll" it to make sure the item at the very left of the
+   * "scroll" it to make sure the item at the very left of the 
    * tab control is the leftmost visible tab.
    */
@@ -297 +297 @@
   {
     OffsetRect(itemRect,
-         0,
-         -(clientRect.bottom - infoPtr->items[infoPtr->leftmostVisible].rect.bottom));
+             0,
+             -(clientRect.bottom - infoPtr->items[infoPtr->leftmostVisible].rect.bottom));
 
     /*
@@ -305 +305 @@
      */
     OffsetRect(itemRect,
-         0,
-         -SELECTED_TAB_OFFSET);
+             0,
+             -SELECTED_TAB_OFFSET);
 
   } else
   {
     OffsetRect(itemRect,
-         -infoPtr->items[infoPtr->leftmostVisible].rect.left,
-         0);
+             -infoPtr->items[infoPtr->leftmostVisible].rect.left, 
+             0);
 
     /*
@@ -319 +319 @@
      */
     OffsetRect(itemRect,
-         SELECTED_TAB_OFFSET,
-         0);
+             SELECTED_TAB_OFFSET,
+             0);
   }
 
@@ -336 +336 @@
     /* If it also a bit higher. */
     if ((lStyle & TCS_BOTTOM) && !(lStyle & TCS_VERTICAL))
-    {
+    {      
       selectedRect->top -= 2; /* the border is thicker on the bottom */
       selectedRect->bottom += SELECTED_TAB_OFFSET;
@@ -362 +362 @@
 static BOOL TAB_GetItemRect(HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam,
+  return TAB_InternalGetItemRect(hwnd, TAB_GetInfoPtr(hwnd), (INT)wParam, 
                                  (LPRECT)lParam, (LPRECT)NULL);
 }
@@ -372 +372 @@
  */
 static LRESULT TAB_KeyUp(
-  HWND   hwnd,
+  HWND   hwnd, 
   WPARAM keyCode)
 {
@@ -387 +387 @@
       break;
   }
-
+  
   /*
    * If we changed to a valid item, change the selection
@@ -416 +416 @@
  */
 static LRESULT TAB_FocusChanging(
-  HWND   hwnd,
-  UINT   uMsg,
-  WPARAM wParam,
+  HWND   hwnd, 
+  UINT   uMsg, 
+  WPARAM wParam, 
   LPARAM lParam)
 {
@@ -429 +429 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                      infoPtr,
-                      infoPtr->uFocus,
-                      NULL,
-                      &selectedRect);
-
+                                      infoPtr,
+                                      infoPtr->uFocus,
+                                      NULL,
+                                      &selectedRect);
+  
   /*
    * If the rectangle is not completely invisible, invalidate that
@@ -451 +451 @@
 static HWND TAB_InternalHitTest (
   HWND      hwnd,
-  TAB_INFO* infoPtr,
-  POINT     pt,
+  TAB_INFO* infoPtr, 
+  POINT     pt, 
   UINT*     flags)
 
 {
   RECT rect;
-  int iCount;
-
+  int iCount; 
+  
   for (iCount = 0; iCount < infoPtr->uNumItem; iCount++)
   {
@@ -479 +479 @@
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   LPTCHITTESTINFO lptest = (LPTCHITTESTINFO) lParam;
-
+  
   return TAB_InternalHitTest (hwnd, infoPtr, lptest->pt, &lptest->flags);
 }
@@ -521 +521 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-            WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
 
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_FOCUSONBUTTONDOWN ) {
@@ -529 +529 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-            WM_LBUTTONDOWN, wParam, lParam);
-
+                    WM_LBUTTONDOWN, wParam, lParam);
+  
   pt.x = (INT)LOWORD(lParam);
   pt.y = (INT)HIWORD(lParam);
-
+  
   newItem = TAB_InternalHitTest (hwnd, infoPtr, pt, &dummy);
-
+  
   TRACE("On Tab, item %d\n", newItem);
 
@@ -619 +619 @@
     ** overlaps.  Note also that the case where the cursor stayed within our
     ** window but has moved off the hot-tracked tab will be handled by the
-    ** WM_MOUSEMOVE event.
+    ** WM_MOUSEMOVE event. 
     */
     if (!GetCursorPos(&pt) || WindowFromPoint(pt) != hwnd)
@@ -721 +721 @@
     if (item >= 0)
     {
-    /* Mark new hot-tracked to be redrawn to look highlighted */
+        /* Mark new hot-tracked to be redrawn to look highlighted */
       if (out_redrawEnter != NULL)
         *out_redrawEnter = item;
@@ -743 +743 @@
   if (infoPtr->hwndToolTip)
     TAB_RelayEvent (infoPtr->hwndToolTip, hwnd,
-            WM_LBUTTONDOWN, wParam, lParam);
+                    WM_LBUTTONDOWN, wParam, lParam);
 
   /* Determine which tab to highlight.  Redraw tabs which change highlight
@@ -764 +764 @@
  */
 static LRESULT TAB_AdjustRect(
-  HWND   hwnd,
-  WPARAM fLarger,
+  HWND   hwnd, 
+  WPARAM fLarger, 
   LPRECT prc)
 {
@@ -845 +845 @@
  */
 static LRESULT TAB_OnHScroll(
-  HWND    hwnd,
+  HWND    hwnd, 
   int     nScrollCode,
   int     nPos,
@@ -871 +871 @@
  * TAB_SetupScrolling
  *
- * This method will check the current scrolling state and make sure the
+ * This method will check the current scrolling state and make sure the 
  * scrolling control is displayed (or not).
  */
@@ -930 +930 @@
     {
       infoPtr->hwndUpDown = CreateWindowA("msctls_updown32",
-                      "",
-                      WS_VISIBLE | WS_CHILD | UDS_HORZ,
-                      controlPos.left, controlPos.top,
-                      controlPos.right - controlPos.left,
-                      controlPos.bottom - controlPos.top,
-                      hwnd,
-                      (HMENU)NULL,
-                      (HINSTANCE)NULL,
-                      NULL);
+                                          "",
+                                          WS_VISIBLE | WS_CHILD | UDS_HORZ,
+                                          controlPos.left, controlPos.top,
+                                          controlPos.right - controlPos.left,
+                                          controlPos.bottom - controlPos.top,
+                                          hwnd,
+                                          (HMENU)NULL, 
+                                          (HINSTANCE)NULL, 
+                                          NULL);        
     }
     else
     {
-      SetWindowPos(infoPtr->hwndUpDown,
-           (HWND)NULL,
-           controlPos.left, controlPos.top,
-           controlPos.right - controlPos.left,
-           controlPos.bottom - controlPos.top,
-           SWP_SHOWWINDOW | SWP_NOZORDER);
+      SetWindowPos(infoPtr->hwndUpDown, 
+                   (HWND)NULL,
+                   controlPos.left, controlPos.top,
+                   controlPos.right - controlPos.left,
+                   controlPos.bottom - controlPos.top,
+                   SWP_SHOWWINDOW | SWP_NOZORDER);                 
     }
 
@@ -1010 +1010 @@
    * a font.
    */
-  hdc = GetDC(hwnd);
-
+  hdc = GetDC(hwnd); 
+    
   hFont = infoPtr->hFont ? infoPtr->hFont : GetStockObject (SYSTEM_FONT);
   hOldFont = SelectObject (hdc, hFont);
@@ -1022 +1022 @@
 
   /* if TCS_VERTICAL then swap the height and width so this code places the
-     tabs along the top of the rectangle and we can just rotate them after
+     tabs along the top of the rectangle and we can just rotate them after 
      rather than duplicate all of the below code */
   if(lStyle & TCS_VERTICAL)
@@ -1054 +1054 @@
 
     /*
-     * Make sure there is enough space for the letters + icon + growing the
-     * selected item + extra space for the selected item.
+     * Make sure there is enough space for the letters + icon + growing the 
+     * selected item + extra space for the selected item.   
      */
     infoPtr->tabHeight = item_height + 2 * VERTICAL_ITEM_PADDING +
@@ -1085 +1085 @@
        * for button style tabs */
       if (lStyle & TCS_BUTTONS)
-          size.cx = max(size.cx, 2 * (infoPtr->tabHeight - 2));
+              size.cx = max(size.cx, 2 * (infoPtr->tabHeight - 2));
 
       /* Add the icon width */
@@ -1095 +1095 @@
 
       infoPtr->items[curItem].rect.right = infoPtr->items[curItem].rect.left +
-                                           size.cx + icon_width +
+                                           size.cx + icon_width + 
                                            num * HORIZONTAL_ITEM_PADDING;
     }
@@ -1114 +1114 @@
                                       infoPtr->items[curItem].rect.left;
 
-    infoPtr->items[curItem].rect.left = 0;
+        infoPtr->items[curItem].rect.left = 0;
         curItemRowCount++;
     }
@@ -1122 +1122 @@
 
     TRACE("TextSize: %li\n", size.cx);
-    TRACE("Rect: T %i, L %i, B %i, R %i\n",
-      infoPtr->items[curItem].rect.top,
-      infoPtr->items[curItem].rect.left,
-      infoPtr->items[curItem].rect.bottom,
-      infoPtr->items[curItem].rect.right);
+    TRACE("Rect: T %i, L %i, B %i, R %i\n", 
+          infoPtr->items[curItem].rect.top,
+          infoPtr->items[curItem].rect.left,
+          infoPtr->items[curItem].rect.bottom,
+          infoPtr->items[curItem].rect.right);  
 
     /*
@@ -1152 +1152 @@
     /* Don't need scrolling, then update infoPtr->leftmostVisible */
     if(!infoPtr->needsScrolling)
-      infoPtr->leftmostVisible = 0;
+      infoPtr->leftmostVisible = 0; 
 
     TAB_SetupScrolling(hwnd, infoPtr, &clientRect);
@@ -1193 +1193 @@
 
           /* shift the item to the left side of the clientRect */
-          infoPtr->items[iItm].rect.right -=
+          infoPtr->items[iItm].rect.right -= 
             infoPtr->items[iItm].rect.left;
           infoPtr->items[iItm].rect.left = 0;
@@ -1202 +1202 @@
           infoPtr->items[iItm].rect.top = iRow;
           if (lStyle & TCS_BUTTONS)
-      {
+          {
             curItemLeftPos = infoPtr->items[iItm].rect.right + 1;
             if (lStyle & TCS_FLATBUTTONS)
-          curItemLeftPos += FLAT_BTN_SPACINGX;
-      }
+              curItemLeftPos += FLAT_BTN_SPACINGX;
+          }
           else
             curItemLeftPos = infoPtr->items[iItm].rect.right;
       }
-
+          
       /*
        * Justify the rows
@@ -1217 +1217 @@
          while(iIndexStart < infoPtr->uNumItem)
         {
-        /*
+        /* 
          * find the indexs of the row
          */
         /* find the first item on the next row */
         for (iIndexEnd=iIndexStart;
-             (iIndexEnd < infoPtr->uNumItem) &&
-           (infoPtr->items[iIndexEnd].rect.top ==
+             (iIndexEnd < infoPtr->uNumItem) && 
+               (infoPtr->items[iIndexEnd].rect.top ==
                 infoPtr->items[iIndexStart].rect.top) ;
             iIndexEnd++)
         /* intentionaly blank */;
 
-        /*
+        /* 
          * we need to justify these tabs so they fill the whole given
          * client area
@@ -1246 +1246 @@
            widthDiff = widthDiff / iCount;
            /* add widthDiff/iCount, or extra space/items on row, to each item on this row */
-           for (iIndex=iIndexStart,iCount=0; iIndex < iIndexEnd;
+           for (iIndex=iIndexStart,iCount=0; iIndex < iIndexEnd; 
                 iIndex++,iCount++)
            {
@@ -1297 +1297 @@
  * This method is used to draw the interior (text and icon) of a single tab
  * into the tab control.
- */
+ */         
 static void
 TAB_DrawItemInterior
@@ -1390 +1390 @@
     id = GetWindowLongA( hwnd, GWL_ID );
 
-    /*
+    /* 
      * put together the DRAWITEMSTRUCT
      */
-    dis.CtlType    = ODT_TAB;
-    dis.CtlID      = id;
-    dis.itemID     = iItem;
-    dis.itemAction = ODA_DRAWENTIRE;
+    dis.CtlType    = ODT_TAB;   
+    dis.CtlID      = id;                
+    dis.itemID     = iItem;             
+    dis.itemAction = ODA_DRAWENTIRE;    
     if ( iItem == infoPtr->iSelected )
-      dis.itemState = ODS_SELECTED;
-    else
-      dis.itemState = 0;
-    dis.hwndItem = hwnd;        /* */
-    dis.hDC      = hdc;
-    dis.rcItem   = *drawRect;       /* */
+      dis.itemState = ODS_SELECTED;     
+    else                                
+      dis.itemState = 0;                
+    dis.hwndItem = hwnd;                /* */
+    dis.hDC      = hdc;         
+    dis.rcItem   = *drawRect;           /* */
     dis.itemData = infoPtr->items[iItem].lParam;
 
@@ -1538 +1538 @@
     if(lStyle & TCS_VERTICAL)
     {
-      if (!GetObjectA((infoPtr->hFont) ?
+      if (!GetObjectA((infoPtr->hFont) ? 
                 infoPtr->hFont : GetStockObject(SYSTEM_FONT),
                 sizeof(LOGFONTA),&logfont))
@@ -1545 +1545 @@
 
         lstrcpyA(logfont.lfFaceName, "Arial");
-        logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY),
+        logfont.lfHeight = -MulDiv(iPointSize, GetDeviceCaps(hdc, LOGPIXELSY), 
                                     72);
         logfont.lfWeight = FW_NORMAL;
@@ -1604 +1604 @@
  *
  * This method is used to draw a single tab into the tab control.
- */
+ */         
 static void TAB_DrawItem(
-  HWND hwnd,
-  HDC  hdc,
+  HWND hwnd, 
+  HDC  hdc, 
   INT  iItem)
 {
@@ -1621 +1621 @@
    */
   isVisible = TAB_InternalGetItemRect(hwnd,
-                      infoPtr,
-                      iItem,
-                      &itemRect,
-                      &selectedRect);
+                                      infoPtr,
+                                      iItem,
+                                      &itemRect,
+                                      &selectedRect);
 
   if (isVisible)
   {
-    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));
+    HBRUSH hbr       = CreateSolidBrush (GetSysColor(COLOR_BTNFACE));    
     HPEN   hwPen     = GetSysColorPen (COLOR_3DHILIGHT);
     HPEN hbPen  = GetSysColorPen (COLOR_3DDKSHADOW);
@@ -1645 +1645 @@
       /* Separators between flat buttons */
       /* FIXME: test and correct this if necessary for TCS_FLATBUTTONS style */
-      if (lStyle & TCS_FLATBUTTONS)
+      if (lStyle & TCS_FLATBUTTONS) 
       {
         int x = r.right + FLAT_BTN_SPACINGX - 2;
@@ -1669 +1669 @@
         /* Background color */
         if (!((lStyle & TCS_OWNERDRAWFIXED) && infoPtr->fSizeSet))
-    {
+        {
               COLORREF bk = GetSysColor(COLOR_3DHILIGHT);
               DeleteObject(hbr);
@@ -1685 +1685 @@
 
               deleteBrush = FALSE;
-    }
+        }
 
         /* Erase the background */
@@ -1704 +1704 @@
         LineTo   (hdc, r.right, r.bottom);
         LineTo   (hdc, r.right, r.top + 1);
-
+        
         /* shadow */
         SelectObject(hdc, hbPen);
@@ -1721 +1721 @@
         FillRect(hdc, &r, hbr);
 
-    if (!(lStyle & TCS_FLATBUTTONS))
-    {
+        if (!(lStyle & TCS_FLATBUTTONS))
+        {
           /* highlight */
           MoveToEx (hdc, r.left, r.bottom, NULL);
           LineTo   (hdc, r.left, r.top);
           LineTo   (hdc, r.right, r.top);
-
+         
           /* shadow */
           SelectObject(hdc, hbPen);
@@ -1738 +1738 @@
           LineTo   (hdc, r.right - 1, r.bottom - 1);
           LineTo   (hdc, r.left + 1, r.bottom - 1);
-    }
+        }
       }
     }
@@ -1745 +1745 @@
       /* Background color */
       DeleteObject(hbr);
-      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));
+      hbr = CreateSolidBrush(GetSysColor(COLOR_BTNFACE));    
 
       /* We draw a rectangle of different sizes depending on the selection
@@ -1756 +1756 @@
       /*
        * Erase the background.
-       * This is necessary when drawing the selected item since it is larger
-       * than the others, it might overlap with stuff already drawn by the
+       * This is necessary when drawing the selected item since it is larger 
+       * than the others, it might overlap with stuff already drawn by the 
        * other tabs
-       */
+       */     
       FillRect(hdc, &r, hbr);
 
@@ -1770 +1770 @@
       r.right--;
       r.bottom--;
-
+      
       holdPen = SelectObject (hdc, hwPen);
       if(lStyle & TCS_VERTICAL)
@@ -1859 +1859 @@
       }
     }
-
+  
     /* This modifies r to be the text rectangle. */
 {
@@ -1868 +1868 @@
     /* Draw the focus rectangle */
     if (((lStyle & TCS_FOCUSNEVER) == 0) &&
-     (GetFocus() == hwnd) &&
-     (iItem == infoPtr->uFocus) )
+         (GetFocus() == hwnd) &&
+         (iItem == infoPtr->uFocus) )
     {
       r = itemRect;
@@ -1888 +1888 @@
  * This method is used to draw the raised border around the tab control
  * "content" area.
- */
+ */         
 static void TAB_DrawBorder (HWND hwnd, HDC hdc)
 {
@@ -1957 +1957 @@
  *
  * This method repaints the tab control..
- */
+ */             
 static void TAB_Refresh (HWND hwnd, HDC hdc)
 {
@@ -1971 +1971 @@
   if (GetWindowLongA(hwnd, GWL_STYLE) & TCS_BUTTONS)
   {
-    for (i = 0; i < infoPtr->uNumItem; i++)
+    for (i = 0; i < infoPtr->uNumItem; i++) 
       TAB_DrawItem (hwnd, hdc, i);
   }
@@ -1977 +1977 @@
   {
     /* Draw all the non selected item first */
-    for (i = 0; i < infoPtr->uNumItem; i++)
+    for (i = 0; i < infoPtr->uNumItem; i++) 
     {
       if (i != infoPtr->iSelected)
-    TAB_DrawItem (hwnd, hdc, i);
+        TAB_DrawItem (hwnd, hdc, i);
     }
 
@@ -2011 +2011 @@
 {
     TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-
+  
   infoPtr->DoRedraw=(BOOL) wParam;
   return 0;
@@ -2017 +2017 @@
 
 static LRESULT TAB_EraseBackground(
-  HWND hwnd,
+  HWND hwnd, 
   HDC  givenDC)
 {
@@ -2207 +2207 @@
   HDC hdc;
   PAINTSTRUCT ps;
-
+    
   hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam;
   TAB_Refresh (hwnd, hdc);
-
+    
   if(!wParam)
     EndPaint (hwnd, &ps);
@@ -2219 +2219 @@
 static LRESULT
 TAB_InsertItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
-{
+{    
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
   TCITEMA *pti;
   INT iItem;
   RECT rect;
-
+  
   GetClientRect (hwnd, &rect);
   TRACE("Rect: %x T %i, L %i, B %i, R %i\n", hwnd,
-        rect.top, rect.left, rect.bottom, rect.right);
-
+        rect.top, rect.left, rect.bottom, rect.right);  
+  
   pti = (TCITEMA *)lParam;
   iItem = (INT)wParam;
-
+  
   if (iItem < 0) return -1;
   if (iItem > infoPtr->uNumItem)
     iItem = infoPtr->uNumItem;
-
+  
   if (infoPtr->uNumItem == 0) {
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM));
@@ -2243 +2243 @@
   else {
     TAB_ITEM *oldItems = infoPtr->items;
-
+    
     infoPtr->uNumItem++;
     infoPtr->items = COMCTL32_Alloc (sizeof (TAB_ITEM) * infoPtr->uNumItem);
-
+    
     /* pre insert copy */
     if (iItem > 0) {
       memcpy (&infoPtr->items[0], &oldItems[0],
-          iItem * sizeof(TAB_ITEM));
-    }
-
+              iItem * sizeof(TAB_ITEM));
+    }
+    
     /* post insert copy */
     if (iItem < infoPtr->uNumItem - 1) {
       memcpy (&infoPtr->items[iItem+1], &oldItems[iItem],
-          (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
-
+              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
+      
     }
 
@@ -2265 +2265 @@
     COMCTL32_Free (oldItems);
   }
-
+  
   infoPtr->items[iItem].mask = pti->mask;
   if (pti->mask & TCIF_TEXT)
@@ -2272 +2272 @@
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-
+  
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-
+  
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
-
+  
   TRACE("[%04x]: added item %d '%s'\n",
-    hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
+        hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
@@ -2319 +2319 @@
     if (iItem > 0) {
       memcpy (&infoPtr->items[0], &oldItems[0],
-          iItem * sizeof(TAB_ITEM));
+              iItem * sizeof(TAB_ITEM));
     }
 
@@ -2325 +2325 @@
     if (iItem < infoPtr->uNumItem - 1) {
       memcpy (&infoPtr->items[iItem+1], &oldItems[iItem],
-          (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
-
-  }
-
+              (infoPtr->uNumItem - iItem - 1) * sizeof(TAB_ITEM));
+
+  }
+  
     if (iItem <= infoPtr->iSelected)
       infoPtr->iSelected++;
@@ -2341 +2341 @@
   if (pti->mask & TCIF_IMAGE)
     infoPtr->items[iItem].iImage = pti->iImage;
-
+  
   if (pti->mask & TCIF_PARAM)
     infoPtr->items[iItem].lParam = pti->lParam;
-
+  
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd, infoPtr);
-
+  
   TRACE("[%04x]: added item %d '%s'\n",
-    hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
+        hwnd, iItem, debugstr_w(infoPtr->items[iItem].pszText));
 
   return iItem;
@@ -2355 +2355 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_SetItemSize (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2373 +2373 @@
 }
 
-static LRESULT
+static LRESULT 
 TAB_SetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-  TCITEMA *tabItem;
+  TCITEMA *tabItem; 
   TAB_ITEM *wineItem;
   INT    iItem;
@@ -2395 +2395 @@
     wineItem->lParam = tabItem->lParam;
 
-  if (tabItem->mask & TCIF_RTLREADING)
+  if (tabItem->mask & TCIF_RTLREADING) 
     FIXME("TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE)
+  if (tabItem->mask & TCIF_STATE) 
     wineItem->dwState = tabItem->dwState;
 
@@ -2451 +2451 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_GetItemCount (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2460 +2460 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_GetItemA (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2476 +2476 @@
   wineItem = &infoPtr->items[iItem];
 
-  if (tabItem->mask & TCIF_IMAGE)
+  if (tabItem->mask & TCIF_IMAGE) 
     tabItem->iImage = wineItem->iImage;
 
-  if (tabItem->mask & TCIF_PARAM)
+  if (tabItem->mask & TCIF_PARAM) 
     tabItem->lParam = wineItem->lParam;
 
-  if (tabItem->mask & TCIF_RTLREADING)
+  if (tabItem->mask & TCIF_RTLREADING) 
     FIXME("TCIF_RTLREADING\n");
 
-  if (tabItem->mask & TCIF_STATE)
+  if (tabItem->mask & TCIF_STATE) 
     tabItem->dwState = wineItem->dwState;
 
-  if (tabItem->mask & TCIF_TEXT)
+  if (tabItem->mask & TCIF_TEXT) 
    Str_GetPtrWtoA (wineItem->pszText, tabItem->pszText, tabItem->cchTextMax);
 
@@ -2495 +2495 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_GetItemW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2530 +2530 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_DeleteItem (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2540 +2540 @@
   {
     TAB_ITEM *oldItems = infoPtr->items;
-
+    
     infoPtr->uNumItem--;
     infoPtr->items = COMCTL32_Alloc(sizeof (TAB_ITEM) * infoPtr->uNumItem);
-
-    if (iItem > 0)
+    
+    if (iItem > 0) 
       memcpy(&infoPtr->items[0], &oldItems[0], iItem * sizeof(TAB_ITEM));
-
-    if (iItem < infoPtr->uNumItem)
+    
+    if (iItem < infoPtr->uNumItem) 
       memcpy(&infoPtr->items[iItem], &oldItems[iItem + 1],
               (infoPtr->uNumItem - iItem) * sizeof(TAB_ITEM));
-
+    
     COMCTL32_Free(oldItems);
 
@@ -2556 +2556 @@
     if ((iItem == infoPtr->iSelected) && (iItem > 0))
       infoPtr->iSelected--;
-
+      
     if (iItem < infoPtr->iSelected)
       infoPtr->iSelected--;
@@ -2573 +2573 @@
 }
 
-static LRESULT
+static LRESULT 
 TAB_DeleteAllItems (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2584 +2584 @@
     KillTimer(hwnd, TAB_HOTTRACK_TIMER);
   infoPtr->iHotTracked = -1;
-
+ 
   TAB_SetItemBounds(hwnd);
   TAB_InvalidateTabArea(hwnd,infoPtr);
@@ -2605 +2605 @@
 {
   TAB_INFO *infoPtr = TAB_GetInfoPtr(hwnd);
-
+  
   TRACE("%x %lx\n",wParam, lParam);
-
+  
   infoPtr->hFont = (HFONT)wParam;
-
+  
   TAB_SetItemBounds(hwnd);
 
@@ -2676 +2676 @@
     cx=LOWORD (lParam);
     cy=HIWORD (lParam);
-    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE)
+    if (GetWindowLongA(hwnd, GWL_STYLE) & CCS_NORESIZE) 
         uPosFlags |= (SWP_NOSIZE | SWP_NOMOVE);
 
@@ -2695 +2695 @@
 
 
-static LRESULT
+static LRESULT 
 TAB_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -2711 +2711 @@
 
   SetWindowLongA(hwnd, 0, (DWORD)infoPtr);
-
+   
   infoPtr->uNumItem        = 0;
   infoPtr->uNumRows        = 0;
@@ -2719 +2719 @@
   infoPtr->iSelected       = -1;
   infoPtr->iHotTracked     = -1;
-  infoPtr->uFocus          = -1;
+  infoPtr->uFocus          = -1;  
   infoPtr->hwndToolTip     = 0;
   infoPtr->DoRedraw        = TRUE;
@@ -2725 +2725 @@
   infoPtr->hwndUpDown      = 0;
   infoPtr->leftmostVisible = 0;
-  infoPtr->fSizeSet    = FALSE;
-  infoPtr->bUnicode    = IsWindowUnicode (hwnd);
-
-  TRACE("Created tab control, hwnd [%04x]\n", hwnd);
-
-  /* The tab control always has the WS_CLIPSIBLINGS style. Even
-     if you don't specify it in CreateWindow. This is necessary in
+  infoPtr->fSizeSet        = FALSE;
+  infoPtr->bUnicode        = IsWindowUnicode (hwnd);
+  
+  TRACE("Created tab control, hwnd [%04x]\n", hwnd); 
+
+  /* The tab control always has the WS_CLIPSIBLINGS style. Even 
+     if you don't specify it in CreateWindow. This is necessary in 
      order for paint to work correctly. This follows windows behaviour. */
   dwStyle = GetWindowLongA(hwnd, GWL_STYLE);
@@ -2740 +2740 @@
     infoPtr->hwndToolTip =
       CreateWindowExA (0, TOOLTIPS_CLASSA, NULL, 0,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               CW_USEDEFAULT, CW_USEDEFAULT,
-               hwnd, 0, 0, 0);
-
+                       CW_USEDEFAULT, CW_USEDEFAULT,
+                       CW_USEDEFAULT, CW_USEDEFAULT,
+                       hwnd, 0, 0, 0);
+    
     /* Send NM_TOOLTIPSCREATED notification */
     if (infoPtr->hwndToolTip) {
       NMTOOLTIPSCREATED nmttc;
-
+      
       nmttc.hdr.hwndFrom = hwnd;
       nmttc.hdr.idFrom = GetWindowLongA(hwnd, GWL_ID);
       nmttc.hdr.code = NM_TOOLTIPSCREATED;
       nmttc.hwndToolTips = infoPtr->hwndToolTip;
-
+      
       SendMessageA (GetParent (hwnd), WM_NOTIFY,
-            (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
-    }
-  }
-
+                    (WPARAM)GetWindowLongA(hwnd, GWL_ID), (LPARAM)&nmttc);
+    }
+  }  
+    
   /*
    * We need to get text information so we need a DC and we need to select
    * a font.
    */
-  hdc = GetDC(hwnd);
+  hdc = GetDC(hwnd); 
   hOldFont = SelectObject (hdc, GetStockObject (SYSTEM_FONT));
 
@@ -2769 +2769 @@
 
   /*
-   * Make sure there is enough space for the letters + growing the
-   * selected item + extra space for the selected item.
+   * Make sure there is enough space for the letters + growing the 
+   * selected item + extra space for the selected item.   
    */
   infoPtr->tabHeight = fontMetrics.tmHeight + 2 * VERTICAL_ITEM_PADDING +
@@ -2796 +2796 @@
     for (iItem = 0; iItem < infoPtr->uNumItem; iItem++) {
       if (infoPtr->items[iItem].pszText)
-    COMCTL32_Free (infoPtr->items[iItem].pszText);
+        COMCTL32_Free (infoPtr->items[iItem].pszText);
     }
     COMCTL32_Free (infoPtr->items);
   }
-
-  if (infoPtr->hwndToolTip)
+  
+  if (infoPtr->hwndToolTip) 
     DestroyWindow (infoPtr->hwndToolTip);
-
+ 
   if (infoPtr->hwndUpDown)
     DestroyWindow(infoPtr->hwndUpDown);
@@ -2827 +2827 @@
     case TCM_GETIMAGELIST:
       return TAB_GetImageList (hwnd, wParam, lParam);
-
+      
     case TCM_SETIMAGELIST:
       return TAB_SetImageList (hwnd, wParam, lParam);
-
+      
     case TCM_GETITEMCOUNT:
       return TAB_GetItemCount (hwnd, wParam, lParam);
-
+      
     case TCM_GETITEMA:
       return TAB_GetItemA (hwnd, wParam, lParam);
-
+      
     case TCM_GETITEMW:
       return TAB_GetItemW (hwnd, wParam, lParam);
-
+      
     case TCM_SETITEMA:
       return TAB_SetItemA (hwnd, wParam, lParam);
-
+      
     case TCM_SETITEMW:
       return TAB_SetItemW (hwnd, wParam, lParam);
-
+      
     case TCM_DELETEITEM:
       return TAB_DeleteItem (hwnd, wParam, lParam);
-
+      
     case TCM_DELETEALLITEMS:
      return TAB_DeleteAllItems (hwnd, wParam, lParam);
-
+     
     case TCM_GETITEMRECT:
      return TAB_GetItemRect (hwnd, wParam, lParam);
-
+      
     case TCM_GETCURSEL:
       return TAB_GetCurSel (hwnd);
-
+      
     case TCM_HITTEST:
       return TAB_HitTest (hwnd, wParam, lParam);
-
+      
     case TCM_SETCURSEL:
       return TAB_SetCurSel (hwnd, wParam);
-
+      
     case TCM_INSERTITEMA:
       return TAB_InsertItemA (hwnd, wParam, lParam);
-
+      
     case TCM_INSERTITEMW:
       return TAB_InsertItemW (hwnd, wParam, lParam);
-
+      
     case TCM_SETITEMEXTRA:
       FIXME("Unimplemented msg TCM_SETITEMEXTRA\n");
       return 0;
-
+      
     case TCM_ADJUSTRECT:
       return TAB_AdjustRect (hwnd, (BOOL)wParam, (LPRECT)lParam);
-
+      
     case TCM_SETITEMSIZE:
       return TAB_SetItemSize (hwnd, wParam, lParam);
-
+      
     case TCM_REMOVEIMAGE:
       FIXME("Unimplemented msg TCM_REMOVEIMAGE\n");
       return 0;
-
+      
     case TCM_SETPADDING:
       FIXME("Unimplemented msg TCM_SETPADDING\n");
       return 0;
-
+      
     case TCM_GETROWCOUNT:
       return TAB_GetRowCount(hwnd);
@@ -2900 +2900 @@
       FIXME("Unimplemented msg TCM_HIGHLIGHTITEM\n");
       return 0;
-
+      
     case TCM_GETTOOLTIPS:
       return TAB_GetToolTips (hwnd, wParam, lParam);
-
+      
     case TCM_SETTOOLTIPS:
       return TAB_SetToolTips (hwnd, wParam, lParam);
-
+      
     case TCM_GETCURFOCUS:
       return TAB_GetCurFocus (hwnd);
-
+      
     case TCM_SETCURFOCUS:
       return TAB_SetCurFocus (hwnd, wParam);
-
+      
     case TCM_SETMINTABWIDTH:
       FIXME("Unimplemented msg TCM_SETMINTABWIDTH\n");
       return 0;
-
+      
     case TCM_DESELECTALL:
       FIXME("Unimplemented msg TCM_DESELECTALL\n");
       return 0;
-
+      
     case TCM_GETEXTENDEDSTYLE:
       FIXME("Unimplemented msg TCM_GETEXTENDEDSTYLE\n");
@@ -2931 +2931 @@
     case WM_GETFONT:
       return TAB_GetFont (hwnd, wParam, lParam);
-
+      
     case WM_SETFONT:
       return TAB_SetFont (hwnd, wParam, lParam);
-
+      
     case WM_CREATE:
       return TAB_Create (hwnd, wParam, lParam);
-
+      
     case WM_NCDESTROY:
       return TAB_Destroy (hwnd, wParam, lParam);
-
+      
     case WM_GETDLGCODE:
       return DLGC_WANTARROWS | DLGC_WANTCHARS;
-
+      
     case WM_LBUTTONDOWN:
       return TAB_LButtonDown (hwnd, wParam, lParam);
-
+      
     case WM_LBUTTONUP:
       return TAB_LButtonUp (hwnd, wParam, lParam);
-
+      
     case WM_RBUTTONDOWN:
       return TAB_RButtonDown (hwnd, wParam, lParam);
-
+      
     case WM_MOUSEMOVE:
       return TAB_MouseMove (hwnd, wParam, lParam);
-
+      
     case WM_ERASEBKGND:
       return TAB_EraseBackground (hwnd, (HDC)wParam);
@@ -2964 +2964 @@
     case WM_SIZE:
       return TAB_Size (hwnd, wParam, lParam);
-
+      
     case WM_SETREDRAW:
       return TAB_SetRedraw (hwnd, wParam);
@@ -2975 +2975 @@
       InvalidateRect(hwnd, NULL, TRUE);
       return 0;
-
+      
     case WM_KILLFOCUS:
     case WM_SETFOCUS:
@@ -2987 +2987 @@
     default:
       if (uMsg >= WM_USER)
-    WARN("unknown msg %04x wp=%08x lp=%08lx\n",
-         uMsg, wParam, lParam);
+        WARN("unknown msg %04x wp=%08x lp=%08lx\n",
+             uMsg, wParam, lParam);
 #ifdef __WIN32OS2__
       return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
@@ -3013 +3013 @@
   wndClass.hbrBackground = (HBRUSH)NULL;
   wndClass.lpszClassName = WC_TABCONTROLA;
-
+  
   RegisterClassA (&wndClass);
 }