Author: hbelusca Date: Thu Dec 18 01:53:08 2014 New Revision: 65716
URL: http://svn.reactos.org/svn/reactos?rev=65716&view=rev Log: [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...)
Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c trunk/reactos/win32ss/user/winsrv/usersrv/init.c
Modified: trunk/reactos/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/dl... ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/dllmain.c [iso-8859-1] Thu Dec 18 01:53:08 2014 @@ -240,7 +240,7 @@ // continue as normal. //
- GetConnected(); + // GetConnected();
UNIMPLEMENTED; return TRUE; @@ -319,6 +319,8 @@ { case DLL_PROCESS_ATTACH: { + +#if 0
#define WIN_OBJ_DIR L"\Windows" #define SESSION_DIR L"\Sessions" @@ -366,6 +368,10 @@ return FALSE; }
+#else + gfServerProcess = FALSE; +#endif + User32Instance = hInstanceDll;
if (!RegisterClientPFN())
Modified: trunk/reactos/win32ss/user/winsrv/usersrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersrv... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/init.c [iso-8859-1] Thu Dec 18 01:53:08 2014 @@ -210,7 +210,11 @@ 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;