From e00d640f157db91e52118b75c98acfd0508f5036 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 7 May 2009 05:49:35 +0000 Subject: [PATCH] - This helps gimp 2.4.6 start-up. But there is another bug in msvcrt.dll that throws an exception. I must apologize for not doing this sooner. svn path=/trunk/; revision=40824 --- reactos/subsystems/win32/win32k/main/dllmain.c | 2 +- reactos/subsystems/win32/win32k/ntuser/misc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/subsystems/win32/win32k/main/dllmain.c b/reactos/subsystems/win32/win32k/main/dllmain.c index 23f8323dcd3..b8d965fca7d 100644 --- a/reactos/subsystems/win32/win32k/main/dllmain.c +++ b/reactos/subsystems/win32/win32k/main/dllmain.c @@ -283,7 +283,7 @@ Win32kThreadCallback(struct _ETHREAD *Thread, if (Win32Thread->ThreadInfo) { Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0; - Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; +// Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo; } } else diff --git a/reactos/subsystems/win32/win32k/ntuser/misc.c b/reactos/subsystems/win32/win32k/ntuser/misc.c index b3b0fe69b8a..6ed5e4dab2d 100644 --- a/reactos/subsystems/win32/win32k/ntuser/misc.c +++ b/reactos/subsystems/win32/win32k/ntuser/misc.c @@ -547,7 +547,8 @@ GetW32ThreadInfo(VOID) sizeof(ULONG)); // FIXME PLEASE! it's a ref pointer and not user data! Use ClientThreadInfo! Teb->Win32ThreadInfo = UserHeapAddressToUser(W32Thread->ThreadInfo); - ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! +// ci->pClientThreadInfo = &ti->ClientThreadInfo; // FIXME! + ci->pClientThreadInfo = NULL; ci->ppi = ti->ppi; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)