Changeset 6348 for trunk/src

Timestamp:

Jul 16, 2001, 9:32:55 PM (24 years ago)

Author:

sandervl

Message:

allocate more memory for GpiCreateBitmap (icon)

Location:

trunk/src/user32

Files:

• loadres.cpp (modified) (4 diffs)
• oslibres.cpp (modified) (2 diffs)

trunk/src/user32/loadres.cpp

@@ -1 @@
-/* $Id: loadres.cpp,v 1.37 2001-05-25 10:04:59 sandervl Exp $ */
+/* $Id: loadres.cpp,v 1.38 2001-07-16 19:32:55 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
         }
         else
-            *buffer = 0;
+            *buffer = 0; //NT4, SP6 clears first character
         HeapFree( GetProcessHeap(), 0, buffer2 );
     }
@@ -69 +69 @@
     hRes = FindResourceW(hinst, (LPWSTR)(((wID>>4)&0xffff)+1), RT_STRINGW);
     if(hRes == NULL) {
-        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer));
-        *lpBuffer = 0;
+        dprintf(("LoadStringW NOT FOUND from %X, id %d buffersize %d\n", hinst, wID, cchBuffer)); 
+        *lpBuffer = 0;  //NT4, SP6 clears first character
         return 0;
     }
@@ -88 +88 @@
         else {
                 if (cchBuffer > 1) {
-                        lpBuffer[0] = (WCHAR) 0;
+                        lpBuffer[0] = (WCHAR) 0;  //NT4, SP6 clears first character
                         return 0;
                 }

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.15 2001-07-04 09:55:17 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.16 2001-07-16 19:32:55 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -246 +246 @@
 
     hps = WinGetScreenPS(HWND_DESKTOP);
-    masksize = sizeof(BITMAPINFO2) + (pAndBmp->bmHeight * 2 * pAndBmp->bmWidthBytes) + 2*sizeof(RGB2);
+    //SvL: 2*sizeof(RGB2) is enough, but GpiCreateBitmap seems to touch more
+    //     memory. (Adobe Photoshop 6 running in the debugger)
+    masksize = sizeof(BITMAPINFO2) + (pAndBmp->bmHeight * 2 * pAndBmp->bmWidthBytes) + 16*sizeof(RGB2);
     pBmpMask = (BITMAPINFO2 *)malloc(masksize);
     if(pBmpMask == NULL) {