[ros-diffs] [jimtabor] 40824: - 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.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Thu May  7 09:49:35 2009
New Revision: 40824

URL: http://svn.reactos.org/svn/reactos?rev=40824&view=rev
Log:
- 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.

Modified:
    trunk/reactos/subsystems/win32/win32k/main/dllmain.c
    trunk/reactos/subsystems/win32/win32k/ntuser/misc.c

Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/main/dllmain.c?rev=40824&r1=40823&r2=40824&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Thu May  7 09:49:35 2009
@@ -283,7 +283,7 @@
       if (Win32Thread->ThreadInfo)
       {
           Win32Thread->ThreadInfo->ClientThreadInfo.dwcPumpHook = 0;
-          Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo;
+//          Win32Thread->pClientInfo->pClientThreadInfo = &Win32Thread->ThreadInfo->ClientThreadInfo;
       }
     }
   else

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=40824&r1=40823&r2=40824&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] Thu May  7 09:49:35 2009
@@ -547,7 +547,8 @@
                               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)