June 2011 - Wine-Commits - list.winehq.org

Vincent Povirk : user32/tests: Do not check the last error on succeeding hotkey calls.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: b0beeaffc6a45dbd9ea46fd980df1c6b81cc809e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0beeaffc6a45dbd9ea46fd98… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 7 11:37:25 2011 -0500 user32/tests: Do not check the last error on succeeding hotkey calls. --- dlls/user32/tests/msg.c | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 841af25..62acf8a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13107,7 +13107,6 @@ static void test_hotkey(void) if (ret == TRUE) { - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); break; } else @@ -13197,10 +13196,8 @@ static void test_hotkey(void) ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Unregister hotkey properly */ - SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Unregister hotkey again */ SetLastError(0xdeadbeef); @@ -13209,10 +13206,8 @@ static void test_hotkey(void) ok(GetLastError() == ERROR_HOTKEY_NOT_REGISTERED, "unexpected error %d\n", GetLastError()); /* Register thread hotkey */ - SetLastError(0xdeadbeef); ret = RegisterHotKey(NULL, 5, MOD_WIN, hotkey_letter); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); @@ -13265,10 +13260,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyReleaseLWIN, "thread hotkey release LWIN", FALSE); /* Unregister thread hotkey */ - SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 5); - ok(ret == TRUE, "expected TRUE, got %i\n", ret); - ok(GetLastError() == 0xdeadbeef, "unexpected error %d\n", GetLastError()); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); UnhookWindowsHookEx(hKBD_hook); hKBD_hook = NULL;

1 0

André Hentschel : include: Fix IOCTL_STORAGE_SET_HOTPLUG_INFO.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: f4f89bf39a0247ed676ffddeb05c23cfb952771c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f89bf39a0247ed676ffddeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:15:11 2011 +0200 include: Fix IOCTL_STORAGE_SET_HOTPLUG_INFO. --- include/winioctl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/winioctl.h b/include/winioctl.h index 7f04d59..3a56d17 100644 --- a/include/winioctl.h +++ b/include/winioctl.h @@ -222,7 +222,7 @@ #define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS)

1 0

Vincent Povirk : user32/tests: Add test showing hotkeys change the async key state.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 58ae3a7fcc62b962576701d79433cc502ddedb03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ae3a7fcc62b962576701d79… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 13:06:43 2011 -0500 user32/tests: Add test showing hotkeys change the async key state. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index da7e3d9..12e606e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13076,6 +13076,7 @@ static void test_hotkey(void) HWND test_window, taskbar_window; BOOL ret; MSG msg; + SHORT key_state; SetLastError(0xdeadbeef); ret = UnregisterHotKey(NULL, 0); @@ -13176,6 +13177,9 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); + key_state = GetAsyncKeyState(hotkey_letter); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE))

1 0

Piotr Caban : msvcrt: Fix broken exports in spec file.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 34ed6b0dbcb525446758b3e85db7031d2dc42827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ed6b0dbcb525446758b3e85… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jun 7 21:18:28 2011 +0200 msvcrt: Fix broken exports in spec file. --- dlls/msvcrt/msvcrt.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 73dd809..0308067 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -334,7 +334,7 @@ # stub _chvalidator_l(ptr long long) @ cdecl _clearfp() @ cdecl _close(long) MSVCRT__close -@ cdecl MSVCRT__commit(long) +@ cdecl _commit(long) MSVCRT__commit @ extern _commode MSVCRT__commode @ cdecl _control87(long long) @ cdecl _controlfp(long long) @@ -1167,7 +1167,7 @@ @ cdecl _wrmdir(wstr) MSVCRT__wrmdir @ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l @ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l -@ cdecl MSVCRT__wsearchenv(wstr wstr ptr) +@ cdecl _wsearchenv(wstr wstr ptr) MSVCRT__wsearchenv @ cdecl _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen(wstr long long) MSVCRT__wsopen @@ -1177,7 +1177,7 @@ @ varargs _wspawnlp(long wstr wstr) @ varargs _wspawnlpe(long wstr wstr) @ cdecl _wspawnv(long wstr ptr) -@ cdecl MSVCRT__wspawnve(long wstr ptr ptr) +@ cdecl _wspawnve(long wstr ptr ptr) MSVCRT__wspawnve @ cdecl _wspawnvp(long wstr ptr) @ cdecl _wspawnvpe(long wstr ptr ptr) MSVCRT__wspawnvpe @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)

1 0

André Hentschel : include: Add more storage ioctls.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: fa9cacdb581271696b715bc73cff905fb88a10de URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa9cacdb581271696b715bc73… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 7 22:17:35 2011 +0200 include: Add more storage ioctls. --- include/ntddstor.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/ntddstor.h b/include/ntddstor.h index cf54be6..e06e99a 100644 --- a/include/ntddstor.h +++ b/include/ntddstor.h @@ -28,17 +28,26 @@ extern "C" { #define IOCTL_STORAGE_BASE FILE_DEVICE_MASS_STORAGE #define IOCTL_STORAGE_CHECK_VERIFY CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_CHECK_VERIFY2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_MEDIA_REMOVAL CTL_CODE(IOCTL_STORAGE_BASE, 0x0201, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_EJECT_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0202, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_LOAD_MEDIA CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_LOAD_MEDIA2 CTL_CODE(IOCTL_STORAGE_BASE, 0x0203, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_RESERVE CTL_CODE(IOCTL_STORAGE_BASE, 0x0204, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RELEASE CTL_CODE(IOCTL_STORAGE_BASE, 0x0205, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_FIND_NEW_DEVICES CTL_CODE(IOCTL_STORAGE_BASE, 0x0206, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_EJECTION_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0250, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_MCN_CONTROL CTL_CODE(IOCTL_STORAGE_BASE, 0x0251, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_TYPES CTL_CODE(IOCTL_STORAGE_BASE, 0x0300, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_GET_MEDIA_TYPES_EX CTL_CODE(IOCTL_STORAGE_BASE, 0x0301, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0304, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_GET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0305, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_SET_HOTPLUG_INFO CTL_CODE(IOCTL_STORAGE_BASE, 0x0306, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_STORAGE_RESET_BUS CTL_CODE(IOCTL_STORAGE_BASE, 0x0400, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_RESET_DEVICE CTL_CODE(IOCTL_STORAGE_BASE, 0x0401, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_STORAGE_BREAK_RESERVATION CTL_CODE(IOCTL_STORAGE_BASE, 0x0405, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_STORAGE_GET_DEVICE_NUMBER CTL_CODE(IOCTL_STORAGE_BASE, 0x0420, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_STORAGE_PREDICT_FAILURE CTL_CODE(IOCTL_STORAGE_BASE, 0x0440, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_STORAGE_QUERY_PROPERTY CTL_CODE(IOCTL_STORAGE_BASE, 0x0500, METHOD_BUFFERED, FILE_ANY_ACCESS) DEFINE_GUID(DiskClassGuid,

1 0

Vincent Povirk : user32/tests: Ignore paint messages in hotkey tests.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 03fbf37fe82a3283d100957918b5162e74fd84a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fbf37fe82a3283d10095791… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 6 11:02:41 2011 -0500 user32/tests: Ignore paint messages in hotkey tests. --- dlls/user32/tests/msg.c | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 303c629..da7e3d9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13024,7 +13024,6 @@ static const struct message WmHotkeyPressLWIN[] = { { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, { WM_KEYDOWN, sent|wparam|lparam, VK_LWIN, 1 }, - { WM_PAINT, sent|optional }, { 0 } }; static const struct message WmHotkeyPress[] = { @@ -13159,12 +13158,14 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyPressLWIN, "window hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13176,12 +13177,14 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyRelease, "window hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); @@ -13205,7 +13208,8 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13213,7 +13217,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPressLWIN, "thread hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13234,7 +13239,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPress, "thread hotkey press", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13242,7 +13248,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyRelease, "thread hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, 0, 0, TRUE)) + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || + PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg);

1 0

Vincent Povirk : user32/tests: Test registering the same hotkey hwnd/ id pair twice.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: a5719990b5c168fbc82e77a062ce95be6e0fcae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5719990b5c168fbc82e77a06… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 13:56:47 2011 -0500 user32/tests: Test registering the same hotkey hwnd/id pair twice. --- dlls/user32/tests/msg.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 12e606e..841af25 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13192,6 +13192,10 @@ static void test_hotkey(void) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); + /* Register same hwnd/id with different key combination */ + ret = RegisterHotKey(test_window, 5, 0, hotkey_letter); + ok(ret == TRUE, "expected TRUE, got %i, err=%d\n", ret, GetLastError()); + /* Unregister hotkey properly */ SetLastError(0xdeadbeef); ret = UnregisterHotKey(test_window, 5);

1 0

Vincent Povirk : user32/tests: Add test for flags on keyboard messages.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: ad3e0b78ade98e34087b7b616891d1e4f7a1dbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad3e0b78ade98e34087b7b616… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 3 15:16:26 2011 -0500 user32/tests: Add test for flags on keyboard messages. --- dlls/user32/tests/msg.c | 126 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2c5be9e..303c629 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12895,6 +12895,131 @@ static void test_SetParent(void) flush_sequence(); } +static const struct message WmKeyReleaseOnly[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x80000001 }, + { WM_KEYUP, sent|wparam|lparam, 0x41, 0x80000001 }, + { 0 } +}; +static const struct message WmKeyPressNormal[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x1 }, + { WM_KEYDOWN, sent|wparam|lparam, 0x41, 0x1 }, + { 0 } +}; +static const struct message WmKeyPressRepeat[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0x40000001 }, + { WM_KEYDOWN, sent|wparam|lparam, 0x41, 0x40000001 }, + { 0 } +}; +static const struct message WmKeyReleaseNormal[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, 0x41, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, 0x41, 0xc0000001 }, + { 0 } +}; + +static void test_keyflags(void) +{ + HWND test_window; + SHORT key_state; + BYTE keyboard_state[256]; + MSG msg; + + test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + + flush_sequence(); + + /* keyup without a keydown */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseOnly, "key release only", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* keydown */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressNormal, "key press only", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keydown repeat */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressRepeat, "key press repeat", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keyup */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseNormal, "key release repeat", FALSE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* set the key state in this thread */ + GetKeyboardState(keyboard_state); + keyboard_state[0x41] = 0x80; + SetKeyboardState(keyboard_state); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + /* keydown */ + keybd_event(0x41, 0, 0, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyPressRepeat, "key press after setkeyboardstate", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* clear the key state in this thread */ + GetKeyboardState(keyboard_state); + keyboard_state[0x41] = 0; + SetKeyboardState(keyboard_state); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); + + /* keyup */ + keybd_event(0x41, 0, KEYEVENTF_KEYUP, 0); + while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE)) + DispatchMessage(&msg); + ok_sequence(WmKeyReleaseOnly, "key release after setkeyboardstate", TRUE); + + key_state = GetAsyncKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + key_state = GetKeyState(0x41); + ok((key_state & 0x8000) == 0, "unexpected key state %x\n", key_state); + + DestroyWindow(test_window); + flush_sequence(); +} + static const struct message WmHotkeyPressLWIN[] = { { WM_KEYDOWN, kbd_hook|wparam|lparam, VK_LWIN, LLKHF_INJECTED }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_LWIN, 1 }, @@ -13248,6 +13373,7 @@ START_TEST(msg) test_paintingloop(); test_defwinproc(); test_clipboard_viewers(); + test_keyflags(); test_hotkey(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct.

1 0

Henri Verbeet : usp10: Store the GDEF table in the script cache.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: 90d673e961ed7aeef9837c9fe3d8b4b482a1cb28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d673e961ed7aeef9837c9fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 7 19:44:46 2011 +0200 usp10: Store the GDEF table in the script cache. To avoid reloading it all the time. --- dlls/usp10/shape.c | 20 ++++++++++---------- dlls/usp10/usp10.c | 1 + dlls/usp10/usp10_internal.h | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 66904da..1d25414 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1281,16 +1281,18 @@ static VOID *load_gdef_table(HDC hdc) return GDEF_Table; } -static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) +static void GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) { - VOID* header = load_gdef_table(hdc); int i; + if (!psc->GDEF_Table) + psc->GDEF_Table = load_gdef_table(hdc); + for (i = 0; i < cGlyphs; i++) { WORD class; - class = GDEF_get_glyph_class(header, pwGlyphs[i]); + class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); switch (class) { @@ -1322,8 +1324,6 @@ static void GDEF_UpdateGlyphProps(HDC hdc, const WORD *pwGlyphs, const WORD cGly pGlyphProp[i].sva.fZeroWidth = 0; } } - - HeapFree(GetProcessHeap(), 0, header); } static void UpdateClustersFromGlyphProp(const int cGlyphs, const int cChars, WORD* pwLogClust, SCRIPT_GLYPHPROP *pGlyphProp) @@ -2656,7 +2656,7 @@ static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYS pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -2770,7 +2770,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); HeapFree(GetProcessHeap(),0,spaces); } @@ -2838,7 +2838,7 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS } HeapFree(GetProcessHeap(),0,spaces); - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Do not allow justification between marks and their base */ @@ -2881,7 +2881,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -2917,7 +2917,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - GDEF_UpdateGlyphProps(hdc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); + GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */ diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 6d7f6cd..bcf2741 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -514,6 +514,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->widths[i]); } heap_free(((ScriptCache *)*psc)->GSUB_Table); + heap_free(((ScriptCache *)*psc)->GDEF_Table); heap_free(((ScriptCache *)*psc)->features); heap_free(*psc); *psc = NULL; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 574e6f3..43edcf3 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -88,6 +88,7 @@ typedef struct { WORD *glyphs[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; LPVOID GSUB_Table; + LPVOID GDEF_Table; INT feature_count; LoadedFeature *features;

1 0

Alexandre Julliard : widl: Set a correct fpu parameter mask on 64-bit.
by Alexandre Julliard June 8, 2011

June 8, 2011

Module: wine Branch: master Commit: e4a0483529d0dae4480b888ce025001dcb7dd6bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a0483529d0dae4480b888ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 11:51:14 2011 +0200 widl: Set a correct fpu parameter mask on 64-bit. --- tools/widl/typegen.c | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7620653..b41abd0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1353,7 +1353,24 @@ static void write_proc_func_header( FILE *file, int indent, const type_t *iface, *offset += 14; if (pointer_size == 8) { - print_file( file, indent, "NdrFcShort(0x0),\n" ); /* floating point mask */ + unsigned short pos = 0, fpu_mask = 0; + + if (is_object( iface )) pos += 2; + if (args) LIST_FOR_EACH_ENTRY( var, args, var_t, entry ) + { + if (type_get_type( var->type ) == TYPE_BASIC) + { + switch (type_basic_get_type( var->type )) + { + case TYPE_BASIC_FLOAT: fpu_mask |= 1 << pos; break; + case TYPE_BASIC_DOUBLE: fpu_mask |= 2 << pos; break; + default: break; + } + } + pos += 2; + if (pos >= 16) break; + } + print_file( file, indent, "NdrFcShort(0x%x),\n", fpu_mask ); /* floating point mask */ *offset += 2; } }

1 0