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

Timestamp:

Aug 14, 1999, 6:13:16 PM (26 years ago)

Author:

cbratschi

Message:

wine-990731 update

File:

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

trunk/src/comctl32/animate.c

@@ -1 @@
-/* $Id: animate.c,v 1.3 1999-06-10 16:21:57 achimha Exp $ */
+/* $Id: animate.c,v 1.4 1999-08-14 16:13:09 cbratschi Exp $ */
 /*
  * Animation control
@@ -34 +34 @@
     hrsrc = FindResourceA (hInst, lpName, "AVI");
     if (!hrsrc)
-        return FALSE;
+        return FALSE;
 
     handle = LoadResource (hInst, hrsrc);
     if (!handle)
-        return FALSE;
+        return FALSE;
 
     infoPtr->lpAvi = LockResource (handle);
     if (!infoPtr->lpAvi)
-        return FALSE;
+        return FALSE;
 
     return TRUE;
@@ -54 +54 @@
 
     infoPtr->hFile =
-        CreateFileA (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
-                       FILE_ATTRIBUTE_NORMAL, 0);
+        CreateFileA (lpName, GENERIC_READ, 0, NULL, OPEN_EXISTING,
+                       FILE_ATTRIBUTE_NORMAL, 0);
     if (!infoPtr->hFile)
-        return FALSE;
+        return FALSE;
 
     handle =
-        CreateFileMappingA (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
-                              0, 0, NULL);
+        CreateFileMappingA (infoPtr->hFile, NULL, PAGE_READONLY | SEC_COMMIT,
+                              0, 0, NULL);
     if (!handle) {
-        CloseHandle (infoPtr->hFile);
-        infoPtr->hFile = 0;
-        return FALSE;
+        CloseHandle (infoPtr->hFile);
+        infoPtr->hFile = 0;
+        return FALSE;
     }
 
     infoPtr->lpAvi = MapViewOfFile (handle, FILE_MAP_READ, 0, 0, 0);
     if (!infoPtr->lpAvi) {
-        CloseHandle (infoPtr->hFile);
-        infoPtr->hFile = 0;
-        return FALSE;
+        CloseHandle (infoPtr->hFile);
+        infoPtr->hFile = 0;
+        return FALSE;
     }
 
@@ -83 +83 @@
 {
     if (infoPtr->hFile) {
-        UnmapViewOfFile (infoPtr->lpAvi);
-        CloseHandle (infoPtr->hFile);
-        infoPtr->lpAvi = NULL;
+        UnmapViewOfFile (infoPtr->lpAvi);
+        CloseHandle (infoPtr->hFile);
+        infoPtr->lpAvi = NULL;
     }
     else {
-        GlobalFree ((HGLOBAL)infoPtr->lpAvi);
-        infoPtr->lpAvi = NULL;
+        GlobalFree ((HGLOBAL)infoPtr->lpAvi);
+        infoPtr->lpAvi = NULL;
     }
 }
@@ -111 +111 @@
 
     if (!lParam) {
-//      TRACE (animate, "closing avi!\n");
-        return TRUE;
-    }
-    
+//      TRACE (animate, "closing avi!\n");
+        return TRUE;
+    }
+
     if (HIWORD(lParam)) {
-//      FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
-
-        if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
-
-//          FIXME (animate, "AVI resource found!\n");
-
-        }
-        else {
-//          FIXME (animate, "No AVI resource found!\n");
-            if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
-//              FIXME (animate, "AVI file found!\n");
-            }
-            else {
-//              FIXME (animate, "No AVI file found!\n");
-                return FALSE;
-            }
-        }
+//      FIXME (animate, "(\"%s\") empty stub!\n", (LPSTR)lParam);
+
+        if (ANIMATE_LoadResA (infoPtr, hInstance, (LPSTR)lParam)) {
+
+//          FIXME (animate, "AVI resource found!\n");
+
+        }
+        else {
+//          FIXME (animate, "No AVI resource found!\n");
+            if (ANIMATE_LoadFileA (infoPtr, (LPSTR)lParam)) {
+//              FIXME (animate, "AVI file found!\n");
+            }
+            else {
+//              FIXME (animate, "No AVI file found!\n");
+                return FALSE;
+            }
+        }
     }
     else {
-//      FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
-
-        if (ANIMATE_LoadResA (infoPtr, hInstance,
-                                MAKEINTRESOURCEA((INT)lParam))) {
-//          FIXME (animate, "AVI resource found!\n");
-        }
-        else {
-//          FIXME (animate, "No AVI resource found!\n");
-            return FALSE;
-        }
+//      FIXME (animate, "(%u) empty stub!\n", (WORD)LOWORD(lParam));
+
+        if (ANIMATE_LoadResA (infoPtr, hInstance,
+                                MAKEINTRESOURCEA((INT)lParam))) {
+//          FIXME (animate, "AVI resource found!\n");
+        }
+        else {
+//          FIXME (animate, "No AVI resource found!\n");
+            return FALSE;
+        }
     }
 
@@ -167 +167 @@
     /* nothing opened */
     if (...)
-        return FALSE;
+        return FALSE;
 #endif
-    
+
     if (nRepeat == -1) {
 
-//      FIXME (animate, "(loop from=%d to=%d) empty stub!\n",
-//             nFrom, nTo);
+//      FIXME (animate, "(loop from=%d to=%d) empty stub!\n",
+//             nFrom, nTo);
 
     }
     else {
 
-//      FIXME (animate, "(repeat=%d from=%d to=%d) empty stub!\n",
-//             nRepeat, nFrom, nTo);
+//      FIXME (animate, "(repeat=%d from=%d to=%d) empty stub!\n",
+//             nRepeat, nFrom, nTo);
 
     }
@@ -196 +196 @@
     /* nothing opened */
     if (...)
-        return FALSE;
+        return FALSE;
 #endif
-    
+
     return TRUE;
 }
@@ -212 +212 @@
     infoPtr = (ANIMATE_INFO *)COMCTL32_Alloc (sizeof(ANIMATE_INFO));
     if (!infoPtr) {
-//      ERR (animate, "could not allocate info memory!\n");
-        return 0;
+//      ERR (animate, "could not allocate info memory!\n");
+        return 0;
     }
 
@@ -262 +262 @@
 
 
-LRESULT WINAPI
+static LRESULT WINAPI
 ANIMATE_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     switch (uMsg)
     {
-        case ACM_OPENA:
-            return ANIMATE_OpenA (hwnd, wParam, lParam);
-
-/*      case ACM_OPEN32W: */
-/*          return ANIMATE_Open32W (hwnd, wParam, lParam); */
+        case ACM_OPENA:
+            return ANIMATE_OpenA (hwnd, wParam, lParam);
+
+/*      case ACM_OPEN32W: */
+/*          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_CREATE:
-            return ANIMATE_Create (hwnd, wParam, lParam);
-
-        case WM_DESTROY:
-            return ANIMATE_Destroy (hwnd, wParam, lParam);
-
-/*      case WM_ERASEBKGND: */
-/*          return ANIMATE_EraseBackground (hwnd, wParam, lParam); */
-
-/*      case WM_NCCREATE: */
-/*      case WM_NCHITTEST: */
-/*      case WM_PAINT: */
-/*      case WM_SIZE: */
-/*      case WM_STYLECHANGED: */
-/*      case WM_TIMER: */
-
-        default:
-//          if (uMsg >= WM_USER)
-//              ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
-//                   uMsg, wParam, lParam);
-            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
+        case ACM_STOP:
+            return ANIMATE_Stop (hwnd, wParam, lParam);
+
+
+        case WM_CREATE:
+            return ANIMATE_Create (hwnd, wParam, lParam);
+
+        case WM_DESTROY:
+            return ANIMATE_Destroy (hwnd, wParam, lParam);
+
+/*      case WM_ERASEBKGND: */
+/*          return ANIMATE_EraseBackground (hwnd, wParam, lParam); */
+
+/*      case WM_NCCREATE: */
+/*      case WM_NCHITTEST: */
+/*      case WM_PAINT: */
+/*      case WM_SIZE: */
+/*      case WM_STYLECHANGED: */
+/*      case WM_TIMER: */
+
+        default:
+//          if (uMsg >= WM_USER)
+//              ERR (animate, "unknown msg %04x wp=%08x lp=%08lx\n",
+//                   uMsg, wParam, lParam);
+            return DefWindowProcA (hwnd, uMsg, wParam, lParam);
     }
     return 0;
@@ -321 +321 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1);
     wndClass.lpszClassName = ANIMATE_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -330 +330 @@
 {
     if (GlobalFindAtomA (ANIMATE_CLASSA))
-        UnregisterClassA (ANIMATE_CLASSA, (HINSTANCE)NULL);
-}
-
+        UnregisterClassA (ANIMATE_CLASSA, (HINSTANCE)NULL);
+}
+