[ros-diffs] [zguo] 58724: Merge in revision 58633, which was supposed to be merged in but was left out of the list I was given. This had better be the last code change.

Author: zguo
Date: Mon Apr  8 18:19:59 2013
New Revision: 58724

URL: http://svn.reactos.org/svn/reactos?rev=58724&view=rev
Log:
Merge in revision 58633, which was supposed to be merged in but was left out of the list I
was given. This had better be the last code change.

Modified:
    branches/ReactOS-0.3.15/   (props changed)
    branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c

Propchange: branches/ReactOS-0.3.15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr  8 18:19:59 2013
@@ -13,4 +13,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:58534,58553,58561,58614,58627-58628
+/trunk/reactos:58534,58553,58561,58614,58627-58628,58633

Modified: branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c
URL:
http://svn.reactos.org/svn/reactos/branches/ReactOS-0.3.15/win32ss/user/ntu…
==============================================================================
--- branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c [iso-8859-1] (original)
+++ branches/ReactOS-0.3.15/win32ss/user/ntuser/focus.c [iso-8859-1] Mon Apr  8 18:19:59
2013
@@ -930,7 +930,8 @@
    }
    else
    {  // Rule #3, last input event in force.
-      ptiLastInput = ppi->ptiList;
+      ERR("Fixme: ptiLastInput is SET!!\n");
+      //ptiLastInput = ppi->ptiList;
       ObDereferenceObject(Process);
    }
    return TRUE;