May 2020 - Wine-Devel - list.winehq.org

[PATCH 4/5] dxgi/tests: Add more get swapchain containing output tests.
by Zhiyi Zhang May 8, 2020

May 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 279 ++++++++++++++++++++++++++--------------- 1 file changed, 175 insertions(+), 104 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 5af2104bb1a..a9f9b715702 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2022,7 +2022,7 @@ static HMONITOR get_primary_if_right_side_secondary(const DXGI_OUTPUT_DESC *outp static void test_get_containing_output(void) { - unsigned int output_count, output_idx; + unsigned int adapter_idx, output_idx, output_count; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGIOutput *output, *output2; DXGI_OUTPUT_DESC output_desc; @@ -2035,6 +2035,7 @@ static void test_get_containing_output(void) unsigned int i, j; HMONITOR monitor; HMONITOR primary; + BOOL fullscreen; ULONG refcount; HRESULT hr; BOOL ret; @@ -2075,6 +2076,7 @@ static void test_get_containing_output(void) IDXGIOutput_Release(output); ++output_count; } + IDXGIAdapter_Release(adapter); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); @@ -2092,7 +2094,6 @@ static void test_get_containing_output(void) if (hr == DXGI_ERROR_UNSUPPORTED) { win_skip("GetContainingOutput() not supported.\n"); - IDXGISwapChain_Release(swapchain); goto done; } @@ -2119,118 +2120,188 @@ static void test_get_containing_output(void) primary = get_primary_if_right_side_secondary(&output_desc); - output_idx = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); - - hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - - /* Move the OutputWindow to the current output. */ - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, - output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); - - check_output_equal(output, output2); - - refcount = IDXGIOutput_Release(output2); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - refcount = IDXGIOutput_Release(output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - ++output_idx; - - /* Move the OutputWindow around the corners of the current output desktop coordinates. */ - for (i = 0; i < 4; ++i) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - static const POINT offsets[] = - { - { 0, 0}, - {-49, 0}, {-50, 0}, {-51, 0}, - { 0, -49}, { 0, -50}, { 0, -51}, - {-49, -49}, {-50, -49}, {-51, -49}, - {-49, -50}, {-50, -50}, {-51, -50}, - {-49, -51}, {-50, -51}, {-51, -51}, - }; - unsigned int x = 0, y = 0; - - switch (i) - { - case 0: - x = output_desc.DesktopCoordinates.left; - y = output_desc.DesktopCoordinates.top; - break; - case 1: - x = output_desc.DesktopCoordinates.right; - y = output_desc.DesktopCoordinates.top; - break; - case 2: - x = output_desc.DesktopCoordinates.right; - y = output_desc.DesktopCoordinates.bottom; - break; - case 3: - x = output_desc.DesktopCoordinates.left; - y = output_desc.DesktopCoordinates.bottom; - break; - } - - for (j = 0; j < ARRAY_SIZE(offsets); ++j) - { - unsigned int idx = ARRAY_SIZE(offsets) * i + j; - assert(idx < ARRAY_SIZE(points)); - points[idx].x = x + offsets[j].x; - points[idx].y = y + offsets[j].y; - } - } - - for (i = 0; i < ARRAY_SIZE(points); ++i) - { - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "Failed to set window position.\n"); - - monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); - ok(!!monitor, "Failed to get monitor from window.\n"); - - monitor_info.cbSize = sizeof(monitor_info); - ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); - ok(ret, "Failed to get monitor info.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); - /* Hack to prevent test failures with secondary on the right until multi-monitor support is improved. */ - todo_wine_if(primary && monitor != primary) - ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), - "Failed to get containing output, hr %#x.\n", hr); - if (hr != S_OK) - continue; - ok(!!output, "Got unexpected containing output %p.\n", output); hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(hr == S_OK, "Failed to get output desc, hr %#x.\n", hr); - refcount = IDXGIOutput_Release(output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); - ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), - "Got unexpected device name %s, expected %s.\n", - wine_dbgstr_w(output_desc.DeviceName), wine_dbgstr_w(monitor_info.szDevice)); - ok(EqualRect(&output_desc.DesktopCoordinates, &monitor_info.rcMonitor), - "Got unexpected desktop coordinates %s, expected %s.\n", - wine_dbgstr_rect(&output_desc.DesktopCoordinates), - wine_dbgstr_rect(&monitor_info.rcMonitor)); + /* Move the OutputWindow to the current output. */ + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + if (FAILED(hr)) + { + win_skip("Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + IDXGIOutput_Release(output); + continue; + } + + check_output_equal(output, output2); + + refcount = IDXGIOutput_Release(output2); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + + /* Move the OutputWindow around the corners of the current output desktop coordinates. */ + for (i = 0; i < 4; ++i) + { + static const POINT offsets[] = + { + { 0, 0}, + {-49, 0}, {-50, 0}, {-51, 0}, + { 0, -49}, { 0, -50}, { 0, -51}, + {-49, -49}, {-50, -49}, {-51, -49}, + {-49, -50}, {-50, -50}, {-51, -50}, + {-49, -51}, {-50, -51}, {-51, -51}, + }; + unsigned int x = 0, y = 0; + + switch (i) + { + case 0: + x = output_desc.DesktopCoordinates.left; + y = output_desc.DesktopCoordinates.top; + break; + case 1: + x = output_desc.DesktopCoordinates.right; + y = output_desc.DesktopCoordinates.top; + break; + case 2: + x = output_desc.DesktopCoordinates.right; + y = output_desc.DesktopCoordinates.bottom; + break; + case 3: + x = output_desc.DesktopCoordinates.left; + y = output_desc.DesktopCoordinates.bottom; + break; + } + + for (j = 0; j < ARRAY_SIZE(offsets); ++j) + { + unsigned int idx = ARRAY_SIZE(offsets) * i + j; + assert(idx < ARRAY_SIZE(points)); + points[idx].x = x + offsets[j].x; + points[idx].y = y + offsets[j].y; + } + } + + for (i = 0; i < ARRAY_SIZE(points); ++i) + { + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, + 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u point %u: Failed to set window position.\n", + adapter_idx, output_idx, i); + + monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); + ok(!!monitor, "Adapter %u output %u point %u: Failed to get monitor from window.\n", + adapter_idx, output_idx, i); + + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(monitor, (MONITORINFO *)&monitor_info); + ok(ret, "Adapter %u output %u point %u: Failed to get monitor info.\n", adapter_idx, + output_idx, i); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + /* Hack to prevent test failures with secondary on the right until multi-monitor support is improved. */ + todo_wine_if(primary && monitor != primary) + ok(hr == S_OK || broken(hr == DXGI_ERROR_UNSUPPORTED), + "Adapter %u output %u point %u: Failed to get containing output, hr %#x.\n", + adapter_idx, output_idx, i, hr); + if (hr != S_OK) + continue; + ok(!!output2, "Adapter %u output %u point %u: Got unexpected containing output %p.\n", + adapter_idx, output_idx, i, output2); + hr = IDXGIOutput_GetDesc(output2, &output_desc); + ok(hr == S_OK, "Adapter %u output %u point %u: Failed to get output desc, hr %#x.\n", + adapter_idx, output_idx, i, hr); + refcount = IDXGIOutput_Release(output2); + ok(!refcount, "Adapter %u output %u point %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, i, refcount); + + ok(!lstrcmpW(output_desc.DeviceName, monitor_info.szDevice), + "Adapter %u output %u point %u: Got unexpected device name %s, expected %s.\n", + adapter_idx, output_idx, i, wine_dbgstr_w(output_desc.DeviceName), + wine_dbgstr_w(monitor_info.szDevice)); + ok(EqualRect(&output_desc.DesktopCoordinates, &monitor_info.rcMonitor), + "Adapter %u output %u point %u: Expect desktop coordinates %s, got %s.\n", + adapter_idx, output_idx, i, + wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&monitor_info.rcMonitor)); + } + IDXGIOutput_Release(output); } + IDXGIAdapter_Release(adapter); } - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + /* Test GetContainingOutput with a full screen swapchain. The containing output should stay + * the same even if the device window is moved */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + goto done; + } + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output2); + if (FAILED(hr)) + { + win_skip("GetContainingOutput failed, hr %#x.\n", hr); + IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + goto done; + } + + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) + { + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) + { + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + + /* Move the OutputWindow to the current output. */ + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed.\n", adapter_idx, output_idx); + + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); + ok(hr == S_OK, "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(fullscreen, "Adapter %u output %u: Expect swapchain full screen.\n", adapter_idx, + output_idx); + ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n", + adapter_idx, output_idx, output2, output); + IDXGIOutput_Release(output); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(output == output2, "Adapter %u output %u: Expect output %p, got %p.\n", + adapter_idx, output_idx, output2, output); + IDXGIOutput_Release(output); + } + IDXGIAdapter_Release(adapter); + } + + IDXGIOutput_Release(output2); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); done: + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); @@ -6594,7 +6665,6 @@ START_TEST(dxgi) queue_test(test_parents); queue_test(test_output); queue_test(test_find_closest_matching_mode); - queue_test(test_get_containing_output); queue_test(test_resize_target_wndproc); queue_test(test_create_factory); queue_test(test_private_data); @@ -6610,6 +6680,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_get_containing_output(); test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); -- 2.25.1

3 2

[PATCH 3/5] wined3d: Move device window to the correct output when changing swapchain state to full screen.
by Zhiyi Zhang May 8, 2020

May 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/device.c | 20 +++++++++++++----- dlls/wined3d/swapchain.c | 38 +++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e16bd84164a..1711014c8d2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4954,6 +4954,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, || swapchain_desc->backbuffer_height != current_desc->backbuffer_height; windowed = current_desc->windowed; + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + return E_FAIL; + } + if (!swapchain_desc->windowed != !windowed || swapchain->reapply_mode || mode || (!swapchain_desc->windowed && backbuffer_resized)) { @@ -4971,11 +4977,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (!(output = wined3d_swapchain_get_output(swapchain))) - { - ERR("Failed to get output from swapchain %p.\n", swapchain); - return E_FAIL; - } if (FAILED(hr = wined3d_swapchain_state_set_fullscreen(&swapchain->state, swapchain_desc, output, mode))) return hr; @@ -4988,13 +4989,22 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { DWORD style = swapchain_state->style; DWORD exstyle = swapchain_state->exstyle; + struct wined3d_output_desc output_desc; + /* If we're in fullscreen, and the mode wasn't changed, we have to get * the window back into the right position. Some applications * (Battlefield 2, Guild Wars) move it and then call Reset() to clean * up their mess. Guild Wars also loses the device during that. */ + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + swapchain_state->style = 0; swapchain_state->exstyle = 0; wined3d_swapchain_state_setup_fullscreen(swapchain_state, swapchain_state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, swapchain_desc->backbuffer_width, swapchain_desc->backbuffer_height); swapchain_state->style = style; swapchain_state->exstyle = exstyle; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3071afb8aeb..466bcd95cae 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -872,13 +872,14 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc const struct wined3d_swapchain_ops *swapchain_ops) { struct wined3d_resource_desc texture_desc; + struct wined3d_output_desc output_desc; struct wined3d_output *output; BOOL displaymode_set = FALSE; DWORD texture_flags = 0; + HRESULT hr = E_FAIL; RECT client_rect; unsigned int i; HWND window; - HRESULT hr; wined3d_mutex_lock(); @@ -933,8 +934,21 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc } else { - wined3d_swapchain_state_setup_fullscreen(&swapchain->state, - window, desc->backbuffer_width, desc->backbuffer_height); + if (!(output = wined3d_swapchain_get_output(swapchain))) + { + ERR("Failed to get output from swapchain %p.\n", swapchain); + goto err; + } + + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + goto err; + } + + wined3d_swapchain_state_setup_fullscreen(&swapchain->state, window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, desc->backbuffer_width, + desc->backbuffer_height); } swapchain->state.desc = *desc; wined3d_swapchain_apply_sample_count_override(swapchain, swapchain->state.desc.backbuffer_format, @@ -1551,7 +1565,7 @@ static LONG fullscreen_exstyle(LONG exstyle) } HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) + HWND window, int x, int y, int width, int height) { LONG style, exstyle; BOOL filter; @@ -1583,7 +1597,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state SetWindowLongW(window, GWL_STYLE, style); SetWindowLongW(window, GWL_EXSTYLE, exstyle); - SetWindowPos(window, HWND_TOPMOST, 0, 0, w, h, SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos(window, HWND_TOPMOST, x, y, width, height, + SWP_FRAMECHANGED | SWP_SHOWWINDOW | SWP_NOACTIVATE); wined3d_filter_messages(window, filter); @@ -1647,6 +1662,7 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st const struct wined3d_display_mode *mode) { struct wined3d_display_mode actual_mode; + struct wined3d_output_desc output_desc; HRESULT hr; TRACE("state %p, swapchain_desc %p, output %p, mode %p.\n", @@ -1695,10 +1711,17 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st unsigned int width = actual_mode.width; unsigned int height = actual_mode.height; + if (FAILED(hr = wined3d_output_get_desc(output, &output_desc))) + { + ERR("Failed to get output description, hr %#x.\n", hr); + return hr; + } + if (state->desc.windowed) { /* Switch from windowed to fullscreen */ - if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, width, height))) + if (FAILED(hr = wined3d_swapchain_state_setup_fullscreen(state, state->device_window, + output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, height))) return hr; } else @@ -1708,7 +1731,8 @@ HRESULT CDECL wined3d_swapchain_state_set_fullscreen(struct wined3d_swapchain_st /* Fullscreen -> fullscreen mode change */ filter = wined3d_filter_messages(window, TRUE); - MoveWindow(window, 0, 0, width, height, TRUE); + MoveWindow(window, output_desc.desktop_rect.left, output_desc.desktop_rect.top, width, + height, TRUE); ShowWindow(window, SW_SHOW); wined3d_filter_messages(window, filter); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7a412d7a8e7..0e20d1fc9b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4720,7 +4720,7 @@ struct wined3d_swapchain_state void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_state *state, HWND window, const RECT *window_rect) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state *state, - HWND window, unsigned int w, unsigned int h) DECLSPEC_HIDDEN; + HWND window, int x, int y, int width, int height) DECLSPEC_HIDDEN; struct wined3d_swapchain_ops { -- 2.25.1

2 1

[PATCH 2/5] wined3d: Release wined3d mutex if wined3d_swapchain_state_init() failed in wined3d_swapchain_init().
by Zhiyi Zhang May 8, 2020

May 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index dd0419412af..3071afb8aeb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -895,7 +895,10 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc window = desc->device_window ? desc->device_window : device->create_parms.focus_window; if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d))) - return hr; + { + ERR("Failed to initialise swapchain state, hr %#x.\n", hr); + goto err; + } swapchain->swapchain_ops = swapchain_ops; swapchain->device = device; -- 2.25.1

2 1

[PATCH 1/5] dxgi/tests: Add more default full screen swapchain target output tests.
by Zhiyi Zhang May 8, 2020

May 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 218 +++++++++++++++++++++++++++-------------- 1 file changed, 144 insertions(+), 74 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index f04cd2be065..5af2104bb1a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2545,13 +2545,15 @@ done: static void test_default_fullscreen_target_output(void) { IDXGIOutput *output, *containing_output, *target; + unsigned int adapter_idx, output_idx; DXGI_SWAP_CHAIN_DESC swapchain_desc; DXGI_OUTPUT_DESC output_desc; + unsigned int width, height; IDXGISwapChain *swapchain; - unsigned int output_idx; IDXGIFactory *factory; IDXGIAdapter *adapter; IDXGIDevice *device; + RECT window_rect; ULONG refcount; HRESULT hr; BOOL ret; @@ -2562,14 +2564,8 @@ static void test_default_fullscreen_target_output(void) return; } - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + get_factory((IUnknown *)device, FALSE, &factory); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); - - swapchain_desc.BufferDesc.Width = 640; - swapchain_desc.BufferDesc.Height = 480; swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; @@ -2579,86 +2575,160 @@ static void test_default_fullscreen_target_output(void) swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; swapchain_desc.BufferCount = 1; - swapchain_desc.OutputWindow = create_window(); - swapchain_desc.Windowed = TRUE; swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - - output_idx = 0; - while ((hr = IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)) != DXGI_ERROR_NOT_FOUND) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - ok(SUCCEEDED(hr), "Failed to enumerate output %u, hr %#x.\n", output_idx, hr); - - hr = IDXGIOutput_GetDesc(output, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); - - /* Move the OutputWindow to the current output. */ - ret = SetWindowPos(swapchain_desc.OutputWindow, 0, - output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, - 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "SetWindowPos failed.\n"); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_UNSUPPORTED) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - win_skip("GetContainingOutput() not supported.\n"); - IDXGIOutput_Release(output); - goto done; - } + /* Windowed swapchain */ + swapchain_desc.BufferDesc.Width = 640; + swapchain_desc.BufferDesc.Height = 480; + swapchain_desc.OutputWindow = create_window(); + swapchain_desc.Windowed = TRUE; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, + &swapchain); + ok(SUCCEEDED(hr), "Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", + adapter_idx, output_idx, hr); - hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); - ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, - "SetFullscreenState failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) - { - skip("Could not change fullscreen state.\n"); + /* Move the OutputWindow to the current output. */ + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, + output_desc.DesktopCoordinates.left, output_desc.DesktopCoordinates.top, + 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("Adapter %u output %u: GetContainingOutput() not supported.\n", + adapter_idx, output_idx); + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, + "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", adapter_idx, + output_idx, hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Adapter %u output %u: Could not change fullscreen state.\n", adapter_idx, + output_idx); + IDXGIOutput_Release(containing_output); + IDXGISwapChain_Release(swapchain); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + GetWindowRect(swapchain_desc.OutputWindow, &window_rect); + ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, + output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&window_rect)); + + target = NULL; + hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(target != containing_output, + "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, + output_idx, target, containing_output); + check_output_equal(target, containing_output); + + refcount = IDXGIOutput_Release(containing_output); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(SUCCEEDED(hr), "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(containing_output == target, + "Adapter %u output %u: Got unexpected containing output %p, expected %p.\n", + adapter_idx, output_idx, containing_output, target); + refcount = IDXGIOutput_Release(containing_output); + ok(refcount >= 2, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + output_idx, refcount); + refcount = IDXGIOutput_Release(target); + ok(refcount >= 1, "Adapter %u output %u: Got unexpected refcount %u.\n", adapter_idx, + output_idx, refcount); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, refcount); + DestroyWindow(swapchain_desc.OutputWindow); + + /* Full screen swapchain */ + width = output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left; + height = output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top; + swapchain_desc.BufferDesc.Width = width; + swapchain_desc.BufferDesc.Height = height; + swapchain_desc.OutputWindow = create_window(); + swapchain_desc.Windowed = FALSE; + ret = SetWindowPos(swapchain_desc.OutputWindow, 0, output_desc.DesktopCoordinates.left, + output_desc.DesktopCoordinates.top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + ok(ret, "Adapter %u output %u: SetWindowPos failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, + &swapchain); + if (FAILED(hr)) + { + skip("Adapter %u output %u: CreateSwapChain failed, hr %#x.\n", adapter_idx, + output_idx, hr); + IDXGIOutput_Release(output); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + ret = GetWindowRect(swapchain_desc.OutputWindow, &window_rect); + ok(ret, "Adapter %u output %u: GetWindowRect failed, error %#x.\n", adapter_idx, + output_idx, GetLastError()); + ok(EqualRect(&window_rect, &output_desc.DesktopCoordinates), + "Adapter %u output %u: Expect window rect %s, got %s.\n", adapter_idx, + output_idx, wine_dbgstr_rect(&output_desc.DesktopCoordinates), + wine_dbgstr_rect(&window_rect)); + + hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); + ok(hr == S_OK, "Adapter %u output %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, hr); + ok(containing_output != output, + "Adapter %u output %u: Got unexpected output %p, expected %p.\n", adapter_idx, + output_idx, output, containing_output); + check_output_equal(output, containing_output); IDXGIOutput_Release(containing_output); - IDXGIOutput_Release(output); - goto done; + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Adapter %u output %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, refcount); + refcount = IDXGIOutput_Release(output); + ok(!refcount, "Adapter %u output %u: IDXGIOutput has %u references left.\n", + adapter_idx, output_idx, refcount); + DestroyWindow(swapchain_desc.OutputWindow); } - - target = NULL; - hr = IDXGISwapChain_GetFullscreenState(swapchain, NULL, &target); - ok(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); - ok(target != containing_output, "Got unexpected output pointers %p, %p.\n", - target, containing_output); - check_output_equal(target, containing_output); - - refcount = IDXGIOutput_Release(containing_output); - ok(!refcount, "IDXGIOutput has %u references left.\n", refcount); - - hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); - ok(containing_output == target, "Got unexpected containing output %p, expected %p.\n", - containing_output, target); - refcount = IDXGIOutput_Release(containing_output); - ok(refcount >= 2, "Got unexpected refcount %u.\n", refcount); - refcount = IDXGIOutput_Release(target); - ok(refcount >= 1, "Got unexpected refcount %u.\n", refcount); - - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - - IDXGIOutput_Release(output); - ++output_idx; + IDXGIAdapter_Release(adapter); } -done: - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - refcount = IDXGIAdapter_Release(adapter); - ok(!refcount, "Adapter has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); ok(!refcount, "Factory has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); } static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, -- 2.25.1

3 2

[PATCH] iphlpapi: add stub for NotifyRouteChange2 (now with "Signed off"...)
by Louis Lenders May 8, 2020

May 8, 2020

Now with "Signed-off"............... https://bugs.winehq.org/show_bug.cgi?id=48775 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c5857f2831..ded265f571 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -236,7 +236,7 @@ @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) -#@ stub NotifyRouteChange2 +@ stdcall NotifyRouteChange2( long ptr ptr long ptr ) @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3ce21c44b..86f495266e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2817,6 +2817,18 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ return NO_ERROR; } +/****************************************************************** + * NotifyRouteChange2 (IPHLPAPI.@) + */ +DWORD WINAPI NotifyRouteChange2(ADDRESS_FAMILY family, PIPFORWARD_CHANGE_CALLBACK callback, VOID* context, + BOOLEAN init_notify, HANDLE* handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return NO_ERROR; +} + /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) diff --git a/include/netioapi.h b/include/netioapi.h index a41bae0968..7238d527ad 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -236,6 +236,8 @@ typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); +typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); -- 2.26.2

1 0

[PATCH] comdlg32: Improve error handling in get_config_key_string.
by Jacek Caban May 8, 2020

May 8, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/comdlg32/filedlg.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 2/2 v2] winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open
by Andrew Eikum May 8, 2020

May 8, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v2: Use HandleToUlong instead of casts. dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9f..f60b44b096c 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW(HandleToUlong(win),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,HandleToUlong(win),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad1..eec1ba2a034 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW(HandleToUlong(wout),&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,HandleToUlong(wout),pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; -- 2.26.2

1 0

[PATCH 2/2] winmm/tests: Test using a device handle in wave{In,Out}GetDevCaps and wave{In,Out}Open
by Andrew Eikum May 8, 2020

May 8, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/tests/capture.c | 17 ++++++++++++++++- dlls/winmm/tests/wave.c | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c index 4290c358a9f..cd28ba867d2 100644 --- a/dlls/winmm/tests/capture.c +++ b/dlls/winmm/tests/capture.c @@ -130,7 +130,7 @@ static void check_position(int device, HWAVEIN win, DWORD bytes, static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEINCAPSA *pcaps) { - HWAVEIN win; + HWAVEIN win, win2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR frag; MMRESULT rc; @@ -139,6 +139,7 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, WORD nChannels = pwfx->nChannels; WORD wBitsPerSample = pwfx->wBitsPerSample; DWORD nSamplesPerSec = pwfx->nSamplesPerSec; + WAVEINCAPSW capsW; win=NULL; flags |= CALLBACK_EVENT; @@ -181,6 +182,20 @@ static void wave_in_test_deviceIn(int device, WAVEFORMATEX *pwfx, DWORD format, pwfx->nSamplesPerSec, pwfx->wBitsPerSample, pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels); + /* waveInGetDevCaps allows an open handle instead of a device id */ + rc=waveInGetDevCapsW((UINT)(UINT_PTR)win,&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveInGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + + /* waveInOpen does not allow an open handle instead of a device id */ + rc=waveInOpen(&win2,(UINT)(UINT_PTR)win,pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveInOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_in_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveInClose(win2); + /* Check that the position is 0 at start */ check_position(device, win, 0, pwfx); diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index f9fc5c5aad1..98d32d9b48f 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -599,9 +599,10 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in WAVEFORMATEX *pwfx, DWORD format, DWORD flags, WAVEOUTCAPSA *pcaps, BOOL interactive, BOOL sine, BOOL pause) { - HWAVEOUT wout; + HWAVEOUT wout, wout2; HANDLE hevent = CreateEventW(NULL, FALSE, FALSE, NULL); WAVEHDR *frags = 0; + WAVEOUTCAPSW capsW; MMRESULT rc; DWORD volume; WORD nChannels = pwfx->nChannels; @@ -705,6 +706,20 @@ static void wave_out_test_deviceOut(int device, double duration, int headers, in ok(has_volume ? rc==MMSYSERR_NOERROR : rc==MMSYSERR_NOTSUPPORTED, "waveOutGetVolume(%s): rc=%s\n",dev_name(device),wave_out_error(rc)); + /* waveOutGetDevCaps allows an open handle instead of a device id */ + rc=waveOutGetDevCapsW((UINT)(UINT_PTR)wout,&capsW,sizeof(capsW)); + ok(rc==MMSYSERR_NOERROR, + "waveOutGetDevCapsW(%s): MMSYSERR_NOERROR " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + + /* waveOutOpen does not allow an open handle instead of a device id */ + rc=waveOutOpen(&wout2,(UINT)(UINT_PTR)wout,pwfx,0,0,CALLBACK_NULL); + ok(rc==MMSYSERR_BADDEVICEID, + "waveOutOpen(%s): MMSYSERR_BADDEVICEID " + "expected, got %s\n",dev_name(device),wave_out_error(rc)); + if(rc==MMSYSERR_NOERROR) + waveOutClose(wout2); + /* make sure fragment length is a multiple of block size */ frag_length = ((length / headers) / pwfx->nBlockAlign) * pwfx->nBlockAlign; -- 2.26.2

1 0

[PATCH 1/2] winmm: Accept open handles in wave{In,Out}GetDevCaps
by Andrew Eikum May 8, 2020

May 8, 2020

Based on a patch by Changping Yu <dead.ash(a)hotmail.com>. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winmm/waveform.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b08768577bb..39461743c4a 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2669,10 +2669,18 @@ UINT WINAPI waveOutGetDevCapsW(UINT_PTR uDeviceID, LPWAVEOUTCAPSW lpCaps, caps = &mapper_caps; }else{ - if(uDeviceID >= g_outmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_outmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); - caps = &read_map(g_out_map, uDeviceID)->out_caps; + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->out_caps; + + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_out_map, uDeviceID)->out_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); @@ -3336,10 +3344,18 @@ UINT WINAPI waveInGetDevCapsW(UINT_PTR uDeviceID, LPWAVEINCAPSW lpCaps, UINT uSi caps = &mapper_caps; }else{ - if(uDeviceID >= g_inmmdevices_count) - return MMSYSERR_BADDEVICEID; + if(uDeviceID >= g_inmmdevices_count){ + WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)uDeviceID); - caps = &read_map(g_in_map, uDeviceID)->in_caps; + if(!WINMM_ValidateAndLock(device)) + return MMSYSERR_BADDEVICEID; + + caps = &device->parent->in_caps; + + LeaveCriticalSection(&device->lock); + }else{ + caps = &read_map(g_in_map, uDeviceID)->in_caps; + } } memcpy(lpCaps, caps, min(uSize, sizeof(*lpCaps))); -- 2.26.2

1 0

[PATCH] iphlpapi: add stub for NotifyRouteChange2
by Louis Lenders May 8, 2020

May 8, 2020

https://bugs.winehq.org/show_bug.cgi?id=48775 --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 12 ++++++++++++ include/netioapi.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index c5857f2831..ded265f571 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -236,7 +236,7 @@ @ stdcall NotifyAddrChange( ptr ptr ) @ stdcall NotifyIpInterfaceChange( long ptr ptr long ptr ) @ stdcall NotifyRouteChange( ptr ptr ) -#@ stub NotifyRouteChange2 +@ stdcall NotifyRouteChange2( long ptr ptr long ptr ) @ stub NotifyRouteChangeEx #@ stub NotifyStableUnicastIpAddressTable #@ stub NotifyTeredoPortChange diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index e3ce21c44b..86f495266e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2817,6 +2817,18 @@ DWORD WINAPI NotifyIpInterfaceChange(ADDRESS_FAMILY family, PIPINTERFACE_CHANGE_ return NO_ERROR; } +/****************************************************************** + * NotifyRouteChange2 (IPHLPAPI.@) + */ +DWORD WINAPI NotifyRouteChange2(ADDRESS_FAMILY family, PIPFORWARD_CHANGE_CALLBACK callback, VOID* context, + BOOLEAN init_notify, HANDLE* handle) +{ + FIXME("(family %d, callback %p, context %p, init_notify %d, handle %p): stub\n", + family, callback, context, init_notify, handle); + if (handle) *handle = NULL; + return NO_ERROR; +} + /****************************************************************** * NotifyRouteChange (IPHLPAPI.@) diff --git a/include/netioapi.h b/include/netioapi.h index a41bae0968..7238d527ad 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -236,6 +236,8 @@ typedef VOID (WINAPI *PIPINTERFACE_CHANGE_CALLBACK)(PVOID, PMIB_IPINTERFACE_ROW, typedef VOID (WINAPI *PUNICAST_IPADDRESS_CHANGE_CALLBACK)(PVOID, PMIB_UNICASTIPADDRESS_ROW, MIB_NOTIFICATION_TYPE); +typedef VOID (WINAPI *PIPFORWARD_CHANGE_CALLBACK)(VOID*,MIB_IPFORWARD_ROW2*,MIB_NOTIFICATION_TYPE); + DWORD WINAPI ConvertInterfaceGuidToLuid(const GUID*,NET_LUID*); DWORD WINAPI ConvertInterfaceIndexToLuid(NET_IFINDEX,NET_LUID*); DWORD WINAPI ConvertInterfaceLuidToGuid(const NET_LUID*,GUID*); -- 2.26.2

1 0