I wish Magnus would mention that this commit ALSO includes patch from bug #1837.
WBR, Aleksey Bragin.
On Nov 26, 2006, at 1:39 PM, greatlrd@svn.reactos.org wrote:
Author: greatlrd Date: Sun Nov 26 13:39:50 2006 New Revision: 24834
URL: http://svn.reactos.org/svn/reactos?rev=24834&view=rev Log:
- revers 24831 to 24833 userenv.h does not exists in ms psdk and
shall move to folder include/ndk or include/reactos 2. do not create new private header, we already have one, but it is in wrong folder. 3. This header should have been move long time ago. 4. do not doing #include "userenv-priv.h" it will not found the header in syssetup/install
Removed: trunk/reactos/dll/win32/userenv/userenv-priv.h Modified: trunk/reactos/dll/win32/syssetup/install.c trunk/reactos/dll/win32/syssetup/syssetup.rbuild trunk/reactos/dll/win32/userenv/precomp.h trunk/reactos/dll/win32/userenv/userenv.rbuild trunk/reactos/drivers/input/i8042prt/mouse.c trunk/reactos/include/psdk/userenv.h
Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/ i8042prt/mouse.c?rev=24834&r1=24833&r2=24834&view=diff ====================================================================== ======== --- trunk/reactos/drivers/input/i8042prt/mouse.c (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c Sun Nov 26 13:39:50 2006 @@ -903,6 +903,9 @@ UCHAR Value; UCHAR ExpectedReply[] = { 0xFA, 0xAA, 0x00 }; unsigned ReplyByte;
ULONG Counter;
I8042Flush();
if (! I8042Write(DevExt, I8042_CTRL_PORT, 0xD4) || ! I8042Write(DevExt, I8042_DATA_PORT, 0xFF))
@@ -915,7 +918,12 @@ ReplyByte < sizeof(ExpectedReply) / sizeof(ExpectedReply[0]) && Ok; ReplyByte++) {
Status = I8042ReadDataWait(DevExt, &Value);
Counter = 200;do {Status = I8042ReadDataWait(DevExt, &Value);} while (Status == STATUS_IO_TIMEOUT && Counter--);- if (! NT_SUCCESS(Status)) { DPRINT1("No ACK after mouse reset, status 0x%08x\n",