[ros-diffs] [dquintana] 64943: Sync up to trunk HEAD (r64942).

Author: dquintana
Date: Thu Oct 23 20:48:15 2014
New Revision: 64943

URL: http://svn.reactos.org/svn/reactos?rev=64943&view=rev
Log:
Sync up to trunk HEAD (r64942).

Modified:
    branches/shell-experiments/   (props changed)
    branches/shell-experiments/win32ss/user/ntuser/hook.c

Propchange: branches/shell-experiments/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Thu Oct 23 20:48:15 2014
@@ -18,4 +18,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:61927-64939
+/trunk/reactos:61927-64942

Modified: branches/shell-experiments/win32ss/user/ntuser/hook.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…
==============================================================================
--- branches/shell-experiments/win32ss/user/ntuser/hook.c	[iso-8859-1] (original)
+++ branches/shell-experiments/win32ss/user/ntuser/hook.c	[iso-8859-1] Thu Oct 23 20:48:15
2014
@@ -1402,7 +1402,7 @@
                         BOOL Ansi)
 {
     PWINSTATION_OBJECT WinStaObj;
-    PHOOK Hook;
+    PHOOK Hook = NULL;
     UNICODE_STRING ModuleName;
     NTSTATUS Status;
     HHOOK Handle;
@@ -1634,6 +1634,8 @@
     RETURN( Handle);
 
 CLEANUP:
+    if (Hook)
+        UserDereferenceObject(Hook);
     TRACE("Leave NtUserSetWindowsHookEx, ret=%p\n", _ret_);
     UserLeave();
     END_CLEANUP;