Changeset 4533 for trunk/src/gdi32/objhandle.cpp

Timestamp:

Oct 26, 2000, 7:20:29 PM (25 years ago)

Author:

sandervl

Message:

GetObjectA/W fixes

File:

• trunk/src/gdi32/objhandle.cpp (modified) (16 diffs)

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.4 2000-09-08 18:06:32 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.5 2000-10-26 17:20:29 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -8 +8 @@
  *
  * TODO: The table should be dynamically increased when necessary
- *       This is just a quick and dirty implementation 
- * 
+ *       This is just a quick and dirty implementation
+ *
  * Project Odin Software License can be found in LICENSE.TXT
  *
@@ -15 +15 @@
 
 #include <os2win.h>
+#include <stdlib.h>
+#include <string.h>
 #include <vmutex.h>
 #include <objhandle.h>
@@ -20 +22 @@
 #include "region.h"
 
-#define DBG_LOCALLOG    DBG_objhandle
+#define DBG_LOCALLOG    DBG_objhandle
 #include "dbglocal.h"
 
@@ -35 +37 @@
   objTableMutex.enter(VMUTEX_WAIT_FOREVER);
   if(lowestFreeIndex == -1) {
-        //oops, out of handles
-        dprintf(("ERROR: GDI: HwAllocateWindowHandle OUT OF GDI OBJECT HANDLES!!"));
-        objTableMutex.leave();
-        DebugInt3();
-        return FALSE;
+    //oops, out of handles
+    dprintf(("ERROR: GDI: HwAllocateWindowHandle OUT OF GDI OBJECT HANDLES!!"));
+    objTableMutex.leave();
+    DebugInt3();
+    return FALSE;
   }
   *hObject  = lowestFreeIndex;
@@ -49 +51 @@
   //find next free handle
   for(int i=0;i<MAX_OBJECT_HANDLES;i++) {
-        if(objHandleTable[i] == 0) {
-                lowestFreeIndex = i;
-                break;
-        }
+    if(objHandleTable[i] == 0) {
+        lowestFreeIndex = i;
+        break;
+    }
   }
   objTableMutex.leave();
@@ -63 +65 @@
   hObject &= OBJHANDLE_MAGIC_MASK;
   if(hObject < MAX_OBJECT_HANDLES) {
-        objTableMutex.enter(VMUTEX_WAIT_FOREVER);
-        objHandleTable[hObject] = 0;
-        if(lowestFreeIndex == -1 || hObject < lowestFreeIndex) 
-                lowestFreeIndex = hObject;
-
-        objTableMutex.leave();
+    objTableMutex.enter(VMUTEX_WAIT_FOREVER);
+    objHandleTable[hObject] = 0;
+    if(lowestFreeIndex == -1 || hObject < lowestFreeIndex)
+        lowestFreeIndex = hObject;
+
+    objTableMutex.leave();
   }
 }
@@ -78 +80 @@
   {
   case GDIOBJ_REGION:
-        break;
+    break;
   //case GDIOBJ_BITMAP
   //case GDIOBJ_BRUSH
@@ -84 +86 @@
   //case GDIOBJ_FONT
   default:
-        return HANDLE_OBJ_ERROR;
+    return HANDLE_OBJ_ERROR;
   }
 
   hObject &= OBJHANDLE_MAGIC_MASK;
   if(hObject < MAX_OBJECT_HANDLES) {
-        return objHandleTable[hObject];
+    return objHandleTable[hObject];
   }
   return HANDLE_OBJ_ERROR;
@@ -100 +102 @@
   {
   case GDIOBJ_REGION:
-        return GDIOBJ_REGION;
+    return GDIOBJ_REGION;
   //case GDIOBJ_BITMAP
   //case GDIOBJ_BRUSH
@@ -106 +108 @@
   //case GDIOBJ_FONT
   default:
-        return GDIOBJ_ERROR;
+    return GDIOBJ_ERROR;
   }
 }
@@ -115 +117 @@
  int rc;
 
-  if(size == 0 || lpBuffer == NULL) {
-        SetLastError(ERROR_INVALID_PARAMETER);
+  dprintf(("GDI32: GetObject %X %X %X\n", hObject, size, lpBuffer));
+  if(lpBuffer == NULL)
+  { //return required size if buffer pointer == NULL
+    int objtype = GetObjectType(hObject);
+    switch(objtype)
+    {
+    case OBJ_PEN:
+        return sizeof(LOGPEN);
+
+    case OBJ_EXTPEN:
+        return sizeof(EXTLOGPEN);
+
+    case OBJ_BRUSH:
+        return sizeof(LOGBRUSH);
+
+    case OBJ_PAL:
+        return sizeof(USHORT);
+
+    case OBJ_FONT:
+        return sizeof(LOGFONTA);
+
+    case OBJ_BITMAP:
+        return sizeof(BITMAP); //also default for dib sections??? (TODO: NEED TO CHECK THIS)
+
+    case OBJ_DC:
+    case OBJ_METADC:
+    case OBJ_REGION:
+    case OBJ_METAFILE:
+    case OBJ_MEMDC:
+    case OBJ_ENHMETADC:
+    case OBJ_ENHMETAFILE:
+        dprintf(("warning: GetObjectA not defined for object type %d", objtype));
         return 0;
-  }
-
-  if(ObjGetHandleType(hObject) == GDIOBJ_REGION) {
-        SetLastError(ERROR_SUCCESS);
-        return 0;
-  }
-  dprintf(("GDI32: GetObject %X %X %X\n", hObject, size, lpBuffer));
+    }
+  }
   if(DIBSection::getSection() != NULL)
   {
@@ -144 +171 @@
 //******************************************************************************
 //******************************************************************************
-int WIN32API GetObjectW( HGDIOBJ arg1, int arg2, void *  arg3)
-{
-  dprintf(("GDI32: GetObjectW %X, %d %X not complete!", arg1, arg2, arg3));
-  return GetObjectA(arg1, arg2, arg3);
+int WIN32API GetObjectW( HGDIOBJ hObject, int size, void *lpBuffer)
+{
+ int ret, objtype;
+
+  dprintf(("GDI32: GetObjectW %X, %d %X", hObject, size, lpBuffer));
+  objtype = GetObjectType(hObject);
+
+  switch(objtype)
+  {
+  case OBJ_FONT:
+  {
+    LOGFONTA logfonta;
+
+        if(lpBuffer == NULL) {
+            return sizeof(LOGFONTW); //return required size if buffer pointer == NULL
+        }
+        ret = GetObjectA(hObject, sizeof(logfonta), (void *)&logfonta);
+        if(ret == sizeof(logfonta))
+        {
+            LOGFONTW *logfontw = (LOGFONTW *)lpBuffer;
+
+            if(size < sizeof(LOGFONTW)) {
+                dprintf(("GDI32: GetObjectW : buffer not big enough for LOGFONTW struct!!")); //is the correct? or copy only part?
+                return 0;
+            }
+            memcpy(logfontw, &logfonta, sizeof(LOGFONTA));
+            memset(logfontw->lfFaceName, 0, LF_FACESIZE);
+            AsciiToUnicodeN(logfonta.lfFaceName, logfontw->lfFaceName, LF_FACESIZE-1);
+
+            return sizeof(LOGFONTW);
+        }
+        return 0;
+  }
+  default:
+      return GetObjectA(hObject, size, lpBuffer);
+  }
 }
 //******************************************************************************
@@ -158 +217 @@
 
     if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
-        //Return complexity here; not previously selected clip region
-        return (HGDIOBJ)SelectClipRgn(hdc, hObj);
+    //Return complexity here; not previously selected clip region
+        return (HGDIOBJ)SelectClipRgn(hdc, hObj);
     }
 
@@ -196 +255 @@
   if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
         SetLastError(ERROR_SUCCESS);
-        return OBJ_REGION;
+    return OBJ_REGION;
   }
   return O32_GetObjectType(hObj);
@@ -206 +265 @@
   dprintf(("GDI32: DeleteObject %x", hObj));
   if(ObjGetHandleType(hObj) == GDIOBJ_REGION) {
-        OSLibDeleteRegion(ObjGetHandleData(hObj));
-        ObjFreeHandle(hObj);
+    OSLibDeleteRegion(ObjGetHandleData(hObj));
+    ObjFreeHandle(hObj);
         SetLastError(ERROR_SUCCESS);
-        return OBJ_REGION;
+    return OBJ_REGION;
   }
   DIBSection::deleteSection((DWORD)hObj);