[ros-diffs] 12/18: [WIN32K:NTUSER] Code style fixes only.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83104d9f00ba8a7442391…

commit 83104d9f00ba8a74423917f4fae3e198f2f148b0
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sun Jul 22 20:32:12 2018 +0200
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Sun Aug 19 22:18:36 2018 +0200

    [WIN32K:NTUSER] Code style fixes only.
---
 win32ss/user/ntuser/desktop.c   | 22 +++++++++++-----------
 win32ss/user/ntuser/sysparams.c |  6 ++++--
 win32ss/user/ntuser/winsta.c    |  8 ++++----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/win32ss/user/ntuser/desktop.c b/win32ss/user/ntuser/desktop.c
index 2776cbe27a..8f0555a746 100644
--- a/win32ss/user/ntuser/desktop.c
+++ b/win32ss/user/ntuser/desktop.c
@@ -1753,7 +1753,7 @@ IntCreateDesktop(
     /* In case the object was not created (eg if it existed), return now */
     if (Context == FALSE)
     {
-        TRACE("NtUserCreateDesktop opened desktop %wZ\n",
ObjectAttributes->ObjectName);
+        TRACE("IntCreateDesktop opened desktop '%wZ'\n",
ObjectAttributes->ObjectName);
         Status = STATUS_SUCCESS;
         goto Quit;
     }
@@ -1825,8 +1825,8 @@ IntCreateDesktop(
     Cs.cx = Cs.cy = 100;
     Cs.style = WS_POPUP|WS_CLIPCHILDREN;
     Cs.hInstance = hModClient; // hModuleWin; // Server side winproc!
-    Cs.lpszName = (LPCWSTR) &WindowName;
-    Cs.lpszClass = (LPCWSTR) &ClassName;
+    Cs.lpszName = (LPCWSTR)&WindowName;
+    Cs.lpszClass = (LPCWSTR)&ClassName;
     pWnd = IntCreateWindow(&Cs, &WindowName, pcls, NULL, NULL, NULL, pdesk);
     if (pWnd == NULL)
     {
@@ -2050,7 +2050,7 @@ NtUserCloseDesktop(HDESK hDesktop)
     NTSTATUS Status;
     DECLARE_RETURN(BOOL);
 
-    TRACE("NtUserCloseDesktop called (0x%p)\n", hDesktop);
+    TRACE("NtUserCloseDesktop(0x%p) called\n", hDesktop);
     UserEnterExclusive();
 
     if (hDesktop == gptiCurrent->hdesk || hDesktop ==
gptiCurrent->ppi->hdeskStartup)
@@ -2060,10 +2060,10 @@ NtUserCloseDesktop(HDESK hDesktop)
         RETURN(FALSE);
     }
 
-    Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk);
+    Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk);
     if (!NT_SUCCESS(Status))
     {
-        ERR("Validation of desktop handle (0x%p) failed\n", hDesktop);
+        ERR("Validation of desktop handle 0x%p failed\n", hDesktop);
         RETURN(FALSE);
     }
 
@@ -2236,10 +2236,10 @@ NtUserSwitchDesktop(HDESK hdesk)
     UserEnterExclusive();
     TRACE("Enter NtUserSwitchDesktop(0x%p)\n", hdesk);
 
-    Status = IntValidateDesktopHandle( hdesk, UserMode, 0, &pdesk);
+    Status = IntValidateDesktopHandle(hdesk, UserMode, 0, &pdesk);
     if (!NT_SUCCESS(Status))
     {
-        ERR("Validation of desktop handle (0x%p) failed\n", hdesk);
+        ERR("Validation of desktop handle 0x%p failed\n", hdesk);
         RETURN(FALSE);
     }
 
@@ -2539,10 +2539,10 @@ IntSetThreadDesktop(IN HDESK hDesktop,
     if (hDesktop != NULL)
     {
         /* Validate the new desktop. */
-        Status = IntValidateDesktopHandle( hDesktop, UserMode, 0, &pdesk);
+        Status = IntValidateDesktopHandle(hDesktop, UserMode, 0, &pdesk);
         if (!NT_SUCCESS(Status))
         {
-            ERR("Validation of desktop handle (0x%p) failed\n", hDesktop);
+            ERR("Validation of desktop handle 0x%p failed\n", hDesktop);
             return FALSE;
         }
 
@@ -2583,7 +2583,7 @@ IntSetThreadDesktop(IN HDESK hDesktop,
             return FALSE;
         }
 
-        pctiNew = DesktopHeapAlloc( pdesk, sizeof(CLIENTTHREADINFO));
+        pctiNew = DesktopHeapAlloc(pdesk, sizeof(CLIENTTHREADINFO));
         if (pctiNew == NULL)
         {
             ERR("Failed to allocate new pcti\n");
diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c
index d0badba00e..0fede4ceec 100644
--- a/win32ss/user/ntuser/sysparams.c
+++ b/win32ss/user/ntuser/sysparams.c
@@ -25,6 +25,7 @@ BOOL g_PaintDesktopVersion = FALSE;
 #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi))
 
 #define REQ_INTERACTIVE_WINSTA(err) \
+do { \
     if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \
     { \
         if (GetW32ProcessInfo()->prpwinsta == NULL) \
@@ -33,12 +34,13 @@ BOOL g_PaintDesktopVersion = FALSE;
         } \
         else \
         { \
-            ERR("NtUserSystemParametersInfo requires interactive window station
(current is %wZ)\n", \
+            ERR("NtUserSystemParametersInfo requires interactive window station
(current is '%wZ')\n", \
                
&(OBJECT_HEADER_TO_NAME_INFO(OBJECT_TO_OBJECT_HEADER(GetW32ProcessInfo()->prpwinsta))->Name));
\
         } \
         EngSetLastError(err); \
         return 0; \
-    }
+    } \
+} while (0)
 
 static const WCHAR* KEY_MOUSE = L"Control Panel\\Mouse";
 static const WCHAR* VAL_MOUSE1 = L"MouseThreshold1";
diff --git a/win32ss/user/ntuser/winsta.c b/win32ss/user/ntuser/winsta.c
index 1400827bc6..13b968516c 100644
--- a/win32ss/user/ntuser/winsta.c
+++ b/win32ss/user/ntuser/winsta.c
@@ -971,7 +971,7 @@ NtUserCloseWindowStation(
                                             UserMode,
                                             0,
                                             &Object,
-                                            0);
+                                            NULL);
 
     if (!NT_SUCCESS(Status))
     {
@@ -1449,7 +1449,7 @@ NtUserLockWindowStation(HWINSTA hWindowStation)
                                             UserMode,
                                             0,
                                             &Object,
-                                            0);
+                                            NULL);
     if (!NT_SUCCESS(Status))
     {
         TRACE("Validation of window station handle (%p) failed\n",
@@ -1494,7 +1494,7 @@ NtUserUnlockWindowStation(HWINSTA hWindowStation)
                                             UserMode,
                                             0,
                                             &Object,
-                                            0);
+                                            NULL);
     if (!NT_SUCCESS(Status))
     {
         TRACE("Validation of window station handle (%p) failed\n",
@@ -1718,7 +1718,7 @@ BuildDesktopNameList(
                                             UserMode,
                                             0,
                                             &WindowStation,
-                                            0);
+                                            NULL);
     if (! NT_SUCCESS(Status))
     {
         return Status;