Changeset 7237 for trunk/src

Timestamp:

Oct 27, 2001, 12:30:11 PM (24 years ago)

Author:

sandervl

Message:

CreateIconIndirect bugfix

Location:

trunk/src/user32

Files:

• oslibres.cpp (modified) (2 diffs)
• winicon.cpp (modified) (2 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.28 2001-10-18 15:35:45 achimha Exp $ */
+/* $Id: oslibres.cpp,v 1.29 2001-10-27 10:30:10 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -447 +447 @@
                 goto fail;
         }
-// @@@AH 20011018 regression
-#if 0
         if(fCursor && pXorBmp->bmBitsPixel >= 8) 
-#else
-        if(pXorBmp->bmBitsPixel >= 8)
-#endif
         {
             if(isMonoBitmap(pXorBmp, (PBYTE)os2rgb) == TRUE) 

trunk/src/user32/winicon.cpp

@@ -1 @@
-/* $Id: winicon.cpp,v 1.32 2001-10-15 17:09:05 sandervl Exp $ */
+/* $Id: winicon.cpp,v 1.33 2001-10-27 10:30:11 sandervl Exp $ */
 /*
  * Win32 Icon Code for OS/2
@@ -227 +227 @@
 
 #ifdef __WIN32OS2__
-        info->hColorBmp = OSLibWinCreatePointer(info, (char*)(info + 1), (LPBITMAP_W)&bmpAnd, (char*)(info + 1) + sizeAnd, (LPBITMAP_W)&bmpXor, iconinfo->fIcon);
+        info->hColorBmp = OSLibWinCreatePointer(info, (char*)(info + 1), (LPBITMAP_W)&bmpAnd, (char*)(info + 1) + sizeAnd, (LPBITMAP_W)&bmpXor, iconinfo->fIcon == FALSE);
 #endif
         GlobalUnlock(hObj);