diff --git a/reactos/win32ss/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
index 133f82f86a3..55ea3780649 100644
--- a/reactos/win32ss/user/user32/include/ntwrapper.h
+++ b/reactos/win32ss/user/user32/include/ntwrapper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #if defined(__GNUC__)
-#define EXTINLINE extern inline __attribute__((always_inline)) 
+#define EXTINLINE extern inline __attribute__((always_inline))
 #elif defined(_MSC_VER)
 #define EXTINLINE extern __forceinline
 #else
@@ -55,7 +55,7 @@ SwitchDesktop(HDESK hDesktop)
 EXTINLINE BOOL WINAPI
 SetShellWindowEx(HWND hwndShell, HWND hwndShellListView)
 {
-	return NtUserSetShellWindowEx(hwndShell, hwndShellListView);
+    return NtUserSetShellWindowEx(hwndShell, hwndShellListView);
 }
 
 EXTINLINE DWORD WINAPI
@@ -127,7 +127,7 @@ GetProcessWindowStation(VOID)
 EXTINLINE BOOL WINAPI
 SetProcessWindowStation(HWINSTA hWinSta)
 {
-  return NtUserSetProcessWindowStation(hWinSta);
+    return NtUserSetProcessWindowStation(hWinSta);
 }
 
 EXTINLINE BOOL WINAPI
@@ -142,7 +142,7 @@ UnlockWindowStation(HWINSTA hWinSta)
     return NtUserUnlockWindowStation(hWinSta);
 }
 
-EXTINLINE int WINAPI 
+EXTINLINE int WINAPI
 CopyAcceleratorTableW(HACCEL hAccelSrc, LPACCEL lpAccelDst, int cAccelEntries)
 {
     return NtUserCopyAcceleratorTable(hAccelSrc, lpAccelDst, cAccelEntries);
@@ -317,7 +317,7 @@ GetDoubleClickTime(VOID)
 EXTINLINE BOOL WINAPI
 GetKeyboardState(PBYTE lpKeyState)
 {
-    return NtUserGetKeyboardState((LPBYTE) lpKeyState);
+    return NtUserGetKeyboardState((LPBYTE)lpKeyState);
 }
 
 EXTINLINE BOOL WINAPI
@@ -512,19 +512,19 @@ InvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)
     return NtUserInvalidateRect(hWnd, lpRect, bErase);
 }
 
-EXTINLINE BOOL WINAPI ValidateRect( HWND hWnd, CONST RECT *lpRect)
+EXTINLINE BOOL WINAPI ValidateRect(HWND hWnd, CONST RECT *lpRect)
 {
-   return NtUserValidateRect(hWnd, lpRect);
+    return NtUserValidateRect(hWnd, lpRect);
 }
 
-EXTINLINE BOOL WINAPI ShowCaret( HWND hWnd )
+EXTINLINE BOOL WINAPI ShowCaret(HWND hWnd)
 {
-   return NtUserShowCaret(hWnd);
+    return NtUserShowCaret(hWnd);
 }
 
-EXTINLINE BOOL WINAPI HideCaret( HWND hWnd )
+EXTINLINE BOOL WINAPI HideCaret(HWND hWnd)
 {
-   return NtUserHideCaret(hWnd);
+    return NtUserHideCaret(hWnd);
 }
 
 
@@ -558,12 +558,12 @@ EXTINLINE HMENU NtUserxCreatePopupMenu()
 
 EXTINLINE DWORD NtUserxGetMessagePos(VOID)
 {
-  return (DWORD)NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS);
+    return (DWORD)NtUserCallNoParam(NOPARAM_ROUTINE_GETMSESSAGEPOS);
 }
 
 EXTINLINE BOOL NtUserxReleaseCapture(VOID)
 {
-  return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE);
+    return (BOOL)NtUserCallNoParam(NOPARAM_ROUTINE_RELEASECAPTURE);
 }
 
 EXTINLINE BOOL NtUserxInitMessagePump()
@@ -613,7 +613,7 @@ EXTINLINE UINT NtUserxEnumClipboardFormats(UINT format)
 
 EXTINLINE HICON NtUserxCreateEmptyCurObject(DWORD_PTR Param)
 {
-	return (HICON)NtUserCallOneParam(Param, ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT);
+    return (HICON)NtUserCallOneParam(Param, ONEPARAM_ROUTINE_CREATEEMPTYCUROBJECT);
 }
 
 EXTINLINE BOOL NtUserxMessageBeep(UINT uType)
@@ -623,22 +623,22 @@ EXTINLINE BOOL NtUserxMessageBeep(UINT uType)
 
 EXTINLINE HKL NtUserxGetKeyboardLayout(DWORD idThread)
 {
-  return (HKL)NtUserCallOneParam((DWORD_PTR) idThread,  ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT);
+    return (HKL)NtUserCallOneParam((DWORD_PTR)idThread,  ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT);
 }
 
 EXTINLINE INT NtUserxGetKeyboardType(INT nTypeFlag)
 {
-    return (INT)NtUserCallOneParam((DWORD_PTR) nTypeFlag,  ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
+    return (INT)NtUserCallOneParam((DWORD_PTR)nTypeFlag,  ONEPARAM_ROUTINE_GETKEYBOARDTYPE);
 }
 
 EXTINLINE INT NtUserxReleaseDC(HDC hDC)
 {
-    return (INT)NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_RELEASEDC);
+    return (INT)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_RELEASEDC);
 }
 
-EXTINLINE UINT NtUserxRealizePalette ( HDC hDC )
+EXTINLINE UINT NtUserxRealizePalette(HDC hDC)
 {
-    return (UINT)NtUserCallOneParam((DWORD_PTR) hDC, ONEPARAM_ROUTINE_REALIZEPALETTE);
+    return (UINT)NtUserCallOneParam((DWORD_PTR)hDC, ONEPARAM_ROUTINE_REALIZEPALETTE);
 }
 
 EXTINLINE VOID NtUserxCreateSystemThreads(DWORD param)
@@ -653,7 +653,7 @@ EXTINLINE HDWP NtUserxBeginDeferWindowPos(INT nNumWindows)
 
 EXTINLINE BOOL NtUserxReplyMessage(LRESULT lResult)
 {
-  return NtUserCallOneParam(lResult, ONEPARAM_ROUTINE_REPLYMESSAGE);
+    return NtUserCallOneParam(lResult, ONEPARAM_ROUTINE_REPLYMESSAGE);
 }
 
 EXTINLINE VOID NtUserxPostQuitMessage(int nExitCode)
@@ -663,7 +663,7 @@ EXTINLINE VOID NtUserxPostQuitMessage(int nExitCode)
 
 EXTINLINE DWORD NtUserxGetQueueStatus(UINT flags)
 {
-   return (DWORD)NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS);
+    return (DWORD)NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS);
 }
 
 EXTINLINE BOOL NtUserxValidateRgn(HWND hWnd, HRGN hRgn)
@@ -678,7 +678,7 @@ EXTINLINE BOOL NtUserxSetCursorPos(INT x, INT y)
 
 EXTINLINE BOOL NtUserxEnableWindow(HWND hWnd, BOOL bEnable)
 {
-  return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bEnable, TWOPARAM_ROUTINE_ENABLEWINDOW);
+    return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, (DWORD_PTR)bEnable, TWOPARAM_ROUTINE_ENABLEWINDOW);
 }
 
 EXTINLINE BOOL NtUserxUpdateUiState(HWND hWnd, DWORD Param)
@@ -691,16 +691,16 @@ EXTINLINE BOOL NtUserxShowOwnedPopups(HWND hWnd, BOOL fShow)
     return (BOOL)NtUserCallTwoParam((DWORD_PTR)hWnd, fShow, TWOPARAM_ROUTINE_SHOWOWNEDPOPUPS);
 }
 
-EXTINLINE BOOL NtUserxUnhookWindowsHook ( int nCode, HOOKPROC pfnFilterProc )
+EXTINLINE BOOL NtUserxUnhookWindowsHook(int nCode, HOOKPROC pfnFilterProc)
 {
-  return (BOOL)NtUserCallTwoParam(nCode, (DWORD_PTR)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK);
+    return (BOOL)NtUserCallTwoParam(nCode, (DWORD_PTR)pfnFilterProc, TWOPARAM_ROUTINE_UNHOOKWINDOWSHOOK);
 }
 
 EXTINLINE BOOL NtUserxSetWindowContextHelpId(HWND hWnd, DWORD_PTR dwContextHelpId)
 {
     return (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID);
 }
-  
+
 EXTINLINE BOOL NtUserxKillSystemTimer(HWND hWnd, UINT_PTR IDEvent)
 {
     return (BOOL)NtUserCallHwndParam(hWnd, IDEvent, HWNDPARAM_ROUTINE_KILLSYSTEMTIMER);
@@ -708,7 +708,7 @@ EXTINLINE BOOL NtUserxKillSystemTimer(HWND hWnd, UINT_PTR IDEvent)
 
 EXTINLINE VOID NtUserxSetDialogPointer(HWND hWnd, PVOID dlgInfo)
 {
-    NtUserCallHwndParam( hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER );
+    NtUserCallHwndParam(hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER);
 }
 
 EXTINLINE VOID NtUserxNotifyWinEvent(HWND hWnd, PVOID ne)
@@ -723,29 +723,29 @@ EXTINLINE DWORD NtUserxGetWindowContextHelpId(HWND hwnd)
 
 EXTINLINE BOOL NtUserxDeregisterShellHookWindow(HWND hWnd)
 {
-  return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW);
+    return NtUserCallHwnd(hWnd, HWND_ROUTINE_DEREGISTERSHELLHOOKWINDOW);
 }
 
 EXTINLINE BOOL NtUserxRegisterShellHookWindow(HWND hWnd)
 {
-  return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW);
+    return NtUserCallHwnd(hWnd, HWND_ROUTINE_REGISTERSHELLHOOKWINDOW);
 }
 
 EXTINLINE BOOL NtUserxSetMessageBox(HWND hWnd)
 {
-  return NtUserCallHwnd(hWnd, HWND_ROUTINE_SETMSGBOX);
+    return NtUserCallHwnd(hWnd, HWND_ROUTINE_SETMSGBOX);
 }
 
 EXTINLINE VOID NtUserxClearWindowState(PWND pWnd, UINT Flag)
 {
-  if (!TestState(pWnd, Flag)) return; 
-  NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_CLEARWINDOWSTATE);
+    if (!TestState(pWnd, Flag)) return;
+    NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_CLEARWINDOWSTATE);
 }
 
 EXTINLINE VOID NtUserxSetWindowState(PWND pWnd, UINT Flag)
 {
-  if (TestState(pWnd, Flag)) return;
-  NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_SETWINDOWSTATE);
+    if (TestState(pWnd, Flag)) return;
+    NtUserCallHwndParam(UserHMGetHandle(pWnd), (DWORD_PTR)Flag, HWNDPARAM_ROUTINE_SETWINDOWSTATE);
 }
 
 EXTINLINE HWND NtUserxSetTaskmanWindow(HWND hWnd)
@@ -760,7 +760,7 @@ EXTINLINE HWND NtUserxSetProgmanWindow(HWND hWnd)
 
 EXTINLINE UINT NtUserxArrangeIconicWindows(HWND hWnd)
 {
-    return (UINT)NtUserCallHwndLock( hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS);
+    return (UINT)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_ARRANGEICONICWINDOWS);
 }
 
 EXTINLINE BOOL NtUserxUpdateWindow(HWND hWnd)
@@ -784,11 +784,11 @@ EXTINLINE BOOL NtUserxSetForegroundWindow(HWND hWnd)
 }
 
 
-/* Reactos specific definitions */
+/* ReactOS-specific definitions */
 
 EXTINLINE LPARAM NtUserxGetMessageExtraInfo(VOID)
 {
-  return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
+    return (LPARAM)NtUserGetThreadState(THREADSTATE_GETMESSAGEEXTRAINFO);
 }
 
 EXTINLINE BOOL NtUserxSwitchCaretShowing(THRDCARETINFO* CaretInfo)