July 2020 - Wine-devel - list.winehq.org

[PATCH 6/6] winex11.drv: Remove the old virtual desktop display settings handler.
by Zhiyi Zhang 22 Jul '20

22 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 81 +------------------------------------- 1 file changed, 1 insertion(+), 80 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ea269d8f2cc..64f61d21e4d 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -35,10 +35,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -/* data for resolution changing */ -static struct x11drv_mode_info *dd_modes; -static unsigned int dd_mode_count; - static unsigned int max_width; static unsigned int max_height; static unsigned int desktop_width; @@ -90,72 +86,6 @@ BOOL is_virtual_desktop(void) return root_window != DefaultRootWindow( gdi_display ); } -/* create the mode structures */ -static void make_modes(void) -{ - RECT primary_rect = get_primary_monitor_rect(); - unsigned int i; - unsigned int screen_width = primary_rect.right - primary_rect.left; - unsigned int screen_height = primary_rect.bottom - primary_rect.top; - - /* original specified desktop size */ - X11DRV_Settings_AddOneMode(screen_width, screen_height, 0, 60); - for (i=0; i<ARRAY_SIZE(screen_sizes); i++) - { - if ( (screen_sizes[i].width <= max_width) && (screen_sizes[i].height <= max_height) ) - { - if ( ( (screen_sizes[i].width != max_width) || (screen_sizes[i].height != max_height) ) && - ( (screen_sizes[i].width != screen_width) || (screen_sizes[i].height != screen_height) ) ) - { - /* only add them if they are smaller than the root window and unique */ - X11DRV_Settings_AddOneMode(screen_sizes[i].width, screen_sizes[i].height, 0, 60); - } - } - } - if ((max_width != screen_width) || (max_height != screen_height)) - { - /* root window size (if different from desktop window) */ - X11DRV_Settings_AddOneMode(max_width, max_height, 0, 60); - } -} - -static int X11DRV_desktop_GetCurrentMode(void) -{ - unsigned int i; - DWORD dwBpp = screen_bpp; - RECT primary_rect = get_primary_monitor_rect(); - - for (i=0; i<dd_mode_count; i++) - { - if ( (primary_rect.right - primary_rect.left == dd_modes[i].width) && - (primary_rect.bottom - primary_rect.top == dd_modes[i].height) && - (dwBpp == dd_modes[i].bpp)) - return i; - } - ERR("In unknown mode, returning default\n"); - return 0; -} - -static LONG X11DRV_desktop_SetCurrentMode(int mode) -{ - DWORD dwBpp = screen_bpp; - if (dwBpp != dd_modes[mode].bpp) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].bpp); - /* Ignore the depth mismatch - * - * Some (older) applications require a specific bit depth, this will allow them - * to run. X11drv performs a color depth conversion if needed. - */ - } - TRACE("Resizing Wine desktop window to %dx%d\n", dd_modes[mode].width, dd_modes[mode].height); - - desktop_width = dd_modes[mode].width; - desktop_height = dd_modes[mode].height; - X11DRV_DisplayDevices_Update( TRUE ); - return DISP_CHANGE_SUCCESSFUL; -} - /* Virtual desktop display settings handler */ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) { @@ -372,16 +302,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - /* initialize the available resolutions */ - dd_modes = X11DRV_Settings_SetHandlers("desktop", - X11DRV_desktop_GetCurrentMode, - X11DRV_desktop_SetCurrentMode, - ARRAY_SIZE(screen_sizes)+2, 1); - make_modes(); - X11DRV_Settings_AddDepthModes(); - dd_mode_count = X11DRV_Settings_GetModeCount(); - - /* TODO: Remove the old display settings handler once the migration to the new interface is done */ + /* Initialize virtual desktop display settings handler */ settings_handler.name = "Virtual Desktop"; settings_handler.priority = 1000; settings_handler.get_id = X11DRV_desktop_get_id; -- 2.25.1

1 0

[PATCH 5/6] winex11.drv: Support setting virtual desktop display mode using the new display settings handler interface.
by Zhiyi Zhang 22 Jul '20

22 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 11 ++++ dlls/winex11.drv/settings.c | 123 +++++++++++++++++++++++++++++++++++- dlls/winex11.drv/x11drv.h | 6 ++ 3 files changed, 139 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 72a315e35be..ea269d8f2cc 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -251,6 +251,16 @@ static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) return TRUE; } +static LONG X11DRV_desktop_set_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + if (mode->dmFields & DM_BITSPERPEL && mode->dmBitsPerPel != screen_bpp) + WARN("Cannot change screen color depth from %dbits to %dbits!\n", screen_bpp, mode->dmBitsPerPel); + + desktop_width = mode->dmPelsWidth; + desktop_height = mode->dmPelsHeight; + return DISP_CHANGE_SUCCESSFUL; +} + static void query_desktop_work_area( RECT *rc_work ) { static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; @@ -378,6 +388,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) settings_handler.get_modes = X11DRV_desktop_get_modes; settings_handler.free_modes = X11DRV_desktop_free_modes; settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; + settings_handler.set_current_mode = X11DRV_desktop_set_current_mode; X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 8fc8cbd44dd..28c405ae0e0 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -30,6 +30,7 @@ #include "winreg.h" #include "wingdi.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11settings); @@ -466,6 +467,53 @@ BOOL is_detached_mode(const DEVMODEW *mode) mode->dmPelsHeight == 0; } +/* Get the full display mode with all the necessary fields set. + * Return NULL on failure. Caller should free the returned mode. */ +static DEVMODEW *get_full_mode(ULONG_PTR id, const DEVMODEW *dev_mode) +{ + DEVMODEW *modes, *full_mode, *found_mode = NULL; + UINT mode_count, mode_idx; + + if (!handler.get_modes(id, 0, &modes, &mode_count)) + return NULL; + + for (mode_idx = 0; mode_idx < mode_count; ++mode_idx) + { + found_mode = (DEVMODEW *)((BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * mode_idx); + + if (dev_mode->dmFields & DM_BITSPERPEL && found_mode->dmBitsPerPel != dev_mode->dmBitsPerPel) + continue; + if (dev_mode->dmFields & DM_PELSWIDTH && found_mode->dmPelsWidth != dev_mode->dmPelsWidth) + continue; + if (dev_mode->dmFields & DM_PELSHEIGHT && found_mode->dmPelsHeight != dev_mode->dmPelsHeight) + continue; + if (dev_mode->dmFields & DM_DISPLAYFREQUENCY && + dev_mode->dmDisplayFrequency && + found_mode->dmDisplayFrequency && + dev_mode->dmDisplayFrequency != 1 && + dev_mode->dmDisplayFrequency != found_mode->dmDisplayFrequency) + continue; + + break; + } + + if (!found_mode || mode_idx == mode_count) + { + handler.free_modes(modes); + return NULL; + } + + if (!(full_mode = heap_alloc(sizeof(*found_mode) + found_mode->dmDriverExtra))) + { + handler.free_modes(modes); + return NULL; + } + + memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); + handler.free_modes(modes); + return full_mode; +} + /*********************************************************************** * ChangeDisplaySettingsEx (X11DRV.@) * @@ -475,9 +523,82 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { WCHAR primary_adapter[CCHDEVICENAME]; char bpp_buffer[16], freq_buffer[18]; - DEVMODEW default_mode; + DEVMODEW default_mode, *full_mode; + ULONG_PTR id; + LONG ret; DWORD i; + /* Use the new interface if it is available */ + if (!handler.name) + goto old_interface; + + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + default_mode.dmSize = sizeof(default_mode); + if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + + if (!handler.get_id(devname, &id)) + { + ERR("Failed to get %s device id.\n", wine_dbgstr_w(devname)); + return DISP_CHANGE_BADPARAM; + } + + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (!(full_mode = get_full_mode(id, devmode))) + { + ERR("Failed to find a valid mode.\n"); + return DISP_CHANGE_BADMODE; + } + + if (flags & CDS_UPDATEREGISTRY && !write_registry_settings(devname, full_mode)) + { + ERR("Failed to write %s display settings to registry.\n", wine_dbgstr_w(devname)); + heap_free(full_mode); + return DISP_CHANGE_NOTUPDATED; + } + + if (lstrcmpiW(primary_adapter, devname)) + { + FIXME("Changing non-primary adapter %s settings is currently unsupported.\n", + wine_dbgstr_w(devname)); + heap_free(full_mode); + return DISP_CHANGE_SUCCESSFUL; + } + + if (flags & (CDS_TEST | CDS_NORESET)) + { + heap_free(full_mode); + return DISP_CHANGE_SUCCESSFUL; + } + + TRACE("handler:%s device:%s position:(%d,%d) resolution:%ux%u frequency:%uHz depth:%ubits " + "orientation:%#x.\n", handler.name, wine_dbgstr_w(devname), full_mode->u1.s2.dmPosition.x, + full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, + full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); + + ret = handler.set_current_mode(id, full_mode); + if (ret == DISP_CHANGE_SUCCESSFUL) + X11DRV_DisplayDevices_Update(TRUE); + heap_free(full_mode); + return ret; + +old_interface: if (!get_primary_adapter(primary_adapter)) return DISP_CHANGE_FAILED; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b19e0e3e80a..1c6b666227f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -697,6 +697,12 @@ struct x11drv_settings_handler * * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ BOOL (*get_current_mode)(ULONG_PTR id, DEVMODEW *mode); + + /* set_current_mode() will be called to change the display mode of the display device of id. + * mode must be a valid mode from get_modes() with optional fields, such as dmPosition set. + * + * Return DISP_CHANGE_*, same as ChangeDisplaySettingsExW() return values */ + LONG (*set_current_mode)(ULONG_PTR id, DEVMODEW *mode); }; extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 4/6] winex11.drv: Cache display modes for X11DRV_EnumDisplaySettingsEx().
by Zhiyi Zhang 22 Jul '20

22 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 41 ++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 097710fc1cc..8fc8cbd44dd 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -130,6 +130,21 @@ unsigned int X11DRV_Settings_GetModeCount(void) /* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ static struct x11drv_settings_handler handler; +/* Cached display modes for a device, protected by modes_section */ +static WCHAR cached_device_name[CCHDEVICENAME]; +static DWORD cached_flags; +static DEVMODEW *cached_modes; +static UINT cached_mode_count; + +static CRITICAL_SECTION modes_section; +static CRITICAL_SECTION_DEBUG modes_critsect_debug = +{ + 0, 0, &modes_section, + {&modes_critsect_debug.ProcessLocksList, &modes_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": modes_section")} +}; +static CRITICAL_SECTION modes_section = {&modes_critsect_debug, -1, 0, 0, 0, 0}; + void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) { if (new_handler->priority > handler.priority) @@ -353,22 +368,34 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo goto done; } - if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + EnterCriticalSection(&modes_section); + if (n == 0 || lstrcmpiW(cached_device_name, name) || cached_flags != flags) { - ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); - return FALSE; + if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + { + ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); + LeaveCriticalSection(&modes_section); + return FALSE; + } + + if (cached_modes) + handler.free_modes(cached_modes); + lstrcpyW(cached_device_name, name); + cached_flags = flags; + cached_modes = modes; + cached_mode_count = mode_count; } - if (n >= mode_count) + if (n >= cached_mode_count) { + LeaveCriticalSection(&modes_section); WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); - handler.free_modes(modes); SetLastError(ERROR_NO_MORE_FILES); return FALSE; } - memcpy(devmode, (BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * n, sizeof(*devmode)); - handler.free_modes(modes); + memcpy(devmode, (BYTE *)cached_modes + (sizeof(*cached_modes) + cached_modes[0].dmDriverExtra) * n, sizeof(*devmode)); + LeaveCriticalSection(&modes_section); done: /* Set generic fields */ -- 2.25.1

1 0

[PATCH 3/6] winex11.drv: Support virtual desktop display mode enumeration using the new display settings handler interface.
by Zhiyi Zhang 22 Jul '20

22 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 68 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 25 +++++++++++++- dlls/winex11.drv/x11drv.h | 17 ++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d3dcf90fb9d..72a315e35be 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -168,6 +168,72 @@ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) return TRUE; } +static void add_desktop_mode( DEVMODEW *mode, DWORD depth, DWORD width, DWORD height ) +{ + mode->dmSize = sizeof(*mode); + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = depth; + mode->dmPelsWidth = width; + mode->dmPelsHeight = height; + mode->u2.dmDisplayFlags = 0; + mode->dmDisplayFrequency = 60; +} + +static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_modes, UINT *mode_count ) +{ + UINT depth_idx, size_idx, mode_idx = 0; + UINT screen_width, screen_height; + RECT primary_rect; + DEVMODEW *modes; + + primary_rect = get_primary_monitor_rect(); + screen_width = primary_rect.right - primary_rect.left; + screen_height = primary_rect.bottom - primary_rect.top; + + /* Allocate memory for modes in different color depths */ + if (!(modes = heap_calloc( (ARRAY_SIZE(screen_sizes) + 2) * DEPTH_COUNT, sizeof(*modes))) ) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + for (depth_idx = 0; depth_idx < DEPTH_COUNT; ++depth_idx) + { + for (size_idx = 0; size_idx < ARRAY_SIZE(screen_sizes); ++size_idx) + { + if (screen_sizes[size_idx].width > max_width || + screen_sizes[size_idx].height > max_height) + continue; + + if (screen_sizes[size_idx].width == max_width && + screen_sizes[size_idx].height == max_height) + continue; + + if (screen_sizes[size_idx].width == screen_width && + screen_sizes[size_idx].height == screen_height) + continue; + + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_sizes[size_idx].width, + screen_sizes[size_idx].height ); + } + + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], screen_width, screen_height ); + if (max_width != screen_width || max_height != screen_height) + add_desktop_mode( &modes[mode_idx++], depths[depth_idx], max_width, max_height ); + } + + *new_modes = modes; + *mode_count = mode_idx; + return TRUE; +} + +static void X11DRV_desktop_free_modes( DEVMODEW *modes ) +{ + heap_free( modes ); +} + static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) { RECT primary_rect = get_primary_monitor_rect(); @@ -309,6 +375,8 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) settings_handler.name = "Virtual Desktop"; settings_handler.priority = 1000; settings_handler.get_id = X11DRV_desktop_get_id; + settings_handler.get_modes = X11DRV_desktop_get_modes; + settings_handler.free_modes = X11DRV_desktop_free_modes; settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e0dee951543..097710fc1cc 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -42,6 +42,7 @@ static unsigned int dd_max_modes = 0; */ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; +const unsigned int *depths; /* pointers to functions that actually do the hard stuff */ static int (*pGetCurrentMode)(void); @@ -158,6 +159,9 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) void X11DRV_Settings_Init(void) { RECT primary = get_host_primary_monitor_rect(); + + depths = screen_bpp == 32 ? depths_32 : depths_24; + X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode, @@ -321,10 +325,12 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo { static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; + DEVMODEW *modes; + UINT mode_count; ULONG_PTR id; /* Use the new interface if it is available */ - if (!handler.name || (n != ENUM_REGISTRY_SETTINGS && n != ENUM_CURRENT_SETTINGS)) + if (!handler.name) goto old_interface; if (n == ENUM_REGISTRY_SETTINGS) @@ -347,6 +353,23 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo goto done; } + if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + { + ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); + return FALSE; + } + + if (n >= mode_count) + { + WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); + handler.free_modes(modes); + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; + } + + memcpy(devmode, (BYTE *)modes + (sizeof(*modes) + modes[0].dmDriverExtra) * n, sizeof(*devmode)); + handler.free_modes(modes); + done: /* Set generic fields */ devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 49059e09b70..b19e0e3e80a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,6 +657,9 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +#define DEPTH_COUNT 3 +extern const unsigned int *depths DECLSPEC_HIDDEN; + /* Required functions for changing and enumerating display settings */ struct x11drv_settings_handler { @@ -672,6 +675,20 @@ struct x11drv_settings_handler * Return FALSE if the device can not be found and TRUE on success */ BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + /* get_modes() will be called to get a list of supported modes of the device of id in modes + * with respect to flags, which could be 0, EDS_RAWMODE or EDS_ROTATEDMODE. If the implementation + * uses dmDriverExtra then every DEVMODEW in the list must have the same dmDriverExtra value + * + * Following fields in DEVMODE must be valid: + * dmSize, dmDriverExtra, dmFields, dmDisplayOrientation, dmBitsPerPel, dmPelsWidth, dmPelsHeight, + * dmDisplayFlags and dmDisplayFrequency + * + * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ + BOOL (*get_modes)(ULONG_PTR id, DWORD flags, DEVMODEW **modes, UINT *mode_count); + + /* free_modes() will be called to free the mode list returned from get_modes() */ + void (*free_modes)(DEVMODEW *modes); + /* get_current_mode() will be called to get the current display mode of the device of id * * Following fields in DEVMODE must be valid: -- 2.25.1

1 0

[PATCH 2/6] winex11.drv: Migrate the virtual desktop display settings handler to a new interface.
by Zhiyi Zhang 22 Jul '20

22 Jul '20

The old display settings handler interface can only support one adapter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 41 +++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 48 +++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 27 +++++++++++++++++++++ 3 files changed, 116 insertions(+) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b5894d5e028..d3dcf90fb9d 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -2,6 +2,7 @@ * X11DRV desktop window handling * * Copyright 2001 Alexandre Julliard + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,9 @@ #include <X11/cursorfont.h> #include <X11/Xlib.h> +#define NONAMELESSSTRUCT +#define NONAMELESSUNION + #include "x11drv.h" /* avoid conflict with field names in included win32 headers */ @@ -152,6 +156,35 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) return DISP_CHANGE_SUCCESSFUL; } +/* Virtual desktop display settings handler */ +static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) +{ + WCHAR primary_adapter[CCHDEVICENAME]; + + if (!get_primary_adapter( primary_adapter ) || lstrcmpiW( primary_adapter, device_name )) + return FALSE; + + *id = 0; + return TRUE; +} + +static BOOL X11DRV_desktop_get_current_mode( ULONG_PTR id, DEVMODEW *mode ) +{ + RECT primary_rect = get_primary_monitor_rect(); + + mode->dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY | DM_POSITION; + mode->u1.s2.dmDisplayOrientation = DMDO_DEFAULT; + mode->dmBitsPerPel = screen_bpp; + mode->dmPelsWidth = primary_rect.right - primary_rect.left; + mode->dmPelsHeight = primary_rect.bottom - primary_rect.top; + mode->u2.dmDisplayFlags = 0; + mode->dmDisplayFrequency = 60; + mode->u1.s2.dmPosition.x = 0; + mode->u1.s2.dmPosition.y = 0; + return TRUE; +} + static void query_desktop_work_area( RECT *rc_work ) { static const WCHAR trayW[] = {'S','h','e','l','l','_','T','r','a','y','W','n','d',0}; @@ -242,6 +275,7 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { RECT primary_rect = get_host_primary_monitor_rect(); + struct x11drv_settings_handler settings_handler; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ @@ -270,6 +304,13 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) make_modes(); X11DRV_Settings_AddDepthModes(); dd_mode_count = X11DRV_Settings_GetModeCount(); + + /* TODO: Remove the old display settings handler once the migration to the new interface is done */ + settings_handler.name = "Virtual Desktop"; + settings_handler.priority = 1000; + settings_handler.get_id = X11DRV_desktop_get_id; + settings_handler.get_current_mode = X11DRV_desktop_get_current_mode; + X11DRV_Settings_SetHandler( &settings_handler ); } diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index bbbb6fdf0a3..e0dee951543 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -2,6 +2,7 @@ * Wine X11drv display settings functions * * Copyright 2003 Alexander James Pasadyn + * Copyright 2020 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,6 +126,18 @@ unsigned int X11DRV_Settings_GetModeCount(void) return dd_mode_count; } +/* TODO: Remove the old display settings handler interface once all backends are migrated to the new interface */ +static struct x11drv_settings_handler handler; + +void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display settings are now handled by: %s.\n", handler.name); + } +} + /*********************************************************************** * Default handlers if resolution switching is not enabled * @@ -308,7 +321,42 @@ BOOL CDECL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmo { static const WCHAR dev_name[CCHDEVICENAME] = { 'W','i','n','e',' ','X','1','1',' ','d','r','i','v','e','r',0 }; + ULONG_PTR id; + /* Use the new interface if it is available */ + if (!handler.name || (n != ENUM_REGISTRY_SETTINGS && n != ENUM_CURRENT_SETTINGS)) + goto old_interface; + + if (n == ENUM_REGISTRY_SETTINGS) + { + if (!read_registry_settings(name, devmode)) + { + ERR("Failed to get %s registry display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + + if (n == ENUM_CURRENT_SETTINGS) + { + if (!handler.get_id(name, &id) || !handler.get_current_mode(id, devmode)) + { + ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); + return FALSE; + } + goto done; + } + +done: + /* Set generic fields */ + devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); + devmode->dmDriverExtra = 0; + devmode->dmSpecVersion = DM_SPECVERSION; + devmode->dmDriverVersion = DM_SPECVERSION; + lstrcpyW(devmode->dmDeviceName, dev_name); + return TRUE; + +old_interface: devmode->dmSize = FIELD_OFFSET(DEVMODEW, dmICMMethod); devmode->dmSpecVersion = DM_SPECVERSION; devmode->dmDriverVersion = DM_SPECVERSION; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9bbb48f1eeb..49059e09b70 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -657,6 +657,33 @@ struct x11drv_mode_info unsigned int refresh_rate; }; +/* Required functions for changing and enumerating display settings */ +struct x11drv_settings_handler +{ + /* A name to tell what host driver is used */ + const char *name; + + /* Higher priority can override handlers with a lower priority */ + UINT priority; + + /* get_id() will be called to map a device name, e.g., \\.\DISPLAY1 to a driver specific id. + * Following functions use this id to identify the device. + * + * Return FALSE if the device can not be found and TRUE on success */ + BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); + + /* get_current_mode() will be called to get the current display mode of the device of id + * + * Following fields in DEVMODE must be valid: + * dmFields, dmDisplayOrientation, dmBitsPerPel, dmPelsWidth, dmPelsHeight, dmDisplayFlags, + * dmDisplayFrequency and dmPosition + * + * Return FALSE on failure with parameters unchanged and error code set. Return TRUE on success */ + BOOL (*get_current_mode)(ULONG_PTR id, DEVMODEW *mode); +}; + +extern void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *handler) DECLSPEC_HIDDEN; + extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(BOOL) DECLSPEC_HIDDEN; extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; -- 2.25.1

1 0

[PATCH 1/6] winex11.drv: Allow reporting a virtual desktop mode with the same width or height as the current mode.
by Zhiyi Zhang 22 Jul '20

22 Jul '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 5a9e0f59ae8..b5894d5e028 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -108,7 +108,7 @@ static void make_modes(void) } } } - if ((max_width != screen_width) && (max_height != screen_height)) + if ((max_width != screen_width) || (max_height != screen_height)) { /* root window size (if different from desktop window) */ X11DRV_Settings_AddOneMode(max_width, max_height, 0, 60); -- 2.25.1

1 0

[PATCH v4] winevulkan: Implement VK_EXT_calibrated_timestamps
by Joshua Ashton 22 Jul '20

22 Jul '20

Map performance counter to the appropriate monotonic clock used by ntdll/unix/sync.c The performance counter timestamp clock won't be available under Mac and platforms without clock_gettime. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> --- dlls/winevulkan/make_vulkan | 5 +- dlls/winevulkan/vulkan.c | 146 ++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 04b263e3e4..b5629b95a5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -100,7 +100,6 @@ UNSUPPORTED_EXTENSIONS = [ # Device extensions "VK_AMD_display_native_hdr", - "VK_EXT_calibrated_timestamps", "VK_EXT_display_control", # Requires VK_EXT_display_surface_counter "VK_EXT_full_screen_exclusive", "VK_EXT_hdr_metadata", # Needs WSI work. @@ -222,6 +221,10 @@ FUNCTION_OVERRIDES = { # VK_EXT_private_data "vkGetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, "vkSetPrivateDataEXT" : {"dispatch": True, "driver" : False, "thunk" : False}, + + # VK_EXT_calibrated_timestamps + "vkGetPhysicalDeviceCalibrateableTimeDomainsEXT" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkGetCalibratedTimestampsEXT" : {"dispatch" : True, "driver" : False, "thunk" : False}, } STRUCT_CHAIN_CONVERSIONS = [ diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4642975ad0..be614f1cef 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -17,6 +17,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" +#include <time.h> #include <stdarg.h> #include "windef.h" @@ -1265,6 +1267,150 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi return res; } +/* From ntdll/unix/sync.c */ +#define NANOSECONDS_IN_A_SECOND 1000000000 +#define TICKSPERSEC 10000000 + +static inline VkTimeDomainEXT get_performance_counter_time_domain(void) +{ +#if !defined(__APPLE__) && defined(HAVE_CLOCK_GETTIME) +# ifdef CLOCK_MONOTONIC_RAW + return VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT; +# else + return VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT; +# endif +#else + FIXME("No mapping for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT on this platform."); + return VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; +#endif +} + +static VkTimeDomainEXT map_to_host_time_domain(VkTimeDomainEXT domain) +{ + /* Matches ntdll/unix/sync.c's performance counter implementation. */ + if (domain == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT) + return get_performance_counter_time_domain(); + + return domain; +} + +static inline uint64_t convert_monotonic_timestamp(uint64_t value) +{ + return value / (NANOSECONDS_IN_A_SECOND / TICKSPERSEC); +} + +static inline uint64_t convert_timestamp(VkTimeDomainEXT host_domain, VkTimeDomainEXT target_domain, uint64_t value) +{ + if (host_domain == target_domain) + return value; + + /* Convert between MONOTONIC time in ns -> QueryPerformanceCounter */ + if ((host_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT || host_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) + && target_domain == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT) + return convert_monotonic_timestamp(value); + + FIXME("Couldn't translate between host domain %d and target domain %d", host_domain, target_domain); + return value; +} + +VkResult WINAPI wine_vkGetCalibratedTimestampsEXT(VkDevice device, + uint32_t timestamp_count, const VkCalibratedTimestampInfoEXT *timestamp_infos, + uint64_t *timestamps, uint64_t *max_deviation) +{ + VkCalibratedTimestampInfoEXT* host_timestamp_infos; + unsigned int i; + VkResult res; + TRACE("%p, %u, %p, %p, %p\n", device, timestamp_count, timestamp_infos, timestamps, max_deviation); + + if (!(host_timestamp_infos = heap_alloc(sizeof(VkCalibratedTimestampInfoEXT) * timestamp_count))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + for (i = 0; i < timestamp_count; i++) + { + host_timestamp_infos[i].sType = timestamp_infos[i].sType; + host_timestamp_infos[i].pNext = timestamp_infos[i].pNext; + host_timestamp_infos[i].timeDomain = map_to_host_time_domain(timestamp_infos[i].timeDomain); + } + + res = device->funcs.p_vkGetCalibratedTimestampsEXT(device->device, timestamp_count, host_timestamp_infos, timestamps, max_deviation); + + for (i = 0; i < timestamp_count; i++) + timestamps[i] = convert_timestamp(host_timestamp_infos[i].timeDomain, timestamp_infos[i].timeDomain, timestamps[i]); + + heap_free(host_timestamp_infos); + + return res; +} + +VkResult WINAPI wine_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(VkPhysicalDevice phys_dev, + uint32_t *time_domain_count, VkTimeDomainEXT *time_domains) +{ + BOOL supports_device = FALSE, supports_monotonic = FALSE, supports_monotonic_raw = FALSE; + const VkTimeDomainEXT performance_counter_domain = get_performance_counter_time_domain(); + VkTimeDomainEXT *host_time_domains; + uint32_t host_time_domain_count; + VkTimeDomainEXT out_time_domains[2]; + uint32_t out_time_domain_count; + unsigned int i; + VkResult res; + + TRACE("%p, %p, %p\n", phys_dev, time_domain_count, time_domains); + + /* Find out the time domains supported on the host */ + res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, NULL); + if (res != VK_SUCCESS) + return res; + + if (!(host_time_domains = heap_alloc(sizeof(VkTimeDomainEXT) * host_time_domain_count))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = phys_dev->instance->funcs.p_vkGetPhysicalDeviceCalibrateableTimeDomainsEXT(phys_dev->phys_dev, &host_time_domain_count, host_time_domains); + if (res != VK_SUCCESS) + return res; + + for (i = 0; i < host_time_domain_count; i++) + { + if (host_time_domains[i] == VK_TIME_DOMAIN_DEVICE_EXT) + supports_device = TRUE; + else if (host_time_domains[i] == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) + supports_monotonic = TRUE; + else if (host_time_domains[i] == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT) + supports_monotonic_raw = TRUE; + else + FIXME("Unknown time domain %d", host_time_domains[i]); + } + + heap_free(host_time_domains); + + out_time_domain_count = 0; + + /* Map our monotonic times -> QPC */ + if (supports_monotonic_raw && performance_counter_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_RAW_EXT) + out_time_domains[out_time_domain_count++] = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; + else if (supports_monotonic && performance_counter_domain == VK_TIME_DOMAIN_CLOCK_MONOTONIC_EXT) + out_time_domains[out_time_domain_count++] = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; + else + FIXME("VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT not supported on this platform."); + + /* Forward the device domain time */ + if (supports_device) + out_time_domains[out_time_domain_count++] = VK_TIME_DOMAIN_DEVICE_EXT; + + /* Send the count/domains back to the app */ + if (!time_domains) + { + *time_domain_count = out_time_domain_count; + return VK_SUCCESS; + } + + for (i = 0; i < min(*time_domain_count, out_time_domain_count); i++) + time_domains[i] = out_time_domains[i]; + + res = *time_domain_count < out_time_domain_count ? VK_INCOMPLETE : VK_SUCCESS; + *time_domain_count = out_time_domain_count; + return res; +} + static HANDLE get_display_device_init_mutex(void) { static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; -- 2.27.0

4 4

[PATCH] quartz/vmr9: Return E_INVALIDARG if both texture and offscreen flags are passed to AllocateSurfaceHelper().
by Zebediah Figura 21 Jul '20

21 Jul '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 7 +++++++ dlls/quartz/vmr9.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a2fd5b76861..092ee871328 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2760,6 +2760,13 @@ static void test_allocate_surface_helper(void) IDirect3DSurface9_Release(surfaces[0]); + info.Format = D3DFMT_A8R8G8B8; + info.dwFlags = VMR9AllocFlag_OffscreenSurface | VMR9AllocFlag_TextureSurface; + count = 1; + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + out: IVMRSurfaceAllocatorNotify9_Release(notify); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 00cd6bbce84..f66500086d5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2042,6 +2042,13 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa allocinfo->dwFlags, allocinfo->dwWidth, allocinfo->dwHeight, allocinfo->Format, allocinfo->Format, allocinfo->Pool, allocinfo->MinBuffers); + if ((allocinfo->dwFlags & VMR9AllocFlag_TextureSurface) + && (allocinfo->dwFlags & VMR9AllocFlag_OffscreenSurface)) + { + WARN("Invalid flags specified; returning E_INVALIDARG.\n"); + return E_INVALIDARG; + } + if (!allocinfo->Format) { IDirect3DSurface9 *backbuffer; -- 2.27.0

1 1

[PATCH] setupapi: change to IMPORTS from DELAYIMPORTS.
by Jordan 21 Jul '20

21 Jul '20

Using DELAYIMPORTS is breaking startup of some applications. After discussion in #winehackers IRC, it was remarked that there is no good reason to keep setupapi under DELAYIMPORTS, thus I have moved all occurrences of it to IMPORTS instead. Signed-off-by: Jordan <jordan(a)niau.io> --- Fixes bugs similar to: https://bugs.winehq.org/show_bug.cgi?id=45936 however does not address it, this sentence is for semantics. --- dlls/gdi32/Makefile.in | 4 ++-- dlls/hidclass.sys/Makefile.in | 4 ++-- dlls/ntoskrnl.exe/Makefile.in | 4 ++-- dlls/xinput1_1/Makefile.in | 3 ++- dlls/xinput1_2/Makefile.in | 3 ++- dlls/xinput1_3/Makefile.in | 3 ++- dlls/xinput1_4/Makefile.in | 3 ++- dlls/xinput9_1_0/Makefile.in | 3 ++- programs/wineboot/Makefile.in | 4 ++-- 9 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 32b2e6959c..5f34a56478 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -1,10 +1,10 @@ EXTRADEFS = -D_GDI32_ MODULE = gdi32.dll IMPORTLIB = gdi32 -IMPORTS = advapi32 +IMPORTS = advapi32 setupapi EXTRAINCL = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) EXTRALIBS = $(CARBON_LIBS) $(APPKIT_LIBS) -DELAYIMPORTS = usp10 setupapi +DELAYIMPORTS = usp10 C_SRCS = \ bidi.c \ diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in index be4af74785..32ed254025 100644 --- a/dlls/hidclass.sys/Makefile.in +++ b/dlls/hidclass.sys/Makefile.in @@ -1,7 +1,7 @@ MODULE = hidclass.sys IMPORTLIB = hidclass -IMPORTS = hal ntoskrnl -DELAYIMPORTS = setupapi hid +IMPORTS = hal ntoskrnl setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index df48e44ede..10e5b7951e 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,7 +1,7 @@ MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl -IMPORTS = advapi32 hal msvcrt -DELAYIMPORTS = rpcrt4 setupapi +IMPORTS = advapi32 hal msvcrt setupapi +DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index a2b17a248c..9300d2e120 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -1,6 +1,7 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index fd38c6f6cc..d4f042e3c1 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -1,6 +1,7 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 3b4968fb6d..cf9d64c073 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -1,6 +1,7 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput -DELAYIMPORTS = hid setupapi +IMPORTS = setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index cdf4b4fed0..517fde300b 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -1,6 +1,7 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index dc8739c464..cebb3523b9 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -1,6 +1,7 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 -DELAYIMPORTS = hid setupapi +IMPORTS = setupapi +DELAYIMPORTS = hid EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 3921fa9644..f6fabf5990 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,7 +1,7 @@ MODULE = wineboot.exe APPMODE = -mconsole -IMPORTS = uuid advapi32 -DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev +IMPORTS = uuid advapi32 setupapi +DELAYIMPORTS = shell32 shlwapi version user32 newdev EXTRADLLFLAGS = -mno-cygwin -- 2.27.0

2 3

[PATCH 1/5] include: Fix undefined char16_t with -DWINE_UNICODE_CHAR16.
by Puetz Kevin A 21 Jul '20

21 Jul '20

In c++11 char16_t is a built-in fundamental type, but in c11 it is a typedef from <uchar.h> Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> --- include/sqltypes.h | 3 +++ include/tchar.h | 3 +++ include/winnt.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/include/sqltypes.h b/include/sqltypes.h index 0923f6b362..8d406df562 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -31,6 +31,9 @@ typedef unsigned char SQLCHAR; #if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; #elif defined(WINE_UNICODE_CHAR16) +# if !defined(__cplusplus) && !defined(RC_INVOKED) +# include <uchar.h> /* Bring in char16_t and char32_t for C */ +# endif typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; diff --git a/include/tchar.h b/include/tchar.h index 9fc4c72099..56f876bf84 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -241,6 +241,9 @@ typedef unsigned short wctype_t; #if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; #elif defined(WINE_UNICODE_CHAR16) +# if !defined(__cplusplus) && !defined(RC_INVOKED) +# include <uchar.h> /* Bring in char16_t and char32_t for C */ +# endif typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; diff --git a/include/winnt.h b/include/winnt.h index e1cf78420a..126135eca2 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -463,6 +463,9 @@ typedef int LONG, *PLONG; #if defined(WINE_UNICODE_NATIVE) typedef wchar_t WCHAR; #elif defined(WINE_UNICODE_CHAR16) +# if !defined(__cplusplus) && !defined(RC_INVOKED) +# include <uchar.h> /* Bring in char16_t and char32_t for C */ +# endif typedef char16_t WCHAR; #else typedef unsigned short WCHAR; -- 2.27.0.windows.1

2 5