February 2015 - Wine-Commits

Sebastian Lackner : winex11: Only enable XInput2 cursor warp workaround if necessary.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 7714efe2134f141a3e9f228f99c02185da5ef107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7714efe2134f141a3e9f228f9… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Jan 26 05:42:32 2015 +0100 winex11: Only enable XInput2 cursor warp workaround if necessary. Based on a patch by Patrick Rudolph. --- dlls/winex11.drv/mouse.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index f1e58fe..5f5bdeb 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -131,6 +131,7 @@ static Cursor create_cursor( HANDLE handle ); #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static BOOL xinput2_available; +static BOOL broken_rawevents; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(XIFreeDeviceInfo); MAKE_FUNCPTR(XIQueryDevice); @@ -1579,7 +1580,15 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) if (!hwnd) { struct x11drv_thread_data *thread_data = x11drv_thread_data(); - if (thread_data->warp_serial && (long)(event->serial - thread_data->warp_serial) < 0) return; + if (thread_data->warp_serial) + { + if ((long)(event->serial - thread_data->warp_serial) < 0) + { + TRACE( "pos %d,%d old serial %lu, ignoring\n", input.u.mi.dx, input.u.mi.dy, event->serial ); + return; + } + thread_data->warp_serial = 0; /* we caught up now */ + } } send_mouse_input( hwnd, event->window, event->state, &input ); @@ -1669,7 +1678,7 @@ static void X11DRV_RawMotion( XGenericEventCookie *xev ) break; } - if (thread_data->warp_serial) + if (broken_rawevents && thread_data->warp_serial) { if ((long)(xev->serial - thread_data->warp_serial) < 0) { @@ -1716,6 +1725,12 @@ void X11DRV_XInput2_Init(void) #undef LOAD_FUNCPTR xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error ); + + /* Until version 1.10.4 rawinput was broken in XOrg, see + * https://bugs.freedesktop.org/show_bug.cgi?id=30068 */ + broken_rawevents = strstr(XServerVendor( gdi_display ), "X.Org") && + XVendorRelease( gdi_display ) < 11004000; + #else TRACE( "X Input 2 support not compiled in.\n" ); #endif

1 0

Mark Harmstone : include: Add definition for KSDATAFORMAT_TYPE_AUDIO.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 67fda1b2c346213062f96128d633f5f48cc6afd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67fda1b2c346213062f96128d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 27 00:18:50 2015 +0000 include: Add definition for KSDATAFORMAT_TYPE_AUDIO. --- include/ksmedia.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ksmedia.h b/include/ksmedia.h index 88c9fad..ae95249 100644 --- a/include/ksmedia.h +++ b/include/ksmedia.h @@ -23,6 +23,8 @@ #ifndef _KSMEDIA_ #define _KSMEDIA_ +DEFINE_GUID(KSDATAFORMAT_TYPE_AUDIO, 0x73647561, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); + DEFINE_GUID(KSDATAFORMAT_SUBTYPE_PCM, 0x00000001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, 0x00000003, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71); DEFINE_GUID(KSDATAFORMAT_SUBTYPE_MULAW, 0x00000007, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);

1 0

Nikolay Sivov : include: Fix REPASTESPECIAL definition.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 8f517054d236967411042d7ff68e68b23214b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f517054d236967411042d7ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 18:07:37 2015 +0300 include: Fix REPASTESPECIAL definition. Spotted by Christoph von Wittich. --- include/richedit.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/richedit.h b/include/richedit.h index 6b27fc9..ce2c145 100644 --- a/include/richedit.h +++ b/include/richedit.h @@ -691,7 +691,7 @@ typedef struct _reqresize { typedef struct _repastespecial { DWORD dwAspect; - DWORD dwParam; + DWORD_PTR dwParam; } REPASTESPECIAL; typedef struct _punctuation {

1 0

Nikolay Sivov : scrrun/tests: More dictionary tests.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: wine Branch: master Commit: 94e5353f0d3b19c4bfc102d6d214fc48891eced9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e5353f0d3b19c4bfc102d6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 26 17:23:12 2015 +0300 scrrun/tests: More dictionary tests. --- dlls/scrrun/scrrun.idl | 5 +- dlls/scrrun/tests/dictionary.c | 169 +++++++++++++++++++++++++++++++++++++++++ dlls/scrrun/tests/scrrun.idl | 5 +- 3 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 53125ee..061d924d 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -27,7 +27,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228), diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index 0c3a92c..25cb0a6 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -93,6 +93,7 @@ static void test_comparemode(void) { CompareMethod method; IDictionary *dict; + VARIANT key, item; HRESULT hr; hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -122,6 +123,18 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(method == DatabaseCompare, "got %d\n", method); + /* try to change mode of a non-empty dict */ + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_put_CompareMode(dict, BinaryCompare); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + IDictionary_Release(dict); } @@ -414,6 +427,159 @@ static void test_hash_value(void) IDictionary_Release(dict); } +static void test_Exists(void) +{ + VARIANT_BOOL exists; + IDictionary *dict; + VARIANT key, item; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) /* crashes on native */ + hr = IDictionary_Exists(dict, NULL, NULL); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + hr = IDictionary_Exists(dict, &key, NULL); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + exists = VARIANT_TRUE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_FALSE, "got %x\n", exists); +} + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == CTL_E_KEY_ALREADY_EXISTS, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + hr = IDictionary_Exists(dict, &key, NULL); +todo_wine + ok(hr == CTL_E_ILLEGALFUNCTIONCALL, "got 0x%08x\n", hr); + + V_VT(&key) = VT_I2; + V_I2(&key) = 0; + exists = VARIANT_FALSE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_TRUE, "got %x\n", exists); +} + /* key of different type, but resolves to same hash value */ + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + exists = VARIANT_FALSE; + hr = IDictionary_Exists(dict, &key, &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists == VARIANT_TRUE, "got %x\n", exists); +} + IDictionary_Release(dict); +} + +static void test_Keys(void) +{ + VARIANT key, keys, item; + IDictionary *dict; + LONG index; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Keys(dict, NULL); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} + VariantClear(&keys); + + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + VariantInit(&keys); + hr = IDictionary_Keys(dict, &keys); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&keys) == (VT_ARRAY|VT_VARIANT), "got %d\n", V_VT(&keys)); +} +if (hr == S_OK) +{ + VariantInit(&key); + index = 0; + hr = SafeArrayGetElement(V_ARRAY(&keys), &index, &key); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&key) == VT_R4, "got %d\n", V_VT(&key)); + + index = SafeArrayGetDim(V_ARRAY(&keys)); + ok(index == 1, "got %d\n", index); + + hr = SafeArrayGetUBound(V_ARRAY(&keys), 1, &index); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(index == 0, "got %d\n", index); +} + VariantClear(&keys); + + IDictionary_Release(dict); +} + +static void test_Remove(void) +{ + VARIANT key, item; + IDictionary *dict; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_Dictionary, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IDictionary, (void**)&dict); + ok(hr == S_OK, "got 0x%08x\n", hr); + +if (0) + hr = IDictionary_Remove(dict, NULL); + + /* nothing added yet */ + V_VT(&key) = VT_R4; + V_R4(&key) = 0.0; + hr = IDictionary_Remove(dict, &key); +todo_wine + ok(hr == CTL_E_ELEMENT_NOT_FOUND, "got 0x%08x\n", hr); + + VariantInit(&item); + hr = IDictionary_Add(dict, &key, &item); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDictionary_Remove(dict, &key); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDictionary_Release(dict); +} + START_TEST(dictionary) { IDispatch *disp; @@ -433,6 +599,9 @@ START_TEST(dictionary) test_interfaces(); test_comparemode(); test_hash_value(); + test_Exists(); + test_Keys(); + test_Remove(); CoUninitialize(); } diff --git a/dlls/scrrun/tests/scrrun.idl b/dlls/scrrun/tests/scrrun.idl index 96835c7..91e0151 100644 --- a/dlls/scrrun/tests/scrrun.idl +++ b/dlls/scrrun/tests/scrrun.idl @@ -24,7 +24,10 @@ cpp_quote("#undef CopyFile") cpp_quote("#undef DeleteFile") cpp_quote("#undef MoveFile") cpp_quote("#endif") -cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") /* this is not defined in public headers */ +/* this is not defined in public headers */ +cpp_quote("#define CTL_E_ENDOFFILE STD_CTL_SCODE(62)") +cpp_quote("#define CTL_E_KEY_ALREADY_EXISTS STD_CTL_SCODE(457)") +cpp_quote("#define CTL_E_ELEMENT_NOT_FOUND STD_CTL_SCODE(32811)") [ uuid(420B2830-E718-11CF-893D-00A0C9054228),

1 0

Jacek Caban : winegecko.php: Make use of autoselect mirror SourceForge feature.
by Alexandre Julliard Feb. 27, 2015

Feb. 27, 2015

Module: tools Branch: master Commit: c97e300fa50540af4c9b9cea5d17293524320cbd URL: http://source.winehq.org/git/tools.git/?a=commit;h=c97e300fa50540af4c9b9cea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 27 11:45:49 2015 +0100 winegecko.php: Make use of autoselect mirror SourceForge feature. This leaves the job of redirecting to mirror to SourceForge, which may do much better job at this than we do. Our current solution is to redirect to random mirror known to have Gecko. In our current code, connection time is bad (it may even feel like it hangs), because we need an additional request from server script to a mirror to ensure that the resource is present there. Also, choosing random mirror often causes pretty bad transfers. --- winegecko.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/winegecko.php b/winegecko.php index fdc1b96..e44b9e3 100644 --- a/winegecko.php +++ b/winegecko.php @@ -48,6 +48,16 @@ default: // Name of the file $sFileName = sprintf('%s/%s/wine_gecko-%s.%s', $sFolder, $sVersion, $sFileSuffix, $sExt); +// SourceForge can do better job at redirecting to the mirror than us. However, +// it redirects to HTML page by default for web browser user agents. New enough +// Wine set user agent to 'Wine Addon Downloader', so redirect them directly +// to SourceForge. For older Wine and other user agents, fallback to random +// known mirror. +if(strcmp($_SERVER['HTTP_USER_AGENT'], 'Wine Addon Downloader') === 0) { + header("Location: http://sourceforge.net/projects/wine/files/".$sFileName); + exit; +} + // Size array $aFileSizes = array( '0.0.1'=>5219822,

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_SetPrivateData( ).
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 450a3fbfc20e4cca99e75425d1d4cd0dd48a927b URL: http://source.winehq.org/git/wine.git/?a=commit;h=450a3fbfc20e4cca99e75425d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:34 2015 +0100 d3d10core: Implement d3d10_geometry_shader_SetPrivateData(). --- dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/shader.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index dfd6149..8526cf2 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -215,6 +215,7 @@ struct d3d10_geometry_shader ID3D10GeometryShader ID3D10GeometryShader_iface; LONG refcount; + struct wined3d_private_store private_store; struct wined3d_shader *wined3d_shader; }; diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index 8010828..d1d67bd 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -377,10 +377,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_GetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10GeometryShader *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_set_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, @@ -406,6 +408,9 @@ static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl = static void STDMETHODCALLTYPE d3d10_geometry_shader_wined3d_object_destroyed(void *parent) { + struct d3d10_geometry_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); HeapFree(GetProcessHeap(), 0, parent); } @@ -425,12 +430,14 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct shader->ID3D10GeometryShader_iface.lpVtbl = &d3d10_geometry_shader_vtbl; shader->refcount = 1; + wined3d_private_store_init(&shader->private_store); shader_info.input_signature = &input_signature; shader_info.output_signature = &output_signature; if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &shader_info))) { ERR("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return hr; } @@ -446,6 +453,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct if (FAILED(hr)) { WARN("Failed to create wined3d geometry shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); return E_INVALIDARG; }

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_SetPrivateDataInterface().
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: e0e909ec48418c106ce35232a6c8bba68802ef62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0e909ec48418c106ce35232a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:35 2015 +0100 d3d10core: Implement d3d10_geometry_shader_SetPrivateDataInterface(). --- dlls/d3d10core/shader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c index d1d67bd..ee47001 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -388,9 +388,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateData(ID3D10Geom static HRESULT STDMETHODCALLTYPE d3d10_geometry_shader_SetPrivateDataInterface(ID3D10GeometryShader *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d10_geometry_shader *shader = impl_from_ID3D10GeometryShader(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d10_set_private_data_interface(&shader->private_store, guid, data); } static const struct ID3D10GeometryShaderVtbl d3d10_geometry_shader_vtbl =

1 0

Sebastian Lackner : shell32: Simplify check for an empty string.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: 9491044e443bf5627f6ec5ecb42e1aafd26336b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9491044e443bf5627f6ec5ecb… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 26 06:32:13 2015 +0100 shell32: Simplify check for an empty string. --- dlls/shell32/assoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 686c323..21df493 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -897,7 +897,7 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp *association = NULL; - if((type == AT_URLPROTOCOL || type == AT_FILEEXTENSION) && !lstrlenW(query)) + if((type == AT_URLPROTOCOL || type == AT_FILEEXTENSION) && !query[0]) return E_INVALIDARG; else if(type == AT_FILEEXTENSION && query[0] != '.') return E_INVALIDARG;

1 0

Aric Stewart : imm32: Move thread data from TLSEntry to an internal list.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: e28fc1177a1f77e89b81abfd5ee606dcab071ad9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28fc1177a1f77e89b81abfd5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:11 2015 -0600 imm32: Move thread data from TLSEntry to an internal list. --- dlls/imm32/imm.c | 168 +++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 132 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e28fc1177a1f77e89b81a…

1 0

Aric Stewart : imm32: Do not let ImmDestroyContext destroy any default contexts.
by Alexandre Julliard Feb. 26, 2015

Feb. 26, 2015

Module: wine Branch: master Commit: f3967902c5e5684d20429caddd81d31a6f211b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3967902c5e5684d20429cadd… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:18 2015 -0600 imm32: Do not let ImmDestroyContext destroy any default contexts. --- dlls/imm32/imm.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9dbdc1a..db5939c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -77,6 +77,7 @@ typedef struct tagInputContextData ImmHkl *immKbd; UINT lastVK; + BOOL threadDefault; DWORD magic; } InputContextData; @@ -119,6 +120,7 @@ static CRITICAL_SECTION threaddata_cs = { &critsect_debug, -1, 0, 0, 0, 0 }; #define is_kbd_ime_unicode(p) (p->imeInfo.fdwProperty & IME_PROP_UNICODE) static BOOL IMM_DestroyContext(HIMC hIMC); +static InputContextData* get_imc_data(HIMC hIMC); static inline WCHAR *strdupAtoW( const char *str ) { @@ -244,6 +246,16 @@ static IMMThreadData* IMM_GetThreadData(DWORD id) return data; } +static BOOL IMM_IsDefaultContext(HIMC imc) +{ + InputContextData *data = get_imc_data(imc); + + if (!data) + return FALSE; + + return data->threadDefault; +} + static void IMM_FreeThreadData(void) { IMMThreadData *data; @@ -478,6 +490,8 @@ static IMMThreadData* IMM_GetInitializedThreadData(void) HIMC defaultContext; LeaveCriticalSection(&threaddata_cs); defaultContext = ImmCreateContext(); + if (defaultContext) + ((InputContextData*)defaultContext)->threadDefault = TRUE; thread_data = IMM_GetThreadData(0); if (!thread_data) { @@ -780,11 +794,7 @@ static BOOL IMM_DestroyContext(HIMC hIMC) */ BOOL WINAPI ImmDestroyContext(HIMC hIMC) { - IMMThreadData* thread_data = IMM_GetThreadData(0); - HIMC defaultContext = thread_data->defaultContext; - LeaveCriticalSection(&threaddata_cs); - - if (hIMC != defaultContext) + if (!IMM_IsDefaultContext(hIMC)) return IMM_DestroyContext(hIMC); else return FALSE;

1 0