- wine-devel - winehq.org

[PATCH] wineps.drv: Don't use strcasecmp.
by Piotr Caban 05 Apr '19

05 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wineps.drv/builtin.c | 3 ++- dlls/wineps.drv/font.c | 5 +++-- dlls/wineps.drv/mkagl.c | 4 ++-- dlls/wineps.drv/ppd.c | 21 +++++++++++---------- dlls/wineps.drv/type1afm.c | 7 ++++--- 5 files changed, 22 insertions(+), 18 deletions(-)

2 1

[PATCH v2] msi: Use case sensitive compare in handle_msi_break.
by Piotr Caban 05 Apr '19

05 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/custom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/4] quartz/tests: Fix some VMR9 test failures.
by Zebediah Figura 05 Apr '19

05 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 43 ++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index f8e6f21586..88b0562e38 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -36,7 +36,7 @@ static IBaseFilter *create_vmr9(DWORD mode) hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, mode); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); IVMRFilterConfig9_Release(config); } return filter; @@ -65,7 +65,7 @@ static void test_filter_config(void) ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -82,7 +82,7 @@ static void test_filter_config(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -134,7 +134,7 @@ static void test_filter_config(void) /* Despite MSDN, you can still change the rendering mode after setting the * stream count. */ hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK || broken(hr == E_FAIL), "Got hr %#x.\n", hr); hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -150,19 +150,30 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) -static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +#define check_interface_broken(a, b, c) check_interface_(__LINE__, a, b, c, TRUE) +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c, FALSE) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID riid, BOOL supported, BOOL is_broken) { - IUnknown *iface = iface_ptr; - HRESULT hr, expected_hr; - IUnknown *unk; + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; - expected_hr = supported ? S_OK : E_NOINTERFACE; + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } - hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + hr = IUnknown_QueryInterface(unknown, riid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); if (SUCCEEDED(hr)) - IUnknown_Release(unk); + IUnknown_Release(out); + return hr; } static void test_interfaces(void) @@ -188,7 +199,9 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + /* IVMRMonitorConfig9 may not be available if the d3d9 device has + * insufficient support. */ + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); @@ -210,7 +223,7 @@ static void test_interfaces(void) IBaseFilter_Release(filter); filter = create_vmr9(VMR9Mode_Windowless); - check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface_broken(filter, &IID_IVMRMonitorConfig9, TRUE); check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); -- 2.20.1

2 5

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 05 Apr '19

05 Apr '19

1 0

[PATCH] msi: Don't use strcasecmp.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/custom.c | 3 ++- dlls/shell32/pidl.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

3 2

[PATCH v4] ntdll: Also try to stat() the drive root.
by Zebediah Figura 04 Apr '19

04 Apr '19

From: "Thomas J. Moore" <darktjm(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46863 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This supersedes patch 162281. dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6736..859f4d82b5 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2638,7 +2638,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer char *p; unix_name[pos + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if (!redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) + if (!name_len || !redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) { if (!stat( unix_name, &st )) { -- 2.20.1

1 0

[PATCH] mscoree: Don't return from _CorExeMain.
by Vincent Povirk 04 Apr '19

04 Apr '19

Testing on Windows shows that unmanaged threads do not keep the process open after a .NET program's entry point and all .NET foreground threads have exited. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/corruntimehost.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ca8ba0dc01f..95f6a9a892e 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1524,6 +1524,8 @@ __int32 WINAPI _CorExeMain(void) mono_runtime_quit(); } + ExitProcess(exit_code); + return exit_code; } -- 2.17.1

1 0

[PATCH] wined3d: Don't use strcasecmp.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)

2 1

[PATCH 1/4] d3d8/tests: Add more tests for calling stateblock methods while recording.
by Zebediah Figura 04 Apr '19

04 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/d3d8/tests/device.c | 57 +++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c5ec9aa736..f0acd9ff81 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -7231,10 +7231,11 @@ cleanup: static void test_begin_end_state_block(void) { + DWORD stateblock, stateblock2; IDirect3DDevice8 *device; - DWORD stateblock; IDirect3D8 *d3d; ULONG refcount; + DWORD value; HWND window; HRESULT hr; @@ -7249,28 +7250,54 @@ static void test_begin_end_state_block(void) return; } - /* Should succeed. */ hr = IDirect3DDevice8_BeginStateBlock(device); - ok(SUCCEEDED(hr), "Failed to begin stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Calling BeginStateBlock() while recording should return - * D3DERR_INVALIDCALL. */ - hr = IDirect3DDevice8_BeginStateBlock(device); - ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - /* Should succeed. */ stateblock = 0xdeadbeef; hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); - ok(SUCCEEDED(hr), "Failed to end stateblock, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(!!stateblock && stateblock != 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); - IDirect3DDevice8_DeleteStateBlock(device, stateblock); - /* Calling EndStateBlock() while not recording should return - * D3DERR_INVALIDCALL. stateblock should not be touched. */ - stateblock = 0xdeadbeef; - hr = IDirect3DDevice8_EndStateBlock(device, &stateblock); + stateblock2 = 0xdeadbeef; + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); - ok(stateblock == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock); + ok(stateblock2 == 0xdeadbeef, "Got unexpected stateblock %#x.\n", stateblock2); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginStateBlock(device); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CaptureStateBlock(device, stateblock); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_CreateStateBlock(device, D3DSBT_ALL, &stateblock2); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(value == TRUE, "Got unexpected value %#x.\n", value); + + hr = IDirect3DDevice8_EndStateBlock(device, &stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_ApplyStateBlock(device, stateblock2); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderState(device, D3DRS_LIGHTING, &value); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(value == TRUE, "Got unexpected value %#x.\n", value); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- 2.20.1

3 11

[PATCH 1/2] d3d9: Keep previous stream source stride and offset only when setting NULL buffer.
by Paul Gofman 04 Apr '19

04 Apr '19

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/d3d9/device.c | 10 +++------- dlls/d3d9/tests/device.c | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 5e505b4cfa..5d14ce3cbc 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3567,13 +3567,9 @@ static HRESULT WINAPI d3d9_device_SetStreamSource(IDirect3DDevice9Ex *iface, iface, stream_idx, buffer, offset, stride); wined3d_mutex_lock(); - if (!stride) - { - unsigned int cur_offset; - - hr = wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, - &cur_offset, &stride); - } + if (!buffer_impl) + wined3d_device_get_stream_source(device->wined3d_device, stream_idx, &wined3d_buffer, + &offset, &stride); if (!buffer_impl) wined3d_buffer = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 57521a5648..97435e91a5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3240,7 +3240,8 @@ cleanup: static void test_set_stream_source(void) { - IDirect3DVertexBuffer9 *vb; + IDirect3DVertexBuffer9 *vb, *current_vb; + unsigned int offset, stride; IDirect3DDevice9 *device; IDirect3D9 *d3d9; ULONG refcount; @@ -3273,7 +3274,24 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 3, 32); ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 4, 32); - ok(SUCCEEDED(hr), "Failed to set the stream source, hr %#x.\n", hr); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(!current_vb, "Got unexpected vb %p.\n", current_vb); + ok(offset == 4, "Got unexpected offset %u.\n", offset); + ok(stride == 32, "Got unexpected stride %u.\n", stride); + + hr = IDirect3DDevice9_SetStreamSource(device, 0, vb, 0, 0); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice9_GetStreamSource(device, 0, &current_vb, &offset, &stride); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + ok(current_vb == vb, "Got unexpected vb %p.\n", current_vb); + IDirect3DVertexBuffer9_Release(current_vb); + ok(!offset, "Got unexpected offset %u.\n", offset); + ok(!stride, "Got unexpected stride %u.\n", stride); /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); -- 2.20.1

4 8

[PATCH vkd3d 3/5] vkd3d: Simplify d3d12_command_list_update_descriptor_table().
by Józef Kucia 04 Apr '19

04 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 936e96598f9c..b9deffe33328 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2057,7 +2057,7 @@ static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_des } static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list *list, - VkPipelineBindPoint bind_point, unsigned int index, D3D12_GPU_DESCRIPTOR_HANDLE base_descriptor) + VkPipelineBindPoint bind_point, unsigned int index, struct d3d12_desc *base_descriptor) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; struct VkWriteDescriptorSet descriptor_writes[24], *current_descriptor_write; @@ -2072,19 +2072,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list descriptor_table = root_signature_get_descriptor_table(root_signature, index); - descriptor_count = 0; - for (i = 0; i < descriptor_table->range_count; ++i) - descriptor_count += descriptor_table->ranges[i].descriptor_count; - - if (!descriptor_count) - return; - - if (!(descriptor = d3d12_desc_from_gpu_handle(base_descriptor))) - { - WARN("Descriptor table %u is not set.\n", index); - return; - } - + descriptor = base_descriptor; descriptor_count = 0; current_descriptor_write = descriptor_writes; current_image_info = image_infos; @@ -2094,7 +2082,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list if (range->offset != D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND) { - descriptor = d3d12_desc_from_gpu_handle(base_descriptor) + range->offset; + descriptor = base_descriptor + range->offset; } for (j = 0; j < range->descriptor_count; ++j, ++descriptor) @@ -2296,6 +2284,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct d3d12_root_signature *rs = bindings->root_signature; + struct d3d12_desc *base_descriptor; unsigned int i; if (!rs || !rs->pool_size_count || !rs->vk_set_layout) @@ -2307,7 +2296,12 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis for (i = 0; i < ARRAY_SIZE(bindings->descriptor_tables); ++i) { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) - d3d12_command_list_update_descriptor_table(list, bind_point, i, bindings->descriptor_tables[i]); + { + if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); + else + WARN("Descriptor table %u is not set.\n", i); + } } bindings->descriptor_table_dirty_mask = 0; -- 2.19.2

2 1

[PATCH vkd3d 4/5] vkd3d: Add support for VK_EXT_depth_clip_enable.
by Józef Kucia 04 Apr '19

04 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- configure.ac | 2 +- libs/vkd3d/device.c | 22 ++++++++++++++++++ libs/vkd3d/state.c | 47 +++++++++++++++++++++++++++++--------- libs/vkd3d/vkd3d_private.h | 4 +++- tests/d3d12.c | 2 +- tests/d3d12_crosstest.h | 11 +++++++++ 6 files changed, 74 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 4d7b83a6e161..029278126b49 100644 --- a/configure.ac +++ b/configure.ac @@ -67,7 +67,7 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) -VKD3D_CHECK_VULKAN_HEADER_VERSION([88], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.88 is required.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([101], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.101 is required.])]) dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 0dbbde4c2d20..bdea5a9067d9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -135,6 +135,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, /* EXT extensions */ {VK_EXT_DEBUG_MARKER_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_debug_marker)}, + {VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_depth_clip_enable)}, {VK_EXT_DESCRIPTOR_INDEXING_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_descriptor_indexing)}, {VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, EXT_transform_feedback)}, @@ -899,6 +900,7 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 { const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; + const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; const VkPhysicalDeviceFeatures *features = &features2->features; const VkPhysicalDeviceTransformFeedbackFeaturesEXT *xfb; @@ -1009,6 +1011,13 @@ static void vkd3d_trace_physical_device_features(const VkPhysicalDeviceFeatures2 descriptor_indexing->runtimeDescriptorArray); } + depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); + if (depth_clip_features) + { + TRACE(" VkPhysicalDeviceDepthClipEnableFeaturesEXT:\n"); + TRACE(" depthClipEnable: %#x.\n", depth_clip_features->depthClipEnable); + } + xfb = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT); if (xfb) { @@ -1080,6 +1089,8 @@ static void vkd3d_init_feature_level(struct vkd3d_vulkan_info *vk_info, CHECK_FEATURE(shaderStorageImageWriteWithoutFormat); CHECK_FEATURE(tessellationShader); + if (!vk_info->EXT_depth_clip_enable) + WARN("Depth clip enable is not supported.\n"); if (!vk_info->EXT_transform_feedback) WARN("Stream output is not supported.\n"); @@ -1113,6 +1124,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT vertex_divisor_properties; const VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT *divisor_features; const struct vkd3d_optional_device_extensions_info *optional_extensions; + const VkPhysicalDeviceDepthClipEnableFeaturesEXT *depth_clip_features; VkPhysicalDeviceDescriptorIndexingFeaturesEXT *descriptor_indexing; VkPhysicalDeviceMaintenance3Properties maintenance3_properties; VkPhysicalDeviceTransformFeedbackPropertiesEXT xfb_properties; @@ -1240,6 +1252,12 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, optional_extensions ? optional_extensions->extension_count : 0, *user_extension_supported, vulkan_info, "device"); + depth_clip_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT); + if (depth_clip_features) + { + vulkan_info->EXT_depth_clip_enable = depth_clip_features->depthClipEnable; + } + divisor_features = vk_find_struct(features2->pNext, PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_FEATURES_EXT); if (get_spec_version(vk_extensions, count, VK_EXT_VERTEX_ATTRIBUTE_DIVISOR_EXTENSION_NAME) >= 3 && divisor_features) @@ -1522,6 +1540,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing_features; VkPhysicalDeviceVertexAttributeDivisorFeaturesEXT vertex_divisor_features; const struct vkd3d_optional_device_extensions_info *optional_extensions; + VkPhysicalDeviceDepthClipEnableFeaturesEXT depth_clip_features; VkPhysicalDeviceTransformFeedbackFeaturesEXT xfb_features; struct vkd3d_vulkan_info *vulkan_info = &device->vk_info; struct vkd3d_device_queue_info device_queue_info; @@ -1558,8 +1577,11 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VK_CALL(vkGetPhysicalDeviceMemoryProperties(physical_device, &device->memory_properties)); + memset(&depth_clip_features, 0, sizeof(depth_clip_features)); + depth_clip_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLIP_ENABLE_FEATURES_EXT; memset(&descriptor_indexing_features, 0, sizeof(descriptor_indexing_features)); descriptor_indexing_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT; + descriptor_indexing_features.pNext = &depth_clip_features.pNext; memset(&xfb_features, 0, sizeof(xfb_features)); xfb_features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT; xfb_features.pNext = &descriptor_indexing_features; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index c7ae63bdc315..85ecb395f3dc 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -19,6 +19,16 @@ #include "vkd3d_private.h" +static void vk_append_struct(void *h, void *structure) +{ + VkBaseOutStructure *header = h; + + while (header->pNext) + header = header->pNext; + + header->pNext = structure; +} + /* ID3D12RootSignature */ static inline struct d3d12_root_signature *impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) { @@ -1496,7 +1506,7 @@ static enum VkCullModeFlagBits vk_cull_mode_from_d3d12(D3D12_CULL_MODE mode) } } -static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk_desc, +static void rs_desc_from_d3d12(VkPipelineRasterizationStateCreateInfo *vk_desc, const D3D12_RASTERIZER_DESC *d3d12_desc) { vk_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; @@ -1523,7 +1533,20 @@ static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk FIXME("Ignoring ConservativeRaster %#x.\n", d3d12_desc->ConservativeRaster); } -static void rs_stream_desc_from_d3d12(VkPipelineRasterizationStateStreamCreateInfoEXT *vk_desc, +static void rs_depth_clip_info_from_d3d12(VkPipelineRasterizationDepthClipStateCreateInfoEXT *depth_clip_info, + VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_RASTERIZER_DESC *d3d12_desc) +{ + vk_rs_desc->depthClampEnable = VK_TRUE; + + depth_clip_info->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT; + depth_clip_info->pNext = NULL; + depth_clip_info->flags = 0; + depth_clip_info->depthClipEnable = d3d12_desc->DepthClipEnable; + + vk_append_struct(vk_rs_desc, depth_clip_info); +} + +static void rs_stream_info_from_d3d12(VkPipelineRasterizationStateStreamCreateInfoEXT *stream_info, VkPipelineRasterizationStateCreateInfo *vk_rs_desc, const D3D12_STREAM_OUTPUT_DESC *so_desc, const struct vkd3d_vulkan_info *vk_info) { @@ -1536,12 +1559,12 @@ static void rs_stream_desc_from_d3d12(VkPipelineRasterizationStateStreamCreateIn return; } - vk_desc->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT; - vk_desc->pNext = NULL; - vk_desc->flags = 0; - vk_desc->rasterizationStream = so_desc->RasterizedStream; + stream_info->sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_STREAM_CREATE_INFO_EXT; + stream_info->pNext = NULL; + stream_info->flags = 0; + stream_info->rasterizationStream = so_desc->RasterizedStream; - vk_rs_desc->pNext = vk_desc; + vk_append_struct(vk_rs_desc, stream_info); } static enum VkStencilOp vk_stencil_op_from_d3d12(D3D12_STENCIL_OP op) @@ -1859,13 +1882,13 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; - struct VkSubpassDescription sub_pass_desc; - struct VkRenderPassCreateInfo pass_desc; VkShaderStageFlagBits xfb_stage = 0; VkSampleCountFlagBits sample_count; + VkSubpassDescription sub_pass_desc; const struct vkd3d_format *format; - enum VkVertexInputRate input_rate; + VkRenderPassCreateInfo pass_desc; unsigned int instance_divisor; + VkVertexInputRate input_rate; unsigned int i, j; size_t rt_count; uint32_t mask; @@ -2333,7 +2356,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s || so_desc->RasterizedStream == D3D12_SO_NO_RASTERIZED_STREAM) graphics->rs_desc.rasterizerDiscardEnable = VK_TRUE; - rs_stream_desc_from_d3d12(&graphics->rs_stream_desc, &graphics->rs_desc, so_desc, vk_info); + rs_stream_info_from_d3d12(&graphics->rs_stream_info, &graphics->rs_desc, so_desc, vk_info); + if (vk_info->EXT_depth_clip_enable) + rs_depth_clip_info_from_d3d12(&graphics->rs_depth_clip_info, &graphics->rs_desc, &desc->RasterizerState); graphics->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; graphics->ms_desc.pNext = NULL; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 24d26d90ebf5..76fec700f82e 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -95,6 +95,7 @@ struct vkd3d_vulkan_info bool KHR_push_descriptor; /* EXT device extensions */ bool EXT_debug_marker; + bool EXT_depth_clip_enable; bool EXT_descriptor_indexing; bool EXT_transform_feedback; bool EXT_vertex_attribute_divisor; @@ -629,7 +630,8 @@ struct d3d12_graphics_pipeline_state VkPipelineDepthStencilStateCreateInfo ds_desc; VkSampleMask sample_mask[2]; - VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_desc; + VkPipelineRasterizationDepthClipStateCreateInfoEXT rs_depth_clip_info; + VkPipelineRasterizationStateStreamCreateInfoEXT rs_stream_info; const struct d3d12_root_signature *root_signature; diff --git a/tests/d3d12.c b/tests/d3d12.c index 1f88e68fc0b3..0c19bf3289b8 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16823,7 +16823,7 @@ static void test_depth_clip(void) transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(!is_mesa_intel_device(context.device)) + bug_if(!is_depth_clip_enable_supported(context.device)) check_sub_resource_float(ds.texture, 0, queue, command_list, 1.0f, 2); reset_command_list(command_list, context.allocator); diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 2103cafd03c4..171c23418028 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -364,6 +364,11 @@ static inline bool is_radv_device(ID3D12Device *device) return false; } +static inline bool is_depth_clip_enable_supported(ID3D12Device *device) +{ + return true; +} + #else static bool check_device_extension(VkPhysicalDevice vk_physical_device, const char *name) @@ -585,6 +590,12 @@ static inline bool is_radv_device(ID3D12Device *device) get_driver_properties(device, &properties); return properties.driverID == VK_DRIVER_ID_MESA_RADV_KHR; } + +static inline bool is_depth_clip_enable_supported(ID3D12Device *device) +{ + VkPhysicalDevice vk_physical_device = vkd3d_get_vk_physical_device(device); + return check_device_extension(vk_physical_device, VK_EXT_DEPTH_CLIP_ENABLE_EXTENSION_NAME); +} #endif static void parse_args(int argc, char **argv) -- 2.19.2

3 2

[PATCH vkd3d 5/5] include: Introduce VKD3D_NO_TRACE_MESSAGES and VKD3D_NO_DEBUG_MESSAGES.
by Józef Kucia 04 Apr '19

04 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_debug.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index 42e5903d96d9..5d798ef9a13d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -23,6 +23,15 @@ #include <stdarg.h> +#ifdef VKD3D_NO_TRACE_MESSAGES +#define TRACE(args...) +#endif + +#ifdef VKD3D_NO_DEBUG_MESSAGES +#define WARN(args...) +#define FIXME(args...) +#endif + enum vkd3d_dbg_level { VKD3D_DBG_LEVEL_NONE, @@ -50,9 +59,18 @@ const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; #define VKD3D_DBG_PRINTF(args...) \ vkd3d_dbg_printf(vkd3d_dbg_level, __FUNCTION__, args); } while (0) +#ifndef TRACE #define TRACE VKD3D_DBG_LOG(TRACE) +#endif + +#ifndef WARN #define WARN VKD3D_DBG_LOG(WARN) +#endif + +#ifndef FIXME #define FIXME VKD3D_DBG_LOG(FIXME) +#endif + #define ERR VKD3D_DBG_LOG(ERR) #define TRACE_ON() (vkd3d_dbg_get_level() == VKD3D_DBG_LEVEL_TRACE) -- 2.19.2

2 1

[PATCH vkd3d 2/5] vkd3d: Drop support for dummy sampler.
by Józef Kucia 04 Apr '19

04 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 6 ------ libs/vkd3d-shader/spirv.c | 1 - libs/vkd3d/device.c | 21 --------------------- libs/vkd3d/state.c | 32 -------------------------------- libs/vkd3d/vkd3d_private.h | 4 ---- 5 files changed, 64 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index ed4c0a0075a6..15a0b22d64dc 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -144,12 +144,6 @@ struct vkd3d_shader_interface_info const struct vkd3d_shader_combined_resource_sampler *combined_samplers; unsigned int combined_sampler_count; - /* A sampler used by OpImageFetches generated for SM4 ld instructions. - * - * In Vulkan OpImageFetch must be used with a sampled image. - */ - struct vkd3d_shader_descriptor_binding dummy_sampler; - const struct vkd3d_shader_uav_counter_binding *uav_counters; unsigned int uav_counter_count; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e036c7161621..b0134164cd79 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2004,7 +2004,6 @@ struct vkd3d_dxbc_compiler uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t private_output_variable_write_mask[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t epilogue_function_id; - uint32_t dummy_sampler_id; uint32_t binding_idx; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a754077226b8..0dbbde4c2d20 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1634,18 +1634,6 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, return hr; } -static HRESULT d3d12_device_create_dummy_sampler(struct d3d12_device *device) -{ - D3D12_STATIC_SAMPLER_DESC sampler_desc; - - memset(&sampler_desc, 0, sizeof(sampler_desc)); - sampler_desc.Filter = D3D12_FILTER_MIN_MAG_MIP_POINT; - sampler_desc.AddressU = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressV = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_CLAMP; - return vkd3d_create_static_sampler(device, &sampler_desc, &device->vk_dummy_sampler); -} - static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -1855,7 +1843,6 @@ static ULONG STDMETHODCALLTYPE d3d12_device_Release(ID3D12Device *iface) vkd3d_destroy_null_resources(&device->null_resources, device); vkd3d_gpu_va_allocator_cleanup(&device->gpu_va_allocator); vkd3d_fence_worker_stop(&device->fence_worker, device); - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); d3d12_device_destroy_pipeline_cache(device); d3d12_device_destroy_vkd3d_queues(device); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); @@ -3004,17 +2991,10 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->removed_reason = S_OK; device->vk_device = VK_NULL_HANDLE; - device->vk_dummy_sampler = VK_NULL_HANDLE; if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) goto out_free_instance; - if (FAILED(hr = d3d12_device_create_dummy_sampler(device))) - { - ERR("Failed to create dummy sampler, hr %#x.\n", hr); - goto out_free_vk_resources; - } - if (FAILED(hr = d3d12_device_init_pipeline_cache(device))) goto out_free_vk_resources; @@ -3042,7 +3022,6 @@ out_free_pipeline_cache: d3d12_device_destroy_pipeline_cache(device); out_free_vk_resources: vk_procs = &device->vk_procs; - VK_CALL(vkDestroySampler(device->vk_device, device->vk_dummy_sampler, NULL)); VK_CALL(vkDestroyDevice(device->vk_device, NULL)); out_free_instance: vkd3d_instance_decref(device->vkd3d_instance); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index aa9f62bccaaf..c7ae63bdc315 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -775,24 +775,6 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign return S_OK; } -static HRESULT d3d12_root_signature_init_dummy_sampler(struct d3d12_root_signature *root_signature, - struct d3d12_device *device, struct vkd3d_descriptor_set_context *context) -{ - VkDescriptorSetLayoutBinding *binding = context->current_binding; - - root_signature->dummy_sampler.set = context->set_index; - root_signature->dummy_sampler.binding = context->descriptor_binding++; - - binding->binding = root_signature->dummy_sampler.binding; - binding->descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; - binding->descriptorCount = 1; - binding->stageFlags = VK_SHADER_STAGE_ALL; - binding->pImmutableSamplers = &device->vk_dummy_sampler; - - ++context->current_binding; - return S_OK; -} - static HRESULT d3d12_root_signature_init_static_samplers(struct d3d12_root_signature *root_signature, struct d3d12_device *device, const D3D12_ROOT_SIGNATURE_DESC *desc, struct vkd3d_descriptor_set_context *context) @@ -883,7 +865,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa VkDescriptorSetLayoutBinding *binding_desc; struct d3d12_root_signature_info info; VkDescriptorSetLayout set_layouts[2]; - bool needs_dummy_sampler; HRESULT hr; memset(&context, 0, sizeof(context)); @@ -924,14 +905,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = desc->NumStaticSamplers; root_signature->root_descriptor_count = info.root_descriptor_count; - /* An additional sampler is created for SpvOpImageFetch. */ - needs_dummy_sampler = info.srv_count || info.buffer_srv_count; - if (needs_dummy_sampler) - { - ++info.sampler_count; - ++info.descriptor_count; - } - hr = E_OUTOFMEMORY; root_signature->parameter_count = desc->NumParameters; if (!(root_signature->parameters = vkd3d_calloc(root_signature->parameter_count, @@ -978,9 +951,6 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa goto fail; if (FAILED(hr = d3d12_root_signature_init_static_samplers(root_signature, device, desc, &context))) goto fail; - if (needs_dummy_sampler && FAILED(hr = d3d12_root_signature_init_dummy_sampler(root_signature, - device, &context))) - goto fail; root_signature->main_set = context.set_index; if (context.descriptor_binding) @@ -1421,7 +1391,6 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = state->uav_counters; shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2148,7 +2117,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.push_constant_buffer_count = root_signature->root_constant_count; shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; - shader_interface.dummy_sampler = root_signature->dummy_sampler; shader_interface.uav_counters = NULL; shader_interface.uav_counter_count = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index c071b414a73e..24d26d90ebf5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -584,7 +584,6 @@ struct d3d12_root_signature unsigned int descriptor_count; struct vkd3d_shader_resource_binding *descriptor_mapping; - struct vkd3d_shader_descriptor_binding dummy_sampler; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; @@ -912,9 +911,6 @@ struct d3d12_device pthread_mutex_t pipeline_cache_mutex; VkPipelineCache vk_pipeline_cache; - /* A sampler used for SpvOpImageFetch. */ - VkSampler vk_dummy_sampler; - VkPhysicalDeviceMemoryProperties memory_properties; D3D12_FEATURE_DATA_D3D12_OPTIONS feature_options; -- 2.19.2

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Drop support for dummy samplers.
by Józef Kucia 04 Apr '19

04 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> This shouldn't be needed by any Vulkan driver anymore. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 55 +++++++-------------------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 6cacf7c4b8d3..e036c7161621 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4602,32 +4602,6 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); } -static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) -{ - const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; - const SpvStorageClass storage_class = SpvStorageClassUniformConstant; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t type_id, ptr_type_id, var_id; - - if (compiler->dummy_sampler_id) - return compiler->dummy_sampler_id; - - type_id = vkd3d_spirv_get_op_type_sampler(builder); - ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, storage_class, type_id); - var_id = vkd3d_spirv_build_op_variable(builder, &builder->global_stream, - ptr_type_id, storage_class, 0); - - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationDescriptorSet, shader_interface->dummy_sampler.set); - vkd3d_spirv_build_op_decorate1(builder, var_id, - SpvDecorationBinding, shader_interface->dummy_sampler.binding); - - vkd3d_spirv_build_op_name(builder, var_id, "dummy_sampler"); - - compiler->dummy_sampler_id = var_id; - return compiler->dummy_sampler_id; -} - static const struct vkd3d_spirv_resource_type *vkd3d_dxbc_compiler_enable_resource_type( struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_resource_type resource_type, bool is_uav) { @@ -6746,11 +6720,9 @@ static void vkd3d_dxbc_compiler_prepare_image(struct vkd3d_dxbc_compiler *compil if (sampled) { assert(image->image_id); + assert(sampler_reg); - if (sampler_reg) - sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); - else - sampler_var_id = vkd3d_dxbc_compiler_get_dummy_sampler_id(compiler); + sampler_var_id = vkd3d_dxbc_compiler_get_register_id(compiler, sampler_reg); sampler_id = vkd3d_spirv_build_op_load(builder, vkd3d_spirv_get_op_type_sampler(builder), sampler_var_id, SpvMemoryAccessMaskNone); @@ -6781,7 +6753,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - uint32_t image_id, type_id, coordinate_id, val_id; + uint32_t type_id, coordinate_id, val_id; SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; @@ -6791,9 +6763,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; - /* OpImageFetch must be used with a sampled image. */ - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; @@ -6818,7 +6788,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, } assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, - image_id, coordinate_id, operands_mask, image_operands, image_operand_count); + image.image_id, coordinate_id, operands_mask, image_operands, image_operand_count); vkd3d_dxbc_compiler_emit_store_dst_swizzled(compiler, dst, val_id, image.sampled_type, src[1].swizzle); @@ -7041,10 +7011,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_raw_structured_addressing( static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t coordinate_id, type_id, val_id, image_id, texel_type_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t coordinate_id, type_id, val_id, texel_type_id; const struct vkd3d_shader_src_param *resource; uint32_t base_coordinate_id, component_idx; uint32_t constituents[VKD3D_VEC4_SIZE]; @@ -7055,18 +7025,11 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc resource = &src[instruction->src_count - 1]; if (resource->reg.type == VKD3DSPR_RESOURCE) - { - /* OpImageFetch must be used with a sampled image. */ op = SpvOpImageFetch; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_SAMPLED); - image_id = vkd3d_spirv_build_op_image(builder, image.image_type_id, image.sampled_image_id); - } else - { op = SpvOpImageRead; - vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); - image_id = image.image_id; - } + + vkd3d_dxbc_compiler_prepare_image(compiler, &image, &resource->reg, NULL, VKD3D_IMAGE_FLAG_NONE); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); base_coordinate_id = vkd3d_dxbc_compiler_emit_raw_structured_addressing(compiler, @@ -7085,7 +7048,7 @@ static void vkd3d_dxbc_compiler_emit_ld_raw_structured_srv_uav(struct vkd3d_dxbc coordinate_id, vkd3d_dxbc_compiler_get_constant_uint(compiler, component_idx)); val_id = vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, - op, texel_type_id, image_id, coordinate_id); + op, texel_type_id, image.image_id, coordinate_id); constituents[j++] = vkd3d_spirv_build_op_composite_extract1(builder, type_id, val_id, 0); } -- 2.19.2

2 1

[PATCH vkd3d v2] vkd3d: Improve UMA memory detection.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Some vulkan implementation report 2 memory types with the same VkMemoryPropertyFlags for a device. So check property flags to determine if UMA and CacheCoherentUMA are actually supported by the device. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 162192 libs/vkd3d/device.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a754077..8563b43 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2098,6 +2098,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * D3D12_FEATURE feature, void *feature_data, UINT feature_data_size) { struct d3d12_device *device = impl_from_ID3D12Device(iface); + unsigned int i; TRACE("iface %p, feature %#x, feature_data %p, feature_data_size %u.\n", iface, feature, feature_data, feature_data_size); @@ -2138,18 +2139,16 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * FIXME("Assuming device does not support tile based rendering.\n"); data->TileBasedRenderer = FALSE; - if (device->memory_properties.memoryTypeCount == 1) - { - TRACE("Assuming cache coherent UMA.\n"); - data->UMA = TRUE; - data->CacheCoherentUMA = TRUE; - } - else + data->UMA = TRUE; + data->CacheCoherentUMA = TRUE; + for (i = 0; i < device->memory_properties.memoryTypeCount; ++i) { - FIXME("Assuming NUMA.\n"); - data->UMA = FALSE; - data->CacheCoherentUMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT)) + data->UMA = FALSE; + if (!(device->memory_properties.memoryTypes[i].propertyFlags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + data->CacheCoherentUMA = FALSE; } + TRACE("UMA: %#x CacheCoherentUMA: %#x.\n", data->UMA, data->CacheCoherentUMA); return S_OK; } -- 2.20.1

3 2

[PATCH 1/3] d3dx9/tests: Avoid a test failure on Vista testbot.
by Matteo Bruni 04 Apr '19

04 Apr '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/math.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index becd55dedf6..3b7acfc2696 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -414,7 +414,8 @@ static void D3DXMatrixTest(void) ret = D3DXMatrixInverse(&gotmat, &determinant, &mat2); ok(!ret, "Unexpected return value %p.\n", ret); expect_matrix(&expectedmat, &gotmat, 1); - ok(compare_float(determinant, 5.0f, 0), "Unexpected determinant %.8e.\n", determinant); + ok(compare_float(determinant, 5.0f, 0) || broken(!determinant), /* Vista 64 bit testbot */ + "Unexpected determinant %.8e.\n", determinant); /*____________D3DXMatrixIsIdentity______________*/ expected = FALSE; -- 2.19.2

2 3

[PATCH 4/4] mscoree: Update install process to account for shared installs.
by Vincent Povirk 04 Apr '19

04 Apr '19

This will install the support MSI if it's found in a shared install. Otherwise, it'll fall back to appwiz as before. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/metahost.c | 4 +- dlls/mscoree/mscoree_main.c | 166 +++++++++++++++++++++++---------- dlls/mscoree/mscoree_private.h | 2 + 3 files changed, 122 insertions(+), 50 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3c4f803717b..50d43b30ead 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -129,8 +129,6 @@ void (CDECL *mono_thread_manage)(void); void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback); void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback); -static BOOL get_mono_path(LPWSTR path); - static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path); static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); @@ -772,7 +770,7 @@ static BOOL get_mono_path_datadir(LPWSTR path) return ret; } -static BOOL get_mono_path(LPWSTR path) +BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || get_mono_path_registry(path) || diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 7bb63592882..6393af8c6c5 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -665,30 +665,81 @@ static void parse_msi_version_string(const char *version, int *parts) } } +static int compare_versions(const char *a, const char *b) +{ + int a_parts[3], b_parts[3], i; + + parse_msi_version_string(a, a_parts); + parse_msi_version_string(b, b_parts); + + for (i=0; i<3; i++) + if (a_parts[i] != b_parts[i]) + return a_parts[i] - b_parts[i]; + + return 0; +} + +static BOOL invoke_appwiz(void) +{ + PROCESS_INFORMATION pi; + STARTUPINFOW si; + WCHAR app[MAX_PATH]; + WCHAR *args; + LONG len; + BOOL ret; + + static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; + static const WCHAR argsW[] = + {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; + + len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); + memcpy(app+len, controlW, sizeof(controlW)); + + args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); + if(!args) + return FALSE; + + memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); + memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + + TRACE("starting %s\n", debugstr_w(args)); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + HeapFree(GetProcessHeap(), 0, args); + if (ret) { + CloseHandle(pi.hThread); + WaitForSingleObject(pi.hProcess, INFINITE); + CloseHandle(pi.hProcess); + } + + return ret; +} + static BOOL install_wine_mono(void) { + static const WCHAR support_msi_relative[] = {'\\','s','u','p','p','o','r','t','\\','w','i','n','e','m','o','n','o','-','s','u','p','p','o','r','t','.','m','s','i',0}; BOOL is_wow64 = FALSE; - HMODULE hmsi; + HMODULE hmsi = NULL; + HRESULT initresult = E_FAIL; UINT (WINAPI *pMsiEnumRelatedProductsA)(LPCSTR,DWORD,DWORD,LPSTR); UINT (WINAPI *pMsiGetProductInfoA)(LPCSTR,LPCSTR,LPSTR,DWORD*); + UINT (WINAPI *pMsiOpenPackageW)(LPCWSTR,ULONG*); + UINT (WINAPI *pMsiGetProductPropertyA)(ULONG,LPCSTR,LPSTR,LPDWORD); + UINT (WINAPI *pMsiCloseHandle)(ULONG); + UINT (WINAPI *pMsiInstallProductW)(LPCWSTR,LPCWSTR); char versionstringbuf[15]; char productcodebuf[39]; UINT res; DWORD buffer_size; - PROCESS_INFORMATION pi; - STARTUPINFOW si; - WCHAR app[MAX_PATH]; - WCHAR *args; - LONG len; + ULONG msiproduct; BOOL ret; + WCHAR mono_path[MAX_PATH]; + WCHAR support_msi_path[MAX_PATH]; - static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; - static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; - static const WCHAR argsW[] = - {' ','a','p','p','w','i','z','.','c','p','l',' ','i','n','s','t','a','l','l','_','m','o','n','o',0}; - IsWow64Process(GetCurrentProcess(), &is_wow64); if (is_wow64) @@ -697,6 +748,16 @@ static BOOL install_wine_mono(void) return TRUE; } + TRACE("searching for mono runtime\n"); + + if (!get_mono_path(mono_path)) + { + TRACE("mono runtime not found\n"); + return invoke_appwiz(); + } + + TRACE("mono runtime is at %s\n", debugstr_w(mono_path)); + hmsi = LoadLibraryA("msi"); if (!hmsi) @@ -722,57 +783,68 @@ static BOOL install_wine_mono(void) ERR("MsiEnumRelatedProducts failed, err=%u\n", res); } - FreeLibrary(hmsi); + if (res == ERROR_SUCCESS) + { + TRACE("found installed support package %s\n", versionstringbuf); + + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("support package is at least %s, quitting\n", WINE_MONO_VERSION); + ret = TRUE; + goto end; + } + } + + strcpyW(support_msi_path, mono_path); + strcatW(support_msi_path, support_msi_relative); + + initresult = CoInitialize(NULL); + + pMsiOpenPackageW = (void*)GetProcAddress(hmsi, "MsiOpenPackageW"); + + res = pMsiOpenPackageW(support_msi_path, &msiproduct); if (res == ERROR_SUCCESS) { - int current_version[3], wanted_version[3], i; + buffer_size = sizeof(versionstringbuf); - TRACE("found installed version %s\n", versionstringbuf); + pMsiGetProductPropertyA = (void*)GetProcAddress(hmsi, "MsiGetProductPropertyA"); - parse_msi_version_string(versionstringbuf, current_version); - parse_msi_version_string(mono_version, wanted_version); + res = pMsiGetProductPropertyA(msiproduct, "ProductVersion", versionstringbuf, &buffer_size); - for (i=0; i<3; i++) - { - if (current_version[i] < wanted_version[i]) - break; - else if (current_version[i] > wanted_version[i]) - { - TRACE("installed version is newer than %s, quitting\n", mono_version); - return TRUE; - } - } + pMsiCloseHandle = (void*)GetProcAddress(hmsi, "MsiCloseHandle"); - if (i == 3) - { - TRACE("version %s is already installed, quitting\n", mono_version); - return TRUE; - } + pMsiCloseHandle(msiproduct); } - len = GetSystemDirectoryW(app, MAX_PATH - ARRAY_SIZE(controlW)); - memcpy(app+len, controlW, sizeof(controlW)); + if (res == ERROR_SUCCESS) { + TRACE("found support msi version %s at %s\n", versionstringbuf, debugstr_w(support_msi_path)); - args = HeapAlloc(GetProcessHeap(), 0, (len*sizeof(WCHAR) + sizeof(controlW) + sizeof(argsW))); - if(!args) - return FALSE; + if (compare_versions(WINE_MONO_VERSION, versionstringbuf) <= 0) + { + TRACE("installing support msi\n"); - memcpy(args, app, len*sizeof(WCHAR) + sizeof(controlW)); - memcpy(args + len + ARRAY_SIZE(controlW) - 1, argsW, sizeof(argsW)); + pMsiInstallProductW = (void*)GetProcAddress(hmsi, "MsiInstallProductW"); - TRACE("starting %s\n", debugstr_w(args)); + res = pMsiInstallProductW(support_msi_path, NULL); - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - ret = CreateProcessW(app, args, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - HeapFree(GetProcessHeap(), 0, args); - if (ret) { - CloseHandle(pi.hThread); - WaitForSingleObject(pi.hProcess, INFINITE); - CloseHandle(pi.hProcess); + if (res == ERROR_SUCCESS) + { + ret = TRUE; + goto end; + } + else + ERR("MsiInstallProduct failed, err=%i\n", res); + } } + ret = invoke_appwiz(); + +end: + if (hmsi) + FreeLibrary(hmsi); + if (SUCCEEDED(initresult)) + CoUninitialize(); return ret; } diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 77610994359..43209fd1877 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -108,6 +108,8 @@ extern HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config IStream *config_stream, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) DECLSPEC_HIDDEN; +extern BOOL get_mono_path(LPWSTR path) DECLSPEC_HIDDEN; + extern HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) DECLSPEC_HIDDEN; extern HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk) DECLSPEC_HIDDEN; -- 2.17.1

1 0

[PATCH 3/4] mscoree: Search shared addon locations for mono runtime.
by Vincent Povirk 04 Apr '19

04 Apr '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/Makefile.in | 2 + dlls/mscoree/metahost.c | 67 +++++++++++++++++++++++++++++++++- dlls/mscoree/mscoree_main.c | 2 +- dlls/mscoree/mscoree_private.h | 2 + 4 files changed, 71 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 634869e9ae7..9ae43df101c 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -11,3 +11,5 @@ C_SRCS = \ mscoree_main.c IDL_SRCS = mscoree_classes.idl + +metahost_EXTRADEFS = -DINSTALL_DATADIR="\"${datadir}\"" diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index d6af7b64b38..3c4f803717b 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -712,10 +712,75 @@ static BOOL get_mono_path_registry(LPWSTR path) return ret; } +static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) +{ + static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); + LPWSTR dos_dir; + WCHAR mono_dll_path[MAX_PATH]; + BOOL ret; + + if (!p_wine_get_dos_file_name) + { + p_wine_get_dos_file_name = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "wine_get_dos_file_name"); + if (!p_wine_get_dos_file_name) + return FALSE; + } + + dos_dir = p_wine_get_dos_file_name(unix_dir); + if (!dos_dir) + return FALSE; + + ret = find_mono_dll(dos_dir, mono_dll_path); + if (ret) + strcpyW(path, dos_dir); + + heap_free(dos_dir); + + return ret; +} + +static BOOL get_mono_path_datadir(LPWSTR path) +{ + const char *data_dir; + char *package_dir; + int len; + BOOL ret; + + if((data_dir = wine_get_data_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/mono/wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/mono/wine-mono-" WINE_MONO_VERSION); + } + else if((data_dir = wine_get_build_dir())) + { + len = strlen(data_dir); + package_dir = heap_alloc(len + sizeof("/../wine-mono-" WINE_MONO_VERSION)); + memcpy(package_dir, data_dir, len); + strcpy(package_dir+len, "/../wine-mono-" WINE_MONO_VERSION); + } + else + { + return FALSE; + } + + ret = get_mono_path_unix(package_dir, path); + + heap_free(package_dir); + + return ret; +} + static BOOL get_mono_path(LPWSTR path) { return get_mono_path_local(path) || - get_mono_path_registry(path); + get_mono_path_registry(path) || + get_mono_path_datadir(path) || + get_mono_path_unix(INSTALL_DATADIR "/wine/mono/wine-mono-" WINE_MONO_VERSION, path) || + (strcmp(INSTALL_DATADIR, "/usr/share") && + get_mono_path_unix("/usr/share/wine/mono/wine-mono-" WINE_MONO_VERSION, path)) || + get_mono_path_unix("/opt/wine/mono/wine-mono-" WINE_MONO_VERSION, path); } struct InstalledRuntimeEnum diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 198e2792918..7bb63592882 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.1"; + static const char* mono_version = WINE_MONO_VERSION; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 4e7ee013934..77610994359 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,6 +45,8 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; +#define WINE_MONO_VERSION "4.8.1" + /* Mono embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; -- 2.17.1

1 0

[PATCH 2/4] mscoree: Check for mono runtime path in registry.
by Vincent Povirk 04 Apr '19

04 Apr '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/mscoree/metahost.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index fc1d178751c..d6af7b64b38 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -667,7 +667,7 @@ static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path) return (attributes != INVALID_FILE_ATTRIBUTES); } -static BOOL get_mono_path(LPWSTR path) +static BOOL get_mono_path_local(LPWSTR path) { static const WCHAR subdir_mono[] = {'\\','m','o','n','o','\\','m','o','n','o','-','2','.','0', 0}; WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; @@ -685,6 +685,39 @@ static BOOL get_mono_path(LPWSTR path) return FALSE; } +static BOOL get_mono_path_registry(LPWSTR path) +{ + static const WCHAR keyname[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','M','o','n','o',0}; + static const WCHAR valuename[] = {'R','u','n','t','i','m','e','P','a','t','h',0}; + WCHAR base_path[MAX_PATH], mono_dll_path[MAX_PATH]; + HKEY hkey; + DWORD res, valuesize; + BOOL ret=FALSE; + + /* @@ Wine registry key: HKCU\Software\Wine\Mono */ + res = RegOpenKeyW(HKEY_CURRENT_USER, keyname, &hkey); + if (res != ERROR_SUCCESS) + return FALSE; + + valuesize = sizeof(base_path); + res = RegGetValueW(hkey, NULL, valuename, RRF_RT_REG_SZ, NULL, base_path, &valuesize); + if (res == ERROR_SUCCESS && find_mono_dll(base_path, mono_dll_path)) + { + strcpyW(path, base_path); + ret = TRUE; + } + + RegCloseKey(hkey); + + return ret; +} + +static BOOL get_mono_path(LPWSTR path) +{ + return get_mono_path_local(path) || + get_mono_path_registry(path); +} + struct InstalledRuntimeEnum { IEnumUnknown IEnumUnknown_iface; -- 2.17.1

1 0

[PATCH 1/4] mscoree: Update Wine Mono to 4.8.1.
by Vincent Povirk 04 Apr '19

04 Apr '19

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b0703073ddb..143931b3733 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -65,8 +65,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "4.8.0" -#define MONO_SHA "890159ffd1679ca7d45e840e1890caba8c24acbc18c59db1ca718b35a5ab8778" +#define MONO_VERSION "4.8.1" +#define MONO_SHA "4e073038c14c2496246ecb044ef8abfb8a1cfede58aa35168e04d484a003b032" typedef struct { const char *version; diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index db5f42616bd..198e2792918 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -682,7 +682,7 @@ static BOOL install_wine_mono(void) LONG len; BOOL ret; - static const char* mono_version = "4.8.0"; + static const char* mono_version = "4.8.1"; static const char* mono_upgrade_code = "{DE624609-C6B5-486A-9274-EF0B854F6BC5}"; static const WCHAR controlW[] = {'\\','c','o','n','t','r','o','l','.','e','x','e',0}; -- 2.17.1

1 0

[PATCH] shell32: Don't use strcasecmp.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/shell32/pidl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] d3dx9: Fix argument type in convert_dib_to_bmp().
by Matteo Bruni 04 Apr '19

04 Apr '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index cf8286ec758..c82c22289f6 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -770,7 +770,7 @@ HRESULT load_volume_texture_from_dds(IDirect3DVolumeTexture9 *volume_texture, co return D3D_OK; } -static BOOL convert_dib_to_bmp(void **data, UINT *size) +static BOOL convert_dib_to_bmp(const void **data, unsigned int *size) { ULONG header_size; ULONG count = 0; @@ -878,7 +878,7 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, } /* In case of DIB file, convert it to BMP */ - dib = convert_dib_to_bmp((void**)&data, &datasize); + dib = convert_dib_to_bmp(&data, &datasize); hr = WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory); @@ -1154,7 +1154,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileInMemory(IDirect3DSurface9 *pDestSurface, } if (imginfo.ImageFileFormat == D3DXIFF_DIB) - convert_dib_to_bmp((void**)&pSrcData, &SrcDataSize); + convert_dib_to_bmp(&pSrcData, &SrcDataSize); if (FAILED(WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory))) goto cleanup_err; -- 2.19.2

1 0

[PATCH] d3dxof: Don't use strncasecmp.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/d3dxof/parsing.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)

2 1

[PATCH] shlwapi: Fix PathIsContentTypeA implementation.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/shlwapi/path.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)

1 0

[PATCH v3] ntdll: Only fail lookup_unix_name() early if we actually tried stat().
by Zebediah Figura 04 Apr '19

04 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46863 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This supersedes patch 161955. dlls/ntdll/directory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6736..2df9c21a38 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2646,14 +2646,14 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer return STATUS_OBJECT_NAME_COLLISION; return STATUS_SUCCESS; } + + if (!name_len) /* empty name -> drive root doesn't exist */ + return STATUS_OBJECT_PATH_NOT_FOUND; + if (check_case && !redirect && (disposition == FILE_OPEN || disposition == FILE_OVERWRITE)) + return STATUS_OBJECT_NAME_NOT_FOUND; } } - if (!name_len) /* empty name -> drive root doesn't exist */ - return STATUS_OBJECT_PATH_NOT_FOUND; - if (check_case && !redirect && (disposition == FILE_OPEN || disposition == FILE_OVERWRITE)) - return STATUS_OBJECT_NAME_NOT_FOUND; - /* now do it component by component */ while (name_len) -- 2.20.1

2 1

[PATCH v2 01/10] comctl32/button: Center align split buttons' text by default
by Gabriel Ivăncescu 04 Apr '19

04 Apr '19

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Sorry for the delay for v2, there was an internet outage in my area. dlls/comctl32/button.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index f7497a1..0bd416d 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -215,6 +215,13 @@ static inline UINT get_button_type( LONG window_style ) return (window_style & BS_TYPEMASK); } +static inline BOOL button_centers_text( LONG window_style ) +{ + /* Push button's text is centered by default, same for split buttons */ + UINT type = get_button_type(window_style); + return type <= BS_DEFPUSHBUTTON || type == BS_SPLITBUTTON || type == BS_DEFSPLITBUTTON; +} + /* paint a button of any type */ static inline void paint_button( BUTTON_INFO *infoPtr, LONG style, UINT action ) { @@ -308,9 +315,7 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) case BS_RIGHT: dtStyle |= DT_RIGHT; break; case BS_CENTER: dtStyle |= DT_CENTER; break; default: - /* Pushbutton's text is centered by default */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) dtStyle |= DT_CENTER; - /* all other flavours have left aligned text */ + if (button_centers_text(style)) dtStyle |= DT_CENTER; } if (ex_style & WS_EX_RIGHT) dtStyle = DT_RIGHT | (dtStyle & ~(DT_LEFT | DT_CENTER)); @@ -984,8 +989,7 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe if (!(style & BS_CENTER)) { - /* Push button's text is centered by default, all other types have left aligned text */ - if (get_button_type(style) <= BS_DEFPUSHBUTTON) + if (button_centers_text(style)) style |= BS_CENTER; else style |= BS_LEFT; -- 2.20.1

2 15

[PATCH rebase 7/7] winex11.drv: Handle display device changes.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 2 ++ dlls/winex11.drv/display.c | 10 ++++++++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbdcb3..c69c2122ab 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", @@ -303,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 99124d05cf..6e3cdf9540 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -370,7 +370,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -BOOL X11DRV_DisplayDevices_Init(void) +BOOL X11DRV_DisplayDevices_Init(const char *name, BOOL force) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -387,12 +387,18 @@ BOOL X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); + if (name && strcmp(handler.name, name)) + { + TRACE("Wrong handler name %s, ignoring\n", name); + return FALSE; + } + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) goto fail; /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) { ret = TRUE; goto fail; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 56fbf3f22d..ca8b1e88ea 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -740,7 +740,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern BOOL X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern BOOL X11DRV_DisplayDevices_Init(const char *name, BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 69478741f1..b0fa225565 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(NULL, FALSE); return TRUE; } -- 2.20.1

1 0

[PATCH rebase 6/7] winex11.drv: Initialize monitor registry data.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 120 +++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index c355ba3893..99124d05cf 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,11 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -90,6 +98,13 @@ static const WCHAR device_video_fmtW[] = { static const WCHAR machine_prefixW[] = { '\\','R','e','g','i','s','t','r','y','\\', 'M','a','c','h','i','n','e','\\',0}; +static const WCHAR monitor_instance_fmtW[] = { + 'D','I','S','P','L','A','Y','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '%','0','4','X','&','%','0','4','X',0}; +static const WCHAR monitor_hardware_idW[] = { + 'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; @@ -185,7 +200,7 @@ fail: return ret; } -static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, INT monitor_count, const struct x11drv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) { @@ -194,6 +209,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, WCHAR bufferW[1024]; HKEY hkey = NULL; BOOL ret = FALSE; + INT i; sprintfW(key_nameW, device_video_fmtW, video_index); strcpyW(bufferW, machine_prefixW); @@ -225,6 +241,15 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto fail; + /* Write all monitor instances paths under this adapter */ + for (i = 0; i < monitor_count; i++) + { + sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(bufferW, monitor_instance_fmtW, video_index, i); + if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -238,6 +263,64 @@ fail: return ret; } +static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, + int video_index) +{ + WCHAR bufferW[MAX_PATH]; + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + HKEY hkey = NULL; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, monitor->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + + /* Write HaredwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto fail; + + /* Open driver key */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)monitor->name, + (strlenW(monitor->name) + 1) * sizeof(WCHAR))) + goto fail; + + /* FIXME: + * Following properties are Wine specific, see comments in X11DRV_InitAdapter for details */ + /* StateFlags */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, + (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) + goto fail; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto fail; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto fail; + + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + /* Adapter name */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -245,8 +328,18 @@ static void prepare_devices(void) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with * each initialization run. We clean up non present GPUs at the end of initialization */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -281,9 +374,10 @@ BOOL X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct x11drv_monitor *monitors = NULL; + INT gpu_count, adapter_count, monitor_count; + INT gpu, adapter, monitor; + HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -312,6 +406,7 @@ BOOL X11DRV_DisplayDevices_Init(void) prepare_devices(); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) @@ -328,10 +423,22 @@ BOOL X11DRV_DisplayDevices_Init(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + goto fail; + + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto fail; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto fail; + } + + handler.pFreeMonitors(monitors); + monitors = NULL; video_index++; } @@ -342,12 +449,15 @@ BOOL X11DRV_DisplayDevices_Init(void) ret = TRUE; fail: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); if (adapters) handler.pFreeAdapters(adapters); + if (monitors) + handler.pFreeMonitors(monitors); if (!ret) ERR("Failed to initialize display devices\n"); return ret; -- 2.20.1

1 0

[PATCH rebase 5/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 93 +++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index adf30ee4d3..c355ba3893 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; @@ -74,6 +77,19 @@ static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'V','I','D','E','O',0}; +static const WCHAR adapter_key_fmtW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '%','s','\\', + '%','0','4','x',0}; +static const WCHAR device_video_fmtW[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR machine_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; static struct x11drv_display_device_handler handler; @@ -169,6 +185,59 @@ fail: return ret; } +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, + const struct x11drv_gpu *gpu, const WCHAR *guid_string, + const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) +{ + WCHAR adapter_keyW[MAX_PATH]; + WCHAR key_nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + BOOL ret = FALSE; + + sprintfW(key_nameW, device_video_fmtW, video_index); + strcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + strcatW(bufferW, adapter_keyW); + + /* Write value of \Device\Video? (adapter key) in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW(video_hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Create HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} link to GPU driver */ + RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (RegSetValueExW(hkey, symbolic_link_valueW, 0, REG_LINK, (const BYTE *)gpu_driver, + strlenW(gpu_driver) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information are Wine specific, they don't really exist on Windows. They are used so that we can + * implement EnumDisplayDevices etc by querying registry only. These information are most likely reported by the + * device driver on Windows */ + RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + + /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match + * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -211,10 +280,12 @@ static void cleanup_devices(void) BOOL X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct x11drv_adapter *adapters = NULL; + INT gpu_count, adapter_count; + INT gpu, adapter; HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; + INT video_index = 0; DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; @@ -250,6 +321,22 @@ BOOL X11DRV_DisplayDevices_Init(void) { if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) goto fail; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + goto fail; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto fail; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } ret = TRUE; @@ -259,6 +346,8 @@ fail: RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); if (!ret) ERR("Failed to initialize display devices\n"); return ret; -- 2.20.1

1 0

[PATCH rebase 4/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 228 +++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 231 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 9b9009c255..adf30ee4d3 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -20,11 +20,61 @@ #include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR winex11_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','x','1','1','.','d','r','v',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static struct x11drv_display_device_handler handler; void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -34,4 +84,182 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler handler = *new_handler; TRACE("Display device functions are now handled by: %s\n", handler.name); } +} + +/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, + WCHAR *driver) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + } + + /* Write HaredwareID registry property */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winex11_drvW, sizeof(winex11_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto fail; + strcpyW(driver, nt_classW); + strcatW(driver, bufferW); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + bufferW[0] = 0; + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + strcpyW(guid_string, bufferW); + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with + * each initialization run. We clean up non present GPUs at the end of initialization */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +BOOL X11DRV_DisplayDevices_Init(void) +{ + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; + HKEY video_hkey = NULL; + DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; + BOOL ret = FALSE; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + ret = TRUE; + goto fail; + } + + /* FIXME: + * Currently we have no idea how to implement SetupDiGetClassDevsW with DIGCF_PRESENT properly. So we need to clean + * up not present devices in case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could + * exist in registry as a result of prefix copying or having devices unpluged. But then we couldn't simply delete + * GPUs because we need to retain the same GUID for the same GPU. */ + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto fail; + } + + ret = TRUE; +fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); + RegCloseKey(video_hkey); + if (gpus) + handler.pFreeGpus(gpus); + if (!ret) + ERR("Failed to initialize display devices\n"); + return ret; } \ No newline at end of file diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 22c50667be..56fbf3f22d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -740,6 +740,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern BOOL X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } -- 2.20.1

1 0

[PATCH rebase 3/7] winex11.drv: Support Xinerama display device handler.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xinerama.c | 137 ++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 42bf34cc46..b85d807fce 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -212,8 +214,133 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + /* First adapter is always primary because first monitor is primary */ + if (!i) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first || EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor )) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first || EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor )) + { + strcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -247,6 +374,16 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; + handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

1 0

[PATCH rebase 1/7] winex11.drv: Support multiple display device handlers.
by Zhiyi Zhang 04 Apr '19

04 Apr '19

Display device handler will be used to initialize the registry. Different handlers can be implemented according to the interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 161265~161271. Rebase to current master. dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 37 ++++++++++++++++++ dlls/winex11.drv/x11drv.h | 76 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..9b9009c255 --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,37 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 Zhiyi Zhang for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} \ No newline at end of file diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..22c50667be 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,82 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device driver */ + +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; -- 2.20.1

1 0

[PATCH] mferror: Consistently format error messages.
by Nikolay Sivov 04 Apr '19

04 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Spotted by Lauri Kenttä. dlls/mferror/mferror.mc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/mferror/mferror.mc b/dlls/mferror/mferror.mc index f0299b0986..826f8e562c 100644 --- a/dlls/mferror/mferror.mc +++ b/dlls/mferror/mferror.mc @@ -440,14 +440,14 @@ Severity=Error Facility=MF SymbolicName=MF_E_INVALID_STATE_TRANSITION Language=ENU -Invalid media source state transition +Invalid media source state transition. . MessageId=16004 Severity=Error Facility=MF SymbolicName=MF_E_END_OF_STREAM Language=ENU -End of media stream has been reached +End of media stream has been reached. . MessageId=16005 Severity=Error @@ -461,70 +461,70 @@ Severity=Error Facility=MF SymbolicName=MF_E_NO_DURATION Language=ENU -Media stream has no duration set +Media stream has no duration set. . MessageId=16012 Severity=Error Facility=MF SymbolicName=MF_E_INVALID_FORMAT Language=ENU -Media format was recognized but is invalid +Media format was recognized but is invalid. . MessageId=16013 Severity=Error Facility=MF SymbolicName=MF_E_PROPERTY_NOT_FOUND Language=ENU -Property wasn't found +Property wasn't found. . MessageId=16014 Severity=Error Facility=MF SymbolicName=MF_E_PROPERTY_READ_ONLY Language=ENU -Property is read-only +Property is read-only. . MessageId=16015 Severity=Error Facility=MF SymbolicName=MF_E_PROPERTY_NOT_ALLOWED Language=ENU -Property is not allowed +Property is not allowed. . MessageId=16017 Severity=Error Facility=MF SymbolicName=MF_E_MEDIA_SOURCE_NOT_STARTED Language=ENU -Media source is not started +Media source is not started. . MessageId=16024 Severity=Error Facility=MF SymbolicName=MF_E_UNSUPPORTED_FORMAT Language=ENU -Unsupported media format +Unsupported media format. . MessageId=16027 Severity=Error Facility=MF SymbolicName=MF_E_MEDIA_SOURCE_WRONGSTATE Language=ENU -Media source is in wrong state +Media source is in wrong state. . MessageId=16028 Severity=Error Facility=MF SymbolicName=MF_E_MEDIA_SOURCE_NO_STREAMS_SELECTED Language=ENU -No media streams were selected +No media streams were selected. . MessageId=16030 Severity=Error Facility=MF SymbolicName=MF_E_UNSUPPORTED_CHARACTERISTICS Language=ENU -Unsupported media source characteristics +Unsupported media source characteristics. . MessageId=21006 Severity=Error -- 2.20.1

1 0

[PATCH 1/7] mfplat: Partially implement MFCreateWaveFormatExFromMFMediaType() for PCM format.
by Nikolay Sivov 04 Apr '19

04 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/mediatype.c | 77 ++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 67 +++++++++++++++++++++++++++++++++ include/mfapi.h | 7 ++++ 4 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index dddea4ba1b..6a8bd97557 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -20,6 +20,10 @@ #include "mfplat_private.h" +#include "initguid.h" +#include "ks.h" +#include "ksmedia.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1679,3 +1683,76 @@ HRESULT WINAPI MFUnwrapMediaType(IMFMediaType *wrapper, IMFMediaType **ret) return S_OK; } + +/*********************************************************************** + * MFCreateWaveFormatExFromMFMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVEFORMATEX **ret_format, + UINT32 *size, UINT32 flags) +{ + WAVEFORMATEXTENSIBLE *format_ext = NULL; + WAVEFORMATEX *format; + GUID major, subtype; + UINT32 value; + HRESULT hr; + + TRACE("%p, %p, %p, %#x.\n", mediatype, ret_format, size, flags); + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_MAJOR_TYPE, &major))) + return hr; + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return E_INVALIDARG; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + { + FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype)); + return E_NOTIMPL; + } + + /* FIXME: probably WAVE_FORMAT_MPEG/WAVE_FORMAT_MPEGLAYER3 should be handled separately. */ + if (flags == MFWaveFormatExConvertFlag_ForceExtensible) + { + format_ext = CoTaskMemAlloc(sizeof(*format_ext)); + *size = sizeof(*format_ext); + format = (WAVEFORMATEX *)format_ext; + } + else + { + format = CoTaskMemAlloc(sizeof(*format)); + *size = sizeof(*format); + } + + if (!format) + return E_OUTOFMEMORY; + + memset(format, 0, *size); + + format->wFormatTag = format_ext ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) + format->nChannels = value; + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) + format->nBlockAlign = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) + format->wBitsPerSample = value; + if (format_ext) + { + format->cbSize = sizeof(*format_ext) - sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) + format_ext->Samples.wSamplesPerBlock = value; + + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); + } + + *ret_format = format; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d4035c60e..7823ac0d9e 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -74,7 +74,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateWaveFormatExFromMFMediaType +@ stdcall MFCreateWaveFormatExFromMFMediaType(ptr ptr ptr long) @ stub MFDeserializeAttributesFromStream @ stub MFDeserializeEvent @ stub MFDeserializeMediaTypeFromStream diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f62136f4ad..f081d976d7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2744,6 +2744,72 @@ static void test_wrapped_media_type(void) IMFMediaType_Release(mediatype2); } +static void test_MFCreateWaveFormatExFromMFMediaType(void) +{ + WAVEFORMATEXTENSIBLE *format_ext; + IMFMediaType *mediatype; + WAVEFORMATEX *format; + UINT32 size; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + /* Audio/PCM */ + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + ok(format->wFormatTag == WAVE_FORMAT_PCM, "Unexpected tag.\n"); + ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); + ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); + ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); + ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); + ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); + ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + CoTaskMemFree(format); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, + MFWaveFormatExConvertFlag_ForceExtensible); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format_ext != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); + ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); + ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); + ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", + format_ext->Format.nAvgBytesPerSec); + ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); + ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", + format_ext->Format.cbSize); + CoTaskMemFree(format_ext); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + CoTaskMemFree(format); + + IMFMediaType_Release(mediatype); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2777,6 +2843,7 @@ START_TEST(mfplat) test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type(); + test_MFCreateWaveFormatExFromMFMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 775a89f240..cee9d403c4 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -344,6 +344,12 @@ typedef void (CALLBACK *MFPERIODICCALLBACK)(IUnknown *context); #define MF_4096_BYTE_ALIGNMENT 0x00000fff #define MF_8192_BYTE_ALIGNMENT 0x00001fff +typedef enum _MFWaveFormatExConvertFlags +{ + MFWaveFormatExConvertFlag_Normal = 0, + MFWaveFormatExConvertFlag_ForceExtensible = 1, +} MFWaveFormatExConvertFlags; + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); @@ -363,6 +369,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size); -- 2.20.1

3 10

[PATCH] winspool.drv: Don't use strcasecmp.
by Piotr Caban 04 Apr '19

04 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winspool.drv/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[PATCH v2 1/5] quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter.
by Zebediah Figura 04 Apr '19

04 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr9.c | 146 ++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 dlls/quartz/tests/vmr9.c diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ce59b73fca..1a12ffaa6a 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ systemclock.c \ videorenderer.c \ vmr7.c \ + vmr9.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c new file mode 100644 index 0000000000..2d642c6710 --- /dev/null +++ b/dlls/quartz/tests/vmr9.c @@ -0,0 +1,146 @@ +/* + * Video Mixing Renderer 9 unit tests + * + * Copyright 2019 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig9 *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Renderless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr9) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter))) + { + skip("Failed to create VMR9, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_filter_config(); + + CoUninitialize(); +} -- 2.20.1

1 4

[PATCH 1/5] quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter.
by Zebediah Figura 04 Apr '19

04 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/vmr9.c | 146 ++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) create mode 100644 dlls/quartz/tests/vmr9.c diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ce59b73fca..1a12ffaa6a 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ systemclock.c \ videorenderer.c \ vmr7.c \ + vmr9.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c new file mode 100644 index 0000000000..2d642c6710 --- /dev/null +++ b/dlls/quartz/tests/vmr9.c @@ -0,0 +1,146 @@ +/* + * Video Mixing Renderer 9 unit tests + * + * Copyright 2019 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig9 *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Renderless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr9) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter))) + { + skip("Failed to create VMR9, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_filter_config(); + + CoUninitialize(); +} -- 2.20.1

2 7

[PATCH 1/2] mssign32: Add SignerSignEx stub.
by Gijs Vermeulen 04 Apr '19

04 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46903 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/mssign32/mssign32.spec | 2 +- dlls/mssign32/mssign32_main.c | 12 +++ dlls/mssign32/mssign32_private.h | 124 +++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 dlls/mssign32/mssign32_private.h diff --git a/dlls/mssign32/mssign32.spec b/dlls/mssign32/mssign32.spec index 07d7a996fd..c7b3cef466 100644 --- a/dlls/mssign32/mssign32.spec +++ b/dlls/mssign32/mssign32.spec @@ -24,7 +24,7 @@ @ stub SignerCreateTimeStampRequest @ stub SignerFreeSignerContext @ stub SignerSign -@ stub SignerSignEx +@ stdcall SignerSignEx(long ptr ptr ptr ptr wstr ptr ptr ptr) @ stub SignerTimeStamp @ stub SignerTimeStampEx @ stub SpcGetCertFromKey diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index e35488bad3..2a5365e028 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -28,6 +28,8 @@ #include "wine/debug.h" +#include "mssign32_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(mssign); BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID lpv ) @@ -72,3 +74,13 @@ void WINAPI PvkFreeCryptProv(HCRYPTPROV hProv, LPCWSTR pwszCapiProvider, DWORD d FIXME("%08lx %s %d %s stub\n", hProv, debugstr_w(pwszCapiProvider), dwProviderType, debugstr_w(pwszTmpContainer)); } + +HRESULT WINAPI SignerSignEx(DWORD flags, SIGNER_SUBJECT_INFO *subject_info, SIGNER_CERT *signer_cert, + SIGNER_SIGNATURE_INFO *signature_info, SIGNER_PROVIDER_INFO *provider_info, + const WCHAR *http_time_stamp, CRYPT_ATTRIBUTES *request, void *sip_data, + SIGNER_CONTEXT **signer_context) +{ + FIXME("%x %p %p %p %p %s %p %p %p stub\n", flags, subject_info, signer_cert, signature_info, provider_info, + wine_dbgstr_w(http_time_stamp), request, sip_data, signer_cert); + return E_NOTIMPL; +} diff --git a/dlls/mssign32/mssign32_private.h b/dlls/mssign32/mssign32_private.h new file mode 100644 index 0000000000..a4e5d360a7 --- /dev/null +++ b/dlls/mssign32/mssign32_private.h @@ -0,0 +1,124 @@ +/* + * Copyright 2019 Gijs Vermeulen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" +#include "winbase.h" +#include "wincrypt.h" + +#define SPC_EXC_PE_PAGE_HASHES_FLAG 0x10 +#define SPC_INC_PE_IMPORT_ADDR_TABLE_FLAG 0x20 +#define SPC_INC_PE_DEBUG_INFO_FLAG 0x40 +#define SPC_INC_PE_RESOURCES_FLAG 0x80 +#define SPC_INC_PE_PAGE_HASHES_FLAG 0x100 + +#define SIGNER_CERT_SPC_FILE 1 +#define SIGNER_CERT_STORE 2 +#define SIGNER_CERT_SPC_CHAIN 3 + +#define SIGNER_CERT_POLICY_STORE 0x1 +#define SIGNER_CERT_POLICY_CHAIN 0x2 +#define SIGNER_CERT_POLICY_CHAIN_NO_ROOT 0x8 + +#define SIGNER_NO_ATTR 0 +#define SIGNER_AUTHCODE_ATTR 1 + +typedef struct _SIGNER_CONTEXT { + DWORD cbSize; + DWORD cbBlob; + BYTE *pbBlob; +} SIGNER_CONTEXT, *PSIGNER_CONTEXT; + +typedef struct _SIGNER_FILE_INFO { + DWORD cbSize; + const WCHAR *pwszFileName; + HANDLE hFile; +} SIGNER_FILE_INFO, *PSIGNER_FILE_INFO; + +typedef struct _SIGNER_BLOB_INFO { + DWORD cbSize; + GUID *pGuidSubject; + DWORD cbBlob; + BYTE *pbBlob; + const WCHAR *pwszDisplayName; +} SIGNER_BLOB_INFO, *PSIGNER_BLOB_INFO; + +typedef struct _SIGNER_SUBJECT_INFO { + DWORD cbSize; + DWORD *pdwIndex; + DWORD dwSubjectChoice; + union { + SIGNER_FILE_INFO *pSignerFileInfo; + SIGNER_BLOB_INFO *pSignerBlobInfo; + }; +} SIGNER_SUBJECT_INFO, *PSIGNER_SUBJECT_INFO; + +typedef struct _SIGNER_CERT_STORE_INFO { + DWORD cbSize; + const CERT_CONTEXT *pSigningCert; + DWORD dwCertPolicy; + HCERTSTORE hCertStore; +} SIGNER_CERT_STORE_INFO, *PSIGNER_CERT_STORE_INFO; + +typedef struct _SIGNER_SPC_CHAIN_INFO { + DWORD cbSize; + const WCHAR *pwszSpcFile; + DWORD dwCertPolicy; + HCERTSTORE hCertStore; +} SIGNER_SPC_CHAIN_INFO, *PSIGNER_SPC_CHAIN_INFO; + +typedef struct _SIGNER_CERT { + DWORD cbSize; + DWORD dwCertChoice; + union { + const WCHAR *pwszSpcFile; + SIGNER_CERT_STORE_INFO *pCertStoreInfo; + SIGNER_SPC_CHAIN_INFO *pSpcChainInfo; + }; + HWND hwnd; +} SIGNER_CERT, *PSIGNER_CERT; + +typedef struct _SIGNER_ATTR_AUTHCODE { + DWORD cbSize; + BOOL fCommercial; + BOOL fIndividual; + const WCHAR *pwszName; + const WCHAR *pwszInfo; +} SIGNER_ATTR_AUTHCODE, *PSIGNER_ATTR_AUTHCODE; + +typedef struct _SIGNER_SIGNATURE_INFO { + DWORD cbSize; + ALG_ID algidHash; + DWORD dwAttrChoice; + union { + SIGNER_ATTR_AUTHCODE *pAttrAuthcode; + }; + CRYPT_ATTRIBUTES *psAuthenticated; + CRYPT_ATTRIBUTES *psUnauthenticated; +} SIGNER_SIGNATURE_INFO, *PSIGNER_SIGNATURE_INFO; + +typedef struct _SIGNER_PROVIDER_INFO { + DWORD cbSize; + const WCHAR *pwszProviderName; + DWORD dwProviderType; + DWORD dwKeySpec; + DWORD dwPvkChoice; + union { + WCHAR *pwszPvkFileName; + WCHAR *pwszKeyContainer; + }; +} SIGNER_PROVIDER_INFO, *PSIGNER_PROVIDER_INFO; -- 2.21.0

1 1

[PATCH] kernel32/winerror: Correct capitalization of "Windows" in ERROR_OLD_WIN_VERSION string.
by Isira Seneviratne 03 Apr '19

03 Apr '19

2 1

[PATCH] winecrt0: Correct compile error under x86
by Alistair Leslie-Hughes 03 Apr '19

03 Apr '19

Using gcc version 4.8.4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winecrt0/debug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index d7c170c..69a3ea7 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -24,6 +24,7 @@ #include "wine/port.h" #include <stdio.h> +#include <stdarg.h> #include "windef.h" #include "winbase.h" #include "wine/debug.h" -- 1.9.1

2 1

Re: Alexandre Julliard : reg: Add missing null to terminate a string.
by Michael Stefaniuc 03 Apr '19

03 Apr '19

On 4/3/19 10:26 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: 8268c47462544baf5bc7e5071c0a9f2d00c5c2cb > URL: https://source.winehq.org/git/wine.git/?a=commit;h=8268c47462544baf5bc7e507… > > Author: Alexandre Julliard <julliard(a)winehq.org> > Date: Wed Apr 3 21:47:59 2019 +0200 > > reg: Add missing null to terminate a string. > > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > > programs/reg/export.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/programs/reg/export.c b/programs/reg/export.c > index 1e69bc7..2a09e34 100644 > --- a/programs/reg/export.c > +++ b/programs/reg/export.c > @@ -316,7 +316,7 @@ static void export_file_header(HANDLE hFile) > { > static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', > 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', > - 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; > + 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n',0}; That bug wouldn't have happened when using an utf16 string literal. Just stating the obvious... bye michael

1 0

[PATCH v2] ntdll: Avoid matching the config directory for /windows/ in lookup_unix_name().
by Zebediah Figura 03 Apr '19

03 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46863 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index b46c2a6736..717873551b 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2638,7 +2638,7 @@ static NTSTATUS lookup_unix_name( const WCHAR *name, int name_len, char **buffer char *p; unix_name[pos + ret] = 0; for (p = unix_name + pos ; *p; p++) if (*p == '\\') *p = '/'; - if (!redirect || (!strstr( unix_name, "/windows/") && strncmp( unix_name, "windows/", 8 ))) + if (!redirect || strncmp( unix_name + pos, "/windows/", 9 )) { if (!stat( unix_name, &st )) { -- 2.17.1

2 2

[PATCH 1/5] uianimation: Add IUIAnimationManager stub
by Vijay Kiran Kamuju 03 Apr '19

03 Apr '19

Based on the patch from Louis Lenders <xerox.xerox2000x(a)gmail.com> Split into smaller chunks for each stub interface From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/uianimation/Makefile.in | 2 + dlls/uianimation/main.c | 236 +++++++++++++++++++++++++++++++++++ 2 files changed, 238 insertions(+) diff --git a/dlls/uianimation/Makefile.in b/dlls/uianimation/Makefile.in index b504181b9a..cb33313f7b 100644 --- a/dlls/uianimation/Makefile.in +++ b/dlls/uianimation/Makefile.in @@ -1,4 +1,6 @@ MODULE = uianimation.dll +IMPORTS = uuid + C_SRCS = \ main.c diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index 92d594ff5d..6c41269223 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -21,19 +21,255 @@ #include "config.h" #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "objbase.h" #include "rpcproxy.h" +#include "initguid.h" #include "uianimation.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uianimation); static HINSTANCE hinstance; +/*********************************************************************** + * IUIAnimationManager + */ +struct manager +{ + IUIAnimationManager IUIAnimationManager_iface; + LONG ref; +}; + +struct manager *impl_from_IUIAnimationManager( IUIAnimationManager *iface ) +{ + return CONTAINING_RECORD( iface, struct manager, IUIAnimationManager_iface ); +} + +static HRESULT WINAPI manager_QueryInterface( IUIAnimationManager *iface, REFIID iid, void **obj ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_IUIAnimationManager )) + { + IUIAnimationManager_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI manager_AddRef( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI manager_Release( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + { + heap_free( This ); + } + + return ref; +} + +static HRESULT WINAPI manager_CreateAnimationVariable( IUIAnimationManager *iface, DOUBLE initial_value, IUIAnimationVariable **variable ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_ScheduleTransition( IUIAnimationManager *iface, IUIAnimationVariable *variable, IUIAnimationTransition *transition, UI_ANIMATION_SECONDS current_time ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_CreateStoryboard( IUIAnimationManager *iface, IUIAnimationStoryboard **storyboard ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_FinishAllStoryboards( IUIAnimationManager *iface, UI_ANIMATION_SECONDS max_time ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_AbandonAllStoryboards( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_Update( IUIAnimationManager *iface, UI_ANIMATION_SECONDS cur_time, UI_ANIMATION_UPDATE_RESULT *update_result ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + *update_result=UI_ANIMATION_UPDATE_VARIABLES_CHANGED; + return S_OK; +} + +static HRESULT WINAPI manager_GetVariableFromTag( IUIAnimationManager *iface, IUnknown *object, UINT32 id, IUIAnimationVariable **variable ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_GetStoryboardFromTag( IUIAnimationManager *iface, IUnknown *object, UINT32 id, IUIAnimationStoryboard **storyboard ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_GetStatus( IUIAnimationManager *iface, UI_ANIMATION_MANAGER_STATUS *status ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetAnimationMode( IUIAnimationManager *iface, UI_ANIMATION_MODE mode ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return S_OK; +} + +static HRESULT WINAPI manager_Pause( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_Resume( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetManagerEventHandler( IUIAnimationManager *iface, IUIAnimationManagerEventHandler *handler ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return S_OK; +} + +static HRESULT WINAPI manager_SetCancelPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetTrimPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetCompressPriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetConcludePriorityComparison( IUIAnimationManager *iface, IUIAnimationPriorityComparison *comparison ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_SetDefaultLongestAcceptableDelay( IUIAnimationManager *iface, UI_ANIMATION_SECONDS delay ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI manager_Shutdown( IUIAnimationManager *iface ) +{ + struct manager *This = impl_from_IUIAnimationManager( iface ); + FIXME( "stub (%p)->( )\n", This ); + return E_NOTIMPL; +} + +const struct IUIAnimationManagerVtbl manager_vtbl = +{ + manager_QueryInterface, + manager_AddRef, + manager_Release, + manager_CreateAnimationVariable, + manager_ScheduleTransition, + manager_CreateStoryboard, + manager_FinishAllStoryboards, + manager_AbandonAllStoryboards, + manager_Update, + manager_GetVariableFromTag, + manager_GetStoryboardFromTag, + manager_GetStatus, + manager_SetAnimationMode, + manager_Pause, + manager_Resume, + manager_SetManagerEventHandler, + manager_SetCancelPriorityComparison, + manager_SetTrimPriorityComparison, + manager_SetCompressPriorityComparison, + manager_SetConcludePriorityComparison, + manager_SetDefaultLongestAcceptableDelay, + manager_Shutdown +}; + +HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct manager *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) return E_OUTOFMEMORY; + This->IUIAnimationManager_iface.lpVtbl = &manager_vtbl; + This->ref = 1; + + hr = IUIAnimationManager_QueryInterface( &This->IUIAnimationManager_iface, iid, obj ); + + IUIAnimationManager_Release( &This->IUIAnimationManager_iface ); + return hr; +} + BOOL WINAPI DllMain( HINSTANCE dll, DWORD reason, LPVOID reserved ) { TRACE("(%p %d %p)\n", dll, reason, reserved); -- 2.21.0

2 7

[PATCH] wininet: Don't use strcasecmp.
by Piotr Caban 03 Apr '19

03 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wininet/ftp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] ws2_32: Don't use strcasecmp.
by Piotr Caban 03 Apr '19

03 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH] iphlpapi/tests: Replace a test about a wrong assumption with a comment
by Detlef Riekenberg 03 Apr '19

03 Apr '19

The order of the interfaces is not fixed and can change, That is already commented at the top of the file: https://source.winehq.org/git/wine.git/blob/c6ff0e01224e86c7baa31d019fcb0a7… When upgrading my machine to Windows 10, the Windows-updater failed to install a driver for the ethernet port and for the wifi port The loopback was the first interface and is the first interface after installing the missing drivers from an USB stick Example test failures From the 90 failure package after updating from win7 to win10: http://test.winehq.org/queue/err5iRR8/report Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=50532 BTW: With a linux live system, the ethernet port works out of the box without any user input and the wifi port just needed the wifi credentials. Linux driver support beats Windows 10 in this configuration 2:0 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> --- dlls/iphlpapi/tests/iphlpapi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 1be9f3c5fa..369d38dadb 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -285,9 +285,10 @@ static void testGetIpAddrTable(void) ok (buf->table[i].wType != 0, "Test[%d]: expected wType > 0\n", i); trace("Entry[%d]: addr %s, dwIndex %u, wType 0x%x\n", i, ntoa(buf->table[i].dwAddr), buf->table[i].dwIndex, buf->table[i].wType); - /* loopback must never be the first when more than one interface is found */ - if (buf->table[i].dwAddr == htonl(INADDR_LOOPBACK)) - ok(buf->dwNumEntries == 1 || i, "Loopback interface in wrong first position\n"); + /* a removed test checked, that loopback was not the first interface, + when more than one interface was found, + but that assumption about the interface-order is wrong + (example machine, where the old test failed: dr-i7-HD3000-x64 / -wow) */ } } HeapFree(GetProcessHeap(), 0, buf); -- 2.21.0.windows.1

1 0

[PATCH] winex11.drv: Don't use strcasecmp.
by Piotr Caban 03 Apr '19

03 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/xim.c | 7 ++++--- dlls/winex11.drv/xrender.c | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH] crypt32: Don't use strncasecmp.
by Piotr Caban 03 Apr '19

03 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/crypt32/cert.c | 2 +- dlls/crypt32/oid.c | 5 +++-- dlls/crypt32/store.c | 15 ++++++++------- 3 files changed, 12 insertions(+), 10 deletions(-)

1 0

[PATCH] hhctrl.ocx: Don't use strncasecmp.
by Piotr Caban 03 Apr '19

03 Apr '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/hhctrl.ocx/chm.c | 2 +- dlls/hhctrl.ocx/content.c | 18 +++++++++--------- dlls/hhctrl.ocx/hhctrl.h | 1 + dlls/hhctrl.ocx/index.c | 22 +++++++++++----------- dlls/hhctrl.ocx/search.c | 2 +- 5 files changed, 23 insertions(+), 22 deletions(-)

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel