[Win32k]

- Fix the window handle De/Reference throttler issue. Used mIrc.

svn path=/trunk/; revision=45096

diff --git a/reactos/subsystems/win32/win32k/ntuser/object.c b/reactos/subsystems/win32/win32k/ntuser/object.c
index 2e91337..cd5f591 100644 (file)
--- a/reactos/subsystems/win32/win32k/ntuser/object.c
+++ b/reactos/subsystems/win32/win32k/ntuser/object.c
@@ -396,37 +396,26 @@ UserCreateObject( PUSER_HANDLE_TABLE ht,
 
 BOOL
 FASTCALL
-UserDereferenceObject(PVOID obj)
-{
-  ASSERT(((PHEAD)obj)->cLockObj >= 1);
-
-  if (--((PHEAD)obj)->cLockObj <= 0)
-  {
-     return TRUE;
-  }
-  return FALSE;
-}
-
-BOOL
-FASTCALL
-UserFreeHandle(PUSER_HANDLE_TABLE ht,  HANDLE handle )
+UserDereferenceObject(PVOID object)
 {
   PUSER_HANDLE_ENTRY entry;
-  PVOID object;
   USER_OBJECT_TYPE type;
 
-  if (!(entry = handle_to_entry( ht, handle )))
+  ASSERT(((PHEAD)object)->cLockObj >= 1);
+
+  if ((INT)--((PHEAD)object)->cLockObj <= 0)
   {
-     SetLastNtError( STATUS_INVALID_HANDLE );
-     return FALSE;
-  }
+     entry = handle_to_entry(gHandleTable, ((PHEAD)object)->h );
 
-  entry->flags = HANDLEENTRY_INDESTROY;
+     DPRINT("warning! Dereference to zero! Obj -> 0x%x\n", object);
+
+     ((PHEAD)object)->cLockObj = 0;
+
+     if (!(entry->flags & HANDLEENTRY_INDESTROY))
+        return TRUE;
 
-  if (UserDereferenceObject(entry->ptr))
-  {
      type = entry->type;
-     object = free_user_entry(ht, entry );
+     free_user_entry(gHandleTable, entry );
 
      switch (type)
      {
@@ -444,6 +433,23 @@ UserFreeHandle(PUSER_HANDLE_TABLE ht,  HANDLE handle )
   return FALSE;
 }
 
+BOOL
+FASTCALL
+UserFreeHandle(PUSER_HANDLE_TABLE ht,  HANDLE handle )
+{
+  PUSER_HANDLE_ENTRY entry;
+
+  if (!(entry = handle_to_entry( ht, handle )))
+  {
+     SetLastNtError( STATUS_INVALID_HANDLE );
+     return FALSE;
+  }
+
+  entry->flags = HANDLEENTRY_INDESTROY;
+
+  return UserDereferenceObject(entry->ptr);
+}
+
 BOOL
 FASTCALL
 UserDeleteObject(HANDLE h, USER_OBJECT_TYPE type )