wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hans Leidekker : wineandroid: Synchronize keyboard lock state.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 4f4ede56e9f5d97029b37434badd77e80ece2e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4ede56e9f5d97029b37434b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:52 2017 +0200 wineandroid: Synchronize keyboard lock state. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/android.h | 2 ++ dlls/wineandroid.drv/keyboard.c | 63 +++++++++++++++++++++++++++++++++++++++++ dlls/wineandroid.drv/window.c | 1 + 3 files changed, 66 insertions(+) diff --git a/dlls/wineandroid.drv/android.h b/dlls/wineandroid.drv/android.h index ca026fa..0c3f35f 100644 --- a/dlls/wineandroid.drv/android.h +++ b/dlls/wineandroid.drv/android.h @@ -81,6 +81,7 @@ enum android_window_messages extern HWND get_capture_window(void) DECLSPEC_HIDDEN; extern void init_monitors( int width, int height ) DECLSPEC_HIDDEN; +extern void update_keyboard_lock_state( WORD vkey, UINT state ) DECLSPEC_HIDDEN; /* JNI entry points */ extern void desktop_changed( JNIEnv *env, jobject obj, jint width, jint height ) DECLSPEC_HIDDEN; @@ -125,6 +126,7 @@ union event_data { enum event_type type; HWND hwnd; + UINT lock_state; INPUT input; } kbd; }; diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 741b76a..e6e1d02 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -33,6 +33,7 @@ #include "android.h" #include "wine/unicode.h" +#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); @@ -653,6 +654,67 @@ static const char* vkey_to_name( UINT vkey ) return NULL; } +static BOOL get_async_key_state( BYTE state[256] ) +{ + BOOL ret; + + SERVER_START_REQ( get_key_state ) + { + req->tid = 0; + req->key = -1; + wine_server_set_reply( req, state, 256 ); + ret = !wine_server_call( req ); + } + SERVER_END_REQ; + return ret; +} + +static void send_keyboard_input( HWND hwnd, WORD vkey, WORD scan, DWORD flags ) +{ + INPUT input; + + input.type = INPUT_KEYBOARD; + input.u.ki.wVk = vkey; + input.u.ki.wScan = scan; + input.u.ki.dwFlags = flags; + input.u.ki.time = 0; + input.u.ki.dwExtraInfo = 0; + + __wine_send_input( hwnd, &input ); +} + +/*********************************************************************** + * update_keyboard_lock_state + */ +void update_keyboard_lock_state( WORD vkey, UINT state ) +{ + BYTE keystate[256]; + + if (!get_async_key_state( keystate )) return; + + if (!(keystate[VK_CAPITAL] & 0x01) != !(state & AMETA_CAPS_LOCK_ON) && vkey != VK_CAPITAL) + { + TRACE( "adjusting CapsLock state (%02x)\n", keystate[VK_CAPITAL] ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, 0 ); + send_keyboard_input( 0, VK_CAPITAL, 0x3a, KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_NUMLOCK] & 0x01) != !(state & AMETA_NUM_LOCK_ON) && (vkey & 0xff) != VK_NUMLOCK) + { + TRACE( "adjusting NumLock state (%02x)\n", keystate[VK_NUMLOCK] ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY ); + send_keyboard_input( 0, VK_NUMLOCK, 0x45, KEYEVENTF_EXTENDEDKEY | KEYEVENTF_KEYUP ); + } + + if (!(keystate[VK_SCROLL] & 0x01) != !(state & AMETA_SCROLL_LOCK_ON) && vkey != VK_SCROLL) + { + TRACE( "adjusting ScrollLock state (%02x)\n", keystate[VK_SCROLL] ); + send_keyboard_input( 0, VK_SCROLL, 0x46, 0 ); + send_keyboard_input( 0, VK_SCROLL, 0x46, KEYEVENTF_KEYUP ); + } +} + + /*********************************************************************** * keyboard_event * @@ -671,6 +733,7 @@ jboolean keyboard_event( JNIEnv *env, jobject obj, jint win, jint action, jint k } data.type = KEYBOARD_EVENT; data.kbd.hwnd = LongToHandle( win ); + data.kbd.lock_state = state; data.kbd.input.type = INPUT_KEYBOARD; data.kbd.input.u.ki.wVk = keycode_to_vkey[keycode]; data.kbd.input.u.ki.wScan = vkey_to_scancode[data.kbd.input.u.ki.wVk]; diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index 2ddcdf1..33f2240 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -482,6 +482,7 @@ static int process_events( DWORD mask ) TRACE("KEYDOWN hwnd %p vkey %x '%c' scancode %x\n", event->data.kbd.hwnd, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wVk, event->data.kbd.input.u.ki.wScan ); + update_keyboard_lock_state( event->data.kbd.input.u.ki.wVk, event->data.kbd.lock_state ); __wine_send_input( 0, &event->data.kbd.input ); break;

1 0

Hans Leidekker : wineandroid: Implement VkKeyScanEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86b82b8f73f749fe59a007710c52ee0c91375b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=86b82b8f73f749fe59a007710… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:21:15 2017 +0200 wineandroid: Implement VkKeyScanEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 29 +++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 30 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 81af8e3..741b76a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -616,6 +616,23 @@ static const struct { VK_OEM_PERIOD, "." }, }; +static const SHORT char_vkey_map[] = +{ + 0x332, 0x241, 0x242, 0x003, 0x244, 0x245, 0x246, 0x247, 0x008, 0x009, + 0x20d, 0x24b, 0x24c, 0x00d, 0x24e, 0x24f, 0x250, 0x251, 0x252, 0x253, + 0x254, 0x255, 0x256, 0x257, 0x258, 0x259, 0x25a, 0x01b, 0x2dc, 0x2dd, + 0x336, 0x3bd, 0x020, 0x131, 0x1de, 0x133, 0x134, 0x135, 0x137, 0x0de, + 0x139, 0x130, 0x138, 0x1bb, 0x0bc, 0x0bd, 0x0be, 0x0bf, 0x030, 0x031, + 0x032, 0x033, 0x034, 0x035, 0x036, 0x037, 0x038, 0x039, 0x1ba, 0x0ba, + 0x1bc, 0x0bb, 0x1be, 0x1bf, 0x132, 0x141, 0x142, 0x143, 0x144, 0x145, + 0x146, 0x147, 0x148, 0x149, 0x14a, 0x14b, 0x14c, 0x14d, 0x14e, 0x14f, + 0x150, 0x151, 0x152, 0x153, 0x154, 0x155, 0x156, 0x157, 0x158, 0x159, + 0x15a, 0x0db, 0x0dc, 0x0dd, 0x136, 0x1bd, 0x0c0, 0x041, 0x042, 0x043, + 0x044, 0x045, 0x046, 0x047, 0x048, 0x049, 0x04a, 0x04b, 0x04c, 0x04d, + 0x04e, 0x04f, 0x050, 0x051, 0x052, 0x053, 0x054, 0x055, 0x056, 0x057, + 0x058, 0x059, 0x05a, 0x1db, 0x1dc, 0x1dd, 0x1c0, 0x208 +}; + static UINT scancode_to_vkey( UINT scan ) { UINT j; @@ -904,3 +921,15 @@ HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) FIXME( "returning %lx\n", layout ); return (HKL)layout; } + + +/*********************************************************************** + * ANDROID_VkKeyScanEx + */ +SHORT CDECL ANDROID_VkKeyScanEx( WCHAR ch, HKL hkl ) +{ + SHORT ret = -1; + if (ch < sizeof(char_vkey_map) / sizeof(char_vkey_map[0])) ret = char_vkey_map[ch]; + TRACE_(key)( "ch %04x hkl %p -> %04x\n", ch, hkl, ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index bd42cb1..918140f 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -8,6 +8,7 @@ @ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx +@ cdecl VkKeyScanEx(long long) ANDROID_VkKeyScanEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo @ cdecl CreateWindow(long) ANDROID_CreateWindow

1 0

Hans Leidekker : wineandroid: Implement GetKeyboardLayout.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: e545a85351ad72f9c6c7f9abdfdfebe621b1509b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e545a85351ad72f9c6c7f9abd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 9 09:20:49 2017 +0200 wineandroid: Implement GetKeyboardLayout. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 19 +++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 20 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index fb70445..81af8e3 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -885,3 +885,22 @@ UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) TRACE_(key)( "returning 0x%04x\n", ret ); return ret; } + + +/*********************************************************************** + * ANDROID_GetKeyboardLayout + */ +HKL CDECL ANDROID_GetKeyboardLayout( DWORD thread_id ) +{ + ULONG_PTR layout = GetUserDefaultLCID(); + LANGID langid; + + langid = PRIMARYLANGID(LANGIDFROMLCID( layout )); + if (langid == LANG_CHINESE || langid == LANG_JAPANESE || langid == LANG_KOREAN) + layout = MAKELONG( layout, 0xe001 ); /* IME */ + else + layout |= layout << 16; + + FIXME( "returning %lx\n", layout ); + return (HKL)layout; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 89ec528..bd42cb1 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl GetKeyboardLayout(long) ANDROID_GetKeyboardLayout @ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors

1 0

Josh DuBois : wineandroid: Implement MapVirtualKeyEx.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 0d565d0118af1989c57fa27e831ac7815a05fe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d565d0118af1989c57fa27e8… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:20:20 2017 +0200 wineandroid: Implement MapVirtualKeyEx. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 64 +++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 65 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index 9afb73a..fb70445 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -36,6 +36,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(keyboard); +WINE_DECLARE_DEBUG_CHANNEL(key); static const UINT keycode_to_vkey[] = { @@ -821,3 +822,66 @@ INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); return len; } + + +/*********************************************************************** + * ANDROID_MapVirtualKeyEx + */ +UINT CDECL ANDROID_MapVirtualKeyEx( UINT code, UINT maptype, HKL hkl ) +{ + UINT ret = 0; + const char *s; + + TRACE_(key)( "code=0x%x, maptype=%d, hkl %p\n", code, maptype, hkl ); + + switch (maptype) + { + case MAPVK_VK_TO_VSC_EX: + case MAPVK_VK_TO_VSC: + /* vkey to scancode */ + switch (code) + { + case VK_SHIFT: + code = VK_LSHIFT; + break; + case VK_CONTROL: + code = VK_LCONTROL; + break; + case VK_MENU: + code = VK_LMENU; + break; + } + if (code < sizeof(vkey_to_scancode) / sizeof(vkey_to_scancode[0])) ret = vkey_to_scancode[code]; + break; + case MAPVK_VSC_TO_VK: + case MAPVK_VSC_TO_VK_EX: + /* scancode to vkey */ + ret = scancode_to_vkey( code ); + if (maptype == MAPVK_VSC_TO_VK) + switch (ret) + { + case VK_LSHIFT: + case VK_RSHIFT: + ret = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + ret = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + ret = VK_MENU; break; + } + break; + case MAPVK_VK_TO_CHAR: + s = vkey_to_name( code ); + if (s && (strlen( s ) == 1)) + ret = s[0]; + else + ret = 0; + break; + default: + FIXME( "Unknown maptype %d\n", maptype ); + break; + } + TRACE_(key)( "returning 0x%04x\n", ret ); + return ret; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 4e7815a..89ec528 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -5,6 +5,7 @@ # USER driver @ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText +@ cdecl MapVirtualKeyEx(long long long) ANDROID_MapVirtualKeyEx @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Josh DuBois : wineandroid: Implement GetKeyNameText.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 86534e0dd55d972b35ccecf2e9a2b3f53059d3a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86534e0dd55d972b35ccecf2e… Author: Josh DuBois <duboisj(a)codeweavers.com> Date: Fri Jun 9 09:19:42 2017 +0200 wineandroid: Implement GetKeyNameText. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 172 ++++++++++++++++++++++++++++++ dlls/wineandroid.drv/wineandroid.drv.spec | 1 + 2 files changed, 173 insertions(+) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index b3ac76f..9afb73a 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -522,6 +522,118 @@ static const WORD vkey_to_scancode[] = 0, /* 0xff undefined */ }; +static const struct +{ + DWORD vkey; + const char *name; +} vkey_names[] = { + { VK_ADD, "Num +" }, + { VK_BACK, "Backspace" }, + { VK_CAPITAL, "Caps Lock" }, + { VK_CONTROL, "Ctrl" }, + { VK_DECIMAL, "Num Del" }, + { VK_DELETE | 0x100, "Delete" }, + { VK_DIVIDE | 0x100, "Num /" }, + { VK_DOWN | 0x100, "Down" }, + { VK_END | 0x100, "End" }, + { VK_ESCAPE, "Esc" }, + { VK_F1, "F1" }, + { VK_F2, "F2" }, + { VK_F3, "F3" }, + { VK_F4, "F4" }, + { VK_F5, "F5" }, + { VK_F6, "F6" }, + { VK_F7, "F7" }, + { VK_F8, "F8" }, + { VK_F9, "F9" }, + { VK_F10, "F10" }, + { VK_F11, "F11" }, + { VK_F12, "F12" }, + { VK_F13, "F13" }, + { VK_F14, "F14" }, + { VK_F15, "F15" }, + { VK_F16, "F16" }, + { VK_F17, "F17" }, + { VK_F18, "F18" }, + { VK_F19, "F19" }, + { VK_F20, "F20" }, + { VK_F21, "F21" }, + { VK_F22, "F22" }, + { VK_F23, "F23" }, + { VK_F24, "F24" }, + { VK_HELP | 0x100, "Help" }, + { VK_HOME | 0x100, "Home" }, + { VK_INSERT | 0x100, "Insert" }, + { VK_LCONTROL, "Ctrl" }, + { VK_LEFT | 0x100, "Left" }, + { VK_LMENU, "Alt" }, + { VK_LSHIFT, "Shift" }, + { VK_LWIN | 0x100, "Win" }, + { VK_MENU, "Alt" }, + { VK_MULTIPLY, "Num *" }, + { VK_NEXT | 0x100, "Page Down" }, + { VK_NUMLOCK | 0x100, "Num Lock" }, + { VK_NUMPAD0, "Num 0" }, + { VK_NUMPAD1, "Num 1" }, + { VK_NUMPAD2, "Num 2" }, + { VK_NUMPAD3, "Num 3" }, + { VK_NUMPAD4, "Num 4" }, + { VK_NUMPAD5, "Num 5" }, + { VK_NUMPAD6, "Num 6" }, + { VK_NUMPAD7, "Num 7" }, + { VK_NUMPAD8, "Num 8" }, + { VK_NUMPAD9, "Num 9" }, + { VK_OEM_CLEAR, "Num Clear" }, + { VK_OEM_NEC_EQUAL | 0x100, "Num =" }, + { VK_PRIOR | 0x100, "Page Up" }, + { VK_RCONTROL | 0x100, "Right Ctrl" }, + { VK_RETURN, "Return" }, + { VK_RETURN | 0x100, "Num Enter" }, + { VK_RIGHT | 0x100, "Right" }, + { VK_RMENU | 0x100, "Right Alt" }, + { VK_RSHIFT, "Right Shift" }, + { VK_RWIN | 0x100, "Right Win" }, + { VK_SEPARATOR, "Num ," }, + { VK_SHIFT, "Shift" }, + { VK_SPACE, "Space" }, + { VK_SUBTRACT, "Num -" }, + { VK_TAB, "Tab" }, + { VK_UP | 0x100, "Up" }, + { VK_VOLUME_DOWN | 0x100, "Volume Down" }, + { VK_VOLUME_MUTE | 0x100, "Mute" }, + { VK_VOLUME_UP | 0x100, "Volume Up" }, + { VK_OEM_MINUS, "-" }, + { VK_OEM_PLUS, "=" }, + { VK_OEM_1, ";" }, + { VK_OEM_2, "/" }, + { VK_OEM_3, "`" }, + { VK_OEM_4, "[" }, + { VK_OEM_5, "\\" }, + { VK_OEM_6, "]" }, + { VK_OEM_7, "'" }, + { VK_OEM_COMMA, "," }, + { VK_OEM_PERIOD, "." }, +}; + +static UINT scancode_to_vkey( UINT scan ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_to_scancode)/sizeof(vkey_to_scancode[0]); j++) + if (vkey_to_scancode[j] == scan) + return j; + return 0; +} + +static const char* vkey_to_name( UINT vkey ) +{ + UINT j; + + for (j = 0; j < sizeof(vkey_names)/sizeof(vkey_names[0]); j++) + if (vkey_names[j].vkey == vkey) + return vkey_names[j].name; + return NULL; +} /*********************************************************************** * keyboard_event @@ -649,3 +761,63 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, TRACE( "returning %d / %s\n", strlenW( buffer ), debugstr_wn(buf, strlenW( buffer ))); return strlenW( buffer ); } + + +/*********************************************************************** + * ANDROID_GetKeyNameText + */ +INT CDECL ANDROID_GetKeyNameText( LONG lparam, LPWSTR buffer, INT size ) +{ + int scancode, vkey, len; + const char *name; + char key[2]; + + scancode = (lparam >> 16) & 0x1FF; + vkey = scancode_to_vkey( scancode ); + + if (lparam & (1 << 25)) + { + /* Caller doesn't care about distinctions between left and + right keys. */ + switch (vkey) + { + case VK_LSHIFT: + case VK_RSHIFT: + vkey = VK_SHIFT; break; + case VK_LCONTROL: + case VK_RCONTROL: + vkey = VK_CONTROL; break; + case VK_LMENU: + case VK_RMENU: + vkey = VK_MENU; break; + } + } + + if (scancode & 0x100) vkey |= 0x100; + + if ((vkey >= 0x30 && vkey <= 0x39) || (vkey >= 0x41 && vkey <= 0x5a)) + { + key[0] = vkey; + if (vkey >= 0x41) + key[0] += 0x20; + key[1] = 0; + name = key; + } + else + { + name = vkey_to_name( vkey ); + } + + len = MultiByteToWideChar( CP_UTF8, 0, name, -1, buffer, size ); + if (len) len--; + + if (!len) + { + static const WCHAR format[] = {'K','e','y',' ','0','x','%','0','2','x',0}; + snprintfW( buffer, size, format, vkey ); + len = strlenW( buffer ); + } + + TRACE( "lparam 0x%08x -> %s\n", lparam, debugstr_w( buffer )); + return len; +} diff --git a/dlls/wineandroid.drv/wineandroid.drv.spec b/dlls/wineandroid.drv/wineandroid.drv.spec index 1a74624..4e7815a 100644 --- a/dlls/wineandroid.drv/wineandroid.drv.spec +++ b/dlls/wineandroid.drv/wineandroid.drv.spec @@ -4,6 +4,7 @@ # USER driver +@ cdecl GetKeyNameText(long ptr long) ANDROID_GetKeyNameText @ cdecl ToUnicodeEx(long long ptr ptr long long long) ANDROID_ToUnicodeEx @ cdecl EnumDisplayMonitors(long ptr ptr long) ANDROID_EnumDisplayMonitors @ cdecl GetMonitorInfo(long ptr) ANDROID_GetMonitorInfo

1 0

Hugh McMaster : regedit/tests: Remove an un-needed tab character from a key in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8096e2379883ad5f2caf2fdf3cd2088c76f863db URL: http://source.winehq.org/git/wine.git/?a=commit;h=8096e2379883ad5f2caf2fdf3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:38:04 2017 +0000 regedit/tests: Remove an un-needed tab character from a key in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 550c22b..b2e65a8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1197,7 +1197,7 @@ static void test_key_creation_and_deletion(void) verify_key_exist(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n"); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); verify_key_exist(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n"

1 0

Hugh McMaster : reg/tests: Remove un-needed tab characters from some keys in the key deletion tests.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8834968d02f9b7c30264623dc4835f17fe934315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8834968d02f9b7c30264623dc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 9 00:37:56 2017 +0000 reg/tests: Remove un-needed tab characters from some keys in the key deletion tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 58e003a..cc8dc10 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1676,7 +1676,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b"); @@ -2564,7 +2564,7 @@ static void test_import(void) todo_wine verify_key_exist(hkey, "Subkey2a"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" - "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b\t]\n", &r); + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_key_exist(hkey, "Subkey2b");

1 0

Nikolay Sivov : shell32: Use IS_INTRESOURCE() to test context menu verb kind.
by Alexandre Julliard 09 Jun '17

09 Jun '17

Module: wine Branch: master Commit: 8499ace1ffbd3ffc795fb52047cceae6290e78d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8499ace1ffbd3ffc795fb5204… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 9 02:36:16 2017 +0300 shell32: Use IS_INTRESOURCE() to test context menu verb kind. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlmenu.c | 25 ++++++++++++++----------- dlls/shell32/shlview_cmenu.c | 6 +++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 7a960ad..39ab4c6 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -1114,25 +1114,28 @@ static HRESULT WINAPI CompositeCMenu_GetCommandString(IContextMenu3* iface, UINT static HRESULT WINAPI CompositeCMenu_InvokeCommand(IContextMenu3* iface,LPCMINVOKECOMMANDINFO pici) { CompositeCMenu *This = impl_from_IContextMenu3(iface); - TRACE("(%p)->(%p)\n",iface,pici); - if(HIWORD(pici->lpVerb)) + + TRACE("(%p)->(%p)\n", iface, pici); + + if (IS_INTRESOURCE(pici->lpVerb)) + { + UINT id = (UINT_PTR)pici->lpVerb; + UINT index = CompositeCMenu_GetIndexForCommandId(This, id); + return IContextMenu_InvokeCommand(This->menus[index], pici); + } + else { /*call each handler until one of them succeeds*/ - UINT i=0; - for(;i<This->menu_count;i++) + UINT i; + + for (i = 0; i < This->menu_count; i++) { HRESULT hres; - if(SUCCEEDED(hres=IContextMenu_InvokeCommand(This->menus[i],pici))) + if (SUCCEEDED(hres = IContextMenu_InvokeCommand(This->menus[i], pici))) return hres; } return E_FAIL; } - else - { - UINT id = (UINT_PTR)pici->lpVerb; - UINT index = CompositeCMenu_GetIndexForCommandId(This,id); - return IContextMenu_InvokeCommand(This->menus[index],pici); - } } static HRESULT WINAPI CompositeCMenu_QueryContextMenu(IContextMenu3 *iface, HMENU hmenu,UINT indexMenu, UINT idCmdFirst, UINT idCmdLast, UINT uFlags) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 099f5bc..5c5ba1b 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -397,13 +397,13 @@ static HRESULT WINAPI ItemMenu_InvokeCommand( TRACE("(%p)->(invcom=%p verb=%p wnd=%p)\n",This,lpcmi,lpcmi->lpVerb, lpcmi->hwnd); - if( HIWORD(lpcmi->lpVerb)==0 && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) + if (IS_INTRESOURCE(lpcmi->lpVerb) && LOWORD(lpcmi->lpVerb) > FCIDM_SHVIEWLAST) { - TRACE("Invalid Verb %x\n",LOWORD(lpcmi->lpVerb)); + TRACE("Invalid Verb %x\n", LOWORD(lpcmi->lpVerb)); return E_INVALIDARG; } - if (HIWORD(lpcmi->lpVerb) == 0) + if (IS_INTRESOURCE(lpcmi->lpVerb)) { switch(LOWORD(lpcmi->lpVerb)) {

1 0

Andrey Gusev : shell32: Add IApplicationDestinations stub.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 8ea9c3382961fa28a84a60e56be22cbfa3571c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea9c3382961fa28a84a60e56… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:33 2017 +0300 shell32: Add IApplicationDestinations stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_classes.idl | 6 ++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shellole.c | 1 + dlls/shell32/shellpath.c | 119 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/dlls/shell32/shell32_classes.idl b/dlls/shell32/shell32_classes.idl index cc57b2b..6ed497f 100644 --- a/dlls/shell32/shell32_classes.idl +++ b/dlls/shell32/shell32_classes.idl @@ -69,6 +69,12 @@ coclass KnownFolderManager { interface IKnownFolderManager; } ] coclass ApplicationAssociationRegistration { interface IApplicationAssociationRegistration; } [ + helpstring("Application Destination List"), + threading(apartment), + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) +] coclass ApplicationDestinations { interface IApplicationDestinations; } + +[ helpstring("Shell Drag and Drop Helper"), threading(apartment), uuid(4657278a-411b-11d2-839a-00c04fd918d0) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index fc2a5ba..368c0e0 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -109,6 +109,8 @@ HRESULT WINAPI CPanel_ExtractIconW(LPITEMIDLIST pidl, LPCWSTR pszFile, UINT nIco HRESULT WINAPI IAutoComplete_Constructor(IUnknown * pUnkOuter, REFIID riid, LPVOID * ppv) DECLSPEC_HIDDEN; HRESULT WINAPI ApplicationAssociationRegistration_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; + HRESULT IShellLink_ConstructFromFile(IUnknown * pUnkOuter, REFIID riid, LPCITEMIDLIST pidl, IUnknown **ppv) DECLSPEC_HIDDEN; LPEXTRACTICONA IExtractIconA_Constructor(LPCITEMIDLIST) DECLSPEC_HIDDEN; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index d3d972b..7b6ee92 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -67,6 +67,7 @@ static const struct { } InterfaceTable[] = { {&CLSID_ApplicationAssociationRegistration, ApplicationAssociationRegistration_Constructor}, + {&CLSID_ApplicationDestinations, ApplicationDestinations_Constructor}, {&CLSID_AutoComplete, IAutoComplete_Constructor}, {&CLSID_ControlPanel, IControlPanel_Constructor}, {&CLSID_DragDropHelper, IDropTargetHelper_Constructor}, diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 8569b53..d2ebc66 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1021,6 +1021,125 @@ typedef enum _CSIDL_Type { typedef struct { + IApplicationDestinations IApplicationDestinations_iface; + LONG ref; +} IApplicationDestinationsImpl; + +static inline IApplicationDestinationsImpl *impl_from_IApplicationDestinations( IApplicationDestinations *iface ) +{ + return CONTAINING_RECORD(iface, IApplicationDestinationsImpl, IApplicationDestinations_iface); +} + +static HRESULT WINAPI ApplicationDestinations_QueryInterface(IApplicationDestinations *iface, REFIID riid, + LPVOID *ppv) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (ppv == NULL) + return E_POINTER; + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IApplicationDestinations, riid)) + { + *ppv = &This->IApplicationDestinations_iface; + IUnknown_AddRef((IUnknown*)*ppv); + + TRACE("Returning IApplicationDestinations: %p\n", *ppv); + return S_OK; + } + + *ppv = NULL; + FIXME("(%p)->(%s, %p) interface not supported.\n", This, debugstr_guid(riid), ppv); + + return E_NOINTERFACE; +} + +static ULONG WINAPI ApplicationDestinations_AddRef(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + return ref; +} + +static ULONG WINAPI ApplicationDestinations_Release(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p), new refcount=%i\n", This, ref); + + if (ref == 0) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI ApplicationDestinations_SetAppID(IApplicationDestinations *iface, const WCHAR *appid) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %s) stub!\n", This, debugstr_w(appid)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveDestination(IApplicationDestinations *iface, IUnknown *punk) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p, %p) stub!\n", This, punk); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ApplicationDestinations_RemoveAllDestinations(IApplicationDestinations *iface) +{ + IApplicationDestinationsImpl *This = impl_from_IApplicationDestinations(iface); + + FIXME("(%p) stub!\n", This); + + return E_NOTIMPL; +} + +static const IApplicationDestinationsVtbl ApplicationDestinationsVtbl = +{ + ApplicationDestinations_QueryInterface, + ApplicationDestinations_AddRef, + ApplicationDestinations_Release, + ApplicationDestinations_SetAppID, + ApplicationDestinations_RemoveDestination, + ApplicationDestinations_RemoveAllDestinations +}; + +HRESULT WINAPI ApplicationDestinations_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) +{ + IApplicationDestinationsImpl *This; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", outer, debugstr_guid(riid), ppv); + + if (outer) + return CLASS_E_NOAGGREGATION; + + if (!(This = SHAlloc(sizeof(*This)))) + return E_OUTOFMEMORY; + + This->IApplicationDestinations_iface.lpVtbl = &ApplicationDestinationsVtbl; + This->ref = 0; + + hr = IUnknown_QueryInterface(&This->IApplicationDestinations_iface, riid, ppv); + if (FAILED(hr)) + SHFree(This); + + return hr; +} + +typedef struct +{ const KNOWNFOLDERID *id; CSIDL_Type type; LPCWSTR szValueName;

1 0

Andrey Gusev : shobjidl.idl: Add IApplicationDestinations declaration.
by Alexandre Julliard 08 Jun '17

08 Jun '17

Module: wine Branch: master Commit: 9f4f9423d6f0dcb51f563884591d9c5d7b4cef2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f4f9423d6f0dcb51f5638845… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 7 16:20:32 2017 +0300 shobjidl.idl: Add IApplicationDestinations declaration. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shobjidl.idl | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 52d4e4d..571fbab 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -3467,6 +3467,22 @@ interface IApplicationAssociationRegistration : IUnknown } [ + object, + uuid(12337d35-94c6-48a0-bce7-6a9c69d4d600), + pointer_default(unique) +] +interface IApplicationDestinations : IUnknown +{ + HRESULT SetAppID( + [in] LPCWSTR pszAppID); + + HRESULT RemoveDestination( + [in] IUnknown *punk); + + HRESULT RemoveAllDestinations(); +} + +[ uuid(6332debf-87b5-4670-90c0-5e57b408a49e), object, pointer_default(unique) @@ -3739,6 +3755,14 @@ library ShellObjects } [ + uuid(86c14003-4d6b-4ef3-a7b4-0506663b2e68) + ] + coclass ApplicationDestinations + { + interface IApplicationDestinations; + } + + [ uuid(00021401-0000-0000-c000-000000000046) ] coclass ShellLink

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017