Changeset 3126 for trunk/src/gdi32/dibitmap.cpp

Timestamp:

Mar 16, 2000, 8:18:14 PM (25 years ago)

Author:

sandervl

Message:

CreateDIBSection fix (hdc==0)

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (5 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.4 2000-02-16 14:18:09 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.5 2000-03-16 19:18:14 sandervl Exp $ */
 
 /*
@@ -48 +48 @@
 //******************************************************************************
 //******************************************************************************
-HBITMAP WIN32API CreateCompatibleBitmap( HDC arg1, int arg2, int  arg3)
-{
-    dprintf(("GDI32: CreateCompatibleBitmap\n"));
-    return O32_CreateCompatibleBitmap(arg1, arg2, arg3);
+HBITMAP WIN32API CreateCompatibleBitmap( HDC hdc, int nWidth, int nHeight)
+{
+    dprintf(("GDI32: CreateCompatibleBitmap %x (%d,%d)", hdc, nWidth, nHeight));
+    return O32_CreateCompatibleBitmap(hdc, nWidth, nHeight);
 }
 //******************************************************************************
@@ -87 +87 @@
  BOOL    fFlip = 0;
  int     iHeight, iWidth;
+ BOOL    fCreateDC = FALSE;
 
   dprintf(("GDI32: CreateDIBSection %x %x %x %x %d", hdc, iUsage, ppvBits, hSection, dwOffset));
@@ -106 +107 @@
   }
 
+  //SvL: RP7 (update) calls this api with hdc == 0
+  if(hdc == 0) {
+        hdc = GetWindowDC(GetDesktopWindow());
+        fCreateDC = TRUE;
+  }
   res = O32_CreateDIBitmap(hdc, &pbmi->bmiHeader, 0, NULL, pbmi, iUsage);
   if (res)
@@ -150 +156 @@
       pbmi->bmiHeader.biHeight = iHeight;
 
+      if(fCreateDC)     ReleaseDC(GetDesktopWindow(), hdc);
       return(res);
     }
   }
+  if(fCreateDC) ReleaseDC(GetDesktopWindow(), hdc);
 
   /* Error.  */