September 2021 - Wine-Devel

[PATCH 1/3] wininet/tests: Add some tests for InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS).
by Dmitry Timoshkov Sept. 6, 2021

Sept. 6, 2021

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/wininet/tests/internet.c | 57 +++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 9feafc4118e..6b8eefc0b78 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1514,7 +1514,7 @@ static void test_InternetErrorDlg(void) for(i = INTERNET_ERROR_BASE; i < INTERNET_ERROR_LAST; i++) { - DWORD expected = ERROR_CANCELLED, test_flags = 0, j; + DWORD expected = ERROR_CANCELLED, expected2 = ERROR_SUCCESS, test_flags = 0, j; for (j = 0; j < ARRAY_SIZE(no_ui_res); ++j) { @@ -1522,6 +1522,7 @@ static void test_InternetErrorDlg(void) { test_flags = no_ui_res[j].test_flags; expected = no_ui_res[j].res; + expected2 = no_ui_res[j].res; } } @@ -1550,43 +1551,75 @@ static void test_InternetErrorDlg(void) switch(i) { case ERROR_INTERNET_CHG_POST_IS_NON_SECURE: - if (broken(res == ERROR_CANCELLED)) /* before win10 returns ERROR_CANCELLED */ + if (res == ERROR_CANCELLED) /* before win10 returns ERROR_CANCELLED */ + { expected = ERROR_CANCELLED; + expected2 = ERROR_CANCELLED; + } break; default: - if(broken((expected == ERROR_CANCELLED || i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) && - res == ERROR_NOT_SUPPORTED)) /* XP, Win7, Win8 */ + if (expected == ERROR_CANCELLED && res == ERROR_NOT_SUPPORTED) /* XP, Win7, Win8 */ + { expected = ERROR_NOT_SUPPORTED; + expected2 = ERROR_SUCCESS; + } break; } - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); /* Same thing with NULL hwnd */ res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); - todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + res = InternetErrorDlg(NULL, req, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_INCORRECT_PASSWORD && i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && i != ERROR_INTERNET_POST_IS_NON_SECURE && + i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && + i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED && + i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && i != ERROR_INTERNET_INSERT_CDROM && + i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); /* With a null req */ if(test_flags & FLAG_NEEDREQ) + { expected = ERROR_INVALID_PARAMETER; + expected2 = ERROR_INVALID_PARAMETER; + } res = InternetErrorDlg(hwnd, NULL, i, FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); todo_wine_if(i == ERROR_HTTP_COOKIE_NEEDS_CONFIRMATION || i == ERROR_INTERNET_INCORRECT_PASSWORD || i == ERROR_INTERNET_INSERT_CDROM || i == ERROR_INTERNET_CLIENT_AUTH_CERT_NEEDED || - i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR || - i == ERROR_INTERNET_CHG_POST_IS_NON_SECURE) + i == ERROR_INTERNET_HTTPS_TO_HTTP_ON_REDIR) ok(res == expected, "Got %d, expected %d (%d)\n", res, expected, i); + + res = InternetErrorDlg(NULL, NULL, i, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); + todo_wine_if(i != ERROR_INTERNET_SEC_CERT_DATE_INVALID && i != ERROR_INTERNET_HTTP_TO_HTTPS_ON_REDIR && + i != ERROR_INTERNET_SEC_CERT_CN_INVALID && i != ERROR_INTERNET_INVALID_CA && + i != ERROR_INTERNET_SEC_CERT_ERRORS && i != ERROR_INTERNET_SEC_CERT_REV_FAILED && + i != ERROR_INTERNET_MIXED_SECURITY && i != ERROR_INTERNET_CHG_POST_IS_NON_SECURE && + i != ERROR_INTERNET_POST_IS_NON_SECURE && i != ERROR_INTERNET_HTTPS_HTTP_SUBMIT_REDIR && + i != ERROR_INTERNET_SEC_CERT_WEAK_SIGNATURE && i != ERROR_INTERNET_BAD_AUTO_PROXY_SCRIPT && + i != ERROR_INTERNET_UNABLE_TO_DOWNLOAD_SCRIPT && i != ERROR_HTTP_REDIRECT_NEEDS_CONFIRMATION) + ok(res == expected2, "Got %d, expected %d (%d)\n", res, expected2, i); } + res = InternetErrorDlg(NULL, req, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + + res = InternetErrorDlg(NULL, NULL, 0xdeadbeef, FLAGS_ERROR_UI_FILTER_FOR_ERRORS | FLAGS_ERROR_UI_FLAGS_NO_UI, NULL); +todo_wine + ok(res == ERROR_SUCCESS, "Got %d, expected ERROR_SUCCESS\n", res); + res = InternetCloseHandle(req); ok(res == TRUE, "InternetCloseHandle failed: 0x%08x\n", GetLastError()); res = InternetCloseHandle(con); -- 2.31.1

2 1

[PATCH v2 2/2] wininet: Fix some InternetErrorDlg() conditions returning ERROR_INVALID_PARAMETER.
by Jacek Caban Sept. 6, 2021

Sept. 6, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/dialogs.c | 5 +---- dlls/wininet/tests/internet.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH v2 1/2] wininet/tests: Add some tests for InternetErrorDlg(FLAGS_ERROR_UI_FILTER_FOR_ERRORS).
by Jacek Caban Sept. 6, 2021

Sept. 6, 2021

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/tests/internet.c | 45 ++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)

1 0

[PATCH 1/3] winex11.drv: Add GUID_DISPLAY_DEVICE_ARRIVAL interface to display device.
by Paul Gofman Sept. 6, 2021

Sept. 6, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winex11.drv/display.c | 6 ++++++ include/ntddvdeo.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..0b20cff5e79 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -409,6 +410,7 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g WCHAR *driver, LUID *gpu_luid) { static const BOOL present = TRUE; + SP_DEVICE_INTERFACE_DATA iface_data = {sizeof(iface_data)}; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; @@ -432,6 +434,10 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } + /* Register GUID_DISPLAY_DEVICE_ARRIVAL */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DISPLAY_DEVICE_ARRIVAL, NULL, 0, &iface_data)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0; diff --git a/include/ntddvdeo.h b/include/ntddvdeo.h index 9523e37f7b4..8736c6cc845 100644 --- a/include/ntddvdeo.h +++ b/include/ntddvdeo.h @@ -21,5 +21,6 @@ DEFINE_GUID(GUID_DEVINTERFACE_DISPLAY_ADAPTER, 0x5b45201d, 0xf2f2, 0x4f3b, 0x85, 0xbb, 0x30, 0xff, 0x1f, 0x95, 0x35, 0x99); DEFINE_GUID(GUID_DEVINTERFACE_MONITOR, 0xe6f07b5f, 0xee97, 0x4a90, 0xb0, 0x76, 0x33, 0xf5, 0x7b, 0xf4, 0xea, 0xa7); +DEFINE_GUID(GUID_DISPLAY_DEVICE_ARRIVAL, 0x1ca05180, 0xa699, 0x450a, 0x9a, 0x0c, 0xde, 0x4f, 0xbe, 0x3d, 0xdd, 0x89); #endif -- 2.31.1

3 4

[PATCH] winemac.drv: Omit WM_ENTER/EXITSIZEMOVE on non-interactive window changes.
by Jan Sikorski Sept. 6, 2021

Sept. 6, 2021

The motivating example is when a newly created window gets moved off the system menu bar. A program might not be prepared to handle these messages yet. Fixes a crash in Lord of the Rings online. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 19 +++++++++++++------ dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/window.c | 5 +++-- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index eec750706a8..0926756c875 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -1785,7 +1785,7 @@ - (void) orderBelow:(WineWindow*)prev orAbove:(WineWindow*)next activate:(BOOL)a /* Cocoa may adjust the frame when the window is ordered onto the screen. Generate a frame-changed event just in case. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; if (![self isExcludedFromWindowsMenu]) [NSApp addWindowsItem:self title:[self title] filename:NO]; @@ -1964,7 +1964,7 @@ - (void) setFrameFromWine:(NSRect)contentRect { /* In case Cocoa adjusted the frame we tried to set, generate a frame-changed event. The back end will ignore it if nothing actually changed. */ - [self windowDidResize:nil]; + [self windowDidResize:nil skipSizeMove:TRUE]; } } } @@ -2129,7 +2129,7 @@ - (void) postBroughtForwardEvent macdrv_release_event(event); } - - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing + - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resizing:(BOOL)resizing skipSizeMove:(BOOL)skipSizeMove { macdrv_event* event; NSUInteger style = self.styleMask; @@ -2149,6 +2149,7 @@ - (void) postWindowFrameChanged:(NSRect)frame fullscreen:(BOOL)isFullscreen resi event->window_frame_changed.frame = cgrect_win_from_mac(NSRectToCGRect(frame)); event->window_frame_changed.fullscreen = isFullscreen; event->window_frame_changed.in_resize = resizing; + event->window_frame_changed.skip_size_move_loop = skipSizeMove; [queue postEvent:event]; macdrv_release_event(event); } @@ -2912,7 +2913,7 @@ - (void)windowDidResignKey:(NSNotification *)notification macdrv_release_event(event); } - - (void)windowDidResize:(NSNotification *)notification + - (void)windowDidResize:(NSNotification *)notification skipSizeMove:(BOOL)skipSizeMove { NSRect frame = self.wine_fractionalFrame; @@ -2935,12 +2936,18 @@ - (void)windowDidResize:(NSNotification *)notification [self postWindowFrameChanged:frame fullscreen:([self styleMask] & NSWindowStyleMaskFullScreen) != 0 - resizing:[self inLiveResize]]; + resizing:[self inLiveResize] + skipSizeMove:skipSizeMove]; [[[self contentView] inputContext] invalidateCharacterCoordinates]; [self updateFullscreen]; } + - (void)windowDidResize:(NSNotification *)notification + { + [self windowDidResize:notification skipSizeMove:FALSE]; + } + - (BOOL)windowShouldClose:(id)sender { macdrv_event* event = macdrv_create_event(WINDOW_CLOSE_REQUESTED, self); @@ -2997,7 +3004,7 @@ - (void) windowWillEnterFullScreen:(NSNotification*)notification - (void) windowWillExitFullScreen:(NSNotification*)notification { exitingFullScreen = TRUE; - [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE]; + [self postWindowFrameChanged:nonFullscreenFrame fullscreen:FALSE resizing:FALSE skipSizeMove:FALSE]; } - (void)windowWillMiniaturize:(NSNotification *)notification diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 47ae6627b9f..81840e067a9 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -443,6 +443,7 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, CGRect frame; int fullscreen; int in_resize; + int skip_size_move_loop; } window_frame_changed; struct { unsigned long serial; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 14d6a6fd1b2..622f136930c 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -2322,10 +2322,11 @@ void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event) flags |= SWP_NOSENDCHANGING; if (!(flags & SWP_NOSIZE) || !(flags & SWP_NOMOVE)) { - if (!event->window_frame_changed.in_resize && !being_dragged) + int send_sizemove = !event->window_frame_changed.in_resize && !being_dragged && !event->window_frame_changed.skip_size_move_loop; + if (send_sizemove) SendMessageW(hwnd, WM_ENTERSIZEMOVE, 0, 0); SetWindowPos(hwnd, 0, rect.left, rect.top, width, height, flags); - if (!event->window_frame_changed.in_resize && !being_dragged) + if (send_sizemove) SendMessageW(hwnd, WM_EXITSIZEMOVE, 0, 0); } } -- 2.29.2

1 0

[PATCH v2 1/3] winex11.drv: Add 'EDID' registry key to every monitor device.
by Eduard Permyakov Sept. 6, 2021

Sept. 6, 2021

Extended display identification data (EDID) is a set of data that is provided by a display to describe its capabilities to a graphics adapter. EDID data allows a computer to detect the type of monitor that is connected to it. EDID data includes the manufacturer name, the product type, the timings that are supported by the display, the display size, as well as other display characteristics. EDID is defined by a standard published by the Video Electronics Standards Association (VESA). In Windows, every display device has an associated 'EDID' registry key containing this data. Applications can read and parse it to get the display capabilities. In Linux, we can get each monitor's EDID using the RANDR X extension. This patch fixes, for example, monitor detection in the UE-based game 'Industries of Titan'. Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 4 +++- dlls/winex11.drv/display.c | 15 +++++++++--- dlls/winex11.drv/x11drv.h | 6 ++++- dlls/winex11.drv/x11drv_main.c | 3 ++- dlls/winex11.drv/xinerama.c | 4 +++- dlls/winex11.drv/xrandr.c | 42 +++++++++++++++++++++++++++++++++- 6 files changed, 66 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index b517e44e150..71b3a0a5a27 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -265,6 +265,8 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon SetRect( &monitor->rc_work, 0, 0, desktop_width, desktop_height ); query_desktop_work_area( &monitor->rc_work ); monitor->state_flags = DISPLAY_DEVICE_ATTACHED; + monitor->edid_len = 0; + monitor->edid = NULL; if (desktop_width && desktop_height) monitor->state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -273,7 +275,7 @@ static BOOL X11DRV_desktop_get_monitors( ULONG_PTR adapter_id, struct x11drv_mon return TRUE; } -static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) +static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index b3ff213ae89..ca81f169f9f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -109,6 +109,8 @@ 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 const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; +static const WCHAR edidW[] = {'E','D','I','D',0}; +static const WCHAR bad_edidW[] = {'B','A','D','_','E','D','I','D',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -257,7 +259,7 @@ RECT get_host_primary_monitor_rect(void) if (gpus) host_handler.free_gpus(gpus); if (adapters) host_handler.free_adapters(adapters); - if (monitors) host_handler.free_monitors(monitors); + if (monitors) host_handler.free_monitors(monitors, monitor_count); return rect; } @@ -611,6 +613,13 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo DEVPROP_TYPE_UINT32, (const BYTE *)&output_id, sizeof(output_id), 0)) goto done; + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + if (monitor->edid) + RegSetValueExW(hkey, edidW, 0, REG_BINARY, monitor->edid, monitor->edid_len); + else + RegSetValueExW(hkey, bad_edidW, 0, REG_BINARY, NULL, 0); + RegCloseKey(hkey); + /* Create driver key */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); RegCloseKey(hkey); @@ -768,7 +777,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); monitors = NULL; video_index++; } @@ -788,5 +797,5 @@ done: if (adapters) handler->free_adapters(adapters); if (monitors) - handler->free_monitors(monitors); + handler->free_monitors(monitors, monitor_count); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e14e131d819..2b0f7be589f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -497,6 +497,7 @@ enum x11drv_atoms XATOM_text_rtf, XATOM_text_richtext, XATOM_text_uri_list, + XATOM_EDID, NB_XATOMS }; @@ -752,6 +753,9 @@ struct x11drv_monitor RECT rc_work; /* StateFlags in DISPLAY_DEVICE struct */ DWORD state_flags; + /* Extended Device Identification Data */ + unsigned long edid_len; + unsigned char *edid; }; /* Required functions for display device registry initialization */ @@ -787,7 +791,7 @@ struct x11drv_display_device_handler void (*free_adapters)(struct x11drv_adapter *adapters); /* free_monitors will be called to free a monitor list from get_monitors */ - void (*free_monitors)(struct x11drv_monitor *monitors); + void (*free_monitors)(struct x11drv_monitor *monitors, int count); /* register_event_handlers will be called to register event handlers. * This function pointer is optional and can be NULL when driver doesn't support it */ diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 2fac560556b..6e7cb91c5c7 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -220,7 +220,8 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "text/plain", "text/rtf", "text/richtext", - "text/uri-list" + "text/uri-list", + "EDID" }; /*********************************************************************** diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c9863482534..0e1e07669c2 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -244,6 +244,8 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * monitor[index].rc_work = monitors[i].rcWork; /* Xinerama only reports monitors already attached */ monitor[index].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor[index].edid_len = 0; + monitor[index].edid = NULL; if (!IsRectEmpty( &monitors[i].rcMonitor )) monitor[index].state_flags |= DISPLAY_DEVICE_ACTIVE; @@ -256,7 +258,7 @@ static BOOL xinerama_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * return TRUE; } -static void xinerama_free_monitors( struct x11drv_monitor *monitors ) +static void xinerama_free_monitors( struct x11drv_monitor *monitors, int count ) { heap_free( monitors ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e7adcec0f2e..eb2f7021ba6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetOutputProperty) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) @@ -112,6 +113,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); + LOAD_FUNCPTR(XRRGetOutputProperty); LOAD_FUNCPTR(XRRGetScreenResources); LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); @@ -466,6 +468,37 @@ static void get_screen_size( XRRScreenResources *resources, unsigned int *width, } } +static void get_edid(RROutput output, unsigned char **prop, unsigned long *len) +{ + int result; + Atom actual_type; + int actual_format; + unsigned long bytes_after; + + result = pXRRGetOutputProperty( + gdi_display, + output, + x11drv_atom(EDID), + 0, + 128, + FALSE, + FALSE, + AnyPropertyType, + &actual_type, + &actual_format, + len, + &bytes_after, + prop + ); + + if (result != Success) + { + WARN("Could not retrieve EDID property.\n"); + *prop = NULL; + *len = 0; + } +} + static void set_screen_size( int width, int height ) { int screen = default_visual.screen; @@ -1036,6 +1069,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + get_edid( adapter_id, &monitors[monitor_count].edid, &monitors[monitor_count].edid_len ); monitor_count = 1; } /* Active monitors, need to find other monitors with the same coordinates as mirrored */ @@ -1091,6 +1125,9 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * if (is_crtc_primary( primary_rect, crtc_info )) primary_index = monitor_count; + + get_edid( screen_resources->outputs[i], &monitors[monitor_count].edid, + &monitors[monitor_count].edid_len ); monitor_count++; } @@ -1137,8 +1174,11 @@ done: return ret; } -static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +static void xrandr14_free_monitors( struct x11drv_monitor *monitors, int count ) { + int i; + for (i = 0; i < count; i++) + XFree( monitors[i].edid ); heap_free( monitors ); } -- 2.25.1

3 6

[PATCH 0/4] DbgHelp: Reworked line handling APIs
by Eric Pouech Sept. 6, 2021

Sept. 6, 2021

Basically, current implem is broken: - in some code paths, same buffer is used both as input and output this serie fixes it by putting in place a cleaner way of setting the returned buffer it also implements a couple of missing W64 variants of APIs (this issue had been reported by Alistair a couple of months ago on wine-devel) A+ --- Eric Pouech (4): dbghelp: let symt_fill_func_line_info and symt_get_func_line_next be a static function inside symbol.c dbghelp: introducing internal_line_t structure as help in Line manipulation dbghelp: implemented all SymGetLineNext* functions using internal_line_t dbghelp: (re)write SymGetLinePrev* with internal_line_t dlls/dbghelp/dbghelp.spec | 4 +- dlls/dbghelp/symbol.c | 393 ++++++++++++++++++++++++-------------- 2 files changed, 248 insertions(+), 149 deletions(-)

1 4

[PATCH 5/5] hh: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang Sept. 6, 2021

Sept. 6, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/hh/hh.manifest | 9 +++++++++ programs/hh/hh.rc | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 programs/hh/hh.manifest diff --git a/programs/hh/hh.manifest b/programs/hh/hh.manifest new file mode 100644 index 00000000000..be1e025a548 --- /dev/null +++ b/programs/hh/hh.manifest @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity type="win32" name="Wine.HelpViewer" version="0.0.0.0"/> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> +</assembly> diff --git a/programs/hh/hh.rc b/programs/hh/hh.rc index d397dc63ee4..36c142345b9 100644 --- a/programs/hh/hh.rc +++ b/programs/hh/hh.rc @@ -18,6 +18,10 @@ * 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 <winuser.h> /* @makedep: winhelp.ico */ 101 ICON winhelp.ico + +/* @makedep: hh.manifest */ +1 RT_MANIFEST hh.manifest -- 2.30.2

1 0

[PATCH 4/5] explorer: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang Sept. 6, 2021

Sept. 6, 2021

This is also required for get_monitor_dpi() in wineserver to function properly for DPI unaware applications because it uses desktop window DPI as monitor DPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/explorer/explorer.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/explorer/explorer.manifest b/programs/explorer/explorer.manifest index 15e5428a1b7..a4b573f0b41 100644 --- a/programs/explorer/explorer.manifest +++ b/programs/explorer/explorer.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0

[PATCH 3/5] dxdiag: Add system DPI awareness settings to the application manifest.
by Zhiyi Zhang Sept. 6, 2021

Sept. 6, 2021

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- programs/dxdiag/dxdiag.manifest | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest index 57ba80c05db..6b17f6cd09f 100644 --- a/programs/dxdiag/dxdiag.manifest +++ b/programs/dxdiag/dxdiag.manifest @@ -13,4 +13,9 @@ /> </dependentAssembly> </dependency> +<application xmlns="urn:schemas-microsoft-com:asm.v3"> + <windowsSettings> + <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware> + </windowsSettings> +</application> </assembly> -- 2.30.2

1 0