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

Timestamp:

Nov 19, 2000, 12:51:48 PM (25 years ago)

Author:

sandervl

Message:

Resynched with Christoph's changes for unicode handling

File:

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

trunk/src/comctl32/animate.c

@@ -22 +22 @@
 #include "services.h"
 #include "debugtools.h"
+#ifdef __WIN32OS2__
+#include "ccbase.h"
+#endif
 
 DEFAULT_DEBUG_CHANNEL(animate);
@@ -40 +43 @@
 
     HMMIO (* WINAPI fnmmioOpenA)(LPSTR,MMIOINFO*,DWORD);
+    HMMIO (* WINAPI fnmmioOpenW)(LPSTR,MMIOINFO*,DWORD);
     MMRESULT (* WINAPI fnmmioClose)(HMMIO,UINT);
     UINT  (* WINAPI fnmmioAscend)(HMMIO,MMCKINFO*,UINT);
@@ -100 +104 @@
 }
 
+#ifdef __WIN32OS2__
+static BOOL ANIMATE_LoadRes(ANIMATE_INFO *infoPtr,HINSTANCE hInst,LPWSTR lpName,BOOL unicode)
+#else
 static BOOL ANIMATE_LoadResA(ANIMATE_INFO *infoPtr, HINSTANCE hInst, LPSTR lpName)
+#endif
 {
     HRSRC   hrsrc;
@@ -106 +114 @@
     LPVOID  lpAvi;
 
+#ifdef __WIN32OS2__
+    if (unicode)
+      hrsrc = FindResourceW(hInst,lpName,(LPWSTR)L"AVI");
+    else
+      hrsrc = FindResourceA(hInst,(LPCSTR)lpName,"AVI");
+#else
     hrsrc = FindResourceA(hInst, lpName, "AVI");
+#endif
     if (!hrsrc)
     return FALSE;
@@ -133 +148 @@
 
 
+#ifdef __WIN32OS2__
+static BOOL ANIMATE_LoadFile(ANIMATE_INFO *infoPtr,LPWSTR lpName,BOOL unicode)
+#else
 static BOOL ANIMATE_LoadFileA(ANIMATE_INFO *infoPtr, LPSTR lpName)
-{
+#endif
+{
+#ifdef __WIN32OS2__
+    if (unicode)
+      infoPtr->hMMio = infoPtr->fnmmioOpenW(lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+    else
+      infoPtr->hMMio = infoPtr->fnmmioOpenA((LPSTR)lpName,NULL,MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+#else
     infoPtr->hMMio = infoPtr->fnmmioOpenA((LPSTR)lpName, NULL,
                    MMIO_ALLOCBUF | MMIO_READ | MMIO_DENYWRITE);
+#endif
 
     if (!infoPtr->hMMio)
@@ -684 +710 @@
 }
 
+#ifdef __WIN32OS2__
+static LRESULT ANIMATE_Open(HWND hWnd, WPARAM wParam, LPARAM lParam,BOOL unicode)
+#else
 static LRESULT ANIMATE_OpenA(HWND hWnd, WPARAM wParam, LPARAM lParam)
+#endif
 {
     ANIMATE_INFO *infoPtr = ANIMATE_GetInfoPtr(hWnd);
@@ -702 +732 @@
     TRACE("(\"%s\");\n", (LPSTR)lParam);
 
+#ifdef __WIN32OS2__
+    if (HIWORD(lParam)) {
+        //TRACE("(\"%s\");\n", (LPSTR)lParam);
+
+        if (!ANIMATE_LoadRes(infoPtr, hInstance, (LPWSTR)lParam,unicode)) {
+            //TRACE("No AVI resource found!\n");
+            if (!ANIMATE_LoadFile(infoPtr, (LPWSTR)lParam,unicode)) {
+                //WARN("No AVI file found!\n");
+                return FALSE;
+            }
+        }
+    } else {
+        //TRACE("(%u);\n", (WORD)LOWORD(lParam));
+
+        if (!ANIMATE_LoadRes(infoPtr,hInstance,unicode ? MAKEINTRESOURCEW((INT)lParam):(LPWSTR)MAKEINTRESOURCEA((INT)lParam),unicode)) {
+            //WARN("No AVI resource found!\n");
+            return FALSE;
+        }
+    }
+#else
     if (!ANIMATE_LoadResA(infoPtr, hInstance, (LPSTR)lParam)) {
         TRACE("No AVI resource found!\n");
@@ -717 +767 @@
         return FALSE;
     }
+#endif
     }
 
@@ -790 +841 @@
 
     infoPtr->fnmmioOpenA = (void*)GetProcAddress(hModWinmm, "mmioOpenA");
+#ifdef __WIN32OS2__
+    infoPtr->fnmmioOpenW = (void*)GetProcAddress(hModWinmm, "mmioOpenW");
+#endif
     infoPtr->fnmmioClose = (void*)GetProcAddress(hModWinmm, "mmioClose");
     infoPtr->fnmmioAscend = (void*)GetProcAddress(hModWinmm, "mmioAscend");
@@ -850 +904 @@
     switch (uMsg)
     {
+#ifdef __WIN32OS2__
+        case ACM_OPENA:
+          return ANIMATE_Open(hWnd,wParam,lParam,FALSE);
+
+        case ACM_OPENW:
+          return ANIMATE_Open(hWnd,wParam,lParam,TRUE);
+#else
     case ACM_OPENA:
     return ANIMATE_OpenA(hWnd, wParam, lParam);
@@ -855 +916 @@
     /*  case ACM_OPEN32W: FIXME!! */
     /*      return ANIMATE_Open32W(hWnd, wParam, lParam); */
+#endif
 
     case ACM_PLAY:
@@ -932 +994 @@
         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);
+#endif
     }
     return 0;