February 2015 - Wine-commits

Henri Verbeet : d3d10core: Implement d3d10_vertex_shader_GetPrivateData().
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 43452192745f49961eef998b51dbc96c465b0b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43452192745f49961eef998b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 26 10:11:33 2015 +0100 d3d10core: Implement d3d10_vertex_shader_GetPrivateData(). --- 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 bb0e596..8010828 100644 --- a/dlls/d3d10core/shader.c +++ b/dlls/d3d10core/shader.c @@ -200,10 +200,12 @@ static void STDMETHODCALLTYPE d3d10_vertex_shader_GetDevice(ID3D10VertexShader * static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_GetPrivateData(ID3D10VertexShader *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", + struct d3d10_vertex_shader *shader = impl_from_ID3D10VertexShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d10_get_private_data(&shader->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d10_vertex_shader_SetPrivateData(ID3D10VertexShader *iface,

1 0

Henri Verbeet : d3d10core: Implement d3d10_geometry_shader_SetPrivateData( ).
by Alexandre Julliard 26 Feb '15

26 Feb '15

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 26 Feb '15

26 Feb '15

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

Michael Müller : gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: e618ab65ed5b623785c58ea5ece6e39895d43063 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e618ab65ed5b623785c58ea5e… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Feb 3 11:07:38 2015 +0100 gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats. --- dlls/gdi32/dibdrv/opengl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 28a03f4..a25da208 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -251,6 +251,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) HBITMAP bitmap; BITMAPOBJ *bmp; dib_info dib; + GLenum type; BOOL ret = FALSE; if (!context) @@ -281,7 +282,12 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context ) TRACE( "context %p bits %p size %ux%u\n", context, bits, width, height ); - ret = pOSMesaMakeCurrent( context->context, bits, GL_UNSIGNED_BYTE, width, height ); + if (pixel_formats[context->format - 1].mesa == OSMESA_RGB_565) + type = GL_UNSIGNED_SHORT_5_6_5; + else + type = GL_UNSIGNED_BYTE; + + ret = pOSMesaMakeCurrent( context->context, bits, type, width, height ); if (ret) { pOSMesaPixelStore( OSMESA_ROW_LENGTH, abs( dib.stride ) * 8 / dib.bit_count );

1 0

Amine Khaldi : include: Complete and properly pack DNS_HEADER structure.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 3809c7a1bc8c35bed4850eb4761c62a38b3cb4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3809c7a1bc8c35bed4850eb47… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Mon Feb 23 21:43:14 2015 +0100 include: Complete and properly pack DNS_HEADER structure. --- include/windns.h | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/include/windns.h b/include/windns.h index b8a3e09..fc2a49c 100644 --- a/include/windns.h +++ b/include/windns.h @@ -176,22 +176,26 @@ typedef struct _IP4_ARRAY IP4_ADDRESS AddrArray[1]; } IP4_ARRAY, *PIP4_ARRAY; +#include <pshpack1.h> typedef struct _DNS_HEADER { WORD Xid; - BYTE RecursionDesired; - BYTE Truncation; - BYTE Authoritative; - BYTE Opcode; - BYTE IsResponse; - BYTE ResponseCode; - BYTE Reserved; - BYTE RecursionAvailable; + BYTE RecursionDesired:1; + BYTE Truncation:1; + BYTE Authoritative:1; + BYTE Opcode:4; + BYTE IsResponse:1; + BYTE ResponseCode:4; + BYTE CheckingDisabled:1; + BYTE AuthenticatedData:1; + BYTE Reserved:1; + BYTE RecursionAvailable:1; WORD QuestionCount; WORD AnswerCount; WORD NameServerCount; WORD AdditionalCount; } DNS_HEADER, *PDNS_HEADER; +#include <poppack.h> typedef struct _DNS_MESSAGE_BUFFER {

1 0

Sebastian Lackner : shell32: Fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: aba6a680680c493add66f969a3a39b28f3a39779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba6a680680c493add66f969a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 26 06:29:51 2015 +0100 shell32: Fix memory leak in ApplicationAssociationRegistration_QueryCurrentDefault. --- dlls/shell32/assoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/shell32/assoc.c b/dlls/shell32/assoc.c index 528666e..686c323 100644 --- a/dlls/shell32/assoc.c +++ b/dlls/shell32/assoc.c @@ -916,6 +916,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp ret = RegGetValueW(hkey, NULL, NULL, RRF_RT_REG_SZ, &keytype, *association, &size); if(ret == ERROR_SUCCESS) hr = S_OK; + else + { + CoTaskMemFree(*association); + *association = NULL; + } } else hr = E_OUTOFMEMORY; @@ -952,6 +957,11 @@ static HRESULT WINAPI ApplicationAssociationRegistration_QueryCurrentDefault(IAp ret = RegGetValueW(hkey, path, propid, RRF_RT_REG_SZ, &keytype, *association, &size); if(ret == ERROR_SUCCESS) hr = S_OK; + else + { + CoTaskMemFree(*association); + *association = NULL; + } } else hr = E_OUTOFMEMORY;

1 0

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

26 Feb '15

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 26 Feb '15

26 Feb '15

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 26 Feb '15

26 Feb '15

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

Aric Stewart : imm32: Use thread data from target HWND.
by Alexandre Julliard 26 Feb '15

26 Feb '15

Module: wine Branch: master Commit: 455ca1adb08a87c01a7b044171c909176d8895cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=455ca1adb08a87c01a7b04417… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 25 11:45:22 2015 -0600 imm32: Use thread data from target HWND. --- dlls/imm32/imm.c | 39 +++++++++++++++++++++++++++++---------- dlls/imm32/tests/imm32.c | 21 ++++++++++++++------- 2 files changed, 43 insertions(+), 17 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index db5939c..2b3804e 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -246,6 +246,21 @@ static IMMThreadData* IMM_GetThreadData(DWORD id) return data; } +static IMMThreadData* IMM_GetThreadDataForWindow(HWND hwnd) +{ + DWORD process; + DWORD thread = 0; + + if (hwnd) + { + thread = GetWindowThreadProcessId(hwnd, &process); + if (process != GetCurrentProcessId()) + return NULL; + } + + return IMM_GetThreadData(thread); +} + static BOOL IMM_IsDefaultContext(HIMC imc) { InputContextData *data = get_imc_data(imc); @@ -478,21 +493,21 @@ static InputContextData* get_imc_data(HIMC hIMC) return data; } -static IMMThreadData* IMM_GetInitializedThreadData(void) +static IMMThreadData* IMM_GetInitializedThreadData(HWND hWnd) { - IMMThreadData* thread_data = IMM_GetThreadData(0); + IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) return NULL; - if (!thread_data->defaultContext) + if (!thread_data->defaultContext && thread_data->threadID == GetCurrentThreadId()) { HIMC defaultContext; LeaveCriticalSection(&threaddata_cs); defaultContext = ImmCreateContext(); if (defaultContext) ((InputContextData*)defaultContext)->threadDefault = TRUE; - thread_data = IMM_GetThreadData(0); + thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) { IMM_DestroyContext(defaultContext); @@ -528,7 +543,7 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && data->IMC.hWnd == hWnd) return hIMC; - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return NULL; @@ -603,7 +618,7 @@ BOOL WINAPI ImmAssociateContextEx(HWND hWnd, HIMC hIMC, DWORD dwFlags) TRACE("(%p, %p, 0x%x):\n", hWnd, hIMC, dwFlags); - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return FALSE; @@ -1470,7 +1485,7 @@ HIMC WINAPI ImmGetContext(HWND hWnd) return NULL; } - thread_data = IMM_GetInitializedThreadData(); + thread_data = IMM_GetInitializedThreadData(hWnd); if (!thread_data) return NULL; @@ -1595,18 +1610,21 @@ BOOL WINAPI ImmGetConversionStatus( HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { HWND ret, new = NULL; - IMMThreadData* thread_data = IMM_GetThreadData(0); + IMMThreadData* thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) return NULL; - if (thread_data->hwndDefault == NULL) + if (thread_data->hwndDefault == NULL && thread_data->threadID == GetCurrentThreadId()) { /* Do not create the window inside of a critical section */ LeaveCriticalSection(&threaddata_cs); new = CreateWindowExW( WS_EX_TOOLWINDOW, szwIME, NULL, WS_POPUP, 0, 0, 1, 1, 0, 0, 0, 0); - thread_data = IMM_GetThreadData(0); + thread_data = IMM_GetThreadDataForWindow(hWnd); if (!thread_data) + { + DestroyWindow(new); return NULL; + } /* See if anyone beat us */ if (thread_data->hwndDefault == NULL) { @@ -1622,6 +1640,7 @@ HWND WINAPI ImmGetDefaultIMEWnd(HWND hWnd) { DestroyWindow(new); } + TRACE("Default is %p\n",ret); return ret; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index d434648..34e82c6 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -425,15 +425,17 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) HWND hwnd2; COMPOSITIONFORM cf; POINT pt; + MSG msg; + igc_threadinfo *info= (igc_threadinfo*)lpParam; info->hwnd = CreateWindowExA(WS_EX_CLIENTEDGE, wndcls, "Wine imm32.dll test", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 240, 120, NULL, NULL, GetModuleHandleW(NULL), NULL); h1 = ImmGetContext(hwnd); - todo_wine ok(info->himc == h1, "hwnd context changed in new thread\n"); + ok(info->himc == h1, "hwnd context changed in new thread\n"); h2 = ImmGetContext(info->hwnd); - todo_wine ok(h2 != h1, "new hwnd in new thread should have different context\n"); + ok(h2 != h1, "new hwnd in new thread should have different context\n"); info->himc = h2; ImmReleaseContext(hwnd,h1); @@ -452,7 +454,12 @@ static DWORD WINAPI ImmGetContextThreadFunc( LPVOID lpParam) ImmSetStatusWindowPos(h1, &pt); SetEvent(info->event); - Sleep(INFINITE); + + while(GetMessageW(&msg, 0, 0, 0)) + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } return 1; } @@ -477,8 +484,8 @@ static void test_ImmThreads(void) otherHimc = ImmGetContext(threadinfo.hwnd); - todo_wine ok(himc != otherHimc, "Windows from other threads should have different himc\n"); - todo_wine ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); + ok(himc != otherHimc, "Windows from other threads should have different himc\n"); + ok(otherHimc == threadinfo.himc, "Context from other thread should not change in main thread\n"); if (0) /* FIXME: Causes wine to hang */ { @@ -566,7 +573,7 @@ static void test_ImmThreads(void) ok (rc == 1, "ImmGetCandidateWindow should succeed\n"); rc = ImmGetCandidateWindow(otherHimc, 0, &cdf); - todo_wine ok (rc == 0, "ImmGetCandidateWindow should fail\n"); + ok (rc == 0, "ImmGetCandidateWindow should fail\n"); rc = ImmSetCandidateWindow(otherHimc, &cdf); todo_wine ok (rc == 0, "ImmSetCandidateWindow should fail\n"); @@ -577,7 +584,7 @@ static void test_ImmThreads(void) TerminateThread(hThread, 1); himc = ImmGetContext(GetDesktopWindow()); - todo_wine ok(himc == NULL, "Should not be able to get himc from other process window\n"); + ok(himc == NULL, "Should not be able to get himc from other process window\n"); } static void test_ImmIsUIMessage(void)

1 0