June 2020 - Wine-devel - list.winehq.org

[PATCH 1/3] winex11.drv: Change slave to a more neutral word
by André Hentschel 18 Jun '20

18 Jun '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/winex11.drv/xrandr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index f61a5b190e9..a42b3c274ca 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -946,7 +946,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new if (!output_info->crtc || !crtc_info->mode) detached = TRUE; - /* Ignore mirroring output slaves because mirrored monitors are under the same adapter */ + /* Ignore mirroring output replicas because mirrored monitors are under the same adapter */ mirrored = FALSE; if (!detached) { @@ -968,7 +968,7 @@ static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new continue; /* Some outputs may have the same coordinates, aka mirrored. Choose the output with - * the lowest value as primary and the rest will then be slaves in a mirroring set */ + * the lowest value as primary and the rest will then be replicas in a mirroring set */ if (crtc_info->x == enum_crtc_info->x && crtc_info->y == enum_crtc_info->y && crtc_info->width == enum_crtc_info->width && @@ -1077,7 +1077,7 @@ static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor * goto done; } - /* Inactive but attached monitor, no need to check for mirrored/slave monitors */ + /* Inactive but attached monitor, no need to check for mirrored/replica monitors */ if (!output_info->crtc || !crtc_info->mode) { lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); -- 2.17.1

1 2

[PATCH V2 2/2] kernel32: Modify the mechanism that obtain the thread order of the toolhelp module , so that the thread order obtained is consistent with windows.
by Yu Changping 18 Jun '20

18 Jun '20

2 1

[PATCH V2 2/2] Modify the mechanism that obtain the thread order of the toolhelp module , so that the thread order obtained is consistent with windows.
by Yu Changping 18 Jun '20

18 Jun '20

2 1

[PATCH V2 1/2] kernel32/tests: Add tests for getting main thread id by toolhelp.
by Yu Changping 18 Jun '20

18 Jun '20

2 1

[PATCH 2/2] gdi32: Add support for GCP_USEKERNING to GetCharacterPlacement.
by Dmitry Timoshkov 18 Jun '20

18 Jun '20

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/gdi32/font.c | 77 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 74 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cc366eb4d7..4006da98a9 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -3278,6 +3278,55 @@ GetCharacterPlacementA(HDC hdc, LPCSTR lpString, INT uCount, return ret; } +static int kern_pair(const KERNINGPAIR *kern, int count, WCHAR c1, WCHAR c2) +{ + int i; + + for (i = 0; i < count; i++) + { + if (kern[i].wFirst == c1 && kern[i].wSecond == c2) + return kern[i].iKernAmount; + } + + return 0; +} + +static int *kern_string(HDC hdc, const WCHAR *str, int len, int *kern_total) +{ + int i, count; + KERNINGPAIR *kern = NULL; + int *ret; + + *kern_total = 0; + + ret = heap_alloc(len * sizeof(*ret)); + if (!ret) return NULL; + + count = GetKerningPairsW(hdc, 0, NULL); + if (count) + { + kern = heap_alloc(count * sizeof(*kern)); + if (!kern) + { + heap_free(ret); + return NULL; + } + + GetKerningPairsW(hdc, count, kern); + } + + for (i = 0; i < len - 1; i++) + { + ret[i] = kern_pair(kern, count, str[i], str[i + 1]); + *kern_total += ret[i]; + } + + ret[len - 1] = 0; /* no kerning for last element */ + + heap_free(kern); + return ret; +} + /************************************************************************* * GetCharacterPlacementW [GDI32.@] * @@ -3310,6 +3359,7 @@ GetCharacterPlacementW( SIZE size; UINT i, nSet; WCHAR *norm = NULL; + int *kern = NULL, kern_total = 0; TRACE("%s, %d, %d, 0x%08x\n", debugstr_wn(lpString, uCount), uCount, nMaxExtent, dwFlags); @@ -3326,7 +3376,7 @@ GetCharacterPlacementW( lpResults->lpDx, lpResults->lpCaretPos, lpResults->lpClass, lpResults->lpGlyphs, lpResults->nGlyphs, lpResults->nMaxFit); - if (dwFlags & ~(GCP_REORDER | GCP_LIGATE)) + if (dwFlags & ~(GCP_REORDER | GCP_LIGATE | GCP_USEKERNING)) FIXME("flags 0x%08x ignored\n", dwFlags); if(lpResults->lpClass) FIXME("classes not implemented\n"); @@ -3378,6 +3428,17 @@ GetCharacterPlacementW( nSet, lpResults->lpOrder, NULL, NULL ); } + if (dwFlags & GCP_USEKERNING) + { + kern = kern_string(hdc, lpString, nSet, &kern_total); + if (!kern) + { + heap_free(norm); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } + } + /* FIXME: Will use the placement chars */ if (lpResults->lpDx) { @@ -3385,7 +3446,11 @@ GetCharacterPlacementW( for (i = 0; i < nSet; i++) { if (GetCharWidth32W(hdc, lpString[i], lpString[i], &c)) - lpResults->lpDx[i]= c; + { + lpResults->lpDx[i] = c; + if (dwFlags & GCP_USEKERNING) + lpResults->lpDx[i] += kern[i]; + } } } @@ -3395,17 +3460,23 @@ GetCharacterPlacementW( lpResults->lpCaretPos[0] = 0; for (i = 1; i < nSet; i++) + { + if (dwFlags & GCP_USEKERNING) + pos += kern[i]; + if (GetTextExtentPoint32W(hdc, &(lpString[i - 1]), 1, &size)) lpResults->lpCaretPos[i] = (pos += size.cx); + } } if(lpResults->lpGlyphs) GetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0); if (GetTextExtentPoint32W(hdc, lpString, uCount, &size)) - ret = MAKELONG(size.cx, size.cy); + ret = MAKELONG(size.cx + kern_total, size.cy); heap_free(norm); + heap_free(kern); return ret; } -- 2.26.2

1 0

[PATCH v3 3/3] winevulkan: Fill Vulkan device LUID property.
by Zhiyi Zhang 17 Jun '20

17 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 6 ++- dlls/winevulkan/Makefile.in | 2 +- dlls/winevulkan/vulkan.c | 79 ++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 63fd48b33d3..6f9e9f115c0 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -212,7 +212,11 @@ static void test_enumerate_physical_device2(void) trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); - todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + /* If deviceLUIDValid is VK_TRUE, deviceNodeMask must contain exactly one bit according + * to the Vulkan specification */ + ok(id.deviceNodeMask && !(id.deviceNodeMask & (id.deviceNodeMask - 1)), + "Expect deviceNodeMask to have only one bit set, got %#x.\n", id.deviceNodeMask); } } diff --git a/dlls/winevulkan/Makefile.in b/dlls/winevulkan/Makefile.in index 251de5c68e5..f95a1e3113a 100644 --- a/dlls/winevulkan/Makefile.in +++ b/dlls/winevulkan/Makefile.in @@ -1,6 +1,6 @@ MODULE = winevulkan.dll IMPORTLIB = winevulkan -IMPORTS = user32 gdi32 advapi32 +IMPORTS = user32 gdi32 advapi32 setupapi C_SRCS = \ vulkan.c \ diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index e67c398f604..eb22e72ae36 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -23,11 +23,17 @@ #include "winbase.h" #include "winreg.h" #include "winuser.h" +#include "initguid.h" +#include "devguid.h" +#include "setupapi.h" #include "vulkan_private.h" WINE_DEFAULT_DEBUG_CHANNEL(vulkan); +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); + /* For now default to 4 as it felt like a reasonable version feature wise to support. * Don't support the optional vk_icdGetPhysicalDeviceProcAddr introduced in this version * as it is unlikely we will implement physical device extensions, which the loader is not @@ -1245,12 +1251,84 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi return res; } +static HANDLE get_display_device_init_mutex(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 = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Wait until graphics driver is loaded by explorer */ +static void wait_graphics_driver_ready(void) +{ + static BOOL ready = FALSE; + + if (!ready) + { + SendMessageW(GetDesktopWindow(), WM_NULL, 0, 0); + ready = TRUE; + } +} + +static void fill_luid_property(VkPhysicalDeviceProperties2 *properties2) +{ + static const WCHAR pci[] = {'P','C','I',0}; + VkPhysicalDeviceIDProperties *id; + SP_DEVINFO_DATA device_data; + DWORD type, device_idx = 0; + HDEVINFO devinfo; + HANDLE mutex; + GUID uuid; + LUID luid; + + if (!(id = wine_vk_find_struct(properties2, PHYSICAL_DEVICE_ID_PROPERTIES))) + return; + + wait_graphics_driver_ready(); + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_DISPLAY, pci, NULL, 0); + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo(devinfo, device_idx++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + &type, (BYTE *)&uuid, sizeof(uuid), NULL, 0)) + continue; + + if (!IsEqualGUID(&uuid, id->deviceUUID)) + continue; + + if (SetupDiGetDevicePropertyW(devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)&luid, sizeof(luid), NULL, 0)) + { + memcpy(&id->deviceLUID, &luid, sizeof(id->deviceLUID)); + id->deviceLUIDValid = VK_TRUE; + id->deviceNodeMask = 1; + break; + } + } + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + + TRACE("deviceName:%s deviceLUIDValid:%d LUID:%08x:%08x deviceNodeMask:%#x.\n", + properties2->properties.deviceName, id->deviceLUIDValid, luid.HighPart, luid.LowPart, + id->deviceNodeMask); +} + void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties2) { TRACE("%p, %p\n", phys_dev, properties2); thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); + fill_luid_property(properties2); } void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, @@ -1259,6 +1337,7 @@ void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, TRACE("%p, %p\n", phys_dev, properties2); thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); + fill_luid_property(properties2); } void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, -- 2.25.1

3 2

[PATCH v3 2/3] winevulkan: Thunk vkGetPhysicalDeviceProperties2 and vkGetPhysicalDeviceProperties2KHR.
by Zhiyi Zhang 17 Jun '20

17 Jun '20

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 2 ++ dlls/winevulkan/vulkan.c | 16 ++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 10 ++-------- dlls/winevulkan/vulkan_thunks.h | 4 ++++ 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 1dee769836f..e0a9267bf75 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -165,6 +165,8 @@ FUNCTION_OVERRIDES = { "vkGetPhysicalDeviceExternalFenceProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalSemaphoreProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceImageFormatProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, + "vkGetPhysicalDeviceProperties2KHR" : {"dispatch" : True, "driver" : False, "thunk" : True, "private_thunk" : True}, # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2779f626a17..e67c398f604 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1245,6 +1245,22 @@ VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevi return res; } +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2(phys_dev, properties2); +} + +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, + VkPhysicalDeviceProperties2 *properties2) +{ + TRACE("%p, %p\n", phys_dev, properties2); + + thunk_vkGetPhysicalDeviceProperties2KHR(phys_dev, properties2); +} + void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice phys_dev, const VkPhysicalDeviceExternalSemaphoreInfo *semaphore_info, VkExternalSemaphoreProperties *properties) { diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 8811fbbb8a5..f1d24086cec 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -4787,34 +4787,28 @@ void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physicalDevice, #endif } -void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2(physicalDevice->phys_dev, pProperties); #endif } -static void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) { #if defined(USE_STRUCT_CONVERSION) VkPhysicalDeviceProperties2_host pProperties_host; - TRACE("%p, %p\n", physicalDevice, pProperties); - convert_VkPhysicalDeviceProperties2_win_to_host(pProperties, &pProperties_host); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, &pProperties_host); convert_VkPhysicalDeviceProperties2_host_to_win(&pProperties_host, pProperties); #else - TRACE("%p, %p\n", physicalDevice, pProperties); physicalDevice->instance->funcs.p_vkGetPhysicalDeviceProperties2KHR(physicalDevice->phys_dev, pProperties); #endif } diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index b977cca3e34..60d3676f32b 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -64,11 +64,15 @@ void WINAPI wine_vkGetPhysicalDeviceExternalSemaphoreProperties(VkPhysicalDevice void WINAPI wine_vkGetPhysicalDeviceExternalSemaphorePropertiesKHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceExternalSemaphoreInfo *pExternalSemaphoreInfo, VkExternalSemaphoreProperties *pExternalSemaphoreProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties); VkResult WINAPI wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void WINAPI wine_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties); +void WINAPI wine_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo *pSubmits, VkFence fence); /* Private thunks */ VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; VkResult thunk_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceImageFormatInfo2 *pImageFormatInfo, VkImageFormatProperties2 *pImageFormatProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; +void thunk_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice physicalDevice, VkPhysicalDeviceProperties2 *pProperties) DECLSPEC_HIDDEN; typedef struct VkAcquireNextImageInfoKHR_host { -- 2.25.1

3 2

[PATCH v3 1/3] winex11.drv: Add a Vulkan UUID property for GPUs.
by Zhiyi Zhang 17 Jun '20

17 Jun '20

A Vulkan UUID property is used to find the corresponding GPU in SetupAPI. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 186882~186885. Fill LUID in winevulkan instead of in user graphics drivers. Thanks to Brendan. v3: Supersede 187096~187098. Update comments. Thanks to Liam. dlls/winex11.drv/display.c | 15 ++++-- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xrandr.c | 99 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 1dedf32a52f..a6fe23ea68a 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -43,7 +43,8 @@ DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0 DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_GPU_LUID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 1); DEFINE_DEVPROPKEY(DEVPROPKEY_MONITOR_OUTPUT_ID, 0xca085853, 0x16ce, 0x48aa, 0xb1, 0x14, 0xde, 0x9c, 0x72, 0x33, 0x42, 0x23, 2); -/* Wine specific monitor properties */ +/* Wine specific properties */ +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_VULKAN_UUID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_STATEFLAGS, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 2); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCMONITOR, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 3); DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 4); @@ -337,6 +338,8 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g BOOL ret = FALSE; FILETIME filetime; + TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); + sprintfW(instanceW, gpu_instance_fmtW, gpu->vendor_id, gpu->device_id, gpu->subsys_id, gpu->revision_id, gpu_index); if (!SetupDiOpenDeviceInfoW(devinfo, instanceW, NULL, 0, &device_data)) { @@ -369,8 +372,14 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } *gpu_luid = luid; - TRACE("GPU id:0x%s name:%s LUID:%08x:%08x.\n", wine_dbgstr_longlong(gpu->id), - wine_dbgstr_w(gpu->name), luid.HighPart, luid.LowPart); + TRACE("LUID:%08x:%08x.\n", luid.HighPart, luid.LowPart); + + /* Write WINE_DEVPROPKEY_GPU_VULKAN_UUID property */ + if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_GPU_VULKAN_UUID, + DEVPROP_TYPE_GUID, (const BYTE *)&gpu->vulkan_uuid, + sizeof(gpu->vulkan_uuid), 0)) + goto done; + TRACE("Vulkan UUID:%s.\n", wine_dbgstr_guid(&gpu->vulkan_uuid)); /* Open driver key. * This is where HKLM\System\CurrentControlSet\Control\Video\{GPU GUID}\{Adapter Index} links to */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a9eaed20cab..cfce09bf11d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -690,6 +690,8 @@ struct x11drv_gpu UINT device_id; UINT subsys_id; UINT revision_id; + /* Vulkan device UUID */ + GUID vulkan_uuid; }; /* Represent an adapter in EnumDisplayDevices context */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 76e76806c55..f61a5b190e9 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -35,8 +35,13 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/extensions/Xrandr.h> #include "x11drv.h" +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST + #include "wine/heap.h" #include "wine/unicode.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" static void *xrandr_handle; @@ -680,6 +685,99 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) crtc->y + crtc->height == primary.bottom; } +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) + +static void get_vulkan_device_uuid( GUID *uuid, const XRRProviderInfo *provider_info ) +{ + static const char *extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + "VK_EXT_acquire_xlib_display", + "VK_EXT_direct_mode_display", + }; + const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); + VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + PFN_vkGetPhysicalDeviceProperties2 pvkGetPhysicalDeviceProperties2; + PFN_vkEnumeratePhysicalDevices pvkEnumeratePhysicalDevices; + uint32_t device_count, device_idx, output_idx; + VkPhysicalDevice *vk_physical_devices = NULL; + VkPhysicalDeviceProperties2 properties2; + VkInstanceCreateInfo create_info; + VkPhysicalDeviceIDProperties id; + VkInstance vk_instance = NULL; + VkDisplayKHR vk_display; + VkResult vr; + + if (!vulkan_funcs) + goto done; + + memset( &create_info, 0, sizeof(create_info) ); + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + + vr = vulkan_funcs->p_vkCreateInstance( &create_info, NULL, &vk_instance ); + if (vr != VK_SUCCESS) + { + WARN("Failed to create a Vulkan instance, vr %d.\n", vr); + goto done; + } + +#define LOAD_VK_FUNC(f) \ + if (!(p##f = (void *)vulkan_funcs->p_vkGetInstanceProcAddr( vk_instance, #f ))) \ + { \ + WARN("Failed to load " #f ".\n"); \ + goto done; \ + } + + LOAD_VK_FUNC(vkEnumeratePhysicalDevices) + LOAD_VK_FUNC(vkGetPhysicalDeviceProperties2) + LOAD_VK_FUNC(vkGetRandROutputDisplayEXT) +#undef LOAD_VK_FUNC + + vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, NULL ); + if (vr != VK_SUCCESS || !device_count) + { + WARN("No Vulkan device found, vr %d, device_count %d.\n", vr, device_count); + goto done; + } + + if (!(vk_physical_devices = heap_calloc( device_count, sizeof(*vk_physical_devices) ))) + goto done; + + vr = pvkEnumeratePhysicalDevices( vk_instance, &device_count, vk_physical_devices ); + if (vr != VK_SUCCESS) + { + WARN("vkEnumeratePhysicalDevices failed, vr %d.\n", vr); + goto done; + } + + for (device_idx = 0; device_idx < device_count; ++device_idx) + { + for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) + { + vr = pvkGetRandROutputDisplayEXT( vk_physical_devices[device_idx], gdi_display, + provider_info->outputs[output_idx], &vk_display ); + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + continue; + + memset( &id, 0, sizeof(id) ); + id.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id; + + pvkGetPhysicalDeviceProperties2( vk_physical_devices[device_idx], &properties2 ); + memcpy( uuid, id.deviceUUID, sizeof(id.deviceUUID) ); + goto done; + } + } + +done: + heap_free( vk_physical_devices ); + if (vk_instance) + vulkan_funcs->p_vkDestroyInstance( vk_instance, NULL ); +} + static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; @@ -742,6 +840,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) } gpus[i].id = provider_resources->providers[i]; + get_vulkan_device_uuid( &gpus[i].vulkan_uuid, provider_info ); MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report * their PCI address in the name but many others don't */ -- 2.25.1

3 2

[PATCH] ntdll: Refine NtSetInformationThread ThreadHideFromDebugger stubs.
by Rémi Bernon 17 Jun '20

17 Jun '20

Call of Duty: Black Ops 3, does every one of these calls and is quite senstive to their outcome. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/thread.c | 13 +++++++++++++ 2 files changed, 40 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index cf3f7b9f6f2..eaf2f1a45b7 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -2346,6 +2346,7 @@ static void test_affinity(void) DWORD_PTR proc_affinity, thread_affinity; THREAD_BASIC_INFORMATION tbi; SYSTEM_INFO si; + ULONG dummy; GetSystemInfo(&si); status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessBasicInformation, &pbi, sizeof(pbi), NULL ); @@ -2450,6 +2451,32 @@ static void test_affinity(void) ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok( tbi.AffinityMask == (1 << si.dwNumberOfProcessors) - 1, "Unexpected thread affinity\n" ); + + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG) ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + status = pNtSetInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got %08x\n", status ); + status = pNtSetInformationThread( GetCurrentThread(), ThreadHideFromDebugger, NULL, 0 ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + if (status == STATUS_INVALID_INFO_CLASS) + win_skip("ThreadHideFromDebugger not available\n"); + else + { + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( (HANDLE)0xdeadbeef, ThreadHideFromDebugger, &dummy, sizeof(ULONG), NULL ); + ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status ); + dummy = 0; + status = NtQueryInformationThread( GetCurrentThread(), ThreadHideFromDebugger, &dummy, 1, NULL ); + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + if (status == STATUS_SUCCESS) ok( dummy == 1, "Expected dummy == 1, got %08x\n", dummy ); + } } static void test_NtGetCurrentProcessorNumber(void) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 18664030df5..6a73d6d3466 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -643,6 +643,8 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, { NTSTATUS status; + TRACE("(%p,%d,%p,%x,%p)\n", handle, class, data, length, ret_len); + switch(class) { case ThreadBasicInformation: @@ -860,6 +862,12 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, *ret_len = sizeof(*info) + desc_len; } return status; + case ThreadHideFromDebugger: + if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; + if (!data) return STATUS_ACCESS_VIOLATION; + *(BOOLEAN*)data = TRUE; + if (ret_len) *ret_len = sizeof(BOOLEAN); + return STATUS_SUCCESS; case ThreadPriority: case ThreadBasePriority: case ThreadImpersonationToken: @@ -885,6 +893,9 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, LPCVOID data, ULONG length ) { NTSTATUS status; + + TRACE("(%p,%d,%p,%x)\n", handle, class, data, length); + switch(class) { case ThreadZeroTlsCell: @@ -972,6 +983,8 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, } return status; case ThreadHideFromDebugger: + if (length) return STATUS_INFO_LENGTH_MISMATCH; + if (handle != GetCurrentThread()) return STATUS_INVALID_HANDLE; /* pretend the call succeeded to satisfy some code protectors */ return STATUS_SUCCESS; case ThreadQuerySetWin32StartAddress: -- 2.27.0

2 2

[PATCH 1/2] gdiplus/tests: Test that hatch fill uses rendering origin.
by Jeff Smith 17 Jun '20

17 Jun '20

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/gdiplus/tests/brush.c | 93 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 94 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index fca1c17057..8e0d7e9ca0 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1778,6 +1778,98 @@ static void test_hatchBrushStyles(void) ReleaseDC(hwnd, hdc); } +static void test_renderingOrigin(void) +{ + static const int width = 8, height = 8; + GpStatus status; + HDC hdc; + GpBitmap *bitmap; + GpGraphics *graphics_hdc; + GpGraphics *graphics_image; + GpHatch *brush; + BOOL match_hdc; + BOOL match_image; + static const INT tests[][2] = {{3, 6}, {-7, -4}}; + static const ARGB fore_color = 0xff000000; + static const ARGB back_color = 0xffffffff; + INT x, y; + int i; + + hdc = GetDC(hwnd); + GdipCreateFromHDC(hdc, &graphics_hdc); + + GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppRGB, NULL, &bitmap); + GdipGetImageGraphicsContext((GpImage *)bitmap, &graphics_image); + + GdipCreateHatchBrush(HatchStyleCross, fore_color, back_color, &brush); + + x = y = 0xdeadbeef; + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == 0 && y == 0, "Expected (%d, %d) got (%d, %d)\n", 0, 0, x, y); + x = y = 0xdeadbeef; + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == 0 && y == 0, "Expected (%d, %d) got (%d, %d)\n", 0, 0, x, y); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + const INT exp_x = ((tests[i][0] % 8) + 8) % 8; + const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + + status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); + expect(Ok, status); + status = GdipSetRenderingOrigin(graphics_hdc, tests[i][0], tests[i][1]); + expect(Ok, status); + + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == tests[i][0] && y == tests[i][1], "Expected (%d, %d) got (%d, %d)\n", + tests[i][0], tests[i][1], x, y); + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == tests[i][0] && y == tests[i][1], "Expected (%d, %d) got (%d, %d)\n", + tests[i][0], tests[i][1], x, y); + + GdipFillRectangleI(graphics_image, (GpBrush *)brush, 0, 0, width, height); + GdipFillRectangleI(graphics_hdc, (GpBrush *)brush, 0, 0, width, height); + + match_hdc = TRUE; + match_image = TRUE; + for (y = 0; y < height && (match_hdc || match_image); y++) + { + for (x = 0; x < width && (match_hdc || match_image); x++) + { + ARGB color; + const ARGB exp_color = (x == exp_x || y == exp_y) ? fore_color : back_color; + + color = COLORREF2ARGB(GetPixel(hdc, x, y)); + if (color != exp_color) + match_hdc = FALSE; + + GdipBitmapGetPixel(bitmap, x, y, &color); + if (color != exp_color) + match_image = FALSE; + } + } + todo_wine + { + ok(match_hdc, "Hatch brush rendered incorrectly on hdc with rendering origin (%d, %d).\n", + tests[i][0], tests[i][1]); + ok(match_image, "Hatch brush rendered incorrectly on image with rendering origin (%d, %d).\n", + tests[i][0], tests[i][1]); + } + } + + GdipDeleteBrush((GpBrush *)brush); + + GdipDeleteGraphics(graphics_image); + GdipDisposeImage((GpImage*)bitmap); + + GdipDeleteGraphics(graphics_hdc); + ReleaseDC(hwnd, hdc); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1831,6 +1923,7 @@ START_TEST(brush) test_pathgradientblend(); test_getHatchStyle(); test_hatchBrushStyles(); + test_renderingOrigin(); GdiplusShutdown(gdiplusToken); DestroyWindow(hwnd); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b7da5427d4..1526ce0338 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -258,6 +258,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); +GpStatus WINGDIPAPI GdipGetRenderingOrigin(GpGraphics*,INT*,INT*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*); -- 2.23.0

2 6