[PATCH 0/1] MR6205: d3dx9/effect: Return creator string from GetDesc().
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6205
From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/effect.c | 5 ++- dlls/d3dx9_36/tests/effect.c | 60 ++++++++---------------------------- 2 files changed, 14 insertions(+), 51 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5a73da531ef..628d8ebc3eb 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2007,7 +2007,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - FIXME("iface %p, desc %p partial stub.\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -2015,8 +2015,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d return D3DERR_INVALIDCALL; } - /* TODO: add creator and function count. */ - desc->Creator = NULL; + desc->Creator = "D3DX Effect Compiler"; desc->Functions = 0; desc->Parameters = effect->params.count; desc->Techniques = effect->technique_count; diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c884ee50548..164b7440edb 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -262,10 +262,7 @@ static void test_create_effect_and_pool(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(!desc.Parameters, "Unexpected value %u.\n", desc.Parameters); @@ -2495,10 +2492,7 @@ static void test_effect_setvalue_object(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 7, "Unexpected value %u.\n", desc.Parameters); @@ -2620,10 +2614,7 @@ static void test_effect_variable_names(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 6, "Unexpected value %u.\n", desc.Parameters); @@ -3044,10 +3035,7 @@ static void test_effect_states(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 3, "Unexpected value %u.\n", desc.Parameters); @@ -4624,10 +4612,7 @@ static void test_effect_preshader(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 34, "Unexpected value %u.\n", desc.Parameters); @@ -5089,10 +5074,7 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 3, "Unexpected value %u.\n", desc.Parameters); @@ -5219,10 +5201,7 @@ static void test_effect_isparameterused(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 34, "Unexpected value %u.\n", desc.Parameters); @@ -5269,10 +5248,7 @@ static void test_effect_out_of_bounds_selector(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 34, "Unexpected value %u.\n", desc.Parameters); @@ -5497,10 +5473,7 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 34, "Unexpected value %u.\n", desc.Parameters); @@ -6678,10 +6651,7 @@ static void test_effect_shared_parameters(IDirect3DDevice9 *device) hr = effect2->lpVtbl->GetDesc(effect2, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 34, "Unexpected value %u.\n", desc.Parameters); @@ -7153,10 +7123,7 @@ static void test_effect_skip_constants(IDirect3DDevice9 *device) hr = effect->lpVtbl->GetDesc(effect, &desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!desc.Creator, "Unexpected pointer.\n"); - if (desc.Creator) - ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); + ok(!strcmp(desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", desc.Creator); ok(!desc.Functions, "Unexpected value %u.\n", desc.Functions); ok(desc.Techniques == 1, "Unexpected value %u.\n", desc.Techniques); ok(desc.Parameters == 6, "Unexpected value %u.\n", desc.Parameters); @@ -8269,10 +8236,7 @@ static void test_effect_find_next_valid_technique(void) hr = effect->lpVtbl->GetDesc(effect, &effect_desc); ok(hr == D3D_OK, "Unexpected hr %#lx.\n", hr); - todo_wine - ok(!!effect_desc.Creator, "Unexpected pointer.\n"); - if (effect_desc.Creator) - ok(!strcmp(effect_desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", effect_desc.Creator); + ok(!strcmp(effect_desc.Creator, "D3DX Effect Compiler"), "Unexpected creator %s.\n", effect_desc.Creator); ok(!effect_desc.Functions, "Unexpected value %u.\n", effect_desc.Functions); ok(effect_desc.Techniques == 2, "Unexpected value %u.\n", effect_desc.Techniques); ok(!effect_desc.Parameters, "Unexpected value %u.\n", effect_desc.Parameters); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6205
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=147539 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:733: Test failed: peek: raw_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x46, lparam 0x10001 input.c:733: Test failed: peek: raw_legacy: 0: test->expect 2 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x66, lparam 0x10001 input.c:734: Test failed: peek: raw_legacy: 0: got F: 0 input.c:733: Test failed: peek: raw_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x46, lparam 0xffffffffc0020001 input.c:733: Test failed: peek: raw_vk_packet_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0xe7, lparam 0x10001 input.c:734: Test failed: peek: raw_vk_packet_legacy: 0: got 0xe7: 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_vk_packet_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0xe7, lparam 0xffffffffc0020001 input.c:733: Test failed: peek: raw_unicode_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x3c0, lparam 0x1 input.c:734: Test failed: peek: raw_unicode_legacy: 0: got 0xe7: 0 input.c:733: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x11, lparam 0xc00001 input.c:734: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: got VK_CONTROL: 0 input.c:734: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 0: got VK_LCONTROL: 0 input.c:733: Test failed: peek: raw_unicode_vkey_ctrl_legacy: 1: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x11, lparam 0xffffffffc0c00001 input.c:733: Test failed: peek: raw_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: peek: raw_vk_packet_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: peek: raw_vk_packet_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x46, lparam 0x10001 input.c:733: Test failed: receive: raw_legacy: 0: test->expect 2 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x66, lparam 0x10001 input.c:734: Test failed: receive: raw_legacy: 0: got F: 0 input.c:733: Test failed: receive: raw_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x46, lparam 0xffffffffc0020001 input.c:733: Test failed: receive: raw_vk_packet_legacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0xe7, lparam 0x10001 input.c:734: Test failed: receive: raw_vk_packet_legacy: 0: got 0xe7: 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_vk_packet_legacy: 1: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0xe7, lparam 0xffffffffc0020001 input.c:733: Test failed: receive: raw_unicode_legacy: 0: test->expect 1 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_CHAR, wparam 0x3c0, lparam 0x1 input.c:734: Test failed: receive: raw_unicode_legacy: 0: got 0xe7: 0 input.c:733: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYDOWN, wparam 0x11, lparam 0xc00001 input.c:734: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: got VK_CONTROL: 0 input.c:734: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 0: got VK_LCONTROL: 0 input.c:733: Test failed: receive: raw_unicode_vkey_ctrl_legacy: 1: test->expect 0 (missing): MSG_TEST_WIN hwnd 0000000000000000, WM_KEYUP, wparam 0x11, lparam 0xffffffffc0c00001 input.c:733: Test failed: receive: raw_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey F, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey F, message WM_KEYUP, extra 0 input.c:733: Test failed: receive: raw_vk_packet_nolegacy: 0: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x1, flags 0, vkey 0xe7, message WM_KEYDOWN, extra 0 input.c:733: Test failed: receive: raw_vk_packet_nolegacy: 1: test->expect 0 (missing): got WM_INPUT key hwnd 0000000000000000, code 0, make_code 0x2, flags 0x1, vkey 0xe7, message WM_KEYUP, extra 0
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6205
participants (4)
-
Marvin -
Matteo Bruni (＠Mystral) -
Nikolay Sivov
-
Nikolay Sivov (＠nsivov)