From 07bd1ef0d2d393affa8e5a51ee45926709feac05 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Tue, 10 Jun 2008 21:09:31 +0000 Subject: [PATCH] Use server information for GetSystemMetrics. svn path=/trunk/; revision=33920 --- reactos/dll/win32/user32/misc/desktop.c | 3 +++ reactos/subsystems/win32/win32k/ntuser/ntuser.c | 12 +++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/user32/misc/desktop.c b/reactos/dll/win32/user32/misc/desktop.c index 0ebd88ce217..bd7f9abf58e 100644 --- a/reactos/dll/win32/user32/misc/desktop.c +++ b/reactos/dll/win32/user32/misc/desktop.c @@ -99,6 +99,9 @@ LogFontW2A(LPLOGFONTA pA, CONST LOGFONTW *pW) 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)); } diff --git a/reactos/subsystems/win32/win32k/ntuser/ntuser.c b/reactos/subsystems/win32/win32k/ntuser/ntuser.c index 25dc1ce0cf0..2a04db43b82 100644 --- a/reactos/subsystems/win32/win32k/ntuser/ntuser.c +++ b/reactos/subsystems/win32/win32k/ntuser/ntuser.c @@ -57,9 +57,15 @@ NTSTATUS FASTCALL InitUserImpl(VOID) 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; }