September 2021 - Wine-Commits

Matteo Bruni : d3dcompiler: Clear preprocessor lexer state after running it.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 450d435306dae98d86e99bf894a2b14d30395e1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=450d435306dae98d86e99bf8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 8 12:49:02 2021 +0200 d3dcompiler: Clear preprocessor lexer state after running it. Otherwise state might leak to the next preprocessed shader. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 1 + dlls/d3dcompiler_43/wpp_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index d4523edb99c..b75a1d0a6a5 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -475,6 +475,7 @@ int wpp_parse( const char *input, FILE *output ) } /* Clean if_stack, it could remain dirty on errors */ while (pp_get_if_depth()) pp_pop_if(); + ppy_lex_destroy(); del_special_defines(); del_cmdline_defines(); pp_pop_define_state(); diff --git a/dlls/d3dcompiler_43/wpp_private.h b/dlls/d3dcompiler_43/wpp_private.h index 325c7f1e510..3b6d947d8a8 100644 --- a/dlls/d3dcompiler_43/wpp_private.h +++ b/dlls/d3dcompiler_43/wpp_private.h @@ -235,6 +235,7 @@ extern includelogicentry_t *pp_includelogiclist; extern FILE *ppy_out; extern char *ppy_text; int ppy_lex(void); +int ppy_lex_destroy(void); void pp_do_include(char *fname, int type); void pp_push_ignore_state(void);

1 0

Zebediah Figura : d3dcompiler_46/tests: Enable tests.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: e44bd0e03f1e50f9d50d6b3a6c78e6ad0d580a8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e44bd0e03f1e50f9d50d6b3a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 12:12:50 2021 -0500 d3dcompiler_46/tests: Enable tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dcompiler_43/tests/asm.c | 2 +- dlls/d3dcompiler_46/Makefile.in | 1 + dlls/d3dcompiler_46/tests/Makefile.in | 11 +++++++++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 5ed46f75b84..b879415ff6c 100755 --- a/configure +++ b/configure @@ -20363,6 +20363,7 @@ wine_fn_config_makefile dlls/d3dcompiler_42 enable_d3dcompiler_42 wine_fn_config_makefile dlls/d3dcompiler_43 enable_d3dcompiler_43 wine_fn_config_makefile dlls/d3dcompiler_43/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_46 enable_d3dcompiler_46 +wine_fn_config_makefile dlls/d3dcompiler_46/tests enable_tests wine_fn_config_makefile dlls/d3dcompiler_47 enable_d3dcompiler_47 wine_fn_config_makefile dlls/d3dcompiler_47/tests enable_tests wine_fn_config_makefile dlls/d3dim enable_d3dim diff --git a/configure.ac b/configure.ac index 68b666e455f..8c4985c0294 100644 --- a/configure.ac +++ b/configure.ac @@ -3062,6 +3062,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_42) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_43/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46) +WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_46/tests) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47) WINE_CONFIG_MAKEFILE(dlls/d3dcompiler_47/tests) WINE_CONFIG_MAKEFILE(dlls/d3dim) diff --git a/dlls/d3dcompiler_43/tests/asm.c b/dlls/d3dcompiler_43/tests/asm.c index 3b765d3dae8..e467cec9623 100644 --- a/dlls/d3dcompiler_43/tests/asm.c +++ b/dlls/d3dcompiler_43/tests/asm.c @@ -1726,7 +1726,7 @@ static void test_disassemble_shader(void) hr = D3DDisassemble(vs_2_0, 0, 0, NULL, &blob); todo_wine -#if D3D_COMPILER_VERSION == 47 +#if D3D_COMPILER_VERSION >= 46 ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); #else ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index f58176c61eb..9d3c6546923 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dcompiler_46.dll +IMPORTLIB = d3dcompiler_46 IMPORTS = dxguid uuid EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 diff --git a/dlls/d3dcompiler_46/tests/Makefile.in b/dlls/d3dcompiler_46/tests/Makefile.in new file mode 100644 index 00000000000..7d2b899c0eb --- /dev/null +++ b/dlls/d3dcompiler_46/tests/Makefile.in @@ -0,0 +1,11 @@ +TESTDLL = d3dcompiler_46.dll +IMPORTS = d3d9 user32 d3dcompiler_46 +EXTRADEFS = -DD3D_COMPILER_VERSION=46 +PARENTSRC = ../../d3dcompiler_43/tests + +C_SRCS = \ + asm.c \ + blob.c \ + hlsl_d3d11.c \ + hlsl_d3d9.c \ + reflection.c

1 0

Nikolay Sivov : d3d10/effect: Fix indexing in GetPixelShader().
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 288428cc73c5f9fb6746e8e799330ea44c08e55a URL: https://source.winehq.org/git/wine.git/?a=commit;h=288428cc73c5f9fb6746e8e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 12:30:01 2021 +0300 d3d10/effect: Fix indexing in GetPixelShader(). 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 | 15 ++++++++++----- dlls/d3d10/tests/effect.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 180d36ce65b..fbfe8d0113a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -7104,19 +7104,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetPixelShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10PixelShader **shader) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_VARIABLE_TYPE basetype; + HRESULT hr; TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + *shader = NULL; - if (v->type->basetype != D3D10_SVT_PIXELSHADER) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, &basetype))) + return hr; + + if (basetype != D3D10_SVT_PIXELSHADER) { WARN("Shader is not a pixel shader.\n"); - return E_FAIL; + return D3DERR_INVALIDCALL; } - if ((*shader = v->u.shader.shader.ps)) + if ((*shader = s->shader.ps)) ID3D10PixelShader_AddRef(*shader); return S_OK; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 4583863d59b..603f3dd049a 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6015,6 +6015,7 @@ static void test_effect_shader_object(void) ID3D10EffectShaderVariable *s; ID3D10EffectVariable *v; ID3D10VertexShader *vs; + ID3D10PixelShader *ps; ID3D10Effect* effect; ID3D10Device *device; ULONG refcount; @@ -6060,6 +6061,37 @@ static void test_effect_shader_object(void) ok(!!vs, "Unexpected shader object.\n"); ID3D10VertexShader_Release(vs); + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 0, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 1, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 2, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 3, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = (void *)0xdeadbeef; + hr = s->lpVtbl->GetPixelShader(s, 4, &ps); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!ps, "Unexpected shader object.\n"); + + ps = NULL; + hr = s->lpVtbl->GetPixelShader(s, 5, &ps); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!ps, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Use case-insensitive comparison in GetMemberTypeBySemantic().
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: af20f75f7c1b6a693b9b5d5480b52dd3926f2f57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af20f75f7c1b6a693b9b5d54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 12:30:04 2021 +0300 d3d10/effect: Use case-insensitive comparison in GetMemberTypeBySemantic(). 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 | 2 +- dlls/d3d10/tests/effect.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 5efeb2901c0..5ade60537ef 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -8277,7 +8277,7 @@ static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_type_GetMemberTy { struct d3d10_effect_type_member *typem = &This->members[i]; - if (typem->semantic && !strcmp(typem->semantic, semantic)) + if (typem->semantic && !stricmp(typem->semantic, semantic)) { TRACE("Returning type %p.\n", typem->type); return &typem->type->ID3D10EffectType_iface; diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a448ba83714..029d4271b14 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -390,11 +390,12 @@ static void test_effect_variable_type(void) ok(type_desc.UnpackedSize == 0x8, "UnpackedSize is %#x, expected 0x8\n", type_desc.UnpackedSize); ok(type_desc.Stride == 0x10, "Stride is %x, expected 0x10\n", type_desc.Stride); - for (i = 0; i < 3; ++i) + for (i = 0; i < 4; ++i) { if (i == 0) type3 = type2->lpVtbl->GetMemberTypeByIndex(type2, 0); else if (i == 1) type3 = type2->lpVtbl->GetMemberTypeByName(type2, "f3"); - else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "SV_POSITION"); + else if (i == 2) type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "SV_POSITION"); + else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "sv_POSITION"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr); @@ -413,7 +414,8 @@ static void test_effect_variable_type(void) if (i == 0) type3 = type2->lpVtbl->GetMemberTypeByIndex(type2, 1); else if (i == 1) type3 = type2->lpVtbl->GetMemberTypeByName(type2, "f4"); - else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "COLOR0"); + else if (i == 2) type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "COLOR0"); + else type3 = type2->lpVtbl->GetMemberTypeBySemantic(type2, "color0"); hr = type3->lpVtbl->GetDesc(type3, &type_desc); ok(SUCCEEDED(hr), "GetDesc failed (%x)\n", hr);

1 0

Bernhard Übelacker : attrib: Avoid crash when called without parameter.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 5ec15243266b19970875770da1576d826d0be7a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ec15243266b19970875770d… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Sep 8 14:55:43 2021 +0200 attrib: Avoid crash when called without parameter. If attrib is called without any parameter the variable originalname is used uninitialized. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/attrib/attrib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 4813443449b..13fedad4e34 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -252,7 +252,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) } /* By default all files from current directory are taken into account */ - lstrcpyW(name, L"*"); + lstrcpyW(originalname, L".\\*"); while (i < argc) { WCHAR *param = argv[i++];

1 0

Nikolay Sivov : d3dx10_38/tests: Enable tests.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 3defadee9fdb4bad8f0acf7e333277765d205a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3defadee9fdb4bad8f0acf7e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 12:31:31 2021 +0300 d3dx10_38/tests: Enable tests. 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> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_38/Makefile.in | 1 + dlls/d3dx10_38/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index b879415ff6c..ee1efef77c2 100755 --- a/configure +++ b/configure @@ -20376,6 +20376,7 @@ wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 +wine_fn_config_makefile dlls/d3dx10_38/tests enable_tests wine_fn_config_makefile dlls/d3dx10_39 enable_d3dx10_39 wine_fn_config_makefile dlls/d3dx10_39/tests enable_tests wine_fn_config_makefile dlls/d3dx10_40 enable_d3dx10_40 diff --git a/configure.ac b/configure.ac index 8c4985c0294..15b7c2add2a 100644 --- a/configure.ac +++ b/configure.ac @@ -3075,6 +3075,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_38/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39) WINE_CONFIG_MAKEFILE(dlls/d3dx10_39/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_40) diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 5942b7c7c42..a1e7028de86 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_38.dll +IMPORTLIB = d3dx10_38 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_38/tests/Makefile.in b/dlls/d3dx10_38/tests/Makefile.in new file mode 100644 index 00000000000..9e911457c81 --- /dev/null +++ b/dlls/d3dx10_38/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_38.dll +IMPORTS = d3dx10_38 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0

Nikolay Sivov : d3dx10: Partially implement D3DX10CreateEffectFromResource().
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 737da3eb1ce5521bda1351771ec8d6ab34390080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=737da3eb1ce5521bda135177… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 3 15:46:57 2021 +0300 d3dx10: Partially implement D3DX10CreateEffectFromResource(). 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/d3dx10_43/compiler.c | 82 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 4 +-- dlls/d3dx10_43/tests/d3dx10.c | 22 ++++++++++++ include/d3dx10async.h | 12 +++++++ 4 files changed, 118 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/compiler.c b/dlls/d3dx10_43/compiler.c index 0bda2712d76..2a306fa8f57 100644 --- a/dlls/d3dx10_43/compiler.c +++ b/dlls/d3dx10_43/compiler.c @@ -123,3 +123,85 @@ HRESULT WINAPI D3DX10CreateEffectFromFileA(const char *filename, const D3D10_SHA return hr; } + +static HRESULT get_resource_data(HMODULE module, HRSRC resinfo, void **buffer, DWORD *length) +{ + HGLOBAL resource; + + *length = SizeofResource(module, resinfo); + if (!*length) + return D3DX10_ERR_INVALID_DATA; + + resource = LoadResource(module, resinfo); + if (!resource) + return D3DX10_ERR_INVALID_DATA; + + *buffer = LockResource(resource); + if (!*buffer) + return D3DX10_ERR_INVALID_DATA; + + return S_OK; +} + +HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE module, const char *resource_name, + const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult) +{ + HRSRC resinfo; + void *data; + DWORD size; + HRESULT hr; + + TRACE("module %p, resource_name %s, filename %s, defines %p, include %p, profile %s, " + "shader_flags %#x, effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, " + "errors %p, hresult %p.\n", module, debugstr_a(resource_name), debugstr_a(filename), + defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (!(resinfo = FindResourceA(module, resource_name, (const char *)RT_RCDATA))) + return D3DX10_ERR_INVALID_DATA; + + if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) + return hr; + + return D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); +} + +HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *resource_name, + const WCHAR *filenameW, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult) +{ + char *filename; + HRSRC resinfo; + void *data; + DWORD size; + HRESULT hr; + int len; + + TRACE("module %p, resource_name %s, filename %s, defines %p, include %p, profile %s, " + "shader_flags %#x, effect_flags %#x, device %p, effect_pool %p, pump %p, effect %p, " + "errors %p, hresult %p.\n", module, debugstr_w(resource_name), debugstr_w(filenameW), + defines, include, debugstr_a(profile), shader_flags, effect_flags, + device, effect_pool, pump, effect, errors, hresult); + + if (!(resinfo = FindResourceW(module, resource_name, (const WCHAR *)RT_RCDATA))) + return D3DX10_ERR_INVALID_DATA; + + if (FAILED(hr = get_resource_data(module, resinfo, &data, &size))) + return hr; + + len = WideCharToMultiByte(CP_ACP, 0, filenameW, -1, NULL, 0, NULL, NULL); + if (!(filename = heap_alloc(len))) + return E_OUTOFMEMORY; + WideCharToMultiByte(CP_ACP, 0, filenameW, -1, filename, len, NULL, NULL); + + hr = D3DX10CreateEffectFromMemory(data, size, filename, defines, include, profile, + shader_flags, effect_flags, device, effect_pool, pump, effect, errors, hresult); + heap_free(filename); + return hr; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index da6629ad1a0..8bc9451aeab 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -23,8 +23,8 @@ @ stdcall D3DX10CreateEffectFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr ptr) -@ stub D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectFromResourceA(long str str ptr ptr str long long ptr ptr ptr ptr ptr ptr) +@ stdcall D3DX10CreateEffectFromResourceW(long wstr wstr ptr ptr str long long ptr ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromFileA(str ptr ptr str long long ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromFileW(wstr ptr ptr str long long ptr ptr ptr ptr ptr) @ stdcall D3DX10CreateEffectPoolFromMemory(ptr long str ptr ptr str long long ptr ptr ptr ptr ptr) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index bc5ca6747f5..70827056f5f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -3153,6 +3153,27 @@ todo_wine ok(!refcount, "Unexpected refcount.\n"); } +static void test_create_effect_from_resource(void) +{ + ID3D10Device *device; + ID3D10Effect *effect; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = D3DX10CreateEffectFromResourceA(GetModuleHandleA(NULL), "resource", NULL, NULL, NULL, + "fx_4_0", 0, 0, device, NULL, NULL, &effect, NULL, NULL); + ok(hr == D3DX10_ERR_INVALID_DATA, "Unexpected hr %#x.\n", hr); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Unexpected refcount.\n"); +} + START_TEST(d3dx10) { test_D3DX10UnsetAllDeviceObjects(); @@ -3163,4 +3184,5 @@ START_TEST(d3dx10) test_create_texture(); test_font(); test_sprite(); + test_create_effect_from_resource(); } diff --git a/include/d3dx10async.h b/include/d3dx10async.h index c8204bc7798..0b7aca9c023 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -58,6 +58,18 @@ HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_si const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10CreateEffectFromResourceA(HMODULE module, const char *resource_name, + const char *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult); + +HRESULT WINAPI D3DX10CreateEffectFromResourceW(HMODULE module, const WCHAR *resource_name, + const WCHAR *filename, const D3D10_SHADER_MACRO *defines, ID3D10Include *include, + const char *profile, UINT shader_flags, UINT effect_flags, ID3D10Device *device, + ID3D10EffectPool *effect_pool, ID3DX10ThreadPump *pump, ID3D10Effect **effect, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);

1 0

Nikolay Sivov : widl: Write default values for VARIANT arguments.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: ec9892585eb36ec62c39458a1ffb0c0bdffef558 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9892585eb36ec62c39458a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 8 13:20:50 2021 +0300 widl: Write default values for VARIANT arguments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index c39f38249c8..228f58e2649 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1221,7 +1221,8 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e int vt; if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) { - if (get_type_vt(type) != VT_BSTR) + vt = get_type_vt(type); + if (vt != VT_BSTR && vt != VT_VARIANT) error("string default value applied to non-string type\n"); chat("default value '%s'\n", expr->u.sval); write_string_value(typelib, out, expr->u.sval); @@ -1251,6 +1252,20 @@ static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *e case VT_UINT: case VT_HRESULT: break; + case VT_VARIANT: { + switch (expr->type) { + case EXPR_DOUBLE: + vt = VT_R4; + break; + case EXPR_NUM: + vt = VT_I4; + break; + default: + warning("can't write default VT_VARIANT value for expression type %d.\n", expr->type); + return; + } + break; + } default: warning("can't write value of type %d yet\n", vt); return;

1 0

Zebediah Figura : d3dcompiler: Handle D3D_COMPILE_STANDARD_FILE_INCLUDE in preprocess_shader().
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 72d6654c7327b544b7ed8d5c4957882cc73ee44b URL: https://source.winehq.org/git/wine.git/?a=commit;h=72d6654c7327b544b7ed8d5c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 1 12:12:51 2021 -0500 d3dcompiler: Handle D3D_COMPILE_STANDARD_FILE_INCLUDE in preprocess_shader(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 164 ++++++++++++++++++++--------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 4fae71d4196..d4523edb99c 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -481,13 +481,95 @@ int wpp_parse( const char *input, FILE *output ) return ret; } +static HRESULT WINAPI d3dcompiler_include_from_file_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, + const char *filename, const void *parent_data, const void **data, UINT *bytes) +{ + char *fullpath, *buffer = NULL, current_dir[MAX_PATH + 1]; + const char *initial_dir; + SIZE_T size; + HANDLE file; + ULONG read; + DWORD len; + + if ((initial_dir = strrchr(initial_filename, '\\'))) + { + len = initial_dir - initial_filename + 1; + initial_dir = initial_filename; + } + else + { + len = GetCurrentDirectoryA(MAX_PATH, current_dir); + current_dir[len] = '\\'; + len++; + initial_dir = current_dir; + } + fullpath = heap_alloc(len + strlen(filename) + 1); + if (!fullpath) + return E_OUTOFMEMORY; + memcpy(fullpath, initial_dir, len); + strcpy(fullpath + len, filename); + + file = CreateFileA(fullpath, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + goto error; + + TRACE("Include file found at %s.\n", debugstr_a(fullpath)); + + size = GetFileSize(file, NULL); + if (size == INVALID_FILE_SIZE) + goto error; + buffer = heap_alloc(size); + if (!buffer) + goto error; + if (!ReadFile(file, buffer, size, &read, NULL) || read != size) + goto error; + + *bytes = size; + *data = buffer; + + heap_free(fullpath); + CloseHandle(file); + return S_OK; + +error: + heap_free(fullpath); + heap_free(buffer); + CloseHandle(file); + WARN("Returning E_FAIL.\n"); + return E_FAIL; +} + +static HRESULT WINAPI d3dcompiler_include_from_file_close(ID3DInclude *iface, const void *data) +{ + heap_free((void *)data); + return S_OK; +} + +const struct ID3DIncludeVtbl d3dcompiler_include_from_file_vtbl = +{ + d3dcompiler_include_from_file_open, + d3dcompiler_include_from_file_close +}; + +struct d3dcompiler_include_from_file +{ + ID3DInclude ID3DInclude_iface; +}; + static HRESULT preprocess_shader(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, ID3DBlob **error_messages) { + struct d3dcompiler_include_from_file include_from_file; int ret; HRESULT hr = S_OK; const D3D_SHADER_MACRO *def = defines; + if (include == D3D_COMPILE_STANDARD_FILE_INCLUDE) + { + include_from_file.ID3DInclude_iface.lpVtbl = &d3dcompiler_include_from_file_vtbl; + include = &include_from_file.ID3DInclude_iface; + } + if (def != NULL) { while (def->Name != NULL) @@ -654,88 +736,12 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena return hr; } -static HRESULT WINAPI d3dcompiler_include_from_file_open(ID3DInclude *iface, D3D_INCLUDE_TYPE include_type, - const char *filename, const void *parent_data, const void **data, UINT *bytes) -{ - char *fullpath, *buffer = NULL, current_dir[MAX_PATH + 1]; - const char *initial_dir; - SIZE_T size; - HANDLE file; - ULONG read; - DWORD len; - - if ((initial_dir = strrchr(initial_filename, '\\'))) - { - len = initial_dir - initial_filename + 1; - initial_dir = initial_filename; - } - else - { - len = GetCurrentDirectoryA(MAX_PATH, current_dir); - current_dir[len] = '\\'; - len++; - initial_dir = current_dir; - } - fullpath = heap_alloc(len + strlen(filename) + 1); - if (!fullpath) - return E_OUTOFMEMORY; - memcpy(fullpath, initial_dir, len); - strcpy(fullpath + len, filename); - - file = CreateFileA(fullpath, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); - if (file == INVALID_HANDLE_VALUE) - goto error; - - TRACE("Include file found at %s.\n", debugstr_a(fullpath)); - - size = GetFileSize(file, NULL); - if (size == INVALID_FILE_SIZE) - goto error; - buffer = heap_alloc(size); - if (!buffer) - goto error; - if (!ReadFile(file, buffer, size, &read, NULL) || read != size) - goto error; - - *bytes = size; - *data = buffer; - - heap_free(fullpath); - CloseHandle(file); - return S_OK; - -error: - heap_free(fullpath); - heap_free(buffer); - CloseHandle(file); - WARN("Returning E_FAIL.\n"); - return E_FAIL; -} - -static HRESULT WINAPI d3dcompiler_include_from_file_close(ID3DInclude *iface, const void *data) -{ - heap_free((void *)data); - return S_OK; -} - -const struct ID3DIncludeVtbl d3dcompiler_include_from_file_vtbl = -{ - d3dcompiler_include_from_file_open, - d3dcompiler_include_from_file_close -}; - -struct d3dcompiler_include_from_file -{ - ID3DInclude ID3DInclude_iface; -}; - HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, UINT secondary_flags, const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, ID3DBlob **error_messages) { - struct d3dcompiler_include_from_file include_from_file; HRESULT hr; TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " @@ -751,12 +757,6 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen if (shader) *shader = NULL; if (error_messages) *error_messages = NULL; - if (include == D3D_COMPILE_STANDARD_FILE_INCLUDE) - { - include_from_file.ID3DInclude_iface.lpVtbl = &d3dcompiler_include_from_file_vtbl; - include = &include_from_file.ID3DInclude_iface; - } - EnterCriticalSection(&wpp_mutex); hr = preprocess_shader(data, data_size, filename, defines, include, error_messages);

1 0

Rémi Bernon : winebus.sys: Return an event from SDL bus wait on device creation.
by Alexandre Julliard Sept. 8, 2021

Sept. 8, 2021

Module: wine Branch: master Commit: 507a3076ded1e381233c0d0358ea455bd5ec052f URL: https://source.winehq.org/git/wine.git/?a=commit;h=507a3076ded1e381233c0d03… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 6 09:17:31 2021 +0200 winebus.sys: Return an event from SDL bus wait on device creation. Instead of calling bus_create_hid_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 14 ++++---------- dlls/winebus.sys/main.c | 10 ++++++++++ dlls/winebus.sys/unix_private.h | 1 + dlls/winebus.sys/unixlib.c | 14 ++++++++++++++ dlls/winebus.sys/unixlib.h | 7 +++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 1f7cf237e25..80252e7e6b1 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -741,7 +741,6 @@ static void sdl_add_device(unsigned int index) .serial = {'0','0','0','0',0}, }; struct platform_private *private; - DEVICE_OBJECT *device = NULL; char guid_str[34]; SDL_Joystick* joystick; @@ -791,16 +790,11 @@ static void sdl_add_device(unsigned int index) if (!(private = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*private)))) return; private->unix_device.vtbl = &sdl_device_vtbl; + private->sdl_joystick = joystick; + private->sdl_controller = controller; + private->id = id; - device = bus_create_hid_device(&desc, &private->unix_device); - if (!device) HeapFree(GetProcessHeap(), 0, private); - else - { - private->sdl_joystick = joystick; - private->sdl_controller = controller; - private->id = id; - IoInvalidateDeviceRelations(bus_pdo, BusRelations); - } + bus_event_queue_device_created(&event_queue, &private->unix_device, &desc); } static void process_device_event(SDL_Event *event) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6093a0b79eb..8a565bc3c46 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -578,6 +578,16 @@ static DWORD CALLBACK bus_main_thread(void *args) LeaveCriticalSection(&device_list_cs); IoInvalidateDeviceRelations(bus_pdo, BusRelations); break; + case BUS_EVENT_TYPE_DEVICE_CREATED: + device = bus_create_hid_device(&event->device_created.desc, event->device_created.device); + if (device) IoInvalidateDeviceRelations(bus_pdo, BusRelations); + else + { + WARN("failed to create device for %s bus device %p\n", + debugstr_w(bus.name), event->device_created.device); + winebus_call(device_remove, event->device_created.device); + } + break; } } diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 81c4658068b..5cf999fff86 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -61,6 +61,7 @@ extern NTSTATUS iohid_bus_stop(void *) DECLSPEC_HIDDEN; extern void bus_event_queue_destroy(struct list *queue) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, void *context) DECLSPEC_HIDDEN; +extern BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) DECLSPEC_HIDDEN; extern BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) DECLSPEC_HIDDEN; struct hid_descriptor diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 2337cb3706d..9b0ccc0ae1a 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -327,6 +327,20 @@ BOOL bus_event_queue_device_removed(struct list *queue, const WCHAR *bus_id, voi return TRUE; } +BOOL bus_event_queue_device_created(struct list *queue, struct unix_device *device, struct device_desc *desc) +{ + ULONG size = sizeof(struct bus_event); + struct bus_event *event = HeapAlloc(GetProcessHeap(), 0, size); + if (!event) return FALSE; + + event->type = BUS_EVENT_TYPE_DEVICE_CREATED; + event->device_created.device = device; + event->device_created.desc = *desc; + list_add_tail(queue, &event->entry); + + return TRUE; +} + BOOL bus_event_queue_pop(struct list *queue, struct bus_event *event) { struct list *entry = list_head(queue); diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 96671de0cac..85a03dd17ee 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -65,6 +65,7 @@ enum bus_event_type { BUS_EVENT_TYPE_NONE, BUS_EVENT_TYPE_DEVICE_REMOVED, + BUS_EVENT_TYPE_DEVICE_CREATED, }; struct bus_event @@ -79,6 +80,12 @@ struct bus_event const WCHAR *bus_id; void *context; } device_removed; + + struct + { + struct unix_device *device; + struct device_desc desc; + } device_created; }; };

1 0