Changeset 6163 for trunk/src

Timestamp:

Jul 4, 2001, 10:03:55 AM (24 years ago)

Author:

sandervl

Message:

workaround for 16 bits gdi handles

Location:

trunk/src/gdi32

Files:

• dibitmap.cpp (modified) (2 diffs)
• objhandle.cpp (modified) (7 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.23 2001-06-13 10:29:05 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.24 2001-07-04 08:03:54 sandervl Exp $ */
 
 /*
@@ -139 +139 @@
 //******************************************************************************
 //******************************************************************************
-HBITMAP WIN32API CreateBitmapIndirect( const BITMAP * arg1)
-{
-    dprintf(("GDI32: CreateBitmapIndirect"));
-    return O32_CreateBitmapIndirect(arg1);
+HBITMAP WIN32API CreateBitmapIndirect( const BITMAP *pBitmap)
+{
+    HBITMAP hBitmap;
+
+    dprintf(("GDI32: CreateBitmapIndirect (%d,%d) bpp %d bits %x", pBitmap->bmWidth, pBitmap->bmHeight, pBitmap->bmBitsPixel, pBitmap->bmBits));
+    hBitmap = O32_CreateBitmapIndirect(pBitmap);
+    dprintf(("GDI32: CreateBitmapIndirect returned %x", hBitmap));
+    return hBitmap;
 }
 //******************************************************************************

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.13 2001-04-04 09:02:15 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.14 2001-07-04 08:03:55 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -29 +29 @@
 #include "dbglocal.h"
 
+//TODO: must use 16 bits gdi object handles
+#define GDIOBJ_PREFIX 0xe7000000
+
 //******************************************************************************
 
@@ -142 +145 @@
 
   dprintf(("GDI32: GetObject %X %X %X\n", hObject, size, lpBuffer));
+  //TODO: must use 16 bits gdi object handles
+  if(HIWORD(hObject) == 0) {
+        hObject |= GDIOBJ_PREFIX;
+  }
   if(lpBuffer == NULL)
   { //return required size if buffer pointer == NULL
@@ -200 +207 @@
 
   dprintf(("GDI32: GetObjectW %X, %d %X", hObject, size, lpBuffer));
+
+  //TODO: must use 16 bits gdi object handles
+  if(HIWORD(hObject) == 0) {
+        hObject |= GDIOBJ_PREFIX;
+  }
   objtype = GetObjectType(hObject);
 
@@ -237 +249 @@
 {
  HGDIOBJ rc;
- DWORD   handleType = GetObjectType(hObj);
+ DWORD   handleType;
 
     dprintf2(("GDI32: SelectObject %x %x type %x", hdc, hObj, handleType));
 
+    //TODO: must use 16 bits gdi object handles
+    if(HIWORD(hObj) == 0) {
+        hObj |= GDIOBJ_PREFIX;
+    }
+
+    handleType = GetObjectType(hObj);
     if(handleType == GDIOBJ_REGION) {
         //Return complexity here; not previously selected clip region
@@ -306 +324 @@
 {
     dprintf2(("GDI32: GetObjectType %x", hObj));
+    //TODO: must use 16 bits gdi object handles
+    if(HIWORD(hObj) == 0) {
+        hObj |= GDIOBJ_PREFIX;
+    }
     if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
         SetLastError(ERROR_SUCCESS);
@@ -321 +343 @@
     dprintf(("GDI32: DeleteObject %x", hObj));
 
+    //TODO: must use 16 bits gdi object handles
+    if(HIWORD(hObj) == 0) {
+        hObj |= GDIOBJ_PREFIX;
+    }
     //System objects can't be deleted (TODO: any others?? (fonts?))!!!!)
     type = GetObjectType(hObj);