From 688a20a68b55c9da0fcf72bf356d054144fc55d9 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 23 Oct 2008 17:26:50 +0000 Subject: [PATCH] Quickfix for bug 3808 Don't set SystemMetrics to -1, when there's no CurInfo. Apparently we initialize the metrics before we have a WindowStation. This code needs to be improved... See issue #3808 for more details. svn path=/trunk/; revision=36913 --- reactos/subsystems/win32/win32k/ntuser/metric.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntuser/metric.c b/reactos/subsystems/win32/win32k/ntuser/metric.c index 28eb9d99f8a..73c747ca4b3 100644 --- a/reactos/subsystems/win32/win32k/ntuser/metric.c +++ b/reactos/subsystems/win32/win32k/ntuser/metric.c @@ -85,7 +85,7 @@ InitMetrics(VOID) gpsi->SystemMetrics[SM_CYVSCROLL] = 16; gpsi->SystemMetrics[SM_CXHSCROLL] = 16; gpsi->SystemMetrics[SM_DEBUG] = 0; - gpsi->SystemMetrics[SM_SWAPBUTTON] = CurInfo ? CurInfo->SwapButtons : 0xFFFFFFFF; + gpsi->SystemMetrics[SM_SWAPBUTTON] = CurInfo ? CurInfo->SwapButtons : 0; gpsi->SystemMetrics[SM_RESERVED1] = 0; gpsi->SystemMetrics[SM_RESERVED2] = 0; gpsi->SystemMetrics[SM_RESERVED3] = 0; @@ -98,8 +98,8 @@ InitMetrics(VOID) gpsi->SystemMetrics[SM_CYFRAME] = 4; gpsi->SystemMetrics[SM_CXMINTRACK] = 112; gpsi->SystemMetrics[SM_CYMINTRACK] = 27; - gpsi->SystemMetrics[SM_CXDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 0xFFFFFFFF; - gpsi->SystemMetrics[SM_CYDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 0xFFFFFFFF; + gpsi->SystemMetrics[SM_CXDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 4; + gpsi->SystemMetrics[SM_CYDOUBLECLK] = CurInfo ? CurInfo->DblClickWidth : 4; gpsi->SystemMetrics[SM_CXICONSPACING] = 64; gpsi->SystemMetrics[SM_CYICONSPACING] = 64; gpsi->SystemMetrics[SM_MENUDROPALIGNMENT] = 0;