Changeset 397 for trunk/src/user32/new/oslibres.cpp

Timestamp:

Jul 26, 1999, 11:01:34 AM (26 years ago)

Author:

sandervl

Message:

* empty log message *

File:

• trunk/src/user32/new/oslibres.cpp (modified) (2 diffs)

trunk/src/user32/new/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.3 1999-07-25 20:00:52 cbratschi Exp $ */
+/* $Id: oslibres.cpp,v 1.4 1999-07-26 09:01:33 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -61 +61 @@
  HPS         hps;
 
+    if(iconbitmap == NULL) {
+        dprintf(("OSLibWinSetIcon %x %x: iconbitmap == NULL!!", hwnd, hIcon));
+        return 0;
+    }
     if(hIcon == 0) {
-            if (!iconbitmap) return 0; //CB: or load a default icon
-
-            //skip xor/and mask
-            bfh = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
-            hps = WinGetPS(hwnd);
-            hbmColor = GpiCreateBitmap(hps, &bfh->bmp2, CBM_INIT,
-                                       (char *)bafh + bfh->offBits,
-                                       (BITMAPINFO2 *)&bfh->bmp2);
-            if(hbmColor == GPI_ERROR) {
-                dprintf(("OSLibWinSetIcon: GpiCreateBitmap failed!"));
-                WinReleasePS(hps);
-                return 0;
-            }
-            hbmMask = GpiCreateBitmap(hps, &bafh->bfh2.bmp2, CBM_INIT,
-                                      (char *)bafh + bafh->bfh2.offBits,
-                                      (BITMAPINFO2 *)&bafh->bfh2.bmp2);
-            if(hbmMask == GPI_ERROR) {
-                dprintf(("OSLibWinSetIcon: GpiCreateBitmap hbmMask failed!"));
-                WinReleasePS(hps);
-                return 0;
-            }
-
-            pointerInfo.fPointer   = FALSE; //icon
-            pointerInfo.xHotspot   = bfh->xHotspot;
-            pointerInfo.yHotspot   = bfh->yHotspot;
-            pointerInfo.hbmColor   = hbmColor;
-            pointerInfo.hbmPointer = hbmMask;
-            hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &pointerInfo);
-            if(hIcon == NULL) {
-                dprintf(("WinSetIcon: WinCreatePointerIndirect failed!"));
-                GpiDeleteBitmap(hbmMask);
-                GpiDeleteBitmap(hbmColor);
-                WinReleasePS(hps);
-            }
+            //skip xor/and mask
+            bfh = (BITMAPFILEHEADER2 *)((char *)&bafh->bfh2 + sizeof(RGB2)*2 + sizeof(BITMAPFILEHEADER2));
+            hps = WinGetPS(hwnd);
+            hbmColor = GpiCreateBitmap(hps, &bfh->bmp2, CBM_INIT, 
+                                       (char *)bafh + bfh->offBits,
+                                       (BITMAPINFO2 *)&bfh->bmp2);
+            if(hbmColor == GPI_ERROR) {
+                dprintf(("OSLibWinSetIcon: GpiCreateBitmap failed!"));
+                WinReleasePS(hps);
+                return 0;
+            }
+            hbmMask = GpiCreateBitmap(hps, &bafh->bfh2.bmp2, CBM_INIT, 
+                                      (char *)bafh + bafh->bfh2.offBits,
+                                      (BITMAPINFO2 *)&bafh->bfh2.bmp2);
+            if(hbmMask == GPI_ERROR) {
+                dprintf(("OSLibWinSetIcon: GpiCreateBitmap hbmMask failed!"));
+                WinReleasePS(hps);
+                return 0;
+            }
+        
+            pointerInfo.fPointer   = FALSE; //icon
+            pointerInfo.xHotspot   = bfh->xHotspot;
+            pointerInfo.yHotspot   = bfh->yHotspot;
+            pointerInfo.hbmColor   = hbmColor;
+            pointerInfo.hbmPointer = hbmMask;
+            hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &pointerInfo);
+            if(hIcon == NULL) {
+                dprintf(("WinSetIcon: WinCreatePointerIndirect failed!"));
+                GpiDeleteBitmap(hbmMask);
+                GpiDeleteBitmap(hbmColor);
+                WinReleasePS(hps);
+            }
     }
     WinSendMsg(hwnd, WM_SETICON, (MPARAM)hIcon, 0);
+    WinReleasePS(hps);
     return hIcon;
 }