[WIn32k]
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 16 Dec 2012 14:37:45 +0000 (14:37 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sun, 16 Dec 2012 14:37:45 +0000 (14:37 +0000)
Fix the fix for Safe Mode (vide revision r57923).

svn path=/trunk/; revision=57925

reactos/win32ss/user/ntuser/sysparams.c

index 24f943c..8d63731 100644 (file)
@@ -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; \
     }