[ros-diffs] [jimtabor] 33766: Move the init of server info after heap is init.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Fri May 30 01:13:52 2008
New Revision: 33766

URL: http://svn.reactos.org/svn/reactos?rev=33766&view=rev
Log:
Move the init of server info after heap is init.

Modified:
    trunk/reactos/subsystems/win32/win32k/include/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/event.c
    trunk/reactos/subsystems/win32/win32k/ntuser/metric.c
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
    trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c
    trunk/reactos/subsystems/win32/win32k/objects/stockobj.c

Modified: trunk/reactos/subsystems/win32/win32k/include/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/ntuser.h?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/ntuser.h [iso-8859-1] Fri May 30 01:13:52 2008
@@ -10,6 +10,7 @@
 #define UserEnterCo UserEnterExclusive
 #define UserLeaveCo UserLeave
 
+extern PSERVERINFO gpsi;
 
 NTSTATUS FASTCALL InitUserImpl(VOID);
 VOID FASTCALL CleanupUserImpl(VOID);

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/event.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -4,7 +4,6 @@
 #define NDEBUG
 #include <debug.h>
 
-extern PSERVERINFO gpsi;
 //static PEVENTTABLE GlobalEvents;
 
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/metric.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/metric.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/metric.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -34,7 +34,6 @@
 #define NDEBUG
 #include <debug.h>
 
-extern PSERVERINFO gpsi;
 
 static BOOL Setup = FALSE;
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/misc.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -13,7 +13,6 @@
 #define NDEBUG
 #include <debug.h>
 
-extern PSERVERINFO gpsi;
 
 /*
  * @unimplemented

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntuser.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -57,6 +57,9 @@
       return Status;
    }
 
+   gpsi = UserHeapAlloc(sizeof(SERVERINFO));
+   if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO));
+
    return STATUS_SUCCESS;
 }
 

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/window.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -33,7 +33,6 @@
 #define NDEBUG
 #include <debug.h>
 
-extern PSERVERINFO gpsi;
 
 /* dialog resources appear to pass this in 16 bits, handle them properly */
 #define CW_USEDEFAULT16 (0x8000)
@@ -51,8 +50,6 @@
 NTSTATUS FASTCALL
 InitWindowImpl(VOID)
 {
-   gpsi = UserHeapAlloc(sizeof(SERVERINFO));
-   if (gpsi) RtlZeroMemory(gpsi, sizeof(SERVERINFO));
    return STATUS_SUCCESS;
 }
 

Modified: trunk/reactos/subsystems/win32/win32k/objects/stockobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/objects/stockobj.c?rev=33766&r1=33765&r2=33766&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/stockobj.c [iso-8859-1] Fri May 30 01:13:52 2008
@@ -27,7 +27,6 @@
 #define NDEBUG
 #include <debug.h>
 
-extern PSERVERINFO gpsi;
 
 static COLORREF SysColors[] =
 {