[ros-diffs] [jimtabor] 33920: Use server information for GetSystemMetrics.

Author: jimtabor
Date: Tue Jun 10 16:09:31 2008
New Revision: 33920

URL: http://svn.reactos.org/svn/reactos?rev=33920&view=rev
Log:
Use server information for GetSystemMetrics.

Modified:
    trunk/reactos/dll/win32/user32/misc/desktop.c
    trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c

Modified: trunk/reactos/dll/win32/user32/misc/desktop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/desk…
==============================================================================
--- trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/misc/desktop.c [iso-8859-1] Tue Jun 10 16:09:31 2008
@@ -99,6 +99,9 @@
 int STDCALL
 GetSystemMetrics(int nIndex)
 {
+//  FIXME("Global Sever Data -> %x\n",g_psi);
+  if (g_psi) return g_psi->SystemMetrics[nIndex];
+  else
   return(NtUserGetSystemMetrics(nIndex));
 }
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Tue Jun 10 16:09:31
2008
@@ -57,9 +57,15 @@
       return Status;
    }
 
-   gpsi = UserHeapAlloc(sizeof(SERVERINFO));
-   if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO));
-
+   if (!gpsi)
+   {
+      gpsi = UserHeapAlloc(sizeof(SERVERINFO));
+      if (gpsi)
+      {
+         RtlZeroMemory(gpsi, sizeof(SERVERINFO));
+         DPRINT1("Gloabal Server Data -> %x\n", gpsi);
+      }
+   }
    return STATUS_SUCCESS;
 }