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

[PATCH 6/8] dxgi/tests: Test display mode restoration.
by Zhiyi Zhang Oct. 28, 2020

Oct. 28, 2020

Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 427 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 43c4247dc2a..4d9677b3762 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -134,6 +134,77 @@ static void get_virtual_rect(RECT *rect) rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); } +static BOOL equal_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +{ + return mode1->dmPosition.x == mode2->dmPosition.x + && mode1->dmPosition.y == mode2->dmPosition.y + && mode1->dmPelsWidth == mode2->dmPelsWidth + && mode1->dmPelsHeight == mode2->dmPelsHeight; +} + +/* Free original_modes after finished using it */ +static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_count) +{ + unsigned int number, size = 2, count = 0, index = 0; + DISPLAY_DEVICEW display_device; + DEVMODEW *modes, *tmp; + + if (!(modes = heap_alloc(size * sizeof(*modes)))) + return FALSE; + + display_device.cb = sizeof(display_device); + while (EnumDisplayDevicesW(NULL, index++, &display_device, 0)) + { + /* Skip software devices */ + if (swscanf(display_device.DeviceName, L"\\\\.\\DISPLAY%u", &number) != 1) + continue; + + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + if (count >= size) + { + size *= 2; + if (!(tmp = heap_realloc(modes, size * sizeof(*modes)))) + { + heap_free(modes); + return FALSE; + } + modes = tmp; + } + + memset(&modes[count], 0, sizeof(modes[count])); + modes[count].dmSize = sizeof(modes[count]); + if (!EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) + { + heap_free(modes); + return FALSE; + } + + lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + } + + *original_modes = modes; + *display_count = count; + return TRUE; +} + +static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +{ + unsigned int index; + LONG ret; + + for (index = 0; index < count; ++index) + { + ret = ChangeDisplaySettingsExW(modes[index].dmDeviceName, &modes[index], NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + return FALSE; + } + ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + return ret == DISP_CHANGE_SUCCESSFUL; +} + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -6897,6 +6968,360 @@ static void test_colour_space_support(IUnknown *device, BOOL is_d3d12) ok(ref_count == !is_d3d12, "Factory has %u references left.\n", ref_count); } +static void test_mode_change(IUnknown *device, BOOL is_d3d12) +{ + unsigned int user32_width = 0, user32_height = 0, d3d_width = 0, d3d_height = 0; + unsigned int display_count = 0, mode_idx = 0, adapter_idx, output_idx; + DEVMODEW *original_modes = NULL, old_devmode, devmode, devmode2; + DXGI_SWAP_CHAIN_DESC swapchain_desc, swapchain_desc2; + IDXGIOutput *output, *second_output = NULL; + WCHAR second_monitor_name[CCHDEVICENAME]; + IDXGISwapChain *swapchain, *swapchain2; + DXGI_OUTPUT_DESC output_desc; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + BOOL fullscreen, ret; + LONG change_ret; + ULONG refcount; + HRESULT hr; + + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode, &registry_mode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode, &registry_mode), "Got a different mode.\n"); + + while (EnumDisplaySettingsW(NULL, mode_idx++, &devmode)) + { + if (devmode.dmPelsWidth == registry_mode.dmPelsWidth + && devmode.dmPelsHeight == registry_mode.dmPelsHeight) + continue; + + if (!d3d_width && !d3d_height) + { + d3d_width = devmode.dmPelsWidth; + d3d_height = devmode.dmPelsHeight; + continue; + } + + if (devmode.dmPelsWidth == d3d_width && devmode.dmPelsHeight == d3d_height) + continue; + + user32_width = devmode.dmPelsWidth; + user32_height = devmode.dmPelsHeight; + break; + } + if (!user32_width || !user32_height) + { + skip("Failed to find three different display modes for the primary output.\n"); + return; + } + + ret = save_display_modes(&original_modes, &display_count); + ok(ret, "Failed to save original display modes.\n"); + + get_factory(device, is_d3d12, &factory); + + /* Test that no mode restorations if no mode changes actually happened */ + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + + swapchain_desc.BufferDesc.Width = registry_mode.dmPelsWidth; + swapchain_desc.BufferDesc.Height = registry_mode.dmPelsHeight; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 1; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH; + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + + memset(&devmode2, 0, sizeof(devmode2)); + devmode2.dmSize = sizeof(devmode2); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &registry_mode), "Got a different mode.\n"); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* If current display settings are different than the display settings in registry before + * calling SetFullscreenState() */ + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == DXGI_ERROR_UNSUPPORTED /* Win7 */ + || hr == S_OK /* Win8~Win10 1909 */ + || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, /* Win10 2004 */ + "Got unexpected hr %#x.\n", hr); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations use display settings in the registry with a fullscreen device */ + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + goto done; + } + + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + 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: Got unexpected hr %#x.\n", adapter_idx, output_idx, hr); + + if ((adapter_idx || output_idx) && output_desc.AttachedToDesktop) + { + second_output = output; + break; + } + + IDXGIOutput_Release(output); + } + + IDXGIAdapter_Release(adapter); + if (second_output) + break; + } + + if (!second_output) + { + skip("Following tests require two monitors.\n"); + goto done; + } + lstrcpyW(second_monitor_name, output_desc.DeviceName); + + memset(&old_devmode, 0, sizeof(old_devmode)); + old_devmode.dmSize = sizeof(old_devmode); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + mode_idx = 0; + d3d_width = 0; + d3d_height = 0; + user32_width = 0; + user32_height = 0; + while (EnumDisplaySettingsW(second_monitor_name, mode_idx++, &devmode)) + { + if (devmode.dmPelsWidth == old_devmode.dmPelsWidth + && devmode.dmPelsHeight == old_devmode.dmPelsHeight) + continue; + + if (!d3d_width && !d3d_height) + { + d3d_width = devmode.dmPelsWidth; + d3d_height = devmode.dmPelsHeight; + continue; + } + + if (devmode.dmPelsWidth == d3d_width && devmode.dmPelsHeight == d3d_height) + continue; + + user32_width = devmode.dmPelsWidth; + user32_height = devmode.dmPelsHeight; + break; + } + if (!user32_width || !user32_height) + { + skip("Failed to find three different display modes for the second output.\n"); + goto done; + } + + /* Test that mode restorations for non-primary outputs upon fullscreen state changes */ + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + if (devmode2.dmPelsWidth == old_devmode.dmPelsWidth + && devmode2.dmPelsHeight == old_devmode.dmPelsHeight) + { + skip("Failed to change display settings of the second monitor.\n"); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + goto done; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDXGIOutput_GetDesc(second_output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == + old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth, + output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); + todo_wine ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == + old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight, + output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations for non-primary outputs use display settings in the registry */ + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + devmode2.dmPelsWidth, devmode2.dmPelsHeight); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + devmode2.dmPelsWidth, devmode2.dmPelsHeight); + hr = IDXGIOutput_GetDesc(second_output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + todo_wine ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == + devmode.dmPelsWidth, "Expected width %u, got %u.\n", devmode.dmPelsWidth, + output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); + todo_wine ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == + devmode.dmPelsHeight, "Expected height %u, got %u.\n", devmode.dmPelsHeight, + output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations for non-primary outputs on fullscreen state changes when there + * are two fullscreen swapchains on different outputs */ + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + + swapchain_desc2 = swapchain_desc; + swapchain_desc.BufferDesc.Width = d3d_width; + swapchain_desc.BufferDesc.Height = d3d_height; + swapchain_desc2.OutputWindow = CreateWindowA("static", "dxgi_test2", 0, + old_devmode.dmPosition.x, old_devmode.dmPosition.y, 400, 200, 0, 0, 0, 0); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc2, &swapchain2); + ok(hr == S_OK, "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain2, TRUE, NULL); + if (FAILED(hr)) + { + skip("SetFullscreenState failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain2); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + goto done; + } + + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(!fullscreen, "Expected swapchain not fullscreen.\n"); + hr = IDXGISwapChain_GetFullscreenState(swapchain2, &fullscreen, NULL); + ok(hr == S_OK, "GetFullscreenState failed, hr %#x.\n", hr); + ok(fullscreen, "Expected swapchain fullscreen.\n"); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDXGIOutput_GetDesc(second_output, &output_desc); + ok(hr == S_OK, "GetDesc failed, hr %#x.\n", hr); + ok(output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left == + old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", old_devmode.dmPelsWidth, + output_desc.DesktopCoordinates.right - output_desc.DesktopCoordinates.left); + ok(output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top == + old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", old_devmode.dmPelsHeight, + output_desc.DesktopCoordinates.bottom - output_desc.DesktopCoordinates.top); + + hr = IDXGISwapChain_SetFullscreenState(swapchain2, FALSE, NULL); + ok(hr == S_OK, "SetFullscreenState failed, hr %#x.\n", hr); + refcount = IDXGISwapChain_Release(swapchain2); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + DestroyWindow(swapchain_desc2.OutputWindow); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + +done: + if (second_output) + IDXGIOutput_Release(second_output); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + heap_free(original_modes); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7013,6 +7438,7 @@ START_TEST(dxgi) run_on_d3d10(test_get_containing_output); run_on_d3d10(test_window_association); run_on_d3d10(test_default_fullscreen_target_output); + run_on_d3d10(test_mode_change); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7042,6 +7468,7 @@ START_TEST(dxgi) run_on_d3d12(test_get_containing_output); run_on_d3d12(test_window_association); run_on_d3d12(test_default_fullscreen_target_output); + run_on_d3d12(test_mode_change); FreeLibrary(d3d12_module); } -- 2.27.0

1 0

[PATCH 5/8] d3d9/tests: Test display mode restoration.
by Zhiyi Zhang Oct. 28, 2020

Oct. 28, 2020

Mostly to test that when doing mode restoration, all display outputs get restored to their display settings in the registry, not just one output gets restored. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 385 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 373 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0f0de5e3382..d7b71152b03 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -159,6 +159,14 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +static BOOL equal_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +{ + return mode1->dmPosition.x == mode2->dmPosition.x + && mode1->dmPosition.y == mode2->dmPosition.y + && mode1->dmPelsWidth == mode2->dmPelsWidth + && mode1->dmPelsHeight == mode2->dmPelsHeight; +} + /* Free original_modes after finished using it */ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_count) { @@ -5267,21 +5275,34 @@ done: static void test_mode_change(void) { + DEVMODEW old_devmode, devmode, devmode2, *original_modes = NULL; + struct device_desc device_desc, device_desc2; + WCHAR second_monitor_name[CCHDEVICENAME]; + IDirect3DDevice9 *device, *device2; + unsigned int display_count = 0; RECT d3d_rect, focus_rect, r; - struct device_desc device_desc; IDirect3DSurface9 *backbuffer; - IDirect3DDevice9 *device; + MONITORINFOEXW monitor_info; + HMONITOR second_monitor; D3DSURFACE_DESC desc; IDirect3D9 *d3d9; - DEVMODEW devmode; ULONG refcount; UINT adapter_mode_count, i; HRESULT hr; - DWORD ret; + BOOL ret; LONG change_ret; D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; + memset(&devmode, 0, sizeof(devmode)); + devmode.dmSize = sizeof(devmode); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode, &registry_mode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode, &registry_mode), "Got a different mode.\n"); + d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); @@ -5334,6 +5355,9 @@ static void test_mode_change(void) return; } + ret = save_display_modes(&original_modes, &display_count); + ok(ret, "Failed to save original display modes.\n"); + memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; @@ -5358,8 +5382,6 @@ static void test_mode_change(void) if (!(device = create_device(d3d9, focus_window, &device_desc))) { skip("Failed to create a D3D device, skipping tests.\n"); - change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#x.\n", change_ret); goto done; } @@ -5411,8 +5433,13 @@ static void test_mode_change(void) device_desc.width = registry_mode.dmPelsWidth; device_desc.height = registry_mode.dmPelsHeight; device_desc.flags = CREATE_DEVICE_FULLSCREEN; - ok(!!(device = create_device(d3d9, focus_window, &device_desc)), "Failed to create a D3D device.\n"); + if (!(device = create_device(d3d9, focus_window, &device_desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = user32_width; devmode.dmPelsHeight = user32_height; change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); @@ -5421,17 +5448,351 @@ static void test_mode_change(void) refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + memset(&devmode2, 0, sizeof(devmode2)); + devmode2.dmSize = sizeof(devmode2); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); ok(ret, "Failed to get display mode.\n"); - ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth - && devmode.dmPelsHeight == registry_mode.dmPelsHeight, - "Expected resolution %ux%u, got %ux%u.\n", - registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, devmode.dmPelsWidth, devmode.dmPelsHeight); + ok(devmode2.dmPelsWidth == registry_mode.dmPelsWidth + && devmode2.dmPelsHeight == registry_mode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", registry_mode.dmPelsWidth, + registry_mode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that no mode restorations if no mode changes happened */ + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; + device_desc.device_window = device_window; + device_desc.width = d3d_width; + device_desc.height = d3d_height; + device_desc.flags = 0; + device = create_device(d3d9, device_window, &device_desc); + ok(!!device, "Failed to create a D3D device.\n"); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &registry_mode), "Got a different mode.\n"); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations use display settings in the registry with a fullscreen device */ + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; + device_desc.device_window = device_window; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d9, device_window, &device_desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations use display settings in the registry with a fullscreen device + * having the same display mode and then reset to a different mode */ + change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %d.\n", change_ret); + + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; + device_desc.device_window = device_window; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d9, device_window, &device_desc))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + device_desc.width = d3d_width; + device_desc.height = d3d_height; + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(devmode2.dmPelsWidth == d3d_width && devmode2.dmPelsHeight == d3d_height, + "Expected resolution %ux%u, got %ux%u.\n", d3d_width, d3d_height, + devmode2.dmPelsWidth, devmode2.dmPelsHeight); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + if (IDirect3D9_GetAdapterCount(d3d9) < 2) + { + skip("Following tests require two adapters.\n"); + goto done; + } + + second_monitor = IDirect3D9_GetAdapterMonitor(d3d9, 1); + monitor_info.cbSize = sizeof(monitor_info); + ret = GetMonitorInfoW(second_monitor, (MONITORINFO *)&monitor_info); + ok(ret, "GetMonitorInfoW failed, error %#x.\n", GetLastError()); + lstrcpyW(second_monitor_name, monitor_info.szDevice); + + memset(&old_devmode, 0, sizeof(old_devmode)); + old_devmode.dmSize = sizeof(old_devmode); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + + i = 0; + d3d_width = 0; + d3d_height = 0; + user32_width = 0; + user32_height = 0; + while (EnumDisplaySettingsW(second_monitor_name, i++, &devmode)) + { + if (devmode.dmPelsWidth == old_devmode.dmPelsWidth + && devmode.dmPelsHeight == old_devmode.dmPelsHeight) + continue; + + if (!d3d_width && !d3d_height) + { + d3d_width = devmode.dmPelsWidth; + d3d_height = devmode.dmPelsHeight; + continue; + } + + if (devmode.dmPelsWidth == d3d_width && devmode.dmPelsHeight == d3d_height) + continue; + + user32_width = devmode.dmPelsWidth; + user32_height = devmode.dmPelsHeight; + break; + } + if (!user32_width || !user32_height) + { + skip("Failed to find three different display modes for the second monitor.\n"); + goto done; + } + + /* Test that mode restorations also happen for non-primary monitors on device resets */ + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; + device_desc.device_window = device_window; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d9, device_window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + if (devmode2.dmPelsWidth == old_devmode.dmPelsWidth + && devmode2.dmPelsHeight == old_devmode.dmPelsHeight) + { + skip("Failed to change display settings of the second monitor.\n"); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + goto done; + } + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, 1, &d3ddm); + ok(hr == S_OK, "GetAdapterDisplayMode failed, hr %#x.\n", hr); + todo_wine ok(d3ddm.Width == old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", + old_devmode.dmPelsWidth, d3ddm.Width); + todo_wine ok(d3ddm.Height == old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", + old_devmode.dmPelsHeight, d3ddm.Height); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations happen for non-primary monitors on device releases */ + device_desc.adapter_ordinal = D3DADAPTER_DEFAULT; + device_desc.device_window = device_window; + device_desc.width = registry_mode.dmPelsWidth; + device_desc.height = registry_mode.dmPelsHeight; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d9, device_window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, 1, &d3ddm); + ok(hr == S_OK, "GetAdapterDisplayMode failed, hr %#x.\n", hr); + todo_wine ok(d3ddm.Width == old_devmode.dmPelsWidth, "Expected width %u, got %u.\n", + old_devmode.dmPelsWidth, d3ddm.Width); + todo_wine ok(d3ddm.Height == old_devmode.dmPelsHeight, "Expected height %u, got %u.\n", + old_devmode.dmPelsHeight, d3ddm.Height); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test that mode restorations for non-primary monitors use display settings in the registry */ + if (!(device = create_device(d3d9, device_window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + devmode2.dmPelsWidth, devmode2.dmPelsHeight); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + devmode2.dmPelsWidth, devmode2.dmPelsHeight); + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, 1, &d3ddm); + ok(hr == S_OK, "GetAdapterDisplayMode failed, hr %#x.\n", hr); + todo_wine ok(d3ddm.Width == devmode.dmPelsWidth && d3ddm.Height == devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, + d3ddm.Width, d3ddm.Height); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test mode restorations when there are two fullscreen devices and one of them got reset */ + if (!(device = create_device(d3d9, focus_window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + device_desc2.adapter_ordinal = 1; + device_desc2.device_window = device_window; + device_desc2.width = d3d_width; + device_desc2.height = d3d_height; + device_desc2.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device2 = create_device(d3d9, focus_window, &device_desc2))) + { + skip("Failed to create a D3D device.\n"); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + goto done; + } + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + + device_desc.flags = 0; + hr = reset_device(device, &device_desc); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, 1, &d3ddm); + ok(hr == S_OK, "GetAdapterDisplayMode failed, hr %#x.\n", hr); + todo_wine ok(d3ddm.Width == old_devmode.dmPelsWidth && d3ddm.Height == old_devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", old_devmode.dmPelsWidth, + old_devmode.dmPelsHeight, d3ddm.Width, d3ddm.Height); + + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + + /* Test mode restoration when there are two fullscreen devices and one of them got released */ + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + if (!(device = create_device(d3d9, focus_window, &device_desc))) + { + skip("Failed to create a D3D device.\n"); + goto done; + } + + if (!(device2 = create_device(d3d9, focus_window, &device_desc2))) + { + skip("Failed to create a D3D device.\n"); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + goto done; + } + + change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %d.\n", change_ret); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + todo_wine ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsW failed, error %#x.\n", GetLastError()); + ok(equal_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); + hr = IDirect3D9_GetAdapterDisplayMode(d3d9, 1, &d3ddm); + ok(hr == S_OK, "GetAdapterDisplayMode failed, hr %#x.\n", hr); + todo_wine ok(d3ddm.Width == old_devmode.dmPelsWidth && d3ddm.Height == old_devmode.dmPelsHeight, + "Expected resolution %ux%u, got %ux%u.\n", old_devmode.dmPelsWidth, + old_devmode.dmPelsHeight, d3ddm.Width, d3ddm.Height); + + refcount = IDirect3DDevice9_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); done: DestroyWindow(device_window); DestroyWindow(focus_window); IDirect3D9_Release(d3d9); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + heap_free(original_modes); } static void test_device_window_reset(void) -- 2.27.0

1 0

[PATCH 2/8] d3d9/tests: Restore display modes at the end of test_wndproc().
by Zhiyi Zhang Oct. 28, 2020

Oct. 28, 2020

test_wndproc() makes a series of ChangeDisplaySettings() calls that could make the current display mode no longer match the registry display mode. Restore display modes at the end of test_wndproc() so that other tests are not affected. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 73 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 53a83ad887b..0f0de5e3382 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -25,6 +25,7 @@ #define COBJMACROS #include <d3d9.h> #include "utils.h" +#include "wine/heap.h" struct vec3 { @@ -158,6 +159,69 @@ static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) return !strcmp(identifier->Driver, "d3d10warp.dll"); } +/* Free original_modes after finished using it */ +static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_count) +{ + unsigned int number, size = 2, count = 0, index = 0; + DISPLAY_DEVICEW display_device; + DEVMODEW *modes, *tmp; + + if (!(modes = heap_alloc(size * sizeof(*modes)))) + return FALSE; + + display_device.cb = sizeof(display_device); + while (EnumDisplayDevicesW(NULL, index++, &display_device, 0)) + { + /* Skip software devices */ + if (swscanf(display_device.DeviceName, L"\\\\.\\DISPLAY%u", &number) != 1) + continue; + + if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + continue; + + if (count >= size) + { + size *= 2; + if (!(tmp = heap_realloc(modes, size * sizeof(*modes)))) + { + heap_free(modes); + return FALSE; + } + modes = tmp; + } + + memset(&modes[count], 0, sizeof(modes[count])); + modes[count].dmSize = sizeof(modes[count]); + if (!EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) + { + heap_free(modes); + return FALSE; + } + + lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + } + + *original_modes = modes; + *display_count = count; + return TRUE; +} + +static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +{ + unsigned int index; + LONG ret; + + for (index = 0; index < count; ++index) + { + ret = ChangeDisplaySettingsExW(modes[index].dmDeviceName, &modes[index], NULL, + CDS_UPDATEREGISTRY | CDS_NORESET, NULL); + if (ret != DISP_CHANGE_SUCCESSFUL) + return FALSE; + } + ret = ChangeDisplaySettingsExW(NULL, NULL, NULL, 0, NULL); + return ret == DISP_CHANGE_SUCCESSFUL; +} + static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -3758,6 +3822,8 @@ static DWORD WINAPI wndproc_thread(void *param) static void test_wndproc(void) { struct wndproc_thread_param thread_params; + DEVMODEW devmode, *original_modes = NULL; + unsigned int display_count = 0; struct device_desc device_desc; static WINDOWPOS windowpos; IDirect3DDevice9 *device; @@ -3772,7 +3838,6 @@ static void test_wndproc(void) HRESULT hr; D3DDISPLAYMODE d3ddm; DWORD d3d_width = 0, d3d_height = 0, user32_width = 0, user32_height = 0; - DEVMODEW devmode; LONG change_ret, device_style; BOOL ret; @@ -3997,6 +4062,9 @@ static void test_wndproc(void) return; } + ret = save_display_modes(&original_modes, &display_count); + ok(ret, "Failed to save original display modes.\n"); + filter_messages = NULL; expect_messages = NULL; @@ -4435,6 +4503,9 @@ done: CloseHandle(thread_params.test_finished); CloseHandle(thread_params.window_created); UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); + ret = restore_display_modes(original_modes, display_count); + ok(ret, "Failed to restore display modes.\n"); + heap_free(original_modes); } static void test_wndproc_windowed(void) -- 2.27.0

1 0

[PATCH 1/3] wow64cpu: Add stub dll.
by Zebediah Figura Oct. 28, 2020

Oct. 28, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- configure | 2 ++ configure.ac | 1 + dlls/wow64cpu/Makefile.in | 7 +++++++ dlls/wow64cpu/wow64cpu.spec | 25 +++++++++++++++++++++++++ dlls/wow64cpu/wow64cpu_main.c | 27 +++++++++++++++++++++++++++ 5 files changed, 62 insertions(+) create mode 100644 dlls/wow64cpu/Makefile.in create mode 100644 dlls/wow64cpu/wow64cpu.spec create mode 100644 dlls/wow64cpu/wow64cpu_main.c diff --git a/configure b/configure index ac6a7985cc7..8bff0297bef 100755 --- a/configure +++ b/configure @@ -1692,6 +1692,7 @@ enable_wmp enable_wmphoto enable_wmvcore enable_wnaspi32 +enable_wow64cpu enable_wpc enable_wpcap enable_ws2_32 @@ -21142,6 +21143,7 @@ wine_fn_config_makefile dlls/wmvcore enable_wmvcore wine_fn_config_makefile dlls/wmvcore/tests enable_tests wine_fn_config_makefile dlls/wnaspi32 enable_wnaspi32 wine_fn_config_makefile dlls/wow32 enable_win16 +wine_fn_config_makefile dlls/wow64cpu enable_wow64cpu wine_fn_config_makefile dlls/wpc enable_wpc wine_fn_config_makefile dlls/wpc/tests enable_tests wine_fn_config_makefile dlls/wpcap enable_wpcap diff --git a/configure.ac b/configure.ac index 2f81fd22610..7b7abeb11ed 100644 --- a/configure.ac +++ b/configure.ac @@ -3885,6 +3885,7 @@ WINE_CONFIG_MAKEFILE(dlls/wmvcore) WINE_CONFIG_MAKEFILE(dlls/wmvcore/tests) WINE_CONFIG_MAKEFILE(dlls/wnaspi32) WINE_CONFIG_MAKEFILE(dlls/wow32,enable_win16) +WINE_CONFIG_MAKEFILE(dlls/wow64cpu) WINE_CONFIG_MAKEFILE(dlls/wpc) WINE_CONFIG_MAKEFILE(dlls/wpc/tests) WINE_CONFIG_MAKEFILE(dlls/wpcap) diff --git a/dlls/wow64cpu/Makefile.in b/dlls/wow64cpu/Makefile.in new file mode 100644 index 00000000000..2ab1ca62c4a --- /dev/null +++ b/dlls/wow64cpu/Makefile.in @@ -0,0 +1,7 @@ +MODULE = wow64cpu.dll +IMPORTS = winecrt0 ntdll + +EXTRADLLFLAGS = -nodefaultlibs -mno-cygwin + +C_SRCS = \ + wow64cpu_main.c diff --git a/dlls/wow64cpu/wow64cpu.spec b/dlls/wow64cpu/wow64cpu.spec new file mode 100644 index 00000000000..0ea2b4defc6 --- /dev/null +++ b/dlls/wow64cpu/wow64cpu.spec @@ -0,0 +1,25 @@ +# @ stub CpuFlushInstructionCache +# @ stub CpuGetContext +# @ stub CpuGetStackPointer +# @ stub CpuInitializeStartupContext +# @ stub CpuNotifyAffinityChange +# @ stub CpuNotifyAfterFork +# @ stub CpuNotifyBeforeFork +# @ stub CpuNotifyDllLoad +# @ stub CpuNotifyDllUnload +# @ stub CpuPrepareForDebuggerAttach +# @ stub CpuProcessDebugEvent +# @ stub CpuProcessInit +# @ stub CpuProcessTerm +# @ stub CpuResetFloatingPoint +# @ stub CpuResetToConsistentState +# @ stub CpuSetContext +# @ stub CpuSetInstructionPointer +# @ stub CpuSetStackPointer +# @ stub CpuSimulate +# @ stub CpuSuspendLocalThread +# @ stub CpuSuspendThread +# @ stub CpuThreadInit +# @ stub CpuThreadTerm +# @ stub TurboDispatchJumpAddressEnd +# @ stub TurboDispatchJumpAddressStart diff --git a/dlls/wow64cpu/wow64cpu_main.c b/dlls/wow64cpu/wow64cpu_main.c new file mode 100644 index 00000000000..4da9695230b --- /dev/null +++ b/dlls/wow64cpu/wow64cpu_main.c @@ -0,0 +1,27 @@ +/* + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include "windef.h" +#include "winternl.h" + +BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) +{ + if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + return TRUE; +} -- 2.28.0

2 3

[PATCH] powrprof: Use wide-char string literals.
by Michael Stefaniuc Oct. 27, 2020

Oct. 27, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/powrprof/powrprof.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 5f00c7b6317..fc6f5706f87 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -45,20 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(powrprof); * implementing these functions is going to have to wait until somebody can * cobble together some sane test input. */ -static const WCHAR szPowerCfgSubKey[] = { 'S', 'o', 'f', 't', 'w', 'a', 'r', 'e', - '\\', 'M', 'i', 'c', 'r', 'o', 's', 'o', 'f', 't', '\\', 'W', 'i', - 'n', 'd', 'o', 'w', 's', '\\', 'C', 'u', 'r', 'r', 'e', 'n', 't', - 'V', 'e', 'r', 's', 'i', 'o', 'n', '\\', 'C', 'o', 'n', 't', 'r', - 'o', 'l', 's', ' ', 'F', 'o', 'l', 'd', 'e', 'r', '\\', 'P', 'o', - 'w', 'e', 'r', 'C', 'f', 'g', 0 }; -static const WCHAR szSemaphoreName[] = { 'P', 'o', 'w', 'e', 'r', 'P', 'r', 'o', - 'f', 'i', 'l', 'e', 'R', 'e', 'g', 'i', 's', 't', 'r', 'y', 'S', - 'e', 'm', 'a', 'p', 'h', 'o', 'r', 'e', 0 }; -static const WCHAR szDiskMax[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'a', 'x', 0 }; -static const WCHAR szDiskMin[] = { 'D', 'i', 's', 'k', 'S', 'p', 'i', 'n', 'd', - 'o', 'w', 'n', 'M', 'i', 'n', 0 }; -static const WCHAR szLastID[] = { 'L', 'a', 's', 't', 'I', 'D', 0 }; +static const WCHAR szPowerCfgSubKey[] = L"Software\\Microsoft\\Windows\\CurrentVersion\\Controls Folder\\PowerCfg"; static HANDLE PPRegSemaphore = NULL; NTSTATUS WINAPI CallNtPowerInformation( @@ -172,7 +159,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) return TRUE; } - r = RegQueryValueExW(hKey, szDiskMax, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMax: %d\n", r); TRACE("Using default: 3600\n"); @@ -183,7 +170,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szDiskMin, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open DiskSpinDownMin: %d\n", r); TRACE("Using default: 3\n"); @@ -360,14 +347,14 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) } else { BYTE lpValue[40]; DWORD cbValue = sizeof(lpValue); - r = RegQueryValueExW(hKey, szLastID, 0, 0, lpValue, &cbValue); + r = RegQueryValueExW(hKey, L"LastID", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { TRACE("Couldn't open registry entry HKLM\\%s\\LastID, using some sane(?) defaults\n", debugstr_w(szPowerCfgSubKey)); } RegCloseKey(hKey); } - PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, szSemaphoreName); + PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { ERR("Couldn't create Semaphore: %d\n", GetLastError()); return FALSE; -- 2.26.2

1 0

[PATCH] sapi: Zero terminate some WCHAR strings.
by Michael Stefaniuc Oct. 27, 2020

Oct. 27, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sapi/token.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index b4a318b4ade..04fa3a25d6a 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -372,28 +372,28 @@ static HRESULT WINAPI token_category_EnumValues( ISpObjectTokenCategory *iface, static HRESULT parse_cat_id( const WCHAR *str, HKEY *root, const WCHAR **sub_key ) { - static const WCHAR HKLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\'}; - static const WCHAR HKCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\'}; struct table { const WCHAR *name; - int size; + unsigned int len; HKEY key; } table[] = { - { HKLM, sizeof(HKLM), HKEY_LOCAL_MACHINE }, - { HKCU, sizeof(HKCU), HKEY_CURRENT_USER }, +#define X(s) s, ARRAY_SIZE(s) - 1 + { X(L"HKEY_LOCAL_MACHINE\\"), HKEY_LOCAL_MACHINE }, + { X(L"HKEY_CURRENT_USER\\"), HKEY_CURRENT_USER }, { NULL } +#undef X }; struct table *ptr; int len = lstrlenW( str ); for (ptr = table; ptr->name; ptr++) { - if (len >= ptr->size / sizeof(ptr->name[0]) && !memcmp( str, ptr->name, ptr->size )) + if (len >= ptr->len && !wcsncmp( str, ptr->name, ptr->len )) { *root = ptr->key; - *sub_key = str + ptr->size / sizeof(ptr->name[0]); + *sub_key = str + ptr->len; return S_OK; } } -- 2.26.2

1 0

[PATCH] sapi/tests: Use wide-char string literals.
by Michael Stefaniuc Oct. 27, 2020

Oct. 27, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/sapi/tests/token.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 1ca49398ad1..47196d42dc7 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -54,7 +54,6 @@ static void test_token_category(void) ISpObjectTokenCategory *cat; IEnumSpObjectTokens *enum_tokens; HRESULT hr; - WCHAR bogus[] = {'b','o','g','u','s',0}; ULONG count; hr = CoCreateInstance( &CLSID_SpObjectTokenCategory, NULL, CLSCTX_INPROC_SERVER, @@ -64,7 +63,7 @@ static void test_token_category(void) hr = ISpObjectTokenCategory_EnumTokens( cat, NULL, NULL, &enum_tokens ); ok( hr == SPERR_UNINITIALIZED, "got %08x\n", hr ); - hr = ISpObjectTokenCategory_SetId( cat, bogus, FALSE ); + hr = ISpObjectTokenCategory_SetId( cat, L"bogus", FALSE ); ok( hr == SPERR_INVALID_REGISTRY_KEY, "got %08x\n", hr ); hr = ISpObjectTokenCategory_SetId( cat, SPCAT_VOICES, FALSE ); -- 2.26.2

1 0

[PATCH] mf/evr: Initialize variables which are checked conditionally.
by Biswapriyo Nath Oct. 27, 2020

Oct. 27, 2020

3 4

[PATCH 1/3] kernel32: Align stack in get_proc_address_wrapper().
by Paul Gofman Oct. 27, 2020

Oct. 27, 2020

Fixes crash on start in Nier Automata after switching kernel32 to PE. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- The game calls GetProcAddress from its (probably DRM related) code with unaligned stack. Previously in ELF build all the stdcall functions had stack force aligned by gcc, but mingw build doesn't have that. dlls/kernel32/module.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 12100c1fe23..9b3a3952307 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -320,18 +320,18 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "movq %rsp,%rbp\n\t" __ASM_SEH(".seh_setframe %rbp,0\n\t") __ASM_CFI(".cfi_def_cfa_register %rbp\n\t") - "subq $0x40,%rsp\n\t" - __ASM_SEH(".seh_stackalloc 0x40\n\t") __ASM_SEH(".seh_endprologue\n\t") - "movaps %xmm0,-0x10(%rbp)\n\t" - "movaps %xmm1,-0x20(%rbp)\n\t" - "movaps %xmm2,-0x30(%rbp)\n\t" - "movaps %xmm3,-0x40(%rbp)\n\t" + "subq $0x60,%rsp\n\t" + "andq $~15,%rsp\n\t" + "movaps %xmm0,0x20(%rsp)\n\t" + "movaps %xmm1,0x30(%rsp)\n\t" + "movaps %xmm2,0x40(%rsp)\n\t" + "movaps %xmm3,0x50(%rsp)\n\t" "call " __ASM_NAME("get_proc_address") "\n\t" - "movaps -0x40(%rbp), %xmm3\n\t" - "movaps -0x30(%rbp), %xmm2\n\t" - "movaps -0x20(%rbp), %xmm1\n\t" - "movaps -0x10(%rbp), %xmm0\n\t" + "movaps 0x50(%rsp), %xmm3\n\t" + "movaps 0x40(%rsp), %xmm2\n\t" + "movaps 0x30(%rsp), %xmm1\n\t" + "movaps 0x20(%rsp), %xmm0\n\t" "leaq 0(%rbp),%rsp\n\t" __ASM_CFI(".cfi_def_cfa_register %rsp\n\t") "popq %rbp\n\t" -- 2.26.2

2 4

[PATCH] shdocvw: There's no need to load ieframe.dll again, it's delayimported
by Michael Stefaniuc Oct. 27, 2020

Oct. 27, 2020

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shdocvw/shdocvw_main.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index ac3913dd239..e8487f8b747 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -39,30 +39,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); LONG SHDOCVW_refCount = 0; static HMODULE SHDOCVW_hshell32 = 0; -static HINSTANCE ieframe_instance; - -static HINSTANCE get_ieframe_instance(void) -{ - static const WCHAR ieframe_dllW[] = {'i','e','f','r','a','m','e','.','d','l','l',0}; - - if(!ieframe_instance) - ieframe_instance = LoadLibraryW(ieframe_dllW); - - return ieframe_instance; -} static HRESULT get_ieframe_object(REFCLSID rclsid, REFIID riid, void **ppv) { - HINSTANCE ieframe_instance; - static HRESULT (WINAPI *ieframe_DllGetClassObject)(REFCLSID,REFIID,void**); if(!ieframe_DllGetClassObject) { - ieframe_instance = get_ieframe_instance(); - if(!ieframe_instance) - return CLASS_E_CLASSNOTAVAILABLE; - - ieframe_DllGetClassObject = (void*)GetProcAddress(ieframe_instance, "DllGetClassObject"); + ieframe_DllGetClassObject = (void*)GetProcAddress(GetModuleHandleW(L"ieframe.dll"), "DllGetClassObject"); if(!ieframe_DllGetClassObject) return CLASS_E_CLASSNOTAVAILABLE; } @@ -119,7 +102,7 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLine, int nShowWindow) TRACE("%s %d\n", debugstr_a(szCommandLine), nShowWindow); - pIEWinMain = (void*)GetProcAddress(get_ieframe_instance(), MAKEINTRESOURCEA(101)); + pIEWinMain = (void*)GetProcAddress(GetModuleHandleW(L"ieframe.dll"), MAKEINTRESOURCEA(101)); if(!pIEWinMain) ExitProcess(1); @@ -149,7 +132,6 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) case DLL_PROCESS_DETACH: if (fImpLoad) break; if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); - if (ieframe_instance) FreeLibrary(ieframe_instance); break; } return TRUE; -- 2.26.2

1 0