March 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] cmd: Use wide character string literals in batch.c.
by Gijs Vermeulen 24 Mar '20

24 Mar '20

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- programs/cmd/batch.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index f494b80ae2..371f75af54 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -224,8 +224,7 @@ WCHAR *WCMD_parameter_with_delims (WCHAR *s, int n, WCHAR **start, WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **start, BOOL raw, BOOL wholecmdline) { - static const WCHAR defaultDelims[] = { ' ', '\t', ',', '=', ';', '\0' }; - return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, defaultDelims); + return WCMD_parameter_with_delims (s, n, start, raw, wholecmdline, L" \t,=;"); } /**************************************************************************** @@ -537,11 +536,10 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 2. Handle 'a' : Output attributes (File doesn't have to exist) */ if (wmemchr(firstModifier, 'a', modifierLen) != NULL) { - WCHAR defaults[] = {'-','-','-','-','-','-','-','-','-','\0'}; doneModifier = TRUE; if (exists) { - lstrcpyW(thisoutput, defaults); + lstrcpyW(thisoutput, L"---------"); if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) thisoutput[0]='d'; if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_READONLY) @@ -589,12 +587,11 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* FIXME: Output full 64 bit size (sprintf does not support I64 here) */ ULONG/*64*/ fullsize = /*(fileInfo.nFileSizeHigh << 32) +*/ fileInfo.nFileSizeLow; - static const WCHAR fmt[] = {'%','u','\0'}; doneModifier = TRUE; if (exists) { if (finaloutput[0] != 0x00) lstrcatW(finaloutput, spaceW); - wsprintfW(thisoutput, fmt, fullsize); + wsprintfW(thisoutput, L"%u", fullsize); lstrcatW(finaloutput, thisoutput); } } -- 2.25.1

1 1

[PATCH 2/5] wined3d: Pass a struct wined3d_output pointer to wined3d_device_set_cursor_properties().
by Zhiyi Zhang 24 Mar '20

24 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/device.c | 5 ++++- dlls/d3d9/device.c | 5 ++++- dlls/wined3d/device.c | 5 +++-- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 44a81ba672..25067512f9 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -740,6 +740,7 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_surface *bitmap_impl = unsafe_impl_from_IDirect3DSurface8(bitmap); + unsigned int output_idx; HRESULT hr; TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", @@ -752,8 +753,10 @@ static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, } wined3d_mutex_lock(); + output_idx = device->adapter_ordinal; hr = wined3d_device_set_cursor_properties(device->wined3d_device, - hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); + device->d3d_parent->wined3d_outputs[output_idx], hotspot_x, hotspot_y, + bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 61cb505d77..8204376106 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -787,6 +787,7 @@ static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *bitmap_impl = unsafe_impl_from_IDirect3DSurface9(bitmap); + unsigned int output_idx; HRESULT hr; TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", @@ -799,8 +800,10 @@ static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, } wined3d_mutex_lock(); + output_idx = device->adapter_ordinal; hr = wined3d_device_set_cursor_properties(device->wined3d_device, - hotspot_x, hotspot_y, bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); + device->d3d_parent->wined3d_outputs[output_idx], hotspot_x, hotspot_y, + bitmap_impl->wined3d_texture, bitmap_impl->sub_resource_idx); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0a0c4c526c..30c44aa5aa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4890,7 +4890,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined } HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device, - UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx) + struct wined3d_output *output, unsigned int x_hotspot, unsigned int y_hotspot, + struct wined3d_texture *texture, unsigned int sub_resource_idx) { unsigned int texture_level = sub_resource_idx % texture->level_count; unsigned int cursor_width, cursor_height; @@ -4918,7 +4919,7 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) + if (FAILED(hr = wined3d_output_get_display_mode(output, &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 22a9a9dd74..a7ba855865 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -115,7 +115,7 @@ @ cdecl wined3d_device_set_cs_sampler(ptr long ptr) @ cdecl wined3d_device_set_cs_uav(ptr long ptr long) @ cdecl wined3d_device_set_cursor_position(ptr long long long) -@ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) +@ cdecl wined3d_device_set_cursor_properties(ptr ptr long long ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_domain_shader(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 30b6f9a7e8..3204c6af98 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2437,7 +2437,8 @@ void __cdecl wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned i void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, - UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); + struct wined3d_output *output, unsigned int x_hotspot, unsigned int y_hotspot, + struct wined3d_texture *texture, unsigned int sub_resource_idx); HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); -- 2.20.1

2 1

[PATCH 5/5] dxgi/tests: Test detaching outputs.
by Zhiyi Zhang 24 Mar '20

24 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 160 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 141 insertions(+), 19 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e2b5df7b27..cc49c7b2ae 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4940,15 +4940,17 @@ static void test_multi_adapter(void) { unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; + DXGI_OUTPUT_DESC old_output_desc, output_desc; DISPLAY_DEVICEW display_device; - DXGI_OUTPUT_DESC output_desc; MONITORINFO monitor_info; + DEVMODEW old_mode, mode; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIOutput *output; HMONITOR monitor; BOOL found; HRESULT hr; + LONG ret; if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) { @@ -4973,7 +4975,8 @@ static void test_multi_adapter(void) for (output_index = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_index, &output)); ++output_index) { hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + output_index, hr); found = FALSE; display_device.cb = sizeof(display_device); @@ -4985,39 +4988,158 @@ static void test_multi_adapter(void) break; } } - ok(found, "Failed to find device %s for adapter %u, output %u.\n", - wine_dbgstr_w(output_desc.DeviceName), adapter_index, output_index); + ok(found, "Adapter %u output %u: Failed to find device %s.\n", + adapter_index, output_index, wine_dbgstr_w(output_desc.DeviceName)); ok(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP, - "Got unexpected state flags %#x for adapter %u, output %u.\n", - display_device.StateFlags, adapter_index, output_index); + "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + output_index, display_device.StateFlags); if (!adapter_index && !output_index) ok(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, - "Got unexpected state flags %#x for adapter %u, output %u.\n", - display_device.StateFlags, adapter_index, output_index); + "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + output_index, display_device.StateFlags); else ok(!(display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), - "Got unexpected state flags %#x for adapter %u, output %u.\n", - display_device.StateFlags, adapter_index, output_index); + "Adapter %u output %u: Got unexpected state flags %#x.\n", adapter_index, + output_index, display_device.StateFlags); /* Should have the same monitor handle. */ monitor = get_monitor(display_device.DeviceName); - ok(!!monitor, "Failed to find monitor %s.\n", wine_dbgstr_w(display_device.DeviceName)); - ok(monitor == output_desc.Monitor, "Got unexpected monitor %p, expected %p.\n", - monitor, output_desc.Monitor); + ok(!!monitor, "Adapter %u output %u: Failed to find monitor %s.\n", adapter_index, + output_index, wine_dbgstr_w(display_device.DeviceName)); + ok(monitor == output_desc.Monitor, + "Adapter %u output %u: Got unexpected monitor %p, expected %p.\n", + adapter_index, output_index, monitor, output_desc.Monitor); /* Should have the same monitor rectangle. */ monitor_info.cbSize = sizeof(monitor_info); ok(GetMonitorInfoA(monitor, &monitor_info), - "Failed to get monitor info for adapter %u, output %u, error %#x.\n", - adapter_index, output_index, GetLastError()); + "Adapter %u output %u: Failed to get monitor info, error %#x.\n", adapter_index, + output_index, GetLastError()); ok(EqualRect(&monitor_info.rcMonitor, &output_desc.DesktopCoordinates), - "Got unexpected output rect %s, expected %s for adapter %u, output %u.\n", - wine_dbgstr_rect(&monitor_info.rcMonitor), wine_dbgstr_rect(&output_desc.DesktopCoordinates), - adapter_index, output_index); + "Adapter %u output %u: Got unexpected output rect %s, expected %s.\n", + adapter_index, output_index, wine_dbgstr_rect(&monitor_info.rcMonitor), + wine_dbgstr_rect(&output_desc.DesktopCoordinates)); + + ++output_count; + + /* Test output description after it got detached */ + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + IDXGIOutput_Release(output); + continue; + } + + old_output_desc = output_desc; + + /* Save current display settings */ + memset(&old_mode, 0, sizeof(old_mode)); + old_mode.dmSize = sizeof(old_mode); + ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &old_mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret), + "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), + GetLastError()); + + /* Detach */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmPosition = old_mode.dmPosition; + ret = ChangeDisplaySettingsExW(display_device.DeviceName, &mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); + ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); + + /* Check if it is really detached */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret) , + "Adapter %u output %u: EnumDisplaySettingsW failed for %s, error %#x.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), + GetLastError()); + if (mode.dmPelsWidth && mode.dmPelsHeight) + { + skip("Adapter %u output %u: Failed to detach device %s.\n", adapter_index, + output_index, wine_dbgstr_w(display_device.DeviceName)); + IDXGIOutput_Release(output); + continue; + } + + /* Only the AttachedToDesktop field is updated after an output is detached. + * IDXGIAdapter_EnumOutputs() has to be called again to get other fields updated. + * But resolution changes are reflected right away. This weird behaviour is currently + * unimplemented in Wine */ + memset(&output_desc, 0, sizeof(output_desc)); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + output_index, hr); + ok(!lstrcmpiW(output_desc.DeviceName, old_output_desc.DeviceName), + "Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index, + output_index, wine_dbgstr_w(old_output_desc.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + todo_wine + ok(EqualRect(&output_desc.DesktopCoordinates, &old_output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect desktop coordinates %s, got %s.\n", + adapter_index, output_index, + wine_dbgstr_rect(&old_output_desc.DesktopCoordinates), + wine_dbgstr_rect(&output_desc.DesktopCoordinates)); + ok(!output_desc.AttachedToDesktop, + "Adapter %u output %u: Expect output not attached to desktop.\n", adapter_index, + output_index); + ok(output_desc.Rotation == old_output_desc.Rotation, + "Adapter %u output %u: Expect rotation %#x, got %#x.\n", adapter_index, + output_index, old_output_desc.Rotation, output_desc.Rotation); + todo_wine + ok(output_desc.Monitor == old_output_desc.Monitor, + "Adapter %u output %u: Expect monitor %p, got %p.\n", adapter_index, + output_index, old_output_desc.Monitor, output_desc.Monitor); + IDXGIOutput_Release(output); + + /* Call IDXGIAdapter_EnumOutputs() again to get up-to-date output description */ + hr = IDXGIAdapter_EnumOutputs(adapter, output_index, &output); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + output_index, hr); + memset(&output_desc, 0, sizeof(output_desc)); + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: Got unexpected hr %#x.\n", adapter_index, + output_index, hr); + ok(!lstrcmpiW(output_desc.DeviceName, display_device.DeviceName), + "Adapter %u output %u: Expect device name %s, got %s.\n", adapter_index, + output_index, wine_dbgstr_w(display_device.DeviceName), + wine_dbgstr_w(output_desc.DeviceName)); + ok(IsRectEmpty(&output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect desktop rect empty, got %s.\n", adapter_index, + output_index, wine_dbgstr_rect(&output_desc.DesktopCoordinates)); + ok(!output_desc.AttachedToDesktop, + "Adapter %u output %u: Expect output not attached to desktop.\n", adapter_index, + output_index); + ok(output_desc.Rotation == DXGI_MODE_ROTATION_IDENTITY, + "Adapter %u output %u: Expect rotation %#x, got %#x.\n", adapter_index, + output_index, DXGI_MODE_ROTATION_IDENTITY, output_desc.Rotation); + ok(!output_desc.Monitor, "Adapter %u output %u: Expect monitor NULL.\n", adapter_index, + output_index); + + /* Restore settings */ + ret = ChangeDisplaySettingsExW(display_device.DeviceName, &old_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); + ret = ChangeDisplaySettingsExW(display_device.DeviceName, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u output %u: ChangeDisplaySettingsExW %s returned unexpected %d.\n", + adapter_index, output_index, wine_dbgstr_w(display_device.DeviceName), ret); IDXGIOutput_Release(output); - ++output_count; } IDXGIAdapter_Release(adapter); -- 2.20.1

3 2

[PATCH 4/5] d3d9/tests: Test detaching adapters.
by Zhiyi Zhang 24 Mar '20

24 Mar '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 76 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 70 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 4255293439..839c030185 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -13511,9 +13511,11 @@ static void test_multi_adapter(void) { unsigned int i, adapter_count, expected_adapter_count = 0; DISPLAY_DEVICEA display_device; - MONITORINFO monitor_info; + MONITORINFOEXA monitor_info; + DEVMODEA old_mode, mode; HMONITOR monitor; IDirect3D9 *d3d; + LONG ret; d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -13533,17 +13535,79 @@ static void test_multi_adapter(void) for (i = 0; i < adapter_count; ++i) { monitor = IDirect3D9_GetAdapterMonitor(d3d, i); - ok(!!monitor, "Failed to get monitor for adapter %u.\n", i); + ok(!!monitor, "Adapter %u: Failed to get monitor.\n", i); monitor_info.cbSize = sizeof(monitor_info); - ok(GetMonitorInfoA(monitor, &monitor_info), - "Failed to get monitor info for adapter %u, error %#x.\n", i, GetLastError()); + ok(GetMonitorInfoA(monitor, (MONITORINFO *)&monitor_info), + "Adapter %u: Failed to get monitor info, error %#x.\n", i, GetLastError()); if (!i) ok(monitor_info.dwFlags == MONITORINFOF_PRIMARY, - "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + "Adapter %u: Got unexpected monitor flags %#x.\n", i, monitor_info.dwFlags); else - ok(!monitor_info.dwFlags, "Got unexpected monitor flags %#x for adapter %u.\n", monitor_info.dwFlags, i); + ok(!monitor_info.dwFlags, "Adapter %u: Got unexpected monitor flags %#x.\n", i, + monitor_info.dwFlags); + + /* Test D3D adapters after they got detached */ + if (monitor_info.dwFlags == MONITORINFOF_PRIMARY) + continue; + + /* Save current display settings */ + memset(&old_mode, 0, sizeof(old_mode)); + old_mode.dmSize = sizeof(old_mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &old_mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret), "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + + /* Detach */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + mode.dmFields = DM_POSITION | DM_PELSWIDTH | DM_PELSHEIGHT; + mode.dmPosition = old_mode.dmPosition; + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + + /* Check if it is really detached */ + memset(&mode, 0, sizeof(mode)); + mode.dmSize = sizeof(mode); + ret = EnumDisplaySettingsA(monitor_info.szDevice, ENUM_CURRENT_SETTINGS, &mode); + /* Win10 TestBots may return FALSE but it's actually successful */ + ok(ret || broken(!ret) , "Adapter %u: EnumDisplaySettingsA failed for %s, error %#x.\n", i, + monitor_info.szDevice, GetLastError()); + if (mode.dmPelsWidth && mode.dmPelsHeight) + { + skip("Adapter %u: Failed to detach device %s.\n", i, monitor_info.szDevice); + continue; + } + + /* Detaching adapter shouldn't reduce the adapter count */ + expected_adapter_count = adapter_count; + adapter_count = IDirect3D9_GetAdapterCount(d3d); + ok(adapter_count == expected_adapter_count, + "Adapter %u: Got unexpected adapter count %u, expected %u.\n", i, adapter_count, + expected_adapter_count); + + monitor = IDirect3D9_GetAdapterMonitor(d3d, i); + ok(!monitor, "Adapter %u: Expect monitor to be NULL.\n", i); + + /* Restore settings */ + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, &old_mode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); + ret = ChangeDisplaySettingsExA(monitor_info.szDevice, NULL, NULL, 0, NULL); + ok(ret == DISP_CHANGE_SUCCESSFUL, + "Adapter %u: ChangeDisplaySettingsExA %s returned unexpected %d.\n", i, + monitor_info.szDevice, ret); } IDirect3D9_Release(d3d); -- 2.20.1

3 2

[PATCH v3 1/2] winevulkan: Create JSON manifest and registry entry used by official Vulkan loader.
by Brendan Shanks 24 Mar '20

24 Mar '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47109 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v3: As Zeb suggested, remove key/file in DllUnregisterServer. dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/make_vulkan | 5 +++ dlls/winevulkan/vulkan.c | 75 +++++++++++++++++++++++++++++++++ dlls/winevulkan/winevulkan.spec | 2 + include/wine/vulkan.h | 2 + loader/wine.inf.in | 1 + 6 files changed, 86 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index e0bca6fad7..2ffff40c3a 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 +IMPORTS = user32 gdi32 advapi32 C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3593410041..8dfde00fbf 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2341,6 +2341,8 @@ class VkGenerator(object): f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n") f.write("#endif\n\n") + f.write("#define WINE_VK_SPEC_VERSION \"{0}\"\n\n".format(VK_XML_VERSION)) + # The overall strategy is to define independent constants and datatypes, # prior to complex structures and function calls to avoid forward declarations. for const in self.registry.consts: @@ -2485,6 +2487,9 @@ class VkGenerator(object): else: f.write("@ stub {0}\n".format(func.name)) + f.write("@ stdcall -private DllRegisterServer()\n") + f.write("@ stdcall -private DllUnregisterServer()\n") + def generate_vulkan_loader_spec(self, f): self._generate_copyright(f, spec_file=True) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef8..7282f40805 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" +#include "winreg.h" #include "winuser.h" #include "vulkan_private.h" @@ -1307,3 +1308,77 @@ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { return vk_funcs->p_vkGetInstanceProcAddr(instance, name); } + + +static const WCHAR winevulkan_jsonW[] = {'\\','w','i','n','e','v','u','l','k','a','n','.','j','s','o','n',0}; +static const WCHAR vulkan_driversW[] = {'S','o','f','t','w','a','r','e','\\','K','h','r','o','n','o','s','\\', + 'V','u','l','k','a','n','\\','D','r','i','v','e','r','s',0}; +static BOOL writestr(HANDLE handle, const char *str) +{ + DWORD written; + return WriteFile(handle, str, strlen(str), &written, NULL); +} + +HRESULT WINAPI DllRegisterServer(void) +{ + WCHAR path[MAX_PATH]; + HANDLE file; + LRESULT result; + HKEY key; + DWORD zero = 0; + + /* Create the JSON manifest and registry key to register this ICD with the official Vulkan loader. */ + TRACE("\n"); + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, winevulkan_jsonW); + file = CreateFileW(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if (file == INVALID_HANDLE_VALUE) + { ERR("Unable to create JSON manifest.\n"); return E_UNEXPECTED; } + + writestr(file, "{\r\n"); + writestr(file, " \"file_format_version\": \"1.0.0\",\r\n"); + writestr(file, " \"ICD\": {\r\n"); + writestr(file, " \"library_path\": \"winevulkan.dll\",\r\n"); + writestr(file, " \"api_version\": \"" WINE_VK_SPEC_VERSION "\"\r\n"); + writestr(file, " }\r\n"); + writestr(file, "}\r\n"); + CloseHandle(file); + + result = RegCreateKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, + 0, NULL, 0, KEY_SET_VALUE, NULL, &key, NULL); + if (result != ERROR_SUCCESS) + { ERR("Unable to create registry key.\n"); return E_UNEXPECTED; } + + result = RegSetValueExW(key, path, 0, REG_DWORD, (const BYTE *)&zero, sizeof(zero)); + if (result != ERROR_SUCCESS) + { ERR("Unable to set registry value.\n"); return E_UNEXPECTED; } + + RegCloseKey(key); + return S_OK; +} + +HRESULT WINAPI DllUnregisterServer(void) +{ + WCHAR path[MAX_PATH]; + LRESULT result; + HKEY key; + + /* Remove the JSON manifest and registry key */ + TRACE("\n"); + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, winevulkan_jsonW); + if (!DeleteFileW(path)) + ERR("Unable to delete JSON file.\n"); + + result = RegOpenKeyExW(HKEY_LOCAL_MACHINE, vulkan_driversW, + 0, KEY_SET_VALUE, &key); + if (result != ERROR_SUCCESS) + { ERR("Unable to open registry key.\n"); return E_UNEXPECTED; } + + result = RegDeleteValueW(key, path); + if (result != ERROR_SUCCESS) + ERR("Unable to delete registry key.\n"); + + RegCloseKey(key); + return S_OK; +} diff --git a/dlls/winevulkan/winevulkan.spec b/dlls/winevulkan/winevulkan.spec index 8cdf387857..c660d5c552 100644 --- a/dlls/winevulkan/winevulkan.spec +++ b/dlls/winevulkan/winevulkan.spec @@ -226,3 +226,5 @@ @ stdcall -private wine_vkUpdateDescriptorSetWithTemplate(ptr int64 int64 ptr) @ stdcall -private wine_vkUpdateDescriptorSets(ptr long ptr long ptr) @ stdcall -private wine_vkWaitForFences(ptr long ptr long int64) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index fe804fd23e..c30b72f00c 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -59,6 +59,8 @@ #define WINE_VK_ALIGN DECLSPEC_ALIGN #endif +#define WINE_VK_SPEC_VERSION "1.1.130" + #define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE 256 #define VK_UUID_SIZE 16 #define VK_LUID_SIZE 8 diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 6e0cb21253..d0b156eb77 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2569,6 +2569,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,windowscodecs.dll,1 11,,winegstreamer.dll,1 11,,wineqtdecoder.dll,1 +11,,winevulkan.dll,1 11,,wintrust.dll,1 11,,iexplore.exe,1 -- 2.24.1

2 3

[PATCH] gdi32: Don't free bitmap memory pointer in D3DKMTDestroyDCFromMemory().
by Paul Gofman 24 Mar '20

24 Mar '20

Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/gdi32/dib.c | 14 +++++++++++++- dlls/gdi32/tests/bitmap.c | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 3d267ba89c..f33c198ae1 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1706,12 +1706,21 @@ error: */ NTSTATUS WINAPI D3DKMTDestroyDCFromMemory( const D3DKMT_DESTROYDCFROMMEMORY *desc ) { + BITMAPOBJ *bmp; + if (!desc) return STATUS_INVALID_PARAMETER; TRACE("dc %p, bitmap %p.\n", desc->hDc, desc->hBitmap); if (GetObjectType( desc->hDc ) != OBJ_MEMDC || GetObjectType( desc->hBitmap ) != OBJ_BITMAP) return STATUS_INVALID_PARAMETER; + + if (!(bmp = GDI_GetObjPtr( desc->hBitmap, OBJ_BITMAP ))) + return STATUS_INVALID_PARAMETER; + + bmp->dib.dsBm.bmBits = NULL; + GDI_ReleaseObj( desc->hBitmap ); + DeleteObject( desc->hBitmap ); DeleteDC( desc->hDc ); @@ -1828,7 +1837,10 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ) UnmapViewOfFile( (char *)bmp->dib.dsBm.bmBits - (bmp->dib.dsOffset % SystemInfo.dwAllocationGranularity) ); } - else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); + else if (bmp->dib.dsBm.bmBits) + { + VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); + } HeapFree(GetProcessHeap(), 0, bmp->color_table); HeapFree( GetProcessHeap(), 0, bmp ); diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index fe3482671b..ff04b4012c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5680,6 +5680,7 @@ static void test_D3DKMTCreateDCFromMemory( void ) { D3DKMT_DESTROYDCFROMMEMORY destroy_desc; D3DKMT_CREATEDCFROMMEMORY create_desc; + MEMORY_BASIC_INFORMATION mbi; unsigned int width_bytes; unsigned int i, x, y, z; DWORD expected, colour; @@ -5692,6 +5693,7 @@ static void test_D3DKMTCreateDCFromMemory( void ) int size; HDC bmp_dc; HBITMAP bmp; + SIZE_T len; static const struct { @@ -5933,6 +5935,31 @@ static void test_D3DKMTCreateDCFromMemory( void ) DeleteObject( SelectObject( bmp_dc, bmp ) ); DeleteDC( bmp_dc ); } + + create_desc.pMemory = VirtualAlloc(NULL, 0x10000, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); + create_desc.Format = D3DDDIFMT_A8R8G8B8; + create_desc.Width = 16; + create_desc.Height = 16; + create_desc.Pitch = 16 * 4; + create_desc.hDeviceDc = CreateCompatibleDC(NULL); + create_desc.pColorTable = NULL; + + status = pD3DKMTCreateDCFromMemory(&create_desc); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + DeleteDC(create_desc.hDeviceDc); + + destroy_desc.hDc = create_desc.hDc; + destroy_desc.hBitmap = create_desc.hBitmap; + status = pD3DKMTDestroyDCFromMemory( &destroy_desc ); + ok(status == STATUS_SUCCESS, "Got unexpected status %#x.\n", status); + + memset(&mbi, 0, sizeof(mbi)); + len = VirtualQuery(create_desc.pMemory, &mbi, sizeof(mbi)); + ok(len == sizeof(mbi), "Got unexpected len %lu.\n", len); + ok(mbi.Protect == PAGE_READWRITE && mbi.RegionSize == 0x10000, + "Got unexpected memory state, protect %#x, RegionSize %#lx.\n", + mbi.Protect, mbi.RegionSize); + VirtualFree(create_desc.pMemory, 0, MEM_RELEASE); } START_TEST(bitmap) -- 2.25.1

1 0

[PATCH 1/4] d3d10: Get resources used by effect shaders.
by Connor McAdams 24 Mar '20

24 Mar '20

Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> --- dlls/d3d10/d3d10_private.h | 12 ++++++ dlls/d3d10/effect.c | 87 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e02ea376bb..21fae15505 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -81,6 +81,15 @@ struct d3d10_effect_object } object; }; +struct d3d10_effect_shader_resource +{ + D3D10_SHADER_INPUT_TYPE in_type; + UINT bind_point; + UINT bind_count; + + struct d3d10_effect_variable *resource_variable; +}; + struct d3d10_effect_shader_signature { char *signature; @@ -99,6 +108,9 @@ struct d3d10_effect_shader_variable ID3D10PixelShader *ps; ID3D10GeometryShader *gs; } shader; + + UINT resource_count; + struct d3d10_effect_shader_resource *shader_resource; }; struct d3d10_effect_state_object_variable diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index f620191955..580b6079cf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -656,6 +656,87 @@ static HRESULT shader_chunk_handler(const char *data, DWORD data_size, DWORD tag return S_OK; } +static HRESULT get_fx10_shader_resources(struct d3d10_effect_variable *v, const void *data, size_t data_size) +{ + struct d3d10_effect_shader_variable *sv = &v->u.shader; + struct d3d10_effect_shader_resource *sr; + D3D10_SHADER_INPUT_BIND_DESC rsrc_desc; + struct d3d10_effect_variable *var; + ID3D10ShaderReflection *reflector; + D3D10_SHADER_DESC desc; + unsigned int i, y; + HRESULT hr; + + hr = D3D10ReflectShader(data, data_size, &reflector); + if (FAILED(hr)) return hr; + + reflector->lpVtbl->GetDesc(reflector, &desc); + sv->resource_count = desc.BoundResources; + + if (!(sv->shader_resource = heap_calloc(sv->resource_count, sizeof(*sv->shader_resource)))) + { + ERR("Failed to allocate shader resource binding information memory.\n"); + hr = E_OUTOFMEMORY; + goto exit; + } + + for (i = 0; i < desc.BoundResources; ++i) + { + reflector->lpVtbl->GetResourceBindingDesc(reflector, i, &rsrc_desc); + sr = &sv->shader_resource[i]; + + sr->in_type = rsrc_desc.Type; + sr->bind_point = rsrc_desc.BindPoint; + sr->bind_count = rsrc_desc.BindCount; + + switch (rsrc_desc.Type) + { + case D3D10_SIT_CBUFFER: + case D3D10_SIT_TBUFFER: + for (y = 0; y < v->effect->local_buffer_count; ++y) + { + var = &v->effect->local_buffers[y]; + + if (!strcmp(rsrc_desc.Name, var->name)) + { + sr->resource_variable = var; + break; + } + } + break; + + case D3D10_SIT_SAMPLER: + case D3D10_SIT_TEXTURE: + for (y = 0; y < v->effect->local_variable_count; ++y) + { + var = &v->effect->local_variables[y]; + + if (!strcmp(rsrc_desc.Name, var->name)) + { + sr->resource_variable = var; + break; + } + } + break; + + default: + break; + } + + if (!sr->resource_variable) + { + ERR("Failed to find shader resource.\n"); + hr = E_FAIL; + goto exit; + } + } + +exit: + reflector->lpVtbl->Release(reflector); + + return hr; +} + static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offset, struct d3d10_effect_variable *v) { ID3D10Device *device = v->effect->device; @@ -691,6 +772,9 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse /* We got a shader VertexShader vs = NULL, so it is fine to skip this. */ if (!dxbc_size) return S_OK; + hr = get_fx10_shader_resources(v, (const void *)ptr, dxbc_size); + if (FAILED(hr)) return hr; + switch (v->type->basetype) { case D3D10_SVT_VERTEXSHADER: @@ -2623,6 +2707,9 @@ static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_vari FIXME("Unhandled shader type %s.\n", debug_d3d10_shader_variable_type(type)); break; } + + if (s->resource_count) + heap_free(s->shader_resource); } static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) -- 2.20.1

4 8

[PATCH v6] mfreadwrite: Pass source samples through decoder as they arrive.
by Derek Lesho 24 Mar '20

24 Mar '20

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v6: Only set MF_SOURCE_READERF_ENDOFSTREAM when there are no queued samples. --- dlls/mfreadwrite/main.c | 134 ++++++++++++++++++++++++++++++++++------ 1 file changed, 115 insertions(+), 19 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index d3c10a4d11..8c994273cb 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -366,6 +366,100 @@ static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallbac return IMFSourceReader_Release(&reader->IMFSourceReader_iface); } +static void source_reader_queue_sample(struct media_stream *stream, IMFSample *sample) +{ + struct sample *pending_sample; + + if (!sample) + return; + + pending_sample = heap_alloc(sizeof(*pending_sample)); + pending_sample->sample = sample; + IMFSample_AddRef(pending_sample->sample); + + list_add_tail(&stream->samples, &pending_sample->entry); +} + +static HRESULT source_reader_pull_stream_samples(struct media_stream *stream) +{ + MFT_OUTPUT_STREAM_INFO stream_info = { 0 }; + MFT_OUTPUT_DATA_BUFFER out_buffer; + IMFMediaBuffer *buffer; + DWORD status; + HRESULT hr; + + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder, 0, &stream_info))) + { + WARN("Failed to get output stream info, hr %#x.\n", hr); + return hr; + } + + for (;;) + { + memset(&out_buffer, 0, sizeof(out_buffer)); + + if (!(stream_info.dwFlags & MFT_OUTPUT_STREAM_PROVIDES_SAMPLES)) + { + if (FAILED(hr = MFCreateSample(&out_buffer.pSample))) + break; + + if (FAILED(hr = MFCreateAlignedMemoryBuffer(stream_info.cbSize, stream_info.cbAlignment, &buffer))) + { + IMFSample_Release(out_buffer.pSample); + break; + } + + IMFSample_AddBuffer(out_buffer.pSample, buffer); + IMFMediaBuffer_Release(buffer); + } + + if (FAILED(hr = IMFTransform_ProcessOutput(stream->decoder, 0, 1, &out_buffer, &status))) + { + if (out_buffer.pSample) + IMFSample_Release(out_buffer.pSample); + break; + } + + source_reader_queue_sample(stream, out_buffer.pSample); + if (out_buffer.pSample) + IMFSample_Release(out_buffer.pSample); + if (out_buffer.pEvents) + IMFCollection_Release(out_buffer.pEvents); + } + + return hr; +} + +static HRESULT source_reader_process_sample(struct media_stream *stream, IMFSample *sample) +{ + HRESULT hr; + + if (!stream->decoder) + { + source_reader_queue_sample(stream, sample); + return S_OK; + } + + /* It's assumed that decoder has 1 input and 1 output, both id's are 0. */ + + hr = source_reader_pull_stream_samples(stream); + if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) + { + if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder, 0, sample, 0))) + { + WARN("Transform failed to process input, hr %#x.\n", hr); + return hr; + } + + if ((hr = source_reader_pull_stream_samples(stream)) == MF_E_TRANSFORM_NEED_MORE_INPUT) + return S_OK; + } + else + WARN("Transform failed to process output, hr %#x.\n", hr); + + return hr; +} + static HRESULT source_reader_media_sample_handler(struct source_reader *reader, IMFMediaStream *stream, IMFMediaEvent *event) { @@ -393,21 +487,14 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, { if (id == reader->streams[i].id) { - struct sample *pending_sample; - - if (!(pending_sample = heap_alloc(sizeof(*pending_sample)))) - { - hr = E_OUTOFMEMORY; - goto failed; - } + EnterCriticalSection(&reader->streams[i].cs); - pending_sample->sample = sample; - IMFSample_AddRef(pending_sample->sample); + hr = source_reader_process_sample(&reader->streams[i], sample); - EnterCriticalSection(&reader->streams[i].cs); - list_add_tail(&reader->streams[i].samples, &pending_sample->entry); LeaveCriticalSection(&reader->streams[i].cs); + /* FIXME: propagate processing errors? */ + WakeAllConditionVariable(&reader->streams[i].sample_event); break; @@ -417,7 +504,6 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (i == reader->stream_count) WARN("Stream with id %#x was not present in presentation descriptor.\n", id); -failed: IMFSample_Release(sample); return hr; @@ -438,26 +524,36 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re for (i = 0; i < reader->stream_count; ++i) { - if (id == reader->streams[i].id) + struct media_stream *stream = &reader->streams[i]; + + if (id == stream->id) { - EnterCriticalSection(&reader->streams[i].cs); + EnterCriticalSection(&stream->cs); switch (event) { case MEEndOfStream: - reader->streams[i].state = STREAM_STATE_EOS; + stream->state = STREAM_STATE_EOS; + + if (stream->decoder && SUCCEEDED(IMFTransform_ProcessMessage(stream->decoder, + MFT_MESSAGE_COMMAND_DRAIN, 0))) + { + if ((hr = source_reader_pull_stream_samples(stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) + WARN("Failed to pull pending samples, hr %#x.\n", hr); + } + break; case MEStreamSeeked: case MEStreamStarted: - reader->streams[i].state = STREAM_STATE_READY; + stream->state = STREAM_STATE_READY; break; default: ; } - LeaveCriticalSection(&reader->streams[i].cs); + LeaveCriticalSection(&stream->cs); - WakeAllConditionVariable(&reader->streams[i].sample_event); + WakeAllConditionVariable(&stream->sample_event); break; } @@ -1006,7 +1102,7 @@ static IMFSample *media_stream_pop_sample(struct media_stream *stream, DWORD *st heap_free(pending_sample); } - *stream_flags = stream->state == STREAM_STATE_EOS ? MF_SOURCE_READERF_ENDOFSTREAM : 0; + *stream_flags = (!ret && stream->state == STREAM_STATE_EOS) ? MF_SOURCE_READERF_ENDOFSTREAM : 0; return ret; } -- 2.25.2

2 1

[PATCH v4 1/5] quartz/tests: Add a test for autoplugging from UYVY.
by Zebediah Figura 24 Mar '20

24 Mar '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v4: fix yet another test failure dlls/quartz/tests/filtergraph.c | 45 +++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 16d1629fb88..bfb7e095365 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4448,6 +4448,50 @@ static void test_window_threading(void) ok(ret, "Failed to delete file, error %u.\n", GetLastError()); } +/* Hyperdevotion Noire needs to be able to Render() from UYVY. */ +static void test_autoplug_uyvy(void) +{ + static const VIDEOINFOHEADER source_format = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 600, + .bmiHeader.biHeight = 400, + .bmiHeader.biCompression = mmioFOURCC('U','Y','V','Y'), + .bmiHeader.biBitCount = 16, + }; + AM_MEDIA_TYPE source_type = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_UYVY, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(source_format), + .pbFormat = (BYTE *)&source_format, + }; + + IFilterGraph2 *graph = create_graph(); + struct testpin source_pin; + struct testfilter source; + HRESULT hr; + ULONG ref; + + testsource_init(&source_pin, NULL, 0); + testfilter_init(&source, &source_pin, 1); + source_pin.request_mt = &source_type; + + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, L"source"); + + /* Windows 2008 doesn't seem to have an UYVY decoder, and the testbot chalks + * failure to decode up to missing audio hardware, even though we're not + * trying to render audio. */ + hr = IFilterGraph2_Render(graph, &source_pin.IPin_iface); + todo_wine ok(hr == S_OK || hr == VFW_E_NO_AUDIO_HARDWARE, "Got hr %#x.\n", hr); + + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref); + ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -4471,6 +4515,7 @@ START_TEST(filtergraph) test_default_sync_source(); test_add_source_filter(); test_window_threading(); + test_autoplug_uyvy(); CoUninitialize(); test_render_with_multithread(); -- 2.25.1

2 5

[PATCH] d3dx9: Don't check for negative enum value.
by Jacek Caban 24 Mar '20

24 Mar '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes clang warning: ../../../dlls/d3dx9_37/../d3dx9_36/effect.c:1472:12: warning: result of comparison of unsigned enum expression < 0 is always false [-Wtautological-unsigned-enum-zero-compare] dlls/d3dx9_36/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

6 13