Changeset 10097 for trunk/src/comctl32/animate.c

Timestamp:

May 15, 2003, 4:25:14 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/animate.c (modified) (37 diffs)

trunk/src/comctl32/animate.c

@@ -29 +29 @@
  */
 
+#define COM_NO_WINDOWS_H
 #include <string.h>
 #include "winbase.h"
@@ -79 +80 @@
    int                  currFrame;
    /* tranparency info*/
-   COLORREF             transparentColor;   
+   COLORREF             transparentColor;
    HBRUSH               hbrushBG;
    HBITMAP              hbmPrevFrame;
@@ -89 +90 @@
 static void ANIMATE_Notify(ANIMATE_INFO* infoPtr, UINT notif)
 {
-    SendMessageA(GetParent(infoPtr->hWnd), WM_COMMAND, 
-                 MAKEWPARAM(GetDlgCtrlID(infoPtr->hWnd), notif), 
+    SendMessageA(GetParent(infoPtr->hWnd), WM_COMMAND,
+                 MAKEWPARAM(GetDlgCtrlID(infoPtr->hWnd), notif),
                  (LPARAM)infoPtr->hWnd);
 }
@@ -99 +100 @@
     MMIOINFO    mminfo;
     LPVOID      lpAvi;
-    
+
     hrsrc = FindResourceA(hInst, lpName, "AVI");
     if (!hrsrc)
         return FALSE;
-    
+
     infoPtr->hRes = LoadResource(hInst, hrsrc);
     if (!infoPtr->hRes)
         return FALSE;
-    
+
     lpAvi = LockResource(infoPtr->hRes);
     if (!lpAvi)
         return FALSE;
-    
+
     memset(&mminfo, 0, sizeof(mminfo));
     mminfo.fccIOProc = FOURCC_MEM;
@@ -130 +131 @@
     infoPtr->hMMio = mmioOpenA((LPSTR)lpName, NULL,
                                MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
-    
+
     if (!infoPtr->hMMio)
         return FALSE;
-    
+
     return TRUE;
 }
@@ -143 +144 @@
 
     /* should stop playing */
-    if (infoPtr->hThread) 
+    if (infoPtr->hThread)
     {
         if (!TerminateThread(infoPtr->hThread,0))
@@ -205 +206 @@
         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->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);
 
@@ -268 +269 @@
 
         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)
@@ -283 +284 @@
     }
 
-    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);
@@ -322 +323 @@
         infoPtr->hbmPrevFrame = hbmFinal;
          }
-    
-    if (GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_CENTER) 
-    {
-       RECT rect;   
+
+    if (GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_CENTER)
+    {
+       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);
@@ -348 +349 @@
     mmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET);
     mmioRead(infoPtr->hMMio, infoPtr->indata, infoPtr->ash.dwSuggestedBufferSize);
-    
+
     if (infoPtr->hic &&
-        fnIC.fnICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata, 
+        fnIC.fnICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata,
                      infoPtr->outbih, infoPtr->outdata) != ICERR_OK) {
         LeaveCriticalSection(&infoPtr->cs);
@@ -379 +380 @@
     ANIMATE_INFO*       infoPtr = (ANIMATE_INFO*)ptr_;
     HDC hDC;
-    
+
     if(!infoPtr)
     {
@@ -387 +388 @@
 
     while(1)
-    {    
-        if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT) 
+    {
+        if(GetWindowLongA(infoPtr->hWnd, GWL_STYLE) & ACS_TRANSPARENT)
         {
             hDC = GetDC(infoPtr->hWnd);
             /* sometimes the animation window will be destroyed in between
              * by the main program, so a ReleaseDC() error msg is possible */
-            infoPtr->hbrushBG = SendMessageA(GetParent(infoPtr->hWnd),WM_CTLCOLORSTATIC,hDC, infoPtr->hWnd);
+            infoPtr->hbrushBG = (HBRUSH)SendMessageA(GetParent(infoPtr->hWnd),
+                                             WM_CTLCOLORSTATIC, (WPARAM)hDC,
+                                             (LPARAM)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);
@@ -427 +430 @@
         infoPtr->nToFrame = infoPtr->mah.dwTotalFrames - 1;
 
-    TRACE("(repeat=%d from=%d to=%d);\n", 
+    TRACE("(repeat=%d from=%d to=%d);\n",
           infoPtr->nLoop, infoPtr->nFromFrame, infoPtr->nToFrame);
 
@@ -444 +447 @@
 
         TRACE("Using an animation thread\n");
-        infoPtr->hThread = CreateThread(0,0,ANIMATE_AnimationThread,(LPVOID)infoPtr,0,0 &threadID);
+        infoPtr->hThread = CreateThread(0,0,ANIMATE_AnimationThread,(LPVOID)infoPtr, 0, &threadID);
         if(!infoPtr->hThread)
         {
@@ -450 +453 @@
            return FALSE;
     }
-        
-    }
-        
+
+    }
+
     ANIMATE_Notify(infoPtr, ACN_START);
 
@@ -520 +523 @@
     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)), 
+    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)), 
+    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);
@@ -539 +542 @@
     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, 
+    TRACE("ash.rcFrame=(%d,%d,%d,%d)\n",        infoPtr->ash.rcFrame.top, infoPtr->ash.rcFrame.left,
           infoPtr->ash.rcFrame.bottom, infoPtr->ash.rcFrame.right);
 
@@ -573 +576 @@
 
     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');
@@ -597 +600 @@
     /* FIXME: should handle the 'rec ' LIST when present */
 
-    infoPtr->lpIndex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 
+    infoPtr->lpIndex = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
                                  infoPtr->mah.dwTotalFrames * sizeof(DWORD));
     if (!infoPtr->lpIndex) {
@@ -605 +608 @@
 
     numFrame = insize = 0;
-    while (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, 0) == 0 && 
+    while (mmioDescend(infoPtr->hMMio, &mmckInfo, &mmckList, 0) == 0 &&
            numFrame < infoPtr->mah.dwTotalFrames) {
         infoPtr->lpIndex[numFrame] = mmckInfo.dwDataOffset;
@@ -641 +644 @@
        (infoPtr->ash.fccHandler == mmioFOURCC(0, 0, 0, 0)))
     {
-        infoPtr->hic = 0;             
+        infoPtr->hic = 0;
         return TRUE;
     }
@@ -651 +654 @@
         return FALSE;
     }
-    
-    outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
+
+    outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT,
                             (DWORD)infoPtr->inbih, 0L);
 
@@ -661 +664 @@
     }
 
-    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT, 
-                      (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
+    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT,
+                      (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != outSize) {
         WARN("Can't get output BIH\n");
         return FALSE;
@@ -673 +676 @@
     }
 
-    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN, 
+    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN,
                       (DWORD)infoPtr->inbih, (DWORD)infoPtr->outbih) != ICERR_OK) {
         WARN("Can't begin decompression\n");
@@ -692 +695 @@
     if (!lParam) {
         TRACE("Closing avi!\n");
-        return TRUE;
-    }
-    
+        /* installer of thebat! v1.62 requires FALSE here */
+        return (infoPtr->hMMio != 0);
+    }
+
     if (!hInstance)
-       hInstance = GetWindowLongA(hWnd, GWL_HINSTANCE);
+       hInstance = (HINSTANCE)GetWindowLongA(hWnd, GWL_HINSTANCE);
 
     if (HIWORD(lParam)) {
@@ -794 +798 @@
 
     InitializeCriticalSection(&infoPtr->cs);
-    
+
     return 0;
 }
@@ -818 +822 @@
 {
     RECT rect;
-    HBRUSH hBrush = 0;       
-
-    if(GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT) 
-    {
-        hBrush = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);    
+    HBRUSH hBrush = 0;
+
+    if(GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
+    {
+        hBrush = (HBRUSH)SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,
+                                      wParam, (LPARAM)hWnd);
     }
 
@@ -841 +846 @@
 static LRESULT WINAPI ANIMATE_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-    TRACE("hwnd=%x msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
+    TRACE("hwnd=%p msg=%x wparam=%x lparam=%lx\n", hWnd, uMsg, wParam, lParam);
     if (!ANIMATE_GetInfoPtr(hWnd) && (uMsg != WM_NCCREATE))
         return DefWindowProcA(hWnd, uMsg, wParam, lParam);
@@ -848 +853 @@
     case ACM_OPENA:
         return ANIMATE_OpenA(hWnd, wParam, lParam);
-        
+
         /*      case ACM_OPEN32W: FIXME!! */
         /*          return ANIMATE_Open32W(hWnd, wParam, lParam); */
-        
+
     case ACM_PLAY:
         return ANIMATE_Play(hWnd, wParam, lParam);
-        
+
     case ACM_STOP:
         return ANIMATE_Stop(hWnd, wParam, lParam);
-        
+
     case WM_NCCREATE:
         ANIMATE_Create(hWnd, wParam, lParam);
         return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-        
+
     case WM_NCHITTEST:
         return HTTRANSPARENT;
@@ -868 +873 @@
         ANIMATE_Destroy(hWnd, wParam, lParam);
         return DefWindowProcA(hWnd, uMsg, wParam, lParam);
-        
+
     case WM_ERASEBKGND:
         ANIMATE_EraseBackground(hWnd, wParam, lParam);
@@ -879 +884 @@
         {
             ANIMATE_INFO* infoPtr = ANIMATE_GetInfoPtr(hWnd);
-            infoPtr->hbrushBG = SendMessageA(GetParent(hWnd),WM_CTLCOLORSTATIC,(HDC)wParam, hWnd);
+            infoPtr->hbrushBG = (HBRUSH)SendMessageA(GetParent(hWnd),
+                                                     WM_CTLCOLORSTATIC,
+                                                     wParam, (LPARAM)hWnd);
         }
         return ANIMATE_DrawFrame(ANIMATE_GetInfoPtr(hWnd));
-        
+
     case WM_CLOSE:
         ANIMATE_Free(ANIMATE_GetInfoPtr(hWnd));
@@ -890 +897 @@
         {
             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 (GetWindowLongA(hWnd, GWL_STYLE) & ACS_TRANSPARENT)
-                infoPtr->hbrushBG = SendMessageA(GetParent(hWnd), WM_CTLCOLORSTATIC,
-                                                 (HDC)wParam, hWnd);
-    
+                infoPtr->hbrushBG = (HBRUSH)SendMessageA(GetParent(hWnd),
+                                                         WM_CTLCOLORSTATIC,
+                                                         wParam, (LPARAM)hWnd);
+
             if (wParam)
             {
@@ -914 +922 @@
                 ANIMATE_PaintFrame(infoPtr, hDC);
                 LeaveCriticalSection(&infoPtr->cs);
-    
+
                 EndPaint(hWnd, &ps);
             }
@@ -925 +933 @@
 
     default:
-        if (uMsg >= WM_USER)
+        if ((uMsg >= WM_USER) && (uMsg < WM_APP))
             ERR("unknown msg %04x wp=%08x lp=%08lx\n", uMsg, wParam, lParam);
-        
+
         return DefWindowProcA(hWnd, uMsg, wParam, lParam);
     }
@@ -945 +953 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = ANIMATE_CLASSA;
- 
+
     RegisterClassA(&wndClass);
 }
@@ -952 +960 @@
 void ANIMATE_Unregister(void)
 {
-    UnregisterClassA(ANIMATE_CLASSA, (HINSTANCE)NULL);
-}
-
+    UnregisterClassA(ANIMATE_CLASSA, NULL);
+}