[user32]

- Store ghmodUserApiHook before calling ClearUserApiHook because it will be zeroed during this call
- Fix a typo in ClearUserApiHook

svn path=/branches/GSoC_2011/ThemesSupport/; revision=53123

diff --git a/dll/win32/user32/misc/usrapihk.c b/dll/win32/user32/misc/usrapihk.c
index 3eadd8a..960549d 100644 (file)
--- a/dll/win32/user32/misc/usrapihk.c
+++ b/dll/win32/user32/misc/usrapihk.c
@@ -199,7 +199,7 @@ ClearUserApiHook(HINSTANCE hInstance)
   if ( ghmodUserApiHook == hInstance )
   {
      pfn1 = gpfnInitUserApi;
-     if ( --gcLoadUserApiHook == 1 )
+     if ( --gcLoadUserApiHook == 0 )
      {
         gfUserApiHook = 0;
         ResetUserApiHook(&guah);
@@ -227,7 +227,7 @@ ClearUserApiHook(HINSTANCE hInstance)
      RtlEnterCriticalSection(&gcsUserApiHook);
      pfn1 = gpfnInitUserApi;
 
-     if ( --gcLoadUserApiHook == 1 )
+     if ( --gcLoadUserApiHook == 0 )
      {
         if ( gcCallUserApiHook )
         {

diff --git a/dll/win32/user32/windows/hook.c b/dll/win32/user32/windows/hook.c
index 49bfb8d..08dfbbb 100644 (file)
--- a/dll/win32/user32/windows/hook.c
+++ b/dll/win32/user32/windows/hook.c
@@ -492,8 +492,8 @@ HINSTANCE ClientLoadLibrary(PUNICODE_STRING pstrLibName,
         /* Cleanup user api hook before unloading */
         if(ApiHook == TRUE)
         {
-            Result = ClearUserApiHook(ghmodUserApiHook);
             hLibrary = ghmodUserApiHook;
+            Result = ClearUserApiHook(ghmodUserApiHook);
             /* Check if we can we unload it now */
             if(Result == FALSE)
             {