November 2021 - Wine-Commits

Piotr Caban : msvcr100: Add _Timer class implementation.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: c0ea1ad37d3343c403d80ee18bf0d90c2699148b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0ea1ad37d3343c403d80ee1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 30 19:19:06 2021 +0100 msvcr100: Add _Timer class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 24 +++--- dlls/concrt140/tests/concrt140.c | 145 ++++++++++++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 16 ++-- dlls/msvcr110/msvcr110.spec | 24 +++--- dlls/msvcr120/msvcr120.spec | 24 +++--- dlls/msvcr120_app/msvcr120_app.spec | 24 +++--- dlls/msvcrt/concurrency.c | 102 +++++++++++++++++++++++++ 7 files changed, 303 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0ea1ad37d3343c403d8…

1 0

Hans Leidekker : wininet: Use DNS only for proxy auto-detection.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: d13ec212c3311f671d4519f4d81833635f12505d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d13ec212c3311f671d4519f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:09 2021 +0100 wininet: Use DNS only for proxy auto-detection. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 46fbe86f549..b0fe8a5e3fb 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2431,7 +2431,7 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) while ((p = strchr( p, '.' )) && is_domain_suffix( p + 1, domain )) { char *name; - struct addrinfo *ai; + struct addrinfo *ai, hints; int res; if (!(name = heap_alloc( sizeof("wpad") + strlen(p) ))) @@ -2442,7 +2442,10 @@ static WCHAR *detect_proxy_autoconfig_url_dns(void) } strcpy( name, "wpad" ); strcat( name, p ); - res = getaddrinfo( name, NULL, NULL, &ai ); + memset( &hints, 0, sizeof(hints) ); + hints.ai_flags = AI_ALL | AI_DNS_ONLY; + hints.ai_family = AF_UNSPEC; + res = getaddrinfo( name, NULL, &hints, &ai ); if (!res) { ret = build_wpad_url( name, ai );

1 0

Jacek Caban : user32: Invalidate cache in update_monitor_cache when modification time matches current time.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: d7133c97d91a0dbc746a4c9711831f45704c8b43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7133c97d91a0dbc746a4c97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:56 2021 +0100 user32: Invalidate cache in update_monitor_cache when modification time matches current time. Also preserve last error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 92c62d815ba..82dd0f4c664 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3804,14 +3804,14 @@ static BOOL update_monitor_cache(void) BOOL ret = FALSE; BOOL is_replica; DWORD i = 0, j; - DWORD type; + DWORD type, error = GetLastError(); /* Update monitor cache from SetupAPI if it's outdated */ if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, L"HARDWARE\\DEVICEMAP\\VIDEO", &video_key )) return FALSE; if (RegQueryInfoKeyW( video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime )) return FALSE; - if (CompareFileTime( &filetime, &last_query_monitors_time ) < 1) + if (CompareFileTime( &filetime, &last_query_monitors_time ) < 0) return TRUE; mutex = get_display_device_init_mutex(); @@ -3879,6 +3879,7 @@ fail: SetupDiDestroyDeviceInfoList( devinfo ); LeaveCriticalSection( &monitors_section ); release_display_device_init_mutex( mutex ); + SetLastError( error ); return ret; }

1 0

Jacek Caban : winex11.drv: Use gdi driver types for display device handler.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: b502a3e3c6b43ac3947d85ccc263e729ace917fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=b502a3e3c6b43ac3947d85cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:29 2021 +0100 winex11.drv: Use gdi driver types for display device handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 18 +++++++-------- dlls/winex11.drv/display.c | 24 ++++++++++---------- dlls/winex11.drv/x11drv.h | 55 ++++++--------------------------------------- dlls/winex11.drv/xinerama.c | 20 ++++++++--------- dlls/winex11.drv/xrandr.c | 47 +++++++++++++++++++------------------- 5 files changed, 62 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b502a3e3c6b43ac3947d…

1 0

Jacek Caban : win32u: Implement GPU registration.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 6185c8a34777fbcc06eb26ab716976856054d8ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=6185c8a34777fbcc06eb26ab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:01 2021 +0100 win32u: Implement GPU registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/font.c | 10 +- dlls/win32u/sysparams.c | 473 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/win32u_private.h | 6 + 3 files changed, 481 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6185c8a34777fbcc06eb…

1 0

Hans Leidekker : ws2_32: Implement AI_DNS_ONLY using DNS APIs.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 7c39ce0a6cf8a3df1337a0768045c43044fce2f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c39ce0a6cf8a3df1337a076… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 30 17:29:07 2021 +0100 ws2_32: Implement AI_DNS_ONLY using DNS APIs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52133 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/Makefile.in | 2 +- dlls/ws2_32/protocol.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/protocol.c | 20 +++++++++++ dlls/ws2_32/ws2_32_private.h | 1 + include/ws2def.h | 6 ++++ 5 files changed, 112 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/Makefile.in b/dlls/ws2_32/Makefile.in index 232ce7f31fd..83ae5e915ae 100644 --- a/dlls/ws2_32/Makefile.in +++ b/dlls/ws2_32/Makefile.in @@ -1,7 +1,7 @@ MODULE = ws2_32.dll UNIXLIB = ws2_32.so IMPORTLIB = ws2_32 -DELAYIMPORTS = advapi32 iphlpapi user32 +DELAYIMPORTS = dnsapi advapi32 iphlpapi user32 C_SRCS = \ async.c \ diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 492400b17a7..239e4d14cd2 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -69,6 +69,84 @@ static int do_getaddrinfo( const char *node, const char *service, } } +static int dns_only_query( const char *node, const struct addrinfo *hints, struct addrinfo **result ) +{ + DNS_STATUS status; + DNS_RECORDA *rec = NULL, *rec6 = NULL, *ptr; + struct addrinfo *info, *next; + struct sockaddr_in *addr; + struct sockaddr_in6 *addr6; + ULONG count = 0; + + if (hints->ai_family != AF_INET && hints->ai_family != AF_INET6 && hints->ai_family != AF_UNSPEC) + { + FIXME( "unsupported family %u\n", hints->ai_family ); + return EAI_FAMILY; + } + if (hints->ai_family == AF_INET || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_A, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) return EAI_FAIL; + } + if (hints->ai_family == AF_INET6 || hints->ai_family == AF_UNSPEC) + { + status = DnsQuery_A( node, DNS_TYPE_AAAA, DNS_QUERY_NO_NETBT | DNS_QUERY_NO_MULTICAST, NULL, &rec6, NULL ); + if (status != ERROR_SUCCESS && status != DNS_ERROR_RCODE_NAME_ERROR) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + return EAI_FAIL; + } + } + + for (ptr = rec; ptr; ptr = ptr->pNext) count++; + for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + if (!count) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSAHOST_NOT_FOUND; + } + if (!(info = calloc( count, sizeof(*info) + sizeof(SOCKADDR_STORAGE) ))) + { + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return WSA_NOT_ENOUGH_MEMORY; + } + *result = info; + + for (ptr = rec; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in); + info->ai_addr = (struct sockaddr *)(info + 1); + addr = (struct sockaddr_in *)info->ai_addr; + addr->sin_family = info->ai_family; + addr->sin_addr.S_un.S_addr = ptr->Data.A.IpAddress; + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + for (ptr = rec6; ptr; ptr = ptr->pNext) + { + info->ai_family = AF_INET6; + info->ai_socktype = hints->ai_socktype; + info->ai_protocol = hints->ai_protocol; + info->ai_addrlen = sizeof(struct sockaddr_in6); + info->ai_addr = (struct sockaddr *)(info + 1); + addr6 = (struct sockaddr_in6 *)info->ai_addr; + addr6->sin6_family = info->ai_family; + memcpy( &addr6->sin6_addr, &ptr->Data.AAAA.Ip6Address, sizeof(addr6->sin6_addr) ); + next = (struct addrinfo *)((char *)info + sizeof(*info) + sizeof(SOCKADDR_STORAGE)); + if (--count) info->ai_next = next; + info = next; + } + + DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); + DnsRecordListFree( (DNS_RECORD *)rec6, DnsFreeRecordList ); + return 0; +} /*********************************************************************** * getaddrinfo (ws2_32.@) @@ -96,6 +174,11 @@ int WINAPI getaddrinfo( const char *node, const char *service, if (!(fqdn = get_fqdn())) return WSA_NOT_ENOUGH_MEMORY; node = fqdn; } + else if (!service && hints && (hints->ai_flags == AI_DNS_ONLY || hints->ai_flags == (AI_ALL | AI_DNS_ONLY))) + { + ret = dns_only_query( node, hints, info ); + goto done; + } else if (!hints || hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET6) { /* [ipv6] or [ipv6]:portnumber are supported by Windows */ @@ -139,6 +222,7 @@ int WINAPI getaddrinfo( const char *node, const char *service, free( fqdn ); free( nodev6 ); +done: if (!ret && TRACE_ON(winsock)) { struct addrinfo *ai; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index bb09dc98f1c..6eebb5f6b4d 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2328,6 +2328,26 @@ static void test_getaddrinfo(void) memset(&hint, 0, sizeof(hint)); ret = getaddrinfo(NULL, "nonexistentservice", &hint, &result); ok(ret == WSATYPE_NOT_FOUND, "got %d\n", ret); + + result = NULL; + memset(&hint, 0, sizeof(hint)); + hint.ai_flags = AI_ALL | AI_DNS_ONLY; + hint.ai_family = AF_UNSPEC; + hint.ai_socktype = SOCK_STREAM; + hint.ai_protocol = IPPROTO_TCP; + ret = getaddrinfo("winehq.org", NULL, &hint, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + ok(!result->ai_flags, "ai_flags == %08x\n", result->ai_flags); + ok(result->ai_family == AF_INET, "ai_family == %d\n", result->ai_family); + ok(result->ai_socktype == SOCK_STREAM, "ai_socktype == %d\n", result->ai_socktype); + ok(result->ai_protocol == IPPROTO_TCP, "ai_protocol == %d\n", result->ai_protocol); + ok(!result->ai_canonname, "ai_canonname == %s\n", result->ai_canonname); + ok(result->ai_addrlen == sizeof(struct sockaddr_in), "ai_addrlen == %d\n", (int)result->ai_addrlen); + ok(result->ai_addr != NULL, "ai_addr == NULL\n"); + sockaddr = (SOCKADDR_IN *)result->ai_addr; + ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); + ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); + freeaddrinfo(result); } static void test_dns(void) diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index 8ad3e0d17e9..fa2f89f6e98 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -48,6 +48,7 @@ #define USE_WC_PREFIX /* For CMSG_DATA */ #include "iphlpapi.h" #include "ip2string.h" +#include "windns.h" #include "wine/afd.h" #include "wine/debug.h" #include "wine/unixlib.h" diff --git a/include/ws2def.h b/include/ws2def.h index 9ddfa031633..46fb80db470 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -284,6 +284,12 @@ typedef struct _WSAMSG { (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) +#ifndef USE_WS_PREFIX +#define AI_DNS_ONLY 0x00000010 +#else +#define WS_AI_DNS_ONLY 0x00000010 +#endif + typedef struct addrinfoexA { int ai_flags; int ai_family;

1 0

Zebediah Figura : include: Add _fpreset().
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: d0acbcb0d730651af12ba2774990e515e278dd44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0acbcb0d730651af12ba277… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Nov 29 11:01:15 2021 -0600 include: Add _fpreset(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/float.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/msvcrt/float.h b/include/msvcrt/float.h index 4ed5a79b5b3..c24ac3c3aee 100644 --- a/include/msvcrt/float.h +++ b/include/msvcrt/float.h @@ -135,6 +135,7 @@ extern "C" { #endif _ACRTIMP unsigned int __cdecl _clearfp(void); +_ACRTIMP void __cdecl _fpreset(void); _ACRTIMP unsigned int __cdecl _statusfp(void); _ACRTIMP int __cdecl __fpe_flt_rounds(void); _ACRTIMP unsigned int __cdecl _control87(unsigned int, unsigned int);

1 0

Alistair Leslie-Hughes : dxgi: Silence a noisy fixme.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: c5773b8c76f0e0f9ecdf9b9688b30a1ee39ccb6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5773b8c76f0e0f9ecdf9b96… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 30 08:05:01 2021 +1100 dxgi: Silence a noisy fixme. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/factory.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 4c3e3cf0f34..e3aa554ae85 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -253,7 +253,12 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IWineDXGIFac static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IWineDXGIFactory *iface) { - FIXME("iface %p stub!\n", iface); + static BOOL once = FALSE; + + if (!once++) + FIXME("iface %p stub!\n", iface); + else + WARN("iface %p stub!\n", iface); return TRUE; }

1 0

Huw Davies : winemac: Remove unused variable.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 6bc1e9f445128837c488b613cc8c8a746040099a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc1e9f445128837c488b613… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Nov 30 15:27:49 2021 +0000 winemac: Remove unused variable. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index fe48437849d..ffafb0bd1d2 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -429,7 +429,7 @@ static struct display_mode_descriptor* create_original_display_mode_descriptor(C HKEY hkey; DWORD type, size; DWORD refresh100; - WCHAR* pixel_encoding = NULL, *end; + WCHAR* pixel_encoding = NULL; init_original_display_mode();

1 0

Jacek Caban : win32u: Implement monitor registration.
by Alexandre Julliard Nov. 30, 2021

Nov. 30, 2021

Module: wine Branch: master Commit: 8278bdcbec3430aa32eb387543fcdbc10938c3c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8278bdcbec3430aa32eb3875… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 30 13:26:17 2021 +0100 win32u: Implement monitor registration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b81b78badfe..26ea6f01f1f 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -97,6 +97,22 @@ static const WCHAR devpropkey_device_ispresentW[] = '\\','0','0','0','5' }; +static const WCHAR devpropkey_monitor_gpu_luidW[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','C','A','0','8','5','8','5','3','-','1','6','C','E','-','4','8','A','A', + '-','B','1','1','4','-','D','E','9','C','7','2','3','3','4','2','2','3','}', + '\\','0','0','0','1' +}; + +static const WCHAR devpropkey_monitor_output_idW[] = +{ + 'P','r','o','p','e','r','t','i','e','s', + '\\','{','C','A','0','8','5','8','5','3','-','1','6','C','E','-','4','8','A','A', + '-','B','1','1','4','-','D','E','9','C','7','2','3','3','4','2','2','3','}', + '\\','0','0','0','2' +}; + static const WCHAR wine_devpropkey_monitor_stateflagsW[] = { 'P','r','o','p','e','r','t','i','e','s','\\', @@ -121,6 +137,14 @@ static const WCHAR wine_devpropkey_monitor_rcworkW[] = '\\','0','0','0','4' }; +static const WCHAR wine_devpropkey_monitor_adapternameW[] = +{ + 'P','r','o','p','e','r','t','i','e','s','\\', + '{','2','3','3','a','9','e','f','3','-','a','f','c','4','-','4','a','b','d', + '-','b','5','6','4','-','c','3','2','f','2','1','f','1','5','3','5','b','}', + '\\','0','0','0','5' +}; + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; static const WCHAR controlW[] = {'C','o','n','t','r','o','l'}; static const WCHAR device_parametersW[] = @@ -146,6 +170,9 @@ static const WCHAR guid_devclass_displayW[] = 'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}',0}; static const char guid_devclass_monitorA[] = "{4D36E96E-E325-11CE-BFC1-08002BE10318}"; +static const WCHAR guid_devclass_monitorW[] = + {'{','4','D','3','6','E','9','6','E','-','E','3','2','5','-','1','1','C','E','-' + ,'B','F','C','1','-','0','8','0','0','2','B','E','1','0','3','1','8','}'}; static const WCHAR guid_devinterface_display_adapterW[] = {'{','5','B','4','5','2','0','1','D','-','F','2','F','2','-','4','F','3','B','-', @@ -876,7 +903,121 @@ static void add_adapter( const struct gdi_adapter *adapter, void *param ) static void add_monitor( const struct gdi_monitor *monitor, void *param ) { - FIXME( "\n" ); + struct device_manager_ctx *ctx = param; + char buffer[MAX_PATH], instance[64]; + unsigned int monitor_index, output_index; + WCHAR bufferW[MAX_PATH]; + HKEY hkey, subkey; + + static const WCHAR default_monitorW[] = + {'M','O','N','I','T','O','R','\\','D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; + + TRACE( "%s %s %s\n", debugstr_w(monitor->name), wine_dbgstr_rect(&monitor->rc_monitor), + wine_dbgstr_rect(&monitor->rc_work) ); + + if (!ctx->adapter_count) + { + static const struct gdi_adapter default_adapter = + { + .state_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | + DISPLAY_DEVICE_VGA_COMPATIBLE, + }; + TRACE( "adding default fake adapter\n" ); + add_adapter( &default_adapter, ctx ); + } + + monitor_index = ctx->monitor_count++; + output_index = ctx->output_count++; + + sprintf( buffer, "MonitorID%u", monitor_index ); + sprintf( instance, "DISPLAY\\Default_Monitor\\%04X&%04X", ctx->video_count - 1, monitor_index ); + set_reg_ascii_value( ctx->adapter_key, buffer, instance ); + + hkey = reg_create_key( enum_key, bufferW, asciiz_to_unicode( bufferW, instance ) - sizeof(WCHAR), + 0, NULL ); + if (!hkey) return; + + link_device( bufferW, guid_devinterface_monitorW ); + + lstrcpyW( bufferW, monitor->name ); + if (!bufferW[0]) asciiz_to_unicode( bufferW, "Generic Non-PnP Monitor" ); + set_reg_value( hkey, device_descW, REG_SZ, bufferW, (lstrlenW( bufferW ) + 1) * sizeof(WCHAR) ); + + set_reg_value( hkey, classW, REG_SZ, monitorW, sizeof(monitorW) ); + sprintf( buffer, "%s\\%04X", guid_devclass_monitorA, output_index ); + set_reg_ascii_value( hkey, "Driver", buffer ); + set_reg_value( hkey, class_guidW, REG_SZ, guid_devclass_monitorW, sizeof(guid_devclass_monitorW) ); + set_reg_value( hkey, hardware_idW, REG_MULTI_SZ, default_monitorW, sizeof(default_monitorW) ); + + if ((subkey = reg_create_key( hkey, device_parametersW, sizeof(device_parametersW), 0, NULL ))) + { + static const WCHAR edidW[] = {'E','D','I','D',0}; + set_reg_value( subkey, edidW, REG_BINARY, monitor->edid, monitor->edid_len ); + NtClose( subkey ); + } + + /* StateFlags */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_stateflagsW, + sizeof(wine_devpropkey_monitor_stateflagsW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, &monitor->state_flags, + sizeof(monitor->state_flags) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_RCMONITOR */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_rcmonitorW, + sizeof(wine_devpropkey_monitor_rcmonitorW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_BINARY, &monitor->rc_monitor, + sizeof(monitor->rc_monitor) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_RCWORK */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_rcworkW, + sizeof(wine_devpropkey_monitor_rcworkW), 0, NULL ))) + { + TRACE( "rc_work %s\n", wine_dbgstr_rect(&monitor->rc_work) ); + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_BINARY, &monitor->rc_work, + sizeof(monitor->rc_work) ); + NtClose( subkey ); + } + + /* WINE_DEVPROPKEY_MONITOR_ADAPTERNAME */ + if ((subkey = reg_create_key( hkey, wine_devpropkey_monitor_adapternameW, + sizeof(wine_devpropkey_monitor_adapternameW), 0, NULL ))) + { + sprintf( buffer, "\\\\.\\DISPLAY%u", ctx->video_count ); + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_STRING, bufferW, + asciiz_to_unicode( bufferW, buffer )); + NtClose( subkey ); + } + + /* DEVPROPKEY_MONITOR_GPU_LUID */ + if ((subkey = reg_create_key( hkey, devpropkey_monitor_gpu_luidW, + sizeof(devpropkey_monitor_gpu_luidW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_INT64, + &ctx->gpu_luid, sizeof(ctx->gpu_luid) ); + NtClose( subkey ); + } + + /* DEVPROPKEY_MONITOR_OUTPUT_ID */ + if ((subkey = reg_create_key( hkey, devpropkey_monitor_output_idW, + sizeof(devpropkey_monitor_output_idW), 0, NULL ))) + { + set_reg_value( subkey, NULL, 0xffff0000 | DEVPROP_TYPE_UINT32, + &output_index, sizeof(output_index) ); + NtClose( subkey ); + } + + NtClose( hkey ); + + sprintf( buffer, "Class\\%s\\%04X", guid_devclass_monitorA, output_index ); + hkey = reg_create_key( control_key, bufferW, + asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), 0, NULL ); + if (hkey) NtClose( hkey ); } static const struct gdi_device_manager device_manager =

1 0