September 2020 - Wine-devel

[PATCH vkd3d v2 1/5] vkd3d-utils: Introduce D3DCompile() and D3DCompile2().
by Zebediah Figura 01 Oct '20

01 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Makefile.am | 2 +- include/vkd3d_d3dcommon.idl | 26 +++++ include/vkd3d_d3dcompiler.h | 46 +++++++++ include/vkd3d_utils.h | 8 ++ include/vkd3d_windows.h | 2 + libs/vkd3d-utils/vkd3d_utils.map | 2 + libs/vkd3d-utils/vkd3d_utils_main.c | 125 +++++++++++++++++++++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 1 + 8 files changed, 211 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 6f8af578..22a245e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,7 +127,7 @@ libvkd3d_utils_la_SOURCES = \ libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_private.h libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:1 -libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d.la @PTHREAD_LIBS@ +libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ if HAVE_LD_VERSION_SCRIPT libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map EXTRA_libvkd3d_utils_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-utils/vkd3d_utils.map diff --git a/include/vkd3d_d3dcommon.idl b/include/vkd3d_d3dcommon.idl index 8bfa567c..e43cbe41 100644 --- a/include/vkd3d_d3dcommon.idl +++ b/include/vkd3d_d3dcommon.idl @@ -93,3 +93,29 @@ interface ID3D10Blob : IUnknown typedef ID3D10Blob ID3DBlob; cpp_quote("#define IID_ID3DBlob IID_ID3D10Blob") + +typedef enum _D3D_INCLUDE_TYPE +{ + D3D_INCLUDE_LOCAL = 0, + D3D_INCLUDE_SYSTEM, + D3D10_INCLUDE_LOCAL = D3D_INCLUDE_LOCAL, + D3D10_INCLUDE_SYSTEM = D3D_INCLUDE_SYSTEM, + D3D_INCLUDE_FORCE_DWORD = 0x7fffffff, +} D3D_INCLUDE_TYPE; + +[ + object, + local, +] +interface ID3DInclude +{ + HRESULT Open(D3D_INCLUDE_TYPE include_type, const char *filename, const void *parent_data, const void **data, + UINT *size); + HRESULT Close(const void *data); +} + +typedef struct _D3D_SHADER_MACRO +{ + const char *Name; + const char *Definition; +} D3D_SHADER_MACRO; diff --git a/include/vkd3d_d3dcompiler.h b/include/vkd3d_d3dcompiler.h index 25f60449..7137294f 100644 --- a/include/vkd3d_d3dcompiler.h +++ b/include/vkd3d_d3dcompiler.h @@ -20,6 +20,52 @@ #define __VKD3D_D3DCOMPILER_H #ifndef __D3DCOMPILER_H__ +#define D3DCOMPILE_DEBUG 0x00000001 +#define D3DCOMPILE_SKIP_VALIDATION 0x00000002 +#define D3DCOMPILE_SKIP_OPTIMIZATION 0x00000004 +#define D3DCOMPILE_PACK_MATRIX_ROW_MAJOR 0x00000008 +#define D3DCOMPILE_PACK_MATRIX_COLUMN_MAJOR 0x00000010 +#define D3DCOMPILE_PARTIAL_PRECISION 0x00000020 +#define D3DCOMPILE_FORCE_VS_SOFTWARE_NO_OPT 0x00000040 +#define D3DCOMPILE_FORCE_PS_SOFTWARE_NO_OPT 0x00000080 +#define D3DCOMPILE_NO_PRESHADER 0x00000100 +#define D3DCOMPILE_AVOID_FLOW_CONTROL 0x00000200 +#define D3DCOMPILE_PREFER_FLOW_CONTROL 0x00000400 +#define D3DCOMPILE_ENABLE_STRICTNESS 0x00000800 +#define D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY 0x00001000 +#define D3DCOMPILE_IEEE_STRICTNESS 0x00002000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL0 0x00004000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL1 0x00000000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL2 0x0000c000 +#define D3DCOMPILE_OPTIMIZATION_LEVEL3 0x00008000 +#define D3DCOMPILE_RESERVED16 0x00010000 +#define D3DCOMPILE_RESERVED17 0x00020000 +#define D3DCOMPILE_WARNINGS_ARE_ERRORS 0x00040000 +#define D3DCOMPILE_RESOURCES_MAY_ALIAS 0x00080000 +#define D3DCOMPILE_ENABLE_UNBOUNDED_DESCRIPTOR_TABLES 0x00100000 +#define D3DCOMPILE_ALL_RESOURCES_BOUND 0x00200000 +#define D3DCOMPILE_DEBUG_NAME_FOR_SOURCE 0x00400000 +#define D3DCOMPILE_DEBUG_NAME_FOR_BINARY 0x00800000 + +#define D3DCOMPILE_EFFECT_CHILD_EFFECT 0x00000001 +#define D3DCOMPILE_EFFECT_ALLOW_SLOW_OPS 0x00000002 + +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_LATEST 0x00000000 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_0 0x00000010 +#define D3DCOMPILE_FLAGS2_FORCE_ROOT_SIGNATURE_1_1 0x00000020 + +#define D3DCOMPILE_SECDATA_MERGE_UAV_SLOTS 0x00000001 +#define D3DCOMPILE_SECDATA_PRESERVE_TEMPLATE_SLOTS 0x00000002 +#define D3DCOMPILE_SECDATA_REQUIRE_TEMPLATE_MATCH 0x00000004 + +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entrypoint, + const char *profile, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages); +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entrypoint, + const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T size, ID3D10Blob **blob); #endif /* __D3DCOMPILER_H__ */ diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index f1fc4dbd..c005d4e9 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -55,6 +55,14 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S ID3DBlob **blob, ID3DBlob **error_blob); /* 1.3 */ +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, + const char *target, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages); +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 flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader, + ID3DBlob **error_messages); HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3D10Blob **blob); #ifdef __cplusplus diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index ad2f08a6..8398d403 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -65,6 +65,8 @@ typedef int HRESULT; # define DXGI_ERROR_NOT_FOUND _HRESULT_TYPEDEF_(0x887a0002) # define DXGI_ERROR_MORE_DATA _HRESULT_TYPEDEF_(0x887a0003) +# define D3DERR_INVALIDCALL _HRESULT_TYPEDEF_(0x8876086c) + /* Basic types */ typedef unsigned char BYTE; typedef unsigned int DWORD; diff --git a/libs/vkd3d-utils/vkd3d_utils.map b/libs/vkd3d-utils/vkd3d_utils.map index 20d182c5..337409ee 100644 --- a/libs/vkd3d-utils/vkd3d_utils.map +++ b/libs/vkd3d-utils/vkd3d_utils.map @@ -8,6 +8,8 @@ global: D3D12GetDebugInterface; D3D12SerializeRootSignature; D3D12SerializeVersionedRootSignature; + D3DCompile; + D3DCompile2; D3DCreateBlob; vkd3d_create_event; vkd3d_destroy_event; diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index ffb655f8..8f54ac86 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -125,6 +125,131 @@ HRESULT WINAPI D3D12SerializeVersionedRootSignature(const D3D12_VERSIONED_ROOT_S return vkd3d_serialize_versioned_root_signature(desc, blob, error_blob); } +static int open_include(const char *filename, bool local, const char *parent_data, void *context, + struct vkd3d_shader_code *code) +{ + ID3DInclude *iface = context; + unsigned int size; + + if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, + filename, parent_data, &code->code, &size))) + return VKD3D_ERROR; + + code->size = size; + return VKD3D_OK; +} + +static void close_include(const struct vkd3d_shader_code *code, void *context) +{ + ID3DInclude *iface = context; + + ID3DInclude_Close(iface, code->code); +} + +HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entry_point, + const char *profile, UINT flags, UINT effect_flags, UINT secondary_flags, + const void *secondary_data, SIZE_T secondary_data_size, ID3DBlob **shader_blob, + ID3DBlob **messages_blob) +{ + struct vkd3d_shader_preprocess_info preprocess_info; + struct vkd3d_shader_hlsl_source_info hlsl_info; + struct vkd3d_shader_compile_option options[1]; + struct vkd3d_shader_compile_info compile_info; + struct vkd3d_shader_code byte_code; + const D3D_SHADER_MACRO *macro; + char *messages; + HRESULT hr; + int ret; + + TRACE("data %p, data_size %lu, filename %s, macros %p, include %p, entry_point %s, " + "profile %s, flags %#x, effect_flags %#x, secondary_flags %#x, secondary_data %p, " + "secondary_data_size %lu, shader_blob %p, messages_blob %p.\n", + data, data_size, debugstr_a(filename), macros, include, debugstr_a(entry_point), + debugstr_a(profile), flags, effect_flags, secondary_flags, secondary_data, + secondary_data_size, shader_blob, messages_blob); + + if (flags & ~D3DCOMPILE_DEBUG) + FIXME("Ignoring flags %#x.\n", flags); + if (effect_flags) + FIXME("Ignoring effect flags %#x.\n", effect_flags); + if (secondary_flags) + FIXME("Ignoring secondary flags %#x.\n", secondary_flags); + + compile_info.type = VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_INFO; + compile_info.next = &preprocess_info; + compile_info.source.code = data; + compile_info.source.size = data_size; + compile_info.source_type = VKD3D_SHADER_SOURCE_HLSL; + compile_info.target_type = VKD3D_SHADER_TARGET_DXBC_TPF; + compile_info.options = options; + compile_info.option_count = 0; + compile_info.log_level = VKD3D_SHADER_LOG_INFO; + compile_info.source_name = filename; + + preprocess_info.type = VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO; + preprocess_info.next = &hlsl_info; + preprocess_info.macros = (const struct vkd3d_shader_macro *)macros; + preprocess_info.macro_count = 0; + if (macros) + { + for (macro = macros; macro->Name; ++macro) + ++preprocess_info.macro_count; + } + preprocess_info.pfn_open_include = open_include; + preprocess_info.pfn_close_include = close_include; + preprocess_info.include_context = include; + + hlsl_info.type = VKD3D_SHADER_STRUCTURE_TYPE_HLSL_SOURCE_INFO; + hlsl_info.next = NULL; + hlsl_info.profile = profile; + hlsl_info.entry_point = entry_point; + hlsl_info.secondary_code.code = secondary_data; + hlsl_info.secondary_code.size = secondary_data_size; + + if (!(flags & D3DCOMPILE_DEBUG)) + options[compile_info.option_count++].name = VKD3D_SHADER_COMPILE_OPTION_STRIP_DEBUG; + + ret = vkd3d_shader_compile(&compile_info, &byte_code, &messages); + if (messages) + { + if (messages_blob) + { + if (FAILED(hr = vkd3d_blob_create(messages, strlen(messages), messages_blob))) + { + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + } + else + vkd3d_shader_free_messages(messages); + } + + if (!ret) + { + if (FAILED(hr = vkd3d_blob_create((void *)byte_code.code, byte_code.size, shader_blob))) + { + vkd3d_shader_free_shader_code(&byte_code); + return hr; + } + } + + return hresult_from_vkd3d_result(ret); +} + +HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filename, + const D3D_SHADER_MACRO *macros, ID3DInclude *include, const char *entrypoint, + const char *profile, UINT flags, UINT effect_flags, ID3DBlob **shader, ID3DBlob **error_messages) +{ + TRACE("data %p, data_size %lu, filename %s, macros %p, include %p, entrypoint %s, " + "profile %s, flags %#x, effect_flags %#x, shader %p, error_messages %p.\n", + data, data_size, debugstr_a(filename), macros, include, debugstr_a(entrypoint), + debugstr_a(profile), flags, effect_flags, shader, error_messages); + + return D3DCompile2(data, data_size, filename, macros, include, entrypoint, profile, flags, + effect_flags, 0, NULL, 0, shader, error_messages); +} + /* Events */ HANDLE vkd3d_create_event(void) { diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 3c73f421..06ac7e6b 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -26,6 +26,7 @@ #include <pthread.h> #include <vkd3d.h> #include <vkd3d_shader.h> +#include <vkd3d_d3dcompiler.h> #include "vkd3d_blob.h" #include "vkd3d_memory.h" -- 2.28.0

4 10

[PATCH] wined3d: Correct off-by-one errors when comparing against ARRAY_SIZE.
by Zebediah Figura 01 Oct '20

01 Oct '20

Spotted by Alex Henrie. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0166746bfd2..d3921d5a981 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2059,7 +2059,7 @@ static void shader_dump_resource_type(struct wined3d_string_buffer *buffer, enum /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown"); @@ -2080,7 +2080,7 @@ static void shader_dump_data_type(struct wined3d_string_buffer *buffer, enum win /* WINED3D_DATA_OPAQUE */ "(opaque)", }; - if (type <= ARRAY_SIZE(data_type_names)) + if (type < ARRAY_SIZE(data_type_names)) shader_addline(buffer, "%s", data_type_names[type]); else shader_addline(buffer, "(unknown)"); -- 2.28.0

2 1

[PATCH v3 2/2] d3d11/tests: Add a test for rendering with deferred contexts.
by Zebediah Figura 01 Oct '20

01 Oct '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 103 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 82a165c62d7..e1a6dd6159b 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30237,6 +30237,108 @@ static void test_deferred_context_state(void) release_test_context(&test_context); } +static void test_deferred_context_rendering(void) +{ + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11CommandList *list1, *list2; + ID3D11RenderTargetView *rtv; + ID3D11Texture2D *texture; + ID3D11Device *device; + DWORD color; + HRESULT hr; + + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + immediate = test_context.immediate_context; + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + { + release_test_context(&test_context); + return; + } + + ID3D11DeviceContext_ClearRenderTargetView(deferred, test_context.backbuffer_rtv, green); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffffffff, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + + ID3D11DeviceContext_ExecuteCommandList(deferred, list1, TRUE); + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ExecuteCommandList(immediate, list2, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xff00ff00, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list2); + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create view, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, test_context.backbuffer_rtv, white); + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, green); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(deferred, (ID3D11Resource *)test_context.backbuffer, (ID3D11Resource *)texture); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_ClearRenderTargetView(immediate, rtv, blue); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + color = get_texture_color(test_context.backbuffer, 320, 240); + ok(color == 0xffff0000, "Got unexpected color %#08x.\n", color); + + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + + ID3D11RenderTargetView_Release(rtv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30401,6 +30503,7 @@ START_TEST(d3d11) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_deferred_context_state); + queue_test(test_deferred_context_rendering); run_queued_tests(); } -- 2.28.0

3 2

[PATCH vkd3d] vkd3d-shader: Correct an off-by-one error when comparing against ARRAY_SIZE.
by Zebediah Figura 01 Oct '20

01 Oct '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9ff18e77..a510f3a2 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -520,7 +520,7 @@ static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum v /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown"); -- 2.28.0

2 1

[PATCH] d3dx9/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/asm.c | 6 ++---- dlls/d3dx9_36/tests/effect.c | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 4087bd89b09..9b4e82f218a 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -195,7 +195,6 @@ static void assembleshader_test(void) }; struct D3DXIncludeImpl include; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; /* pDefines test */ shader = NULL; @@ -356,7 +355,7 @@ static void assembleshader_test(void) shader = NULL; messages = NULL; - hr = D3DXAssembleShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXAssembleShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, D3DXSHADER_SKIPVALIDATION, &shader, &messages); ok(hr == D3D_OK, "D3DXAssembleShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); @@ -445,7 +444,6 @@ static void d3dxpreprocess_test(void) ID3DXBuffer *shader, *messages; char shader_vsh_path[MAX_PATH], shader3_vsh_path[MAX_PATH]; static struct D3DXIncludeImpl include = {{&D3DXInclude_Vtbl}}; - static const WCHAR shader_filename_w[] = {'s','h','a','d','e','r','.','v','s','h',0}; if (create_file("shader.vsh", testshader, sizeof(testshader) - 1, shader_vsh_path)) { @@ -520,7 +518,7 @@ static void d3dxpreprocess_test(void) shader = NULL; messages = NULL; - hr = D3DXPreprocessShaderFromFileW(shader_filename_w, NULL, &include.ID3DXInclude_iface, + hr = D3DXPreprocessShaderFromFileW(L"shader.vsh", NULL, &include.ID3DXInclude_iface, &shader, &messages); ok(hr == D3D_OK, "D3DXPreprocessShaderFromFile + pInclude main shader test failed with error 0x%x - %d\n", hr, hr & 0x0000ffff); diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index c72049d553e..ae6f65d52d5 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -7740,8 +7740,6 @@ static void test_create_effect_from_file(void) " VertexShader = compile vs_2_0 vs_main();\n" " }\n" "}\n"; - static const WCHAR effect1_filename_w[] = {'e','f','f','e','c','t','1','.','f','x',0}; - static const WCHAR effect2_filename_w[] = {'e','f','f','e','c','t','2','.','f','x',0}; WCHAR effect_path_w[MAX_PATH], filename_w[MAX_PATH]; char effect_path[MAX_PATH], filename[MAX_PATH]; D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -7798,7 +7796,7 @@ static void test_create_effect_from_file(void) create_file("include1.h", include1_wrong, sizeof(include1_wrong) - 1, NULL); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect1_filename_w); + lstrcatW(filename_w, L"effect1.fx"); effect = NULL; messages = NULL; hr = D3DXCreateEffectFromFileExW(device, filename_w, NULL, NULL, NULL, @@ -7813,7 +7811,7 @@ static void test_create_effect_from_file(void) effect->lpVtbl->Release(effect); lstrcpyW(filename_w, effect_path_w); - lstrcatW(filename_w, effect2_filename_w); + lstrcatW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; /* This is apparently broken on native, it ends up using the wrong include. */ @@ -7835,7 +7833,7 @@ static void test_create_effect_from_file(void) delete_file("include2.h"); delete_directory("include"); - lstrcpyW(filename_w, effect2_filename_w); + lstrcpyW(filename_w, L"effect2.fx"); effect = NULL; messages = NULL; include.ID3DXInclude_iface.lpVtbl = &d3dxinclude_vtbl; -- 2.26.2

2 1

[PATCH] d3dx11/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx11_43/tests/d3dx11.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_43/tests/d3dx11.c b/dlls/d3dx11_43/tests/d3dx11.c index db06c971440..06924877da4 100644 --- a/dlls/d3dx11_43/tests/d3dx11.c +++ b/dlls/d3dx11_43/tests/d3dx11.c @@ -129,13 +129,12 @@ static void test_D3DX11CreateAsyncMemoryLoader(void) static void create_testfile(WCHAR *path, const void *data, int data_len) { - static const WCHAR test_filename[] = {'a','s','y','n','c','l','o','a','d','e','r','.','d','a','t','a',0}; DWORD written; HANDLE file; BOOL ret; GetTempPathW(MAX_PATH, path); - lstrcatW(path, test_filename); + lstrcatW(path, L"asyncloader.data"); file = CreateFileW(path, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); ok(file != INVALID_HANDLE_VALUE, "Test file creation failed, at %s, error %d.\n", @@ -240,7 +239,6 @@ static void test_D3DX11CreateAsyncFileLoader(void) static void test_D3DX11CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX11DataLoader *loader; HRESULT hr; @@ -259,7 +257,7 @@ static void test_D3DX11CreateAsyncResourceLoader(void) hr = D3DX11CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX11CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX11CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX11_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } -- 2.26.2

2 1

[PATCH] d3dx10/tests: Use wide-char string literals.
by Michael Stefaniuc 01 Oct '20

01 Oct '20

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 897c54249b3..54cb4df3b7b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1340,7 +1340,6 @@ static void test_D3DX10CreateAsyncFileLoader(void) static void test_D3DX10CreateAsyncResourceLoader(void) { - static const WCHAR resource_name[] = {'n','o','n','a','m','e',0}; ID3DX10DataLoader *loader; HRESULT hr; @@ -1359,7 +1358,7 @@ static void test_D3DX10CreateAsyncResourceLoader(void) hr = D3DX10CreateAsyncResourceLoaderW(NULL, NULL, &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); - hr = D3DX10CreateAsyncResourceLoaderW(NULL, resource_name, &loader); + hr = D3DX10CreateAsyncResourceLoaderW(NULL, L"noname", &loader); ok(hr == D3DX10_ERR_INVALID_DATA, "Got unexpected hr %#x.\n", hr); } -- 2.26.2

2 1

[PATCH v4] msdmo: Also handle ERROR_SUCCESS with nonzero size from RegQueryValueExW().
by Zebediah Figura 30 Sep '20

30 Sep '20

Fixes: caa41d4917a84dbbeb4aa14f18cfecfd17efe71a Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49659 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/dmoreg.c | 20 +++++++++++++----- dlls/msdmo/tests/msdmo.c | 44 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 8e0680931f4..33caa6d0dc5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -526,11 +526,16 @@ static HRESULT WINAPI IEnumDMO_fnNext( if (This->pInTypes) { - DWORD size = types_size, i; + DWORD size, i; - while ((ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"InputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); @@ -559,9 +564,14 @@ static HRESULT WINAPI IEnumDMO_fnNext( { DWORD size = types_size, i; - while ((ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, - (BYTE *)types, &size)) == ERROR_MORE_DATA) + for (;;) { + size = types_size; + ret = RegQueryValueExW(hkey, L"OutputTypes", NULL, NULL, (BYTE *)types, &size); + if (ret != ERROR_SUCCESS && ret != ERROR_MORE_DATA) + break; + if (size <= types_size) + break; if (!array_reserve((void **)&types, &types_size, size, 1)) { RegCloseKey(hkey); diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index a1ab8ee00dc..b1b2f544ceb 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -88,6 +88,9 @@ static void test_DMOGetName(void) static void test_DMOEnum(void) { + static const DMO_PARTIAL_MEDIATYPE input_type = {{0x1111}, {0x2222}}; + static const DMO_PARTIAL_MEDIATYPE wrong_type = {{0x3333}, {0x4444}}; + IEnumDMO *enum_dmo; HRESULT hr; CLSID clsid; @@ -115,6 +118,47 @@ static void test_DMOEnum(void) ok(count == 0, "expected 0, got %d\n", count); IEnumDMO_Release(enum_dmo); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 1, &input_type, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_DMOGetTypes(void) -- 2.28.0

1 0

[PATCH v3] dxgi/tests: Check that the last adapter is always WARP.
by Rémi Bernon 30 Sep '20

30 Sep '20

Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add a new condition for the windows version <= 7 that don't expose WARP adapters. I couldn't really test it though as I don't have access to a Win7 machine and the testbot win7 VM fail to enumerate their adapters before reaching there. dlls/dxgi/tests/dxgi.c | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3b..2e3ea1720f8 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5326,9 +5326,12 @@ static void test_multi_adapter(void) unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; DXGI_OUTPUT_DESC old_output_desc, output_desc; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; + IDXGIAdapter1 *adapter1; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; @@ -5530,6 +5533,47 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + /* Win8+ always have a WARP adapter present at the end */ + todo_wine ok(adapter_index >= 2, "Unexpected adapter count %u.\n", adapter_index); + if (broken(adapter_index < 2) /* <= Win7 */) + { + win_skip("WARP adapter missing, skipping tests\n"); + goto done; + } + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(SUCCEEDED(hr), "Failed to get the last adapter %u, hr %#x.\n", adapter_index - 1, hr); + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Unexpected name for the last adapter %s.\n", wine_dbgstr_w(adapter_desc.Description)); + todo_wine ok(adapter_desc.VendorId == 0x1414, "Expected VendorId 0x1414, got %#x.\n", + adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, "Expected DeviceId 0x008c, got %#x.\n", + adapter_desc.DeviceId); + ok(adapter_desc.SubSysId == 0x0000, "Expected SubSysId 0x0000, got %#x.\n", + adapter_desc.SubSysId); + ok(adapter_desc.Revision == 0x0000, "Expected Revision 0x0000, got %#x.\n", + adapter_desc.Revision); + todo_wine ok(adapter_desc.DedicatedVideoMemory == 0, + "Expected DedicatedVideoMemory 0, got %#lx.\n", adapter_desc.DedicatedVideoMemory); + ok(adapter_desc.DedicatedSystemMemory == 0, "Expected DedicatedSystemMemory 0, got %#lx.\n", + adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, + "Expected flags DXGI_ADAPTER_FLAG_SOFTWARE, got %#x.\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + +done: IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS); -- 2.28.0

1 0

[PATCH v3 1/2] msdmo/tests: Add more tests for DMOEnum().
by Zebediah Figura 30 Sep '20

30 Sep '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msdmo/tests/msdmo.c | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/msdmo/tests/msdmo.c b/dlls/msdmo/tests/msdmo.c index a1ab8ee00dc..b1b2f544ceb 100644 --- a/dlls/msdmo/tests/msdmo.c +++ b/dlls/msdmo/tests/msdmo.c @@ -88,6 +88,9 @@ static void test_DMOGetName(void) static void test_DMOEnum(void) { + static const DMO_PARTIAL_MEDIATYPE input_type = {{0x1111}, {0x2222}}; + static const DMO_PARTIAL_MEDIATYPE wrong_type = {{0x3333}, {0x4444}}; + IEnumDMO *enum_dmo; HRESULT hr; CLSID clsid; @@ -115,6 +118,47 @@ static void test_DMOEnum(void) ok(count == 0, "expected 0, got %d\n", count); IEnumDMO_Release(enum_dmo); + + hr = DMORegister(L"testdmo", &GUID_unknowndmo, &GUID_unknowncategory, 0, 1, &input_type, 0, NULL); + if (hr != S_OK) + return; + + hr = DMOEnum(&GUID_unknowncategory, 0, 0, NULL, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &input_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(IsEqualGUID(&clsid, &GUID_unknowndmo), "Got clsid %s.\n", debugstr_guid(&clsid)); + ok(!wcscmp(name, L"testdmo"), "Got name %s.\n", debugstr_w(name)); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOEnum(&GUID_unknowncategory, 0, 1, &wrong_type, 0, NULL, &enum_dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumDMO_Next(enum_dmo, 1, &clsid, &name, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumDMO_Release(enum_dmo); + + hr = DMOUnregister(&GUID_unknowndmo, &GUID_unknowncategory); + ok(hr == S_OK, "Got hr %#x.\n", hr); } static void test_DMOGetTypes(void) -- 2.28.0

1 1