Changeset 132 for trunk/src/helpers/comctl.c

Timestamp:

Jan 19, 2002, 11:50:39 AM (24 years ago)

Author:

umoeller

Message:

Misc changes.

File:

• trunk/src/helpers/comctl.c (modified) (5 diffs)

trunk/src/helpers/comctl.c

@@ -977 +977 @@
  */
 
-PANIMATIONDATA CreateAnimationData(HWND hwndStatic,
+PANIMATIONDATA CreateAnimationData(HAB hab,
+                                   HWND hwndStatic,
                                    USHORT cAnimations)
 {
@@ -996 +997 @@
             WinSetWindowULong(hwndStatic, QWL_USER, (ULONG)pa);
 
-            pa->hab = WinQueryAnchorBlock(hwndStatic);
+            pa->hab = hab;
             WinQueryWindowRect(hwndStatic, &pa->rclIcon);
             pa->OldStaticProc = WinSubclassWindow(hwndStatic, ctl_fnwpBitmapStatic);
@@ -1046 +1047 @@
 {
     PANIMATIONDATA pa;
-
-    if (pa = CreateAnimationData(hwndStatic,
-                                 usAnimCount))
+    HAB     hab;
+    if (    (hwndStatic)
+         && (hab = WinQueryAnchorBlock(hwndStatic))
+         && (WinIsWindow(hab, hwndStatic))
+         && (pa = CreateAnimationData(hab,
+                                      hwndStatic,
+                                      usAnimCount))
+       )
     {
         // switch static to icon mode
         pa->ulFlags = ANF_ICON;
+        return (pa);
     }
 
-    return (pa);
+    return (NULL);
 }
 
@@ -1233 +1240 @@
 {
     PANIMATIONDATA pa;
-
-    if (pa = CreateAnimationData(hwndStatic, 1))
+    HAB hab;
+    if (    (hwndStatic)
+         && (hab = WinQueryAnchorBlock(hwndStatic))
+         && (WinIsWindow(hab, hwndStatic))
+         && (pa = CreateAnimationData(hab, hwndStatic, 1))
+       )
     {
         // switch static to bitmap mode
@@ -1240 +1251 @@
         if (fPreserveProportions)
             pa->ulFlags |= ANF_PROPORTIONAL;
+        return (pa);
     }
 
-    return (pa);
+    return NULL;
 }