October 2021 - Wine-Commits

Piotr Caban : imm32: Destroy default IME windows in ImmDisableIME.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 684d023faad9549c642274d02c1363d5d179a417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=684d023faad9549c642274d0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:24 2021 +0200 imm32: Destroy default IME windows in ImmDisableIME. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 50 +++++++++++++++++++++++++++++++++++++------- dlls/imm32/tests/imm32.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 7 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 023d816a51e..1230c2e2b95 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -992,18 +992,58 @@ BOOL WINAPI ImmDestroyContext(HIMC hIMC) return FALSE; } +static HWND imm_detach_default_window(IMMThreadData *thread_data) +{ + HWND to_destroy; + + imm_couninit_thread(thread_data, TRUE); + to_destroy = thread_data->hwndDefault; + thread_data->hwndDefault = NULL; + thread_data->windowRefs = 0; + return to_destroy; +} + /*********************************************************************** * ImmDisableIME (IMM32.@) */ BOOL WINAPI ImmDisableIME(DWORD idThread) { + IMMThreadData *thread_data; + HWND to_destroy; + if (idThread == (DWORD)-1) + { disable_ime = TRUE; - else { - IMMThreadData *thread_data = IMM_GetThreadData(NULL, idThread); + + while (1) + { + to_destroy = 0; + EnterCriticalSection(&threaddata_cs); + LIST_FOR_EACH_ENTRY(thread_data, &ImmThreadDataList, IMMThreadData, entry) + { + if (thread_data->hwndDefault) + { + to_destroy = imm_detach_default_window(thread_data); + break; + } + } + LeaveCriticalSection(&threaddata_cs); + + if (!to_destroy) + break; + DestroyWindow(to_destroy); + } + } + else + { + thread_data = IMM_GetThreadData(NULL, idThread); if (!thread_data) return FALSE; thread_data->disableIME = TRUE; + to_destroy = imm_detach_default_window(thread_data); LeaveCriticalSection(&threaddata_cs); + + if (to_destroy) + DestroyWindow(to_destroy); } return TRUE; } @@ -1878,11 +1918,7 @@ void WINAPI __wine_unregister_window(HWND hwnd) /* Destroy default IME window */ if (thread_data->windowRefs == 0) - { - imm_couninit_thread(thread_data, TRUE); - to_destroy = thread_data->hwndDefault; - thread_data->hwndDefault = NULL; - } + to_destroy = imm_detach_default_window(thread_data); LeaveCriticalSection(&threaddata_cs); if (to_destroy) DestroyWindow( to_destroy ); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 759b564aba9..9e0e59d384d 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -2241,6 +2241,57 @@ static void test_com_initialization(void) test_apttype(-1); } +static DWORD WINAPI disable_ime_thread(void *arg) +{ + HWND h, def; + MSG msg; + BOOL r; + + h = CreateWindowA("static", "static", 0, 0, 0, 0, 0, 0, 0, 0, 0); + ok(h != NULL, "CreateWindow failed\n"); + def = ImmGetDefaultIMEWnd(h); + ok(def != NULL, "ImmGetDefaultIMEWnd returned NULL\n"); + + r = ImmDisableIME(arg ? GetCurrentThreadId() : 0); + ok(r, "ImmDisableIME failed\n"); + + if (arg) + { + def = ImmGetDefaultIMEWnd(h); + todo_wine ok(def != NULL, "ImmGetDefaultIMEWnd returned NULL\n"); + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + } + def = ImmGetDefaultIMEWnd(h); + ok(!def, "ImmGetDefaultIMEWnd returned %p\n", def); + return 0; +} + +static void test_ImmDisableIME(void) +{ + HANDLE thread; + HWND def; + BOOL r; + + def = ImmGetDefaultIMEWnd(hwnd); + ok(def != NULL, "ImmGetDefaultIMEWnd(hwnd) returned NULL\n"); + + thread = CreateThread(NULL, 0, disable_ime_thread, 0, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + thread = CreateThread(NULL, 0, disable_ime_thread, (void*)1, 0, NULL); + ok(thread != NULL, "CreateThread failed\n"); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + + r = ImmDisableIME(-1); + ok(r, "ImmDisableIME(-1) failed\n"); + def = ImmGetDefaultIMEWnd(hwnd); + ok(!def, "ImmGetDefaultIMEWnd(hwnd) returned %p\n", def); +} + START_TEST(imm32) { if (!is_ime_enabled()) { @@ -2276,6 +2327,9 @@ START_TEST(imm32) { if (pSendInput) test_ime_processkey(); else win_skip("SendInput is not available\n"); + + /* there's no way of enabling IME - keep the test last */ + test_ImmDisableIME(); } cleanup(); }

1 0

Piotr Caban : winemac.drv: Silence ImeSetActiveContext fixme.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 30c6ab463fcb99d4a196e2c9c10e7af7c39898e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c6ab463fcb99d4a196e2c9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:33 2021 +0200 winemac.drv: Silence ImeSetActiveContext fixme. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/ime.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index f2368c10743..8b89c0089fc 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -648,7 +648,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect) BOOL WINAPI ImeSetActiveContext(HIMC hIMC, BOOL fFlag) { - FIXME("(%p, %x): stub\n", hIMC, fFlag); + static int once; + + if (!once++) + FIXME("(%p, %x): stub\n", hIMC, fFlag); return TRUE; }

1 0

Piotr Caban : imm32: Use ImmSetActiveContext in ImmAssociateContext.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: e6d53d63019a3344bed6b1cd561d463fcca9c761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6d53d63019a3344bed6b1cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:03 2021 +0200 imm32: Use ImmSetActiveContext in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 34 ++++++++++++---------------------- dlls/imm32/tests/imm32.c | 26 ++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cbcc70daedf..790afc34adc 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -601,35 +601,25 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; + old = GetPropW(hWnd, szwWineIMCProperty); defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd, szwWineIMCProperty); - if (old == NULL) + if (!old) old = defaultContext; else if (old == (HIMC)-1) old = NULL; - if (hIMC != defaultContext) - { - if (hIMC == NULL) /* Meaning disable imm for that window*/ - SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); - else - SetPropW(hWnd, szwWineIMCProperty, hIMC); - } - - if (old) - { - InputContextData *old_data = old; - if (old_data->IMC.hWnd == hWnd) - old_data->IMC.hWnd = NULL; - } - - if (!hIMC) - return old; + if (old == hIMC) + return hIMC; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, FALSE, ISC_SHOWUIALL); - data->IMC.hWnd = hWnd; - SendMessageW(data->IMC.hWnd, WM_IME_SETCONTEXT, TRUE, ISC_SHOWUIALL); + if (!hIMC) /* Meaning disable imm for that window*/ + SetPropW(hWnd, szwWineIMCProperty, (HANDLE)-1); + else if (hIMC == defaultContext) + RemovePropW(hWnd, szwWineIMCProperty); + else + SetPropW(hWnd, szwWineIMCProperty, hIMC); + ImmSetActiveContext(hWnd, old, FALSE); + ImmSetActiveContext(hWnd, hIMC, TRUE); return old; } diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 18d69724e58..77df36b8e38 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -663,29 +663,55 @@ static void test_ImmAssociateContextEx(void) { HIMC retimc, newimc; + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + + ok(GetActiveWindow() == hwnd, "hwnd is not active\n"); newimc = ImmCreateContext(); ok(newimc != imc, "handles should not be the same\n"); rc = pImmAssociateContextEx(NULL, NULL, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, NULL, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); rc = pImmAssociateContextEx(NULL, imc, 0); ok(!rc, "ImmAssociateContextEx succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, imc, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); ok(retimc == imc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + rc = pImmAssociateContextEx(hwnd, imc, 0); + ok(rc, "ImmAssociateContextEx failed\n"); + + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, newimc, 0); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); retimc = ImmGetContext(hwnd); ok(retimc == newimc, "handles should be the same\n"); ImmReleaseContext(hwnd,retimc); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); rc = pImmAssociateContextEx(hwnd, NULL, IACE_DEFAULT); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); ok(rc, "ImmAssociateContextEx failed\n"); + + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); } ImmReleaseContext(hwnd,imc); }

1 0

Nikolay Sivov : d3d10/effect: Remove buffer type argument from object creation helper.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: d5153870050503a7ed985c3c0989a7ffa7684520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5153870050503a7ed985c3c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:21 2021 +0300 d3d10/effect: Remove buffer type argument from object creation helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index cc59f673369..a0ab21429f1 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2326,7 +2326,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return S_OK; } -static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBUFFER_TYPE type) +static HRESULT create_variable_buffer(struct d3d10_effect_variable *v) { D3D10_BUFFER_DESC buffer_desc; D3D10_SUBRESOURCE_DATA subresource_data; @@ -2344,7 +2344,7 @@ static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBU buffer_desc.Usage = D3D10_USAGE_DEFAULT; buffer_desc.CPUAccessFlags = 0; buffer_desc.MiscFlags = 0; - if (type == D3D10_CT_CBUFFER) + if (v->type->basetype == D3D10_SVT_CBUFFER) buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; else buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; @@ -2356,7 +2356,7 @@ static HRESULT create_variable_buffer(struct d3d10_effect_variable *v, D3D10_CBU if (FAILED(hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &subresource_data, &v->u.buffer.buffer))) return hr; - if (type == D3D10_CT_TBUFFER) + if (v->type->basetype == D3D10_SVT_TBUFFER) { srv_desc.Format = DXGI_FORMAT_R32G32B32A32_UINT; srv_desc.ViewDimension = D3D_SRV_DIMENSION_BUFFER; @@ -2561,7 +2561,7 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char if (local && l->type->size_unpacked) { - if (FAILED(hr = create_variable_buffer(l, d3d10_cbuffer_type))) + if (FAILED(hr = create_variable_buffer(l))) return hr; }

1 0

Nikolay Sivov : d3d10/effect: Use correct vertex shader element when returning input signature.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 7b6918f680ecba9bf06fa3405d7290e0f6849a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b6918f680ecba9bf06fa340… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:22 2021 +0300 d3d10/effect: Use correct vertex shader element when returning input signature. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 12 +++++++----- dlls/d3d10/tests/effect.c | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a0ab21429f1..3b4050460a0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3710,7 +3710,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa D3D10_PASS_DESC *desc) { struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); - struct d3d10_effect_shader_variable *s; + struct d3d10_effect_variable *vs; + ID3D10Blob *input_signature; TRACE("iface %p, desc %p.\n", iface, desc); @@ -3726,14 +3727,15 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *ifa return E_INVALIDARG; } - s = &pass->vs.shader->u.shader; + vs = d3d10_array_get_element(pass->vs.shader, pass->vs.index); + input_signature = vs->u.shader.input_signature; desc->Name = pass->name; desc->Annotations = pass->annotations.count; - if (s->input_signature) + if (input_signature) { - desc->pIAInputSignature = ID3D10Blob_GetBufferPointer(s->input_signature); - desc->IAInputSignatureSize = ID3D10Blob_GetBufferSize(s->input_signature); + desc->pIAInputSignature = ID3D10Blob_GetBufferPointer(input_signature); + desc->IAInputSignatureSize = ID3D10Blob_GetBufferSize(input_signature); } else { diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 04cbcbc662b..76beb682fea 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2913,6 +2913,7 @@ static void test_effect_local_shader(void) D3D10_EFFECT_SHADER_DESC shaderdesc; D3D10_SIGNATURE_PARAMETER_DESC sign; D3D10_STATE_BLOCK_MASK mask; + D3D10_PASS_DESC pass_desc; ID3D10Device *device; ULONG refcount; @@ -3611,6 +3612,12 @@ if (0) ok(typedesc.UnpackedSize == 0x0, "UnpackedSize is %#x, expected 0x0\n", typedesc.UnpackedSize); ok(typedesc.Stride == 0x0, "Stride is %#x, expected 0x0\n", typedesc.Stride); + /* Get input signature from vertex shader set from array element. */ + hr = p->lpVtbl->GetDesc(p, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!pass_desc.pIAInputSignature, "Expected input signature.\n"); + ok(pass_desc.IAInputSignatureSize == 88, "Unexpected input signature size.\n"); + /* pass 6 pixelshader */ hr = p->lpVtbl->GetPixelShaderDesc(p, &pdesc); ok(hr == S_OK, "GetPixelShaderDesc got %x, expected %x\n", hr, S_OK);

1 0

Nikolay Sivov : d3d10/tests: Use IsValid() instead of null checks.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 7c7a14bfc2d13b2cc2049c861e4be66d8259720b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c7a14bfc2d13b2cc2049c86… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:23 2021 +0300 d3d10/tests: Use IsValid() instead of null checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 76beb682fea..bd5392fcd16 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4499,9 +4499,9 @@ static void test_effect_state_groups(void) rast_desc.AntialiasedLineEnable); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); - ok(!!technique, "Failed to get technique.\n"); + ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); pass = technique->lpVtbl->GetPassByName(technique, "pass0"); - ok(!!pass, "Failed to get pass.\n"); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); @@ -4789,9 +4789,9 @@ static void test_effect_state_group_defaults(void) rast_desc.AntialiasedLineEnable); technique = effect->lpVtbl->GetTechniqueByName(effect, "tech0"); - ok(!!technique, "Failed to get technique.\n"); + ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); pass = technique->lpVtbl->GetPassByName(technique, "pass0"); - ok(!!pass, "Failed to get pass.\n"); + ok(pass->lpVtbl->IsValid(pass), "Failed to get pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); ok(SUCCEEDED(hr), "Failed to get pass desc, hr %#x.\n", hr); ok(!strcmp(pass_desc.Name, "pass0"), "Got unexpected Name \"%s\".\n", pass_desc.Name); @@ -6155,9 +6155,9 @@ static void test_effect_resource_variable(void) /* Apply the pass to bind the resource to the shader. */ technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); - ok(!!technique, "Got unexpected technique %p.\n", technique); + ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); pass = technique->lpVtbl->GetPassByName(technique, "p0"); - ok(!!pass, "Got unexpected pass %p.\n", pass); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); hr = pass->lpVtbl->GetDesc(pass, &pass_desc); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!pass_desc.pIAInputSignature, "Unexpected input signature.\n"); @@ -6227,9 +6227,9 @@ static void test_effect_resource_variable(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); technique = effect->lpVtbl->GetTechniqueByName(effect, "rsrc_test"); - ok(!!technique, "Got unexpected technique %p.\n", technique); + ok(technique->lpVtbl->IsValid(technique), "Expected valid technique.\n"); pass = technique->lpVtbl->GetPassByName(technique, "p0"); - ok(!!pass, "Got unexpected pass %p.\n", pass); + ok(pass->lpVtbl->IsValid(pass), "Expected valid pass.\n"); var = effect->lpVtbl->GetVariableByName(effect, "s"); ok(var->lpVtbl->IsValid(var), "Expected valid variable.\n");

1 0

Piotr Caban : imm32: Add ImmSetActiveContext implementation.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 80ac0b9af4302a3d7be4868b7507740abbe5e0d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80ac0b9af4302a3d7be4868b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:26:50 2021 +0200 imm32: Add ImmSetActiveContext implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 28 ++++++++++++++++++++++ dlls/imm32/imm32.spec | 2 +- dlls/imm32/tests/imm32.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 20633041871..d933ca06c2f 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -550,6 +550,34 @@ static BOOL IMM_IsCrossThreadAccess(HWND hWnd, HIMC hIMC) return FALSE; } +/*********************************************************************** + * ImmSetActiveContext (IMM32.@) + */ +BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) +{ + InputContextData *data = get_imc_data(himc); + + TRACE("(%p, %p, %x)\n", hwnd, himc, activate); + + if (himc && !data && activate) + return FALSE; + + if (data) + { + data->IMC.hWnd = activate ? hwnd : NULL; + + if (data->immKbd->hIME && data->immKbd->pImeSetActiveContext) + data->immKbd->pImeSetActiveContext(himc, activate); + } + + if (IsWindow(hwnd)) + { + SendMessageW(hwnd, WM_IME_SETCONTEXT, activate, ISC_SHOWUIALL); + /* TODO: send WM_IME_NOTIFY */ + } + return TRUE; +} + /*********************************************************************** * ImmAssociateContext (IMM32.@) */ diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 4197bb81e21..25876de873d 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -86,7 +86,7 @@ @ stub ImmSendIMEMessageExA @ stub ImmSendIMEMessageExW @ stub ImmSendMessageToActiveDefImeWndW -@ stub ImmSetActiveContext +@ stdcall ImmSetActiveContext(long long long) @ stub ImmSetActiveContextConsoleIME @ stdcall ImmSetCandidateWindow(long ptr) @ stdcall ImmSetCompositionFontA(long ptr) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index cc9e0e8c01f..18d69724e58 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -26,10 +26,44 @@ #include "imm.h" #include "ddk/imm.h" +BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); + static BOOL (WINAPI *pImmAssociateContextEx)(HWND,HIMC,DWORD); static BOOL (WINAPI *pImmIsUIMessageA)(HWND,UINT,WPARAM,LPARAM); static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE, enabled_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + if (enabled_ ## func) {\ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + } \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define SET_ENABLE(func, val) \ + enabled_ ## func = (val) + +DEFINE_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); +DEFINE_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + /* * msgspy - record and analyse message traces sent to a certain window */ @@ -182,6 +216,9 @@ static LRESULT WINAPI wndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) switch (msg) { case WM_IME_SETCONTEXT: + if (wParam) CHECK_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + else CHECK_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + ok(lParam == ISC_SHOWUIALL || !lParam, "lParam = %lx\n", lParam); return TRUE; case WM_NCCREATE: default_ime_wnd = get_ime_window(); @@ -737,6 +774,19 @@ static void test_ImmThreads(void) 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"); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + SET_EXPECT(WM_IME_SETCONTEXT_ACTIVATE); + rc = ImmSetActiveContext(hwnd, otherHimc, TRUE); + ok(rc, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_ACTIVATE); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + rc = ImmSetActiveContext(hwnd, otherHimc, FALSE); + ok(rc, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + h1 = ImmAssociateContext(hwnd,otherHimc); ok(h1 == NULL, "Should fail to be able to Associate a default context from a different thread\n"); h1 = ImmGetContext(hwnd); @@ -1680,6 +1730,7 @@ static void test_InvalidIMC(void) CHAR buffer[1000]; INPUTCONTEXT *ic; LOGFONTA lf; + BOOL r; memset(&lf, 0, sizeof(lf)); @@ -1697,6 +1748,17 @@ static void test_InvalidIMC(void) imc2 = ImmGetContext(hwnd); ok(imc1 == imc2, "imc should not changed! imc1 %p, imc2 %p\n", imc1, imc2); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, TRUE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, TRUE); + r = ImmSetActiveContext(hwnd, imc_destroy, TRUE); + ok(!r, "ImmSetActiveContext succeeded\n"); + SET_EXPECT(WM_IME_SETCONTEXT_DEACTIVATE); + r = ImmSetActiveContext(hwnd, imc_destroy, FALSE); + ok(r, "ImmSetActiveContext failed\n"); + CHECK_CALLED(WM_IME_SETCONTEXT_DEACTIVATE); + SET_ENABLE(WM_IME_SETCONTEXT_ACTIVATE, FALSE); + SET_ENABLE(WM_IME_SETCONTEXT_DEACTIVATE, FALSE); + /* Test associating NULL imc, which is different from an invalid imc */ oldimc = ImmAssociateContext(hwnd, imc_null); ok(oldimc != NULL, "Associating to NULL imc should success!\n");

1 0

Piotr Caban : imm32: Initialize COM in ImmSetActiveContext.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: ea0c992fa5852d6236bf9977c774d7d40bdb113a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea0c992fa5852d6236bf9977… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:27:15 2021 +0200 imm32: Initialize COM in ImmSetActiveContext. Loosely based on a patch by Nikolay. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/Makefile.in | 2 +- dlls/imm32/imm.c | 161 ++++++++++++++++++++++++++++++++++++++++++- dlls/imm32/tests/Makefile.in | 2 +- dlls/imm32/tests/imm32.c | 145 +++++++++++++++++++++++++++++++++++--- 4 files changed, 298 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea0c992fa5852d6236bf…

1 0

Jan Sikorski : d3d11: Use wined3d_device_context_set_render_targets_and_unordered_access_views() in OMSetRenderTargets.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: 4a83ccfb5c066b540f6770aee997abaa62d01679 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a83ccfb5c066b540f6770ae… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:25:59 2021 +0200 d3d11: Use wined3d_device_context_set_render_targets_and_unordered_access_views() in OMSetRenderTargets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 31c68f62e68..764fbece076 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1128,11 +1128,8 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargets(ID3D11Devi dsv = unsafe_impl_from_ID3D11DepthStencilView(depth_stencil_view); - wined3d_mutex_lock(); - wined3d_device_context_set_rendertarget_views(context->wined3d_context, 0, - ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, FALSE); - wined3d_device_context_set_depth_stencil_view(context->wined3d_context, dsv ? dsv->wined3d_view : NULL); - wined3d_mutex_unlock(); + wined3d_device_context_set_render_targets_and_unordered_access_views(context->wined3d_context, + ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ~0u, NULL, NULL); } static void STDMETHODCALLTYPE d3d11_device_context_OMSetRenderTargetsAndUnorderedAccessViews( @@ -4988,12 +4985,8 @@ static void STDMETHODCALLTYPE d3d10_device_OMSetRenderTargets(ID3D10Device1 *ifa dsv = unsafe_impl_from_ID3D10DepthStencilView(depth_stencil_view); - wined3d_mutex_lock(); - wined3d_device_context_set_rendertarget_views(device->immediate_context.wined3d_context, 0, - ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, FALSE); - wined3d_device_context_set_depth_stencil_view(device->immediate_context.wined3d_context, - dsv ? dsv->wined3d_view : NULL); - wined3d_mutex_unlock(); + wined3d_device_context_set_render_targets_and_unordered_access_views(device->immediate_context.wined3d_context, + ARRAY_SIZE(wined3d_rtvs), wined3d_rtvs, dsv ? dsv->wined3d_view : NULL, ~0u, NULL, NULL); } static void STDMETHODCALLTYPE d3d10_device_OMSetBlendState(ID3D10Device1 *iface,

1 0

Jan Sikorski : d3d11: Don't grab wined3d lock for reference decrementing functions.
by Alexandre Julliard Oct. 15, 2021

Oct. 15, 2021

Module: wine Branch: master Commit: a519188f63749ffc04fca27f428ca7679bbe8ee8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a519188f63749ffc04fca27f… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Oct 15 14:26:02 2021 +0200 d3d11: Don't grab wined3d lock for reference decrementing functions. Except wined3d_texture_decref(). Signed-off-by: Jan Sikorski <jsikorski(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 | 4 ---- dlls/d3d11/buffer.c | 2 -- dlls/d3d11/device.c | 4 ---- dlls/d3d11/inputlayout.c | 4 ---- dlls/d3d11/shader.c | 21 --------------------- dlls/d3d11/state.c | 14 -------------- dlls/d3d11/view.c | 16 ---------------- 7 files changed, 65 deletions(-) diff --git a/dlls/d3d11/async.c b/dlls/d3d11/async.c index 4476d56404f..74ba62b3d04 100644 --- a/dlls/d3d11/async.c +++ b/dlls/d3d11/async.c @@ -88,11 +88,7 @@ static ULONG STDMETHODCALLTYPE d3d11_query_Release(ID3D11Query *iface) if (!refcount) { ID3D11Device2 *device = query->device; - - wined3d_mutex_lock(); wined3d_query_decref(query->wined3d_query); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/buffer.c b/dlls/d3d11/buffer.c index 180641caef5..ab8471d6f52 100644 --- a/dlls/d3d11/buffer.c +++ b/dlls/d3d11/buffer.c @@ -86,9 +86,7 @@ static ULONG STDMETHODCALLTYPE d3d11_buffer_Release(ID3D11Buffer *iface) { ID3D11Device2 *device = buffer->device; - wined3d_mutex_lock(); wined3d_buffer_decref(buffer->wined3d_buffer); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 764fbece076..f306f9ebc7a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -375,9 +375,7 @@ static ULONG STDMETHODCALLTYPE d3d11_command_list_Release(ID3D11CommandList *ifa if (!refcount) { - wined3d_mutex_lock(); wined3d_command_list_decref(list->wined3d_list); - wined3d_mutex_unlock(); wined3d_private_store_cleanup(&list->private_store); ID3D11Device2_Release(list->device); heap_free(list); @@ -4541,9 +4539,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) d3d11_device_context_cleanup(&device->immediate_context); if (device->wined3d_device) { - wined3d_mutex_lock(); wined3d_device_decref(device->wined3d_device); - wined3d_mutex_unlock(); } wine_rb_destroy(&device->sampler_states, NULL, NULL); wine_rb_destroy(&device->rasterizer_states, NULL, NULL); diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 34d273b31c8..520fa0ba7b3 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -154,11 +154,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_Release(ID3D11InputLayout *ifa if (!refcount) { ID3D11Device2 *device = layout->device; - - wined3d_mutex_lock(); wined3d_vertex_declaration_decref(layout->wined3d_decl); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index e474ae692d5..eec164a876c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -86,9 +86,7 @@ static ULONG STDMETHODCALLTYPE d3d11_vertex_shader_Release(ID3D11VertexShader *i { ID3D11Device2 *device = shader->device; - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -379,11 +377,7 @@ static ULONG STDMETHODCALLTYPE d3d11_hull_shader_Release(ID3D11HullShader *iface if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -570,11 +564,7 @@ static ULONG STDMETHODCALLTYPE d3d11_domain_shader_Release(ID3D11DomainShader *i if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -771,11 +761,7 @@ static ULONG STDMETHODCALLTYPE d3d11_geometry_shader_Release(ID3D11GeometryShade if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1273,10 +1259,7 @@ static ULONG STDMETHODCALLTYPE d3d11_pixel_shader_Release(ID3D11PixelShader *ifa if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); @@ -1566,11 +1549,7 @@ static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader if (!refcount) { ID3D11Device2 *device = shader->device; - - wined3d_mutex_lock(); wined3d_shader_decref(shader->wined3d_shader); - wined3d_mutex_unlock(); - /* Release the device last, it may cause the wined3d device to be * destroyed. */ ID3D11Device2_Release(device); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 8fa94a12a66..810217c93b4 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -80,11 +80,7 @@ static ULONG STDMETHODCALLTYPE d3d11_blend_state_Release(ID3D11BlendState *iface if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_blend_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -511,9 +507,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_state_Release(ID3D11DepthStenc { ID3D11Device2 *device = state->device; - wined3d_mutex_lock(); wined3d_depth_stencil_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); ID3D11Device2_Release(device); } @@ -908,11 +902,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_rasterizer_state_decref(state->wined3d_state); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1294,11 +1284,7 @@ static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *i if (!refcount) { ID3D11Device2 *device = state->device; - - wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 1679729e15c..89c541fa9ed 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -979,11 +979,7 @@ static ULONG STDMETHODCALLTYPE d3d11_depthstencil_view_Release(ID3D11DepthStenci if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1421,11 +1417,7 @@ static ULONG STDMETHODCALLTYPE d3d11_rendertarget_view_Release(ID3D11RenderTarge if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_rendertarget_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -1867,11 +1859,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); } @@ -2350,11 +2338,7 @@ static ULONG STDMETHODCALLTYPE d3d11_unordered_access_view_Release(ID3D11Unorder if (!refcount) { ID3D11Device2 *device = view->device; - - wined3d_mutex_lock(); wined3d_unordered_access_view_decref(view->wined3d_view); - wined3d_mutex_unlock(); - ID3D11Device2_Release(device); }

1 0