November 2019 - Wine-commits

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a812c1a5ef177567db2e8f8d389d2f6f32399363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a812c1a5ef177567db2e8f8d… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:57 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByIndex() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 34a9984768..5c08cdf5e4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2077,9 +2077,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetDesc static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByIndex( ID3D10ShaderReflectionConstantBuffer *iface, UINT index) { - FIXME("iface %p, index %d stub!\n", iface, index); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); - return &null_variable.ID3D10ShaderReflectionVariable_iface; + TRACE("iface %p, index %u.\n", iface, index); + + if (index >= cb->variable_count) + { + WARN("Invalid index specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + return &cb->variables[index].ID3D10ShaderReflectionVariable_iface; } static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName(

1 0

Connor McAdams : d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 44e65ebd7c9ad293c2f150ff5fad6d5f746e169f URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e65ebd7c9ad293c2f150ff… Author: Connor McAdams <conmanx360(a)gmail.com> Date: Thu Nov 14 20:59:58 2019 +0100 d3dcompiler: Implement ID3D10ShaderReflectionConstantBuffer GetVariableByName() method. Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 5c08cdf5e4..820e5c239f 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -2093,7 +2093,29 @@ static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflectio static ID3D10ShaderReflectionVariable * STDMETHODCALLTYPE d3d10_shader_reflection_constant_buffer_GetVariableByName( ID3D10ShaderReflectionConstantBuffer *iface, const char *name) { - FIXME("iface %p, name %s stub!\n", iface, name); + struct d3dcompiler_shader_reflection_constant_buffer *cb = impl_from_ID3D10ShaderReflectionConstantBuffer(iface); + unsigned int i; + + TRACE("iface %p, name %s.\n", iface, debugstr_a(name)); + + if (!name) + { + WARN("Invalid argument specified.\n"); + return &null_variable.ID3D10ShaderReflectionVariable_iface; + } + + for (i = 0; i < cb->variable_count; ++i) + { + struct d3dcompiler_shader_reflection_variable *v = &cb->variables[i]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning ID3D10ShaderReflectionVariable %p.\n", v); + return &v->ID3D10ShaderReflectionVariable_iface; + } + } + + WARN("Invalid name specified.\n"); return &null_variable.ID3D10ShaderReflectionVariable_iface; }

1 0

Matteo Bruni : d3dcompiler/tests: Clean up test_reflection_desc_ps_output() a bit.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 6889a0c3a04e79d7da19028a3bbbc3dd066bf060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6889a0c3a04e79d7da19028a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 14 20:59:59 2019 +0100 d3dcompiler/tests: Clean up test_reflection_desc_ps_output() a bit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 50 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index fb117fd6a9..c5726198af 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -908,27 +908,28 @@ static const DWORD test_reflection_desc_ps_output_blob_5[] = { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -static const DWORD *test_reflection_desc_ps_output_blob[] = { - test_reflection_desc_ps_output_blob_0, - test_reflection_desc_ps_output_blob_1, - test_reflection_desc_ps_output_blob_2, - test_reflection_desc_ps_output_blob_3, - test_reflection_desc_ps_output_blob_4, - test_reflection_desc_ps_output_blob_5, -}; - -static const D3D11_SIGNATURE_PARAMETER_DESC test_reflection_desc_ps_output_result[] = -{ - {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}, - {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}, - {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}, -}; - static void test_reflection_desc_ps_output(void) { + static const struct test_reflection_desc_ps_output_test + { + const DWORD *blob; + D3D11_SIGNATURE_PARAMETER_DESC desc; + } + tests[] = + { + {test_reflection_desc_ps_output_blob_0, + {"SV_Target", 3, 3, D3D_NAME_TARGET, D3D_REGISTER_COMPONENT_FLOAT32, 0xf, 0, 0}}, + {test_reflection_desc_ps_output_blob_1, + {"SV_DepthLessEqual", 0, 0xffffffff, D3D_NAME_DEPTH_LESS_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_2, + {"SV_DepthGreaterEqual", 0, 0xffffffff, D3D11_NAME_DEPTH_GREATER_EQUAL, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_3, + {"sV_DePtH", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_4, + {"SV_Depth", 0, 0xffffffff, D3D_NAME_DEPTH, D3D_REGISTER_COMPONENT_FLOAT32, 0x1, 0xe, 0}}, + {test_reflection_desc_ps_output_blob_5, + {"SV_COVERAGE", 0, 0xffffffff, D3D_NAME_COVERAGE, D3D_REGISTER_COMPONENT_UINT32, 0x1, 0xe, 0}}, + }; HRESULT hr; ULONG count; ID3D11ShaderReflection *ref11; @@ -936,12 +937,12 @@ static void test_reflection_desc_ps_output(void) const D3D11_SIGNATURE_PARAMETER_DESC *pdesc; unsigned int i; - for (i = 0; i < ARRAY_SIZE(test_reflection_desc_ps_output_result); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - hr = pD3DReflect(test_reflection_desc_ps_output_blob[i], test_reflection_desc_ps_output_blob[i][6], &IID_ID3D11ShaderReflection, (void **)&ref11); - ok(hr == S_OK, "(%u): D3DReflect failed %x\n", i, hr); + hr = pD3DReflect(tests[i].blob, tests[i].blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + ok(hr == S_OK, "(%u): got unexpected hr %x.\n", i, hr); - pdesc = &test_reflection_desc_ps_output_result[i]; + pdesc = &tests[i].desc; hr = ref11->lpVtbl->GetOutputParameterDesc(ref11, 0, &desc); ok(hr == S_OK, "(%u): GetOutputParameterDesc failed, got %x, expected %x\n", i, hr, S_OK); @@ -1050,7 +1051,8 @@ static void test_reflection_bound_resources(void) const D3D11_SHADER_INPUT_BIND_DESC *pdesc; unsigned int i; - hr = pD3DReflect(test_reflection_bound_resources_blob, test_reflection_bound_resources_blob[6], &IID_ID3D11ShaderReflection, (void **)&ref11); + hr = pD3DReflect(test_reflection_bound_resources_blob, test_reflection_bound_resources_blob[6], + &IID_ID3D11ShaderReflection, (void **)&ref11); ok(hr == S_OK, "D3DReflect failed %x\n", hr); /* check invalid cases */

1 0

Matteo Bruni : d3d10/tests: Add reflection test.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 1559f6013c212639e41f9555ead7c30e4d43317b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1559f6013c212639e41f9555… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 14 21:00:00 2019 +0100 d3d10/tests: Add reflection test. Share and reuse most of the d3dcompiler test. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/Makefile.in | 5 +- dlls/d3d10/tests/device.c | 1 - dlls/d3dcompiler_43/tests/reflection.c | 103 +++++++++++++++++++++++++++------ 3 files changed, 88 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1559f6013c212639e41f…

1 0

Sven Baars : d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: a63a98c3884fa4d9b299450634d6aea25c3ad48b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a63a98c3884fa4d9b2994506… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Nov 14 10:56:07 2019 +0100 d3dcompiler/tests: Fix some d3dcompiler_47 test failures on Windows 8. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index ca7aa7760f..810eac8936 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -118,10 +118,12 @@ static void test_reflection_references(void) expected = E_NOINTERFACE; #endif hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection, (void **)&ref10); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(test_reflection_blob, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); - ok(hr == expected, "D3DReflect failed, got %x, expected %x\n", hr, expected); + ok(hr == expected || broken(hr == E_NOINTERFACE) /* Windows 8 */, + "D3DReflect failed, got %x, expected %x\n", hr, expected); hr = pD3DReflect(NULL, test_reflection_blob[6], &IID_ID3D10ShaderReflection1, (void **)&ref10_1); ok(hr == D3DERR_INVALIDCALL, "D3DReflect failed, got %x, expected %x\n", hr, D3DERR_INVALIDCALL);

1 0

Zebediah Figura : advapi32/tests: Remove a todo_wine.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: 8313551d26120d9b4de251aab2a116181c9dfed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8313551d26120d9b4de251aa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 13 23:34:55 2019 -0600 advapi32/tests: Remove a todo_wine. This seems to have been fixed by recent changes to CreateProcess() implementation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index aa9a69fed2..bd70ecaddf 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1793,7 +1793,7 @@ static void test_wow64(void) ok(!!service, "Failed to create service, error %u.\n", GetLastError()); ret = StartServiceA(service, 0, NULL); ok(!ret, "Expected failure.\n"); - todo_wine ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); + ok(GetLastError() == ERROR_BAD_EXE_FORMAT, "Got error %u.\n", GetLastError()); ret = DeleteService(service); ok(ret, "Failed to delete service, error %u.\n", GetLastError());

1 0

Dmitry Timoshkov : wineconsole: Fix "Select all" functionality in USER backend.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: bbdd1be4f8019778158767f3aa8db8868b4cabd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbdd1be4f8019778158767f3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 14 11:46:25 2019 +0800 wineconsole: Fix "Select all" functionality in USER backend. Selection is stored in character cell coords, not in pixels. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 28e81261e9..5cc405d5b7 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1310,8 +1310,8 @@ static LRESULT CALLBACK WCUSER_Proc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM break; case IDS_SELECTALL: PRIVATE(data)->selectPt1.X = PRIVATE(data)->selectPt1.Y = 0; - PRIVATE(data)->selectPt2.X = (data->curcfg.sb_width - 1) * data->curcfg.cell_width; - PRIVATE(data)->selectPt2.Y = (data->curcfg.sb_height - 1) * data->curcfg.cell_height; + PRIVATE(data)->selectPt2.X = data->curcfg.sb_width - 1; + PRIVATE(data)->selectPt2.Y = data->curcfg.sb_height - 1; WCUSER_SetSelection(data, 0); PRIVATE(data)->has_selection = TRUE; break;

1 0

Francois Gouget : kernel32/tests: Windows 10 dropped support for SetConsoleFont().
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: wine Branch: master Commit: ba4cfbd4489a45dc685b06fd72fdfbd3db13f11d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba4cfbd4489a45dc685b06fd… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Nov 14 00:29:46 2019 +0100 kernel32/tests: Windows 10 dropped support for SetConsoleFont(). Windows 10 1507 still supports it but not 1607+. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index a22051deaf..171b2dad4d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2967,6 +2967,12 @@ static void test_SetConsoleFont(HANDLE std_output) SetLastError(0xdeadbeef); ret = pSetConsoleFont(NULL, 0); ok(!ret, "got %d, expected zero\n", ret); + if (GetLastError() == LOWORD(E_NOTIMPL) /* win10 1709+ */ || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win10 1607 */) + { + skip("SetConsoleFont is not implemented\n"); + return; + } todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); SetLastError(0xdeadbeef);

1 0

Francois Gouget : testbot: Fix the 'no software synthesizer midi port' winediag check.
by Alexandre Julliard 14 Nov '19

14 Nov '19

Module: tools Branch: master Commit: 7447ab0dcf6da7b14739788618d50cd047a6f970 URL: https://source.winehq.org/git/tools.git/?a=commit;h=7447ab0dcf6da7b14739788… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 13 06:20:12 2019 +0100 testbot: Fix the 'no software synthesizer midi port' winediag check. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ea1ad89..99b1568 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -171,7 +171,7 @@ sub GetLogLineCategory($) # calls it as a test. $Line =~ /CorIsLatestSvc If this function is called,/ or # VMs and most test machines don't have a midi port. - $Line =~ /No software synthesizer midi port found / or + $Line =~ /No software synthesizer midi port found,/ or # Most VMs have limited OpenGL support. $Line =~ /None of the requested D3D feature levels is supported / or # The tests are not run as root.

1 0

Rémi Bernon : oleaut32: Increase buffer size to fix format-overflow warning.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: a3c410d0a595534201a44078cc9c6fa6e89a1da3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c410d0a595534201a44078… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 13 14:51:20 2019 +0100 oleaut32: Increase buffer size to fix format-overflow warning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 28f796794a..9417969465 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -829,7 +829,7 @@ static BOOL actctx_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) static HRESULT reg_get_typelib_module(REFIID iid, WCHAR *module, DWORD len) { REGSAM opposite = (sizeof(void*) == 8) ? KEY_WOW64_32KEY : KEY_WOW64_64KEY; - char tlguid[200], typelibkey[300], interfacekey[300], ver[100], tlfn[260]; + char tlguid[200], typelibkey[316], interfacekey[300], ver[100], tlfn[260]; DWORD tlguidlen, verlen, type; LONG tlfnlen, err; BOOL is_wow64;

1 0