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

Alexandre Julliard : Wine release 2.10
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: website Branch: master Commit: f98e7a06ca1323a82d96b28433dca54926fea04b URL: http://source.winehq.org/git/website.git/?a=commit;h=f98e7a06ca1323a82d96b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:44:08 2017 +0200 Wine release 2.10 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017060901.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017060901.xml b/news/en/2017060901.xml new file mode 100644 index 0000000..43c515c --- /dev/null +++ b/news/en/2017060901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 9, 2017</date> +<title>Wine 2.10 Released</title> +<body> + The Wine development release 2.10 is now available. + <a href="{$root}/announce/2.10">What's new</a> in this release: +<ul> + <li>Initial version of the Android graphics driver.</li> + <li>Dictionary support in WebServices.</li> + <li>A number of Direct2D fixes.</li> + <li>User interface improvements in RegEdit.</li> + <li>OLE clipboard cache fixes.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.10.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.10 : Alexandre Julliard : Release 2.10
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: refs/tags/wine-2.10 Tag: 5c8ee03b9d8823fb03baa4016a52edb0ed55ece4 URL: http://source.winehq.org/git/wine.git/?a=tag;h=5c8ee03b9d8823fb03baa4016a52… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10

1 0

Józef Kucia : d3d11: Implement d3d11_query_GetDesc().
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 2fb2836b45977b7fcf14eddf820895f95b96da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb2836b45977b7fcf14eddf8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:03 2017 +0200 d3d11: Implement d3d11_query_GetDesc(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/async.c | 9 ++++++++- dlls/d3d11/d3d11_private.h | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index baa0926..4b290ad 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -159,7 +159,11 @@ static UINT STDMETHODCALLTYPE d3d11_query_GetDataSize(ID3D11Query *iface) static void STDMETHODCALLTYPE d3d11_query_GetDesc(ID3D11Query *iface, D3D11_QUERY_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_query *query = impl_from_ID3D11Query(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = query->desc; } static const struct ID3D11QueryVtbl d3d11_query_vtbl = @@ -428,6 +432,9 @@ static HRESULT d3d_query_init(struct d3d_query *query, struct d3d_device *device query->ID3D11Query_iface.lpVtbl = &d3d11_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl; query->refcount = 1; + + query->desc = *desc; + wined3d_mutex_lock(); wined3d_private_store_init(&query->private_store); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 57f1e90..479c84f 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -480,6 +480,7 @@ struct d3d_query struct wined3d_private_store private_store; struct wined3d_query *wined3d_query; BOOL predicate; + D3D11_QUERY_DESC desc; ID3D11Device *device; };

1 0

Józef Kucia : d3d10core/tests: Introduce get_query_data() helper function.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: de7f712ba9a18f308d9d55f1621e1ee18b59e254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7f712ba9a18f308d9d55f16… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 9 13:00:02 2017 +0200 d3d10core/tests: Introduce get_query_data() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 183 ++++++++++++++++-------------------------- 1 file changed, 68 insertions(+), 115 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=de7f712ba9a18f308d9d5…

1 0

Alistair Leslie-Hughes : dplayx: Implement IDirectPlay4 EnumConnections.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 2ef274b6087feeefdeb2750bf119a58b50c64046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef274b6087feeefdeb2750bf… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 8 05:37:40 2017 +0000 dplayx: Implement IDirectPlay4 EnumConnections. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 4a80f1c..fde0681 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -4490,8 +4490,8 @@ static HRESULT WINAPI IDirectPlay4Impl_EnumConnections( IDirectPlay4 *iface, const GUID *application, LPDPENUMCONNECTIONSCALLBACK enumcb, void *context, DWORD flags ) { IDirectPlayImpl *This = impl_from_IDirectPlay4( iface ); - FIXME( "(%p)->(%p,%p,%p,0x%08x): stub\n", This, application, enumcb, context, flags ); - return DP_OK; + return IDirectPlayX_EnumConnections( &This->IDirectPlay4A_iface, application, enumcb, context, + flags ); } static HRESULT WINAPI IDirectPlay3AImpl_EnumGroupsInGroup( IDirectPlay3A *iface, DPID group,

1 0

Hans Leidekker : wineandroid: Synchronize keyboard lock state.
by Alexandre Julliard June 9, 2017

June 9, 2017

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 June 9, 2017

June 9, 2017

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

Josh DuBois : wineandroid: Implement MapVirtualKeyEx.
by Alexandre Julliard June 9, 2017

June 9, 2017

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

Alexandre Julliard : Release 2.10.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 74d93d9bc0acadacc97c3dc803ede6ed4b8becb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74d93d9bc0acadacc97c3dc80… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 9 19:41:15 2017 +0200 Release 2.10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 749 ++++++++++++++++++++++++++++++++------------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 396 insertions(+), 373 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=74d93d9bc0acadacc97c3…

1 0

Andrey Gusev : uxtheme/tests: Fix a typo in ok() message.
by Alexandre Julliard June 9, 2017

June 9, 2017

Module: wine Branch: master Commit: 1a761379f8742fe79f696ea7c7bbf4aa02e9f764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a761379f8742fe79f696ea7c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 9 17:48:16 2017 +0300 uxtheme/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index beba353..6989f44 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -687,7 +687,7 @@ todo_wine hr = pGetBufferedPaintBits(NULL, &bits, &row); ok(hr == E_FAIL, "Unexpected return code %#x\n", hr); ok(row == 10, "Unexpected row count %d\n", row); - ok(bits == (void *)0xdeadbeef, "Unepexpected data pointer %p\n", bits); + ok(bits == (void *)0xdeadbeef, "Unexpected data pointer %p\n", bits); hr = pGetBufferedPaintBits(NULL, NULL, NULL); ok(hr == E_POINTER, "Unexpected return code %#x\n", hr);

1 0