commit 2a2321bbca3ef72649dc34a185bc6f7cef4a58fa
author Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
tree 4d6b9768a706f9aca41ae05b8b8d1e65d49977f0
parent 9fcb4f551e680e90168131ba4c2a85f8a773bb86

Authors: Alexandre Julliard <julliard@codeweavers.com> (for Corel), Albert den Haan <albertd@corel.com>
Added syslevel locking for GDI operations.
Propagate the changes through the graphics code.

windows/user.c

diff --git a/windows/user.c b/windows/user.c
index 4cfa2e1..3eea645 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -12,7 +12,6 @@
 #include "winuser.h"
 #include "heap.h"
 #include "user.h"
-#include "gdi.h"
 #include "task.h"
 #include "queue.h"
 #include "class.h"
@@ -43,8 +42,13 @@
  */
 WORD WINAPI GetFreeSystemResources16( WORD resType )
 {
+    HINSTANCE16 gdi_inst;
+    WORD gdi_heap;
     int userPercent, gdiPercent;
 
+    if ((gdi_inst = LoadLibrary16( "GDI" )) < 32) return 0;
+    gdi_heap = GlobalHandleToSel16( gdi_inst );
+
     switch(resType)
     {
     case GFSR_USERRESOURCES:
@@ -54,21 +58,23 @@
         break;
 
     case GFSR_GDIRESOURCES:
-        gdiPercent  = (int)LOCAL_CountFree( GDI_HeapSel ) * 100 /
-                               LOCAL_HeapSize( GDI_HeapSel );
+        gdiPercent  = (int)LOCAL_CountFree( gdi_inst ) * 100 /
+                               LOCAL_HeapSize( gdi_inst );
         userPercent = 100;
         break;
 
     case GFSR_SYSTEMRESOURCES:
         userPercent = (int)LOCAL_CountFree( USER_HeapSel ) * 100 /
                                LOCAL_HeapSize( USER_HeapSel );
-        gdiPercent  = (int)LOCAL_CountFree( GDI_HeapSel ) * 100 /
-                               LOCAL_HeapSize( GDI_HeapSel );
+        gdiPercent  = (int)LOCAL_CountFree( gdi_inst ) * 100 /
+                               LOCAL_HeapSize( gdi_inst );
         break;
 
     default:
-        return 0;
+        userPercent = gdiPercent = 0;
+        break;
     }
+    FreeLibrary16( gdi_inst );
     return (WORD)min( userPercent, gdiPercent );
 }