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

Timestamp:

Mar 31, 2001, 3:25:59 PM (24 years ago)

Author:

sandervl

Message:

Resync with Wine + previous merge fixes

File:

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

trunk/src/comctl32/animate.c

@@ -30 +30 @@
 typedef struct
 {
+#ifdef __WIN32OS2__
+    COMCTL32_HEADER header;
+#endif
+
    /* pointer to msvideo functions. it's easier to put them here.
     * to be correct, they should be defined on a per process basis, but
@@ -819 +823 @@
 
     /* allocate memory for info structure */
+#ifdef __WIN32OS2__
+    infoPtr = (ANIMATE_INFO*)initControl(hWnd,sizeof(ANIMATE_INFO));
+#else
     infoPtr = (ANIMATE_INFO *)COMCTL32_Alloc(sizeof(ANIMATE_INFO));
+#endif
     if (!infoPtr) {
         ERR("could not allocate info memory!\n");