Changeset 7330 for trunk/src

Timestamp:

Nov 13, 2001, 4:42:19 PM (24 years ago)

Author:

sandervl

Message:

refuse DeleteObject for DEFAULT_GUI_FONT handle

Location:

trunk/src/gdi32

Files:

• font.cpp (modified) (2 diffs)
• font.h (added)
• gdi32.cpp (modified) (3 diffs)
• objhandle.cpp (modified) (3 diffs)

trunk/src/gdi32/font.cpp

@@ -1 @@
-/* $Id: font.cpp,v 1.20 2001-07-16 20:17:39 sandervl Exp $ */
+/* $Id: font.cpp,v 1.21 2001-11-13 15:42:05 sandervl Exp $ */
 
 /*
@@ -143 +143 @@
 }
 
-
+//******************************************************************************
+HFONT hFntDefaultGui = NULL;
+//TODO: more??
+//******************************************************************************
+BOOL WIN32API IsSystemFont(HFONT hFont)
+{
+    if(hFont == hFntDefaultGui) {
+        return TRUE;
+    }
+    return FALSE;
+}
 //******************************************************************************
 //******************************************************************************

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.75 2001-08-02 14:49:31 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.76 2001-11-13 15:42:05 sandervl Exp $ */
 
 /*
@@ -24 +24 @@
 #include <dcdata.h>
 #include <winuser32.h>
+#include "font.h"
 
 #define DBG_LOCALLOG    DBG_gdi32
@@ -51 +52 @@
 //******************************************************************************
 //******************************************************************************
-
-static hFntDefaultGui = NULL;
 HGDIOBJ WIN32API GetStockObject(int arg1)
 {

trunk/src/gdi32/objhandle.cpp

@@ -1 @@
-/* $Id: objhandle.cpp,v 1.18 2001-09-19 15:38:42 sandervl Exp $ */
+/* $Id: objhandle.cpp,v 1.19 2001-11-13 15:42:06 sandervl Exp $ */
 /*
  * Win32 Handle Management Code for OS/2
@@ -25 +25 @@
 #include "region.h"
 #include <unicode.h>
+#include "font.h"
 
 #define DBG_LOCALLOG    DBG_objhandle
@@ -372 +373 @@
                 break;
 
+        case OBJ_FONT:
+            if(IsSystemFont(hObj))
+            {
+                SetLastError(ERROR_SUCCESS);
+                return TRUE;
+            }
+            else
+                break;
+            
         // add more system-type objects as required ...
     }