[tfaber] 69488: [WIN32K:NTUSER] - Make IntRemoveProp return the property value and use it from NtUserRemoveProp

Author: tfaber
Date: Sat Oct 10 14:43:25 2015
New Revision: 69488

URL: http://svn.reactos.org/svn/reactos?rev=69488&view=rev
Log:
[WIN32K:NTUSER]
- Make IntRemoveProp return the property value and use it from NtUserRemoveProp

Modified:
    trunk/reactos/win32ss/user/ntuser/prop.c
    trunk/reactos/win32ss/user/ntuser/prop.h

Modified: trunk/reactos/win32ss/user/ntuser/prop.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.c?...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/prop.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/prop.c	[iso-8859-1] Sat Oct 10 14:43:25 2015
@@ -58,25 +58,27 @@
 }

_Success_(return)
-BOOL
+HANDLE
 FASTCALL
 IntRemoveProp(
     _In_ PWND Window,
     _In_ ATOM Atom)
 {
     PPROPERTY Prop;
+    HANDLE Data;

NT_ASSERT(UserIsEnteredExclusive());
     Prop = IntGetProp(Window, Atom);
     if (Prop == NULL)
     {
-        return FALSE;
-    }
-
+        return NULL;
+    }
+
+    Data = Prop->Data;
     RemoveEntryList(&Prop->PropListEntry);
     UserHeapFree(Prop);
     Window->PropListItems--;
-    return TRUE;
+    return Data;
 }

_Success_(return)
@@ -215,7 +217,6 @@
     _In_ ATOM Atom)
 {
     PWND Window;
-    PPROPERTY Prop;
     HANDLE Data = NULL;

TRACE("Enter NtUserRemoveProp\n");
@@ -227,16 +228,7 @@
         goto Exit;
     }

-    Prop = IntGetProp(Window, Atom);
-    if (Prop == NULL)
-    {
-        goto Exit;
-    }
-
-    Data = Prop->Data;
-    RemoveEntryList(&Prop->PropListEntry);
-    UserHeapFree(Prop);
-    Window->PropListItems--;
+    Data = IntRemoveProp(Window, Atom);

Exit:
     TRACE("Leave NtUserRemoveProp, ret=%p\n", Data);

Modified: trunk/reactos/win32ss/user/ntuser/prop.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/prop.h?...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/prop.h	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/prop.h	[iso-8859-1] Sat Oct 10 14:43:25 2015
@@ -12,8 +12,7 @@
     _In_ PWND Window,
     _In_ ATOM Atom);

-_Success_(return)
-BOOL
+HANDLE
 FASTCALL
 IntRemoveProp(
     _In_ PWND Window,