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

[PATCH 3/5] dxgi/tests: Test IDXGISwapChain_ResizeTarget() with all outputs.
by Zhiyi Zhang May 5, 2020

May 5, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 178 +++++++++++++++++++++++------------------ 1 file changed, 102 insertions(+), 76 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 325a0bf07a9..f04cd2be065 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2721,12 +2721,12 @@ static void test_windowed_resize_target(IDXGISwapChain *swapchain, HWND window, check_swapchain_fullscreen_state(swapchain, &expected_state); } - ret = MoveWindow(window, 0, 0, 0, 0, TRUE); - ok(ret, "Failed to move window.\n"); + ret = SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); GetWindowRect(window, &e->window_rect); GetClientRect(window, &e->client_rect); - ret = MoveWindow(window, 0, 0, 200, 200, TRUE); - ok(ret, "Failed to move window.\n"); + ret = SetWindowPos(window, 0, 0, 0, 200, 200, SWP_NOMOVE | SWP_NOZORDER); + ok(ret, "SetWindowPos failed, error %#x.\n", GetLastError()); memset(&mode, 0, sizeof(mode)); hr = IDXGISwapChain_ResizeTarget(swapchain, &mode); @@ -2809,10 +2809,13 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, static void test_resize_target(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state, expected_state; + unsigned int adapter_idx, output_idx, test_idx; DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_OUTPUT_DESC output_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - unsigned int i; + IDXGIAdapter *adapter; + IDXGIOutput *output; ULONG refcount; HRESULT hr; @@ -2856,85 +2859,108 @@ static void test_resize_target(IUnknown *device, BOOL is_d3d12) swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (adapter_idx = 0; SUCCEEDED(IDXGIFactory_EnumAdapters(factory, adapter_idx, &adapter)); + ++adapter_idx) { - swapchain_desc.Flags = tests[i].flags; - swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, - tests[i].origin.x, tests[i].origin.y, 400, 200, 0, 0, 0, 0); - if (tests[i].menu) + for (output_idx = 0; SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, output_idx, &output)); + ++output_idx) { - HMENU menu_bar = CreateMenu(); - HMENU menu = CreateMenu(); - AppendMenuA(menu_bar, MF_POPUP, (UINT_PTR)menu, "Menu"); - SetMenu(swapchain_desc.OutputWindow, menu_bar); - } + hr = IDXGIOutput_GetDesc(output, &output_desc); + ok(hr == S_OK, "Adapter %u output %u: GetDesc failed, hr %#x.\n", adapter_idx, + output_idx, hr); - memset(&initial_state, 0, sizeof(initial_state)); - capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); - - hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - - expected_state = initial_state; - if (tests[i].fullscreen) - { - expected_state.fullscreen = TRUE; - compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, - &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); - hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); - ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, - "GetContainingOutput failed, hr %#x.\n", hr); - if (hr == DXGI_ERROR_UNSUPPORTED) + for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) { - win_skip("GetContainingOutput() not supported.\n"); - IDXGISwapChain_Release(swapchain); + swapchain_desc.Flags = tests[test_idx].flags; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, + output_desc.DesktopCoordinates.left + tests[test_idx].origin.x, + output_desc.DesktopCoordinates.top + tests[test_idx].origin.y, + 400, 200, 0, 0, 0, 0); + if (tests[test_idx].menu) + { + HMENU menu_bar = CreateMenu(); + HMENU menu = CreateMenu(); + AppendMenuA(menu_bar, MF_POPUP, (UINT_PTR)menu, "Menu"); + SetMenu(swapchain_desc.OutputWindow, menu_bar); + } + + memset(&initial_state, 0, sizeof(initial_state)); + capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: CreateSwapChain failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + + expected_state = initial_state; + if (tests[test_idx].fullscreen) + { + expected_state.fullscreen = TRUE; + compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, + &swapchain_desc, &initial_state.fullscreen_state.monitor_rect, 800, 600, NULL); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &expected_state.target); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED) /* Win 7 testbot */, + "Adapter %u output %u test %u: GetContainingOutput failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + if (hr == DXGI_ERROR_UNSUPPORTED) + { + win_skip("Adapter %u output %u test %u: GetContainingOutput() not supported.\n", + adapter_idx, output_idx, test_idx); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, + "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Adapter %u output %u test %u: Could not change fullscreen state.\n", + adapter_idx, output_idx, test_idx); + IDXGIOutput_Release(expected_state.target); + IDXGISwapChain_Release(swapchain); + DestroyWindow(swapchain_desc.OutputWindow); + continue; + } + } + check_swapchain_fullscreen_state(swapchain, &expected_state); + + hr = IDXGISwapChain_ResizeTarget(swapchain, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Adapter %u output %u test %u: Got unexpected hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &expected_state); + + if (tests[test_idx].fullscreen) + { + test_fullscreen_resize_target(swapchain, &expected_state); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "Adapter %u output %u test %u: SetFullscreenState failed, hr %#x.\n", + adapter_idx, output_idx, test_idx, hr); + check_swapchain_fullscreen_state(swapchain, &initial_state); + IDXGIOutput_Release(expected_state.target); + check_swapchain_fullscreen_state(swapchain, &initial_state); + expected_state = initial_state; + } + else + { + test_windowed_resize_target(swapchain, swapchain_desc.OutputWindow, &expected_state); + + check_swapchain_fullscreen_state(swapchain, &expected_state); + } + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Adapter %u output %u test %u: IDXGISwapChain has %u references left.\n", + adapter_idx, output_idx, test_idx, refcount); + check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); - continue; - } - - 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"); - IDXGIOutput_Release(expected_state.target); - IDXGISwapChain_Release(swapchain); - DestroyWindow(swapchain_desc.OutputWindow); - continue; } + IDXGIOutput_Release(output); } - check_swapchain_fullscreen_state(swapchain, &expected_state); - - hr = IDXGISwapChain_ResizeTarget(swapchain, NULL); - ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &expected_state); - - if (tests[i].fullscreen) - { - test_fullscreen_resize_target(swapchain, &expected_state); - - hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); - ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); - check_swapchain_fullscreen_state(swapchain, &initial_state); - IDXGIOutput_Release(expected_state.target); - check_swapchain_fullscreen_state(swapchain, &initial_state); - expected_state = initial_state; - } - else - { - test_windowed_resize_target(swapchain, swapchain_desc.OutputWindow, &expected_state); - - check_swapchain_fullscreen_state(swapchain, &expected_state); - } - - refcount = IDXGISwapChain_Release(swapchain); - ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - check_window_fullscreen_state(swapchain_desc.OutputWindow, &expected_state.fullscreen_state); - DestroyWindow(swapchain_desc.OutputWindow); + IDXGIAdapter_Release(adapter); } - refcount = IDXGIFactory_Release(factory); ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } -- 2.25.1

2 1

[PATCH 2/5] dxgi/tests: Do not run test_multi_adapter() in parallel with other tests.
by Zhiyi Zhang May 5, 2020

May 5, 2020

test_multi_adapter() tests detaching non-primary outputs, interferencing other tests when non-primary outputs are enumerated. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 4ca0b952f8b..325a0bf07a9 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6505,7 +6505,6 @@ START_TEST(dxgi) queue_test(test_maximum_frame_latency); queue_test(test_output_desc); queue_test(test_object_wrapping); - queue_test(test_multi_adapter); queue_test(test_factory_check_feature_support); run_queued_tests(); @@ -6515,6 +6514,7 @@ START_TEST(dxgi) test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); + test_multi_adapter(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); -- 2.25.1

3 2

[PATCH 1/5] dxgi/tests: Fix a possible test failure on D3D12.
by Zhiyi Zhang May 5, 2020

May 5, 2020

Calling d3d12_swapchain_Present() right after switching to full screen mode may fail because the swapchain window may be in the animation of becoming full screen and vkQueuePresentKHR() returns VK_ERROR_OUT_OF_DATE_KHR, even after d3d12_swapchain_present() tried to recreate the swapchain. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 32aae2567f0..4ca0b952f8b 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -129,6 +129,24 @@ static void get_virtual_rect(RECT *rect) rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); } +/* try to make sure pending X events have been processed before continuing */ +static void flush_events(void) +{ + int diff = 200; + DWORD time; + MSG msg; + + time = GetTickCount() + diff; + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) + break; + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + diff = time - GetTickCount(); + } +} + #define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) @@ -4276,6 +4294,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) skip("Test %u: Could not change fullscreen state.\n", i); continue; } + flush_events(); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4427,6 +4446,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); + flush_events(); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); @@ -4903,24 +4923,6 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -/* try to make sure pending X events have been processed before continuing */ -static void flush_events(void) -{ - int diff = 200; - DWORD time; - MSG msg; - - time = GetTickCount() + diff; - while (diff > 0) - { - if (MsgWaitForMultipleObjects(0, NULL, FALSE, 100, QS_ALLINPUT) == WAIT_TIMEOUT) - break; - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) - DispatchMessageA(&msg); - diff = time - GetTickCount(); - } -} - struct adapter_info { const WCHAR *name; -- 2.25.1

2 1

[PATCH v2 1/3] ddraw/tests: Add more tests for EnumSurfaces().
by Zebediah Figura May 5, 2020

May 5, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 158 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 158 ++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 168 +++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 169 ++++++++++++++++++++++++++++++++++++-- 4 files changed, 636 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 4e27ecfb796..0e1de7909dd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12093,10 +12093,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw *ddraw; + DDSURFACEDESC modes[20]; + unsigned int mode_count; + IDirectDrawSurface *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface *surface; + + if (SUCCEEDED(IDirectDraw_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) { struct enum_surfaces_param *param = context; @@ -12119,18 +12139,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; IDirectDraw *ddraw; DDSURFACEDESC desc; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; hr = IDirectDraw_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -12150,6 +12206,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -12161,9 +12218,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7c25b2be557..8d38344520c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13069,10 +13069,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw2 *ddraw; + DDSURFACEDESC modes[20]; + unsigned int mode_count; + IDirectDrawSurface *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface *surface; + + if (SUCCEEDED(IDirectDraw2_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) { struct enum_surfaces_param *param = context; @@ -13095,18 +13115,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface *surface, DDSURFACEDES return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface *surface, DDSURFACEDESC *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; IDirectDraw2 *ddraw; DDSURFACEDESC desc; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw2_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = desc.ddpfPixelFormat; hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -13126,6 +13182,7 @@ static void test_enum_surfaces(void) ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); @@ -13137,9 +13194,106 @@ static void test_enum_surfaces(void) ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface_Release(param.surfaces[2]); IDirectDrawSurface_Release(param.surfaces[1]); IDirectDrawSurface_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw2_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw2_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface2_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + desc.ddpfPixelFormat.dwSize = sizeof(desc.ddpfPixelFormat); + desc.ddpfPixelFormat.dwFlags = DDPF_FOURCC; + desc.ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw2_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw2_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c38c0b3ce5a..3a3983639de 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15657,10 +15657,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw4 *ddraw; + DDSURFACEDESC2 modes[20]; + unsigned int mode_count; + IDirectDrawSurface4 *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface4 *surface; + + if (SUCCEEDED(IDirectDraw4_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface4_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) { struct enum_surfaces_param *param = context; @@ -15683,18 +15703,54 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface4 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface4 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC2 *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw4 *ddraw; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw4_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15704,30 +15760,128 @@ static void test_enum_surfaces(void) desc.dwWidth = 32; desc.dwHeight = 32; hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); - ok(SUCCEEDED(hr), "Failed to create a surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to create a surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface4_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface4_Release(param.surfaces[2]); IDirectDrawSurface4_Release(param.surfaces[1]); IDirectDrawSurface4_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw4_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw4_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface4_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw4_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw4_Release(ddraw); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index d3ea36e9808..bf31d3915b9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15060,10 +15060,30 @@ static void test_clear(void) struct enum_surfaces_param { + IDirectDraw7 *ddraw; + DDSURFACEDESC2 modes[20]; + unsigned int mode_count; + IDirectDrawSurface7 *surfaces[8]; unsigned int count; }; +static HRESULT CALLBACK build_mode_list_cb(DDSURFACEDESC2 *desc, void *context) +{ + struct enum_surfaces_param *param = context; + IDirectDrawSurface7 *surface; + + if (SUCCEEDED(IDirectDraw7_CreateSurface(param->ddraw, desc, &surface, NULL))) + { + if (param->mode_count < ARRAY_SIZE(param->modes)) + param->modes[param->mode_count] = *desc; + ++param->mode_count; + IDirectDrawSurface7_Release(surface); + } + + return DDENUMRET_OK; +} + static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) { struct enum_surfaces_param *param = context; @@ -15086,18 +15106,57 @@ static HRESULT WINAPI enum_surfaces_cb(IDirectDrawSurface7 *surface, DDSURFACEDE return DDENUMRET_OK; } +static HRESULT WINAPI enum_surfaces_create_cb(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) +{ + static const DWORD expect_flags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_PIXELFORMAT; + struct enum_surfaces_param *param = context; + + ok(!surface, "Unexpected surface %p.\n", surface); + ok((desc->dwFlags & expect_flags) == expect_flags, "Got unexpected flags %#x.\n", desc->dwFlags); + if (param->count < ARRAY_SIZE(param->modes)) + { + const DDSURFACEDESC2 *expect = &param->modes[param->count]; + ok(desc->dwWidth == expect->dwWidth, "Expected width %u, got %u.\n", expect->dwWidth, desc->dwWidth); + ok(desc->dwHeight == expect->dwHeight, "Expected height %u, got %u.\n", expect->dwHeight, desc->dwHeight); + ok(!memcmp(&U4(*desc).ddpfPixelFormat, &U4(*expect).ddpfPixelFormat, sizeof(U4(*desc).ddpfPixelFormat)), + "Pixel formats didn't match.\n"); + } + + ++param->count; + + return DDENUMRET_OK; +} + static void test_enum_surfaces(void) { - struct enum_surfaces_param param = {{0}}; + struct enum_surfaces_param param = {0}; + DDPIXELFORMAT current_format; DDSURFACEDESC2 desc; IDirectDraw7 *ddraw; HRESULT hr; ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + param.ddraw = ddraw; + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectDraw7_GetDisplayMode(ddraw, &desc); + ok(hr == DD_OK, "Failed to get display mode, hr %#x.\n", hr); + current_format = U4(desc).ddpfPixelFormat; hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); - ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to set cooperative level, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, NULL, NULL); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_ALL, NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + NULL, NULL, enum_surfaces_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); @@ -15114,27 +15173,125 @@ static void test_enum_surfaces(void) } hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[0], &desc.ddsCaps, &param.surfaces[1]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[1], &desc.ddsCaps, &param.surfaces[2]); - ok(SUCCEEDED(hr), "Failed to get attached surface, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to get attached surface, hr %#x.\n", hr); hr = IDirectDrawSurface7_GetAttachedSurface(param.surfaces[2], &desc.ddsCaps, &param.surfaces[3]); ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); ok(!param.surfaces[3], "Got unexpected pointer %p.\n", param.surfaces[3]); + param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, &desc, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); param.count = 0; hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, NULL, &param, enum_surfaces_cb); - ok(SUCCEEDED(hr), "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 2, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + desc.dwFlags = 0; + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST, &desc, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); ok(param.count == 3, "Got unexpected number of enumerated surfaces %u.\n", param.count); IDirectDrawSurface7_Release(param.surfaces[2]); IDirectDrawSurface7_Release(param.surfaces[1]); IDirectDrawSurface7_Release(param.surfaces[0]); + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_ALL, + NULL, &param, enum_surfaces_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwFlags = DDSD_CAPS; + desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_ALL, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_NOMATCH, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED, + &desc, &param, enum_surfaces_create_cb); + todo_wine ok(hr == DDERR_INVALIDPARAMS, "Failed to enumerate surfaces, hr %#x.\n", hr); + + /* When not passed width and height, the callback is called with every + * available display resolution. */ + + param.mode_count = 0; + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat = current_format; + hr = IDirectDraw7_EnumDisplayModes(ddraw, 0, &desc, &param, build_mode_list_cb); + ok(hr == DD_OK, "Failed to build mode list, hr %#x.\n", hr); + + param.count = 0; + desc.dwFlags &= ~DDSD_PIXELFORMAT; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == param.mode_count, "Expected %u surfaces, got %u.\n", param.mode_count, param.count); + + desc.dwFlags |= DDSD_WIDTH | DDSD_HEIGHT; + desc.dwWidth = desc.dwHeight = 32; + + param.modes[0].dwWidth = param.modes[0].dwHeight = 32; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + + hr = IDirectDraw7_CreateSurface(ddraw, &desc, &param.surfaces[0], NULL); + ok(hr == DD_OK, "Failed to create surface, hr %#x.\n", hr); + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_DOESEXIST | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + todo_wine ok(param.count == 1, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDrawSurface7_Release(param.surfaces[0]); + + desc.dwFlags |= DDSD_PIXELFORMAT; + U4(desc).ddpfPixelFormat.dwSize = sizeof(U4(desc).ddpfPixelFormat); + U4(desc).ddpfPixelFormat.dwFlags = DDPF_FOURCC; + U4(desc).ddpfPixelFormat.dwFourCC = 0xdeadbeef; + + param.count = 0; + hr = IDirectDraw7_EnumSurfaces(ddraw, DDENUMSURFACES_CANBECREATED | DDENUMSURFACES_MATCH, + &desc, &param, enum_surfaces_create_cb); + ok(hr == DD_OK, "Failed to enumerate surfaces, hr %#x.\n", hr); + ok(!param.count, "Got unexpected number of enumerated surfaces %u.\n", param.count); + IDirectDraw7_Release(ddraw); } -- 2.26.2

3 8

[PATCH 1/4] sechost: Implement I_ScRegisterDeviceNotification().
by Zebediah Figura May 5, 2020

May 5, 2020

Based on a patch by Micah N Gorrell. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Instead of implementing the interface in services.exe, I've elected to use a separate RPC interface hosted by plugplay.exe, for the following reasons: * device notifications don't have a lot to do with services; * the svcctl interface is already a (somewhat) documented interface which does not include any functions related to device notification; * it probably makes sense to move the BroadcastSystemMessage() call out of ntoskrnl and into the RPCserver [as in patch 0004], and services.exe can't import user32. dlls/sechost/Makefile.in | 1 + dlls/sechost/plugplay.idl | 2 + dlls/sechost/sechost.spec | 4 +- dlls/sechost/service.c | 148 +++++++++++++++++++++++++++++++++ include/wine/plugplay.idl | 32 +++++++ programs/plugplay/Makefile.in | 5 +- programs/plugplay/main.c | 130 +++++++++++++++++++++++++++++ programs/plugplay/plugplay.idl | 2 + 8 files changed, 321 insertions(+), 3 deletions(-) create mode 100644 dlls/sechost/plugplay.idl create mode 100644 include/wine/plugplay.idl create mode 100644 programs/plugplay/plugplay.idl diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index 91016c67577..f4d88272857 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -11,4 +11,5 @@ C_SRCS = \ trace.c IDL_SRCS = \ + plugplay.idl \ svcctl.idl diff --git a/dlls/sechost/plugplay.idl b/dlls/sechost/plugplay.idl new file mode 100644 index 00000000000..05e040388e4 --- /dev/null +++ b/dlls/sechost/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep client +#include "wine/plugplay.idl" diff --git a/dlls/sechost/sechost.spec b/dlls/sechost/sechost.spec index f21e2f1cda8..0867412c1cb 100644 --- a/dlls/sechost/sechost.spec +++ b/dlls/sechost/sechost.spec @@ -108,14 +108,14 @@ @ stub I_ScIsSecurityProcess @ stub I_ScPnPGetServiceName @ stub I_ScQueryServiceConfig -@ stub I_ScRegisterDeviceNotification +@ stdcall I_ScRegisterDeviceNotification(ptr ptr long) @ stub I_ScRegisterPreshutdownRestart @ stub I_ScReparseServiceDatabase @ stub I_ScRpcBindA @ stub I_ScRpcBindW @ stub I_ScSendPnPMessage @ stub I_ScSendTSMessage -@ stub I_ScUnregisterDeviceNotification +@ stdcall I_ScUnregisterDeviceNotification(ptr) @ stub I_ScValidatePnPService @ stub LocalGetConditionForString @ stub LocalGetReferencedTokenTypesForCondition diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 7a4211631e2..924a6c9264d 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -26,6 +26,8 @@ #include "winbase.h" #include "winsvc.h" #include "winternl.h" +#include "winuser.h" +#include "dbt.h" #include "wine/debug.h" #include "wine/exception.h" @@ -33,6 +35,7 @@ #include "wine/list.h" #include "svcctl.h" +#include "plugplay.h" WINE_DEFAULT_DEBUG_CHANNEL(service); @@ -1967,3 +1970,148 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceCtrlDispatcherW( const SERVICE_TABLE_E return service_run_main_thread(); } + +struct device_notification_details +{ + DWORD (CALLBACK *cb)(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header); + HANDLE handle; +}; + +static HANDLE device_notify_thread; +static struct list device_notify_list = LIST_INIT(device_notify_list); + +struct device_notify_registration +{ + struct list entry; + struct device_notification_details details; +}; + +static DWORD WINAPI device_notify_proc( void *arg ) +{ + WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; + WCHAR protseq[] = L"ncalrpc"; + RPC_WSTR binding_str; + DWORD err = ERROR_SUCCESS; + struct device_notify_registration *registration; + plugplay_rpc_handle handle = NULL; + DWORD code = 0; + unsigned int size; + BYTE *buf; + + if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) + { + ERR("RpcStringBindingCompose() failed, error %#x\n", err); + return err; + } + err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle ); + RpcStringFreeW( &binding_str ); + if (err) + { + ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); + return err; + } + + __TRY + { + handle = plugplay_register_listener(); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (!handle) + { + ERR("failed to open RPC handle, error %u\n", err); + return 1; + } + + for (;;) + { + buf = NULL; + __TRY + { + code = plugplay_get_event( handle, &buf, &size ); + err = ERROR_SUCCESS; + } + __EXCEPT(rpc_filter) + { + err = map_exception_code( GetExceptionCode() ); + } + __ENDTRY + + if (err) + { + ERR("failed to get event, error %u\n", err); + break; + } + + EnterCriticalSection( &service_cs ); + LIST_FOR_EACH_ENTRY(registration, &device_notify_list, struct device_notify_registration, entry) + { + registration->details.cb( registration->details.handle, code, (DEV_BROADCAST_HDR *)buf ); + } + LeaveCriticalSection(&service_cs); + MIDL_user_free(buf); + } + + __TRY + { + plugplay_unregister_listener( handle ); + } + __EXCEPT(rpc_filter) + { + } + __ENDTRY + + RpcBindingFree( &plugplay_binding_handle ); + return 0; +} + +/****************************************************************************** + * I_ScRegisterDeviceNotification (sechost.@) + */ +HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_details *details, + void *filter, DWORD flags ) +{ + struct device_notify_registration *registration; + + TRACE("callback %p, handle %p, filter %p, flags %#x\n", details->cb, details->handle, filter, flags); + + if (filter) FIXME("Notification filters are not yet implemented.\n"); + + if (!(registration = heap_alloc(sizeof(struct device_notify_registration)))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return NULL; + } + + registration->details = *details; + + EnterCriticalSection( &service_cs ); + list_add_tail( &device_notify_list, &registration->entry ); + + if (!device_notify_thread) + device_notify_thread = CreateThread( NULL, 0, device_notify_proc, NULL, 0, NULL ); + + LeaveCriticalSection( &service_cs ); + + return registration; +} + +/****************************************************************************** + * I_ScUnregisterDeviceNotification (sechost.@) + */ +BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ) +{ + struct device_notify_registration *registration = handle; + + TRACE("%p\n", handle); + + EnterCriticalSection( &service_cs ); + list_remove( &registration->entry ); + LeaveCriticalSection(&service_cs); + heap_free( registration ); + return TRUE; +} diff --git a/include/wine/plugplay.idl b/include/wine/plugplay.idl new file mode 100644 index 00000000000..7cc59191248 --- /dev/null +++ b/include/wine/plugplay.idl @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2020 Zebediah Figura 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 + */ + +import "wtypes.idl"; + +[ + uuid(57c680ac-7bce-4f39-97fd-ffea566754d5), + implicit_handle(handle_t plugplay_binding_handle) +] +interface plugplay +{ + typedef [context_handle] void *plugplay_rpc_handle; + + plugplay_rpc_handle plugplay_register_listener(); + DWORD plugplay_get_event([in] plugplay_rpc_handle handle, [out, size_is(,*size)] BYTE **data, [out] unsigned int *size); + void plugplay_unregister_listener([in] plugplay_rpc_handle handle); +} diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in index e5d37e66f1d..1bc2aa505ab 100644 --- a/programs/plugplay/Makefile.in +++ b/programs/plugplay/Makefile.in @@ -1,7 +1,10 @@ MODULE = plugplay.exe -IMPORTS = advapi32 +IMPORTS = advapi32 rpcrt4 EXTRADLLFLAGS = -mconsole -municode -mno-cygwin C_SRCS = \ main.c + +IDL_SRCS = \ + plugplay.idl diff --git a/programs/plugplay/main.c b/programs/plugplay/main.c index 73bf46d6f99..59561dca503 100644 --- a/programs/plugplay/main.c +++ b/programs/plugplay/main.c @@ -21,6 +21,8 @@ #include <windows.h> #include "winsvc.h" #include "wine/debug.h" +#include "wine/list.h" +#include "plugplay.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -29,6 +31,111 @@ static WCHAR plugplayW[] = {'P','l','u','g','P','l','a','y',0}; static SERVICE_STATUS_HANDLE service_handle; static HANDLE stop_event; +void __RPC_FAR * __RPC_USER MIDL_user_allocate( SIZE_T len ) +{ + return malloc( len ); +} + +void __RPC_USER MIDL_user_free( void __RPC_FAR *ptr ) +{ + free( ptr ); +} + +static CRITICAL_SECTION plugplay_cs; +static CRITICAL_SECTION_DEBUG plugplay_cs_debug = +{ + 0, 0, &plugplay_cs, + { &plugplay_cs_debug.ProcessLocksList, &plugplay_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": plugplay_cs") } +}; +static CRITICAL_SECTION plugplay_cs = { &plugplay_cs_debug, -1, 0, 0, 0, 0 }; + +static struct list listener_list = LIST_INIT(listener_list); + +struct listener +{ + struct list entry; + struct list events; + CONDITION_VARIABLE cv; +}; + +struct event +{ + struct list entry; + DWORD code; + BYTE *data; + unsigned int size; +}; + + +static void destroy_listener( struct listener *listener ) +{ + struct event *event, *next; + + EnterCriticalSection( &plugplay_cs ); + list_remove( &listener->entry ); + LeaveCriticalSection( &plugplay_cs ); + + LIST_FOR_EACH_ENTRY_SAFE(event, next, &listener->events, struct event, entry) + { + MIDL_user_free( event->data ); + list_remove( &event->entry ); + free( event ); + } + free( listener ); +} + +void __RPC_USER plugplay_rpc_handle_rundown( plugplay_rpc_handle handle ) +{ + destroy_listener( handle ); +} + +plugplay_rpc_handle __cdecl plugplay_register_listener(void) +{ + struct listener *listener; + + if (!(listener = calloc( 1, sizeof(*listener) ))) + return NULL; + + list_init( &listener->events ); + InitializeConditionVariable( &listener->cv ); + + EnterCriticalSection( &plugplay_cs ); + list_add_tail( &listener_list, &listener->entry ); + LeaveCriticalSection( &plugplay_cs ); + + return listener; +} + +DWORD __cdecl plugplay_get_event( plugplay_rpc_handle handle, BYTE **data, unsigned int *size ) +{ + struct listener *listener = handle; + struct event *event; + struct list *entry; + DWORD ret; + + EnterCriticalSection( &plugplay_cs ); + + while (!(entry = list_head( &listener->events ))) + SleepConditionVariableCS( &listener->cv, &plugplay_cs, INFINITE ); + + event = LIST_ENTRY(entry, struct event, entry); + list_remove( &event->entry ); + + LeaveCriticalSection( &plugplay_cs ); + + ret = event->code; + *data = event->data; + *size = event->size; + free( event ); + return ret; +} + +void __cdecl plugplay_unregister_listener( plugplay_rpc_handle handle ) +{ + destroy_listener( handle ); +} + static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context ) { SERVICE_STATUS status; @@ -60,10 +167,29 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) { + unsigned char endpoint[] = "\\pipe\\wine_plugplay"; + unsigned char protseq[] = "ncalrpc"; SERVICE_STATUS status; + RPC_STATUS err; WINE_TRACE( "starting service\n" ); + if ((err = RpcServerUseProtseqEpA( protseq, 0, endpoint, NULL ))) + { + ERR("RpcServerUseProtseqEp() failed, error %u\n", err); + return; + } + if ((err = RpcServerRegisterIf( plugplay_v0_0_s_ifspec, NULL, NULL ))) + { + ERR("RpcServerRegisterIf() failed, error %u\n", err); + return; + } + if ((err = RpcServerListen( 1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE ))) + { + ERR("RpcServerListen() failed, error %u\n", err); + return; + } + stop_event = CreateEventW( NULL, TRUE, FALSE, NULL ); service_handle = RegisterServiceCtrlHandlerExW( plugplayW, service_handler, NULL ); @@ -81,6 +207,10 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv ) WaitForSingleObject( stop_event, INFINITE ); + RpcMgmtStopServerListening( NULL ); + RpcServerUnregisterIf( plugplay_v0_0_s_ifspec, NULL, TRUE ); + RpcMgmtWaitServerListen(); + status.dwCurrentState = SERVICE_STOPPED; status.dwControlsAccepted = 0; SetServiceStatus( service_handle, &status ); diff --git a/programs/plugplay/plugplay.idl b/programs/plugplay/plugplay.idl new file mode 100644 index 00000000000..0cb8884c2df --- /dev/null +++ b/programs/plugplay/plugplay.idl @@ -0,0 +1,2 @@ +#pragma makedep server +#include "wine/plugplay.idl" -- 2.26.2

1 3

[PATCH 7/7] configure: Explicitly specify subsystem when using msvc target.
by Jacek Caban May 5, 2020

May 5, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

2 1

[PATCH v2 2/2] msasn1: Implement ASN1_CloseModule function
by Vijay Kiran Kamuju May 5, 2020

May 5, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/2] msasn1: Implement ASN1_CreateModule function
by Vijay Kiran Kamuju May 5, 2020

May 5, 2020

[Based on patch from Austin English Wine-Bug: https:/bugs.winehq.org/show_bug.cgi?id=38020 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2] mf: Add missing ::Release of clock timer.
by Derek Lesho May 5, 2020

May 5, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- v2: Release the original reference upon removal from list instead. --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 75ef600a4df..d6b881218bf 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -4289,6 +4289,7 @@ static HRESULT WINAPI present_clock_timer_callback_Invoke(IMFAsyncCallback *ifac EnterCriticalSection(&clock->cs); list_remove(&timer->entry); + IUnknown_Release(&timer->IUnknown_iface); LeaveCriticalSection(&clock->cs); IMFAsyncCallback_Invoke(timer->callback, timer->result); -- 2.26.2

2 1

[PATCH RFC] winedbg: Allow attaching to process by name.
by Derek Lesho May 5, 2020

May 5, 2020

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- I've found this useful for situations where you can't use winedbg to launch the app (steam games), and the apps fail too quickly for you to manually retrieve their PID. --- programs/winedbg/dbg.y | 1 + programs/winedbg/debugger.h | 1 + programs/winedbg/winedbg.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index ac76b5baf8a..205ea167b67 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -138,6 +138,7 @@ command: | tSYMBOLFILE pathname expr_rvalue { symbol_read_symtable($2, $3); } | tWHATIS expr_lvalue { dbg_printf("type = "); types_print_type(&$2.type, FALSE); dbg_printf("\n"); } | tATTACH tNUM { dbg_attach_debuggee($2); dbg_active_wait_for_first_exception(); } + | tATTACH tSTRING { dbg_attach_debuggee(dbg_find_process($2)); dbg_active_wait_for_first_exception(); } | tDETACH { dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE); } | tTHREAD tNUM { dbg_set_curr_thread($2); } | tKILL { dbg_curr_process->process_io->close_process(dbg_curr_process, TRUE); } diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index ddac129bab5..754e7d5b22f 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -473,6 +473,7 @@ extern void dbg_set_process_name(struct dbg_process* p, const WCHAR* extern struct dbg_process* dbg_get_process(DWORD pid); extern struct dbg_process* dbg_get_process_h(HANDLE handle); extern void dbg_del_process(struct dbg_process* p); +extern DWORD dbg_find_process(const char *filename); struct dbg_thread* dbg_add_thread(struct dbg_process* p, DWORD tid, HANDLE h, void* teb); extern struct dbg_thread* dbg_get_thread(struct dbg_process* p, DWORD tid); extern void dbg_del_thread(struct dbg_thread* t); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 19f30f04e5d..27ce57607a0 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -25,6 +25,7 @@ #include <string.h> #include "debugger.h" +#include "tlhelp32.h" #include "winternl.h" #include "wine/exception.h" #include "wine/library.h" @@ -377,6 +378,42 @@ void dbg_del_process(struct dbg_process* p) HeapFree(GetProcessHeap(), 0, p); } +DWORD dbg_find_process(const char *search) +{ + HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + const char *process_name; + PROCESSENTRY32 cur_proc; + DWORD ret = -1; + + if (snap == INVALID_HANDLE_VALUE) + return ret; + + cur_proc.dwSize = sizeof(cur_proc); + if (!(Process32First(snap, &cur_proc))) + goto done; + + do + { + if (cur_proc.th32ProcessID == GetCurrentProcessId()) + continue; + + if (!(strcasecmp(search, cur_proc.szExeFile))) + { + ret = cur_proc.th32ProcessID; + break; + } + + cur_proc.dwSize = sizeof(cur_proc); + } + while ((Process32Next(snap, &cur_proc))); + + done: + if (ret == -1) + dbg_printf("Could not find running process with name \"%s\"\n", search); + CloseHandle(snap); + return ret; +} + /****************************************************************** * dbg_init * -- 2.26.2

1 0