September 2020 - Wine-Devel

[PATCH 2/2] setupapi: Copy all files specified in manifest on wine dll install.
by Piotr Caban Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- With this patch all files specified in msvcr80 and msvcr90 manifests are copied to winsxs sub directories. dlls/setupapi/fakedll.c | 153 ++++++++++++++++++++++++++++++---------- 1 file changed, 114 insertions(+), 39 deletions(-)

2 2

[PATCH 1/4] include: Add an entry for ProcessIoPriority.
by Nikolay Sivov Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- include/winternl.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b0371c615e6..8996dd91446 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3685,7 +3685,7 @@ static void test_process_info(HANDLE hproc) case ProcessPriorityClass: case ProcessPriorityBoost: case ProcessLUIDDeviceMapsEnabled: - case 33 /* ProcessIoPriority */: + case ProcessIoPriority: case ProcessIoCounters: case ProcessVmCounters: case ProcessWow64Information: diff --git a/include/winternl.h b/include/winternl.h index e23a02b9b26..20b2a44ba20 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1153,6 +1153,7 @@ typedef enum _PROCESSINFOCLASS { ProcessDebugObjectHandle = 30, ProcessDebugFlags = 31, ProcessHandleTracing = 32, + ProcessIoPriority = 33, ProcessExecuteFlags = 34, ProcessTlsInformation = 35, ProcessCookie = 36, -- 2.28.0

2 6

[PATCH 1/2] setupapi: Remove unused end parameter from next_xml_attr internal function.
by Piotr Caban Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/setupapi/fakedll.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

2 1

[PATCH] msvcirt/tests: Fix the spelling of a couple of ok() messages.
by Francois Gouget Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcirt/tests/msvcirt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 7bb8bdcf738..0b9ce68257e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -7978,7 +7978,7 @@ static void test_fstream(void) /* make sure that OPENMODE_in is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_read(pfb->fd, st, 1) == -1, "_read succeded on OPENMODE_out only fstream\n"); + ok(_read(pfb->fd, st, 1) == -1, "_read succeeded on OPENMODE_out only fstream\n"); /* reopen the file for reading */ call_func1(p_fstream_vbase_dtor, &fs); @@ -8002,7 +8002,7 @@ static void test_fstream(void) /* make sure that OPENMODE_out is not implied */ ok(_lseek(pfb->fd, 0, SEEK_SET) == 0, "_lseek failed\n"); - ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeded on OPENMODE_in fstream\n"); + ok(_write(pfb->fd, "blabla", 6) == -1, "_write succeeded on OPENMODE_in fstream\n"); /* cleanup */ call_func1(p_fstream_vbase_dtor, &fs); -- 2.20.1

2 1

[PATCH] conhost: Input should be restored and input_thread handle should be closed before return.
by Haidong Yu Sept. 22, 2020

Sept. 22, 2020

3 2

[PATCH] iphlpapi: Avoid local variables overwriting external variables.
by Jiangyi Chen Sept. 22, 2020

Sept. 22, 2020

2 1

[PATCH] conhost: Add the case where the divisor is 0.
by Pengpeng Dong Sept. 22, 2020

Sept. 22, 2020

3 2

[PATCH 1/3] gdi32: Use explicit CDECL in gdi_image_bits.
by Rémi Bernon Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/gdi32/bitblt.c | 2 +- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- dlls/wineps.drv/bitmap.c | 2 +- dlls/winex11.drv/bitblt.c | 4 ++-- include/wine/gdi_driver.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index d46d7bada49..f3b866057eb 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -163,7 +163,7 @@ static BOOL get_vis_rectangles( DC *dc_dst, struct bitblt_coords *dst, return intersect_vis_rectangles( dst, src ); } -void free_heap_bits( struct gdi_image_bits *bits ) +void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index f818aa02286..727f3837e33 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -565,7 +565,7 @@ static inline void unlock_surface( struct windrv_physdev *dev ) if (GetTickCount() - dev->start_ticks > FLUSH_PERIOD) dev->surface->funcs->flush( dev->surface ); } -static void unlock_bits_surface( struct gdi_image_bits *bits ) +static void CDECL unlock_bits_surface( struct gdi_image_bits *bits ) { struct window_surface *surface = bits->param; surface->funcs->unlock( surface ); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6b2502c4586..4bb46619666 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -620,7 +620,7 @@ static inline void copy_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO *src ) memcpy( dst, src, get_dib_info_size( src, DIB_RGB_COLORS )); } -extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; +extern void CDECL free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HMODULE gdi32_module DECLSPEC_HIDDEN; diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index 1a98f162702..bafc86e9a24 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -148,7 +148,7 @@ static inline DWORD max_ascii85_size(DWORD size) return (size + 3) / 4 * 5; } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b530ba7ba62..46e52612a21 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -914,12 +914,12 @@ BOOL CDECL X11DRV_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, } -static void free_heap_bits( struct gdi_image_bits *bits ) +static void CDECL free_heap_bits( struct gdi_image_bits *bits ) { HeapFree( GetProcessHeap(), 0, bits->ptr ); } -static void free_ximage_bits( struct gdi_image_bits *bits ) +static void CDECL free_ximage_bits( struct gdi_image_bits *bits ) { XFree( bits->ptr ); } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 971618e19ac..0bd169c653b 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -54,7 +54,7 @@ struct gdi_image_bits { void *ptr; /* pointer to the bits */ BOOL is_copy; /* whether this is a copy of the bits that can be modified */ - void (*free)(struct gdi_image_bits *); /* callback for freeing the bits */ + void (CDECL *free)(struct gdi_image_bits *); /* callback for freeing the bits */ void *param; /* extra parameter for callback private use */ }; -- 2.28.0

2 5

[PATCH 4/4] winex11.drv: Support display orientations for XRandR 1.4 display settings handler.
by Zhiyi Zhang Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/winex11.drv/xrandr.c | 156 +++++++++++++++++++++++++++++--------- 2 files changed, 121 insertions(+), 37 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 97db3d445cd..462037b2e01 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -621,7 +621,7 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - todo_wine ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, "rotation is %d instead of %d\n", rotation, S2(U1(devmode)).dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6c16fb29ec2..78ad98acd49 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -465,6 +465,55 @@ static unsigned int get_frequency( const XRRModeInfo *mode ) return (mode->dotClock + dots / 2) / dots; } +static DWORD get_orientation( Rotation rotation ) +{ + if (rotation & RR_Rotate_270) return DMDO_270; + if (rotation & RR_Rotate_180) return DMDO_180; + if (rotation & RR_Rotate_90) return DMDO_90; + return DMDO_DEFAULT; +} + +static DWORD get_orientation_count( Rotation rotations ) +{ + DWORD count = 0; + + if (rotations & RR_Rotate_0) ++count; + if (rotations & RR_Rotate_90) ++count; + if (rotations & RR_Rotate_180) ++count; + if (rotations & RR_Rotate_270) ++count; + return count; +} + +static Rotation get_rotation( DWORD orientation ) +{ + return (Rotation)(1 << orientation); +} + +static RRCrtc get_output_free_crtc( XRRScreenResources *resources, XRROutputInfo *output_info ) +{ + XRRCrtcInfo *crtc_info; + INT crtc_idx; + RRCrtc crtc; + + for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, output_info->crtcs[crtc_idx] ); + if (!crtc_info) + continue; + + if (!crtc_info->noutput) + { + crtc = output_info->crtcs[crtc_idx]; + pXRRFreeCrtcInfo( crtc_info ); + return crtc; + } + + pXRRFreeCrtcInfo( crtc_info ); + } + + return 0; +} + static RECT get_primary_rect( XRRScreenResources *resources ) { XRROutputInfo *output_info = NULL; @@ -1137,7 +1186,8 @@ static BOOL xrandr14_get_id( const WCHAR *device_name, ULONG_PTR *id ) return FALSE; } -static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency ) +static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, DWORD frequency, + DWORD orientation ) { mode->dmSize = sizeof(*mode); mode->dmDriverExtra = sizeof(RRMode); @@ -1148,24 +1198,35 @@ static void add_xrandr14_mode( DEVMODEW *mode, XRRModeInfo *info, DWORD depth, D mode->dmFields |= DM_DISPLAYFREQUENCY; mode->dmDisplayFrequency = frequency; } - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + if (orientation == DMDO_DEFAULT || orientation == DMDO_180) + { + mode->dmPelsWidth = info->width; + mode->dmPelsHeight = info->height; + } + else + { + mode->dmPelsWidth = info->height; + mode->dmPelsHeight = info->width; + } + mode->u1.s2.dmDisplayOrientation = orientation; mode->dmBitsPerPel = depth; - mode->dmPelsWidth = info->width; - mode->dmPelsHeight = info->height; mode->u2.dmDisplayFlags = 0; memcpy( (BYTE *)mode + sizeof(*mode), &info->id, sizeof(info->id) ); } static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count ) { + DWORD frequency, orientation, orientation_count; XRRScreenResources *screen_resources; XRROutputInfo *output_info = NULL; RROutput output = (RROutput)id; + XRRCrtcInfo *crtc_info = NULL; UINT depth_idx, mode_idx = 0; XRRModeInfo *mode_info; DEVMODEW *mode, *modes; + Rotation rotations; BOOL ret = FALSE; - DWORD frequency; + RRCrtc crtc; INT i, j; screen_resources = xrandr_get_screen_resources(); @@ -1184,9 +1245,44 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, goto done; } - /* Allocate space for display modes in different color depths. + crtc = output_info->crtc; + if (!crtc) + crtc = get_output_free_crtc( screen_resources, output_info ); + if (crtc) + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, crtc ); + + /* If the output is connected to a CRTC, use rotations reported by the CRTC */ + if (crtc_info) + { + if (flags & EDS_ROTATEDMODE) + { + rotations = crtc_info->rotations; + } + else + { + /* According to the RandR spec, RRGetCrtcInfo should set the active rotation to Rotate_0 + * when a CRTC is disabled. However, some RandR implementations report 0 in this case */ + rotations = (crtc_info->rotation & 0xf) ? crtc_info->rotation : RR_Rotate_0; + } + } + /* Not connected to CRTC, assume all rotations are supported */ + else + { + if (flags & EDS_ROTATEDMODE) + { + rotations = RR_Rotate_0 | RR_Rotate_90 | RR_Rotate_180 | RR_Rotate_270; + } + else + { + rotations = RR_Rotate_0; + } + } + orientation_count = get_orientation_count( rotations ); + + /* Allocate space for display modes in different color depths and orientations. * Store a RRMode at the end of each DEVMODEW as private driver data */ - modes = heap_calloc( output_info->nmode * DEPTH_COUNT, sizeof(*modes) + sizeof(RRMode) ); + modes = heap_calloc( output_info->nmode * DEPTH_COUNT * orientation_count, + sizeof(*modes) + sizeof(RRMode) ); if (!modes) goto done; @@ -1202,9 +1298,15 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) { - mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); - add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency ); - ++mode_idx; + for (orientation = DMDO_DEFAULT; orientation <= DMDO_270; ++orientation) + { + if (!((1 << orientation) & rotations)) + continue; + + mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + sizeof(RRMode)) * mode_idx); + add_xrandr14_mode( mode, mode_info, depths[depth_idx], frequency, orientation ); + ++mode_idx; + } } break; @@ -1215,6 +1317,8 @@ static BOOL xrandr14_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, *new_modes = modes; *mode_count = mode_idx; done: + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); if (output_info) pXRRFreeOutputInfo( output_info ); if (screen_resources) @@ -1285,10 +1389,10 @@ static BOOL xrandr14_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; - mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->u1.s2.dmDisplayOrientation = get_orientation( crtc_info->rotation ); mode->dmBitsPerPel = screen_bpp; - mode->dmPelsWidth = mode_info->width; - mode->dmPelsHeight = mode_info->height; + mode->dmPelsWidth = crtc_info->width; + mode->dmPelsHeight = crtc_info->height; mode->u2.dmDisplayFlags = 0; mode->dmDisplayFrequency = get_frequency( mode_info ); /* Convert RandR coordinates to virtual screen coordinates */ @@ -1314,8 +1418,8 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) XRROutputInfo *output_info = NULL; XRRCrtcInfo *crtc_info = NULL; LONG ret = DISP_CHANGE_FAILED; - INT crtc_idx, output_count; Rotation rotation; + INT output_count; RRCrtc crtc = 0; Status status; RRMode rrmode; @@ -1362,26 +1466,7 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) /* Detached, need to find a free CRTC */ else { - for (crtc_idx = 0; crtc_idx < output_info->ncrtc; ++crtc_idx) - { - crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtcs[crtc_idx] ); - if (!crtc_info) - goto done; - - if (!crtc_info->noutput) - { - crtc = output_info->crtcs[crtc_idx]; - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - break; - } - - pXRRFreeCrtcInfo( crtc_info ); - crtc_info = NULL; - } - - /* Failed to find a free CRTC */ - if (crtc_idx == output_info->ncrtc) + if (!(crtc = get_output_free_crtc( screen_resources, output_info ))) goto done; } @@ -1396,14 +1481,13 @@ static LONG xrandr14_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) { outputs = crtc_info->outputs; output_count = crtc_info->noutput; - rotation = crtc_info->rotation; } else { outputs = &output; output_count = 1; - rotation = RR_Rotate_0; } + rotation = get_rotation( mode->u1.s2.dmDisplayOrientation ); /* According to the RandR spec, the entire CRTC must fit inside the screen. * Since we use the union of all enabled CRTCs to determine the necessary -- 2.25.1

2 1

[PATCH 1/4] user32/tests: Add display orientation tests.
by Zhiyi Zhang Sept. 22, 2020

Sept. 22, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/monitor.c | 64 +++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index 7ae10fcf848..0ce27455a66 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -938,6 +938,70 @@ static void test_ChangeDisplaySettingsEx(void) } } + /* Test changing each adapter to every supported display orientation */ + for (device = 0; device < device_count; ++device) + { + memset(&dm, 0, sizeof(dm)); + dm.dmSize = sizeof(dm); + res = EnumDisplaySettingsA(devices[device].name, ENUM_CURRENT_SETTINGS, &dm); + ok(res, "EnumDisplaySettingsA %s failed, error %#x.\n", devices[device].name, GetLastError()); + + memset(&dm2, 0, sizeof(dm2)); + dm2.dmSize = sizeof(dm2); + for (mode = 0; EnumDisplaySettingsExA(devices[device].name, mode, &dm2, EDS_ROTATEDMODE); ++mode) + { + if (dm2.dmBitsPerPel != dm.dmBitsPerPel || dm2.dmDisplayFrequency != dm.dmDisplayFrequency) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_DEFAULT || dm2.dmDisplayOrientation == DMDO_180) + && (dm2.dmPelsWidth != dm.dmPelsWidth || dm2.dmPelsHeight != dm.dmPelsHeight)) + continue; + + if ((dm2.dmDisplayOrientation == DMDO_90 || dm2.dmDisplayOrientation == DMDO_270) + && (dm2.dmPelsWidth != dm.dmPelsHeight || dm2.dmPelsHeight != dm.dmPelsWidth)) + continue; + + res = ChangeDisplaySettingsExA(devices[device].name, &dm2, NULL, CDS_RESET, NULL); + if (res != DISP_CHANGE_SUCCESSFUL) + { + win_skip("Failed to change %s to mode %d.\n", devices[device].name, mode); + continue; + } + ok(res == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsExA %s mode %d returned unexpected %d.\n", + devices[device].name, mode, res); + flush_events(); + expect_dm(dm2, devices[device].name, mode); + + /* EnumDisplaySettingsEx without EDS_ROTATEDMODE reports modes with current orientation */ + memset(&dm3, 0, sizeof(dm3)); + dm3.dmSize = sizeof(dm3); + for (i = 0; EnumDisplaySettingsExA(devices[device].name, i, &dm3, 0); ++i) + { + ok(dm3.dmDisplayOrientation == dm2.dmDisplayOrientation, + "Expected %s display mode %d orientation %d, got %d.\n", + devices[device].name, i, dm2.dmDisplayOrientation, dm3.dmDisplayOrientation); + } + ok(i > 0, "Expected at least one display mode found.\n"); + + if (device == 0) + { + ok(GetSystemMetrics(SM_CXSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXSCREEN)); + ok(GetSystemMetrics(SM_CYSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYSCREEN)); + } + + if (device_count == 1) + { + ok(GetSystemMetrics(SM_CXVIRTUALSCREEN) == dm2.dmPelsWidth, "Expected %d, got %d.\n", + dm2.dmPelsWidth, GetSystemMetrics(SM_CXVIRTUALSCREEN)); + ok(GetSystemMetrics(SM_CYVIRTUALSCREEN) == dm2.dmPelsHeight, "Expected %d, got %d.\n", + dm2.dmPelsHeight, GetSystemMetrics(SM_CYVIRTUALSCREEN)); + } + } + ok(mode > 0, "Expected at least one display mode found.\n"); + } + /* Restore all adapters to their original settings */ for (device = 0; device < device_count; ++device) { -- 2.25.1

2 1