Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 17116: add #define DDRAWISURFGBL_NOTIFYWHENUNLOCKED
by greatlrd＠svn.reactos.com 06 Aug '05

06 Aug '05

add #define DDRAWISURFGBL_NOTIFYWHENUNLOCKED Modified: trunk/reactos/w32api/include/ddk/ddrawi.h _____ Modified: trunk/reactos/w32api/include/ddk/ddrawi.h --- trunk/reactos/w32api/include/ddk/ddrawi.h 2005-08-06 20:15:29 UTC (rev 17115) +++ trunk/reactos/w32api/include/ddk/ddrawi.h 2005-08-06 20:18:59 UTC (rev 17116) @@ -848,24 +848,25 @@ DDPIXELFORMAT ddpfSurface; } DDRAWI_DDRAWSURFACE_GBL; -#define DDRAWISURFGBL_MEMFREE 0x00000001 -#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002 -#define DDRAWISURFGBL_ISGDISURFACE 0x00000004 -#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008 -#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010 -#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020 -#define DDRAWISURFGBL_LOCKBROKEN 0x00000040 -#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080 -#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100 -#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200 -#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400 -#define DDRAWISURFGBL_HARDWAREOPSTARTED 0x00000600 -#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800 -#define DDRAWISURFGBL_VPORTDATA 0x00001000 -#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000 -#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000 -#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000 -#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000 +#define DDRAWISURFGBL_MEMFREE 0x00000001L +#define DDRAWISURFGBL_SYSMEMREQUESTED 0x00000002L +#define DDRAWISURFGBL_ISGDISURFACE 0x00000004L +#define DDRAWISURFGBL_SOFTWAREAUTOFLIP 0x00000008L +#define DDRAWISURFGBL_LOCKNOTHOLDINGWIN16LOCK 0x00000010L +#define DDRAWISURFGBL_LOCKVRAMSTYLE 0x00000020L +#define DDRAWISURFGBL_LOCKBROKEN 0x00000040L +#define DDRAWISURFGBL_IMPLICITHANDLE 0x00000080L +#define DDRAWISURFGBL_ISCLIENTMEM 0x00000100L +#define DDRAWISURFGBL_HARDWAREOPSOURCE 0x00000200L +#define DDRAWISURFGBL_HARDWAREOPDEST 0x00000400L +#define DDRAWISURFGBL_HARDWAREOPSTARTED 0x00000600L +#define DDRAWISURFGBL_VPORTINTERLEAVED 0x00000800L +#define DDRAWISURFGBL_VPORTDATA 0x00001000L +#define DDRAWISURFGBL_LATEALLOCATELINEAR 0x00002000L +#define DDRAWISURFGBL_SYSMEMEXECUTEBUFFER 0x00004000L +#define DDRAWISURFGBL_FASTLOCKHELD 0x00008000L +#define DDRAWISURFGBL_READONLYLOCKHELD 0x00010000L +#define DDRAWISURFGBL_NOTIFYWHENUNLOCKED 0x00200000L typedef struct _DDRAWI_DDRAWSURFACE_GBL_MORE { DWORD dwSize;

1 0

[weiden] 17115: allow warnings
by weiden＠svn.reactos.com 06 Aug '05

06 Aug '05

allow warnings Modified: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml Modified: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml _____ Modified: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml --- trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-06 19:42:40 UTC (rev 17114) +++ trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-06 20:15:29 UTC (rev 17115) @@ -1,4 +1,4 @@ -<module name="advapi32_test" type="win32cui" installbase="bin" installname="advapi32_test.exe"> +<module name="advapi32_test" type="win32cui" installbase="bin" installname="advapi32_test.exe" warnings="true"> <include base="advapi32_test">.</include> <define name="__USE_W32API" /> <library>advapi32</library> _____ Modified: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml --- trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-06 19:42:40 UTC (rev 17114) +++ trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-06 20:15:29 UTC (rev 17115) @@ -1,4 +1,4 @@ -<module name="comctl32_test" type="win32cui" installbase="bin" installname="comctl32_test.exe"> +<module name="comctl32_test" type="win32cui" installbase="bin" installname="comctl32_test.exe" warnings="true"> <include base="comctl32_test">.</include> <define name="__USE_W32API" /> <library>shlwapi</library>

1 0

[weiden] 17114: add missing directory.xml
by weiden＠svn.reactos.com 06 Aug '05

06 Aug '05

add missing directory.xml Added: trunk/reactos/regtests/winetests/directory.xml Property changes on: trunk/reactos/regtests/winetests ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/advapi32 ___________________________________________________________________ Name: svn:ignore - ignore advapi32_test.a advapi32_test.exe advapi32_test.map advapi32_test.nostrip.exe crypt.o testlist.o crypt_lmhash.o crypt_md4.o crypt_md5.o crypt_sha.o registry.o security.o + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/comctl32 ___________________________________________________________________ Name: svn:ignore - ignore comctl32_test.a comctl32_test.exe comctl32_test.nostrip.exe comctl32_test.map dpa.o imagelist.o mru.o subclass.o tab.o testlist.o + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/regtests/winetests/directory.xml --- trunk/reactos/regtests/winetests/directory.xml 2005-08-06 19:02:53 UTC (rev 17113) +++ trunk/reactos/regtests/winetests/directory.xml 2005-08-06 19:42:40 UTC (rev 17114) @@ -0,0 +1,8 @@ +<group> +<directory name="advapi32"> + <xi:include href="advapi32/advapi32_test.xml" /> +</directory> +<directory name="comctl32"> + <xi:include href="comctl32/comctl32_test.xml" /> +</directory> +</group> Property changes on: trunk/reactos/regtests/winetests/directory.xml ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/reactos/regtests/winetests/msvcrt ___________________________________________________________________ Name: svn:ignore - *.d *.o *.exe *.a *.map *.sym + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/version ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile Property changes on: trunk/reactos/regtests/winetests/winetest ___________________________________________________________________ Name: svn:ignore + temp.exp *.d *.a *.o *.dll *.coff *.sym *.tmp *.gch *.pch *.map makefile

1 0

[navaraf] 17113: Fix keyboard input in usetup.
by navaraf＠svn.reactos.com 06 Aug '05

06 Aug '05

Fix keyboard input in usetup. Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/usetup.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/system/usetup/usetup.c --- branches/ros-branch-0_2_7/reactos/subsys/system/usetup/usetup.c 2005-08-06 18:57:52 UTC (rev 17112) +++ branches/ros-branch-0_2_7/reactos/subsys/system/usetup/usetup.c 2005-08-06 19:02:53 UTC (rev 17113) @@ -1445,7 +1445,7 @@ return SELECT_FILE_SYSTEM_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'c') /* C */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'C') /* C */ { if (PartitionList->CurrentPartition->Unpartitioned == FALSE) { @@ -1461,7 +1461,7 @@ return CREATE_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { if (PartitionList->CurrentPartition->Unpartitioned == TRUE) { @@ -1971,7 +1971,7 @@ { return SELECT_PARTITION_PAGE; } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'd') /* D */ + else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'D') /* D */ { DeleteCurrentPartition (PartitionList);

1 0

[navaraf] 17112: Fix translation of extended keys.
by navaraf＠svn.reactos.com 06 Aug '05

06 Aug '05

Fix translation of extended keys. Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/include/input.h Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/input.c Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/include/input.h --- branches/ros-branch-0_2_7/reactos/subsys/win32k/include/input.h 2005-08-06 18:56:20 UTC (rev 17111) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/include/input.h 2005-08-06 18:57:52 UTC (rev 17112) @@ -10,7 +10,7 @@ PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); PKBDTABLES W32kGetDefaultKeyLayout(VOID); -VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout); +VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/input.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/input.c 2005-08-06 18:56:20 UTC (rev 17111) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/input.c 2005-08-06 18:57:52 UTC (rev 17112) @@ -628,7 +628,7 @@ lParam |= (KeyInput.MakeCode & 0xff) << 16; - if (KeyInput.Flags & (KEY_E0 | KEY_E1)) + if (KeyInput.Flags & KEY_E0) lParam |= (1 << 24); if (ModifierState & MOD_ALT) @@ -673,7 +673,9 @@ * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - FocusThread->Tcb.Win32Thread->KeyboardLayout); + FocusThread->Tcb.Win32Thread->KeyboardLayout, + KeyInput.Flags & KEY_E0 ? 0xE0 : + (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); if (GetHotKey(InputWindowStation, ModifierState, _____ Modified: branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/keyboard.c --- branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/keyboard.c 2005-08-06 18:56:20 UTC (rev 17111) +++ branches/ros-branch-0_2_7/reactos/subsys/win32k/ntuser/keyboard.c 2005-08-06 18:57:52 UTC (rev 17112) @@ -966,7 +966,11 @@ * appropriately. */ -VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) { +VOID FASTCALL +W32kKeyProcessMessage(LPMSG Msg, + PKBDTABLES KeyboardLayout, + BYTE Prefix) +{ DWORD ScanCode = 0, ModifierBits = 0; DWORD i = 0; DWORD BaseMapping = 0; @@ -984,6 +988,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; + PVSC_VK VscVkTable; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && @@ -1005,11 +1010,41 @@ ScanCode = (Msg->lParam >> 16) & 0xff; BaseMapping = Msg->wParam = IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout ); - if( ScanCode >= KeyboardLayout->bMaxVSCtoVK ) - RawVk = 0; + if( Prefix == 0 ) + { + if( ScanCode >= KeyboardLayout->bMaxVSCtoVK ) + RawVk = 0xff; + else + RawVk = KeyboardLayout->pusVSCtoVK[ScanCode]; + } else - RawVk = KeyboardLayout->pusVSCtoVK[ScanCode]; + { + if( Prefix == 0xE0 ) + { + /* ignore shift codes */ + if( ScanCode == 0x2A || ScanCode == 0x36 ) + { + IntUnLockQueueState; + return; + } + VscVkTable = KeyboardLayout->pVSCtoVK_E0; + } + else if( Prefix == 0xE1 ) + { + VscVkTable = KeyboardLayout->pVSCtoVK_E1; + } + RawVk = 0xff; + while (VscVkTable->Vsc) + { + if( VscVkTable->Vsc == ScanCode ) + { + RawVk = VscVkTable->Vk; + } + VscVkTable++; + } + } + if ((ModifierBits & NUMLOCK_BIT) && !(ModifierBits & GetShiftBit(KeyboardLayout, VK_SHIFT)) && (RawVk & KNUMP) &&

1 0

[navaraf] 17111: Fix translation of extended keys.
by navaraf＠svn.reactos.com 06 Aug '05

06 Aug '05

Fix translation of extended keys. Modified: trunk/reactos/subsys/win32k/include/input.h Modified: trunk/reactos/subsys/win32k/ntuser/input.c Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c _____ Modified: trunk/reactos/subsys/win32k/include/input.h --- trunk/reactos/subsys/win32k/include/input.h 2005-08-06 18:08:07 UTC (rev 17110) +++ trunk/reactos/subsys/win32k/include/input.h 2005-08-06 18:56:20 UTC (rev 17111) @@ -10,7 +10,7 @@ PUSER_MESSAGE_QUEUE W32kGetPrimitiveMessageQueue(VOID); VOID W32kUnregisterPrimitiveMessageQueue(VOID); PKBDTABLES W32kGetDefaultKeyLayout(VOID); -VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout); +VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyLayout, BYTE Prefix); BOOL FASTCALL IntBlockInput(PW32THREAD W32Thread, BOOL BlockIt); BOOL FASTCALL IntMouseInput(MOUSEINPUT *mi); BOOL FASTCALL IntKeyboardInput(KEYBDINPUT *ki); _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-08-06 18:08:07 UTC (rev 17110) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-08-06 18:56:20 UTC (rev 17111) @@ -628,7 +628,7 @@ lParam |= (KeyInput.MakeCode & 0xff) << 16; - if (KeyInput.Flags & (KEY_E0 | KEY_E1)) + if (KeyInput.Flags & KEY_E0) lParam |= (1 << 24); if (ModifierState & MOD_ALT) @@ -673,7 +673,9 @@ * keyboard layout in use. */ W32kKeyProcessMessage(&msg, - FocusThread->Tcb.Win32Thread->KeyboardLayout); + FocusThread->Tcb.Win32Thread->KeyboardLayout, + KeyInput.Flags & KEY_E0 ? 0xE0 : + (KeyInput.Flags & KEY_E1 ? 0xE1 : 0)); if (GetHotKey(InputWindowStation, ModifierState, _____ Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c --- trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-08-06 18:08:07 UTC (rev 17110) +++ trunk/reactos/subsys/win32k/ntuser/keyboard.c 2005-08-06 18:56:20 UTC (rev 17111) @@ -966,7 +966,11 @@ * appropriately. */ -VOID FASTCALL W32kKeyProcessMessage(LPMSG Msg, PKBDTABLES KeyboardLayout) { +VOID FASTCALL +W32kKeyProcessMessage(LPMSG Msg, + PKBDTABLES KeyboardLayout, + BYTE Prefix) +{ DWORD ScanCode = 0, ModifierBits = 0; DWORD i = 0; DWORD BaseMapping = 0; @@ -984,6 +988,7 @@ { VK_UP, VK_NUMPAD8 }, { VK_PRIOR, VK_NUMPAD9 }, { 0,0 } }; + PVSC_VK VscVkTable; if( !KeyboardLayout || !Msg || (Msg->message != WM_KEYDOWN && Msg->message != WM_SYSKEYDOWN && @@ -1005,11 +1010,41 @@ ScanCode = (Msg->lParam >> 16) & 0xff; BaseMapping = Msg->wParam = IntMapVirtualKeyEx( ScanCode, 1, KeyboardLayout ); - if( ScanCode >= KeyboardLayout->bMaxVSCtoVK ) - RawVk = 0; + if( Prefix == 0 ) + { + if( ScanCode >= KeyboardLayout->bMaxVSCtoVK ) + RawVk = 0xff; + else + RawVk = KeyboardLayout->pusVSCtoVK[ScanCode]; + } else - RawVk = KeyboardLayout->pusVSCtoVK[ScanCode]; + { + if( Prefix == 0xE0 ) + { + /* ignore shift codes */ + if( ScanCode == 0x2A || ScanCode == 0x36 ) + { + IntUnLockQueueState; + return; + } + VscVkTable = KeyboardLayout->pVSCtoVK_E0; + } + else if( Prefix == 0xE1 ) + { + VscVkTable = KeyboardLayout->pVSCtoVK_E1; + } + RawVk = 0xff; + while (VscVkTable->Vsc) + { + if( VscVkTable->Vsc == ScanCode ) + { + RawVk = VscVkTable->Vk; + } + VscVkTable++; + } + } + if ((ModifierBits & NUMLOCK_BIT) && !(ModifierBits & GetShiftBit(KeyboardLayout, VK_SHIFT)) && (RawVk & KNUMP) &&

1 0

[sedwards] 17110: and this
by sedwards＠svn.reactos.com 06 Aug '05

06 Aug '05

and this Added: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml _____ Added: trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml --- trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-06 18:07:47 UTC (rev 17109) +++ trunk/reactos/regtests/winetests/comctl32/comctl32_test.xml 2005-08-06 18:08:07 UTC (rev 17110) @@ -0,0 +1,13 @@ +<module name="comctl32_test" type="win32cui" installbase="bin" installname="comctl32_test.exe"> + <include base="comctl32_test">.</include> + <define name="__USE_W32API" /> + <library>shlwapi</library> + <library>ole32</library> + <library>comctl32</library> + <library>ntdll</library> + <file>dpa.c</file> + <file>mru.c</file> + <file>subclass.c</file> + <file>tab.c</file> + <file>testlist.c</file> +</module>

1 0

[sedwards] 17109: forgot this
by sedwards＠svn.reactos.com 06 Aug '05

06 Aug '05

forgot this Added: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml _____ Added: trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml --- trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-06 18:05:15 UTC (rev 17108) +++ trunk/reactos/regtests/winetests/advapi32/advapi32_test.xml 2005-08-06 18:07:47 UTC (rev 17109) @@ -0,0 +1,9 @@ +<module name="advapi32_test" type="win32cui" installbase="bin" installname="advapi32_test.exe"> + <include base="advapi32_test">.</include> + <define name="__USE_W32API" /> + <library>advapi32</library> + <library>ntdll</library> + <file>registry.c</file> + <file>security.c</file> + <file>testlist.c</file> +</module>

1 0

[sedwards] 17108: enable Wine regression tests for advapi32 and comctl32. Not tested under ReactOS. To build tests now you can use the wine name 'make advapi32_test' 'make comctl32_test' etc
by sedwards＠svn.reactos.com 06 Aug '05

06 Aug '05

enable Wine regression tests for advapi32 and comctl32. Not tested under ReactOS. To build tests now you can use the wine name 'make advapi32_test' 'make comctl32_test' etc Modified: trunk/reactos/regtests/directory.xml _____ Modified: trunk/reactos/regtests/directory.xml --- trunk/reactos/regtests/directory.xml 2005-08-06 18:03:53 UTC (rev 17107) +++ trunk/reactos/regtests/directory.xml 2005-08-06 18:05:15 UTC (rev 17108) @@ -5,4 +5,7 @@ <directory name="shared"> <xi:include href="shared/rtshared.xml" /> </directory> +<directory name="winetests"> + <xi:include href="winetests/directory.xml" /> +</directory> </group>

1 0

[sedwards] 17107: add prototype for DbgPrint so Winetests link properly with ReactOS.
by sedwards＠svn.reactos.com 06 Aug '05

06 Aug '05

add prototype for DbgPrint so Winetests link properly with ReactOS. Modified: trunk/reactos/include/wine/test.h _____ Modified: trunk/reactos/include/wine/test.h --- trunk/reactos/include/wine/test.h 2005-08-06 18:02:57 UTC (rev 17106) +++ trunk/reactos/include/wine/test.h 2005-08-06 18:03:53 UTC (rev 17107) @@ -24,6 +24,9 @@ #include <stdarg.h> #include "windows.h" +/* prototype for dbgprint */ +ULONG CDECL DbgPrint(IN PCH Format,IN ...); + /* debug level */ extern int winetest_debug;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs