[USER32][USERSRV]

Temporarily disable UserClientConnect (in server side) and CSR client to server call (in client side), always set gfServerProcess to FALSE (that is normally almost true but when CSR itself does USER32 operations...), and comment again GetConnect() call in ClientThreadSetup, in an attempt to "fix" 3rd stage for bots (so that we don't assert in DesktopPtrToUser because some pdi is NULL...)

svn path=/trunk/; revision=65716

diff --git a/reactos/win32ss/user/user32/misc/dllmain.c b/reactos/win32ss/user/user32/misc/dllmain.c
index 0c91611..5eac679 100644 (file)
--- a/reactos/win32ss/user/user32/misc/dllmain.c
+++ b/reactos/win32ss/user/user32/misc/dllmain.c
@@ -240,7 +240,7 @@ ClientThreadSetup(VOID)
     // continue as normal.
     //
 
-    GetConnected();
+    // GetConnected();
 
     UNIMPLEMENTED;
     return TRUE;
@@ -320,6 +320,8 @@ DllMain(
         case DLL_PROCESS_ATTACH:
         {
 
+#if 0
+
 #define WIN_OBJ_DIR L"\\Windows"
 #define SESSION_DIR L"\\Sessions"
 
@@ -366,6 +368,10 @@ DllMain(
                 return FALSE;
             }
 
+#else
+    gfServerProcess = FALSE;
+#endif
+
             User32Instance = hInstanceDll;
 
             if (!RegisterClientPFN())

diff --git a/reactos/win32ss/user/winsrv/usersrv/init.c b/reactos/win32ss/user/winsrv/usersrv/init.c
index 8a1b3d9..eddf676 100644 (file)
--- a/reactos/win32ss/user/winsrv/usersrv/init.c
+++ b/reactos/win32ss/user/winsrv/usersrv/init.c
@@ -210,7 +210,11 @@ CSR_SERVER_DLL_INIT(UserServerDllInitialization)
     LoadedServerDll->NameTable = UserServerApiNameTable;
 #endif
     LoadedServerDll->SizeOfProcessData = 0;
+#if 0
     LoadedServerDll->ConnectCallback = UserClientConnect;
+#else
+    LoadedServerDll->ConnectCallback = NULL;
+#endif
     LoadedServerDll->DisconnectCallback = NULL;
     LoadedServerDll->HardErrorCallback = UserServerHardError;
     LoadedServerDll->ShutdownProcessCallback = UserClientShutdown;