From afc06cbf845f6c5dfbda9870043694b15b7fdb21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 16 Dec 2012 14:37:45 +0000 Subject: [PATCH] [WIn32k] Fix the fix for Safe Mode (vide revision r57923). svn path=/trunk/; revision=57925 --- reactos/win32ss/user/ntuser/sysparams.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/reactos/win32ss/user/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c index 24f943c4fe2..8d637317375 100644 --- a/reactos/win32ss/user/ntuser/sysparams.c +++ b/reactos/win32ss/user/ntuser/sysparams.c @@ -25,18 +25,16 @@ BOOL g_PaintDesktopVersion = FALSE; #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ - if (GetW32ProcessInfo()->prpwinsta) \ + if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ - if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ + if (GetW32ProcessInfo()->prpwinsta == NULL) \ + { \ + ERR("NtUserSystemParametersInfo called without active window station, and it requires an interactive one\n"); \ + } \ + else \ { \ ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ - EngSetLastError(err); \ - return 0; \ } \ - } \ - else \ - { \ - ERR("NtUserSystemParametersInfo called without active window station, and it requires an interactive one.\n"); \ EngSetLastError(err); \ return 0; \ } -- 2.17.1