[USER32] Fix the previous commit based on the suggested comments

julenuri · May 16, 2024 · 27df753 · 27df753
1 parent e1b1dbe
commit 27df753
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/win32ss/user/user32/windows/cursoricon.c b/win32ss/user/user32/windows/cursoricon.c
@@ -2025,17 +2025,21 @@ HANDLE WINAPI CopyImage(
 {
     TRACE("hImage=%p, uType=%u, cxDesired=%d, cyDesired=%d, fuFlags=%x\n",
         hImage, uType, cxDesired, cyDesired, fuFlags);
-    HANDLE handle;
     switch(uType)
     {
         case IMAGE_BITMAP:
             return BITMAP_CopyImage(hImage, cxDesired, cyDesired, fuFlags);
         case IMAGE_CURSOR:
         case IMAGE_ICON:
-            handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags);
-            if(handle == NULL && (fuFlags & (LR_COPYFROMRESOURCE|LR_COPYRETURNORG)))
+     /* HACK: Returning the old bitmap in LR_COPYFROMRESOURCE caused
+     * failure, so this is a way to return original bit map it if we want
+     * the icons to show up. Look at CORE-17902. We need a simpler test. */
+        {
+            HANDLE handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, fuFlags);
+            if (!handle && (fuFlags & (LR_COPYFROMRESOURCE|LR_COPYRETURNORG)))
                 handle = CURSORICON_CopyImage(hImage, uType == IMAGE_ICON, cxDesired, cyDesired, (fuFlags & ~LR_COPYFROMRESOURCE));
             return handle;
+        }
         default:
             SetLastError(ERROR_INVALID_PARAMETER);
             break;