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

[PATCH 4/6] winemac.drv: Add monitor initialization functions.
by Zhiyi Zhang July 4, 2019

July 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 108 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 103 +++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 14 +++++ dlls/winemac.drv/macdrv_main.c | 2 + 4 files changed, 222 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 53b1fb0a68..e1c1b0cb17 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -582,3 +582,111 @@ void macdrv_free_adapters(struct macdrv_adapter* adapters) if (adapters) free(adapters); } + +/*********************************************************************** + * macdrv_get_monitors + * + * Get a list of monitors under adapter_id. The first monitor is primary if adapter is primary. + * Call macdrv_free_monitors() when you are done using the data. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** new_monitors, int* count) +{ + struct macdrv_monitor* monitors = NULL; + struct macdrv_monitor* realloc_monitors; + struct macdrv_display* displays = NULL; + CGDirectDisplayID display_ids[16]; + uint32_t display_id_count; + int primary_index = 0; + int monitor_count = 0; + int display_count; + int capacity; + int ret = -1; + int i, j; + + /* 2 should be enough for most cases */ + capacity = 2; + monitors = calloc(capacity, sizeof(*monitors)); + if (!monitors) + return -1; + + /* Report an inactive monitor */ + if (!CGDisplayIsActive(adapter_id) && !CGDisplayIsInMirrorSet(adapter_id)) + { + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor_count++; + } + /* Report active and mirrored monitors in the same mirroring set */ + else + { + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + goto done; + + if (macdrv_get_displays(&displays, &display_count)) + goto done; + + for (i = 0; i < display_id_count; i++) + { + if (display_ids[i] != adapter_id && CGDisplayMirrorsDisplay(display_ids[i]) != adapter_id) + continue; + + /* Find and fill in monitor info */ + for (j = 0; j < display_count; j++) + { + if (displays[i].displayID == display_ids[j] + || CGDisplayMirrorsDisplay(display_ids[i]) == displays[j].displayID) + { + /* Allocate more space if needed */ + if (monitor_count >= capacity) + { + capacity *= 2; + realloc_monitors = realloc(monitors, sizeof(*monitors) * capacity); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; + } + + if (CGDisplayIsMain(display_ids[j])) + primary_index = monitor_count; + + strcpy(monitors[monitor_count].name, "Generic Non-PnP Monitor"); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE; + monitor_count++; + } + } + } + + /* Make sure the first monitor on primary adapter is primary */ + if (primary_index) + { + struct macdrv_monitor tmp; + tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; + } + } + + *new_monitors = monitors; + *count = monitor_count; + ret = 0; +done: + if (displays) + macdrv_free_displays(displays); + if (ret) + macdrv_free_monitors(monitors); + return ret; +} + +/*********************************************************************** + * macdrv_free_monitors + * + * Frees an monitor list allocated from macdrv_get_monitors() + */ +void macdrv_free_monitors(struct macdrv_monitor* monitors) +{ + if (monitors) + free(monitors); +} diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 6b2eea9ecc..fdb2415885 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -51,14 +51,18 @@ struct display_mode_descriptor BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmode, DWORD flags); +/* Wine specific monitor properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); static const char initial_mode_key[] = "Initial Display Mode"; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; 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}; +static const WCHAR mointor_id_fmtW[] = {'M','o','n','i','t','o','r','I','D','%','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','-', @@ -100,6 +104,13 @@ static const WCHAR nt_classW[] = { '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 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 CFArrayRef modes; @@ -1538,7 +1549,7 @@ done: * * Return FALSE on failure and TRUE on success. */ -static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, int adapter_index, +static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, int adapter_index, int monitor_count, const struct macdrv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, const struct macdrv_adapter *adapter) { @@ -1548,6 +1559,7 @@ static BOOL macdrv_init_adapter(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); lstrcpyW(bufferW, machine_prefixW); @@ -1582,6 +1594,15 @@ static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, if (RegSetValueExW(hkey, gpu_idW, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; + /* 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, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + /* Write StateFlags */ if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, sizeof(adapter->state_flags))) @@ -1595,6 +1616,52 @@ done: return ret; } +/*********************************************************************** + * macdrv_init_monitor + * + * Initialize an monitor. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL macdrv_init_monitor(HDEVINFO devinfo, const struct macdrv_monitor *monitor, int monitor_index, + int video_index) +{ + SP_DEVINFO_DATA device_data = {sizeof(SP_DEVINFO_DATA)}; + WCHAR nameW[MAX_PATH]; + WCHAR bufferW[MAX_PATH]; + HKEY hkey; + BOOL ret = FALSE; + + /* Create GUID_DEVCLASS_MONITOR instance */ + sprintfW(bufferW, monitor_instance_fmtW, video_index, monitor_index); + MultiByteToWideChar(CP_UTF8, 0, monitor->name, -1, nameW, ARRAY_SIZE(nameW)); + SetupDiCreateDeviceInfoW(devinfo, bufferW, &GUID_DEVCLASS_MONITOR, nameW, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + goto done; + + /* Write HardwareID registry property */ + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, + (const BYTE *)monitor_hardware_idW, sizeof(monitor_hardware_idW))) + goto done; + + /* Create driver key */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DRV, NULL, NULL); + RegCloseKey(hkey); + + /* FIXME: + * Following properties are Wine specific, see comments in macdrv_init_adapter 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 done; + + ret = TRUE; +done: + if (!ret) + ERR("Failed to initialize monitor\n"); + return ret; +} + static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; @@ -1602,6 +1669,15 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; + /* Remove all monitors */ + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiRemoveDevice(devinfo, &device_data)) + ERR("Failed to remove monitor\n"); + } + SetupDiDestroyDeviceInfoList(devinfo); + /* Clean up old adapter keys for reinitialization */ RegDeleteTreeW(video_hkey, NULL); @@ -1610,6 +1686,7 @@ static void prepare_devices(HKEY video_hkey) * case application uses 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. */ + i = 0; devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pciW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) { @@ -1651,9 +1728,10 @@ void macdrv_init_display_devices(void) HANDLE mutex; struct macdrv_gpu *gpus = NULL; struct macdrv_adapter *adapters = NULL; - INT gpu_count, adapter_count; - INT gpu, adapter; - HDEVINFO gpu_devinfo = NULL; + struct macdrv_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; @@ -1679,6 +1757,7 @@ void macdrv_init_display_devices(void) prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ if (macdrv_get_gpus(&gpus, &gpu_count)) @@ -1695,10 +1774,22 @@ void macdrv_init_display_devices(void) for (adapter = 0; adapter < adapter_count; adapter++) { - if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, &gpus[gpu], guidW, driverW, + if (macdrv_get_monitors(adapters[adapter].id, &monitors, &monitor_count)) + goto done; + + if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, monitor_count, &gpus[gpu], guidW, driverW, &adapters[adapter])) goto done; + /* Initialize monitors */ + for (monitor = 0; monitor < monitor_count; monitor++) + { + if (!macdrv_init_monitor(monitor_devinfo, &monitors[monitor], monitor, video_index)) + goto done; + } + + macdrv_free_monitors(monitors); + monitors = NULL; video_index++; } @@ -1708,6 +1799,7 @@ void macdrv_init_display_devices(void) done: cleanup_devices(); + SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); @@ -1716,4 +1808,5 @@ done: macdrv_free_gpus(gpus); macdrv_free_adapters(adapters); + macdrv_free_monitors(monitors); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index b960e902e3..96ebb97e76 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -261,6 +261,9 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* Used DISPLAY_DEVICE.StateFlags for adapters */ #define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 #define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 +/* Used DISPLAY_DEVICE.StateFlags for monitors */ +#define DISPLAY_DEVICE_ACTIVE 0x00000001 +#define DISPLAY_DEVICE_ATTACHED 0x00000002 /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu @@ -285,6 +288,15 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) uint32_t state_flags; }; +/* Represent a monitor in EnumDisplayDevices context */ +struct macdrv_monitor +{ + /* Name, in UTF-8 encoding */ + char name[128]; + /* StateFlags in DISPLAY_DEVICE struct */ + uint32_t state_flags; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, @@ -293,6 +305,8 @@ extern int macdrv_set_display_mode(const struct macdrv_display* display, extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_adapters(struct macdrv_adapter* adapters) DECLSPEC_HIDDEN; +extern int macdrv_get_monitors(uint32_t adapter_id, struct macdrv_monitor** monitors, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_monitors(struct macdrv_monitor* monitors) DECLSPEC_HIDDEN; /* event */ diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 544d448f9f..038578491f 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -299,6 +299,8 @@ static BOOL process_attach(void) return FALSE; } + macdrv_init_display_devices(); + return TRUE; } -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH 1/6] user32: Wait for user driver to be ready in EnumDisplayDevicesW.
by Zhiyi Zhang July 4, 2019

July 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/sysparams.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 3f93f9c827..b82861bb5d 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -736,6 +736,18 @@ static void release_display_device_init_mutex( HANDLE mutex ) CloseHandle( mutex ); } +/* Wait until user driver is loaded by explorer */ +static void wait_user_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW( GetDesktopWindow(), WM_NULL, 0, 0 ); + ready = TRUE; + } +} + /* map value from system dpi to standard 96 dpi for storing in the registry */ static int map_from_system_dpi( int val ) { @@ -4058,6 +4070,7 @@ BOOL WINAPI EnumDisplayDevicesW( LPCWSTR device, DWORD index, DISPLAY_DEVICEW *i TRACE("%s %d %p %#x\n", debugstr_w( device ), index, info, flags); + wait_user_driver_ready(); mutex = get_display_device_init_mutex(); /* Find adapter */ -- 2.15.2 (Apple Git-101.1)

2 1

[PATCH 1/5] gdi32: Support multiple monitors in D3DKMTOpenAdapterFromGdiDisplayName.
by Zhiyi Zhang July 4, 2019

July 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/driver.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index dcbc480376..49ed081df1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -55,7 +55,6 @@ struct graphics_driver struct d3dkmt_adapter { D3DKMT_HANDLE handle; /* Kernel mode graphics adapter handle */ - INT ordinal; /* Graphics adapter ordinal */ struct list entry; /* List entry */ }; @@ -1339,21 +1338,20 @@ NTSTATUS WINAPI D3DKMTCloseAdapter( const D3DKMT_CLOSEADAPTER *desc ) */ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME *desc ) { - static const WCHAR display1W[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y','1',0}; + static const WCHAR displayW[] = {'\\','\\','.','\\','D','I','S','P','L','A','Y'}; static D3DKMT_HANDLE handle_start = 0; struct d3dkmt_adapter *adapter; + WCHAR *end; + int id; TRACE("(%p) semi-stub\n", desc); - if (!desc) + if (!desc || strncmpiW( desc->DeviceName, displayW, ARRAY_SIZE(displayW) )) return STATUS_UNSUCCESSFUL; - /* FIXME: Support multiple monitors */ - if (lstrcmpiW( desc->DeviceName, display1W )) - { - FIXME("%s is unsupported\n", wine_dbgstr_w( desc->DeviceName )); + id = strtolW( desc->DeviceName + ARRAY_SIZE(displayW), &end, 10 ) - 1; + if (*end) return STATUS_UNSUCCESSFUL; - } adapter = heap_alloc( sizeof( *adapter ) ); if (!adapter) @@ -1362,7 +1360,6 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI EnterCriticalSection( &driver_section ); /* D3DKMT_HANDLE is UINT, so we can't use pointer as handle */ adapter->handle = ++handle_start; - adapter->ordinal = 0; list_add_tail( &d3dkmt_adapters, &adapter->entry ); LeaveCriticalSection( &driver_section ); @@ -1370,7 +1367,7 @@ NTSTATUS WINAPI D3DKMTOpenAdapterFromGdiDisplayName( D3DKMT_OPENADAPTERFROMGDIDI /* FIXME: Support AdapterLuid */ desc->AdapterLuid.LowPart = 0; desc->AdapterLuid.HighPart = 0; - desc->VidPnSourceId = 0; + desc->VidPnSourceId = id; return STATUS_SUCCESS; } -- 2.20.1

1 0

[PATCH 3/6] winemac.drv: Add adapter initialization functions.
by Zhiyi Zhang July 4, 2019

July 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/cocoa_display.m | 101 +++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 134 +++++++++++++++++++++++++++++++++++++-- dlls/winemac.drv/macdrv_cocoa.h | 15 +++++ 3 files changed, 243 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 82c9e3fcc3..53b1fb0a68 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -26,6 +26,8 @@ #endif #include "macdrv_cocoa.h" +static uint64_t dedicated_gpu_id; +static uint64_t integrated_gpu_id; /*********************************************************************** * convert_display_rect @@ -286,6 +288,7 @@ static int macdrv_get_gpus_from_metal_devices(struct macdrv_gpu** new_gpus, int* /* Hide the integrated GPU if the system default device is a dedicated GPU */ if (!primary_device.isLowPower) { + dedicated_gpu_id = primary_gpu.id; hide_integrated = TRUE; } @@ -296,6 +299,7 @@ static int macdrv_get_gpus_from_metal_devices(struct macdrv_gpu** new_gpus, int* if (hide_integrated && devices[i].isLowPower) { + integrated_gpu_id = gpus[gpu_count].id; continue; } @@ -415,6 +419,7 @@ static int macdrv_get_gpus_from_displays(struct macdrv_gpu** new_gpus, int* coun * Assuming integrated GPU vendor is Intel for now */ if (gpus[gpu_count].vendor_id == 0x8086) { + integrated_gpu_id = gpus[gpu_count].id; integrated_index = gpu_count; } @@ -433,7 +438,10 @@ static int macdrv_get_gpus_from_displays(struct macdrv_gpu** new_gpus, int* coun * Choose the first dedicated GPU as primary */ if (primary_index == integrated_index) primary_index = 0; + else if (primary_index == gpu_count - 1) + primary_index = integrated_index; + dedicated_gpu_id = gpus[primary_index].id; gpu_count--; } @@ -465,6 +473,9 @@ static int macdrv_get_gpus_from_displays(struct macdrv_gpu** new_gpus, int* coun */ int macdrv_get_gpus(struct macdrv_gpu** new_gpus, int* count) { + integrated_gpu_id = 0; + dedicated_gpu_id = 0; + if (is_metal_available()) return macdrv_get_gpus_from_metal_devices(new_gpus, count); else @@ -481,3 +492,93 @@ void macdrv_free_gpus(struct macdrv_gpu* gpus) if (gpus) free(gpus); } + +/*********************************************************************** + * macdrv_get_adapters + * + * Get a list of adapters under gpu_id. The first adapter is primary if GPU is primary. + * Call macdrv_free_adapters() when you are done using the data. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** new_adapters, int* count) +{ + CGDirectDisplayID display_ids[16]; + uint32_t display_id_count; + struct macdrv_adapter* adapters; + struct macdrv_gpu gpu; + int primary_index = 0; + int adapter_count = 0; + int ret = -1; + uint32_t i; + + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + return -1; + + if (!display_id_count) + { + *new_adapters = NULL; + *count = 0; + return 0; + } + + /* Actual adapter count may be less */ + adapters = calloc(display_id_count, sizeof(*adapters)); + if (!adapters) + return -1; + + for (i = 0; i < display_id_count; i++) + { + /* Mirrored displays are under the same adapter with primary display, so they doesn't increase adapter count */ + if (CGDisplayMirrorsDisplay(display_ids[i]) != kCGNullDirectDisplay) + continue; + + if (macdrv_get_gpu_info_from_display_id(&gpu, display_ids[i])) + goto done; + + if (gpu.id == gpu_id || (gpu_id == dedicated_gpu_id && gpu.id == integrated_gpu_id)) + { + adapters[adapter_count].id = display_ids[i]; + + if (CGDisplayIsMain(display_ids[i])) + { + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + primary_index = adapter_count; + } + + if (CGDisplayIsActive(display_ids[i])) + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + + adapter_count++; + } + } + + /* Make sure the first adapter is primary if the GPU is primary */ + if (primary_index) + { + struct macdrv_adapter tmp; + tmp = adapters[0]; + adapters[0] = adapters[primary_index]; + adapters[primary_index] = tmp; + } + + *new_adapters = adapters; + *count = adapter_count; + ret = 0; +done: + if (ret) + macdrv_free_adapters(adapters); + return ret; +} + +/*********************************************************************** + * macdrv_free_adapters + * + * Frees an adapter list allocated from macdrv_get_adapters() + */ +void macdrv_free_adapters(struct macdrv_adapter* adapters) +{ + if (adapters) + free(adapters); +} diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 3e7335f5aa..6b2eea9ecc 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -57,6 +57,9 @@ static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d',' static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',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}; +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}; @@ -77,6 +80,26 @@ 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 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 CFArrayRef modes; @@ -1431,11 +1454,12 @@ void macdrv_displays_changed(const macdrv_event *event) /*********************************************************************** * macdrv_init_gpu * - * Initialize a GPU instance. + * Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter. * * Return FALSE on failure and TRUE on success. */ -static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index) +static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index, WCHAR *guid_string, + WCHAR *driver) { static const BOOL present = TRUE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; @@ -1478,6 +1502,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int goto done; RegCloseKey(hkey); + /* Retrieve driver value for adapters */ + if (!SetupDiGetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_DRIVER, NULL, (BYTE *)bufferW, sizeof(bufferW), + NULL)) + goto done; + lstrcpyW(driver, nt_classW); + lstrcatW(driver, bufferW); + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); @@ -1490,6 +1521,7 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int if (RegSetValueExW(hkey, video_idW, 0, REG_SZ, (const BYTE *)bufferW, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) goto done; } + lstrcpyW(guid_string, bufferW); ret = TRUE; done: @@ -1499,13 +1531,80 @@ done: return ret; } -static void prepare_devices(void) +/*********************************************************************** + * macdrv_init_adapter + * + * Initialize an adapter. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL macdrv_init_adapter(HKEY video_hkey, int video_index, int gpu_index, int adapter_index, + const struct macdrv_gpu *gpu, const WCHAR *guid_string, const WCHAR *gpu_driver, + const struct macdrv_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); + lstrcpyW(bufferW, machine_prefixW); + sprintfW(adapter_keyW, adapter_key_fmtW, guid_string, adapter_index); + lstrcatW(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, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* 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, + lstrlenW(gpu_driver) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + hkey = NULL; + + /* FIXME: + * Following information is Wine specific, it doesn't really exist on Windows. It is used so that we can + * implement EnumDisplayDevices etc by querying registry only. This information is 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, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + + /* Write StateFlags */ + if (RegSetValueExW(hkey, state_flagsW, 0, REG_DWORD, (const BYTE *)&adapter->state_flags, + sizeof(adapter->state_flags))) + goto done; + + ret = TRUE; +done: + RegCloseKey(hkey); + if (!ret) + ERR("Failed to initialize adapter\n"); + return ret; +} + +static void prepare_devices(HKEY video_hkey) { static const BOOL not_present = FALSE; SP_DEVINFO_DATA device_data = {sizeof(device_data)}; HDEVINFO devinfo; DWORD i = 0; + /* Clean up old adapter keys for reinitialization */ + RegDeleteTreeW(video_hkey, NULL); + /* FIXME: * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in * case application uses SetupDiGetClassDevsW to enumerate devices. Wrong devices could exist in registry as a result @@ -1551,11 +1650,15 @@ void macdrv_init_display_devices(void) static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct macdrv_gpu *gpus = NULL; - INT gpu_count; - INT gpu; + struct macdrv_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]; mutex = CreateMutexW(NULL, FALSE, init_mutexW); WaitForSingleObject(mutex, INFINITE); @@ -1573,7 +1676,7 @@ void macdrv_init_display_devices(void) TRACE("\n"); - prepare_devices(); + prepare_devices(video_hkey); gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); @@ -1583,8 +1686,24 @@ void macdrv_init_display_devices(void) for (gpu = 0; gpu < gpu_count; gpu++) { - if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu)) + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu, guidW, driverW)) goto done; + + /* Initialize adapters */ + if (macdrv_get_adapters(gpus[gpu].id, &adapters, &adapter_count)) + goto done; + + for (adapter = 0; adapter < adapter_count; adapter++) + { + if (!macdrv_init_adapter(video_hkey, video_index, gpu, adapter, &gpus[gpu], guidW, driverW, + &adapters[adapter])) + goto done; + + video_index++; + } + + macdrv_free_adapters(adapters); + adapters = NULL; } done: @@ -1596,4 +1715,5 @@ done: CloseHandle(mutex); macdrv_free_gpus(gpus); + macdrv_free_adapters(adapters); } diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 513746fa0e..b960e902e3 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -258,6 +258,10 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* display */ +/* Used DISPLAY_DEVICE.StateFlags for adapters */ +#define DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 +#define DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 + /* Represent a physical GPU in the PCI slots */ struct macdrv_gpu { @@ -272,12 +276,23 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) uint32_t revision_id; }; +/* Represent an adapter in EnumDisplayDevices context */ +struct macdrv_adapter +{ + /* ID to uniquely identify an adapter. Currently it's a CGDirectDisplayID */ + uint32_t id; + /* as StateFlags in DISPLAY_DEVICE struct */ + uint32_t state_flags; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, CGDisplayModeRef display_mode) DECLSPEC_HIDDEN; extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; +extern int macdrv_get_adapters(uint64_t gpu_id, struct macdrv_adapter** adapters, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_adapters(struct macdrv_adapter* adapters) DECLSPEC_HIDDEN; /* event */ -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 2/6] winemac.drv: Add GPU initialization functions.
by Zhiyi Zhang July 4, 2019

July 4, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winemac.drv/Makefile.in | 2 +- dlls/winemac.drv/cocoa_display.m | 378 +++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/display.c | 200 +++++++++++++++++++++ dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 17 ++ 5 files changed, 597 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in index 3ffb7d666c..c6ae9733bd 100644 --- a/dlls/winemac.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,5 +1,5 @@ MODULE = winemac.drv -IMPORTS = uuid user32 gdi32 advapi32 +IMPORTS = uuid setupapi rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = ole32 shell32 imm32 EXTRALIBS = -framework AppKit -framework Carbon -framework Security -framework OpenGL -framework IOKit -framework CoreVideo $(METAL_LIBS) diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m index 93a0fbca35..82c9e3fcc3 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m @@ -18,7 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "config.h" + #import <AppKit/AppKit.h> +#ifdef HAVE_METAL_METAL_H +#import <Metal/Metal.h> +#endif #include "macdrv_cocoa.h" @@ -103,3 +108,376 @@ void macdrv_free_displays(struct macdrv_display* displays) { free(displays); } + +/*********************************************************************** + * get_entry_property_uint32 + * + * Get an io registry entry property of type uint32 and store it in value parameter. + * + * Returns non-zero value on failure. + */ +static int get_entry_property_uint32(io_registry_entry_t entry, CFStringRef property_name, uint32_t* value) +{ + CFDataRef data = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, property_name, kCFAllocatorDefault, 0); + if (!data) + return -1; + + if (CFGetTypeID(data) != CFDataGetTypeID() || CFDataGetLength(data) != sizeof(uint32_t)) + { + CFRelease(data); + return -1; + } + + CFDataGetBytes(data, CFRangeMake(0, sizeof(uint32_t)), (UInt8*)value); + CFRelease(data); + return 0; +} + +/*********************************************************************** + * get_entry_property_string + * + * Get an io registry entry property of type string and write it in buffer parameter. + * + * Returns non-zero value on failure. + */ +static int get_entry_property_string(io_registry_entry_t entry, CFStringRef property_name, char* buffer, + size_t buffer_size) +{ + size_t length; + + CFDataRef data = IORegistryEntrySearchCFProperty(entry, kIOServicePlane, property_name, kCFAllocatorDefault, 0); + if (!data) + return -1; + + length = CFDataGetLength(data); + if (length + 1 > buffer_size || CFGetTypeID(data) != CFDataGetTypeID()) + { + CFRelease(data); + return -1; + } + + CFDataGetBytes(data, CFRangeMake(0, length), (UInt8*)buffer); + buffer[length] = 0; + CFRelease(data); + return 0; +} + +/*********************************************************************** + * macdrv_get_gpu_info_from_entry + * + * Starting from entry, search upwards to find the PCI GPU. And get GPU information from the PCI GPU entry. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_entry_t entry) +{ + io_registry_entry_t parent_entry; + io_registry_entry_t gpu_entry; + kern_return_t result; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + gpu_entry = entry; + while (![@"IOPCIDevice" isEqualToString:[(__bridge NSString*)IOObjectCopyClass(gpu_entry) autorelease]]) + { + result = IORegistryEntryGetParentEntry(gpu_entry, kIOServicePlane, &parent_entry); + if (gpu_entry != entry) + IOObjectRelease(gpu_entry); + if (result == kIOReturnSuccess) + { + gpu_entry = parent_entry; + } + else + { + [pool release]; + return ret; + } + } + + if (IORegistryEntryGetRegistryEntryID(gpu_entry, &gpu->id) != kIOReturnSuccess) + goto done; + if (get_entry_property_uint32(gpu_entry, CFSTR("vendor-id"), &gpu->vendor_id)) + goto done; + if (get_entry_property_uint32(gpu_entry, CFSTR("device-id"), &gpu->device_id)) + goto done; + if (get_entry_property_uint32(gpu_entry, CFSTR("subsystem-id"), &gpu->subsys_id)) + goto done; + if (get_entry_property_uint32(gpu_entry, CFSTR("revision-id"), &gpu->revision_id)) + goto done; + if (get_entry_property_string(gpu_entry, CFSTR("model"), gpu->name, sizeof(gpu->name))) + goto done; + + ret = 0; +done: + if (gpu_entry != entry) + IOObjectRelease(gpu_entry); + [pool release]; + return ret; +} + +#ifdef HAVE_METAL_METAL_H + +/*********************************************************************** + * is_metal_available + * + * Returns non-zero value if Metal is available and zero if it's unavailable + */ +static int is_metal_available(void) +{ + int ret = 0; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; + if (devices.count && [devices[0] respondsToSelector:@selector(registryID)]) + ret = 1; + + [pool release]; + return ret; +} + +/*********************************************************************** + * macdrv_get_gpu_info_from_registry_id + * + * Get GPU information from a Metal device registry id. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_registry_id(struct macdrv_gpu* gpu, uint64_t registry_id) +{ + int ret; + io_registry_entry_t entry; + + entry = IOServiceGetMatchingService(kIOMasterPortDefault, IORegistryEntryIDMatching(registry_id)); + ret = macdrv_get_gpu_info_from_entry(gpu, entry); + IOObjectRelease(entry); + return ret; +} + +/*********************************************************************** + * macdrv_get_gpus_from_metal_devices + * + * Get a list of GPUs from Metal devices. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +static int macdrv_get_gpus_from_metal_devices(struct macdrv_gpu** new_gpus, int* count) +{ + struct macdrv_gpu* gpus = NULL; + struct macdrv_gpu primary_gpu; + id<MTLDevice> primary_device; + BOOL hide_integrated = FALSE; + int primary_index = 0, i; + int gpu_count = 0; + int ret = -1; + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + NSArray<id<MTLDevice>>* devices = [MTLCopyAllDevices() autorelease]; + gpus = calloc(devices.count, sizeof(*gpus)); + if (!gpus) + goto done; + + /* Use MTLCreateSystemDefaultDevice instead of CGDirectDisplayCopyCurrentMetalDevice(CGMainDisplayID()) to get + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; + if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ + if (!primary_device.isLowPower) + { + hide_integrated = TRUE; + } + + for (i = 0; i < devices.count; i++) + { + if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) + goto done; + + if (hide_integrated && devices[i].isLowPower) + { + continue; + } + + if (gpus[gpu_count].id == primary_gpu.id) + primary_index = gpu_count; + + gpu_count++; + } + + /* Make sure the first GPU is primary */ + if (primary_index) + { + struct macdrv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_index]; + gpus[primary_index] = tmp; + } + + *new_gpus = gpus; + *count = gpu_count; + ret = 0; +done: + if (ret) + macdrv_free_gpus(gpus); + [pool release]; + return ret; +} + +#else + +static int is_metal_available(void) +{ + return 0; +} + +static int macdrv_get_gpus_from_metal_devices(struct macdrv_gpu** new_gpus, int* count) +{ + return -1; +} + +#endif + +/*********************************************************************** + * macdrv_get_gpu_info_from_display_id + * + * Get GPU information from a display id. + * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. + * + * Returns non-zero value on failure. + */ +static int macdrv_get_gpu_info_from_display_id(struct macdrv_gpu* gpu, CGDirectDisplayID display_id) +{ + io_registry_entry_t entry = CGDisplayIOServicePort(display_id); + return macdrv_get_gpu_info_from_entry(gpu, entry); +} + +/*********************************************************************** + * macdrv_get_gpus_from_displays + * + * Get a list of GPUs from displays. + * This is a fallback for 32bit build or older Mac OS version where Metal is unavailable. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +static int macdrv_get_gpus_from_displays(struct macdrv_gpu** new_gpus, int* count) +{ + CGDirectDisplayID display_ids[16]; + uint32_t display_id_count; + struct macdrv_gpu* gpus; + BOOL duplicated; + int integrated_index = -1; + int primary_index = 0; + int gpu_count = 0; + int ret = -1; + int i, j; + + if (CGGetOnlineDisplayList(sizeof(display_ids) / sizeof(display_ids[0]), display_ids, &display_id_count) + != kCGErrorSuccess) + return ret; + + if (!display_id_count) + { + *new_gpus = NULL; + *count = 0; + return 0; + } + + /* Actual GPU count may be less */ + gpus = calloc(display_id_count, sizeof(*gpus)); + if (!gpus) + return ret; + + for (i = 0; i < display_id_count; i++) + { + if (macdrv_get_gpu_info_from_display_id(&gpus[gpu_count], display_ids[i])) + goto done; + + /* Ignore duplicated GPUs */ + duplicated = FALSE; + for (j = 0; j < gpu_count; j++) + { + if (gpus[gpu_count].id == gpus[j].id) + { + duplicated = TRUE; + break; + } + } + + if (duplicated) + continue; + + if (display_ids[i] == CGMainDisplayID()) + primary_index = gpu_count; + + /* FIXME: + * Find integrated GPU without Metal support. + * Assuming integrated GPU vendor is Intel for now */ + if (gpus[gpu_count].vendor_id == 0x8086) + { + integrated_index = gpu_count; + } + + gpu_count++; + } + + /* If there are more than two GPUs and an Intel card exists, + * assume an automatic graphics pair exists and hide the integrated GPU */ + if (gpu_count > 1 && integrated_index != -1) + { + if (integrated_index != gpu_count - 1) + gpus[integrated_index] = gpus[gpu_count - 1]; + + /* FIXME: + * Find the dedicated GPU in an automatic graphics switching pair and use that as primary GPU. + * Choose the first dedicated GPU as primary */ + if (primary_index == integrated_index) + primary_index = 0; + + gpu_count--; + } + + /* Make sure the first GPU is primary */ + if (primary_index) + { + struct macdrv_gpu tmp; + tmp = gpus[0]; + gpus[0] = gpus[primary_index]; + gpus[primary_index] = tmp; + } + + *new_gpus = gpus; + *count = gpu_count; + ret = 0; +done: + if (ret) + macdrv_free_gpus(gpus); + return ret; +} + +/*********************************************************************** + * macdrv_get_gpus + * + * Get a list of GPUs currently in the system. The first GPU is primary. + * Call macdrv_free_gpus() when you are done using the data. + * + * Returns non-zero value on failure with parameters unchanged and zero on success. + */ +int macdrv_get_gpus(struct macdrv_gpu** new_gpus, int* count) +{ + if (is_metal_available()) + return macdrv_get_gpus_from_metal_devices(new_gpus, count); + else + return macdrv_get_gpus_from_displays(new_gpus, count); +} + +/*********************************************************************** + * macdrv_free_gpus + * + * Frees a GPU list allocated from macdrv_get_gpus() + */ +void macdrv_free_gpus(struct macdrv_gpu* gpus) +{ + if (gpus) + free(gpus); +} diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 00ad7738bb..3e7335f5aa 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -25,6 +25,13 @@ #include "winuser.h" #include "winreg.h" #include "ddrawi.h" +#include "rpc.h" +#include "initguid.h" +#include "devguid.h" +#include "devpkey.h" +#include "setupapi.h" +#define WIN32_NO_STATUS +#include "winternl.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(display); @@ -47,6 +54,29 @@ BOOL CDECL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW static const char initial_mode_key[] = "Initial Display Mode"; static const WCHAR pixelencodingW[] = {'P','i','x','e','l','E','n','c','o','d','i','n','g',0}; +static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',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 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 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 CFArrayRef modes; @@ -1397,3 +1427,173 @@ void macdrv_displays_changed(const macdrv_event *event) MAKELPARAM(width, height)); } } + +/*********************************************************************** + * macdrv_init_gpu + * + * Initialize a GPU instance. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int gpu_index) +{ + static const BOOL present = TRUE; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + WCHAR instanceW[MAX_PATH]; + WCHAR nameW[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); + MultiByteToWideChar(CP_UTF8, 0, gpu->name, -1, nameW, ARRAY_SIZE(nameW)); + if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) + { + SetupDiCreateDeviceInfoW(devinfo, instanceW, &GUID_DEVCLASS_DISPLAY, nameW, NULL, 0, &device_data); + if (!SetupDiRegisterDeviceInfo(devinfo, &device_data, 0, NULL, NULL, NULL)) + 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; + if (!SetupDiSetDeviceRegistryPropertyW(devinfo, &device_data, SPDRP_HARDWAREID, (const BYTE *)bufferW, + (written + 2) * sizeof(WCHAR))) + goto done; + + /* Write DEVPKEY_Device_IsPresent property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &DEVPKEY_Device_IsPresent, DEVPROP_TYPE_BOOLEAN, + (const BYTE *)&present, sizeof(present), 0)) + goto done; + + /* Open driver key. + * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ + 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 *)nameW, (lstrlenW(nameW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); + + /* Write GUID in VideoID in .../instance/Device Parameters, reuse the GUID if it's existent */ + hkey = SetupDiCreateDevRegKeyW(devinfo, &device_data, DICS_FLAG_GLOBAL, 0, DIREG_DEV, NULL, NULL); + + size = sizeof(bufferW); + if (RegQueryValueExW(hkey, video_idW, 0, NULL, (BYTE *)bufferW, &size)) + { + UuidCreate(&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, (lstrlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + } + + ret = TRUE; +done: + 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; + + /* FIXME: + * Currently SetupDiGetClassDevsW with DIGCF_PRESENT is unsupported, So we need to clean up not present devices in + * case application uses 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. */ + 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, + (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, pciW, 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); +} + +/*********************************************************************** + * macdrv_init_display_devices + * + * Initialize display device registry data. + */ +void macdrv_init_display_devices(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex; + struct macdrv_gpu *gpus = NULL; + INT gpu_count; + INT gpu; + HDEVINFO gpu_devinfo = NULL; + HKEY video_hkey = NULL; + DWORD disposition = 0; + + mutex = CreateMutexW(NULL, FALSE, init_mutexW); + WaitForSingleObject(mutex, INFINITE); + + if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, + &disposition)) + { + ERR("Failed to create video device key\n"); + goto done; + } + + /* Avoid unnecessary reinit */ + if (disposition != REG_CREATED_NEW_KEY) + goto done; + + TRACE("\n"); + + prepare_devices(); + + gpu_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_DISPLAY, NULL); + + /* Initialize GPUs */ + if (macdrv_get_gpus(&gpus, &gpu_count)) + goto done; + + for (gpu = 0; gpu < gpu_count; gpu++) + { + if (!macdrv_init_gpu(gpu_devinfo, &gpus[gpu], gpu)) + goto done; + } + +done: + cleanup_devices(); + SetupDiDestroyDeviceInfoList(gpu_devinfo); + RegCloseKey(video_hkey); + + ReleaseMutex(mutex); + CloseHandle(mutex); + + macdrv_free_gpus(gpus); +} diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f948da42c7..064b93a1df 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -223,6 +223,7 @@ extern CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP extern void macdrv_status_item_mouse_move(const macdrv_event *event) DECLSPEC_HIDDEN; extern void check_retina_status(void) DECLSPEC_HIDDEN; +extern void macdrv_init_display_devices(void) DECLSPEC_HIDDEN; /************************************************************************** * Mac IME driver diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h index 8ca9b9afa0..513746fa0e 100644 --- a/dlls/winemac.drv/macdrv_cocoa.h +++ b/dlls/winemac.drv/macdrv_cocoa.h @@ -257,10 +257,27 @@ static inline CGPoint cgpoint_win_from_mac(CGPoint point) /* display */ + +/* Represent a physical GPU in the PCI slots */ +struct macdrv_gpu +{ + /* PCI GPU io registry entry id */ + uint64_t id; + /* Name, in UTF-8 encoding */ + char name[128]; + /* PCI ID */ + uint32_t vendor_id; + uint32_t device_id; + uint32_t subsys_id; + uint32_t revision_id; +}; + extern int macdrv_get_displays(struct macdrv_display** displays, int* count) DECLSPEC_HIDDEN; extern void macdrv_free_displays(struct macdrv_display* displays) DECLSPEC_HIDDEN; extern int macdrv_set_display_mode(const struct macdrv_display* display, CGDisplayModeRef display_mode) DECLSPEC_HIDDEN; +extern int macdrv_get_gpus(struct macdrv_gpu** gpus, int* count) DECLSPEC_HIDDEN; +extern void macdrv_free_gpus(struct macdrv_gpu* gpus) DECLSPEC_HIDDEN; /* event */ -- 2.15.2 (Apple Git-101.1)

1 0

[PATCH 5/5] wined3d: Try harder to reuse the current context.
by Henri Verbeet July 4, 2019

July 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 4 +--- dlls/wined3d/swapchain.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 619b5ff7d02..32cbc029e7f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4215,14 +4215,12 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context; - BOOL swapchain_texture; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); if (current_context && current_context->destroyed) current_context = NULL; - swapchain_texture = texture && texture->swapchain; if (!texture) { if (current_context @@ -4248,7 +4246,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { context = current_context; } - else if (swapchain_texture) + else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 69580adbffb..bf0c308f0d3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -717,25 +717,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } -static void wined3d_swapchain_cs_init(void *object) -{ - struct wined3d_swapchain *swapchain = object; - struct wined3d_context *context; - - if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) - { - WARN("Failed to acquire context.\n"); - return; - } - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (!swapchain->desc.enable_auto_depth_stencil - || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) - FIXME("Add OpenGL context recreation support.\n"); - - context_release(context); -} - void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) { /* Subtract 1 for the implicit OpenGL latency. */ @@ -890,25 +871,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } - if (!(device->wined3d->flags & WINED3D_NO3D)) - { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) - { - ERR("Failed to create the context array.\n"); - hr = E_OUTOFMEMORY; - goto err; - } - - wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); - wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - - if (!swapchain->num_contexts) - { - hr = WINED3DERR_NOTAVAILABLE; - goto err; - } - } - if (swapchain->desc.backbuffer_count > 0) { if (!(swapchain->back_buffers = heap_calloc(swapchain->desc.backbuffer_count, -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object().
by Henri Verbeet July 4, 2019

July 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 58e757c855b..b1677375a90 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -37,10 +37,10 @@ static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) return query->map_ptr[0] == query->map_ptr[1]; } -static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_create_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint buffer_object; GL_EXTCALL(glGenBuffers(1, &buffer_object)); @@ -75,6 +75,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, * instead of from the csmt-thread. */ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLsync tmp_sync; @@ -96,7 +97,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s } if (!query->buffer_object) - wined3d_query_create_buffer_object(context, query); + wined3d_query_create_buffer_object(context_gl, query); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions().
by Henri Verbeet July 4, 2019

July 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/nvidia_texture_shader.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f4b0791f47d..1cffbe45798 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -30,9 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* Context activation for state handlers is done by the caller. */ -static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) +static void nvts_activate_dimensions(const struct wined3d_state *state, + unsigned int stage, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *texture; BOOL bumpmap = FALSE; @@ -41,11 +42,11 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st || state->texture_states[stage - 1][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP)) { bumpmap = TRUE; - context->texShaderBumpMap |= (1u << stage); + context_gl->c.texShaderBumpMap |= (1u << stage); } else { - context->texShaderBumpMap &= ~(1u << stage); + context_gl->c.texShaderBumpMap &= ~(1u << stage); } if ((texture = state->textures[stage])) @@ -550,13 +551,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (tex_used) { if (gl_info->supported[NV_TEXTURE_SHADER2]) - { - nvts_activate_dimensions(state, stage, context); - } + nvts_activate_dimensions(state, stage, context_gl); else - { texture_activate_dimensions(state->textures[stage], gl_info); - } } } @@ -580,7 +577,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (usesBump != usedBump) { wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); - nvts_activate_dimensions(state, stage + 1, context); + nvts_activate_dimensions(state, stage + 1, context_gl); wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } } @@ -620,7 +617,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; - nvts_activate_dimensions(state, sampler, context); + nvts_activate_dimensions(state, sampler, context_gl); } static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
by Henri Verbeet July 4, 2019

July 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c6b6b6d5f8..e8357f8dc2f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct glsl_blitter_program *program; struct glsl_blitter_args args; struct wine_rb_entry *entry; @@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli colour_key = NULL; } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context_gl, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program().
by Henri Verbeet July 4, 2019

July 4, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cd6bb6b507..0c6b6b6d5f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10089,12 +10089,11 @@ static void set_glsl_compute_shader_program(const struct wined3d_context_gl *con } /* Context activation is done by the caller. */ -static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, +static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader *pre_rasterization_shader; const struct ps_np2fixup_info *np2fixup_info = NULL; struct wined3d_shader *hshader, *dshader, *gshader; @@ -10114,7 +10113,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD attribs_map; struct wined3d_string_buffer *tmp_name; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) { vs_id = ctx_data->glsl_program->vs.id; vs_list = &ctx_data->glsl_program->vs.shader_entry; @@ -10128,7 +10127,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; - find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); + find_vs_compile_args(state, vshader, context_gl->c.stream_info.swizzle_map, &vs_compile_args, &context_gl->c); vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; } @@ -10137,20 +10136,20 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(context, state, &settings); + wined3d_ffp_get_vs_settings(&context_gl->c, state, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; } hshader = state->shader[WINED3D_SHADER_TYPE_HULL]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) { ds_id = ctx_data->glsl_program->ds.id; } @@ -10158,12 +10157,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ds_compile_args args; - find_ds_compile_args(state, dshader, &args, context); + find_ds_compile_args(state, dshader, &args, &context_gl->c); ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) { gs_id = ctx_data->glsl_program->gs.id; } @@ -10171,7 +10170,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct gs_compile_args args; - find_gs_compile_args(state, gshader, &args, context); + find_gs_compile_args(state, gshader, &args, &context_gl->c); gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } @@ -10181,7 +10180,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ps_id = 0; ps_list = NULL; } - else if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) + else if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry; @@ -10193,7 +10192,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ps_compile_args ps_compile_args; pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context); + find_ps_compile_args(state, pshader, context_gl->c.stream_info.position_transformed, + &ps_compile_args, &context_gl->c); ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; @@ -10204,7 +10204,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - gen_ffp_frag_op(context, state, &settings, FALSE); + gen_ffp_frag_op(&context_gl->c, state, &settings, FALSE); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; @@ -10490,7 +10490,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - shader_glsl_load_samplers(context, priv, program_id, NULL); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, NULL); } for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) @@ -10542,7 +10542,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_shader_program(context, state, priv, ctx_data); + set_glsl_shader_program(context_gl, state, priv, ctx_data); glsl_program = ctx_data->glsl_program; if (glsl_program) -- 2.11.0

1 0

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban July 4, 2019

July 4, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban July 4, 2019

July 4, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[PATCH 1/3] kernel32/tests: Add more debugger tests.
by Jacek Caban July 4, 2019

July 4, 2019

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

1 0

[PATCH] kerberos: Fix compilation on systems where SONAME_LIBKRB5 is not defined.
by Dmitry Timoshkov July 4, 2019

July 4, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 3827e5ccbc..0a6463c5f3 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -842,6 +842,8 @@ static int get_buffer_index( SecBufferDesc *desc, DWORD type ) return -1; } +#ifdef SONAME_LIBKRB5 + static char *get_user_at_domain( const WCHAR *user, ULONG user_len, const WCHAR *domain, ULONG domain_len ) { int len_user, len_domain; @@ -924,6 +926,16 @@ done: return krb5_error_to_status( err ); } +#else /* SONAME_LIBKRB5 */ + +static NTSTATUS init_creds( const SEC_WINNT_AUTH_IDENTITY_W *id ) +{ + FIXME( "Kerberos support was not provided at compile time\n" ); + return SEC_E_UNKNOWN_CREDENTIALS; +} + +#endif /* SONAME_LIBKRB5 */ + static NTSTATUS acquire_credentials_handle( UNICODE_STRING *principal_us, gss_cred_usage_t cred_usage, LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) { -- 2.20.1

3 10

[PATCH] wbemprox: Build with msvcrt.
by Hans Leidekker July 4, 2019

July 4, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 2 + dlls/wbemprox/builtin.c | 157 ++++++++++++++----------------- dlls/wbemprox/class.c | 19 ++-- dlls/wbemprox/main.c | 2 - dlls/wbemprox/process.c | 1 - dlls/wbemprox/qualifier.c | 9 +- dlls/wbemprox/query.c | 61 ++++++------ dlls/wbemprox/reg.c | 1 - dlls/wbemprox/security.c | 1 - dlls/wbemprox/service.c | 1 - dlls/wbemprox/services.c | 12 +-- dlls/wbemprox/table.c | 17 ++-- dlls/wbemprox/wbemlocator.c | 12 +-- dlls/wbemprox/wbemprox_private.h | 3 +- dlls/wbemprox/wql.y | 10 +- 15 files changed, 140 insertions(+), 168 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index a86893a45c..a26c833878 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,6 +1,8 @@ MODULE = wbemprox.dll IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ builtin.c \ class.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6302cf574d..4b91b643a9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -20,32 +20,14 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include "config.h" #include <stdarg.h> -#include <fcntl.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" -#ifdef __MINGW32__ -# include "winsock2.h" -# include "ws2tcpip.h" -# define WS_AF_INET AF_INET -# define WS_AF_UNSPEC AF_UNSPEC -# define WS_NI_MAXHOST NI_MAXHOST -# define WS_NI_NAMEREQD NI_NAMEREQD -#else -# define USE_WS_PREFIX -# include "winsock2.h" -# include "ws2tcpip.h" -#endif +#include "winsock2.h" +#include "ws2tcpip.h" #include "initguid.h" #include "wbemcli.h" #include "wbemprov.h" @@ -1351,7 +1333,7 @@ static enum fill_status fill_cdromdrive( struct table *table, const struct expr rec = (struct record_cdromdrive *)(table->data + offset); rec->device_id = cdromdrive_pnpdeviceidW; - sprintfW( drive, fmtW, 'A' + i ); + swprintf( drive, ARRAY_SIZE( drive ), fmtW, 'A' + i ); rec->drive = heap_strdupW( drive ); rec->mediatype = cdromdrive_mediatypeW; rec->name = cdromdrive_nameW; @@ -1574,7 +1556,7 @@ static WCHAR *get_compsysproduct_uuid(void) } if (!uuid || !memcmp( uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; - sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], + swprintf( ret, 37, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); done: @@ -1747,9 +1729,9 @@ static WCHAR *build_dirname( const WCHAR *path, UINT *ret_len ) UINT len, i; WCHAR *ret; - if (!isalphaW( p[0] ) || p[1] != ':' || p[2] != '\\' || p[3] != '\\' || !p[4]) return NULL; + if (!iswalpha( p[0] ) || p[1] != ':' || p[2] != '\\' || p[3] != '\\' || !p[4]) return NULL; start = path + 4; - len = strlenW( start ); + len = lstrlenW( start ); p = start + len - 1; if (*p == '\\') return NULL; @@ -1774,7 +1756,7 @@ static WCHAR *build_dirname( const WCHAR *path, UINT *ret_len ) static BOOL seen_dir( struct dirstack *dirstack, const WCHAR *path ) { UINT i; - for (i = 0; i < dirstack->num_dirs; i++) if (!strcmpW( dirstack->dirs[i], path )) return TRUE; + for (i = 0; i < dirstack->num_dirs; i++) if (!lstrcmpW( dirstack->dirs[i], path )) return TRUE; return FALSE; } @@ -1794,14 +1776,14 @@ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR const WCHAR *str = NULL; if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && - !strcmpW( left->u.propval->name, prop_nameW ) && - toupperW( right->u.sval[0] ) == toupperW( root )) + !lstrcmpW( left->u.propval->name, prop_nameW ) && + towupper( right->u.sval[0] ) == towupper( root )) { str = right->u.sval; } else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && - !strcmpW( right->u.propval->name, prop_nameW ) && - toupperW( left->u.sval[0] ) == toupperW( root )) + !lstrcmpW( right->u.propval->name, prop_nameW ) && + towupper( left->u.sval[0] ) == towupper( root )) { str = left->u.sval; } @@ -1830,11 +1812,11 @@ static UINT seed_dirs( struct dirstack *dirstack, const struct expr *cond, WCHAR static WCHAR *append_path( const WCHAR *path, const WCHAR *segment, UINT *len ) { - UINT len_path = 0, len_segment = strlenW( segment ); + UINT len_path = 0, len_segment = lstrlenW( segment ); WCHAR *ret; *len = 0; - if (path) len_path = strlenW( path ); + if (path) len_path = lstrlenW( path ); if (!(ret = heap_alloc( (len_path + len_segment + 2) * sizeof(WCHAR) ))) return NULL; if (path && len_path) { @@ -1852,11 +1834,11 @@ static WCHAR *get_file_version( const WCHAR *filename ) { static const WCHAR slashW[] = {'\\',0}, fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; VS_FIXEDFILEINFO *info; - DWORD size; + DWORD size, len = 4 * 5 + ARRAY_SIZE( fmtW ); void *block; WCHAR *ret; - if (!(ret = heap_alloc( (4 * 5 + ARRAY_SIZE( fmtW )) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) { heap_free( ret ); @@ -1869,8 +1851,8 @@ static WCHAR *get_file_version( const WCHAR *filename ) heap_free( ret ); return NULL; } - sprintfW( ret, fmtW, info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, - info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); + swprintf( ret, len, fmtW, info->dwFileVersionMS >> 16, info->dwFileVersionMS & 0xffff, + info->dwFileVersionLS >> 16, info->dwFileVersionLS & 0xffff ); heap_free( block ); return ret; } @@ -1921,7 +1903,7 @@ static enum fill_status fill_datafile( struct table *table, const struct expr *c FindClose( handle ); goto done; } - if (!strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) continue; + if (!lstrcmpW( data.cFileName, dotW ) || !lstrcmpW( data.cFileName, dotdotW )) continue; new_path = append_path( path, data.cFileName, &len ); if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -2043,7 +2025,7 @@ static enum fill_status fill_directory( struct table *table, const struct expr * goto done; } if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) || - !strcmpW( data.cFileName, dotW ) || !strcmpW( data.cFileName, dotdotW )) + !lstrcmpW( data.cFileName, dotW ) || !lstrcmpW( data.cFileName, dotdotW )) continue; new_path = append_path( path, data.cFileName, &len ); @@ -2136,7 +2118,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_diskdrive *)(table->data + offset); - sprintfW( device_id, fmtW, index ); + swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->index = index; rec->interfacetype = diskdrive_interfacetypeW; @@ -2202,7 +2184,7 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex rec = (struct record_diskpartition *)(table->data + offset); rec->bootable = (i == 2) ? -1 : 0; rec->bootpartition = (i == 2) ? -1 : 0; - sprintfW( device_id, fmtW, index ); + swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, index ); rec->device_id = heap_strdupW( device_id ); rec->diskindex = index; rec->index = 0; @@ -2229,10 +2211,11 @@ static enum fill_status fill_diskpartition( struct table *table, const struct ex static WCHAR *get_ip4_string( DWORD addr ) { static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0}; + DWORD len = sizeof("ddd.ddd.ddd.ddd"); WCHAR *ret; - if (!(ret = heap_alloc( sizeof("ddd.ddd.ddd.ddd") * sizeof(WCHAR) ))) return NULL; - sprintfW( ret, fmtW, (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, (addr >> 24) & 0xff, (addr >> 16) & 0xff, (addr >> 8) & 0xff, addr & 0xff ); return ret; } @@ -2292,7 +2275,7 @@ static WCHAR *get_volumeserialnumber( const WCHAR *root ) WCHAR buffer[9]; GetVolumeInformationW( root, NULL, 0, &serial, NULL, NULL, NULL, 0 ); - sprintfW( buffer, fmtW, serial ); + swprintf( buffer, ARRAY_SIZE( buffer ), fmtW, serial ); return heap_strdupW( buffer ); } @@ -2320,7 +2303,7 @@ static enum fill_status fill_logicaldisk( struct table *table, const struct expr if (!resize_table( table, row + 1, sizeof(*rec) )) return FILL_STATUS_FAILED; rec = (struct record_logicaldisk *)(table->data + offset); - sprintfW( device_id, fmtW, 'A' + i ); + swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, 'A' + i ); rec->device_id = heap_strdupW( device_id ); rec->drivetype = type; rec->filesystem = get_filesystem( root ); @@ -2365,7 +2348,7 @@ static WCHAR *get_mac_address( const BYTE *addr, DWORD len ) WCHAR *ret; if (len != 6 || !(ret = heap_alloc( 18 * sizeof(WCHAR) ))) return NULL; - sprintfW( ret, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); + swprintf( ret, 18, fmtW, addr[0], addr[1], addr[2], addr[3], addr[4], addr[5] ); return ret; } static const WCHAR *get_adaptertype( DWORD type, int *id, int *physical ) @@ -2411,11 +2394,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e int adaptertypeid, physical; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( WS_AF_UNSPEC, 0, NULL, buffer, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2434,7 +2417,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e if (aa->IfType == IF_TYPE_SOFTWARE_LOOPBACK) continue; rec = (struct record_networkadapter *)(table->data + offset); - sprintfW( device_id, fmtW, aa->u.s.IfIndex ); + swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, aa->u.s.IfIndex ); rec->adaptertype = get_adaptertype( aa->IfType, &adaptertypeid, &physical ); rec->adaptertypeid = adaptertypeid; rec->description = heap_strdupW( aa->Description ); @@ -2466,11 +2449,11 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) { const SOCKET_ADDRESS *sa = &addr->Address; - WCHAR buf[WS_NI_MAXHOST]; + WCHAR buf[NI_MAXHOST]; if (!addr) return NULL; if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, ARRAY_SIZE( buf ), NULL, - 0, WS_NI_NAMEREQD )) return NULL; + 0, NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) @@ -2532,7 +2515,7 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li heap_free( ret ); return NULL; } - if ((p = strrchrW( ptr[i - 1], ':' ))) *p = 0; + if ((p = wcsrchr( ptr[i - 1], ':' ))) *p = 0; } ret->count = count; ret->ptr = ptr; @@ -2588,14 +2571,14 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - if (address->Address.lpSockaddr->sa_family == WS_AF_INET) + if (address->Address.lpSockaddr->sa_family == AF_INET) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; ULONG buflen = ARRAY_SIZE( buf ); memset( &addr, 0, sizeof(addr) ); - addr.sin_family = WS_AF_INET; + addr.sin_family = AF_INET; if (ConvertLengthToIpv4Mask( address->OnLinkPrefixLength, &addr.sin_addr.S_un.S_addr ) != NO_ERROR || WSAAddressToStringW( (SOCKADDR*)&addr, sizeof(addr), NULL, buf, &buflen)) ptr[i] = NULL; @@ -2607,7 +2590,7 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) static const WCHAR fmtW[] = {'%','u',0}; WCHAR buf[11]; - sprintfW(buf, fmtW, address->OnLinkPrefixLength); + swprintf( buf, ARRAY_SIZE( buf ), fmtW, address->OnLinkPrefixLength ); ptr[i] = heap_strdupW( buf ); } if (!ptr[i++]) @@ -2642,11 +2625,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; enum fill_status status = FILL_STATUS_UNFILTERED; - ret = GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); + ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size ); if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED; if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED; - if (GetAdaptersAddresses( WS_AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) + if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size )) { heap_free( buffer ); return FILL_STATUS_FAILED; @@ -2788,7 +2771,7 @@ static enum fill_status fill_printer( struct table *table, const struct expr *co { rec = (struct record_printer *)(table->data + offset); rec->attributes = info[i].Attributes; - sprintfW( id, fmtW, i ); + swprintf( id, ARRAY_SIZE( id ), fmtW, i ); rec->device_id = heap_strdupW( id ); rec->drivername = heap_strdupW( info[i].pDriverName ); rec->horizontalresolution = info[i].pDevMode->u1.s1.dmPrintQuality; @@ -2843,7 +2826,7 @@ static enum fill_status fill_process( struct table *table, const struct expr *co rec->caption = heap_strdupW( entry.szExeFile ); rec->commandline = get_cmdline( entry.th32ProcessID ); rec->description = heap_strdupW( entry.szExeFile ); - sprintfW( handle, fmtW, entry.th32ProcessID ); + swprintf( handle, ARRAY_SIZE( handle ), fmtW, entry.th32ProcessID ); rec->handle = heap_strdupW( handle ); rec->name = heap_strdupW( entry.szExeFile ); rec->process_id = entry.th32ProcessID; @@ -2891,14 +2874,17 @@ __ASM_GLOBAL_FUNC( do_cpuid, "ret" ) #elif defined(__x86_64__) __ASM_GLOBAL_FUNC( do_cpuid, + "pushq %rsi\n\t" "pushq %rbx\n\t" - "movl %edi,%eax\n\t" + "movq %rcx,%rax\n\t" + "movq %rdx,%rsi\n\t" "cpuid\n\t" "movl %eax,(%rsi)\n\t" "movl %ebx,4(%rsi)\n\t" "movl %ecx,8(%rsi)\n\t" "movl %edx,12(%rsi)\n\t" "popq %rbx\n\t" + "popq %rsi\n\t" "ret" ) #else void do_cpuid( unsigned int ax, unsigned int *p ) @@ -2929,7 +2915,7 @@ static void regs_to_str( unsigned int *regs, unsigned int len, WCHAR *buffer ) for (i = 0; i < len; i++) { buffer[i] = *p++; } buffer[i] = 0; } -static void get_processor_manufacturer( WCHAR *manufacturer ) +static void get_processor_manufacturer( WCHAR *manufacturer, UINT len ) { unsigned int tmp, regs[4] = {0, 0, 0, 0}; @@ -2938,7 +2924,7 @@ static void get_processor_manufacturer( WCHAR *manufacturer ) regs[2] = regs[3]; regs[3] = tmp; - regs_to_str( regs + 1, 12, manufacturer ); + regs_to_str( regs + 1, min( 12, len ), manufacturer ); } static const WCHAR *get_osarchitecture(void) { @@ -2947,7 +2933,7 @@ static const WCHAR *get_osarchitecture(void) if (info.u.s.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64) return os_64bitW; return os_32bitW; } -static void get_processor_caption( WCHAR *caption ) +static void get_processor_caption( WCHAR *caption, UINT len ) { static const WCHAR fmtW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','u',' ', @@ -2960,17 +2946,17 @@ static void get_processor_caption( WCHAR *caption ) WCHAR manufacturer[13]; unsigned int regs[4] = {0, 0, 0, 0}, family, model, stepping; - get_processor_manufacturer( manufacturer ); + get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); if (get_osarchitecture() == os_32bitW) arch = x86W; - else if (!strcmpW( manufacturer, authenticamdW )) arch = amd64W; + else if (!lstrcmpW( manufacturer, authenticamdW )) arch = amd64W; else arch = intel64W; do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, &family ); - sprintfW( caption, fmtW, arch, family, model, stepping ); + swprintf( caption, len, fmtW, arch, family, model, stepping ); } -static void get_processor_version( WCHAR *version ) +static void get_processor_version( WCHAR *version, UINT len ) { static const WCHAR fmtW[] = {'M','o','d','e','l',' ','%','u',',',' ','S','t','e','p','p','i','n','g',' ','%','u',0}; @@ -2979,7 +2965,7 @@ static void get_processor_version( WCHAR *version ) do_cpuid( 1, regs ); model = get_processor_model( regs[0], &stepping, NULL ); - sprintfW( version, fmtW, model, stepping ); + swprintf( version, len, fmtW, model, stepping ); } static UINT16 get_processor_revision(void) { @@ -2987,13 +2973,13 @@ static UINT16 get_processor_revision(void) do_cpuid( 1, regs ); return regs[0]; } -static void get_processor_id( WCHAR *processor_id ) +static void get_processor_id( WCHAR *processor_id, UINT len ) { static const WCHAR fmtW[] = {'%','0','8','X','%','0','8','X',0}; unsigned int regs[4] = {0, 0, 0, 0}; do_cpuid( 1, regs ); - sprintfW( processor_id, fmtW, regs[3], regs[0] ); + swprintf( processor_id, len, fmtW, regs[3], regs[0] ); } static void get_processor_name( WCHAR *name ) { @@ -3010,7 +2996,7 @@ static void get_processor_name( WCHAR *name ) do_cpuid( 0x80000004, regs ); regs_to_str( regs, 16, name + 32 ); } - for (i = strlenW(name) - 1; i >= 0 && name[i] == ' '; i--) name[i] = 0; + for (i = lstrlenW(name) - 1; i >= 0 && name[i] == ' '; i--) name[i] = 0; } static UINT get_processor_currentclockspeed( UINT index ) { @@ -3053,11 +3039,11 @@ static enum fill_status fill_processor( struct table *table, const struct expr * if (!resize_table( table, num_packages, sizeof(*rec) )) return FILL_STATUS_FAILED; - get_processor_caption( caption ); - get_processor_id( processor_id ); - get_processor_manufacturer( manufacturer ); + get_processor_caption( caption, ARRAY_SIZE( caption ) ); + get_processor_id( processor_id, ARRAY_SIZE( processor_id ) ); + get_processor_manufacturer( manufacturer, ARRAY_SIZE( manufacturer ) ); get_processor_name( name ); - get_processor_version( version ); + get_processor_version( version, ARRAY_SIZE( version ) ); for (i = 0; i < num_packages; i++) { @@ -3069,7 +3055,7 @@ static enum fill_status fill_processor( struct table *table, const struct expr * rec->currentclockspeed = get_processor_currentclockspeed( i ); rec->datawidth = get_osarchitecture() == os_32bitW ? 32 : 64; rec->description = heap_strdupW( caption ); - sprintfW( device_id, fmtW, i ); + swprintf( device_id, ARRAY_SIZE( device_id ), fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->family = 2; /* Unknown */ rec->level = 15; @@ -3110,7 +3096,7 @@ static WCHAR *get_lastbootuptime(void) NtQuerySystemInformation( SystemTimeOfDayInformation, &ti, sizeof(ti), NULL ); RtlTimeToTimeFields( &ti.liKeBootTime, &tf ); - sprintfW( ret, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); + swprintf( ret, 26, fmtW, tf.Year, tf.Month, tf.Day, tf.Hour, tf.Minute, tf.Second, tf.Milliseconds * 1000 ); return ret; } static WCHAR *get_localdatetime(void) @@ -3135,7 +3121,7 @@ static WCHAR *get_localdatetime(void) if (!(ret = heap_alloc( 26 * sizeof(WCHAR) ))) return NULL; GetLocalTime(&st); - sprintfW( ret, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias); + swprintf( ret, 26, fmtW, st.wYear, st.wMonth, st.wDay, st.wHour, st.wMinute, st.wSecond, st.wMilliseconds * 1000, -Bias ); return ret; } static WCHAR *get_systemdirectory(void) @@ -3160,7 +3146,7 @@ static WCHAR *get_codeset(void) { static const WCHAR fmtW[] = {'%','u',0}; WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); - if (ret) sprintfW( ret, fmtW, GetACP() ); + if (ret) swprintf( ret, 11, fmtW, GetACP() ); return ret; } static WCHAR *get_countrycode(void) @@ -3179,7 +3165,7 @@ static WCHAR *get_osbuildnumber( OSVERSIONINFOEXW *ver ) { static const WCHAR fmtW[] = {'%','u',0}; WCHAR *ret = heap_alloc( 11 * sizeof(WCHAR) ); - if (ret) sprintfW( ret, fmtW, ver->dwBuildNumber ); + if (ret) swprintf( ret, 11, fmtW, ver->dwBuildNumber ); return ret; } static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) @@ -3240,7 +3226,7 @@ static WCHAR *get_osname( const WCHAR *caption ) static const WCHAR partitionW[] = {'|','C',':','\\','W','I','N','D','O','W','S','|','\\','D','e','v','i','c','e','\\', 'H','a','r','d','d','i','s','k','0','\\','P','a','r','t','i','t','i','o','n','1',0}; - int len = strlenW( caption ); + int len = lstrlenW( caption ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(partitionW) ))) return NULL; @@ -3252,7 +3238,7 @@ static WCHAR *get_osversion( OSVERSIONINFOEXW *ver ) { static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u',0}; WCHAR *ret = heap_alloc( 33 * sizeof(WCHAR) ); - if (ret) sprintfW( ret, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); + if (ret) swprintf( ret, 33, fmtW, ver->dwMajorVersion, ver->dwMinorVersion, ver->dwBuildNumber ); return ret; } static DWORD get_operatingsystemsku(void) @@ -3501,11 +3487,11 @@ static const WCHAR *find_sid_str( const struct expr *cond ) left = cond->u.expr.left; right = cond->u.expr.right; - if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !strcmpiW( left->u.propval->name, prop_sidW )) + if (left->type == EXPR_PROPVAL && right->type == EXPR_SVAL && !lstrcmpiW( left->u.propval->name, prop_sidW )) { ret = right->u.sval; } - else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !strcmpiW( right->u.propval->name, prop_sidW )) + else if (left->type == EXPR_SVAL && right->type == EXPR_PROPVAL && !lstrcmpiW( right->u.propval->name, prop_sidW )) { ret = left->u.sval; } @@ -3578,10 +3564,11 @@ static WCHAR *get_pnpdeviceid( DXGI_ADAPTER_DESC *desc ) {'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','&','D','E','A','D','B','E','E','F','&','0','&','D','E','A','D',0}; + UINT len = sizeof(fmtW) + 2; WCHAR *ret; - if (!(ret = heap_alloc( sizeof(fmtW) + 2 * sizeof(WCHAR) ))) return NULL; - sprintfW( ret, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); + if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; + swprintf( ret, len, fmtW, desc->VendorId, desc->DeviceId, desc->SubSysId, desc->Revision ); return ret; } @@ -3659,7 +3646,7 @@ done: rec->status = videocontroller_statusW; rec->videoarchitecture = 2; /* Unknown */ rec->videomemorytype = 2; /* Unknown */ - wsprintfW( mode, fmtW, hres, vres, (UINT64)1 << rec->current_bitsperpixel ); + swprintf( mode, ARRAY_SIZE( mode ), fmtW, hres, vres, (UINT64)1 << rec->current_bitsperpixel ); rec->videomodedescription = heap_strdupW( mode ); rec->videoprocessor = heap_strdupW( name ); if (!match_row( table, row, cond, &status )) free_row_values( table, row ); diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a005204791..6cb065b222 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -586,7 +585,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) if ((value = get_value_bstr( table, row, i ))) { *len += ARRAY_SIZE( fmtW ); - *len += strlenW( table->columns[i].name ); + *len += lstrlenW( table->columns[i].name ); *len += SysStringLen( value ); SysFreeString( value ); } @@ -597,7 +596,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - p += sprintfW( p, fmtW, table->columns[i].name, value ); + p += swprintf( p, *len - (p - ret), fmtW, table->columns[i].name, value ); SysFreeString( value ); } } @@ -612,12 +611,12 @@ static BSTR get_object_text( const struct view *view, UINT index ) BSTR ret, body; len = ARRAY_SIZE( fmtW ); - len += strlenW( view->table->name ); + len += lstrlenW( view->table->name ); if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; len += len_body; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - sprintfW( ret, fmtW, view->table->name, body ); + swprintf( ret, len, fmtW, view->table->name, body ); SysFreeString( body ); return ret; } @@ -807,12 +806,12 @@ static WCHAR *build_signature_table_name( const WCHAR *class, const WCHAR *metho static const WCHAR fmtW[] = {'_','_','%','s','_','%','s','_','%','s',0}; static const WCHAR outW[] = {'O','U','T',0}; static const WCHAR inW[] = {'I','N',0}; - UINT len = ARRAY_SIZE(fmtW) + ARRAY_SIZE(outW) + strlenW( class ) + strlenW( method ); + UINT len = ARRAY_SIZE(fmtW) + ARRAY_SIZE(outW) + lstrlenW( class ) + lstrlenW( method ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - sprintfW( ret, fmtW, class, method, dir == PARAM_IN ? inW : outW ); - return struprW( ret ); + swprintf( ret, len, fmtW, class, method, dir == PARAM_IN ? inW : outW ); + return wcsupr( ret ); } HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_direction dir, @@ -831,9 +830,9 @@ HRESULT create_signature( const WCHAR *class, const WCHAR *method, enum param_di WCHAR *query, *name; HRESULT hr; - len += strlenW( class ) + strlenW( method ); + len += lstrlenW( class ) + lstrlenW( method ); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - sprintfW( query, selectW, class, method, dir >= 0 ? geW : leW ); + swprintf( query, len, selectW, class, method, dir >= 0 ? geW : leW ); hr = exec_query( query, &iter ); heap_free( query ); diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index e6ccd5c21c..d90f4f8cc6 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #define COBJMACROS diff --git a/dlls/wbemprox/process.c b/dlls/wbemprox/process.c index 6bc3f37529..de9b03f708 100644 --- a/dlls/wbemprox/process.c +++ b/dlls/wbemprox/process.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wbemprox/qualifier.c b/dlls/wbemprox/qualifier.c index 06dcc59e31..9a4f74b978 100644 --- a/dlls/wbemprox/qualifier.c +++ b/dlls/wbemprox/qualifier.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -108,13 +107,13 @@ static HRESULT create_qualifier_enum( const WCHAR *class, const WCHAR *member, c int len; if (!member) member = noneW; - len = strlenW( class ) + strlenW( member ); - if (name) len += strlenW( name ) + ARRAY_SIZE(fmtW); + len = lstrlenW( class ) + lstrlenW( member ); + if (name) len += lstrlenW( name ) + ARRAY_SIZE(fmtW); else len += ARRAY_SIZE(fmt2W); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return E_OUTOFMEMORY; - if (name) sprintfW( query, fmtW, class, member, name ); - else sprintfW( query, fmt2W, class, member ); + if (name) swprintf( query, len, fmtW, class, member, name ); + else swprintf( query, len, fmt2W, class, member ); hr = exec_query( query, iter ); heap_free( query ); diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3221e27b0b..cb76d2946a 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -63,10 +62,10 @@ static BOOL eval_like( const WCHAR *lstr, const WCHAR *rstr ) { while (*q == '%') q++; if (!*q) return TRUE; - while (*p && *q && toupperW( *p ) == toupperW( *q )) { p++; q++; }; + while (*p && *q && towupper( *p ) == towupper( *q )) { p++; q++; }; if (!*p && !*q) return TRUE; } - if (*q != '%' && toupperW( *p++ ) != toupperW( *q++ )) return FALSE; + if (*q != '%' && towupper( *p++ ) != towupper( *q++ )) return FALSE; } return TRUE; } @@ -81,22 +80,22 @@ static HRESULT eval_strcmp( UINT op, const WCHAR *lstr, const WCHAR *rstr, LONGL switch (op) { case OP_EQ: - *val = !strcmpW( lstr, rstr ); + *val = !lstrcmpW( lstr, rstr ); break; case OP_GT: - *val = strcmpW( lstr, rstr ) > 0; + *val = lstrcmpW( lstr, rstr ) > 0; break; case OP_LT: - *val = strcmpW( lstr, rstr ) < 0; + *val = lstrcmpW( lstr, rstr ) < 0; break; case OP_LE: - *val = strcmpW( lstr, rstr ) <= 0; + *val = lstrcmpW( lstr, rstr ) <= 0; break; case OP_GE: - *val = strcmpW( lstr, rstr ) >= 0; + *val = lstrcmpW( lstr, rstr ) >= 0; break; case OP_NE: - *val = strcmpW( lstr, rstr ); + *val = lstrcmpW( lstr, rstr ); break; case OP_LIKE: *val = eval_like( lstr, rstr ); @@ -148,8 +147,8 @@ static HRESULT eval_boolcmp( UINT op, LONGLONG lval, LONGLONG rval, UINT ltype, { static const WCHAR trueW[] = {'T','r','u','e',0}; - if (ltype == CIM_STRING) lval = !strcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; - else if (rtype == CIM_STRING) rval = !strcmpiW( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; + if (ltype == CIM_STRING) lval = !lstrcmpiW( (const WCHAR *)(INT_PTR)lval, trueW ) ? -1 : 0; + else if (rtype == CIM_STRING) rval = !lstrcmpiW( (const WCHAR *)(INT_PTR)rval, trueW ) ? -1 : 0; switch (op) { @@ -207,7 +206,7 @@ static UINT resolve_type( UINT left, UINT right ) return CIM_ILLEGAL; } -static const WCHAR *format_int( WCHAR *buf, CIMTYPE type, LONGLONG val ) +static const WCHAR *format_int( WCHAR *buf, UINT len, CIMTYPE type, LONGLONG val ) { static const WCHAR fmt_signedW[] = {'%','d',0}; static const WCHAR fmt_unsignedW[] = {'%','u',0}; @@ -219,13 +218,13 @@ static const WCHAR *format_int( WCHAR *buf, CIMTYPE type, LONGLONG val ) case CIM_SINT8: case CIM_SINT16: case CIM_SINT32: - sprintfW( buf, fmt_signedW, val ); + swprintf( buf, len, fmt_signedW, val ); return buf; case CIM_UINT8: case CIM_UINT16: case CIM_UINT32: - sprintfW( buf, fmt_unsignedW, val ); + swprintf( buf, len, fmt_unsignedW, val ); return buf; case CIM_SINT64: @@ -263,10 +262,10 @@ static HRESULT eval_binary( const struct table *table, UINT row, const struct co const WCHAR *lstr, *rstr; WCHAR lbuf[21], rbuf[21]; - if (is_int( ltype )) lstr = format_int( lbuf, ltype, lval ); + if (is_int( ltype )) lstr = format_int( lbuf, ARRAY_SIZE( lbuf ), ltype, lval ); else lstr = (const WCHAR *)(INT_PTR)lval; - if (is_int( rtype )) rstr = format_int( rbuf, rtype, rval ); + if (is_int( rtype )) rstr = format_int( rbuf, ARRAY_SIZE( rbuf ), rtype, rval ); else rstr = (const WCHAR *)(INT_PTR)rval; return eval_strcmp( expr->op, lstr, rstr, val ); @@ -493,7 +492,7 @@ BOOL is_selected_prop( const struct view *view, const WCHAR *name ) if (!prop) return TRUE; while (prop) { - if (!strcmpiW( prop->name, name )) return TRUE; + if (!lstrcmpiW( prop->name, name )) return TRUE; prop = prop->next; } return FALSE; @@ -512,7 +511,7 @@ static BSTR build_servername( const struct view *view ) if (view->proplist) return NULL; if (!(GetComputerNameW( server, &len ))) return NULL; - for (p = server; *p; p++) *p = toupperW( *p ); + for (p = server; *p; p++) *p = towupper( *p ); return SysAllocString( server ); } @@ -545,7 +544,7 @@ static BSTR build_proplist( const struct view *view, UINT index, UINT count, UIN const WCHAR *name = view->table->columns[i].name; values[j] = get_value_bstr( view->table, row, i ); - *len += strlenW( fmtW ) + strlenW( name ) + strlenW( values[j] ); + *len += lstrlenW( fmtW ) + lstrlenW( name ) + lstrlenW( values[j] ); j++; } } @@ -558,7 +557,7 @@ static BSTR build_proplist( const struct view *view, UINT index, UINT count, UIN { const WCHAR *name = view->table->columns[i].name; - offset += sprintfW( ret + offset, fmtW, name, values[j] ); + offset += swprintf( ret + offset, *len - offset, fmtW, name, values[j] ); if (j < count - 1) ret[offset++] = ','; j++; } @@ -592,9 +591,9 @@ static BSTR build_relpath( const struct view *view, UINT index, const WCHAR *nam if (!(num_keys = count_key_columns( view ))) return class; if (!(proplist = build_proplist( view, index, num_keys, &len ))) goto done; - len += strlenW( fmtW ) + SysStringLen( class ); + len += lstrlenW( fmtW ) + SysStringLen( class ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; - sprintfW( ret, fmtW, class, proplist ); + swprintf( ret, len, fmtW, class, proplist ); done: SysFreeString( class ); @@ -614,9 +613,9 @@ static BSTR build_path( const struct view *view, UINT index, const WCHAR *name ) if (!(namespace = build_namespace( view ))) goto done; if (!(relpath = build_relpath( view, index, name ))) goto done; - len = strlenW( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); + len = lstrlenW( fmtW ) + SysStringLen( server ) + SysStringLen( namespace ) + SysStringLen( relpath ); if (!(ret = SysAllocStringLen( NULL, len ))) goto done; - sprintfW( ret, fmtW, server, namespace, relpath ); + swprintf( ret, len, fmtW, server, namespace, relpath ); done: SysFreeString( server ); @@ -666,7 +665,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (flavor) *flavor = WBEM_FLAVOR_ORIGIN_SYSTEM; - if (!strcmpiW( name, classW )) + if (!lstrcmpiW( name, classW )) { if (ret) { @@ -676,7 +675,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_STRING; return S_OK; } - if (!strcmpiW( name, genusW )) + if (!lstrcmpiW( name, genusW )) { if (ret) { @@ -686,7 +685,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_SINT32; return S_OK; } - else if (!strcmpiW( name, namespaceW )) + else if (!lstrcmpiW( name, namespaceW )) { if (ret) { @@ -696,7 +695,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_STRING; return S_OK; } - else if (!strcmpiW( name, pathW )) + else if (!lstrcmpiW( name, pathW )) { if (ret) { @@ -706,7 +705,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_STRING; return S_OK; } - if (!strcmpiW( name, propcountW )) + if (!lstrcmpiW( name, propcountW )) { if (ret) { @@ -716,7 +715,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_SINT32; return S_OK; } - else if (!strcmpiW( name, relpathW )) + else if (!lstrcmpiW( name, relpathW )) { if (ret) { @@ -726,7 +725,7 @@ static HRESULT get_system_propval( const struct view *view, UINT index, const WC if (type) *type = CIM_STRING; return S_OK; } - else if (!strcmpiW( name, serverW )) + else if (!lstrcmpiW( name, serverW )) { if (ret) { diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index ed30d15100..64e94f6e1f 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wbemprox/security.c b/dlls/wbemprox/security.c index d3057e01f5..3ad7321a60 100644 --- a/dlls/wbemprox/security.c +++ b/dlls/wbemprox/security.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wbemprox/service.c b/dlls/wbemprox/service.c index b096c5ceb9..53010bc100 100644 --- a/dlls/wbemprox/service.c +++ b/dlls/wbemprox/service.c @@ -20,7 +20,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index 599a421ced..fd08bad5bf 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -27,7 +26,6 @@ #include "wbemcli.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wbemprox_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); @@ -279,7 +277,7 @@ static HRESULT WINAPI wbem_services_OpenNamespace( TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, pCtx, ppWorkingNamespace, ppResult); - if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace) + if ((lstrcmpiW( strNamespace, cimv2W ) && lstrcmpiW( strNamespace, defaultW )) || ws->namespace) return WBEM_E_INVALID_NAMESPACE; return WbemServices_create( cimv2W, (void **)ppWorkingNamespace ); @@ -422,14 +420,14 @@ static WCHAR *query_from_path( const struct path *path ) { len = path->class_len + path->filter_len + ARRAY_SIZE(selectW); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - sprintfW( query, selectW, path->class, path->filter ); + swprintf( query, len, selectW, path->class, path->filter ); } else { len = path->class_len + ARRAY_SIZE(select_allW); if (!(query = heap_alloc( len * sizeof(WCHAR) ))) return NULL; - strcpyW( query, select_allW ); - strcatW( query, path->class ); + lstrcpyW( query, select_allW ); + lstrcatW( query, path->class ); } return query; } @@ -653,7 +651,7 @@ static HRESULT WINAPI wbem_services_ExecQuery( debugstr_w(strQuery), lFlags, pCtx, ppEnum); if (!strQueryLanguage || !strQuery || !strQuery[0]) return WBEM_E_INVALID_PARAMETER; - if (strcmpiW( strQueryLanguage, wqlW )) return WBEM_E_INVALID_QUERY_TYPE; + if (lstrcmpiW( strQueryLanguage, wqlW )) return WBEM_E_INVALID_QUERY_TYPE; return exec_query( strQuery, ppEnum ); } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index a8fd0041b3..fcff6c403a 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -35,7 +34,7 @@ HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *co UINT i; for (i = 0; i < table->num_cols; i++) { - if (!strcmpiW( table->columns[i].name, name )) + if (!lstrcmpiW( table->columns[i].name, name )) { *column = i; return S_OK; @@ -176,19 +175,19 @@ BSTR get_value_bstr( const struct table *table, UINT row, UINT column ) case CIM_DATETIME: case CIM_STRING: if (!val) return NULL; - len = strlenW( (const WCHAR *)(INT_PTR)val ) + 2; + len = lstrlenW( (const WCHAR *)(INT_PTR)val ) + 2; if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; - sprintfW( ret, fmt_strW, (const WCHAR *)(INT_PTR)val ); + swprintf( ret, len, fmt_strW, (const WCHAR *)(INT_PTR)val ); return ret; case CIM_SINT16: case CIM_SINT32: - sprintfW( number, fmt_signedW, val ); + swprintf( number, ARRAY_SIZE( number ), fmt_signedW, val ); return SysAllocString( number ); case CIM_UINT16: case CIM_UINT32: - sprintfW( number, fmt_unsignedW, val ); + swprintf( number, ARRAY_SIZE( number ), fmt_unsignedW, val ); return SysAllocString( number ); case CIM_SINT64: @@ -263,7 +262,7 @@ HRESULT get_method( const struct table *table, const WCHAR *name, class_method * { for (j = 0; j < table->num_cols; j++) { - if (table->columns[j].type & COL_FLAG_METHOD && !strcmpW( table->columns[j].name, name )) + if (table->columns[j].type & COL_FLAG_METHOD && !lstrcmpW( table->columns[j].name, name )) { HRESULT hr; LONGLONG val; @@ -357,7 +356,7 @@ struct table *grab_table( const WCHAR *name ) LIST_FOR_EACH_ENTRY( table, table_list, struct table, entry ) { - if (name && !strcmpiW( table->name, name )) + if (name && !lstrcmpiW( table->name, name )) { TRACE("returning %p\n", table); return addref_table( table ); @@ -392,7 +391,7 @@ BOOL add_table( struct table *table ) LIST_FOR_EACH_ENTRY( iter, table_list, struct table, entry ) { - if (!strcmpiW( iter->name, table->name )) + if (!lstrcmpiW( iter->name, table->name )) { TRACE("table %s already exists\n", debugstr_w(table->name)); return FALSE; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 998dc0ef63..e8cd88d2e1 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -18,7 +18,6 @@ #define COBJMACROS -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -27,7 +26,6 @@ #include "wbemcli.h" #include "wine/debug.h" -#include "wine/unicode.h" #include "wbemprox_private.h" WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); @@ -93,8 +91,8 @@ static BOOL is_local_machine( const WCHAR *server ) WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !strcmpW( server, dotW ) || !strcmpiW( server, localhostW )) return TRUE; - if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; + if (!server || !lstrcmpW( server, dotW ) || !lstrcmpiW( server, localhostW )) return TRUE; + if (GetComputerNameW( buffer, &len ) && !lstrcmpiW( server, buffer )) return TRUE; return FALSE; } @@ -133,15 +131,15 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= ARRAY_SIZE( rootW ) && strncmpiW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && wcsnicmp( rootW, p, len )) goto done; if (!*q) { hr = S_OK; goto done; } q++; - len = strlenW( q ); - if (strcmpiW( q, cimv2W ) && strcmpiW( q, defaultW )) + len = lstrlenW( q ); + if (lstrcmpiW( q, cimv2W ) && lstrcmpiW( q, defaultW )) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 15b961de52..cbf4c894f1 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -19,7 +19,6 @@ #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h" -#include "wine/unicode.h" IClientSecurity client_security DECLSPEC_HIDDEN; struct list *table_list DECLSPEC_HIDDEN; @@ -240,7 +239,7 @@ static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; if (!src) return NULL; - if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + if ((dst = heap_alloc( (lstrlenW( src ) + 1) * sizeof(WCHAR) ))) lstrcpyW( dst, src ); return dst; } diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y index 4d9ba493f0..2206525897 100644 --- a/dlls/wbemprox/wql.y +++ b/dlls/wbemprox/wql.y @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h" @@ -28,7 +27,6 @@ #include "wine/list.h" #include "wine/debug.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); @@ -672,7 +670,7 @@ static int cmp_keyword( const void *arg1, const void *arg2 ) int len = min( key1->len, key2->len ); int ret; - if ((ret = strncmpiW( key1->name, key2->name, len ))) return ret; + if ((ret = wcsnicmp( key1->name, key2->name, len ))) return ret; if (key1->len < key2->len) return -1; else if (key1->len > key2->len) return 1; return 0; @@ -702,7 +700,7 @@ static int get_token( const WCHAR *s, int *token ) case '\t': case '\r': case '\n': - for (i = 1; isspaceW( s[i] ); i++) {} + for (i = 1; iswspace( s[i] ); i++) {} *token = TK_SPACE; return i; case '-': @@ -781,7 +779,7 @@ static int get_token( const WCHAR *s, int *token ) *token = TK_STRING; return i; case '.': - if (!isdigitW( s[1] )) + if (!iswdigit( s[1] )) { *token = TK_DOT; return 1; @@ -790,7 +788,7 @@ static int get_token( const WCHAR *s, int *token ) case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': *token = TK_INTEGER; - for (i = 1; isdigitW( s[i] ); i++) {} + for (i = 1; iswdigit( s[i] ); i++) {} return i; default: if (!id_char[*s]) break; -- 2.20.1

1 0

[PATCH 1/2] services: Report a PID of 0 for drivers.
by Zebediah Figura July 3, 2019

July 3, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- programs/services/rpc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 41501024dac..8a77d97dd9f 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -831,7 +831,9 @@ static void fill_status_process(SERVICE_STATUS_PROCESS *status, struct service_e { struct process_entry *process = service->process; memcpy(status, &service->status, sizeof(service->status)); - status->dwProcessId = process ? process->process_id : 0; + status->dwProcessId = 0; + if (process && !(service->status.dwServiceType & SERVICE_DRIVER)) + status->dwProcessId = process->process_id; status->dwServiceFlags = 0; } -- 2.20.1

2 2

[PATCH 1/8] user32/tests: Test opening raw input devices.
by Zebediah Figura July 3, 2019

July 3, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/user32/tests/input.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a9be550bdc..998fcdd1943 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1599,6 +1599,7 @@ static void test_GetRawInputDeviceList(void) char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; + HANDLE file; /* get required buffer size */ name[0] = '\0'; @@ -1638,6 +1639,11 @@ static void test_GetRawInputDeviceList(void) ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + todo_wine_if(info.dwType != RIM_TYPEHID) + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + CloseHandle(file); } /* check if variable changes from larger to smaller value */ -- 2.20.1

3 11

[PATCH 1/3 v2] kernel32/tests: Add more debugger tests.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Better timeout handling dlls/kernel32/tests/debugger.c | 270 ++++++++++++++++++++++++++++++--- 1 file changed, 248 insertions(+), 22 deletions(-)

3 3

[PATCH 1/2 v2] ntdll: Move null terminating result to pf_vsnprintf callers.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Merged first two patches. dlls/ntdll/printf.c | 48 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 38 insertions(+), 10 deletions(-)

2 1

[PATCH 2/2] ntdll: Implement _snprintf_s and _vsnprintf_s.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/printf.c | 45 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+)

1 0

[PATCH 1/3] ntdll: Store the actual used value in error cases.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/printf.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-)

2 1

[PATCH 3/3] ntdll: Implement _snprintf_s and _vsnprintf_s.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/printf.c | 45 +++++++++++++++++++++++++++++++++ dlls/ntdll/tests/string.c | 53 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 100 insertions(+)

1 0

[PATCH 2/3] ntdll: Move null terminating result to pf_vsnprintf callers.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/printf.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)

1 0

[PATCH v2 1/8] user32/tests: Test opening raw input devices.
by Zebediah Figura July 3, 2019

July 3, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- v2: fix test failures on XP/2003; other patches are unaffected dlls/user32/tests/input.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 168b055773e..d0dc4a8bcf3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1625,6 +1625,7 @@ static void test_GetRawInputDeviceList(void) char nameA[128]; UINT sz, len; RID_DEVICE_INFO info; + HANDLE file; /* get required buffer size */ name[0] = '\0'; @@ -1664,6 +1665,14 @@ static void test_GetRawInputDeviceList(void) ok(ret == sizeof(info), "GetRawInputDeviceInfo gave wrong return: %d\n", err); ok(sz == sizeof(info), "GetRawInputDeviceInfo set wrong size\n"); ok(info.dwType == devices[i].dwType, "GetRawInputDeviceInfo set wrong type: 0x%x\n", info.dwType); + + /* setupapi returns an NT device path, but CreateFile() < Vista can't + * understand that; so use the \\?\ prefix instead */ + name[1] = '\\'; + file = CreateFileW(name, 0, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); + todo_wine_if(info.dwType != RIM_TYPEHID) + ok(file != INVALID_HANDLE_VALUE, "Failed to open %s, error %u\n", wine_dbgstr_w(name), GetLastError()); + CloseHandle(file); } /* check if variable changes from larger to smaller value */ -- 2.20.1

1 0

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban July 3, 2019

July 3, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

1 0

[PATCH 1/2] wineserver: Implement thread priorities on Unix with sched_setscheduler / setpriority
by Rémi Bernon July 3, 2019

July 3, 2019

This does not really check for errors in order to avoid introducing breaking changes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- configure | 69 ++++++++++++++++++++ configure.ac | 19 ++++++ include/config.h.in | 6 ++ server/thread.c | 149 ++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 230 insertions(+), 13 deletions(-) diff --git a/configure b/configure index 3b6d744c391..e89be467e2e 100755 --- a/configure +++ b/configure @@ -18065,6 +18065,75 @@ $as_echo "#define HAVE_SCHED_SETAFFINITY 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_setscheduler" >&5 +$as_echo_n "checking for sched_setscheduler... " >&6; } +if ${wine_cv_have_sched_setscheduler+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <sched.h> +int +main () +{ +sched_setscheduler(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_sched_setscheduler=yes +else + wine_cv_have_sched_setscheduler=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_sched_setscheduler" >&5 +$as_echo "$wine_cv_have_sched_setscheduler" >&6; } +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + +$as_echo "#define HAVE_SCHED_SETSCHEDULER 1" >>confdefs.h + +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for setpriority" >&5 +$as_echo_n "checking for setpriority... " >&6; } +if ${wine_cv_have_setpriority+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h> +int +main () +{ +setpriority(0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + wine_cv_have_setpriority=yes +else + wine_cv_have_setpriority=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_setpriority" >&5 +$as_echo "$wine_cv_have_setpriority" >&6; } +if test "$wine_cv_have_setpriority" = "yes" +then + +$as_echo "#define HAVE_SETPRIORITY 1" >>confdefs.h + +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5 $as_echo_n "checking for fallocate... " >&6; } if ${wine_cv_have_fallocate+:} false; then : diff --git a/configure.ac b/configure.ac index 709b43b9478..4a3ff36e6b7 100644 --- a/configure.ac +++ b/configure.ac @@ -2233,6 +2233,25 @@ then AC_DEFINE(HAVE_SCHED_SETAFFINITY, 1, [Define to 1 if you have the `sched_setaffinity' function.]) fi +AC_CACHE_CHECK([for sched_setscheduler],wine_cv_have_sched_setscheduler, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sched.h>]], [[sched_setscheduler(0, 0, 0);]])],[wine_cv_have_sched_setscheduler=yes],[wine_cv_have_sched_setscheduler=no])) +if test "$wine_cv_have_sched_setscheduler" = "yes" +then + AC_DEFINE(HAVE_SCHED_SETSCHEDULER, 1, [Define to 1 if you have the `sched_setscheduler' function.]) +fi + +AC_CACHE_CHECK([for setpriority],wine_cv_have_setpriority, + AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#define _GNU_SOURCE +#include <sys/resource.h> +#include <sys/time.h>]], [[setpriority(0, 0, 0);]])],[wine_cv_have_setpriority=yes],[wine_cv_have_setpriority=no])) +if test "$wine_cv_have_setpriority" = "yes" +then + AC_DEFINE(HAVE_SETPRIORITY, 1, [Define to 1 if you have the `setpriority' function.]) +fi + AC_CACHE_CHECK([for fallocate],wine_cv_have_fallocate, AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#define _GNU_SOURCE diff --git a/include/config.h.in b/include/config.h.in index ce5c1570541..1acc02b7173 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -788,6 +788,9 @@ /* Define to 1 if you have the `sched_setaffinity' function. */ #undef HAVE_SCHED_SETAFFINITY +/* Define to 1 if you have the `sched_setscheduler' function. */ +#undef HAVE_SCHED_SETSCHEDULER + /* Define to 1 if you have the `sched_yield' function. */ #undef HAVE_SCHED_YIELD @@ -812,6 +815,9 @@ /* Define to 1 if you have the `select' function. */ #undef HAVE_SELECT +/* Define to 1 if you have the `setpriority' function. */ +#undef HAVE_SETPRIORITY + /* Define to 1 if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE diff --git a/server/thread.c b/server/thread.c index 7057c9bbd0c..5b5f3cde617 100644 --- a/server/thread.c +++ b/server/thread.c @@ -38,6 +38,12 @@ #ifdef HAVE_SCHED_H #include <sched.h> #endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_SYS_RESOURCE_H +#include <sys/resource.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -517,28 +523,144 @@ affinity_t get_thread_affinity( struct thread *thread ) return mask; } +#if defined(HAVE_SCHED_SETSCHEDULER) || defined(HAVE_SETPRIORITY) +static int get_unix_priority( int priority_class, int priority ) +{ + switch (priority_class) { + case PROCESS_PRIOCLASS_IDLE: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 10; + case THREAD_PRIORITY_BELOW_NORMAL: return 8; + case THREAD_PRIORITY_NORMAL: return 6; + case THREAD_PRIORITY_ABOVE_NORMAL: return 4; + case THREAD_PRIORITY_HIGHEST: return 2; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_BELOW_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 8; + case THREAD_PRIORITY_BELOW_NORMAL: return 6; + case THREAD_PRIORITY_NORMAL: return 4; + case THREAD_PRIORITY_ABOVE_NORMAL: return 2; + case THREAD_PRIORITY_HIGHEST: return 0; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 4; + case THREAD_PRIORITY_BELOW_NORMAL: return 2; + case THREAD_PRIORITY_NORMAL: return 0; + case THREAD_PRIORITY_ABOVE_NORMAL: return -2; + case THREAD_PRIORITY_HIGHEST: return -4; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_ABOVE_NORMAL: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return 0; + case THREAD_PRIORITY_BELOW_NORMAL: return -2; + case THREAD_PRIORITY_NORMAL: return -4; + case THREAD_PRIORITY_ABOVE_NORMAL: return -6; + case THREAD_PRIORITY_HIGHEST: return -8; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_HIGH: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 15; + case THREAD_PRIORITY_LOWEST: return -2; + case THREAD_PRIORITY_BELOW_NORMAL: return -4; + case THREAD_PRIORITY_NORMAL: return -6; + case THREAD_PRIORITY_ABOVE_NORMAL: return -8; + case THREAD_PRIORITY_HIGHEST: return -10; + case THREAD_PRIORITY_TIME_CRITICAL: return -15; + } + case PROCESS_PRIOCLASS_REALTIME: + switch (priority) { + case THREAD_PRIORITY_IDLE: return 1; + case -7: + case -6: + case -5: + case -4: + case -3: + case THREAD_PRIORITY_LOWEST: + case THREAD_PRIORITY_BELOW_NORMAL: + case THREAD_PRIORITY_NORMAL: + case THREAD_PRIORITY_ABOVE_NORMAL: + case THREAD_PRIORITY_HIGHEST: + case 3: + case 4: + case 5: + case 6: + return priority + 9; + case THREAD_PRIORITY_TIME_CRITICAL: + return 16; + } + } + return 0; +} +#endif + #define THREAD_PRIORITY_REALTIME_HIGHEST 6 #define THREAD_PRIORITY_REALTIME_LOWEST -7 +int set_thread_priority( struct thread* thread, int priority ) +{ + int max = THREAD_PRIORITY_HIGHEST; + int min = THREAD_PRIORITY_LOWEST; + if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) + { + max = THREAD_PRIORITY_REALTIME_HIGHEST; + min = THREAD_PRIORITY_REALTIME_LOWEST; + } + + if ((priority < min || priority > max) && + priority != THREAD_PRIORITY_IDLE && + priority != THREAD_PRIORITY_TIME_CRITICAL) + { + errno = EINVAL; + return -1; + } + + thread->priority = priority; + if (thread->unix_tid == -1) + return 0; + + if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) + { +#ifdef HAVE_SCHED_SETSCHEDULER + struct sched_param param; + if (sched_getparam( thread->unix_tid, &param ) != 0) + goto error; + + param.sched_priority = get_unix_priority( thread->process->priority, priority ); + if (sched_setscheduler( thread->unix_tid, SCHED_RR|SCHED_RESET_ON_FORK, &param ) == 0) + return 0; +#endif + } + else + { +#ifdef HAVE_SETPRIORITY + if (setpriority( PRIO_PROCESS, thread->unix_tid, + get_unix_priority( thread->process->priority, priority ) ) == 0) + return 0; +#endif + } + +error: + return 0; +} + /* set all information about a thread */ static void set_thread_info( struct thread *thread, const struct set_thread_info_request *req ) { if (req->mask & SET_THREAD_INFO_PRIORITY) { - int max = THREAD_PRIORITY_HIGHEST; - int min = THREAD_PRIORITY_LOWEST; - if (thread->process->priority == PROCESS_PRIOCLASS_REALTIME) - { - max = THREAD_PRIORITY_REALTIME_HIGHEST; - min = THREAD_PRIORITY_REALTIME_LOWEST; - } - if ((req->priority >= min && req->priority <= max) || - req->priority == THREAD_PRIORITY_IDLE || - req->priority == THREAD_PRIORITY_TIME_CRITICAL) - thread->priority = req->priority; - else - set_error( STATUS_INVALID_PARAMETER ); + if (set_thread_priority( thread, req->priority )) + file_set_error(); } if (req->mask & SET_THREAD_INFO_AFFINITY) { @@ -1402,6 +1524,7 @@ DECL_HANDLER(init_thread) process->unix_pid = -1; /* can happen with linuxthreads */ init_thread_context( current ); generate_debug_event( current, CREATE_THREAD_DEBUG_EVENT, &req->entry ); + set_thread_priority( current, current->priority ); set_thread_affinity( current, current->affinity ); } debug_level = max( debug_level, req->debug_level ); -- 2.20.1

2 4

[PATCH 5/5] wined3d: Also try to create a depth/stencil buffer for WINED3D_NO3D devices in swapchain_init().
by Henri Verbeet July 3, 2019

July 3, 2019

If requested. It will fail as it should, but the client library should never request it. I.e., the additional check is redundant. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 9be6658c83d..69580adbffb 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -938,7 +938,7 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } /* Swapchains share the depth/stencil buffer, so only create a single depthstencil surface. */ - if (desc->enable_auto_depth_stencil && !(device->wined3d->flags & WINED3D_NO3D)) + if (desc->enable_auto_depth_stencil) { TRACE("Creating depth/stencil buffer.\n"); if (!device->auto_depth_stencil_view) -- 2.11.0

2 1

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to set_glsl_compute_shader_program().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34bb0b75bfb..1cd6bb6b507 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10062,16 +10062,15 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_ } /* Context activation is done by the caller. */ -static void set_glsl_compute_shader_program(const struct wined3d_context *context, +static void set_glsl_compute_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; GLuint cs_id; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE))) return; if (!(shader = state->shader[WINED3D_SHADER_TYPE_COMPUTE])) @@ -10591,13 +10590,14 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; GLuint program_id, prev_id; prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_compute_shader_program(context, state, priv, ctx_data); + set_glsl_compute_shader_program(context_gl, state, priv, ctx_data); program_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; TRACE("Using GLSL program %u.\n", program_id); -- 2.11.0

2 1

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_compute_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e7c7bca8e9e..34bb0b75bfb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10043,10 +10043,9 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, return WINED3D_OK; } -static GLuint find_glsl_compute_shader(const struct wined3d_context *context, +static GLuint find_glsl_compute_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) @@ -10066,6 +10065,7 @@ static GLuint find_glsl_compute_shader(const struct wined3d_context *context, static void set_glsl_compute_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_prog_link *entry; struct wined3d_shader *shader; struct glsl_program_key key; @@ -10081,7 +10081,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex return; } - cs_id = find_glsl_compute_shader(context, priv, shader); + cs_id = find_glsl_compute_shader(context_gl, priv, shader); memset(&key, 0, sizeof(key)); key.cs_id = cs_id; if (!(entry = get_glsl_program_entry(priv, &key))) -- 2.11.0

2 1

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_compile_compute_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 88f1cae0b1e..e7c7bca8e9e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9964,12 +9964,11 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * } static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, - const struct wined3d_context *context, struct wined3d_shader *shader) + const struct wined3d_context_gl *context_gl, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - struct glsl_context_data *ctx_data = context->shader_backend_data; + struct glsl_context_data *ctx_data = context_gl->c.shader_backend_data; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct glsl_cs_compiled_shader *gl_shaders; struct glsl_shader_private *shader_data; struct glsl_shader_prog_link *entry; @@ -10047,12 +10046,13 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, static GLuint find_glsl_compute_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_shader_private *shader_data; if (!shader->backend_data) { WARN("Failed to find GLSL program for compute shader %p.\n", shader); - if (FAILED(shader_glsl_compile_compute_shader(priv, context, shader))) + if (FAILED(shader_glsl_compile_compute_shader(priv, context_gl, shader))) { ERR("Failed to compile compute shader %p.\n", shader); return 0; @@ -10522,7 +10522,7 @@ static void shader_glsl_precompile(void *shader_priv, struct wined3d_shader *sha if (shader->reg_maps.shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) { context = context_acquire(device, NULL, 0); - shader_glsl_compile_compute_shader(shader_priv, context, shader); + shader_glsl_compile_compute_shader(shader_priv, wined3d_context_gl(context), shader); context_release(context); } } -- 2.11.0

2 1

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_find_ffp_fragment_shader().
by Henri Verbeet July 3, 2019

July 3, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ed3ff541496..88f1cae0b1e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9793,9 +9793,8 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct } static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *args, const struct wined3d_context *context) + const struct ffp_frag_settings *args, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -10207,7 +10206,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ffp_frag_settings settings; gen_ffp_frag_op(context, state, &settings, FALSE); - ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context); + ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; } -- 2.11.0

2 1

[PATCH] d3d10core/tests: Use d3d10 enumeration types.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index a395467125..f65bd34a79 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1835,7 +1835,7 @@ static void test_texture1d_interfaces(void) desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; - desc.Usage = D3D11_USAGE_DEFAULT; + desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = current->bind_flags; desc.CPUAccessFlags = 0; desc.MiscFlags = current->misc_flags; @@ -17524,8 +17524,8 @@ static void test_multiple_viewports(void) /* Two viewports, only first scissor rectangle set. */ memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); - rasterizer_desc.FillMode = D3D11_FILL_SOLID; - rasterizer_desc.CullMode = D3D11_CULL_BACK; + rasterizer_desc.FillMode = D3D10_FILL_SOLID; + rasterizer_desc.CullMode = D3D10_CULL_BACK; rasterizer_desc.DepthClipEnable = TRUE; rasterizer_desc.ScissorEnable = TRUE; hr = ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rasterizer_state); -- 2.20.1

3 2

[PATCH] wbemprox: Retrieve the system UUID from the SMBIOS table.
by Hans Leidekker July 3, 2019

July 3, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 124 +++++++++++++++++++++++++++------------- 1 file changed, 83 insertions(+), 41 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6c56d0d70a..6302cf574d 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1493,52 +1493,94 @@ static enum fill_status fill_compsys( struct table *table, const struct expr *co return status; } +#include "pshpack1.h" +struct smbios_prologue +{ + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +struct smbios_header +{ + BYTE type; + BYTE length; + WORD handle; +}; + +struct smbios_system +{ + struct smbios_header hdr; + BYTE vendor; + BYTE product; + BYTE version; + BYTE serial; + BYTE uuid[16]; +}; +#include "poppack.h" + +#define RSMB (('R' << 24) | ('S' << 16) | ('M' << 8) | 'B') + static WCHAR *get_compsysproduct_uuid(void) { -#ifdef __APPLE__ - unsigned char uuid[16]; - const struct timespec timeout = {1, 0}; - if (!gethostuuid( uuid, &timeout )) - { - static const WCHAR fmtW[] = - {'%','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','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', - '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X',0}; - WCHAR *ret = heap_alloc( 37 * sizeof(WCHAR) ); - if (!ret) return NULL; - sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], - uuid[8], uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); - return ret; - } -#endif -#ifdef __linux__ - int file; - if ((file = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) - { - unsigned char buf[32]; - if (read( file, buf, sizeof(buf) ) == sizeof(buf)) + static const WCHAR fmtW[] = + {'%','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','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 BYTE none[] = {0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; + ULONG len; + char *buf = NULL; + const char *ptr, *start; + const struct smbios_prologue *prologue; + const struct smbios_header *hdr; + const struct smbios_system *system; + const BYTE *uuid = NULL; + WCHAR *ret = NULL; + + if ((len = GetSystemFirmwareTable( RSMB, 0, NULL, 0 )) < sizeof(*prologue) ) goto done; + if (!(buf = heap_alloc( len ))) goto done; + GetSystemFirmwareTable( RSMB, 0, buf, len ); + + prologue = (const struct smbios_prologue *)buf; + if (prologue->length < sizeof(*hdr)) goto done; + start = (const char *)(prologue + 1); + hdr = (const struct smbios_header *)start; + + for (;;) + { + if (uuid || (const char *)hdr - start >= prologue->length - sizeof(*hdr)) break; + if (!hdr->length) + { + WARN( "invalid entry\n" ); + break; + } + + switch (hdr->type) { - unsigned int i, j; - WCHAR *ret, *p; - - close( file ); - if (!(p = ret = heap_alloc( 37 * sizeof(WCHAR) ))) return NULL; - for (i = 0, j = 0; i < 8; i++) p[i] = toupperW( buf[j++] ); - p[8] = '-'; - for (i = 9; i < 13; i++) p[i] = toupperW( buf[j++] ); - p[13] = '-'; - for (i = 14; i < 18; i++) p[i] = toupperW( buf[j++] ); - p[18] = '-'; - for (i = 19; i < 23; i++) p[i] = toupperW( buf[j++] ); - p[23] = '-'; - for (i = 24; i < 36; i++) p[i] = toupperW( buf[j++] ); - ret[i] = 0; - return ret; + case 1: /* system entry */ + if (hdr->length < sizeof(*system) || (const char *)hdr - start + hdr->length > prologue->length) break; + system = (const struct smbios_system *)hdr; + uuid = system->uuid; + break; + + default: /* skip other entries */ + for (ptr = (const char *)hdr + hdr->length; *ptr; ptr += strlen(ptr) + 1) { /* nothing */ } + if (ptr == (const char *)hdr + hdr->length) ptr++; + hdr = (const struct smbios_header *)(ptr + 1); + break; } - close( file ); } -#endif - return heap_strdupW( compsysproduct_uuidW ); + if (!uuid || !memcmp( uuid, none, sizeof(none) ) || !(ret = heap_alloc( 37 * sizeof(WCHAR) ))) goto done; + + sprintfW( ret, fmtW, uuid[0], uuid[1], uuid[2], uuid[3], uuid[4], uuid[5], uuid[6], uuid[7], uuid[8], + uuid[9], uuid[10], uuid[11], uuid[12], uuid[13], uuid[14], uuid[15] ); + +done: + heap_free( buf ); + if (!ret) ret = heap_strdupW( compsysproduct_uuidW ); + return ret; } static enum fill_status fill_compsysproduct( struct table *table, const struct expr *cond ) -- 2.20.1

2 1

[PATCH] quartz: Remove unused function.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/quartz/filesource.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index a7063fea78..9ab5d3e3cb 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -647,11 +647,6 @@ static inline AsyncReader *impl_from_BaseOutputPin(BaseOutputPin *iface) return CONTAINING_RECORD(iface, AsyncReader, source); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin(BasePin *iface) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - static inline AsyncReader *impl_from_IAsyncReader(IAsyncReader *iface) { return CONTAINING_RECORD(iface, AsyncReader, IAsyncReader_iface); -- 2.20.1

2 1

[PATCH] kernel32: Remove unused functions.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/sync.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index 49374ccd62..d8d0f20ce6 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -50,12 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(sync); -/* check if current version is NT or Win95 */ -static inline BOOL is_version_nt(void) -{ - return !(GetVersion() & 0x80000000); -} - static void get_create_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING *nameW, SECURITY_ATTRIBUTES *sa, const WCHAR *name ) { @@ -89,14 +83,6 @@ static BOOL get_open_object_attributes( OBJECT_ATTRIBUTES *attr, UNICODE_STRING return TRUE; } -/* helper for kernel32->ntdll timeout format conversion */ -static inline PLARGE_INTEGER get_nt_timeout( PLARGE_INTEGER pTime, DWORD timeout ) -{ - if (timeout == INFINITE) return NULL; - pTime->QuadPart = (ULONGLONG)timeout * -10000; - return pTime; -} - /*********************************************************************** * SwitchToThread (KERNEL32.@) */ -- 2.20.1

2 1

[PATCH] devenum: Don't free with uninitialized pointer value.
by Nikolay Sivov July 3, 2019

July 3, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/devenum/createdevenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 76bb0c249a..8e82fcdeac 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -379,9 +379,9 @@ static void free_regfilter2(REGFILTER2 *rgf) static void write_filter_data(IPropertyBag *prop_bag, REGFILTER2 *rgf) { + BYTE *data = NULL, *array; IAMFilterData *fildata; SAFEARRAYBOUND sabound; - BYTE *data, *array; VARIANT var = {}; ULONG size; HRESULT hr; -- 2.20.1

2 1

[PATCH 1/5] quartz/dsoundrender: Use flush_event instead of reimplementing it.
by Zebediah Figura July 3, 2019

July 3, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 39 +++----------------------------------- 1 file changed, 3 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f9fef51b562..8afb094af82 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,8 +64,6 @@ typedef struct DSoundRenderImpl REFERENCE_TIME play_time; - HANDLE blocked; - LONG volume; LONG pan; @@ -245,7 +243,7 @@ static HRESULT DSoundRender_HandleEndOfStream(DSoundRenderImpl *This) This->in_loop = 1; LeaveCriticalSection(&This->renderer.filter.csFilter); LeaveCriticalSection(&This->renderer.csRenderLock); - WaitForSingleObject(This->blocked, 10); + WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); EnterCriticalSection(&This->renderer.filter.csFilter); This->in_loop = 0; @@ -270,7 +268,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, REFERENCE_TIM if (hr != S_OK) { This->in_loop = 1; LeaveCriticalSection(&This->renderer.csRenderLock); - ret = WaitForSingleObject(This->blocked, 10); + ret = WaitForSingleObject(This->renderer.flush_event, 10); EnterCriticalSection(&This->renderer.csRenderLock); This->in_loop = 0; if (This->renderer.sink.flushing || This->renderer.filter.state == State_Stopped) @@ -434,7 +432,6 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) IDirectSoundBuffer_Stop(This->dsbuffer); This->writepos = This->buf_size; - SetEvent(This->blocked); } static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) @@ -445,13 +442,7 @@ static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface) if (This->renderer.sink.pin.pConnectedTo) { - if (This->renderer.filter.state == State_Paused) - { - /* Unblock our thread, state changing from paused to running doesn't need a reset for state change */ - SetEvent(This->blocked); - } IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - ResetEvent(This->blocked); } } @@ -548,17 +539,6 @@ static HRESULT WINAPI DSoundRender_EndOfStream(BaseRenderer* iface) return hr; } -static HRESULT WINAPI DSoundRender_BeginFlush(BaseRenderer* iface) -{ - DSoundRenderImpl *This = impl_from_BaseRenderer(iface); - - TRACE("\n"); - BaseRendererImpl_BeginFlush(iface); - SetEvent(This->blocked); - - return S_OK; -} - static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -566,8 +546,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(BaseRenderer* iface) TRACE("\n"); BaseRendererImpl_EndFlush(iface); - if (This->renderer.filter.state != State_Stopped) - ResetEvent(This->blocked); if (This->dsbuffer) { @@ -602,8 +580,6 @@ static void dsound_render_destroy(BaseRenderer *iface) IDirectSound8_Release(filter->dsound); filter->dsound = NULL; - CloseHandle(filter->blocked); - strmbase_renderer_cleanup(&filter->renderer); CoTaskMemFree(filter); } @@ -643,7 +619,7 @@ static const BaseRendererFuncTable BaseFuncTable = { DSoundRender_CompleteConnect, DSoundRender_BreakConnect, DSoundRender_EndOfStream, - DSoundRender_BeginFlush, + NULL, DSoundRender_EndFlush, dsound_render_destroy, dsound_render_query_interface, @@ -694,14 +670,6 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) if (SUCCEEDED(hr)) { - pDSoundRender->blocked = CreateEventW(NULL, TRUE, TRUE, NULL); - - if (!pDSoundRender->blocked || FAILED(hr)) - { - IBaseFilter_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); - return HRESULT_FROM_WIN32(GetLastError()); - } - *out = &pDSoundRender->renderer.filter.IUnknown_inner; } else @@ -734,7 +702,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (SUCCEEDED(hr)) This->renderer.filter.state = State_Paused; - ResetEvent(This->blocked); ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock); -- 2.22.0

1 4

[PATCH] ntoskrnl.exe: Use the registered interface class in IoSetDeviceInterfaceState().
by Zebediah Figura July 2, 2019

July 2, 2019

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntoskrnl.exe/pnp.c | 77 +---------------------------------------- 1 file changed, 1 insertion(+), 76 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 4ec8aaaed27..30865a05dcb 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -71,77 +71,6 @@ static int interface_rb_compare( const void *key, const struct wine_rb_entry *en static struct wine_rb_tree device_interfaces = { interface_rb_compare }; -static inline BOOL is_valid_hex(WCHAR c) -{ - if (!(((c >= '0') && (c <= '9')) || - ((c >= 'a') && (c <= 'f')) || - ((c >= 'A') && (c <= 'F')))) - return FALSE; - return TRUE; -} - -static const BYTE guid_conv_table[256] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x10 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 */ - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 0, 0, 0, 0, 0, /* 0x30 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x40 */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x50 */ - 0, 0xa, 0xb, 0xc, 0xd, 0xe, 0xf /* 0x60 */ -}; - -static BOOL guid_from_string(const WCHAR *s, GUID *id) -{ - int i; - - if (!s || s[0] != '{') - { - memset( id, 0, sizeof (CLSID) ); - return FALSE; - } - - id->Data1 = 0; - for (i = 1; i < 9; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data1 = (id->Data1 << 4) | guid_conv_table[s[i]]; - } - if (s[9] != '-') return FALSE; - - id->Data2 = 0; - for (i = 10; i < 14; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data2 = (id->Data2 << 4) | guid_conv_table[s[i]]; - } - if (s[14] != '-') return FALSE; - - id->Data3 = 0; - for (i = 15; i < 19; i++) - { - if (!is_valid_hex(s[i])) return FALSE; - id->Data3 = (id->Data3 << 4) | guid_conv_table[s[i]]; - } - if (s[19] != '-') return FALSE; - - for (i = 20; i < 37; i += 2) - { - if (i == 24) - { - if (s[i] != '-') return FALSE; - i++; - } - if (!is_valid_hex(s[i]) || !is_valid_hex(s[i+1])) return FALSE; - id->Data4[(i-20)/2] = guid_conv_table[s[i]] << 4 | guid_conv_table[s[i+1]]; - } - - if (s[37] == '}') - return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI internal_complete( DEVICE_OBJECT *device, IRP *irp, void *context ) { HANDLE event = context; @@ -594,7 +523,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; - GUID class; ULONG len; TRACE("device %s, enable %u.\n", debugstr_us(name), enable); @@ -615,9 +543,6 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (*p == '\\') refstr = p; if (!refstr) refstr = p; - if (!guid_from_string( refstr - 38, &class )) - return STATUS_INVALID_PARAMETER; - len = lstrlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) @@ -676,7 +601,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable { broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = class; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast ); -- 2.20.1

1 0

Ubuntu 19.10 will be 64 bit only
by Rosanne DiMesio July 2, 2019

July 2, 2019

https://discourse.ubuntu.com/t/i386-architecture-will-be-dropped-starting-w… A user has already asked about this on the forum. https://forum.winehq.org/viewtopic.php?f=8&t=32565 The immediate question for me is whether to even bother trying to package Wine for Ubuntu 19.10 and up. The suggestion from Ubuntu is to use the 32 bit libraries from 18.04, which will be supported until 2023. It's theoretically possible for me to build the 32 bit side on the OBS using the libraries from 18.04, but that would lead to a mismatch in library versions the 32 and 64 bit sides were built against. Apt requires the i386 and amd64 versions of packages match or it will refuse to install them, so unless that changes, users of 19.10 and up will be unable to install the 32 bit libraries they need to run Wine, unless they downgrade a significant part of their system to the 18.04 versions. I could build pure 64 bit Wine packages for Ubuntu. We've been telling users for 10 years that pure 64 bit Wine is not supported, but with so many systems going 64 bit only, perhaps it's time to reconsider that policy. There are certainly more 64 bit Windows apps now than there used to be, so it wouldn't be completely useless. The downside of doing that is that we will spend a lot of time explaining to users that pure 64 bit Wine will not run 32 bit programs, no matter how many places we plaster that information. The upside is that if we change that policy, I'm ready to go with pure 64 bit CentOS 7 packages. Thoughts? Perhaps this should be discussed at WineConf? -- Rosanne DiMesio dimesio(a)earthlink.net

16 29

[PATCH] d2d1: Remove unused function.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 9e4acb6ea2..98f06a281a 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -207,11 +207,6 @@ static inline struct d2d_device_context *impl_from_ID2D1DeviceContext(ID2D1Devic return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); } -static inline struct d2d_device_context *impl_from_ID2D1RenderTarget(ID2D1RenderTarget *iface) -{ - return CONTAINING_RECORD(iface, struct d2d_device_context, ID2D1DeviceContext_iface); -} - static HRESULT STDMETHODCALLTYPE d2d_device_context_inner_QueryInterface(IUnknown *iface, REFIID iid, void **out) { struct d2d_device_context *context = impl_from_IUnknown(iface); -- 2.20.1

3 2

[PATCH] d3drm: Fix reference leak in d3drm_viewport2_Clear().
by Jeff Smith July 2, 2019

July 2, 2019

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/d3drm/tests/d3drm.c | 4 ++++ dlls/d3drm/viewport.c | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index eefd33ed2f..ea68838948 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -7014,10 +7014,12 @@ static void test_viewport_clear1(void) ret_color = IDirect3DRMFrame_GetSceneBackground(camera1); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMViewport_Clear(viewport1); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame1, 1); hr = IDirect3DRMFrame_SetSceneBackgroundRGB(frame1, 0.0f, 0.0f, 1.0f); ok(SUCCEEDED(hr), "Cannot set scene background RGB (hr = %#x)\n", hr); @@ -7217,10 +7219,12 @@ static void test_viewport_clear2(void) ret_color = IDirect3DRMFrame3_GetSceneBackground(camera3); ok(ret_color == 0xff00ff00, "Expected scene color returned == 0xff00ff00, got %#x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_Clear(viewport2, D3DRMCLEAR_ALL); ok(SUCCEEDED(hr), "Cannot clear viewport (hr = %#x).\n", hr); ret_color = get_surface_color(surface, 320, 240); ok(compare_color(ret_color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", ret_color); + CHECK_REFCOUNT(frame3, 1); hr = IDirect3DRMViewport2_GetDirect3DViewport(viewport2, &d3d_viewport); ok(SUCCEEDED(hr), "Cannot get IDirect3DViewport interface (hr = %#x).\n", hr); diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 81d3af444f..51174cd59e 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -50,6 +50,7 @@ static HRESULT d3drm_update_background_material(struct d3drm_viewport *viewport) if (FAILED(hr = IDirect3DRMFrame_GetScene(viewport->camera, &root_frame))) return hr; color = IDirect3DRMFrame_GetSceneBackground(root_frame); + IDirect3DRMFrame_Release(root_frame); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); -- 2.14.3

2 1

[PATCH] shlwapi: Remove unused function.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/path.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dlls/shlwapi/path.c b/dlls/shlwapi/path.c index a8d1c97172..e7b56a7ade 100644 --- a/dlls/shlwapi/path.c +++ b/dlls/shlwapi/path.c @@ -54,21 +54,6 @@ static fnpIsNetDrive pIsNetDrive; HRESULT WINAPI SHGetWebFolderFilePathW(LPCWSTR,LPWSTR,DWORD); -static inline WCHAR* heap_strdupAtoW(LPCSTR str) -{ - WCHAR *ret = NULL; - - if (str) - { - DWORD len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR)); - if (ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - /************************************************************************* * PathBuildRootA [SHLWAPI.@] * -- 2.20.1

2 1

[PATCH 2/2] winedbg: Set auto attach event after processing the first exception.
by Jacek Caban July 2, 2019

July 2, 2019

On Windows, the process is broken by ordering and actual debug break execution in a new thread. We need to process this even before continuing exception handling in debuggee to avoid race. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winedbg/debugger.h | 4 ++-- programs/winedbg/tgt_active.c | 14 +++++--------- programs/winedbg/winedbg.c | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-)

1 0

[PATCH 1/2] winedbg: Move continue_on_first_exception handling out of dbg_attach_debuggee.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winedbg/dbg.y | 2 +- programs/winedbg/debugger.h | 2 +- programs/winedbg/stack.c | 2 +- programs/winedbg/tgt_active.c | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-)

1 0

[PATCH] xaudio2: Fix the export order for CreateAudioReverb/CreateAudioVolumeMeter
by elee＠codeweavers.com July 2, 2019

July 2, 2019

From: Ethan Lee <elee(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47437 Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_8/xaudio2_8.spec | 12 ++++++------ dlls/xaudio2_9/xaudio2_9.spec | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/xaudio2_8/xaudio2_8.spec b/dlls/xaudio2_8/xaudio2_8.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_8/xaudio2_8.spec +++ b/dlls/xaudio2_8/xaudio2_8.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) diff --git a/dlls/xaudio2_9/xaudio2_9.spec b/dlls/xaudio2_9/xaudio2_9.spec index 0b9f23866b..78bf05bdb6 100644 --- a/dlls/xaudio2_9/xaudio2_9.spec +++ b/dlls/xaudio2_9/xaudio2_9.spec @@ -1,6 +1,6 @@ -@ stdcall XAudio2Create(ptr long long) -@ stdcall CreateAudioVolumeMeter(ptr) -@ stdcall CreateAudioReverb(ptr) -@ cdecl CreateFX(ptr ptr ptr long) -@ cdecl X3DAudioCalculate(ptr ptr ptr long ptr) -@ cdecl X3DAudioInitialize(long float ptr) +1 stdcall -ordinal XAudio2Create(ptr long long) +2 stdcall -ordinal CreateAudioReverb(ptr) +3 stdcall -ordinal CreateAudioVolumeMeter(ptr) +4 cdecl -ordinal CreateFX(ptr ptr ptr long) +5 cdecl -ordinal X3DAudioCalculate(ptr ptr ptr long ptr) +6 cdecl -ordinal X3DAudioInitialize(long float ptr) -- 2.21.0

1 0

[PATCH 1/2] xaudio2: Add TRACE functions to CreateAudioReverb/CreateAudioVolumeMeter
by elee＠codeweavers.com July 2, 2019

July 2, 2019

From: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Ethan Lee <elee(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index da0b0aa606..a87e0124d3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2075,6 +2075,8 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; @@ -2091,6 +2093,8 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr; + TRACE("%p\n", out); + hr = make_xapo_factory(&CLSID_AudioReverb27, &IID_IClassFactory, (void**)&cf); if(FAILED(hr)) return hr; -- 2.21.0

3 4

[PATCH] msvcrt: Fix handling of dst == src in wcscpy_s.
by Dmitry Timoshkov July 2, 2019

July 2, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcrt/tests/string.c | 5 +++++ dlls/msvcrt/wcs.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 0f1ee47d17..da6478c1b1 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -1020,6 +1020,11 @@ static void test_wcscpy_s(void) ok(ret == 0, "expected 0 got %d\n", ret); ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* dest == source */ + ret = p_wcscpy_s(szDest, 18, szDest); + ok(ret == 0, "expected 0 got %d\n", ret); + ok(lstrcmpW(szDest, szLongText) == 0, "szDest != szLongText\n"); + /* Copy smaller buffer size */ errno = EBADF; szDest[0] = 'A'; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e62ac25edc..6b8c7bbe0f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2041,16 +2041,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con if(!MSVCRT_CHECK_PMT(wcDest)) return MSVCRT_EINVAL; if(!MSVCRT_CHECK_PMT(numElement)) return MSVCRT_EINVAL; - wcDest[0] = 0; - - if(!MSVCRT_CHECK_PMT(wcSrc)) return MSVCRT_EINVAL; + if(!MSVCRT_CHECK_PMT(wcSrc)) + { + wcDest[0] = 0; + return MSVCRT_EINVAL; + } size = strlenW(wcSrc) + 1; if(!MSVCRT_CHECK_PMT_ERR(size <= numElement, MSVCRT_ERANGE)) + { + wcDest[0] = 0; return MSVCRT_ERANGE; + } - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + memmove( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0; } -- 2.20.1

2 1

[PATCH 3/3] ntdll: Use the machine ID for the system UUID on Linux.
by Hans Leidekker July 2, 2019

July 2, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 7cfe57c9bd..1211234293 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -101,6 +101,7 @@ struct smbios_system { BYTE product; BYTE version; BYTE serial; + BYTE uuid[16]; }; struct smbios_board { @@ -2064,6 +2065,45 @@ static size_t get_smbios_string(const char *path, char *str, size_t size) return len; } +static void get_system_uuid( GUID *uuid ) +{ + static const unsigned char hex[] = + { + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x00 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x10 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x20 */ + 0,1,2,3,4,5,6,7,8,9,0,0,0,0,0,0, /* 0x30 */ + 0,10,11,12,13,14,15,0,0,0,0,0,0,0,0,0, /* 0x40 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x50 */ + 0,10,11,12,13,14,15 /* 0x60 */ + }; + int fd; + + memset( uuid, 0xff, sizeof(*uuid) ); + if ((fd = open( "/var/lib/dbus/machine-id", O_RDONLY )) != -1) + { + unsigned char buf[32], *p = buf; + if (read( fd, buf, sizeof(buf) ) == sizeof(buf)) + { + uuid->Data1 = hex[p[6]] << 28 | hex[p[7]] << 24 | hex[p[4]] << 20 | hex[p[5]] << 16 | + hex[p[2]] << 12 | hex[p[3]] << 8 | hex[p[0]] << 4 | hex[p[1]]; + + uuid->Data2 = hex[p[10]] << 12 | hex[p[11]] << 8 | hex[p[8]] << 4 | hex[p[9]]; + uuid->Data3 = hex[p[14]] << 12 | hex[p[15]] << 8 | hex[p[12]] << 4 | hex[p[13]]; + + uuid->Data4[0] = hex[p[16]] << 4 | hex[p[17]]; + uuid->Data4[1] = hex[p[18]] << 4 | hex[p[19]]; + uuid->Data4[2] = hex[p[20]] << 4 | hex[p[21]]; + uuid->Data4[3] = hex[p[22]] << 4 | hex[p[23]]; + uuid->Data4[4] = hex[p[24]] << 4 | hex[p[25]]; + uuid->Data4[5] = hex[p[26]] << 4 | hex[p[27]]; + uuid->Data4[6] = hex[p[28]] << 4 | hex[p[29]]; + uuid->Data4[7] = hex[p[30]] << 4 | hex[p[31]]; + } + close( fd ); + } +} + static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) { switch (sfti->ProviderSignature) @@ -2163,6 +2203,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; system->serial = system_serial_len ? ++string_count : 0; + get_system_uuid( (GUID *)system->uuid ); buffer += sizeof(struct smbios_system); copy_smbios_string(&buffer, system_vendor, system_vendor_len); -- 2.11.0

2 1

[PATCH 2/3] ntdll: Use a common structure for the SMBIOS table entry header.
by Hans Leidekker July 2, 2019

July 2, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2a2bd4fd60..7cfe57c9bd 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -79,10 +79,14 @@ struct smbios_prologue { DWORD length; }; -struct smbios_bios { +struct smbios_header { BYTE type; BYTE length; WORD handle; +}; + +struct smbios_bios { + struct smbios_header hdr; BYTE vendor; BYTE version; WORD start; @@ -92,9 +96,7 @@ struct smbios_bios { }; struct smbios_system { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -102,9 +104,7 @@ struct smbios_system { }; struct smbios_board { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE product; BYTE version; @@ -112,9 +112,7 @@ struct smbios_board { }; struct smbios_chassis { - BYTE type; - BYTE length; - WORD handle; + struct smbios_header hdr; BYTE vendor; BYTE shape; BYTE version; @@ -2139,9 +2137,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; bios = (struct smbios_bios*)buffer; - bios->type = 0; - bios->length = sizeof(struct smbios_bios); - bios->handle = 0; + bios->hdr.type = 0; + bios->hdr.length = sizeof(struct smbios_bios); + bios->hdr.handle = 0; bios->vendor = bios_vendor_len ? ++string_count : 0; bios->version = bios_version_len ? ++string_count : 0; bios->start = 0; @@ -2158,9 +2156,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; system = (struct smbios_system*)buffer; - system->type = 1; - system->length = sizeof(struct smbios_system); - system->handle = 0; + system->hdr.type = 1; + system->hdr.length = sizeof(struct smbios_system); + system->hdr.handle = 0; system->vendor = system_vendor_len ? ++string_count : 0; system->product = system_product_len ? ++string_count : 0; system->version = system_version_len ? ++string_count : 0; @@ -2176,9 +2174,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; board = (struct smbios_board*)buffer; - board->type = 2; - board->length = sizeof(struct smbios_board); - board->handle = 0; + board->hdr.type = 2; + board->hdr.length = sizeof(struct smbios_board); + board->hdr.handle = 0; board->vendor = board_vendor_len ? ++string_count : 0; board->product = board_product_len ? ++string_count : 0; board->version = board_version_len ? ++string_count : 0; @@ -2194,9 +2192,9 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG string_count = 0; chassis = (struct smbios_chassis*)buffer; - chassis->type = 3; - chassis->length = sizeof(struct smbios_chassis); - chassis->handle = 0; + chassis->hdr.type = 3; + chassis->hdr.length = sizeof(struct smbios_chassis); + chassis->hdr.handle = 0; chassis->vendor = chassis_vendor_len ? ++string_count : 0; chassis->shape = 0x2; /* unknown */ chassis->version = chassis_version_len ? ++string_count : 0; -- 2.11.0

2 1

[PATCH 1/3] ntdll: Fix sysfs path for the product name.
by Hans Leidekker July 2, 2019

July 2, 2019

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ntdll/nt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 0dc06f971b..2a2bd4fd60 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -2093,7 +2093,7 @@ static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); system_vendor_len = get_smbios_string("/sys/class/dmi/id/sys_vendor", S(system_vendor)); - system_product_len = get_smbios_string("/sys/class/dmi/id/product", S(system_product)); + system_product_len = get_smbios_string("/sys/class/dmi/id/product_name", S(system_product)); system_version_len = get_smbios_string("/sys/class/dmi/id/product_version", S(system_version)); system_serial_len = get_smbios_string("/sys/class/dmi/id/product_serial", S(system_serial)); board_vendor_len = get_smbios_string("/sys/class/dmi/id/board_vendor", S(board_vendor)); -- 2.11.0

2 1

[PATCH 3/3] kernel32: Terminate process in unhandled exception handler.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/debugger.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)

2 1

[PATCH 2/3] server: Fix debug event order in generate_startup_debug_events.
by Jacek Caban July 2, 2019

July 2, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-)

2 1

Broken WoW builds
by Francois Gouget July 2, 2019

July 2, 2019

So as far as I can tell the following patch broke the WoW builds: commit a1cdcc5290618c00d73e7a71aaa38897ec501138 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 09:28:35 2019 +0200 ntoskrnl: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> That is, after this patch, I get a crash in mountmgr.sys when creating the wineprefix (see attached backtrace). Maybe I'm missing something. Anyway, this is why the TestBot has been failing all patches for a while: all patches are tested against wow32 and wow64 builds but those were unable to run the tests. So for now I have disabled testing on the wow builds. -- Francois Gouget <fgouget(a)codeweavers.com>

2 2

[PATCH 1/3] kernel32/tests: Add more debugger tests.
by Jacek Caban July 2, 2019

July 2, 2019

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

2 1

[PATCH] msvcrt: Add '-norelay' flag for _vsnprintf().
by Dmitry Timoshkov July 2, 2019

July 2, 2019

Otherwise for instance +relay,+msi log has msi: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msvcrt/msvcrt.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 3dddf8a473..ed1e72c5e1 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1062,7 +1062,7 @@ @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l @ cdecl _vscwprintf_p_l(wstr ptr ptr) MSVCRT__vscwprintf_p_l -@ cdecl _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c(ptr long str ptr) MSVCRT_vsnprintf @ cdecl _vsnprintf_c_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l @ cdecl _vsnprintf_l(ptr long str ptr ptr) MSVCRT_vsnprintf_l -- 2.20.1

2 1

[PATCH] kernelbase: Only subtract 2 when strings arent equal.
by Alistair Leslie-Hughes July 2, 2019

July 2, 2019

Restores code remove from commit 2a455ce049d65eeab95895b6b6d52f6e5047537b. Always subtracting 2 means two strings could never be equal, returning 0. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernelbase/string.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7bea47942e..edc68ed01e 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -67,34 +67,50 @@ static BOOL char_compare(WORD ch1, WORD ch2, DWORD flags) int WINAPI lstrcmpA( LPCSTR str1, LPCSTR str2 ) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), 0, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiA(LPCSTR str1, LPCSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ) - 2; + ret = CompareStringA( GetThreadLocale(), NORM_IGNORECASE|LOCALE_USE_CP_ACP, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } int WINAPI lstrcmpiW(LPCWSTR str1, LPCWSTR str2) { + int ret; if (!str1 && !str2) return 0; if (!str1) return -1; if (!str2) return 1; - return CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ) - 2; + ret = CompareStringW( GetThreadLocale(), NORM_IGNORECASE, str1, -1, str2, -1 ); + if (ret) ret -= 2; + + return ret; } LPSTR WINAPI KERNELBASE_lstrcpynA( LPSTR dst, LPCSTR src, INT n ) -- 2.17.1

3 3

[PATCH] dwrite: Remove unused functions.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 8 -------- dlls/dwrite/font.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 679e1ed0ff..8e58e615e6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1394,14 +1394,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } -static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) -{ - FLOAT advance = 0.0f; - for (; start < end; start++) - advance += advances[start]; - return advance; -} - static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, unsigned int start, unsigned int end, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, DWRITE_SHAPING_GLYPH_PROPERTIES const *glyph_props, float *modified_advances, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4abc7ee6..3f11b1d3ad 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5123,11 +5123,6 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return S_OK; } -static inline int get_dib_stride( int width, int bpp ) -{ - return ((width * bpp + 31) >> 3) & ~3; -} - static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const RECT *runbounds, const RECT *bounds) { if (type == DWRITE_TEXTURE_CLEARTYPE_3x1) -- 2.20.1

2 1

[PATCH] strmbase: Remove unused function.
by Nikolay Sivov July 2, 2019

July 2, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/strmbase/pin.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ebc7a1c16b..4478855ed7 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -347,11 +347,6 @@ static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); -- 2.20.1

1 0

[PATCH 1/5] strmbase: Remove unused "ThreadSignal" event.
by Zebediah Figura July 2, 2019

July 2, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/renderer.c | 7 ------- include/wine/strmbase.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index e295e32f669..ee0473478ba 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -737,7 +737,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) ResetEvent(This->blocked); ResetEvent(This->renderer.RenderEvent); } - ResetEvent(This->renderer.ThreadSignal); LeaveCriticalSection(&This->renderer.csRenderLock); return hr; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index b35011ec641..fa4f0f3c93f 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -281,7 +281,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); filter->pMediaSample = NULL; @@ -306,7 +305,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->evComplete); - CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); @@ -418,7 +416,6 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); - SetEvent(This->ThreadSignal); SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -438,7 +435,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); - ResetEvent(This->ThreadSignal); if (This->sink.pin.pConnectedTo) { @@ -496,7 +492,6 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) This->filter.state = State_Paused; } } - ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -559,7 +554,6 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->ThreadSignal); SetEvent(iface->RenderEvent); return S_OK; } @@ -569,7 +563,6 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d3df095fde7..5892efcf197 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -541,7 +541,6 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; - HANDLE ThreadSignal; HANDLE RenderEvent; IMediaSample *pMediaSample; -- 2.22.0

2 9

[PATCH] ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT.
by Zebediah Figura July 2, 2019

July 2, 2019

From: Zebediah Figura <z.figura12(a)gmail.com> DataTransferLength specifies the number of bytes transferred, but sg_io_hdr_t.resid gives the number of bytes *not* transferred: https://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/x356.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47424 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4a3b84d4ad2..f6e3a86e34f 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1658,7 +1658,7 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); @@ -1842,7 +1842,7 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); -- 2.20.1

2 1

[PATCH 5/5] wined3d: Unhook swapchains in swapchain_cleanup().
by Henri Verbeet July 1, 2019

July 1, 2019

So that the hook is properly removed on failure in wined3d_swapchain_create(). This is a somewhat theoretical though, since in practice WINED3D_SWAPCHAIN_HOOK and WINED3D_SWAPCHAIN_IMPLICIT are never used together. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead1e83..9be6658c83d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -39,6 +39,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); + wined3d_unhook_swapchain(swapchain); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -121,7 +122,6 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) device = swapchain->device; if (device->swapchain_count && device->swapchains[0] == swapchain) wined3d_device_uninit_3d(device); - wined3d_unhook_swapchain(swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_ffp_fragment_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6fe7839d02..ed3ff541496 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9362,13 +9362,13 @@ static void shader_glsl_ffp_fragment_op(struct wined3d_string_buffer *buffer, un /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv *priv, - const struct ffp_frag_settings *settings, const struct wined3d_context *context) + const struct ffp_frag_settings *settings, const struct wined3d_context_gl *context_gl) { struct wined3d_string_buffer *tex_reg_name = string_buffer_get(&priv->string_buffers); enum wined3d_cmp_func alpha_test_func = settings->alpha_test_func + 1; struct wined3d_string_buffer *buffer = &priv->shader_buffer; BYTE lum_map = 0, bump_map = 0, tex_map = 0, tss_const_map = 0; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); BOOL tempreg_used = FALSE, tfactor_used = FALSE; UINT lowest_disabled_stage; @@ -9497,7 +9497,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (sampler_type) { if (shader_glsl_use_layout_binding_qualifier(gl_info)) - shader_glsl_append_sampler_binding_qualifier(buffer, context, NULL, stage); + shader_glsl_append_sampler_binding_qualifier(buffer, &context_gl->c, NULL, stage); shader_addline(buffer, "uniform sampler%s ps_sampler%u;\n", sampler_type, stage); } @@ -9795,6 +9795,7 @@ static struct glsl_ffp_vertex_shader *shader_glsl_find_ffp_vertex_shader(struct static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(struct shader_glsl_priv *priv, const struct ffp_frag_settings *args, const struct wined3d_context *context) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ffp_fragment_shader *glsl_desc; const struct ffp_frag_desc *desc; @@ -9805,7 +9806,7 @@ static struct glsl_ffp_fragment_shader *shader_glsl_find_ffp_fragment_shader(str return NULL; glsl_desc->entry.settings = *args; - glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context); + glsl_desc->id = shader_glsl_generate_ffp_fragment_shader(priv, args, context_gl); list_init(&glsl_desc->linked_programs); add_ffp_frag_shader(&priv->ffp_fragment_shaders, &glsl_desc->entry); -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_geometry_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a34de176b27..e6fe7839d02 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8633,10 +8633,9 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_geometry_shader(const struct wined3d_context *context, +static GLuint find_glsl_geometry_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct gs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_gs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10174,7 +10173,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct gs_compile_args args; find_gs_compile_args(state, gshader, &args, context); - gs_id = find_glsl_geometry_shader(context, priv, gshader, &args); + gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } /* A pixel shader is not used when rasterization is disabled. */ -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_domain_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 92a95865f6d..a34de176b27 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8578,10 +8578,9 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, return ret; } -static GLuint find_glsl_domain_shader(const struct wined3d_context *context, +static GLuint find_glsl_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -10162,7 +10161,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct ds_compile_args args; find_ds_compile_args(state, dshader, &args, context); - ds_id = find_glsl_domain_shader(context, priv, dshader, &args); + ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to find_glsl_hull_shader().
by Henri Verbeet July 1, 2019

July 1, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8023f7bd2ff..92a95865f6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8533,10 +8533,9 @@ static GLuint find_glsl_vertex_shader(const struct wined3d_context_gl *context_g return ret; } -static GLuint find_glsl_hull_shader(const struct wined3d_context *context, +static GLuint find_glsl_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -10151,7 +10150,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) - hs_id = find_glsl_hull_shader(context, priv, hshader); + hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) -- 2.11.0

1 0

[PATCH v2] user32: Do not call SendMessage() to show a window that is already visible.
by Alexey Prokhin July 1, 2019

July 1, 2019

Based on a patch made by Kimmo Myllyvirta. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39731 Signed-off-by: Alexey Prokhin <alexey(a)prokhin.ru> --- v2: handle all ShowWindow commands, add a better test case. Supersede 166154 --- dlls/user32/tests/msg.c | 116 ++++++++++++++++++++++++++++++---------- dlls/user32/winpos.c | 64 +++++++++++++++++++--- 2 files changed, 146 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index a5bc1c5518..8aa00d5ba0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5041,16 +5041,6 @@ static void test_WM_DEVICECHANGE(HWND hwnd) } } -static DWORD CALLBACK show_window_thread(LPVOID arg) -{ - HWND hwnd = arg; - - /* function will not return if ShowWindow(SW_HIDE) calls SendMessage() */ - ok(ShowWindow(hwnd, SW_HIDE) == FALSE, "ShowWindow(SW_HIDE) expected FALSE\n"); - - return 0; -} - /* Helper function to easier test SetWindowPos messages */ #define test_msg_setpos( expected_list, flags, todo ) \ test_msg_setpos_( (expected_list), (flags), (todo), __FILE__, __LINE__) @@ -5071,8 +5061,6 @@ static void test_msg_setpos_(const struct message *expected_list, UINT flags, BO /* test if we receive the right sequence of messages */ static void test_messages(void) { - DWORD tid; - HANDLE hthread; HWND hwnd, hparent, hchild; HWND hchild2, hbutton; HMENU hmenu; @@ -5111,14 +5099,6 @@ static void test_messages(void) flush_events(); ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - /* test ShowWindow(SW_HIDE) on a hidden window - multi-threaded */ - hthread = CreateThread(NULL, 0, show_window_thread, hwnd, 0, &tid); - ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); - ok(WaitForSingleObject(hthread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); - CloseHandle(hthread); - flush_events(); - ok_sequence(WmEmptySeq, "ShowWindow(SW_HIDE):overlapped", FALSE); - ShowWindow(hwnd, SW_SHOW); flush_events(); ok_sequence(WmShowOverlappedSeq, "ShowWindow(SW_SHOW):overlapped", TRUE); @@ -13180,6 +13160,14 @@ static const struct message WmShowMaximized_3[] = { { 0 } }; +static const char * const sw_cmd_name[13] = +{ + "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", + "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", + "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", + "SW_NORMALNA" /* 0xCC */ +}; + static void test_ShowWindow(void) { /* ShowWindow commands in random order */ @@ -13366,13 +13354,6 @@ static void test_ShowWindow(void) for (i = 0; i < ARRAY_SIZE(sw); i++) { - static const char * const sw_cmd_name[13] = - { - "SW_HIDE", "SW_SHOWNORMAL", "SW_SHOWMINIMIZED", "SW_SHOWMAXIMIZED", - "SW_SHOWNOACTIVATE", "SW_SHOW", "SW_MINIMIZE", "SW_SHOWMINNOACTIVE", - "SW_SHOWNA", "SW_RESTORE", "SW_SHOWDEFAULT", "SW_FORCEMINIMIZE", - "SW_NORMALNA" /* 0xCC */ - }; char comment[64]; INT idx; /* index into the above array of names */ @@ -13421,6 +13402,86 @@ if (0) /* FIXME: Wine behaves completely different here */ flush_events(); } +struct show_window_thread_data +{ + const char *comment; + HWND hwnd; + int cmd; + BOOL ret; +}; + +static DWORD CALLBACK show_window_thread(LPVOID arg) +{ + struct show_window_thread_data *d = arg; + BOOL ret; + + /* function will not return if ShowWindow() calls SendMessage() */ + ret = ShowWindow(d->hwnd, d->cmd); + ok(!ret == !d->ret, "%s: expected ret %u, got %u\n", d->comment, d->ret, ret); + + return 0; +} + +static void test_ShowWindow_multithreaded(void) +{ + static const struct + { + INT initial_cmd; /* ShowWindow command to apply before the test */ + INT cmd; /* ShowWindow command to apply in a thread */ + BOOL ret; /* ShowWindow return value */ + } sw[] = { + { SW_HIDE, SW_HIDE, FALSE }, + { SW_RESTORE, SW_SHOW, TRUE }, + { SW_RESTORE, SW_SHOWNOACTIVATE, TRUE }, + { SW_RESTORE, SW_RESTORE, TRUE }, + { SW_RESTORE, SW_SHOWNORMAL, TRUE }, + { SW_RESTORE, SW_SHOWDEFAULT, TRUE }, + { SW_MINIMIZE, SW_SHOW, TRUE }, + { SW_MINIMIZE, SW_SHOWMINNOACTIVE, TRUE }, + { SW_MINIMIZE, SW_MINIMIZE, TRUE }, + { SW_MINIMIZE, SW_SHOWMINIMIZED, TRUE }, + { SW_MINIMIZE, SW_FORCEMINIMIZE, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOW, TRUE }, + { SW_SHOWMAXIMIZED, SW_SHOWMAXIMIZED, TRUE }, + }; + + DWORD tid; + HANDLE hthread; + HWND hwnd; + int i; + struct show_window_thread_data swtd; + + hwnd = CreateWindowExA(0, "ShowWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 120, 120, 90, 90, + 0, 0, 0, NULL); + assert(hwnd); + + for (i = 0; i < ARRAY_SIZE(sw); ++i) + { + char comment[64]; + sprintf(comment, "%d: ShowWindow(%s)", i+1, sw_cmd_name[sw[i].cmd]); + + ShowWindow(hwnd, sw[i].initial_cmd); + flush_events(); + flush_sequence(); + + swtd.comment = comment; + swtd.hwnd = hwnd; + swtd.cmd = sw[i].cmd; + swtd.ret = sw[i].ret; + hthread = CreateThread(NULL, 0, show_window_thread, &swtd, 0, &tid); + ok(hthread != NULL, "%d: CreateThread failed, error %d\n", i, GetLastError()); + ok(WaitForSingleObject(hthread, 3000) == WAIT_OBJECT_0, "%d: WaitForSingleObject failed\n", i); + CloseHandle(hthread); + + flush_events(); + ok_sequence(WmOptionalPaint, comment, FALSE); + } + + DestroyWindow(hwnd); + flush_events(); +} + static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { struct recvd_message msg; @@ -17748,6 +17809,7 @@ START_TEST(msg) test_PostMessage(); test_broadcast(); test_ShowWindow(); + test_ShowWindow_multithreaded(); test_PeekMessage(); test_PeekMessage2(); test_PeekMessage3(); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5837c179e4..96f86c4aeb 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1032,6 +1032,51 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) return swpFlags; } +/*********************************************************************** + * is_window_state_changed + * + * A helper function for ShowWindow and ShowWindowAsync for checking if + * a window already has the requested style. + */ +static BOOL is_window_state_changed( LONG style, INT cmd ) +{ + BOOL is_visible = (style & WS_VISIBLE) != 0; + + switch (cmd) { + case SW_HIDE: + if (!is_visible) + return FALSE; + break; + case SW_SHOW: + if (is_visible) + return FALSE; + break; + case SW_SHOWMINNOACTIVE: + case SW_MINIMIZE: + case SW_FORCEMINIMIZE: + case SW_SHOWMINIMIZED: + if (is_visible && (style & WS_MINIMIZE)) + return FALSE; + break; + case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ + if (is_visible && (style & WS_MAXIMIZE)) + return FALSE; + break; + case SW_SHOWNA: + break; + case SW_SHOWNOACTIVATE: + case SW_RESTORE: + case SW_SHOWNORMAL: /* same as SW_NORMAL: */ + case SW_SHOWDEFAULT: + if (is_visible && !(style & (WS_MINIMIZE | WS_MAXIMIZE))) + return FALSE; + break; + default: + return FALSE; + } + + return TRUE; +} /*********************************************************************** * show_window @@ -1056,7 +1101,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) switch(cmd) { case SW_HIDE: - if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1070,14 +1114,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1085,7 +1127,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1105,7 +1146,6 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1114,6 +1154,9 @@ static BOOL show_window( HWND hwnd, INT cmd ) goto done; } + if (!is_window_state_changed( style, cmd )) + goto done; + if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); @@ -1199,6 +1242,7 @@ done: BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1209,6 +1253,10 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; + return SendNotifyMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } @@ -1219,6 +1267,7 @@ BOOL WINAPI ShowWindowAsync( HWND hwnd, INT cmd ) BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) { HWND full_handle; + LONG style; if (is_broadcast(hwnd)) { @@ -1228,8 +1277,9 @@ BOOL WINAPI ShowWindow( HWND hwnd, INT cmd ) if ((full_handle = WIN_IsCurrentThread( hwnd ))) return show_window( full_handle, cmd ); - if ((cmd == SW_HIDE) && !(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) - return FALSE; + style = GetWindowLongW( hwnd, GWL_STYLE ); + if (!is_window_state_changed( style, cmd )) + return (style & WS_VISIBLE) != 0; return SendMessageW( hwnd, WM_WINE_SHOWWINDOW, cmd, 0 ); } -- 2.17.2 (Apple Git-113)

2 1

[PATCH 7/7] mshtml: Include URL pathname and query in test traces.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/script.c | 22 +++++++++++----------- dlls/mshtml/tests/winetest.js | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 14 deletions(-)

2 1

[PATCH 6/7] mshtml/tests: Improve tests exception handling.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/winetest.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

2 1

[PATCH 5/7] mshtml/tests: Rename elements.js to dom.js.
by Jacek Caban July 1, 2019

July 1, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/{elements.js => dom.js} | 0 dlls/mshtml/tests/rsrc.rc | 4 ++-- dlls/mshtml/tests/script.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename dlls/mshtml/tests/{elements.js => dom.js} (100%)

2 1

[PATCH 4/7] mshtml: Add IHTMLDOMRange stub.
by Jacek Caban July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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 July 1, 2019

July 1, 2019

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

[PATCH] mfplat: Trace MF_PD_DURATION guid.
by Nikolay Sivov July 1, 2019

July 1, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 1 + include/mfidl.idl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 45d1677b9b..eec54ae3f6 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -641,6 +641,7 @@ const char *debugstr_attr(const GUID *guid) X(MF_MT_AUDIO_BLOCK_ALIGNMENT), X(MF_PD_PMPHOST_CONTEXT), X(MF_PD_APP_CONTEXT), + X(MF_PD_DURATION), X(MF_PD_TOTAL_FILE_SIZE), X(MF_PD_AUDIO_ENCODING_BITRATE), X(MF_PD_VIDEO_ENCODING_BITRATE), diff --git a/include/mfidl.idl b/include/mfidl.idl index 66a84771a7..1ed63bea12 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -761,9 +761,9 @@ cpp_quote("EXTERN_GUID(MF_SD_MUTUALLY_EXCLUSIVE, 0x023ef79c, 0x388d, 0x487f cpp_quote("EXTERN_GUID(MF_SD_PROTECTED, 0x00af2181, 0xbdc2, 0x423c, 0xab, 0xca, 0xf5, 0x03, 0x59, 0x3b, 0xc1, 0x21);") cpp_quote("EXTERN_GUID(MF_SD_STREAM_NAME, 0x4f1b099d, 0xd314, 0x41e5, 0xa7, 0x81, 0x7f, 0xef, 0xaa, 0x4c, 0x50, 0x1f);") cpp_quote("EXTERN_GUID(MF_SD_SAMI_LANGUAGE, 0x36fcb98a, 0x6cd0, 0x44cb, 0xac, 0xb9, 0xa8, 0xf5, 0x60, 0x0d, 0xd0, 0xbb);") - cpp_quote("EXTERN_GUID(MF_PD_PMPHOST_CONTEXT, 0x6c990d31, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_APP_CONTEXT, 0x6c990d32, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") +cpp_quote("EXTERN_GUID(MF_PD_DURATION, 0x6c990d33, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_TOTAL_FILE_SIZE, 0x6c990d34, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_AUDIO_ENCODING_BITRATE, 0x6c990d35, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") cpp_quote("EXTERN_GUID(MF_PD_VIDEO_ENCODING_BITRATE, 0x6c990d36, 0xbb8e, 0x477a, 0x85, 0x98, 0x0d, 0x5d, 0x96, 0xfc, 0xd8, 0x8a);") -- 2.20.1

1 0

[PATCH 1/3] user32/tests: Use SendInput() directly.
by Nikolay Sivov July 1, 2019

July 1, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/input.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 4a9be550bd..78d1e54588 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -76,7 +76,6 @@ static struct { BOOL sendinput_broken; } key_status; -static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); @@ -163,7 +162,6 @@ static void init_function_pointers(void) if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ trace("GetProcAddress(%s) failed\n", #func) - GET_PROC(SendInput); GET_PROC(GetCurrentInputMessageSource); GET_PROC(GetMouseMovePointsEx); GET_PROC(GetPointerType); @@ -249,7 +247,7 @@ static BOOL do_test( HWND hwnd, int seqnr, const KEV td[] ) for( kmctr = 0; kmctr < MAXKEYEVENTS && expmsg[kmctr].message; kmctr++) ; ok( evtctr <= MAXKEYEVENTS, "evtctr is above MAXKEYEVENTS\n" ); - if( evtctr != pSendInput(evtctr, &inputs[0], sizeof(INPUT))) + if( evtctr != SendInput(evtctr, &inputs[0], sizeof(INPUT))) ok (FALSE, "SendInput failed to send some events\n"); i = 0; if (winetest_debug > 1) @@ -954,7 +952,7 @@ static void test_Input_blackbox(void) i.u.ki.wScan = ii+1 /* useful for debugging */; i.u.ki.dwFlags = sendinput_test[ii].dwFlags; i.u.ki.wVk = sendinput_test[ii].wVk; - pSendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); + SendInput(1, (INPUT*)&i, sizeof(TEST_INPUT)); empty_message_queue(); GetKeyboardState(ks2); compare_and_check(ii, ks1, ks2, &sendinput_test[ii], foreground); @@ -997,7 +995,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; reset_key_status(); - pSendInput(1, (INPUT*)inputs, sizeof(INPUT)); + SendInput(1, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1019,7 +1017,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) inputs[1].u.ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP; reset_key_status(); - pSendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); + SendInput(1, (INPUT*)(inputs+1), sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_KEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1045,7 +1043,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -1072,7 +1070,7 @@ static void test_unicode_keys(HWND hwnd, HHOOK hook) reset_key_status(); key_status.expect_alt = TRUE; - pSendInput(2, (INPUT*)inputs, sizeof(INPUT)); + SendInput(2, (INPUT*)inputs, sizeof(INPUT)); while(PeekMessageW(&msg, hwnd, 0, 0, PM_REMOVE)){ if(msg.message == WM_SYSKEYDOWN && msg.wParam == VK_PACKET){ TranslateMessage(&msg); @@ -2758,7 +2756,7 @@ static void test_input_message_source(void) SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); SendMessageA( hwnd, WM_MOUSEMOVE, 0, 0 ); - pSendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); + SendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) { expect_src.deviceType = IMDT_KEYBOARD; @@ -2834,15 +2832,10 @@ START_TEST(input) init_function_pointers(); GetCursorPos( &pos ); - if (pSendInput) - { - test_Input_blackbox(); - test_Input_whitebox(); - test_Input_unicode(); - test_Input_mouse(); - } - else win_skip("SendInput is not available\n"); - + test_Input_blackbox(); + test_Input_whitebox(); + test_Input_unicode(); + test_Input_mouse(); test_keynames(); test_mouse_ll_hook(); test_key_map(); -- 2.20.1

1 2

[PATCH] msi: Close all handles opened by a custom action thread.
by Zebediah Figura July 1, 2019

July 1, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47418 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/custom.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 03f9b085c04..b864270690b 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -580,7 +580,8 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) midl_user_free(dll); midl_user_free(proc); - MsiCloseHandle(hPackage); + + MsiCloseAllHandles(); return r; } -- 2.22.0

2 1

[PATCH] ntdll: Add '-norelay' flag for _vsnprintf().
by Dmitry Timoshkov July 1, 2019

July 1, 2019

Otherwise for instance +relay,+ver log has ver: traces completely messed up. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0ec7b56c2b..94bc52cc14 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1419,7 +1419,7 @@ @ cdecl _ui64tow(int64 ptr long) @ cdecl _ultoa(long ptr long) @ cdecl _ultow(long ptr long) -@ cdecl _vsnprintf(ptr long str ptr) NTDLL__vsnprintf +@ cdecl -norelay _vsnprintf(ptr long str ptr) NTDLL__vsnprintf @ cdecl _vsnwprintf(ptr long wstr ptr) NTDLL__vsnwprintf @ cdecl _wcsicmp(wstr wstr) NTDLL__wcsicmp @ cdecl _wcslwr(wstr) NTDLL__wcslwr -- 2.20.1

1 0