[ros-diffs] [fireball] 42090: - Fix win32csr build (get rid of NtUserInitialize invocation). - Don't create the desktop window class (looks like a hack).

[fireball at svn.reactos.org]

Author: fireball
Date: Sun Jul 19 20:53:22 2009
New Revision: 42090

URL: http://svn.reactos.org/svn/reactos?rev=42090&view=rev
Log:
- Fix win32csr build (get rid of NtUserInitialize invocation).
- Don't create the desktop window class (looks like a hack).

Modified:
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
    branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c?rev=42090&r1=42089&r2=42090&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c [iso-8859-1] Sun Jul 19 20:53:22 2009
@@ -11,7 +11,7 @@
 #include "w32csr.h"
 #include <debug.h>
 
-#define DESKTOP_WINDOW_ATOM 32769 //32880
+#define DESKTOP_WINDOW_ATOM 32769
 
 #define PM_SHOW_DESKTOP 1
 #define PM_HIDE_DESKTOP 2
@@ -39,7 +39,7 @@
 static BOOL BgInitialized = FALSE;
 static HWND VisibleDesktopWindow = NULL;
 
-static LRESULT CALLBACK
+LRESULT CALLBACK
 DtbgWindowProc(HWND Wnd, UINT Msg, WPARAM wParam, LPARAM lParam)
 {
   switch(Msg)
@@ -119,12 +119,13 @@
 static BOOL FASTCALL
 DtbgInit()
 {
-  WNDCLASSEXW Class;
-  ATOM ClassAtom;
+  //WNDCLASSEXW Class;
+  //ATOM ClassAtom;
 
   /*
    * Create the desktop window class
    */
+#if 0
   Class.cbSize = sizeof(WNDCLASSEXW);
   Class.style = 0;
   Class.lpfnWndProc = DtbgWindowProc;
@@ -143,6 +144,7 @@
               GetLastError());
       return FALSE;
     }
+#endif
   VisibleDesktopWindow = NULL;
 
   return TRUE;

Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c?rev=42090&r1=42089&r2=42090&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Jul 19 20:53:22 2009
@@ -588,7 +588,7 @@
   CsrExports = *Exports;
   Win32CsrApiHeap = CsrssApiHeap;
 
-  Status = NtUserInitialize(0 ,NULL, NULL);
+  Status = STATUS_SUCCESS;//NtUserInitialize(0 ,NULL, NULL);
 
   PrivateCsrssManualGuiCheck(0);
   CsrInitConsoleSupport();