[PATCH 0/1] MR9070: ddraw/tests: Use ANSI versions of user32 functions.

List overview All Threads

newer

older

[PATCH 0/4] MR9071: server:...

[PATCH v2 0/1] MR9058: d3dx9: Add...

Elizabeth Figura (＠zfigura)

30 Sep 2025 30 Sep '25

12:21 a.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/9070

Show replies by date

Elizabeth Figura

30 Sep 30 Sep

12:21 a.m.

New subject: [PATCH 1/1] ddraw/tests: Use ANSI versions of user32 functions.

From: Elizabeth Figura zfigura@codeweavers.com

WCHAR versions do not work on Windows 98. --- dlls/ddraw/tests/ddraw1.c | 202 +++++++++++++++++++------------------- dlls/ddraw/tests/ddraw2.c | 202 +++++++++++++++++++------------------- dlls/ddraw/tests/ddraw4.c | 202 +++++++++++++++++++------------------- dlls/ddraw/tests/ddraw7.c | 202 +++++++++++++++++++------------------- 4 files changed, 404 insertions(+), 404 deletions(-)

diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5b482459d3e..3292883afb3 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -28,7 +28,7 @@ #include "d3dhal.h"

static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); -static DEVMODEW registry_mode; +static DEVMODEA registry_mode;

static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);

@@ -269,20 +269,20 @@ static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice *device) }

/* Free original_modes after finished using it */ -static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_count) +static BOOL save_display_modes(DEVMODEA **original_modes, unsigned int *display_count) { unsigned int number, size = 2, count = 0, index = 0; - DISPLAY_DEVICEW display_device; - DEVMODEW *modes, *tmp; + DISPLAY_DEVICEA display_device; + DEVMODEA *modes, *tmp;

if (!(modes = malloc(size * sizeof(*modes)))) return FALSE;

display_device.cb = sizeof(display_device); - while (EnumDisplayDevicesW(NULL, index++, &display_device, 0)) + while (EnumDisplayDevicesA(NULL, index++, &display_device, 0)) { /* Skip software devices */ - if (swscanf(display_device.DeviceName, L"\\.\DISPLAY%u", &number) != 1) + if (sscanf(display_device.DeviceName, "\\.\DISPLAY%u", &number) != 1) continue;

if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) @@ -301,13 +301,13 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_

memset(&modes[count], 0, sizeof(modes[count])); modes[count].dmSize = sizeof(modes[count]); - if (!EnumDisplaySettingsW(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) + if (!EnumDisplaySettingsA(display_device.DeviceName, ENUM_CURRENT_SETTINGS, &modes[count])) { free(modes); return FALSE; }

- lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + strcpy((char *)modes[count++].dmDeviceName, display_device.DeviceName); }

*original_modes = modes; @@ -315,19 +315,19 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ return TRUE; }

-static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +static BOOL restore_display_modes(DEVMODEA *modes, unsigned int count) { unsigned int index; LONG ret;

for (index = 0; index < count; ++index) { - ret = ChangeDisplaySettingsExW(modes[index].dmDeviceName, &modes[index], NULL, + ret = ChangeDisplaySettingsExA((char *)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); + ret = ChangeDisplaySettingsExA(NULL, NULL, NULL, 0, NULL); return ret == DISP_CHANGE_SUCCESSFUL; }

@@ -1396,7 +1396,7 @@ static void test_coop_level_threaded(void) IDirectDraw_Release(ddraw); }

-static BOOL compare_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +static BOOL compare_mode_rect(const DEVMODEA *mode1, const DEVMODEA *mode2) { return mode1->dmPosition.x == mode2->dmPosition.x && mode1->dmPosition.y == mode2->dmPosition.y @@ -2939,7 +2939,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_

static void test_coop_level_mode_set(void) { - DEVMODEW *original_modes = NULL, devmode, devmode2; + DEVMODEA *original_modes = NULL, devmode, devmode2; unsigned int display_count = 0; IDirectDrawSurface *primary; RECT registry_rect, ddraw_rect, user32_rect, r; @@ -3034,11 +3034,11 @@ static void test_coop_level_mode_set(void)

memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode, &registry_mode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode, &registry_mode), "Got a different mode.\n");

ret = save_display_modes(&original_modes, &display_count); @@ -3069,7 +3069,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);

ddraw = create_ddraw(); @@ -3169,7 +3169,7 @@ static void test_coop_level_mode_set(void)

hr = IDirectDrawSurface_IsLost(primary); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3190,7 +3190,7 @@ static void test_coop_level_mode_set(void) ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %lux%lu.\n", @@ -3203,7 +3203,7 @@ static void test_coop_level_mode_set(void) GetWindowRect(window, &r); ok(EqualRect(&r, &ddraw_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&ddraw_rect), wine_dbgstr_rect(&r)); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %lux%lu.\n", @@ -3276,7 +3276,7 @@ static void test_coop_level_mode_set(void) expect_messages = NULL;

/* For Wine. */ - change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(NULL, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); flush_events();

@@ -3357,7 +3357,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3470,14 +3470,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

- ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", registry_mode.dmPelsWidth, registry_mode.dmPelsHeight, devmode.dmPelsWidth, devmode.dmPelsHeight); - change_ret = ChangeDisplaySettingsW(NULL, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(NULL, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);

memset(&ddsd, 0, sizeof(ddsd)); @@ -3554,7 +3554,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3660,14 +3660,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3745,8 +3745,8 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3755,15 +3755,15 @@ static void test_coop_level_mode_set(void)

memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_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 no mode restorations if no mode changes happened with fullscreen ddraw objects */ - change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3774,8 +3774,8 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

- change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_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"); @@ -3808,17 +3808,17 @@ static void test_coop_level_mode_set(void) hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw_RestoreDisplayMode(ddraw); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw_Release(ddraw); @@ -3835,9 +3835,9 @@ done:

static void test_coop_level_mode_set_multi(void) { - DEVMODEW old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; + DEVMODEA old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; unsigned int mode_idx = 0, display_idx, display_count = 0; - WCHAR second_monitor_name[CCHDEVICENAME]; + char second_monitor_name[CCHDEVICENAME]; IDirectDraw *ddraw1, *ddraw2; LONG change_ret; UINT w, h; @@ -3848,11 +3848,11 @@ static void test_coop_level_mode_set_multi(void)

ret = save_display_modes(&original_modes, &display_count); @@ -4052,18 +4052,18 @@ static void test_coop_level_mode_set_multi(void) { if (original_modes[display_idx].dmPosition.x || original_modes[display_idx].dmPosition.y) { - lstrcpyW(second_monitor_name, original_modes[display_idx].dmDeviceName); + strcpy(second_monitor_name, (char *)original_modes[display_idx].dmDeviceName); break; } } - ok(lstrlenW(second_monitor_name), "Got an empty second monitor name.\n"); + ok(strlen(second_monitor_name), "Got an empty second monitor name.\n"); 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 %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError());

devmode = old_devmode; - while (EnumDisplaySettingsW(second_monitor_name, mode_idx++, &devmode)) + while (EnumDisplaySettingsA(second_monitor_name, mode_idx++, &devmode)) { if (devmode.dmPelsWidth != old_devmode.dmPelsWidth || devmode.dmPelsHeight != old_devmode.dmPelsHeight) @@ -4079,13 +4079,13 @@ static void test_coop_level_mode_set_multi(void) hr = IDirectDraw_SetCooperativeLevel(ddraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr);

- change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsExA(second_monitor_name, &devmode, NULL, CDS_RESET, NULL); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA failed with %ld.\n", change_ret);

memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); if (compare_mode_rect(&devmode2, &old_devmode)) { skip("Failed to change display settings of the second monitor.\n"); @@ -4101,8 +4101,8 @@ static void test_coop_level_mode_set_multi(void)

memset(&devmode3, 0, sizeof(devmode3)); devmode3.dmSize = sizeof(devmode3); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode3, &devmode2), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4114,17 +4114,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4135,17 +4135,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw_RestoreDisplayMode(ddraw1); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw_Release(ddraw1); @@ -4159,20 +4159,20 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

- change_ret = ChangeDisplaySettingsExW(second_monitor_name, &devmode, NULL, + change_ret = ChangeDisplaySettingsExA(second_monitor_name, &devmode, NULL, CDS_UPDATEREGISTRY | CDS_NORESET, NULL); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExW failed with %ld.\n", change_ret); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA failed with %ld.\n", change_ret);

ref = IDirectDraw_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); @@ -4190,17 +4190,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw_RestoreDisplayMode(ddraw2); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw_Release(ddraw2); @@ -4221,17 +4221,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw_Release(ddraw2); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw_Release(ddraw1); @@ -14789,7 +14789,7 @@ static void test_get_display_mode(void) static const DWORD flags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_REFRESHRATE | DDSD_PIXELFORMAT | DDSD_PITCH; DDSURFACEDESC surface_desc; IDirectDraw *ddraw; - DEVMODEW devmode; + DEVMODEA devmode; HRESULT hr; BOOL ret;

@@ -14800,8 +14800,8 @@ static void test_get_display_mode(void)

surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw_GetDisplayMode(ddraw, &surface_desc); @@ -16220,7 +16220,7 @@ out: START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; - DEVMODEW current_mode; + DEVMODEA current_mode; IDirectDraw *ddraw; HMODULE dwmapi;

@@ -16242,9 +16242,9 @@ START_TEST(ddraw1)

memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); registry_mode.dmSize = sizeof(registry_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); if (registry_mode.dmPelsWidth != current_mode.dmPelsWidth || registry_mode.dmPelsHeight != current_mode.dmPelsHeight) { diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index bac59a1949b..3c49c28a212 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -29,7 +29,7 @@ #include "d3dhal.h"

static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); -static DEVMODEW registry_mode; +static DEVMODEA registry_mode;

static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);

@@ -270,20 +270,20 @@ static IDirectDrawSurface *get_depth_stencil(IDirect3DDevice2 *device) }

if (!(modes = malloc(size * sizeof(*modes)))) return FALSE;

if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) @@ -302,13 +302,13 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_

- lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + strcpy((char *)modes[count++].dmDeviceName, display_device.DeviceName); }

*original_modes = modes; @@ -316,19 +316,19 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ return TRUE; }

-static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +static BOOL restore_display_modes(DEVMODEA *modes, unsigned int count) { unsigned int index; LONG ret;

@@ -1589,7 +1589,7 @@ done: if (ddraw) IDirectDraw2_Release(ddraw); }

-static BOOL compare_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +static BOOL compare_mode_rect(const DEVMODEA *mode1, const DEVMODEA *mode2) { return mode1->dmPosition.x == mode2->dmPosition.x && mode1->dmPosition.y == mode2->dmPosition.y @@ -3031,7 +3031,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC *surface_

static void test_coop_level_mode_set(void) { - DEVMODEW *original_modes = NULL, devmode, devmode2; + DEVMODEA *original_modes = NULL, devmode, devmode2; unsigned int display_count = 0; IDirectDrawSurface *primary; RECT registry_rect, ddraw_rect, user32_rect, r; @@ -3126,11 +3126,11 @@ static void test_coop_level_mode_set(void)

ret = save_display_modes(&original_modes, &display_count); @@ -3161,7 +3161,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);

ddraw = create_ddraw(); @@ -3266,7 +3266,7 @@ static void test_coop_level_mode_set(void)

hr = IDirectDrawSurface_IsLost(primary); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3287,7 +3287,7 @@ static void test_coop_level_mode_set(void) ok(!expect_messages->message, "Expected message %#x, but didn't receive it.\n", expect_messages->message); memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %lux%lu.\n", @@ -3300,7 +3300,7 @@ static void test_coop_level_mode_set(void) GetWindowRect(window, &r); ok(EqualRect(&r, &ddraw_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&ddraw_rect), wine_dbgstr_rect(&r)); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %lux%lu.\n", @@ -3373,7 +3373,7 @@ static void test_coop_level_mode_set(void) expect_messages = NULL;

@@ -3454,7 +3454,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3567,14 +3567,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3651,7 +3651,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3757,14 +3757,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3946,8 +3946,8 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3956,15 +3956,15 @@ static void test_coop_level_mode_set(void)

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3975,8 +3975,8 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_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"); @@ -4009,17 +4009,17 @@ static void test_coop_level_mode_set(void) hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw2_RestoreDisplayMode(ddraw); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw); @@ -4038,9 +4038,9 @@ done:

static void test_coop_level_mode_set_multi(void) { - DEVMODEW old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; + DEVMODEA old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; unsigned int mode_idx = 0, display_idx, display_count = 0; - WCHAR second_monitor_name[CCHDEVICENAME]; + char second_monitor_name[CCHDEVICENAME]; IDirectDraw2 *ddraw1, *ddraw2; LONG change_ret; UINT w, h; @@ -4051,11 +4051,11 @@ static void test_coop_level_mode_set_multi(void)

ret = save_display_modes(&original_modes, &display_count); @@ -4255,18 +4255,18 @@ static void test_coop_level_mode_set_multi(void) { if (original_modes[display_idx].dmPosition.x || original_modes[display_idx].dmPosition.y) { - lstrcpyW(second_monitor_name, original_modes[display_idx].dmDeviceName); + strcpy(second_monitor_name, (char *)original_modes[display_idx].dmDeviceName); break; } } - ok(lstrlenW(second_monitor_name), "Got an empty second monitor name.\n"); + ok(strlen(second_monitor_name), "Got an empty second monitor name.\n"); 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 %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError());

devmode = old_devmode; - while (EnumDisplaySettingsW(second_monitor_name, mode_idx++, &devmode)) + while (EnumDisplaySettingsA(second_monitor_name, mode_idx++, &devmode)) { if (devmode.dmPelsWidth != old_devmode.dmPelsWidth || devmode.dmPelsHeight != old_devmode.dmPelsHeight) @@ -4282,13 +4282,13 @@ static void test_coop_level_mode_set_multi(void) hr = IDirectDraw2_SetCooperativeLevel(ddraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr);

memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); if (compare_mode_rect(&devmode2, &old_devmode)) { skip("Failed to change display settings of the second monitor.\n"); @@ -4304,8 +4304,8 @@ static void test_coop_level_mode_set_multi(void)

memset(&devmode3, 0, sizeof(devmode3)); devmode3.dmSize = sizeof(devmode3); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode3, &devmode2), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4317,17 +4317,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4338,17 +4338,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw2_RestoreDisplayMode(ddraw1); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw1); @@ -4362,20 +4362,20 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); @@ -4393,17 +4393,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw2_RestoreDisplayMode(ddraw2); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw2); @@ -4424,17 +4424,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw2_Release(ddraw2); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw2_Release(ddraw1); @@ -15749,7 +15749,7 @@ static void test_get_display_mode(void) struct find_different_mode_param param; DDSURFACEDESC surface_desc; IDirectDraw2 *ddraw; - DEVMODEW devmode; + DEVMODEA devmode; HWND window; HRESULT hr; BOOL ret; @@ -15766,8 +15766,8 @@ static void test_get_display_mode(void)

surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw2_GetDisplayMode(ddraw, &surface_desc); @@ -17252,7 +17252,7 @@ out: START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; - DEVMODEW current_mode; + DEVMODEA current_mode; IDirectDraw2 *ddraw; HMODULE dwmapi;

@@ -17274,9 +17274,9 @@ START_TEST(ddraw2)

memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); registry_mode.dmSize = sizeof(registry_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); if (registry_mode.dmPelsWidth != current_mode.dmPelsWidth || registry_mode.dmPelsHeight != current_mode.dmPelsHeight) { diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8345b6b3434..064591ec4e6 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -30,7 +30,7 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC *device_dc);

static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); -static DEVMODEW registry_mode; +static DEVMODEA registry_mode;

static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *);

@@ -272,20 +272,20 @@ static IDirectDrawSurface4 *get_depth_stencil(IDirect3DDevice3 *device) }

if (!(modes = malloc(size * sizeof(*modes)))) return FALSE;

if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) @@ -304,13 +304,13 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_

- lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + strcpy((char *)modes[count++].dmDeviceName, display_device.DeviceName); }

*original_modes = modes; @@ -318,19 +318,19 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ return TRUE; }

-static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +static BOOL restore_display_modes(DEVMODEA *modes, unsigned int count) { unsigned int index; LONG ret;

@@ -1760,7 +1760,7 @@ static void test_texture_load_ckey(void) IDirectDraw4_Release(ddraw); }

-static BOOL compare_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +static BOOL compare_mode_rect(const DEVMODEA *mode1, const DEVMODEA *mode2) { return mode1->dmPosition.x == mode2->dmPosition.x && mode1->dmPosition.y == mode2->dmPosition.y @@ -3271,7 +3271,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface

static void test_coop_level_mode_set(void) { - DEVMODEW *original_modes = NULL, devmode, devmode2; + DEVMODEA *original_modes = NULL, devmode, devmode2; unsigned int display_count = 0; IDirectDrawSurface4 *primary; RECT registry_rect, ddraw_rect, user32_rect, r; @@ -3366,11 +3366,11 @@ static void test_coop_level_mode_set(void)

ret = save_display_modes(&original_modes, &display_count); @@ -3401,7 +3401,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);

ddraw = create_ddraw(); @@ -3506,7 +3506,7 @@ static void test_coop_level_mode_set(void)

hr = IDirectDrawSurface4_IsLost(primary); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface4_IsLost(primary); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3530,7 +3530,7 @@ static void test_coop_level_mode_set(void)

memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %lux%lu.\n", @@ -3543,7 +3543,7 @@ static void test_coop_level_mode_set(void) GetWindowRect(window, &r); ok(EqualRect(&r, &ddraw_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&ddraw_rect), wine_dbgstr_rect(&r)); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %lux%lu.\n", @@ -3616,7 +3616,7 @@ static void test_coop_level_mode_set(void) expect_messages = NULL;

@@ -3697,7 +3697,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface4_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3803,14 +3803,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3887,7 +3887,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface4_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3993,14 +3993,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -4182,8 +4182,8 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -4192,15 +4192,15 @@ static void test_coop_level_mode_set(void)

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -4211,8 +4211,8 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_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"); @@ -4245,17 +4245,17 @@ static void test_coop_level_mode_set(void) hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw4_RestoreDisplayMode(ddraw); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw); @@ -4273,9 +4273,9 @@ static void test_coop_level_mode_set(void)

static void test_coop_level_mode_set_multi(void) { - DEVMODEW old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; + DEVMODEA old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; unsigned int mode_idx = 0, display_idx, display_count = 0; - WCHAR second_monitor_name[CCHDEVICENAME]; + char second_monitor_name[CCHDEVICENAME]; IDirectDraw4 *ddraw1, *ddraw2; LONG change_ret; UINT w, h; @@ -4286,11 +4286,11 @@ static void test_coop_level_mode_set_multi(void)

ret = save_display_modes(&original_modes, &display_count); @@ -4483,18 +4483,18 @@ static void test_coop_level_mode_set_multi(void) { if (original_modes[display_idx].dmPosition.x || original_modes[display_idx].dmPosition.y) { - lstrcpyW(second_monitor_name, original_modes[display_idx].dmDeviceName); + strcpy(second_monitor_name, (char *)original_modes[display_idx].dmDeviceName); break; } } - ok(lstrlenW(second_monitor_name), "Got an empty second monitor name.\n"); + ok(strlen(second_monitor_name), "Got an empty second monitor name.\n"); 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 %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError());

devmode = old_devmode; - while (EnumDisplaySettingsW(second_monitor_name, mode_idx++, &devmode)) + while (EnumDisplaySettingsA(second_monitor_name, mode_idx++, &devmode)) { if (devmode.dmPelsWidth != old_devmode.dmPelsWidth || devmode.dmPelsHeight != old_devmode.dmPelsHeight) @@ -4510,13 +4510,13 @@ static void test_coop_level_mode_set_multi(void) hr = IDirectDraw4_SetCooperativeLevel(ddraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr);

memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); if (compare_mode_rect(&devmode2, &old_devmode)) { skip("Failed to change display settings of the second monitor.\n"); @@ -4532,8 +4532,8 @@ static void test_coop_level_mode_set_multi(void)

memset(&devmode3, 0, sizeof(devmode3)); devmode3.dmSize = sizeof(devmode3); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode3, &devmode2), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4545,17 +4545,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4566,17 +4566,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw4_RestoreDisplayMode(ddraw1); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw1); @@ -4590,20 +4590,20 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); @@ -4621,17 +4621,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw4_RestoreDisplayMode(ddraw2); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw2); @@ -4652,17 +4652,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw4_Release(ddraw2); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw4_Release(ddraw1); @@ -18801,7 +18801,7 @@ static void test_get_display_mode(void) struct find_different_mode_param param; DDSURFACEDESC2 surface_desc; IDirectDraw4 *ddraw; - DEVMODEW devmode; + DEVMODEA devmode; HWND window; HRESULT hr; BOOL ret; @@ -18818,8 +18818,8 @@ static void test_get_display_mode(void)

surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw4_GetDisplayMode(ddraw, &surface_desc); @@ -20325,7 +20325,7 @@ out: START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; - DEVMODEW current_mode; + DEVMODEA current_mode; IDirectDraw4 *ddraw; HMODULE dwmapi;

@@ -20347,9 +20347,9 @@ START_TEST(ddraw4)

memset(&current_mode, 0, sizeof(current_mode)); current_mode.dmSize = sizeof(current_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &current_mode), "Failed to get display mode.\n"); registry_mode.dmSize = sizeof(registry_mode); - ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + ok(EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); if (registry_mode.dmPelsWidth != current_mode.dmPelsWidth || registry_mode.dmPelsHeight != current_mode.dmPelsHeight) { diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 6efb61cc328..fae4f6ae9cc 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -31,7 +31,7 @@ HRESULT WINAPI GetSurfaceFromDC(HDC dc, struct IDirectDrawSurface **surface, HDC

static HRESULT (WINAPI *pDirectDrawCreateEx)(GUID *guid, void **ddraw, REFIID iid, IUnknown *outer_unknown); static BOOL is_ddraw64 = sizeof(DWORD) != sizeof(DWORD *); -static DEVMODEW registry_mode; +static DEVMODEA registry_mode; static const GUID *hw_device_guid = &IID_IDirect3DHALDevice;

static HRESULT (WINAPI *pDwmIsCompositionEnabled)(BOOL *); @@ -111,7 +111,7 @@ static BOOL compare_color(D3DCOLOR c1, D3DCOLOR c2, BYTE max_diff) && compare_uint((c1 >> 24) & 0xff, (c2 >> 24) & 0xff, max_diff); }

-static BOOL compare_mode_rect(const DEVMODEW *mode1, const DEVMODEW *mode2) +static BOOL compare_mode_rect(const DEVMODEA *mode1, const DEVMODEA *mode2) { return mode1->dmPosition.x == mode2->dmPosition.x && mode1->dmPosition.y == mode2->dmPosition.y @@ -314,20 +314,20 @@ static IDirectDrawSurface7 *get_depth_stencil(IDirect3DDevice7 *device) }

if (!(modes = malloc(size * sizeof(*modes)))) return FALSE;

if (!(display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) @@ -346,13 +346,13 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_

- lstrcpyW(modes[count++].dmDeviceName, display_device.DeviceName); + strcpy((char *)modes[count++].dmDeviceName, display_device.DeviceName); }

*original_modes = modes; @@ -360,19 +360,19 @@ static BOOL save_display_modes(DEVMODEW **original_modes, unsigned int *display_ return TRUE; }

-static BOOL restore_display_modes(DEVMODEW *modes, unsigned int count) +static BOOL restore_display_modes(DEVMODEA *modes, unsigned int count) { unsigned int index; LONG ret;

@@ -3033,7 +3033,7 @@ static HRESULT CALLBACK test_coop_level_mode_set_enum_cb(DDSURFACEDESC2 *surface

static void test_coop_level_mode_set(void) { - DEVMODEW *original_modes = NULL, devmode, devmode2; + DEVMODEA *original_modes = NULL, devmode, devmode2; unsigned int display_count = 0; IDirectDrawSurface7 *primary; RECT registry_rect, ddraw_rect, user32_rect, r; @@ -3128,11 +3128,11 @@ static void test_coop_level_mode_set(void)

ret = save_display_modes(&original_modes, &display_count); @@ -3163,7 +3163,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret);

ddraw = create_ddraw(); @@ -3268,7 +3268,7 @@ static void test_coop_level_mode_set(void)

hr = IDirectDrawSurface7_IsLost(primary); ok(hr == DD_OK, "Got unexpected hr %#lx.\n", hr); - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface7_IsLost(primary); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3292,7 +3292,7 @@ static void test_coop_level_mode_set(void)

memset(&devmode, 0, sizeof(devmode)); devmode.dmSize = sizeof(devmode); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == registry_mode.dmPelsWidth && devmode.dmPelsHeight == registry_mode.dmPelsHeight, "Got unexpected screen size %lux%lu.\n", @@ -3305,7 +3305,7 @@ static void test_coop_level_mode_set(void) GetWindowRect(window, &r); ok(EqualRect(&r, &ddraw_rect), "Expected %s, got %s.\n", wine_dbgstr_rect(&ddraw_rect), wine_dbgstr_rect(&r)); - ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); ok(ret, "Failed to get display mode.\n"); ok(devmode.dmPelsWidth == param.ddraw_width && devmode.dmPelsHeight == param.ddraw_height, "Got unexpected screen size %lux%lu.\n", @@ -3378,7 +3378,7 @@ static void test_coop_level_mode_set(void) expect_messages = NULL;

@@ -3459,7 +3459,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface7_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3565,14 +3565,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3649,7 +3649,7 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_FULLSCREEN); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_FULLSCREEN); ok(change_ret == DISP_CHANGE_SUCCESSFUL, "Failed to change display mode, ret %#lx.\n", change_ret); hr = IDirectDrawSurface7_IsLost(primary); todo_wine ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#lx.\n", hr); @@ -3755,14 +3755,14 @@ static void test_coop_level_mode_set(void) ok(expect_messages->message == WM_PAINT, "Unexpected WM_PAINT.\n"); expect_messages = NULL;

memset(&ddsd, 0, sizeof(ddsd)); @@ -3944,8 +3944,8 @@ static void test_coop_level_mode_set(void) devmode.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT; devmode.dmPelsWidth = param.user32_width; devmode.dmPelsHeight = param.user32_height; - change_ret = ChangeDisplaySettingsW(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); - ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsW failed with %ld.\n", change_ret); + change_ret = ChangeDisplaySettingsA(&devmode, CDS_UPDATEREGISTRY | CDS_NORESET); + ok(change_ret == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsA failed with %ld.\n", change_ret);

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3954,15 +3954,15 @@ static void test_coop_level_mode_set(void)

ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); @@ -3973,8 +3973,8 @@ static void test_coop_level_mode_set(void) ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(NULL, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(NULL, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_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"); @@ -4007,17 +4007,17 @@ static void test_coop_level_mode_set(void) hr = set_display_mode(ddraw, param.ddraw_width, param.ddraw_height); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw7_RestoreDisplayMode(ddraw); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw); @@ -4035,9 +4035,9 @@ static void test_coop_level_mode_set(void)

static void test_coop_level_mode_set_multi(void) { - DEVMODEW old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; + DEVMODEA old_devmode, devmode, devmode2, devmode3, *original_modes = NULL; unsigned int mode_idx = 0, display_idx, display_count = 0; - WCHAR second_monitor_name[CCHDEVICENAME]; + char second_monitor_name[CCHDEVICENAME]; IDirectDraw7 *ddraw1, *ddraw2; LONG change_ret; UINT w, h; @@ -4048,11 +4048,11 @@ static void test_coop_level_mode_set_multi(void)

ret = save_display_modes(&original_modes, &display_count); @@ -4245,18 +4245,18 @@ static void test_coop_level_mode_set_multi(void) { if (original_modes[display_idx].dmPosition.x || original_modes[display_idx].dmPosition.y) { - lstrcpyW(second_monitor_name, original_modes[display_idx].dmDeviceName); + strcpy(second_monitor_name, (char *)original_modes[display_idx].dmDeviceName); break; } } - ok(lstrlenW(second_monitor_name), "Got an empty second monitor name.\n"); + ok(strlen(second_monitor_name), "Got an empty second monitor name.\n"); 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 %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &old_devmode); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError());

devmode = old_devmode; - while (EnumDisplaySettingsW(second_monitor_name, mode_idx++, &devmode)) + while (EnumDisplaySettingsA(second_monitor_name, mode_idx++, &devmode)) { if (devmode.dmPelsWidth != old_devmode.dmPelsWidth || devmode.dmPelsHeight != old_devmode.dmPelsHeight) @@ -4272,13 +4272,13 @@ static void test_coop_level_mode_set_multi(void) hr = IDirectDraw7_SetCooperativeLevel(ddraw1, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "SetCooperativeLevel failed, hr %#lx.\n", hr);

memset(&devmode2, 0, sizeof(devmode2)); devmode2.dmSize = sizeof(devmode2); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); if (compare_mode_rect(&devmode2, &old_devmode)) { skip("Failed to change display settings of the second monitor.\n"); @@ -4294,8 +4294,8 @@ static void test_coop_level_mode_set_multi(void)

memset(&devmode3, 0, sizeof(devmode3)); devmode3.dmSize = sizeof(devmode3); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode3); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode3, &devmode2), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4307,17 +4307,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(compare_mode_rect(&devmode2, &old_devmode), "Got a different mode.\n"); ret = restore_display_modes(original_modes, display_count); ok(ret, "Failed to restore display modes.\n"); @@ -4328,17 +4328,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw7_RestoreDisplayMode(ddraw1); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw1); @@ -4352,20 +4352,20 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw1, 800, 600); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw1); ok(!ref, "Unexpected refcount %lu.\n", ref);

- ret = EnumDisplaySettingsW(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_CURRENT_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); - ret = EnumDisplaySettingsW(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); - ok(ret, "EnumDisplaySettingsW failed, error %lu.\n", GetLastError()); + ret = EnumDisplaySettingsA(second_monitor_name, ENUM_REGISTRY_SETTINGS, &devmode2); + ok(ret, "EnumDisplaySettingsA failed, error %lu.\n", GetLastError()); ok(devmode2.dmPelsWidth == devmode.dmPelsWidth && devmode2.dmPelsHeight == devmode.dmPelsHeight, "Expected resolution %lux%lu, got %lux%lu.\n", devmode.dmPelsWidth, devmode.dmPelsHeight, devmode2.dmPelsWidth, devmode2.dmPelsHeight); @@ -4383,17 +4383,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

hr = IDirectDraw7_RestoreDisplayMode(ddraw2); ok(hr == DD_OK, "RestoreDisplayMode failed, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw2); @@ -4414,17 +4414,17 @@ static void test_coop_level_mode_set_multi(void) hr = set_display_mode(ddraw2, 640, 480); ok(hr == DD_OK, "Failed to set display mode, hr %#lx.\n", hr);

ref = IDirectDraw7_Release(ddraw2); ok(!ref, "Unexpected refcount %lu.\n", ref);

ref = IDirectDraw7_Release(ddraw1); @@ -19186,7 +19186,7 @@ static void test_get_display_mode(void) struct find_different_mode_param param; DDSURFACEDESC2 surface_desc; IDirectDraw7 *ddraw; - DEVMODEW devmode; + DEVMODEA devmode; HWND window; HRESULT hr; BOOL ret; @@ -19203,8 +19203,8 @@ static void test_get_display_mode(void)

surface_desc.dwSize = sizeof(surface_desc); hr = IDirectDraw7_GetDisplayMode(ddraw, &surface_desc); @@ -20762,7 +20762,7 @@ START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; HMODULE module, dwmapi; - DEVMODEW current_mode; + DEVMODEA current_mode; IDirectDraw7 *ddraw; IDirect3D7 *d3d; BOOL hal_ok; @@ -20807,9 +20807,9 @@ START_TEST(ddraw7)

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9070

Age (days ago)

Last active (days ago)

wine-gitlab@winehq.org

1 comments

2 participants

tags (0)

participants (2)

Elizabeth Figura
Elizabeth Figura (＠zfigura)