wine-devel July 2019

wine-devel@winehq.org

65 participants
284 discussions

[PATCH 4/7] mshtml: Add IHTMLDOMRange stub.
by Jacek Caban 01 Jul '19

01 Jul '19

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I integrated tests into existing tests to avoid running new document instance. If we need more range tests, it would probably be better in JavaScript anyway. dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++ 6 files changed, 483 insertions(+), 4 deletions(-) rename dlls/mshtml/{txtrange.c => range.c} (82%)

2 1

[PATCH 3/7] mshtml/tests: Merge text range tests.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)

1 0

[PATCH 2/7] mshtml/tests: Introduce set_body_html helper.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/7] mshtml/tests: Fix comment tests on recent IE versions.
by Jacek Caban 01 Jul '19

01 Jul '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)

1 0

Re: Profiling application under Wine
by Hin-Tak Leung 01 Jul '19

01 Jul '19

Hmm, I think wine-mono has been working in 64-bit mode for a while - although you have to invoke wine explicitly as wine64 to hook into it . I think there are some quirks about how wine and wine-mono interacts, in such a way that you cannot do 32-bit + 64-bit switches within the process - i.e. you must do 64-bit wine to get at 64-bit wine-mono. Do you notice any performance difference between using wine-mono and dotnet472 64-bit ? I am going back to wine-mono for your issue, as mono supports setting profiling option via environment variables (catering for exactly this use case, when mono is running embedded inside another process), and you can set WINE_MONO_* variables to pass those along. I am not sure about the exact details so you'll need to look up the relevant docs, but I know this is possible - mono has a built-in profiler, and it is accessible and turned on via environment variables. -------------------------------------------- On Tue, 25/6/19, Chambers, Matthew <matt.chambers42(a)gmail.com> wrote: The application requires dotnet472 and 64-bit at that. I actually had to add that verb to winetricks to get our application to work. I'm definitely getting varying mileage! My question is how to profile it with Windows symbols so I can understand why and either help fix it in Wine or possibly avoid the problem from my application code.

3 3

[PATCH 2/2] user32: Cache monitor information.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

Multiple applications call EnumDisplayMonitors very frequently. This reduce the most of the overhead by caching. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47431 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 181 +++++++++++++++++++++++++--------------- 1 file changed, 116 insertions(+), 65 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 83450eee36..3f93f9c827 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -305,6 +305,19 @@ static const WCHAR MONITOR_INTERFACE_PREFIX[] = {'\\','\\','\?','\\',0}; static const WCHAR GUID_DEVINTERFACE_MONITOR[] = {'#','{','e','6','f','0','7','b','5','f','-','e','e','9','7','-', '4','a','9','0','-','b','0','7','6','-','3','3','f','5','7','b','f','4','e','a','a','7','}',0}; +/* Cached monitor information */ +static MONITORINFOEXW *monitors; +static UINT monitor_count; +static FILETIME last_query_monitors_time; +static CRITICAL_SECTION monitors_section; +static CRITICAL_SECTION_DEBUG monitors_critsect_debug = +{ + 0, 0, &monitors_section, + { &monitors_critsect_debug.ProcessLocksList, &monitors_critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": monitors_section") } +}; +static CRITICAL_SECTION monitors_section = { &monitors_critsect_debug, -1 , 0, 0, 0, 0 }; + static HDC display_dc; static CRITICAL_SECTION display_dc_section; static CRITICAL_SECTION_DEBUG critsect_debug = @@ -328,6 +341,7 @@ static DPI_AWARENESS dpi_awareness; static DPI_AWARENESS default_awareness = DPI_AWARENESS_UNAWARE; static HKEY volatile_base_key; +static HKEY video_key; union sysparam_all_entry; @@ -3723,15 +3737,85 @@ HMONITOR WINAPI MonitorFromWindow(HWND hWnd, DWORD dwFlags) return MonitorFromRect( &rect, dwFlags ); } -BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +/* Return FALSE on failure and TRUE on success */ +static BOOL update_monitor_cache(void) { SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - WCHAR adapter_name[CCHDEVICENAME]; - HDEVINFO devinfo; - DWORD error = 0; - HANDLE mutex; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + MONITORINFOEXW *monitor_array; + FILETIME filetime = {0}; + DWORD device_count = 0; + HANDLE mutex = NULL; + DWORD state_flags; + BOOL ret = FALSE; + DWORD i = 0; DWORD type; - BOOL ret; + + /* Update monitor cache from SetupAPI if it's outdated */ + if (!video_key && RegOpenKeyW( HKEY_LOCAL_MACHINE, VIDEO_KEY, &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) + return TRUE; + + mutex = get_display_device_init_mutex(); + EnterCriticalSection( &monitors_section ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); + + while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + { + /* Inactive monitors don't get enumerated */ + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) + goto fail; + if (state_flags & DISPLAY_DEVICE_ACTIVE) + device_count++; + } + + if (device_count && monitor_count < device_count) + { + monitor_array = heap_alloc( device_count * sizeof(*monitor_array) ); + if (!monitor_array) + goto fail; + heap_free( monitors ); + monitors = monitor_array; + } + + for (i = 0, monitor_count = 0; SetupDiEnumDeviceInfo( devinfo, i, &device_data ); i++) + { + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, + (BYTE *)&state_flags, sizeof(DWORD), NULL, 0 )) + goto fail; + if (!(state_flags & DISPLAY_DEVICE_ACTIVE)) + continue; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitors[monitor_count].rcMonitor, sizeof(RECT), NULL, 0 )) + goto fail; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, + (BYTE *)&monitors[monitor_count].rcWork, sizeof(RECT), NULL, 0 )) + goto fail; + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, + (BYTE *)monitors[monitor_count].szDevice, CCHDEVICENAME * sizeof(WCHAR), NULL, 0)) + goto fail; + monitors[monitor_count].dwFlags = + !lstrcmpW( DEFAULT_ADAPTER_NAME, monitors[monitor_count].szDevice ) ? MONITORINFOF_PRIMARY : 0; + + monitor_count++; + } + + last_query_monitors_time = filetime; + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList( devinfo ); + LeaveCriticalSection( &monitors_section ); + release_display_device_init_mutex( mutex ); + return ret; +} + +BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) +{ + UINT index = (UINT_PTR)handle - 1; TRACE("(%p, %p)\n", handle, info); @@ -3747,32 +3831,26 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) return TRUE; } - /* Use SetupAPI to get monitors */ - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); - if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) + if (!update_monitor_cache()) + return FALSE; + + EnterCriticalSection( &monitors_section ); + if (index < monitor_count) { - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&info->rcMonitor, sizeof(info->rcMonitor), NULL, 0 ); - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, &type, - (BYTE *)&info->rcWork, sizeof(info->rcWork), NULL, 0 ); - SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, &type, - (BYTE *)adapter_name, sizeof(adapter_name), NULL, 0 ); - info->dwFlags = !lstrcmpW( DEFAULT_ADAPTER_NAME, adapter_name ) ? MONITORINFOF_PRIMARY : 0; + info->rcMonitor = monitors[index].rcMonitor; + info->rcWork = monitors[index].rcWork; + info->dwFlags = monitors[index].dwFlags; if (info->cbSize >= sizeof(MONITORINFOEXW)) - lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, adapter_name ); - ret = TRUE; + lstrcpyW( ((MONITORINFOEXW *)info)->szDevice, monitors[index].szDevice ); + LeaveCriticalSection( &monitors_section ); + return TRUE; } else { - error = ERROR_INVALID_MONITOR_HANDLE; - ret = FALSE; - } - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - if (error) + LeaveCriticalSection( &monitors_section ); SetLastError( ERROR_INVALID_MONITOR_HANDLE ); - return ret; + return FALSE; + } } /*********************************************************************** @@ -3875,56 +3953,29 @@ static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC proc, LPARAM lp ) { - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - USEROBJECTFLAGS flags; - HWINSTA winstation; - BOOL success = FALSE; - HDEVINFO devinfo; - RECT monitor_rect; - DWORD state_flags; - HANDLE mutex; - DWORD type; - DWORD i = 0; + RECT default_rect = {0, 0, 640, 480}; + DWORD i; TRACE("(%p, %p, %p, 0x%lx)\n", hdc, rect, proc, lp); - /* Use SetupAPI to get monitors only if window station has visible display surfaces */ - winstation = GetProcessWindowStation(); - if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) + if (update_monitor_cache()) { - mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); - while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) + EnterCriticalSection( &monitors_section ); + for (i = 0; i < monitor_count; i++) { - /* Inactive monitors don't get enumerated */ - if (!SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_STATEFLAGS, &type, - (BYTE *)&state_flags, sizeof(state_flags), NULL, 0 ) - || !(state_flags & DISPLAY_DEVICE_ACTIVE)) - continue; - - if (SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, - (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0 )) + if (!proc( (HMONITOR)(UINT_PTR)(i + 1), hdc, &monitors[i].rcMonitor, lp )) { - if (!proc( (HMONITOR)(UINT_PTR)i, hdc, &monitor_rect, lp )) - { - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); - return FALSE; - } - success = TRUE; + LeaveCriticalSection( &monitors_section ); + return FALSE; } } - SetupDiDestroyDeviceInfoList( devinfo ); - release_display_device_init_mutex( mutex ); + LeaveCriticalSection( &monitors_section ); + return TRUE; } /* Fallback to report one monitor if using SetupAPI failed */ - if (!success) - { - RECT default_rect = {0, 0, 640, 480}; - if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) - return FALSE; - } + if (!proc( NULLDRV_DEFAULT_HMONITOR, hdc, &default_rect, lp )) + return FALSE; return TRUE; } -- 2.20.1

2 1

[PATCH 1/2] user32: Specify enumerator when calling SetupDiGetClassDevsW.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 12225a6551..83450eee36 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -283,7 +283,8 @@ static const WCHAR BACKSLASH[] = {'\\',0}; static const WCHAR DRIVER_DESC[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR STATE_FLAGS[] = {'S','t','a','t','e','F','l','a','g','s',0}; static const WCHAR GPU_ID[] = {'G','P','U','I','D',0}; -static const WCHAR DISPLAY[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; +static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR ADAPTER_PREFIX[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static const WCHAR MONITOR_ID_VALUE_FMT[] = {'M','o','n','i','t','o','r','I','D','%','d',0}; static const WCHAR VIDEO_KEY[] = {'H','A','R','D','W','A','R','E','\\', 'D','E','V','I','C','E','M','A','P','\\', @@ -3748,7 +3749,7 @@ BOOL CDECL nulldrv_GetMonitorInfo( HMONITOR handle, MONITORINFO *info ) /* Use SetupAPI to get monitors */ mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); if (SetupDiEnumDeviceInfo(devinfo, (DWORD)(UINT_PTR)handle - 1, &device_data)) { SetupDiGetDevicePropertyW( devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, @@ -3892,7 +3893,7 @@ BOOL CDECL nulldrv_EnumDisplayMonitors( HDC hdc, RECT *rect, MONITORENUMPROC pro if (GetUserObjectInformationA( winstation, UOI_FLAGS, &flags, sizeof(flags), NULL ) && (flags.dwFlags & WSF_VISIBLE)) { mutex = get_display_device_init_mutex(); - devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, NULL, NULL, 0 ); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_MONITOR, DISPLAY, NULL, DIGCF_PRESENT ); while (SetupDiEnumDeviceInfo( devinfo, i++, &device_data )) { /* Inactive monitors don't get enumerated */ @@ -4062,10 +4063,10 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i else { /* Check adapter name */ - if (strncmpiW( device, DISPLAY, ARRAY_SIZE(DISPLAY) )) + if (strncmpiW( device, ADAPTER_PREFIX, ARRAY_SIZE(ADAPTER_PREFIX) )) goto done; - adapter_index = strtolW( device + ARRAY_SIZE(DISPLAY), NULL, 10 ); + adapter_index = strtolW( device + ARRAY_SIZE(ADAPTER_PREFIX), NULL, 10 ); sprintfW( key_nameW, VIDEO_VALUE_FMT, adapter_index - 1 ); size = sizeof(bufferW); -- 2.20.1

2 1

[PATCH] ntdll: Support NtQuerySystemInformation(SystemFirmwareTableInformation) on macOS.
by Hans Leidekker 01 Jul '19

01 Jul '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c3eb4a1205..aeca6160a6 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -36,6 +36,9 @@ #ifdef HAVE_MACH_MACHINE_H # include <mach/machine.h> #endif +#ifdef HAVE_IOKIT_IOKITLIB_H +# include <IOKit/IOKitLib.h> +#endif #include <ctype.h> #include <string.h> @@ -2227,6 +2230,80 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG } } +#elif defined(__APPLE__) +static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) +{ + switch (sfti->ProviderSignature) + { + case RSMB: + { + io_service_t service; + CFDataRef data; + const UInt8 *ptr; + CFIndex len; + struct smbios_prologue *prologue; + BYTE major_version = 2, minor_version = 0; + + if (!(service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("AppleSMBIOS")))) + { + WARN("can't find AppleSMBIOS service\n"); + return STATUS_NO_MEMORY; + } + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS-EPS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS entry point\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + if (len >= 8 && !memcmp(ptr, "_SM_", 4)) + { + major_version = ptr[6]; + minor_version = ptr[7]; + } + CFRelease(data); + + if (!(data = IORegistryEntryCreateCFProperty(service, CFSTR("SMBIOS"), kCFAllocatorDefault, 0))) + { + WARN("can't find SMBIOS table\n"); + IOObjectRelease(service); + return STATUS_NO_MEMORY; + } + + len = CFDataGetLength(data); + ptr = CFDataGetBytePtr(data); + sfti->TableBufferLength = sizeof(*prologue) + len; + *required_len = sfti->TableBufferLength + FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (available_len < *required_len) + { + CFRelease(data); + IOObjectRelease(service); + return STATUS_BUFFER_TOO_SMALL; + } + + prologue = (struct smbios_prologue *)sfti->TableBuffer; + prologue->calling_method = 0; + prologue->major_version = major_version; + prologue->minor_version = minor_version; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(*prologue); + + memcpy(sfti->TableBuffer + sizeof(*prologue), ptr, len); + + CFRelease(data); + IOObjectRelease(service); + return STATUS_SUCCESS; + } + default: + { + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + return STATUS_NOT_IMPLEMENTED; + } + } +} #else static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) -- 2.20.1

1 0

[PATCH] winex11.drv: Specify enumerator when calling SetupDiGetClassDevsW.
by Zhiyi Zhang 01 Jul '19

01 Jul '19

This reduces some search time. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index f5ef65f428..7ddaf1c10d 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -46,6 +46,8 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x 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 displayW[] = {'D','I','S','P','L','A','Y',0}; +static const WCHAR pciW[] = {'P','C','I',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}; @@ -309,7 +311,7 @@ static void prepare_devices(HKEY video_hkey) DWORD i = 0; /* Remove all monitors */ - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiRemoveDevice(devinfo, &device_data)) @@ -326,7 +328,7 @@ static void prepare_devices(HKEY video_hkey) * 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. */ i = 0; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, @@ -344,7 +346,7 @@ static void cleanup_devices(void) DWORD i = 0; BOOL present; - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, NULL, NULL, 0); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { present = FALSE; -- 2.20.1

1 0

[PATCH] msxml3: Fix string length handling in I[VB]SAXContentHandler::characters.
by Jacek Caban 01 Jul '19

01 Jul '19

Windows crashes when -1 length is passed. Escaping should just copy embedded null bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msxml3/mxwriter.c | 10 ++--- dlls/msxml3/tests/saxreader.c | 72 ++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 6 deletions(-)

3 2

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel July 2019