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

[PATCH] explorer: Set the default driver to mac,x11 in all cases.
by Huw Davies May 20, 2019

May 20, 2019

The host specific options won't work with the PE build anyway. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- programs/explorer/desktop.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2857fcfca9..d4925f7c5b 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -37,11 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff -#ifdef __APPLE__ static const WCHAR default_driver[] = {'m','a','c',',','x','1','1',0}; -#else -static const WCHAR default_driver[] = {'x','1','1',0}; -#endif static BOOL using_root; -- 2.18.0

1 0

[PATCH] kernelbase: Add remaining string handling functions from shlwapi.
by Nikolay Sivov May 20, 2019

May 20, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 34 ++-- dlls/kernelbase/string.c | 306 ++++++++++++++++++++++++++++++++ 2 files changed, 323 insertions(+), 17 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 48276b8bcf..46163150c1 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1381,7 +1381,7 @@ @ stdcall SHRegSetUSValueW( wstr wstr long ptr long long) shlwapi.SHRegSetUSValueW @ stdcall SHRegWriteUSValueA(long str long ptr long long) shlwapi.SHRegWriteUSValueA @ stdcall SHRegWriteUSValueW(long wstr long ptr long long) shlwapi.SHRegWriteUSValueW -@ stdcall SHTruncateString(str long) shlwapi.SHTruncateString +@ stdcall SHTruncateString(str long) # @ stub SaveAlternatePackageRootPath # @ stub SaveStateRootFolderPath @ stdcall ScrollConsoleScreenBufferA(long ptr ptr ptr ptr) kernel32.ScrollConsoleScreenBufferA @@ -1525,13 +1525,13 @@ # @ stub StmReduceSize # @ stub StmReserve # @ stub StmWrite -@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA -@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA -@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW -@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW -@ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA -@ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW -@ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW +@ stdcall StrCSpnA(str str) +@ stdcall StrCSpnIA(str str) +@ stdcall StrCSpnIW(wstr wstr) +@ stdcall StrCSpnW(wstr wstr) +@ stdcall StrCatBuffA(str str long) +@ stdcall StrCatBuffW(wstr wstr long) +@ stdcall StrCatChainW(ptr long long wstr) @ stdcall StrChrA(str long) # @ stub StrChrA_MB @ stdcall StrChrIA(str long) @@ -1546,8 +1546,8 @@ @ stdcall StrCmpIW(wstr wstr) @ stdcall StrCmpLogicalW(wstr wstr) @ stdcall StrCmpNA(str str long) -@ stdcall StrCmpNCA(str ptr long) shlwapi.StrCmpNCA -@ stdcall StrCmpNCW(wstr wstr long) shlwapi.StrCmpNCW +@ stdcall StrCmpNCA(str str long) +@ stdcall StrCmpNCW(wstr wstr long) @ stdcall StrCmpNIA(str str long) @ stdcall StrCmpNICA(long long long) @ stdcall StrCmpNICW(wstr wstr long) @@ -1563,16 +1563,16 @@ @ stdcall StrIsIntlEqualW(long wstr wstr long) @ stdcall StrPBrkA(str str) @ stdcall StrPBrkW(wstr wstr) -@ stdcall StrRChrA(str str long) shlwapi.StrRChrA -@ stdcall StrRChrIA(str str long) shlwapi.StrRChrIA +@ stdcall StrRChrA(str str long) +@ stdcall StrRChrIA(str str long) @ stdcall StrRChrIW(wstr wstr long) @ stdcall StrRChrW(wstr wstr long) -@ stdcall StrRStrIA(str str str) shlwapi.StrRStrIA -@ stdcall StrRStrIW(wstr wstr wstr) shlwapi.StrRStrIW -@ stdcall StrSpnA(str str) shlwapi.StrSpnA +@ stdcall StrRStrIA(str str str) +@ stdcall StrRStrIW(wstr wstr wstr) +@ stdcall StrSpnA(str str) @ stdcall StrSpnW(wstr wstr) -@ stdcall StrStrA(str str) shlwapi.StrStrA -@ stdcall StrStrIA(str str) shlwapi.StrStrIA +@ stdcall StrStrA(str str) +@ stdcall StrStrIA(str str) @ stdcall StrStrIW(wstr wstr) @ stdcall StrStrNIW(wstr wstr long) @ stdcall StrStrNW(wstr wstr long) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index a858f3a51a..4c18acffe5 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -305,11 +305,45 @@ BOOL WINAPI ChrCmpIA(WORD ch1, WORD ch2) return char_compare(ch1, ch2, NORM_IGNORECASE); } +static BOOL WINAPI ChrCmpA(WORD ch1, WORD ch2) +{ + return char_compare(ch1, ch2, 0); +} + BOOL WINAPI ChrCmpIW(WCHAR ch1, WCHAR ch2) { return CompareStringW(GetThreadLocale(), NORM_IGNORECASE, &ch1, 1, &ch2, 1) - CSTR_EQUAL; } +static char * strstr_helper(const char *str, const char *search, + INT (WINAPI *cmp_func)(const char *, const char *, int)) +{ + const char *end; + size_t len; + + if (!str || !search || !*search) + return NULL; + + len = strlen(search); + end = str + strlen(str); + + while (str + len <= end) + { + if (!cmp_func(str, search, len)) + return (char *)str; + str = CharNextA(str); + } + + return NULL; +} + +char * WINAPI StrStrA(const char *str, const char *search) +{ + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(search)); + + return strstr_helper(str, search, StrCmpNA); +} + WCHAR * WINAPI StrStrW(const WCHAR *str, const WCHAR *search) { TRACE("%s, %s\n", wine_dbgstr_w(str), wine_dbgstr_w(search)); @@ -378,6 +412,16 @@ int WINAPI StrCmpNW(const WCHAR *str, const WCHAR *comp, int len) return CompareStringW(GetThreadLocale(), 0, str, len, comp, len) - CSTR_EQUAL; } +DWORD WINAPI StrCmpNCA(const char *str, const char *comp, int len) +{ + return StrCmpNA(str, comp, len); +} + +DWORD WINAPI StrCmpNCW(const WCHAR *str, const WCHAR *comp, int len) +{ + return StrCmpNW(str, comp, len); +} + int WINAPI StrCmpNIW(const WCHAR *str, const WCHAR *comp, int len) { TRACE("%s, %s, %i\n", wine_dbgstr_w(str), wine_dbgstr_w(comp), len); @@ -416,6 +460,13 @@ WCHAR * WINAPI StrCpyNW(WCHAR *dst, const WCHAR *src, int count) return dst; } +char * WINAPI StrStrIA(const char *str, const char *search) +{ + TRACE("%s, %s\n", wine_dbgstr_a(str), debugstr_a(search)); + + return strstr_helper(str, search, StrCmpNIA); +} + WCHAR * WINAPI StrStrIW(const WCHAR *str, const WCHAR *search) { unsigned int len; @@ -439,12 +490,111 @@ WCHAR * WINAPI StrStrIW(const WCHAR *str, const WCHAR *search) return NULL; } +static int strspn_helper(const char *str, const char *match, char * (WINAPI *func)(const char *, WORD), BOOL invert) +{ + const char *ptr = str; + + if (!str || !*str || !match) + return 0; + + while (*ptr) + { + const char *test = func(match, *ptr); + + if (!invert && !test) + break; + if (invert && test) + break; + + ptr = CharNextA(ptr); + }; + + return ptr - str; +} + +int WINAPI StrSpnA(const char *str, const char *match) +{ + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); + + return strspn_helper(str, match, StrChrA, FALSE); +} + int WINAPI StrSpnW(const WCHAR *str, const WCHAR *match) { if (!str || !match) return 0; return strspnW(str, match); } +int WINAPI StrCSpnA(const char *str, const char *match) +{ + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); + + return strspn_helper(str, match, StrChrA, TRUE); +} + +int WINAPI StrCSpnW(const WCHAR *str, const WCHAR *match) +{ + if (!str || !match) + return 0; + + return strcspnW(str, match); +} + +int WINAPI StrCSpnIA(const char *str, const char *match) +{ + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); + + return strspn_helper(str, match, StrChrIA, TRUE); +} + +int WINAPI StrCSpnIW(const WCHAR *str, const WCHAR *match) +{ + const WCHAR *ptr = str; + + TRACE("%s, %s\n", wine_dbgstr_w(str), wine_dbgstr_w(match)); + + if (!str || !*str || !match) + return 0; + + while (*ptr) + { + if (StrChrIW(match, *ptr)) break; + ptr++; + } + + return ptr - str; +} + +static LPSTR strrchra_helper(const char *str, const char *end, WORD ch, BOOL (WINAPI *cmp_func)(WORD, WORD)) +{ + const char *ret = NULL; + WORD ch2; + + if (!str) + return NULL; + + if (!end) + end = str + lstrlenA(str); + + while (*str && str <= end) + { + ch2 = IsDBCSLeadByte(*str) ? *str << 8 | str[1] : *str; + + if (!cmp_func(ch, ch2)) + ret = str; + str = CharNextA(str); + } + + return (char *)ret; +} + +char * WINAPI StrRChrA(const char *str, const char *end, WORD ch) +{ + TRACE("%s, %s, %#x\n", wine_dbgstr_a(str), wine_dbgstr_a(end), ch); + + return strrchra_helper(str, end, ch, ChrCmpA); +} + WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch) { WCHAR *ret = NULL; @@ -459,6 +609,13 @@ WCHAR * WINAPI StrRChrW(const WCHAR *str, const WCHAR *end, WORD ch) return ret; } +char * WINAPI StrRChrIA(const char *str, const char *end, WORD ch) +{ + TRACE("%s, %s, %#x\n", wine_dbgstr_a(str), wine_dbgstr_a(end), ch); + + return strrchra_helper(str, end, ch, ChrCmpIA); +} + WCHAR * WINAPI StrRChrIW(const WCHAR *str, const WCHAR *end, WORD ch) { WCHAR *ret = NULL; @@ -473,6 +630,73 @@ WCHAR * WINAPI StrRChrIW(const WCHAR *str, const WCHAR *end, WORD ch) return ret; } +char * WINAPI StrRStrIA(const char *str, const char *end, const char *search) +{ + char *ret = NULL; + WORD ch1, ch2; + int len; + + TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(search)); + + if (!str || !search || !*search) + return NULL; + + if (IsDBCSLeadByte(*search)) + ch1 = *search << 8 | (UCHAR)search[1]; + else + ch1 = *search; + len = lstrlenA(search); + + if (!end) + end = str + lstrlenA(str); + else /* reproduce the broken behaviour on Windows */ + end += min(len - 1, lstrlenA(end)); + + while (str + len <= end && *str) + { + ch2 = IsDBCSLeadByte(*str) ? *str << 8 | (UCHAR)str[1] : *str; + if (!ChrCmpIA(ch1, ch2)) + { + if (!StrCmpNIA(str, search, len)) + ret = (char *)str; + } + + str = CharNextA(str); + } + + return ret; +} + +WCHAR * WINAPI StrRStrIW(const WCHAR *str, const WCHAR *end, const WCHAR *search) +{ + WCHAR *ret = NULL; + int len; + + TRACE("%s, %s\n", wine_dbgstr_w(str), wine_dbgstr_w(search)); + + if (!str || !search || !*search) + return NULL; + + len = strlenW(search); + + if (!end) + end = str + strlenW(str); + else + end += min(len - 1, lstrlenW(end)); + + while (str + len <= end && *str) + { + if (!ChrCmpIW(*search, *str)) + { + if (!StrCmpNIW(str, search, len)) + ret = (WCHAR *)str; + } + str++; + } + + return ret; +} + char * WINAPI StrPBrkA(const char *str, const char *match) { TRACE("%s, %s\n", wine_dbgstr_a(str), wine_dbgstr_a(match)); @@ -1120,3 +1344,85 @@ BOOL WINAPI StrIsIntlEqualW(BOOL case_sensitive, const WCHAR *str, const WCHAR * return (CompareStringW(GetThreadLocale(), flags, str, len, cmp, len) == CSTR_EQUAL); } + +char * WINAPI StrCatBuffA(char *str, const char *cat, INT max_len) +{ + INT len; + + TRACE("%p, %s, %d\n", str, wine_dbgstr_a(cat), max_len); + + if (!str) + return NULL; + + len = strlen(str); + max_len -= len; + if (max_len > 0) + StrCpyNA(str + len, cat, max_len); + + return str; +} + +WCHAR * WINAPI StrCatBuffW(WCHAR *str, const WCHAR *cat, INT max_len) +{ + INT len; + + TRACE("%p, %s, %d\n", str, wine_dbgstr_w(cat), max_len); + + if (!str) + return NULL; + + len = strlenW(str); + max_len -= len; + if (max_len > 0) + StrCpyNW(str + len, cat, max_len); + + return str; +} + +DWORD WINAPI StrCatChainW(WCHAR *str, DWORD max_len, DWORD at, const WCHAR *cat) +{ + TRACE("%s, %u, %d, %s\n", wine_dbgstr_w(str), max_len, at, wine_dbgstr_w(cat)); + + if (at == -1) + at = strlenW(str); + + if (!max_len) + return at; + + if (at == max_len) + at--; + + if (cat && at < max_len) + { + str += at; + while (at < max_len - 1 && *cat) + { + *str++ = *cat++; + at++; + } + *str = 0; + } + + return at; +} + +DWORD WINAPI SHTruncateString(char *str, DWORD size) +{ + char *last_byte; + + if (!str || !size) + return 0; + + last_byte = str + size - 1; + + while (str < last_byte) + str += IsDBCSLeadByte(*str) ? 2 : 1; + + if (str == last_byte && IsDBCSLeadByte(*str)) + { + *str = '\0'; + size--; + } + + return size; +} -- 2.20.1

1 0

[PATCH v4 6/7] explorer: Create display device registry fallback data if necessary.
by Zhiyi Zhang May 20, 2019

May 20, 2019

If user driver didn't initialize the display device registry data, create some fallback data to at least make EnumDisplayDevice report a primary adapter. Otherwise, report back the primary adapter GUID to store in the desktop HWND atom, instead of creating a new one. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/desktop.c | 11 +-- programs/explorer/Makefile.in | 2 +- programs/explorer/desktop.c | 167 ++++++++++++++++++++++++++++------ 3 files changed, 140 insertions(+), 40 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index fe6649446e..3662a68976 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -101,28 +101,21 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP static const WCHAR display_device_guid_propW[] = { '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', 'd','e','v','i','c','e','_','g','u','i','d',0 }; - static const WCHAR guid_formatW[] = { - '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', - '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; switch (message) { case WM_NCCREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; + WCHAR *guid = cs->lpCreateParams; if (guid) { ATOM atom; - WCHAR buffer[37]; if (GetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - sprintfW( buffer, guid_formatW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); + atom = GlobalAddAtomW( guid ); SetPropW( hwnd, display_device_guid_propW, ULongToHandle( atom ) ); } return TRUE; diff --git a/programs/explorer/Makefile.in b/programs/explorer/Makefile.in index 374c6aaebe..13b0ed3dfa 100644 --- a/programs/explorer/Makefile.in +++ b/programs/explorer/Makefile.in @@ -1,5 +1,5 @@ MODULE = explorer.exe -IMPORTS = rpcrt4 user32 gdi32 advapi32 +IMPORTS = rpcrt4 user32 gdi32 advapi32 setupapi DELAYIMPORTS = comctl32 shell32 oleaut32 ole32 shlwapi EXTRADLLFLAGS = -mwindows -municode -mno-cygwin diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 2857fcfca9..da93f1e4ba 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -27,6 +27,11 @@ #include <rpc.h> #include <shlobj.h> #include <shellapi.h> +#include <wingdi.h> +#include <initguid.h> +#include <devguid.h> +#include <devpkey.h> +#include <setupapi.h> #include "exdisp.h" #include "wine/debug.h" @@ -752,24 +757,143 @@ static BOOL get_default_enable_shell( const WCHAR *name ) return result; } -static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) -{ - static const WCHAR device_keyW[] = { +/* Initialize the display device registry if user driver didn't do it, + * and report the primary adapter guid in paramter guid_string. */ +static BOOL initialize_fallback_display_devices( const WCHAR *driver_path, WCHAR *guid_string ) +{ + static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + static const WCHAR device_video0W[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','0',0}; + static const WCHAR device_video_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; + static const WCHAR gpu_instanceW[] = { + 'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0','\\', + '0','0','0','0','0','0','0','0',0}; + static const WCHAR gpu_hardware_idW[] = { + 'P','C','I','\\', + 'V','E','N','_','0','0','0','0','&', + 'D','E','V','_','0','0','0','0','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0,0}; + static const WCHAR device_key_fmtW[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\', 'V','i','d','e','o','\\', - '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-', - '%','0','2','x','%','0','2','x','-','%','0','2','x','%','0','2','x','%','0','2','x', - '%','0','2','x','%','0','2','x','%','0','2','x','}','\\','0','0','0','0',0}; + '{','%','s','}','\\', + '0','0','0','0',0}; + static const WCHAR guid_formatW[] = { + '%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; + static const DWORD primary_state_flags = DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + HDEVINFO devinfo; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR adapter_keyW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + DWORD disposition = 0; + DWORD size; + GUID guid; + HKEY hkey = NULL; + BOOL ret = FALSE; + + /* Create HKLM\HARDWARE\DEVICEMAP\VIDEO key if user drivers didn't do it */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disposition ); + + /* User driver did create it. Report back primary adapter guid */ + if (disposition != REG_CREATED_NEW_KEY) + { + size = sizeof(bufferW); + if (!RegQueryValueExW( hkey, device_video0W, NULL, NULL, (BYTE *)bufferW, &size )) + { + /* Skip over \Registry\Machine\System\CurrentControlSet\Control\Video\{ to get guid string */ + memcpy( guid_string, bufferW + 58, 36 * sizeof(WCHAR) ); + guid_string[36] = 0; + RegCloseKey( hkey ); + return TRUE; + } + /* Falling through */ + } + + /* Create basic display device registry data so that functions like EnumDisplayDevice can at least report + * a primary adapter */ + /* Init GPU */ + devinfo = SetupDiCreateDeviceInfoList( &GUID_DEVCLASS_DISPLAY, NULL ); + if (!SetupDiOpenDeviceInfoW( devinfo, gpu_instanceW, NULL, 0, &device_data )) + { + SetupDiCreateDeviceInfoW( devinfo, gpu_instanceW, &GUID_DEVCLASS_DISPLAY, NULL, NULL, 0, &device_data ); + if (!SetupDiRegisterDeviceInfo( devinfo, &device_data, 0, NULL, NULL, NULL )) + goto fail; + } + + /* Write HardwareID */ + if (!SetupDiSetDeviceRegistryPropertyW( devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)(gpu_hardware_idW), + sizeof(gpu_hardware_idW) )) + goto fail; + + /* Init primary adapter */ + UuidCreate( &guid ); + swprintf( guid_string, 37, guid_formatW, guid.Data1, guid.Data2, guid.Data3, + guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], + guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7] ); + swprintf( adapter_keyW, ARRAY_SIZE(adapter_keyW), device_key_fmtW, guid_string ); + lstrcpyW( bufferW, device_video_prefixW ); + lstrcatW( bufferW, adapter_keyW ); + + /* Write value of \Device\Video0 in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW( hkey, device_video0W, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) )) + goto fail; + RegCloseKey( hkey ); + hkey = NULL; + + /* Write GraphicsDriver */ + RegCreateKeyExW( HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ); + if (RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)driver_path, (lstrlenW( driver_path ) + 1) * sizeof(WCHAR) )) + goto fail; + + /* Write DriverDesc */ + if (RegSetValueExW( hkey, driver_descW, 0, REG_SZ, (const BYTE *)wine_gpuW, (lstrlenW( wine_gpuW ) + 1) * sizeof(WCHAR) )) + goto fail; + + RegCloseKey( hkey ); + hkey = NULL; + + RegCreateKeyExW( HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL ); + /* Write StateFlags */ + if (RegSetValueExW( hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&primary_state_flags, + sizeof(primary_state_flags) )) + goto fail; + + ret = TRUE; +fail: + RegCloseKey( hkey ); + SetupDiDestroyDeviceInfoList( devinfo ); + if (!ret) + ERR("Failed to initialize fallback display device registry data\n"); + return ret; +} + +/* Load graphics driver, return its module handle in hmodule and report primary adapter guid in guid */ +static void load_graphics_driver( const WCHAR *driver, HMODULE *hmodule, WCHAR *guid ) +{ static const WCHAR driversW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','D','r','i','v','e','r','s',0}; static const WCHAR graphicsW[] = {'G','r','a','p','h','i','c','s',0}; static const WCHAR drv_formatW[] = {'w','i','n','e','%','s','.','d','r','v',0}; WCHAR buffer[MAX_PATH], libname[32], *name, *next; - WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; HMODULE module = 0; HKEY hkey; char error[80]; @@ -812,27 +936,12 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) } if (module) - { GetModuleFileNameW( module, buffer, MAX_PATH ); - TRACE( "display %s driver %s\n", debugstr_guid(guid), debugstr_w(buffer) ); - } - swprintf( key, ARRAY_SIZE(key), device_keyW, guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + initialize_fallback_display_devices( buffer, guid ); + TRACE( "display %s driver %s\n", debugstr_w(guid), debugstr_w(buffer) ); - if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, - REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) - { - if (module) - RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, - (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); - else - RegSetValueExA( hkey, "DriverError", 0, REG_SZ, (BYTE *)error, strlen(error) + 1 ); - RegCloseKey( hkey ); - } - - return module; + *hmodule = module; } static void initialize_display_settings(void) @@ -891,7 +1000,7 @@ void manage_desktop( WCHAR *arg ) { static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; HDESK desktop = 0; - GUID guid; + WCHAR guid[37] = {0}; MSG msg; HWND hwnd; HMODULE graphics_driver; @@ -943,13 +1052,11 @@ void manage_desktop( WCHAR *arg ) SetThreadDesktop( desktop ); } - UuidCreate( &guid ); - TRACE( "display guid %s\n", debugstr_guid(&guid) ); - graphics_driver = load_graphics_driver( driver, &guid ); + load_graphics_driver( driver, &graphics_driver, guid ); /* create the desktop window */ hwnd = CreateWindowExW( 0, DESKTOP_CLASS_ATOM, NULL, - WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, &guid ); + WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, 0, 0, 0, 0, 0, 0, 0, guid ); if (hwnd) { -- 2.20.1

2 1

[PATCH v4 5/7] winex11.drv: Handle display device changes.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 2 ++ dlls/winex11.drv/display.c | 7 +++++-- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d478cbdcb3..c69c2122ab 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -154,6 +154,7 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) max_width = primary_rect.right - primary_rect.left; max_height = primary_rect.bottom - primary_rect.top; xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", @@ -303,6 +304,7 @@ void X11DRV_resize_desktop( unsigned int width, unsigned int height ) resize_data.old_virtual_rect = get_virtual_screen_rect(); xinerama_init( width, height ); + X11DRV_DisplayDevices_Init( "Xinerama", TRUE ); resize_data.new_virtual_rect = get_virtual_screen_rect(); if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f6be8de0e2..5bd0c3ea51 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -374,7 +374,7 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -void X11DRV_DisplayDevices_Init(void) +void X11DRV_DisplayDevices_Init(const char *name, BOOL force) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -391,12 +391,15 @@ void X11DRV_DisplayDevices_Init(void) TRACE("via %s\n", wine_dbgstr_a(handler.name)); + if (name && strcmp(handler.name, name)) + TRACE("Wrong handler name %s, ignoring\n", name); + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) goto fail; /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ - if (disposition != REG_CREATED_NEW_KEY) + if (!force && disposition != REG_CREATED_NEW_KEY) { success = TRUE; goto fail; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 40392b03c0..035d7cc9ab 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -740,7 +740,7 @@ struct x11drv_display_device_handler }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; -extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(const char *name, BOOL force) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 69478741f1..b0fa225565 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,7 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); - X11DRV_DisplayDevices_Init(); + X11DRV_DisplayDevices_Init(NULL, FALSE); return TRUE; } -- 2.20.1

1 0

[PATCH v4 4/7] winex11.drv: Initialize monitor registry data.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 120 +++++++++++++++++++++++++++++++++++-- 1 file changed, 115 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0dbc92846b..f6be8de0e2 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -39,11 +39,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); + static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; +static const WCHAR adapter_name_fmtW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0}; static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', @@ -90,6 +98,13 @@ static const WCHAR device_video_fmtW[] = { static const WCHAR machine_prefixW[] = { '\\','R','e','g','i','s','t','r','y','\\', 'M','a','c','h','i','n','e','\\',0}; +static const WCHAR monitor_instance_fmtW[] = { + 'D','I','S','P','L','A','Y','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r','\\', + '%','0','4','X','&','%','0','4','X',0}; +static const WCHAR monitor_hardware_idW[] = { + 'M','O','N','I','T','O','R','\\', + 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; @@ -185,7 +200,7 @@ fail: return ret; } -static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, INT monitor_count, const struct x11drv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) { @@ -195,6 +210,7 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, HKEY hkey = NULL; BOOL ret = FALSE; LSTATUS ls; + INT i; sprintfW(key_nameW, device_video_fmtW, video_index); strcpyW(bufferW, machine_prefixW); @@ -229,6 +245,15 @@ static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) goto fail; + /* Write all monitor instances paths under this adapter */ + for (i = 0; i < monitor_count; i++) + { + sprintfW(key_nameW, mointor_id_fmtW, i); + sprintfW(bufferW, monitor_instance_fmtW, video_index, i); + if (RegSetValueExW(hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -242,6 +267,64 @@ fail: return ret; } +static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *monitor, int monitor_index, + int video_index) +{ + WCHAR bufferW[MAX_PATH]; + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + HKEY hkey = NULL; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, monitor->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + + /* Write HaredwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto fail; + + /* Open driver key */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)monitor->name, + (strlenW(monitor->name) + 1) * sizeof(WCHAR))) + goto fail; + + /* FIXME: + * Following properties are Wine specific, see comments in X11DRV_InitAdapter for details */ + /* StateFlags */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, DEVPROP_TYPE_UINT32, + (const BYTE *)&monitor->state_flags, sizeof(monitor->state_flags), 0)) + goto fail; + /* RcMonitor */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) + goto fail; + /* RcWork */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, + (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) + goto fail; + + sprintfW(bufferW, adapter_name_fmtW, video_index + 1); + /* Adapter name */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, DEVPROP_TYPE_STRING, + (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR), 0)) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -249,8 +332,18 @@ static void prepare_devices(void) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with * each initialization run. We clean up non present GPUs at the end of initialization */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -285,9 +378,10 @@ void X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct x11drv_monitor *monitors = NULL; + INT gpu_count, adapter_count, monitor_count; + INT gpu, adapter, monitor; + HDEVINFO gpu_devinfo = NULL, monitor_devinfo = NULL; HKEY video_hkey = NULL; INT video_index = 0; DWORD disposition = 0; @@ -316,6 +410,7 @@ void X11DRV_DisplayDevices_Init(void) prepare_devices(); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (!handler.pGetGpus(&gpus, &gpu_count)) @@ -332,10 +427,22 @@ void X11DRV_DisplayDevices_Init(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + goto fail; + + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto fail; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!X11DRV_InitMonitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto fail; + } + + handler.pFreeMonitors(monitors); + monitors = NULL; video_index++; } @@ -346,12 +453,15 @@ void X11DRV_DisplayDevices_Init(void) success = TRUE; fail: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); if (adapters) handler.pFreeAdapters(adapters); + if (monitors) + handler.pFreeMonitors(monitors); if (!success) ERR("Failed to initialize display devices\n"); } -- 2.20.1

1 0

[PATCH v4 3/7] winex11.drv: Initialize adapter registry data.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 97 +++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d69380d8bc..0dbc92846b 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -42,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR symbolic_link_valueW[]= {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e',0}; +static const WCHAR gpu_idW[] = {'G','P','U','I','D',0}; +static const WCHAR state_flagsW[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR guid_fmtW[] = { '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; @@ -74,6 +77,19 @@ static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', 'V','I','D','E','O',0}; +static const WCHAR adapter_key_fmtW[] = { + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'V','i','d','e','o','\\', + '%','s','\\', + '%','0','4','x',0}; +static const WCHAR device_video_fmtW[] = { + '\\','D','e','v','i','c','e','\\', + 'V','i','d','e','o','%','d',0}; +static const WCHAR machine_prefixW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\',0}; static struct x11drv_display_device_handler handler; @@ -169,6 +185,63 @@ fail: return ret; } +static BOOL X11DRV_InitAdapter(HKEY video_hkey, INT video_index, INT gpu_index, INT adapter_index, + const struct x11drv_gpu *gpu, const WCHAR *guid_string, + const WCHAR *gpu_driver, const struct x11drv_adapter *adapter) +{ + WCHAR adapter_keyW[MAX_PATH]; + WCHAR key_nameW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + BOOL ret = FALSE; + LSTATUS ls; + + sprintfW(key_nameW, device_video_fmtW, video_index); + strcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + strcatW(bufferW, adapter_keyW); + + /* Write value of \Device\Video? (adapter key) in HKLM\HARDWARE\DEVICEMAP\VIDEO\ */ + if (RegSetValueExW(video_hkey, key_nameW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Create HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} link to GPU driver */ + ls = RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (ls == ERROR_ALREADY_EXISTS) + RegCreateKeyExW(HKEY_LOCAL_MACHINE, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE | REG_OPTION_OPEN_LINK, + KEY_ALL_ACCESS, NULL, &hkey, NULL); + if (RegSetValueExW(hkey, symbolic_link_valueW, 0, REG_LINK, (const BYTE *)gpu_driver, + strlenW(gpu_driver) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information are Wine specific, they don't really exist on Windows. They are used so that we can + * implement EnumDisplayDevices etc by querying registry only. These information are most likely reported by the + * device driver on Windows */ + RegCreateKeyExW(HKEY_CURRENT_CONFIG, adapter_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_WRITE, NULL, &hkey, NULL); + + /* Write GPU instance path so that we can find the GPU instance via adapters quickly. Another way is trying to match + * them via the GUID in Device Paramters/VideoID, but it would required enumrating all GPU instances */ + sprintfW(bufferW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto fail; + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + static void prepare_devices(void) { static const BOOL not_present = FALSE; @@ -211,10 +284,12 @@ static void cleanup_devices(void) void X11DRV_DisplayDevices_Init(void) { struct x11drv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct x11drv_adapter *adapters = NULL; + INT gpu_count, adapter_count; + INT gpu, adapter; HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; + INT video_index = 0; DWORD disposition = 0; WCHAR guidW[40]; WCHAR driverW[1024]; @@ -250,6 +325,22 @@ void X11DRV_DisplayDevices_Init(void) { if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) goto fail; + + /* Initialize adapters */ + if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + goto fail; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!X11DRV_InitAdapter(video_hkey, video_index, gpu, adapter, + &gpus[gpu], guidW, driverW, &adapters[adapter])) + goto fail; + + video_index++; + } + + handler.pFreeAdapters(adapters); + adapters = NULL; } success = TRUE; @@ -259,6 +350,8 @@ fail: RegCloseKey(video_hkey); if (gpus) handler.pFreeGpus(gpus); + if (adapters) + handler.pFreeAdapters(adapters); if (!success) ERR("Failed to initialize display devices\n"); } -- 2.20.1

1 0

[PATCH v4 2/7] winex11.drv: Initialize GPU registry data.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 190 +++++++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 9ca2fc6efe..72ab1bb77b 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winex11.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid user32 gdi32 advapi32 ntoskrnl setupapi DELAYIMPORTS = comctl32 ole32 shell32 imm32 EXTRAINCL = $(X_CFLAGS) EXTRALIBS = $(X_LIBS) $(X_EXTRA_LIBS) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 7d81de09ac..d69380d8bc 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -26,11 +26,50 @@ #include "winbase.h" #include "winuser.h" #include "winreg.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/ntddk.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "x11drv.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; +static const WCHAR graphics_driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; +static const WCHAR video_idW[] = {'V','i','d','e','o','I','D',0}; +static const WCHAR guid_fmtW[] = { + '{','%','0','8','x','-','%','0','4','x','-','%','0','4','x','-','%','0','2','x','%','0','2','x','-', + '%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','%','0','2','x','}',0}; +static const WCHAR gpu_instance_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','%','0','8','X','&', + 'R','E','V','_','%','0','2','X','\\', + '%','0','8','X',0}; +static const WCHAR gpu_hardware_id_fmtW[] = { + 'P','C','I','\\', + 'V','E','N','_','%','0','4','X','&', + 'D','E','V','_','%','0','4','X','&', + 'S','U','B','S','Y','S','_','0','0','0','0','0','0','0','0','&', + 'R','E','V','_','0','0',0}; +static const WCHAR winex11_drvW[] = { + 'C',':','\\', + 'W','i','n','d','o','w','s','\\', + 'S','y','s','t','e','m','3','2','\\', + 'w','i','n','e','x','1','1','.','d','r','v',0}; +static const WCHAR nt_classW[] = { + '\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', + 'S','y','s','t','e','m','\\', + 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', + 'C','o','n','t','r','o','l','\\', + 'C','l','a','s','s','\\',0}; static const WCHAR video_keyW[] = { 'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -47,10 +86,138 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +/* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ +static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, + WCHAR *driver) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR bufferW[1024]; + HKEY hkey = NULL; + GUID guid; + INT written; + DWORD size; + BOOL ret = FALSE; + + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, gpu->name, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto fail; + } + + /* Write HaredwareID registry property */ + written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); + bufferW[written + 1] = 0; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto fail; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto fail; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + + /* Write GraphicsDriver value */ + if (RegSetValueExW(hkey, graphics_driverW, 0, REG_SZ, (const BYTE *)winex11_drvW, sizeof(winex11_drvW))) + goto fail; + + /* Write DriverDesc value */ + if (RegSetValueExW(hkey, driver_descW, 0, REG_SZ, (const BYTE *)gpu->name, + (strlenW(gpu->name) + 1) * sizeof(WCHAR))) + goto fail; + RegCloseKey(hkey); + hkey = NULL; + + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto fail; + strcpyW(driver, nt_classW); + strcatW(driver, bufferW); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiOpenDevRegKey(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, KEY_ALL_ACCESS); + if (hkey == INVALID_HANDLE_VALUE) + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + bufferW[0] = 0; + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + ExUuidCreate(&guid); + sprintfW(bufferW, guid_fmtW, guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], guid.Data4[2], + guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); + if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto fail; + } + strcpyW(guid_string, bufferW); + + ret = TRUE; +fail: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize GPU\n"); + return ret; +} + +static void prepare_devices(void) +{ + static const BOOL not_present = FALSE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD i = 0; + + /* Set all GPUs as not present. We can't simply delete them because we need to keep the GUID consistent with + * each initialization run. We clean up non present GPUs at the end of initialization */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&not_present, sizeof(not_present), 0)) + ERR("Failed to set GPU present property\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + +static void cleanup_devices(void) +{ + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo; + DWORD type; + DWORD i = 0; + BOOL present; + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + present = FALSE; + SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, &type, (BYTE *)&present, + sizeof(present), NULL, 0); + if (!present && !SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove GPU\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); +} + void X11DRV_DisplayDevices_Init(void) { + struct x11drv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; HKEY video_hkey = NULL; DWORD disposition = 0; + WCHAR guidW[40]; + WCHAR driverW[1024]; BOOL success = FALSE; TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -66,9 +233,32 @@ void X11DRV_DisplayDevices_Init(void) goto fail; } + /* FIXME: + * Currently we have no idea how to implement SetupDiGetClassDevsW with DIGCF_PRESENT properly. So we need to clean + * up not present devices in case application use SetupDiGetClassDevsW to enumerate devices. Wrong devices could + * exist in registry as a result of prefix copying or having devices unplugged. But then we couldn't simply delete + * GPUs because we need to retain the same GUID for the same GPU. */ + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (!handler.pGetGpus(&gpus, &gpu_count)) + goto fail; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!X11DRV_InitGpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) + goto fail; + } + success = TRUE; fail: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); + if (gpus) + handler.pFreeGpus(gpus); if (!success) ERR("Failed to initialize display devices\n"); } -- 2.20.1

1 0

[PATCH v4 1/7] winex11.drv: Add Xinerama display device handler.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Display device handlers are used to initialize the display device registry data. Different handlers can be implemented according to the defined interface, for example, via Xinerama or XRandR. With those registry data, EnumDisplayDevices, EnumDisplayMonitors and GetMonitorInfo can be built on top of it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 162308~162314, fix xinerama primary adapter reporting, fix registry data reinit failure. v3: Rebase v4: Merge patches. Rebase. dlls/winex11.drv/Makefile.in | 1 + dlls/winex11.drv/display.c | 74 ++++++++++++++++ dlls/winex11.drv/x11drv.h | 77 +++++++++++++++++ dlls/winex11.drv/x11drv_main.c | 1 + dlls/winex11.drv/xinerama.c | 154 +++++++++++++++++++++++++++++++++ 5 files changed, 307 insertions(+) create mode 100644 dlls/winex11.drv/display.c diff --git a/dlls/winex11.drv/Makefile.in b/dlls/winex11.drv/Makefile.in index 747f509b44..9ca2fc6efe 100644 --- a/dlls/winex11.drv/Makefile.in +++ b/dlls/winex11.drv/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ brush.c \ clipboard.c \ desktop.c \ + display.c \ event.c \ graphics.c \ ime.c \ diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c new file mode 100644 index 0000000000..7d81de09ac --- /dev/null +++ b/dlls/winex11.drv/display.c @@ -0,0 +1,74 @@ +/* + * X11DRV display device functions + * + * Copyright 2019 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "winreg.h" +#include "wine/debug.h" +#include "x11drv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(x11drv); + +static const WCHAR video_keyW[] = { + 'H','A','R','D','W','A','R','E','\\', + 'D','E','V','I','C','E','M','A','P','\\', + 'V','I','D','E','O',0}; + +static struct x11drv_display_device_handler handler; + +void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) +{ + if (new_handler->priority > handler.priority) + { + handler = *new_handler; + TRACE("Display device functions are now handled by: %s\n", handler.name); + } +} + +void X11DRV_DisplayDevices_Init(void) +{ + HKEY video_hkey = NULL; + DWORD disposition = 0; + BOOL success = FALSE; + + TRACE("via %s\n", wine_dbgstr_a(handler.name)); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + goto fail; + + /* Ensure only one thread is initializing the registry and avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + { + success = TRUE; + goto fail; + } + + success = TRUE; +fail: + RegCloseKey(video_hkey); + if (!success) + ERR("Failed to initialize display devices\n"); +} diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index c633102a38..40392b03c0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -665,6 +665,83 @@ struct x11drv_mode_info *X11DRV_Settings_SetHandlers(const char *name, void X11DRV_XF86VM_Init(void) DECLSPEC_HIDDEN; void X11DRV_XRandR_Init(void) DECLSPEC_HIDDEN; +/* X11 display device handler. Used to initialize display device registry data */ + +/* Represent a physical GPU in the PCI slots */ +struct x11drv_gpu +{ + /* ID to uniquely identify a GPU in handler */ + ULONG_PTR id; + /* Name */ + WCHAR name[128]; + /* PCI ID */ + UINT vendor_id; + UINT device_id; + UINT subsys_id; + UINT revision_id; +}; + +/* Represent an adapter in EnumDisplayDevices context */ +struct x11drv_adapter +{ + /* ID to uniquely identify an adapter in handler */ + ULONG_PTR id; + /* as StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Represent a monitor in EnumDisplayDevices context */ +struct x11drv_monitor +{ + /* Name */ + WCHAR name[128]; + /* as RcMonitor in MONITORINFO struct */ + RECT rc_monitor; + /* as RcWork in MONITORINFO struct */ + RECT rc_work; + /* StateFlags in DISPLAY_DEVICE struct */ + DWORD state_flags; +}; + +/* Required functions for display device registry initialization */ +struct x11drv_display_device_handler +{ + /* A name to tell what host driver is used */ + CHAR name[MAX_PATH]; + + /* Higher priority can override handlers with lower proprity */ + INT priority; + + /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + + /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + * The first adapter has to be primary if GPU is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + + /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + * The first monitor has to be primary if adapter is primary. + * + * Return FALSE on failure with parameters unchanged */ + BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + + /* pFreeGpus will be called to free a GPU list from pGetGpus */ + void (*pFreeGpus)(struct x11drv_gpu *gpus); + + /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ + void (*pFreeAdapters)(struct x11drv_adapter *adapters); + + /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ + void (*pFreeMonitors)(struct x11drv_monitor *monitors); +}; + +extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_Init(void) DECLSPEC_HIDDEN; + /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; extern XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e67a3c05a9..69478741f1 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -597,6 +597,7 @@ static BOOL process_attach(void) X11DRV_InitKeyboard( gdi_display ); if (use_xim) use_xim = X11DRV_InitXIM( input_style ); + X11DRV_DisplayDevices_Init(); return TRUE; } diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 739b139736..49427890cb 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -30,6 +30,8 @@ #include "wine/library.h" #include "x11drv.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(x11drv); @@ -199,8 +201,150 @@ RECT get_primary_monitor_rect(void) return get_primary()->rcMonitor; } +static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + static const WCHAR wine_gpuW[] = {'W','i','n','e',' ','G','P','U',0}; + struct x11drv_gpu *gpus; + + /* Xinerama has no support for GPU, faking one */ + gpus = heap_calloc( 1, sizeof(*gpus) ); + if (!gpus) + return FALSE; + + strcpyW( gpus[0].name, wine_gpuW ); + + *new_gpus = gpus; + *count = 1; + + return TRUE; +} + +static void xinerama_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +static BOOL xinerama_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + INT index = 0; + INT i, j; + INT primary_index; + BOOL mirrored; + + if (gpu_id) + return FALSE; + + /* Being lazy, actual adapter count maybe less */ + adapters = heap_calloc( nb_monitors, sizeof(*adapters) ); + if (!adapters) + return FALSE; + + primary_index = primary_monitor; + if (primary_index >= nb_monitors) + primary_index = 0; + + for (i = 0; i < nb_monitors; i++) + { + mirrored = FALSE; + for (j = 0; j < i; j++) + { + if (EqualRect( &monitors[i].rcMonitor, &monitors[j].rcMonitor) && !IsRectEmpty( &monitors[j].rcMonitor )) + { + mirrored = TRUE; + break; + } + } + + /* Mirrored monitors share the same adapter */ + if (mirrored) + continue; + + /* Use monitor index as id */ + adapters[index].id = (ULONG_PTR)i; + + if (i == primary_index) + adapters[index].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + + if (!IsRectEmpty( &monitors[i].rcMonitor )) + adapters[index].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + index++; + } + + /* Primary adapter has to be first */ + if (primary_index) + { + struct x11drv_adapter tmp; + tmp = adapters[primary_index]; + adapters[primary_index] = adapters[0]; + adapters[0] = tmp; + } + + *new_adapters = adapters; + *count = index; + return TRUE; +} + +static void xinerama_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *monitor; + INT first = (INT)adapter_id; + INT monitor_count = 0; + INT index = 0; + INT i; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + monitor_count++; + } + + monitor = heap_calloc( monitor_count, sizeof(*monitor) ); + if (!monitor) + return FALSE; + + for (i = first; i < nb_monitors; i++) + { + if (i == first + || (EqualRect( &monitors[i].rcMonitor, &monitors[first].rcMonitor ) + && !IsRectEmpty( &monitors[first].rcMonitor ))) + { + strcpyW( monitor[index].name, generic_nonpnp_monitorW ); + monitor[index].rc_monitor = monitors[i].rcMonitor; + monitor[index].rc_work = monitors[i].rcWork; + /* Xinerama only reports monitors already attached */ + monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[i].rcMonitor )) + monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; + + index++; + } + } + + *new_monitors = monitor; + *count = monitor_count; + return TRUE; +} + +static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + void xinerama_init( unsigned int width, unsigned int height ) { + struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; int i; RECT rect; @@ -234,6 +378,16 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } + strcpy( handler.name, "Xinerama" ); + handler.priority = 100; + handler.pGetGpus = xinerama_get_gpus; + handler.pGetAdapters = xinerama_get_adapters; + handler.pGetMonitors = xinerama_get_monitors; + handler.pFreeGpus = xinerama_free_gpus; + handler.pFreeAdapters = xinerama_free_adapters; + handler.pFreeMonitors = xinerama_free_monitors; + X11DRV_DisplayDevices_SetHandler( &handler ); + TRACE( "virtual size: %s primary: %s\n", wine_dbgstr_rect(&virtual_screen_rect), wine_dbgstr_rect(&primary->rcMonitor) ); } -- 2.20.1

1 0

[PATCH v2 10/10] gdi32/tests: Add D3DKMTCheckOcclusion tests.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Mostly to show that D3DKMTCheckOcclusion is mainly composed of ownership checks rather than actually window occlusion. Also composition status doesn't affect its behavior despite MSDN say so. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Remove tests with d3d swapchains as they seemed mostly duplicated. dlls/gdi32/tests/driver.c | 206 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 206 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index b9ee277a5a..ec3e66bf0d 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -27,12 +27,14 @@ #include "wingdi.h" #include "winuser.h" #include "winternl.h" +#include "dwmapi.h" #include "ddk/d3dkmthk.h" #include "wine/test.h" static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; +static NTSTATUS (WINAPI *pD3DKMTCheckOcclusion)(const D3DKMT_CHECKOCCLUSION *); static NTSTATUS (WINAPI *pD3DKMTCheckVidPnExclusiveOwnership)(const D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP *); static NTSTATUS (WINAPI *pD3DKMTCloseAdapter)(const D3DKMT_CLOSEADAPTER *); static NTSTATUS (WINAPI *pD3DKMTCreateDevice)(D3DKMT_CREATEDEVICE *); @@ -40,6 +42,7 @@ static NTSTATUS (WINAPI *pD3DKMTDestroyDevice)(const D3DKMT_DESTROYDEVICE *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromGdiDisplayName)(D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *); static NTSTATUS (WINAPI *pD3DKMTOpenAdapterFromHdc)(D3DKMT_OPENADAPTERFROMHDC *); static NTSTATUS (WINAPI *pD3DKMTSetVidPnSourceOwner)(const D3DKMT_SETVIDPNSOURCEOWNER *); +static HRESULT (WINAPI *pDwmEnableComposition)(UINT); static void test_D3DKMTOpenAdapterFromGdiDisplayName(void) { @@ -615,10 +618,208 @@ static void test_D3DKMTSetVidPnSourceOwner(void) ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTCheckOcclusion(void) +{ + DISPLAY_DEVICEW display_device = {sizeof(display_device)}; + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_gdi_desc; + D3DKMT_CHECKVIDPNEXCLUSIVEOWNERSHIP check_owner_desc; + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc; + D3DKMT_DESTROYDEVICE destroy_device_desc; + D3DKMT_VIDPNSOURCEOWNER_TYPE owner_type; + D3DKMT_CLOSEADAPTER close_adapter_desc; + D3DKMT_CREATEDEVICE create_device_desc; + D3DKMT_CHECKOCCLUSION occlusion_desc; + NTSTATUS expected_occlusion, status; + INT i, adapter_count = 0; + HWND hwnd, hwnd2; + HRESULT hr; + + if (!pD3DKMTCheckOcclusion || pD3DKMTCheckOcclusion(NULL) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTCheckOcclusion() is unavailable.\n"); + return; + } + + /* NULL parameter check */ + status = pD3DKMTCheckOcclusion(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = NULL; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + + hwnd = CreateWindowA("static", "static1", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 200, 200, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Minimized state doesn't affect D3DKMTCheckOcclusion */ + ShowWindow(hwnd, SW_MINIMIZE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOWNORMAL); + + /* Invisible state doesn't affect D3DKMTCheckOcclusion */ + ShowWindow(hwnd, SW_HIDE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOW); + + /* hwnd2 covers hwnd */ + hwnd2 = CreateWindowA("static", "static2", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, 0); + ok(hwnd2 != NULL, "Failed to create window.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Composition doesn't affect D3DKMTCheckOcclusion */ + if (pDwmEnableComposition) + { + hr = pDwmEnableComposition(DWM_EC_DISABLECOMPOSITION); + ok(hr == S_OK, "Failed to disable composition.\n"); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + /* This result means that D3DKMTCheckOcclusion doesn't check composition status despite MSDN says it will */ + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + ShowWindow(hwnd, SW_MINIMIZE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOWNORMAL); + + ShowWindow(hwnd, SW_HIDE); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + ShowWindow(hwnd, SW_SHOW); + + hr = pDwmEnableComposition(DWM_EC_ENABLECOMPOSITION); + ok(hr == S_OK, "Failed to enable composition.\n"); + } + else + skip("Skip testing composition.\n"); + + if (!(pD3DKMTCheckVidPnExclusiveOwnership && pD3DKMTCloseAdapter && pD3DKMTCreateDevice && pD3DKMTDestroyDevice + && pD3DKMTOpenAdapterFromGdiDisplayName && pD3DKMTSetVidPnSourceOwner)) + { + skip("Required functions are unavailable.\n"); + DestroyWindow(hwnd2); + goto done; + } + + lstrcpyW(open_adapter_gdi_desc.DeviceName, display1W); + status = pD3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_gdi_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + memset(&create_device_desc, 0, sizeof(create_device_desc)); + create_device_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCreateDevice(&create_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + /* Test D3DKMTCheckOcclusion relationship with video present source owner */ + set_owner_desc.hDevice = create_device_desc.hDevice; + owner_type = D3DKMT_VIDPNSOURCEOWNER_EXCLUSIVE; + set_owner_desc.pType = &owner_type; + set_owner_desc.pVidPnSourceId = &open_adapter_gdi_desc.VidPnSourceId; + set_owner_desc.VidPnSourceCount = 1; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + for (i = 0; EnumDisplayDevicesW(NULL, i, &display_device, 0); ++i) + { + if ((display_device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) + adapter_count++; + } + /* STATUS_GRAPHICS_PRESENT_OCCLUDED on single monitor system. STATUS_SUCCESS on multiple monitor system. */ + expected_occlusion = adapter_count > 1 ? STATUS_SUCCESS : STATUS_GRAPHICS_PRESENT_OCCLUDED; + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + /* Note hwnd2 is not actually occluded but D3DKMTCheckOcclusion reports STATUS_GRAPHICS_PRESENT_OCCLUDED as well */ + SetWindowPos(hwnd2, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); + ShowWindow(hwnd2, SW_SHOW); + occlusion_desc.hWnd = hwnd2; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + /* Now hwnd is HWND_TOPMOST. Still reports STATUS_GRAPHICS_PRESENT_OCCLUDED */ + ok(SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE), "Failed to SetWindowPos.\n"); + ok(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "No WS_EX_TOPMOST style.\n"); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + DestroyWindow(hwnd2); + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == expected_occlusion, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + ok(status == STATUS_GRAPHICS_PRESENT_OCCLUDED, "Got unexpected return code %#x.\n", status); + + /* Unset video present source owner */ + set_owner_desc.hDevice = create_device_desc.hDevice; + set_owner_desc.pType = NULL; + set_owner_desc.pVidPnSourceId = NULL; + set_owner_desc.VidPnSourceCount = 0; + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + occlusion_desc.hWnd = hwnd; + status = pD3DKMTCheckOcclusion(&occlusion_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + + check_owner_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + check_owner_desc.VidPnSourceId = open_adapter_gdi_desc.VidPnSourceId; + status = pD3DKMTCheckVidPnExclusiveOwnership(&check_owner_desc); + /* D3DKMTCheckVidPnExclusiveOwnership gets STATUS_GRAPHICS_PRESENT_UNOCCLUDED sometimes and with some delay, + * it will always return STATUS_SUCCESS. So there are some timing issues here. */ + ok(status == STATUS_SUCCESS || status == STATUS_GRAPHICS_PRESENT_UNOCCLUDED, "Got unexpected return code %#x.\n", status); + + destroy_device_desc.hDevice = create_device_desc.hDevice; + status = pD3DKMTDestroyDevice(&destroy_device_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + +done: + if (pD3DKMTCloseAdapter) + { + close_adapter_desc.hAdapter = open_adapter_gdi_desc.hAdapter; + status = pD3DKMTCloseAdapter(&close_adapter_desc); + ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); + } + DestroyWindow(hwnd); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); + HMODULE dwmapi = LoadLibraryA("dwmapi.dll"); + pD3DKMTCheckOcclusion = (void *)GetProcAddress(gdi32, "D3DKMTCheckOcclusion"); pD3DKMTCheckVidPnExclusiveOwnership = (void *)GetProcAddress(gdi32, "D3DKMTCheckVidPnExclusiveOwnership"); pD3DKMTCloseAdapter = (void *)GetProcAddress(gdi32, "D3DKMTCloseAdapter"); pD3DKMTCreateDevice = (void *)GetProcAddress(gdi32, "D3DKMTCreateDevice"); @@ -627,6 +828,10 @@ START_TEST(driver) pD3DKMTOpenAdapterFromHdc = (void *)GetProcAddress(gdi32, "D3DKMTOpenAdapterFromHdc"); pD3DKMTSetVidPnSourceOwner = (void *)GetProcAddress(gdi32, "D3DKMTSetVidPnSourceOwner"); + if (dwmapi) + pDwmEnableComposition = (void *)GetProcAddress(dwmapi, "DwmEnableComposition"); + + test_D3DKMTCheckOcclusion(); test_D3DKMTCheckVidPnExclusiveOwnership(); test_D3DKMTCloseAdapter(); test_D3DKMTCreateDevice(); @@ -636,4 +841,5 @@ START_TEST(driver) test_D3DKMTSetVidPnSourceOwner(); FreeLibrary(gdi32); + FreeLibrary(dwmapi); } -- 2.20.1

1 0

[PATCH v2 09/10] gdi32/tests: Add D3DKMTSetVidPnSourceOwner tests.
by Zhiyi Zhang May 20, 2019

May 20, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/driver.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index aa404954ce..b9ee277a5a 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -592,6 +592,29 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) ok(status == STATUS_SUCCESS, "Got unexpected return code %#x.\n", status); } +static void test_D3DKMTSetVidPnSourceOwner(void) +{ + D3DKMT_SETVIDPNSOURCEOWNER set_owner_desc = {0}; + NTSTATUS status; + + if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) + { + skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + return; + } + + /* Invalid parameters */ + /* Crash on windows */ + if (0) + { + status = pD3DKMTSetVidPnSourceOwner(NULL); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + } + + status = pD3DKMTSetVidPnSourceOwner(&set_owner_desc); + ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); +} + START_TEST(driver) { HMODULE gdi32 = LoadLibraryA("gdi32.dll"); @@ -610,6 +633,7 @@ START_TEST(driver) test_D3DKMTDestroyDevice(); test_D3DKMTOpenAdapterFromGdiDisplayName(); test_D3DKMTOpenAdapterFromHdc(); + test_D3DKMTSetVidPnSourceOwner(); FreeLibrary(gdi32); } -- 2.20.1

1 0