August 2009 - Wine-Commits - list.winehq.org

Vitaliy Margolen : dinput: Move axes mapping array and default dead-zone into generic joystick class.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 5347ab427a14b6c90a2b8fbcc2d28c6497b7693c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5347ab427a14b6c90a2b8fbcc… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Aug 15 12:52:48 2009 -0600 dinput: Move axes mapping array and default dead-zone into generic joystick class. --- dlls/dinput/joystick_linux.c | 36 +++++++++++++++++------------------- dlls/dinput/joystick_private.h | 3 +++ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 3a8487b..0f9a691 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -87,8 +87,6 @@ struct JoystickImpl /* joystick private */ int joyfd; - LONG deadzone; - int *axis_map; int axes; POINTL povs[4]; }; @@ -257,12 +255,12 @@ static HRESULT setup_dinput_options(JoystickImpl * device) /* get options */ if (!get_config_key( hkey, appkey, "DefaultDeadZone", buffer, MAX_PATH )) { - device->deadzone = atoi(buffer); - TRACE("setting default deadzone to: \"%s\" %d\n", buffer, device->deadzone); + device->generic.deadzone = atoi(buffer); + TRACE("setting default deadzone to: \"%s\" %d\n", buffer, device->generic.deadzone); } - device->axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); - if (!device->axis_map) return DIERR_OUTOFMEMORY; + device->generic.axis_map = HeapAlloc(GetProcessHeap(), 0, device->axes * sizeof(int)); + if (!device->generic.axis_map) return DIERR_OUTOFMEMORY; if (!get_config_key( hkey, appkey, device->generic.name, buffer, MAX_PATH )) { static const char *axis_names[] = {"X", "Y", "Z", "Rx", "Ry", "Rz", @@ -289,7 +287,7 @@ static HRESULT setup_dinput_options(JoystickImpl * device) else { /* Pov takes two axes */ - device->axis_map[tokens++] = i; + device->generic.axis_map[tokens++] = i; pov++; } } @@ -312,14 +310,14 @@ static HRESULT setup_dinput_options(JoystickImpl * device) i = -1; } - device->axis_map[tokens] = i; + device->generic.axis_map[tokens] = i; tokens++; } while ((ptr = strtok(NULL, delim)) != NULL); if (tokens != device->axes) { ERR("not all joystick axes mapped: %d axes(%d,%d), %d arguments\n", device->axes, axis, pov,tokens); while (tokens < device->axes) { - device->axis_map[tokens] = -1; + device->generic.axis_map[tokens] = -1; tokens++; } } @@ -330,14 +328,14 @@ static HRESULT setup_dinput_options(JoystickImpl * device) for (tokens = 0; tokens < device->axes; tokens++) { if (tokens < 8) - device->axis_map[tokens] = axis++; + device->generic.axis_map[tokens] = axis++; else if (tokens < 16) { - device->axis_map[tokens++] = 8 + pov; - device->axis_map[tokens ] = 8 + pov++; + device->generic.axis_map[tokens++] = 8 + pov; + device->generic.axis_map[tokens ] = 8 + pov++; } else - device->axis_map[tokens] = -1; + device->generic.axis_map[tokens] = -1; } } device->generic.devcaps.dwAxes = axis; @@ -425,7 +423,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->generic.base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": JoystickImpl*->generic.base.crit"); /* setup_dinput_options may change these */ - newDevice->deadzone = 0; + newDevice->generic.deadzone = 0; /* do any user specified configuration */ hr = setup_dinput_options(newDevice); @@ -441,7 +439,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di for (i = 0; i < newDevice->axes; i++) { - int wine_obj = newDevice->axis_map[i]; + int wine_obj = newDevice->generic.axis_map[i]; if (wine_obj < 0) continue; @@ -468,7 +466,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di newDevice->generic.props[i].lDevMax = +32767; newDevice->generic.props[i].lMin = 0; newDevice->generic.props[i].lMax = 0xffff; - newDevice->generic.props[i].lDeadZone = newDevice->deadzone; /* % * 1000 */ + newDevice->generic.props[i].lDeadZone = newDevice->generic.deadzone; /* % * 1000 */ newDevice->generic.props[i].lSaturation = 0; } @@ -489,7 +487,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di if (TRACE_ON(dinput)) { _dump_DIDATAFORMAT(newDevice->generic.base.data_format.wine_df); for (i = 0; i < (newDevice->axes); i++) - TRACE("axis_map[%d] = %d\n", i, newDevice->axis_map[i]); + TRACE("axis_map[%d] = %d\n", i, newDevice->generic.axis_map[i]); _dump_DIDEVCAPS(&newDevice->generic.devcaps); } @@ -503,7 +501,7 @@ FAILED1: if (df) HeapFree(GetProcessHeap(), 0, df->rgodf); HeapFree(GetProcessHeap(), 0, df); release_DataFormat(&newDevice->generic.base.data_format); - HeapFree(GetProcessHeap(),0,newDevice->axis_map); + HeapFree(GetProcessHeap(),0,newDevice->generic.axis_map); HeapFree(GetProcessHeap(),0,newDevice->generic.name); HeapFree(GetProcessHeap(),0,newDevice); *pdev = 0; @@ -684,7 +682,7 @@ static void joy_polldev(JoystickGenericImpl *This_in) { } else if (jse.type & JS_EVENT_AXIS) { - int number = This->axis_map[jse.number]; /* wine format object index */ + int number = This->generic.axis_map[jse.number]; /* wine format object index */ if (number < 0) return; inst_id = DIDFT_MAKEINSTANCE(number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 5b7923d..18e03e6 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -46,6 +46,9 @@ typedef struct JoystickGenericImpl GUID guidInstance; char *name; + int *axis_map; /* User axes remapping */ + LONG deadzone; /* Default dead-zone */ + joy_polldev_handler *joy_polldev; } JoystickGenericImpl;

1 0

Dylan Smith : include: Add missing declarations and definitions to wincon.h .
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 2c85da06b7a6e357bc5b833b6433bc2d689279e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c85da06b7a6e357bc5b833b6… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Sat Aug 15 19:52:48 2009 -0400 include: Add missing declarations and definitions to wincon.h. --- include/wincon.h | 150 +++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 137 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c85da06b7a6e357bc5b8…

1 0

Andrew Eikum : user32/tests: Add tests for SendInput with unicode.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 37754eb400d32a979c9c1d5f850847277f772d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37754eb400d32a979c9c1d5f8… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 18 11:29:17 2009 -0500 user32/tests: Add tests for SendInput with unicode. --- dlls/user32/tests/input.c | 230 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 230 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 6ef7817..dfaf87e 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -60,6 +60,20 @@ static HWND hWndTest; static LONG timetag = 0x10000000; +static struct { + LONG last_key_down; + LONG last_key_up; + LONG last_syskey_down; + LONG last_syskey_up; + LONG last_char; + LONG last_syschar; + LONG last_hook_down; + LONG last_hook_up; + LONG last_hook_syskey_down; + LONG last_hook_syskey_up; + BOOL expect_alt; +} key_status; + static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); @@ -923,6 +937,221 @@ static void test_Input_blackbox(void) UnhookWindowsHookEx(hook); } +static void reset_key_status(void) +{ + key_status.last_key_down = -1; + key_status.last_key_up = -1; + key_status.last_syskey_down = -1; + key_status.last_syskey_up = -1; + key_status.last_char = -1; + key_status.last_syschar = -1; + key_status.last_hook_down = -1; + key_status.last_hook_up = -1; + key_status.last_hook_syskey_down = -1; + key_status.last_hook_syskey_up = -1; + key_status.expect_alt = FALSE; +} + +static void test_unicode_keys(HWND hwnd, HHOOK hook) +{ + TEST_INPUT inputs[2]; + MSG msg; + + /* init input data that never changes */ + inputs[1].type = inputs[0].type = INPUT_KEYBOARD; + inputs[1].u.ki.dwExtraInfo = inputs[0].u.ki.dwExtraInfo = 0; + inputs[1].u.ki.time = inputs[0].u.ki.time = 0; + + /* pressing & releasing a single unicode character */ + inputs[0].u.ki.wVk = 0; + inputs[0].u.ki.wScan = 0x3c0; + inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; + + reset_key_status(); + SendInput(1, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_down == VK_PACKET, + "Last keydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_down); + ok(key_status.last_char == 0x3c0, + "Last char msg wparam should have been 0x3c0 (was: 0x%x)\n", key_status.last_char); + if(hook) + ok(key_status.last_hook_down == 0x3c0, + "Last hookdown msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_down); + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3c0; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; + + reset_key_status(); + SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3c0, + "Last hookup msg should have been 0x3c0, was: 0x%x\n", key_status.last_hook_up); + + /* holding alt, pressing & releasing a unicode character, releasing alt */ + inputs[0].u.ki.wVk = VK_LMENU; + inputs[0].u.ki.wScan = 0; + inputs[0].u.ki.dwFlags = 0; + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3041; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE; + + reset_key_status(); + key_status.expect_alt = TRUE; + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_syskey_down == VK_PACKET, + "Last syskeydown msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_syskey_down); + ok(key_status.last_syschar == 0x3041, + "Last syschar msg should have been 0x3041 (was: 0x%x)\n", key_status.last_syschar); + if(hook) + ok(key_status.last_hook_syskey_down == 0x3041, + "Last hooksysdown msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_syskey_down); + + inputs[1].u.ki.wVk = 0; + inputs[1].u.ki.wScan = 0x3041; + inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; + + inputs[0].u.ki.wVk = VK_LMENU; + inputs[0].u.ki.wScan = 0; + inputs[0].u.ki.dwFlags = KEYEVENTF_KEYUP; + + reset_key_status(); + key_status.expect_alt = TRUE; + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); + while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ + if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ + TranslateMessage(&msg); + } + DispatchMessageW(&msg); + } + ok(key_status.last_key_up == VK_PACKET, + "Last keyup msg should have been VK_PACKET[0x%04x] (was: 0x%x)\n", VK_PACKET, key_status.last_key_up); + if(hook) + ok(key_status.last_hook_up == 0x3041, + "Last hook up msg should have been 0x3041, was: 0x%x\n", key_status.last_hook_up); +} + +static LRESULT CALLBACK unicode_wnd_proc( HWND hWnd, UINT msg, WPARAM wParam, + LPARAM lParam ) +{ + switch(msg){ + case WM_KEYDOWN: + key_status.last_key_down = wParam; + break; + case WM_SYSKEYDOWN: + key_status.last_syskey_down = wParam; + break; + case WM_KEYUP: + key_status.last_key_up = wParam; + break; + case WM_SYSKEYUP: + key_status.last_syskey_up = wParam; + break; + case WM_CHAR: + key_status.last_char = wParam; + break; + case WM_SYSCHAR: + key_status.last_syschar = wParam; + break; + } + return DefWindowProcW(hWnd, msg, wParam, lParam); +} + +static LRESULT CALLBACK llkbd_unicode_hook(int nCode, WPARAM wParam, LPARAM lParam) +{ + if(nCode == HC_ACTION){ + LPKBDLLHOOKSTRUCT info = (LPKBDLLHOOKSTRUCT)lParam; + ok(info->vkCode == VK_PACKET || (key_status.expect_alt && info->vkCode == VK_LMENU), "vkCode should have been VK_PACKET[%04x], was: %04x\n", VK_PACKET, info->vkCode); + key_status.expect_alt = FALSE; + switch(wParam){ + case WM_KEYDOWN: + key_status.last_hook_down = info->scanCode; + break; + case WM_KEYUP: + key_status.last_hook_up = info->scanCode; + break; + case WM_SYSKEYDOWN: + key_status.last_hook_syskey_down = info->scanCode; + break; + case WM_SYSKEYUP: + key_status.last_hook_syskey_up = info->scanCode; + break; + } + } + return CallNextHookEx(NULL, nCode, wParam, lParam); +} + +static void test_Input_unicode(void) +{ + WCHAR classNameW[] = {'I','n','p','u','t','U','n','i','c','o','d','e', + 'K','e','y','T','e','s','t','C','l','a','s','s',0}; + WCHAR windowNameW[] = {'I','n','p','u','t','U','n','i','c','o','d','e', + 'K','e','y','T','e','s','t',0}; + MSG msg; + WNDCLASSW wclass; + HANDLE hInstance = GetModuleHandleW(NULL); + HHOOK hook; + + wclass.lpszClassName = classNameW; + wclass.style = CS_HREDRAW | CS_VREDRAW; + wclass.lpfnWndProc = unicode_wnd_proc; + wclass.hInstance = hInstance; + wclass.hIcon = LoadIcon(0, IDI_APPLICATION); + wclass.hCursor = LoadCursor( NULL, IDC_ARROW); + wclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); + wclass.lpszMenuName = 0; + wclass.cbClsExtra = 0; + wclass.cbWndExtra = 0; + RegisterClassW(&wclass); + /* create the test window that will receive the keystrokes */ + hWndTest = CreateWindowW(wclass.lpszClassName, windowNameW, + WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, + NULL, NULL, hInstance, NULL); + + assert(hWndTest); + assert(IsWindowUnicode(hWndTest)); + + hook = SetWindowsHookExW(WH_KEYBOARD_LL, llkbd_unicode_hook, GetModuleHandleW(NULL), 0); + if(!hook) + win_skip("unable to set WH_KEYBOARD_LL hook\n"); + + ShowWindow(hWndTest, SW_SHOW); + SetWindowPos(hWndTest, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + SetForegroundWindow(hWndTest); + UpdateWindow(hWndTest); + + /* flush pending messages */ + while (PeekMessageW(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageW(&msg); + + SetFocus(hWndTest); + + test_unicode_keys(hWndTest, hook); + + if(hook) + UnhookWindowsHookEx(hook); + DestroyWindow(hWndTest); +} + static void test_keynames(void) { int i, len; @@ -1320,6 +1549,7 @@ START_TEST(input) { test_Input_blackbox(); test_Input_whitebox(); + test_Input_unicode(); } else win_skip("SendInput is not available\n");

1 0

Andrew Eikum : user32: Handle VK_PACKET messages in TranslateMessage.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: f9e7c3f4ba782259b692af1f541ce9a04ac6cff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9e7c3f4ba782259b692af1f5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 18 11:29:09 2009 -0500 user32: Handle VK_PACKET messages in TranslateMessage. --- dlls/user32/message.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f4913e1..3f7a4cd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3015,11 +3015,21 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) if (msg->message < WM_KEYFIRST || msg->message > WM_KEYLAST) return FALSE; if (msg->message != WM_KEYDOWN && msg->message != WM_SYSKEYDOWN) return TRUE; - TRACE_(key)("Translating key %s (%04lx), scancode %02x\n", - SPY_GetVKeyName(msg->wParam), msg->wParam, LOBYTE(HIWORD(msg->lParam))); + TRACE_(key)("Translating key %s (%04lx), scancode %04x\n", + SPY_GetVKeyName(msg->wParam), msg->wParam, HIWORD(msg->lParam)); - if ( msg->wParam == VK_PROCESSKEY ) + switch (msg->wParam) + { + case VK_PACKET: + message = (msg->message == WM_KEYDOWN) ? WM_CHAR : WM_SYSCHAR; + TRACE_(key)("PostMessageW(%p,%s,%04x,%08x)\n", + msg->hwnd, SPY_GetMsgName(message, msg->hwnd), HIWORD(msg->lParam), LOWORD(msg->lParam)); + PostMessageW( msg->hwnd, message, HIWORD(msg->lParam), LOWORD(msg->lParam)); + return TRUE; + + case VK_PROCESSKEY: return ImmTranslateMessage(msg->hwnd, msg->message, msg->wParam, msg->lParam); + } GetKeyboardState( state ); /* FIXME : should handle ToUnicode yielding 2 */

1 0

Andrew Eikum : winex11: Support KEYEVENTF_UNICODE in SendInput.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 55736136e2111377dd682af2dab94a4ecbfdd8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=55736136e2111377dd682af2d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 18 11:29:01 2009 -0500 winex11: Support KEYEVENTF_UNICODE in SendInput. --- dlls/user32/spy.c | 2 +- dlls/winex11.drv/keyboard.c | 46 ++++++++++++++++++++++++++++--------------- include/winuser.h | 5 +++- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 3301ac1..eb126e3 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -1370,7 +1370,7 @@ static const char * const VK_KeyNames[SPY_MAX_VKKEYSNUM + 1] = "VK_ICO_00", /* 0xE4 */ "VK_PROCESSKEY", /* 0xE5 */ NULL, /* 0xE6 */ - NULL, /* 0xE7 */ + "VK_PACKET", /* 0xE7 */ NULL, /* 0xE8 */ NULL, /* 0xE9 */ NULL, /* 0xEA */ diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 3ffa13c..3da7183 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1155,6 +1155,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD UINT message; KBDLLHOOKSTRUCT hook; WORD flags, wVkStripped, wVkL, wVkR, vk_hook = wVk; + LPARAM lParam = 0; wVk = LOBYTE(wVk); flags = LOBYTE(wScan); @@ -1216,11 +1217,16 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD message = WM_SYSKEYDOWN; TrackSysKey = wVkStripped; } - if (key_state_table[wVk] & 0x80) flags |= KF_REPEAT; + if (!(event_flags & KEYEVENTF_UNICODE) && key_state_table[wVk] & 0x80) flags |= KF_REPEAT; } - TRACE_(key)(" wParam=%04x, lParam=%08lx, InputKeyState=%x\n", - wVk, MAKELPARAM( 1, flags ), key_state_table[wVk] ); + if (event_flags & KEYEVENTF_UNICODE) + { + vk_hook = wVk = VK_PACKET; + lParam = MAKELPARAM(1 /* repeat count */, wScan); + TRACE_(key)(" message=0x%04x wParam=0x%04x lParam=0x%08lx\n", + message, wVk, lParam); + } /* Hook gets whatever key was sent. */ hook.vkCode = vk_hook; @@ -1230,21 +1236,29 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD hook.dwExtraInfo = dwExtraInfo; if (HOOK_CallHooks( WH_KEYBOARD_LL, HC_ACTION, message, (LPARAM)&hook, TRUE )) return; - if (event_flags & KEYEVENTF_KEYUP) + if (!(event_flags & KEYEVENTF_UNICODE)) { - key_state_table[wVk] &= ~0x80; - key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; - } - else - { - if (!(key_state_table[wVk] & 0x80)) key_state_table[wVk] ^= 0x01; - key_state_table[wVk] |= 0xc0; - key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; - } + if (event_flags & KEYEVENTF_KEYUP) + { + key_state_table[wVk] &= ~0x80; + key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; + } + else + { + if (!(key_state_table[wVk] & 0x80)) key_state_table[wVk] ^= 0x01; + key_state_table[wVk] |= 0xc0; + key_state_table[wVkStripped] = key_state_table[wVkL] | key_state_table[wVkR]; + } - if (key_state_table[VK_MENU] & 0x80) flags |= KF_ALTDOWN; + if (key_state_table[VK_MENU] & 0x80) flags |= KF_ALTDOWN; - if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; + if (wVkStripped == VK_SHIFT) flags &= ~KF_EXTENDED; + + lParam = MAKELPARAM(1 /* repeat count */, flags); + + TRACE_(key)(" message=0x%04x wParam=0x%04x, lParam=0x%08lx, InputKeyState=0x%x\n", + message, wVk, lParam, key_state_table[wVk]); + } SERVER_START_REQ( send_hardware_message ) { @@ -1252,7 +1266,7 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD req->win = 0; req->msg = message; req->wparam = wVk; - req->lparam = MAKELPARAM( 1 /* repeat count */, flags ); + req->lparam = lParam; req->x = cursor_pos.x; req->y = cursor_pos.y; req->time = time; diff --git a/include/winuser.h b/include/winuser.h index 3f202b1..9707b2c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2822,6 +2822,8 @@ typedef struct tagCBTACTIVATESTRUCT /* keybd_event flags */ #define KEYEVENTF_EXTENDEDKEY 0x0001 #define KEYEVENTF_KEYUP 0x0002 +#define KEYEVENTF_UNICODE 0x0004 +#define KEYEVENTF_SCANCODE 0x0008 /* mouse_event flags */ #define MOUSEEVENTF_MOVE 0x0001 @@ -3813,7 +3815,8 @@ typedef struct tagCOMPAREITEMSTRUCT #define VK_PROCESSKEY 0xE5 /* 0xE6 OEM specific */ -/* 0xE7-0xE8 Unassigned */ +#define VK_PACKET 0xE7 +/* 0xE8 Unassigned */ /* 0xE9-0xF5 OEM specific */ #define VK_ATTN 0xF6

1 0

Vincent Povirk : gdiplus: Add a test for drawing to application-provided memory.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: dad00cce4450dd0e4d793a42e86249b0d25af60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad00cce4450dd0e4d793a42e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 14:10:55 2009 -0500 gdiplus: Add a test for drawing to application-provided memory. --- dlls/gdiplus/tests/graphics.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 62b4990..26794d8 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -1904,6 +1904,30 @@ static void test_GdipGetVisibleClipBounds(void) test_GdipGetVisibleClipBounds_window(); } +static void test_fromMemoryBitmap(void) +{ + GpStatus status; + GpGraphics *graphics = NULL; + GpBitmap *bitmap = NULL; + BYTE bits[48] = {0}; + + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, bits, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGraphicsClear(graphics, 0xff686868); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + /* drawing writes to the memory provided */ + todo_wine expect(0x68, bits[10]); + + GdipDisposeImage((GpImage*)bitmap); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1938,6 +1962,7 @@ START_TEST(graphics) test_isempty(); test_clear(); test_textcontrast(); + test_fromMemoryBitmap(); GdiplusShutdown(gdiplusToken); }

1 0

Alexandre Julliard : userenv/tests: Don' t use string debugging functions for non-debug usage.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: b374a72d5129d40359a6c96b8f398da2b410ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b374a72d5129d40359a6c96b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 12:09:23 2009 +0200 userenv/tests: Don't use string debugging functions for non-debug usage. --- dlls/userenv/tests/userenv.c | 91 +----------------------------------------- 1 files changed, 1 insertions(+), 90 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index 83bfda0..3f2bba0 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -39,94 +39,6 @@ struct profile_item const int todo[4]; }; -/* Debugging functions from wine/libs/wine/debug.c, slightly modified */ - -/* allocate some tmp string space */ -/* FIXME: this is not 100% thread-safe */ -static char *get_tmp_space( int size ) -{ - static char *list[32]; - static long pos; - char *ret; - int idx; - - idx = ++pos % (sizeof(list)/sizeof(list[0])); - if (list[idx]) - ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); - else - ret = HeapAlloc( GetProcessHeap(), 0, size ); - if (ret) list[idx] = ret; - return ret; -} - -/* default implementation of wine_dbgstr_wn */ -static const char *default_dbgstr_wn( const WCHAR *str, int n, BOOL quotes ) -{ - char *dst, *res; - - if (!HIWORD(str)) - { - if (!str) return "(null)"; - res = get_tmp_space( 6 ); - sprintf( res, "#%04x", LOWORD(str) ); - return res; - } - if (n == -1) n = lstrlenW(str); - if (n < 0) n = 0; - else if (n > 200) n = 200; - dst = res = get_tmp_space( n * 5 + 7 ); - if (quotes) - { - *dst++ = 'L'; - *dst++ = '"'; - } - while (n-- > 0) - { - WCHAR c = *str++; - switch (c) - { - case '\n': *dst++ = '\\'; *dst++ = 'n'; break; - case '\r': *dst++ = '\\'; *dst++ = 'r'; break; - case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; - case '\\': *dst++ = '\\'; *dst++ = '\\'; break; - default: - if (c >= ' ' && c <= 126) - *dst++ = (char)c; - else - { - *dst++ = '\\'; - sprintf(dst,"%04x",c); - dst+=4; - } - } - } - if (quotes) *dst++ = '"'; - if (*str) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst = 0; - return res; -} - -const char *wine_dbgstr_wn( const WCHAR *s, int n ) -{ - return default_dbgstr_wn(s, n, TRUE); -} - -const char *wine_dbgstr_w( const WCHAR *s ) -{ - return default_dbgstr_wn( s, -1, TRUE); -} - -static const char *userenv_dbgstr_w( const WCHAR *s ) -{ - return default_dbgstr_wn( s, -1, FALSE); -} - /* Helper function for retrieving environment variables */ static BOOL get_env(const WCHAR * env, const char * var, char ** result) { @@ -139,8 +51,7 @@ static BOOL get_env(const WCHAR * env, const char * var, char ** result) varlen = strlen(var); do { - envlen = lstrlenW(p); - sprintf(buf, "%s", userenv_dbgstr_w(p)); + envlen = WideCharToMultiByte( CP_ACP, 0, p, -1, buf, sizeof(buf), NULL, NULL ) - 1; if (CompareStringA(GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, buf, min(envlen, varlen), var, varlen) == CSTR_EQUAL) { if (buf[varlen] == '=')

1 0

Vincent Povirk : windowscodecs: Implement GetDecoderInfo for the GIF decoder.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: f343c33083646b67f011151f06123e3e6af19c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f343c33083646b67f011151f0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 17 13:24:25 2009 -0500 windowscodecs: Implement GetDecoderInfo for the GIF decoder. --- dlls/windowscodecs/gifformat.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index a09f2ff..0597b1a 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -376,8 +376,20 @@ static HRESULT WINAPI GifDecoder_GetContainerFormat(IWICBitmapDecoder *iface, static HRESULT WINAPI GifDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, IWICBitmapDecoderInfo **ppIDecoderInfo) { - FIXME("(%p,%p): stub\n", iface, ppIDecoderInfo); - return E_NOTIMPL; + HRESULT hr; + IWICComponentInfo *compinfo; + + TRACE("(%p,%p)\n", iface, ppIDecoderInfo); + + hr = CreateComponentInfo(&CLSID_WICGifDecoder, &compinfo); + if (FAILED(hr)) return hr; + + hr = IWICComponentInfo_QueryInterface(compinfo, &IID_IWICBitmapDecoderInfo, + (void**)ppIDecoderInfo); + + IWICComponentInfo_Release(compinfo); + + return hr; } static HRESULT WINAPI GifDecoder_CopyPalette(IWICBitmapDecoder *iface,

1 0

Vincent Povirk : windowscodecs: Implement GetContainerFormat for the GIF decoder.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 2b14970e51fdb2f75a19200f410ddf73e6065751 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b14970e51fdb2f75a19200f4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 17 13:23:12 2009 -0500 windowscodecs: Implement GetContainerFormat for the GIF decoder. --- dlls/windowscodecs/gifformat.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index 9f998d8..a09f2ff 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -369,8 +369,8 @@ static HRESULT WINAPI GifDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p static HRESULT WINAPI GifDecoder_GetContainerFormat(IWICBitmapDecoder *iface, GUID *pguidContainerFormat) { - FIXME("(%p,%s): stub\n", iface, debugstr_guid(pguidContainerFormat)); - return E_NOTIMPL; + memcpy(pguidContainerFormat, &GUID_ContainerFormatGif, sizeof(GUID)); + return S_OK; } static HRESULT WINAPI GifDecoder_GetDecoderInfo(IWICBitmapDecoder *iface,

1 0

Vincent Povirk : oleaut32: Use WIC to decode gif files.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 7c9e198a716d70818f88d129246e7a97e8540d06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9e198a716d70818f88d1292… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 9 15:03:22 2009 -0500 oleaut32: Use WIC to decode gif files. --- dlls/oleaut32/Makefile.in | 3 +- dlls/oleaut32/olepicture.c | 395 ++++++++---------- dlls/oleaut32/regsvr.c | 1 + dlls/oleaut32/ungif.c | 999 -------------------------------------------- dlls/oleaut32/ungif.h | 169 -------- 5 files changed, 180 insertions(+), 1387 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7c9e198a716d70818f88d…

1 0