[WIN32K]

- Put GDI initialization function(s) in a dedicated file.
- Whitespace fixes...

svn path=/trunk/; revision=65852

reactos/win32ss/CMakeLists.txt

@@ -167,6 +167,7 @@ list(APPEND SOURCE
     gdi/ntgdi/gdiobj.c
     gdi/ntgdi/gdipool.c
     gdi/ntgdi/icm.c
+    gdi/ntgdi/init.c
     gdi/ntgdi/line.c
     gdi/ntgdi/metafile.c
     gdi/ntgdi/palette.c

reactos/win32ss/gdi/eng/stubs.c

@@ -1537,16 +1537,6 @@ NtGdiIcmBrushInfo(
     return FALSE;
 }
 
-/*
- * @implemented
- */
-BOOL
-APIENTRY
-NtGdiInit(VOID)
-{
-    return TRUE;
-}
-
 /*
  * @unimplemented
  */

reactos/win32ss/gdi/ntgdi/init.c

@@ -0,0 +1,25 @@
+/*
+ * COPYRIGHT:        See COPYING in the top level directory
+ * PROJECT:          ReactOS Win32k subsystem
+ * PURPOSE:          Initialization of GDI
+ * FILE:             win32ss/gdi/ntgdi/init.c
+ * PROGRAMER:
+ */
+
+#include <win32k.h>
+
+#define NDEBUG
+#include <debug.h>
+#include <kdros.h>
+
+/*
+ * @implemented
+ */
+BOOL
+APIENTRY
+NtGdiInit(VOID)
+{
+    return TRUE;
+}
+
+/* EOF */

reactos/win32ss/include/ntuser.h

@@ -974,6 +974,10 @@ typedef struct tagSERVERINFO
     PERUSERSERVERINFO;
 } SERVERINFO, *PSERVERINFO;
 
+#ifdef _M_IX86
+C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE);
+#endif
+
 
 // Server event activity bits.
 #define SRV_EVENT_MENU            0x0001

reactos/win32ss/user/ntuser/main.c

@@ -733,10 +733,6 @@ DriverUnload(IN PDRIVER_OBJECT DriverObject)
     ResetCsrProcess();
 }
 
-#ifdef _M_IX86
-C_ASSERT(sizeof(SERVERINFO) <= PAGE_SIZE);
-#endif
-
 // Return on failure
 #define NT_ROF(x) \
 { \

reactos/win32ss/user/ntuser/ntuser.c

@@ -2,13 +2,13 @@
  *  COPYRIGHT:        See COPYING in the top level directory
  *  PROJECT:          ReactOS kernel
  *  PURPOSE:          ntuser init. and main funcs.
- *  FILE:             subsystems/win32/win32k/ntuser/ntuser.c
+ *  FILE:             win32ss/user/ntuser/ntuser.c
  */
 
 #include <win32k.h>
 DBG_DEFAULT_CHANNEL(UserMisc);
 
-/* GLOBALS *******************************************************************/
+/* GLOBALS ********************************************************************/
 
 PTHREADINFO gptiCurrent = NULL;
 PPROCESSINFO gppiInputProvider = NULL;
@@ -21,13 +21,12 @@ HINSTANCE hModClient = NULL;
 BOOL ClientPfnInit = FALSE;
 ATOM gaGuiConsoleWndClass;
 
-/* PRIVATE FUNCTIONS *********************************************************/
+/* PRIVATE FUNCTIONS **********************************************************/
 
 static
 NTSTATUS FASTCALL
 InitUserAtoms(VOID)
 {
-
     gpsi->atomSysClass[ICLS_MENU]      = 32768;
     gpsi->atomSysClass[ICLS_DESKTOP]   = 32769;
     gpsi->atomSysClass[ICLS_DIALOG]    = 32770;
@@ -59,7 +58,7 @@ InitUserAtoms(VOID)
     return STATUS_SUCCESS;
 }
 
-/* FUNCTIONS *****************************************************************/
+/* FUNCTIONS ******************************************************************/
 
 INIT_FUNCTION
 NTSTATUS
@@ -110,7 +109,7 @@ UserInitialize(VOID)
     Status = UserCreateWinstaDirectory();
     if (!NT_SUCCESS(Status)) return Status;
 
-    /* Initialize Video. */
+    /* Initialize Video */
     Status = InitVideo();
     if (!NT_SUCCESS(Status)) return Status;
 
@@ -123,7 +122,7 @@ UserInitialize(VOID)
 // Create ThreadInfo for this Thread!
 // {
 
-    /* Initialize the current thread. */
+    /* Initialize the current thread */
     Status = UserCreateThreadInfo(PsGetCurrentThread());
     if (!NT_SUCCESS(Status)) return Status;
 
@@ -201,8 +200,8 @@ RETURN
 */
 BOOL FASTCALL UserIsEntered(VOID)
 {
-   return ExIsResourceAcquiredExclusiveLite(&UserLock)
+    return ExIsResourceAcquiredExclusiveLite(&UserLock) ||
-      || ExIsResourceAcquiredSharedLite(&UserLock);
+           ExIsResourceAcquiredSharedLite(&UserLock);
 }
 
 BOOL FASTCALL UserIsEnteredExclusive(VOID)
@@ -236,3 +235,5 @@ VOID FASTCALL UserLeave(VOID)
     ExReleaseResourceLite(&UserLock);
     KeLeaveCriticalRegion();
 }
+
+/* EOF */