Changeset 4689 for trunk/src/user32/winicon.cpp

Timestamp:

Nov 24, 2000, 2:16:26 PM (25 years ago)

Author:

sandervl

Message:

CopyIcon fix

File:

• trunk/src/user32/winicon.cpp (modified) (5 diffs)

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.17 2000-11-22 21:04:32 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.18 2000-11-24 13:16:26 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -900 +900 @@
             GlobalUnlock( Handle );
             if(dwResGroupId == -1) {
+                //todo: if scaling is necessary..
                 dprintf(("WARNING: no resource associated with icon/cursor -> copy without scaling!"));
                 hNew = CURSORICON_Copy(Handle);
@@ -917 +918 @@
             */
             hRsrc = FindResourceW(hInstance, (LPWSTR)dwResGroupId, bIsIcon ? RT_GROUP_ICONW : RT_GROUP_CURSORW);
-            if(!hRsrc)  return 0;
+            if(!hRsrc)  {
+                goto notfound;
+            }
 
             if (!(hMem = LoadResource( hInstance, hRsrc)))
             {
-                return 0;
+                goto notfound;
             }
             if (!(pDir = (CURSORICONDIR*)LockResource( hMem )))
             {
-                return 0;
+                goto notfound;
             }
 
@@ -950 +953 @@
                 MAKEINTRESOURCEW(wResId), bIsIcon ? RT_ICONW : RT_CURSORW)))
             {
-                return 0;
+                goto notfound;
             }
             if (!(hMem = LoadResource( hInstance, hRsrc )))
             {
-                return 0;
+                goto notfound;
             }
 
@@ -975 +978 @@
             hNew = CURSORICON_Copy(Handle);
     }
+    return hNew;
+
+notfound:
+    dprintf(("WARNING: unable to find resource associated with icon/cursor -> copy without scaling!"));
+    hNew = CURSORICON_Copy(Handle);
     return hNew;
 }