wine-commits October 2021

wine-commits@winehq.org

2 participants
1165 discussions

Piotr Caban : imm32: Use ImmSetActiveContext in ImmAssociateContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

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

Piotr Caban : imm32: Exit on invalid window in ImmAssociateContext.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 266c1101b3e0e0297b6062a4d34b2b766b4c9d33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=266c1101b3e0e0297b6062a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 15 15:26:57 2021 +0200 imm32: Exit on invalid window in ImmAssociateContext. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d933ca06c2f..cbcc70daedf 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -583,12 +583,13 @@ BOOL WINAPI ImmSetActiveContext(HWND hwnd, HIMC himc, BOOL activate) */ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) { - HIMC old = NULL; InputContextData *data = get_imc_data(hIMC); + HIMC defaultContext; + HIMC old; TRACE("(%p, %p):\n", hWnd, hIMC); - if(hIMC && !data) + if (!IsWindow(hWnd) || (hIMC && !data)) return NULL; /* @@ -600,30 +601,26 @@ HIMC WINAPI ImmAssociateContext(HWND hWnd, HIMC hIMC) if (hIMC && IMM_IsCrossThreadAccess(hWnd, hIMC)) return NULL; - if (hWnd) - { - HIMC defaultContext = get_default_context( hWnd ); - old = RemovePropW(hWnd,szwWineIMCProperty); + defaultContext = get_default_context( hWnd ); + old = RemovePropW(hWnd, szwWineIMCProperty); + if (old == NULL) + old = defaultContext; + else if (old == (HIMC)-1) + old = NULL; - if (old == NULL) - 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 (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 (old) + { + InputContextData *old_data = old; + if (old_data->IMC.hWnd == hWnd) + old_data->IMC.hWnd = NULL; } if (!hIMC)

1 0

Piotr Caban : imm32: Add ImmSetActiveContext implementation.
by Alexandre Julliard 15 Oct '21

15 Oct '21

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

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

15 Oct '21

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

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

15 Oct '21

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/effect: Remove buffer type argument from object creation helper.
by Alexandre Julliard 15 Oct '21

15 Oct '21

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 SamplerState.Texture when setting shader resources.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 69ae2cc7e737e3dd9a6053ff925339c2afb9606c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ae2cc7e737e3dd9a6053ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:20 2021 +0300 d3d10/effect: Use SamplerState.Texture when setting shader resources. 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 | 24 ++++- dlls/d3d10/tests/effect.c | 245 ++++++++++++++++++++++++++++------------------ 2 files changed, 171 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=69ae2cc7e737e3dd9a60…

1 0

Nikolay Sivov : d3d10/effect: Use destination index when setting array property element.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: c0e2138ed735fc42c74c65f08d90c07934e82701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0e2138ed735fc42c74c65f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:19 2021 +0300 d3d10/effect: Use destination index when setting array property element. 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 29d59f2620b..6fc69b0df39 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1830,7 +1830,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } - *(void **)dst = variable; + ((void **)dst)[idx] = variable; } else { @@ -1888,11 +1888,11 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size case D3D10_SVT_VERTEXSHADER: case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: - *(void **)dst = variable; + ((void **)dst)[idx] = variable; *dst_index = variable_idx; break; default: - *(void **)dst = &variable->elements[variable_idx]; + ((void **)dst)[idx] = &variable->elements[variable_idx]; } } else @@ -1957,7 +1957,7 @@ static HRESULT parse_fx10_property_assignment(const char *data, size_t data_size return E_FAIL; } - *(void **)dst = variable; + ((void **)dst)[idx] = variable; break;

1 0

Nikolay Sivov : d3d10/effect: Pick up resources from elements when shader variable arrays are used.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 64df3c61a5b7c86f29f292f131c14a41f027a154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64df3c61a5b7c86f29f292f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:18 2021 +0300 d3d10/effect: Pick up resources from elements when shader variable arrays are used. 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 | 11 ++-------- dlls/d3d10/tests/effect.c | 54 +++++++++++++++++++++++++---------------------- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 17a4c547a2c..29d59f2620b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3979,6 +3979,8 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, default: WARN("Unexpected shader type %u.\n", v->type->basetype); } + + apply_shader_resources(device, v); } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) @@ -3991,20 +3993,11 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface if (flags) FIXME("Ignoring flags (%#x)\n", flags); if (pass->vs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->vs); - apply_shader_resources(device, pass->vs.shader); - } if (pass->gs.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->gs); - apply_shader_resources(device, pass->gs.shader); - } if (pass->ps.shader != &null_shader_variable) - { d3d10_effect_pass_set_shader(pass, &pass->ps); - apply_shader_resources(device, pass->ps.shader); - } if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); if (pass->depth_stencil) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index dd16aab5aaa..93e82490eb0 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5946,43 +5946,47 @@ float4 PS( float4 pos : SV_POSITION ) : SV_Target return t_a[1].Sample(s[1], float2(0, 0)); } +PixelShader ps[1] = { CompileShader(ps_4_0, PS()) }; + technique10 rsrc_test { pass p0 { - SetPixelShader(CompileShader(ps_4_0, PS())); + SetPixelShader(ps[0]); } } #endif static DWORD fx_test_resource_variable2[] = { - 0x43425844, 0xb62313ac, 0x8116090b, 0xdc1d2951, 0xfc18ca42, 0x00000001, 0x0000035a, 0x00000001, - 0x00000024, 0x30315846, 0x0000032e, 0xfeff1001, 0x00000000, 0x00000000, 0x00000002, 0x00000000, - 0x00000000, 0x00000000, 0x00000001, 0x0000028a, 0x00000000, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x74786554, + 0x43425844, 0xecd43fcd, 0x0654927c, 0x71931f03, 0xf166cc09, 0x00000001, 0x0000039d, 0x00000001, + 0x00000024, 0x30315846, 0x00000371, 0xfeff1001, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x000002b5, 0x00000000, 0x00000002, 0x00000000, 0x00000000, + 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x74786554, 0x32657275, 0x00040044, 0x00020000, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x000c0000, 0x5f740000, 0x61530061, 0x656c706d, 0x61745372, 0x2e006574, 0x02000000, 0x02000000, 0x00000000, - 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x72737200, 0x65745f63, 0x70007473, 0x02180030, - 0x58440000, 0xb2424342, 0x3c889e83, 0xb8b8fc18, 0x749f2920, 0x0001877a, 0x02180000, 0x00050000, - 0x00340000, 0x00c80000, 0x00fc0000, 0x01300000, 0x019c0000, 0x44520000, 0x008c4645, 0x00000000, - 0x00000000, 0x00020000, 0x001c0000, 0x04000000, 0x0100ffff, 0x00620000, 0x005c0000, 0x00030000, - 0x00000000, 0x00000000, 0x00000000, 0x00010000, 0x00020000, 0x00010000, 0x005e0000, 0x00020000, - 0x00050000, 0x00040000, 0xffff0000, 0x0000ffff, 0x00020000, 0x000c0000, 0x00730000, 0x00615f74, - 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, - 0x31207265, 0x00312e30, 0x5349abab, 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, - 0x00010000, 0x00030000, 0x00000000, 0x000f0000, 0x56530000, 0x534f505f, 0x4f495449, 0x534f004e, - 0x002c4e47, 0x00010000, 0x00080000, 0x00200000, 0x00000000, 0x00000000, 0x00030000, 0x00000000, - 0x000f0000, 0x56530000, 0x7261545f, 0x00746567, 0x4853abab, 0x00645244, 0x00400000, 0x00190000, - 0x005a0000, 0x60000300, 0x00020010, 0x18580000, 0x70000400, 0x00010010, 0x55550000, 0x00650000, - 0x20f20300, 0x00000010, 0x00450000, 0x20f20c00, 0x00000010, 0x40020000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x7e460000, 0x00010010, 0x60000000, 0x00020010, 0x003e0000, 0x54530100, - 0x00745441, 0x00020000, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000000, 0x00000000, - 0x00010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00000000, 0x00000000, 0x15000000, 0x73000000, 0x78695000, 0x68536c65, 0x72656461, 0x00005900, + 0x00000200, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000500, 0x00737000, 0x00000218, + 0x43425844, 0x9e83b242, 0xfc183c88, 0x2920b8b8, 0x877a749f, 0x00000001, 0x00000218, 0x00000005, + 0x00000034, 0x000000c8, 0x000000fc, 0x00000130, 0x0000019c, 0x46454452, 0x0000008c, 0x00000000, + 0x00000000, 0x00000002, 0x0000001c, 0xffff0400, 0x00000100, 0x00000062, 0x0000005c, 0x00000003, + 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000002, 0x00000001, 0x0000005e, 0x00000002, + 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000002, 0x0000000c, 0x5f740073, 0x694d0061, + 0x736f7263, 0x2074666f, 0x20295228, 0x4c534c48, 0x61685320, 0x20726564, 0x706d6f43, 0x72656c69, + 0x2e303120, 0xabab0031, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, + 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000064, 0x00000040, 0x00000019, + 0x0300005a, 0x00106000, 0x00000002, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x03000065, + 0x001020f2, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000002, 0x0100003e, 0x54415453, + 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00660000, 0x00000000, - 0x002a0000, 0x000e0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00570000, 0x003b0000, 0x00000000, - 0xffff0000, 0x0000ffff, 0x00000000, 0x00000000, 0x00590000, 0x00010000, 0x00000000, 0x00630000, - 0x00010000, 0x00000000, 0x00070000, 0x00000000, 0x00070000, 0x02820000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x63727372, 0x7365745f, + 0x30700074, 0x00008100, 0x00000000, 0x00002a00, 0x00000e00, 0x00000000, 0xffffff00, 0x000000ff, + 0x00005700, 0x00003b00, 0x00000000, 0xffffff00, 0x000000ff, 0x00000000, 0x00000000, 0x00008100, + 0x00006500, 0x00000000, 0xffffff00, 0x000084ff, 0x00000000, 0x0002a000, 0x00000100, 0x00000000, + 0x0002aa00, 0x00000100, 0x00000000, 0x00000700, 0x00000000, 0x00000300, 0x0002ad00, 0x00000000, }; static void create_effect_texture_resource(ID3D10Device *device, ID3D10ShaderResourceView **srv,

1 0

Nikolay Sivov : d3d10/effect: Add a helper to return array element.
by Alexandre Julliard 15 Oct '21

15 Oct '21

Module: wine Branch: master Commit: 920afea8cdd836b5c45d58d54fdf42ce1a3ed289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=920afea8cdd836b5c45d58d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 14 09:42:17 2021 +0300 d3d10/effect: Add a helper to return array element. 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 | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 14c18aa77db..17a4c547a2c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -142,6 +142,13 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable return CONTAINING_RECORD(iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface); } +static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v, + unsigned int index) +{ + if (!v->type->element_count) return v; + return &v->elements[index]; +} + enum d3d10_effect_container_type { D3D10_C_NONE, @@ -2152,7 +2159,8 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, const char **ptr, BOOL shared_type_desc, struct d3d10_effect_variable *v) { - unsigned int i, j; + struct d3d10_effect_variable *var; + unsigned int i, j, element_count; HRESULT hr; DWORD offset; @@ -2175,6 +2183,8 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, /* Shared variable description contains only type information. */ if (shared_type_desc) return S_OK; + element_count = max(v->type->element_count, 1); + switch (v->type->basetype) { case D3D10_SVT_TEXTURE: @@ -2186,12 +2196,7 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_TEXTURE2DMSARRAY: case D3D10_SVT_TEXTURE3D: case D3D10_SVT_TEXTURECUBE: - if (!v->type->element_count) - i = 1; - else - i = v->type->element_count; - - if (!(v->u.resource.srv = heap_calloc(i, sizeof(*v->u.resource.srv)))) + if (!(v->u.resource.srv = heap_calloc(element_count, sizeof(*v->u.resource.srv)))) { ERR("Failed to allocate shader resource view array memory.\n"); return E_OUTOFMEMORY; @@ -2218,19 +2223,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_PIXELSHADER: case D3D10_SVT_GEOMETRYSHADER: TRACE("Shader type is %s\n", debug_d3d10_shader_variable_type(v->type->basetype)); - for (i = 0; i < max(v->type->element_count, 1); ++i) + for (i = 0; i < element_count; ++i) { DWORD shader_offset, sodecl_offset; - struct d3d10_effect_variable *var; - if (!v->type->element_count) - { - var = v; - } - else - { - var = &v->elements[i]; - } + var = d3d10_array_get_element(v, i); read_dword(ptr, &shader_offset); TRACE("Shader offset: %#x.\n", shader_offset); @@ -2261,7 +2258,6 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, case D3D10_SVT_SAMPLER: { const struct d3d10_effect_state_storage_info *storage_info; - unsigned int count = max(v->type->element_count, 1); if (!(storage_info = get_storage_info(v->type->basetype))) { @@ -2276,15 +2272,11 @@ static HRESULT parse_fx10_object_variable(const char *data, size_t data_size, return E_FAIL; } - for (i = 0; i < count; ++i) + for (i = 0; i < element_count; ++i) { - struct d3d10_effect_variable *var; unsigned int prop_count; - if (v->type->element_count) - var = &v->elements[i]; - else - var = v; + var = d3d10_array_get_element(v, i); read_dword(ptr, &prop_count); TRACE("State object property count: %#x.\n", prop_count); @@ -3969,10 +3961,9 @@ static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, const struct d3d10_effect_pass_shader_desc *shader_desc) { ID3D10Device *device = pass->technique->effect->device; - struct d3d10_effect_variable *v = shader_desc->shader; + struct d3d10_effect_variable *v; - if (v->type->element_count) - v = &v->elements[shader_desc->index]; + v = d3d10_array_get_element(shader_desc->shader, shader_desc->index); switch (v->type->basetype) { @@ -7081,8 +7072,7 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s { unsigned int i; - if (v->type->element_count) - v = &v->elements[0]; + v = d3d10_array_get_element(v, 0); if (!shader_index) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2021