wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Jacek Caban : ntoskrnl.exe: Don' t add device to the list if IoCreateDevice fails.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 80d53026bf22a11aafaf3c4ba8fab6b1fe3b6cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80d53026bf22a11aafaf3c4b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 8 14:03:27 2019 +0200 ntoskrnl.exe: Don't add device to the list if IoCreateDevice fails. Spotted by Zebediah Figura. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1a74f1..804c7f6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1502,9 +1502,6 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, device->DeviceType = type; device->StackSize = 1; - device->NextDevice = driver->DeviceObject; - driver->DeviceObject = device; - SERVER_START_REQ( create_device ) { req->rootdir = 0; @@ -1521,6 +1518,9 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, return status; } + device->NextDevice = driver->DeviceObject; + driver->DeviceObject = device; + *ret_device = device; return STATUS_SUCCESS; }

1 0

Piotr Caban : dbghelp: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 061f65f9aaa5e6c9e34f407293906a2cc9033f0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=061f65f9aaa5e6c9e34f4072… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:40 2019 +0200 dbghelp: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 2 +- dlls/dbghelp/pe_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index adb66d6..54fbe36 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2684,7 +2684,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, { ptr = (const char*)imp + sizeof(*imp) + strlen(imp->filename); if (i >= CV_MAX_MODULES) FIXME("Out of bounds!!!\n"); - if (!strcasecmp(pdb_lookup->filename, imp->filename)) + if (!_strnicmp(pdb_lookup->filename, imp->filename, -1)) { if (module_index != -1) FIXME("Twice the entry\n"); else module_index = i; diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index c077c07..58530e7 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -127,7 +127,7 @@ BOOL pe_find_section(struct image_file_map* fmap, const char* name, sectname = memcpy(tmp, sectname, IMAGE_SIZEOF_SHORT_NAME); tmp[IMAGE_SIZEOF_SHORT_NAME] = '\0'; } - if (!strcasecmp(sectname, name)) + if (!_strnicmp(sectname, name, -1)) { ism->fmap = fmap; ism->sidx = i;

1 0

Piotr Caban : dinput: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: e7d1107f320285b1182ba2e9cdcbd13a6bdfe9b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7d1107f320285b1182ba2e9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:32 2019 +0200 dinput: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/mouse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7133359..141b922 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -28,6 +28,7 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" +#include "winternl.h" #include "winuser.h" #include "winerror.h" #include "winreg.h" @@ -211,9 +212,9 @@ static SysMouseImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput) get_app_key(&hkey, &appkey); if (!get_config_key(hkey, appkey, "MouseWarpOverride", buffer, sizeof(buffer))) { - if (!strcasecmp(buffer, "disable")) + if (!_strnicmp(buffer, "disable", -1)) newDevice->warp_override = WARP_DISABLE; - else if (!strcasecmp(buffer, "force")) + else if (!_strnicmp(buffer, "force", -1)) newDevice->warp_override = WARP_FORCE_ON; } if (appkey) RegCloseKey(appkey);

1 0

Piotr Caban : inetcomm: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: df019afaa3e1c858102e1964ecc0db0627441aed URL: https://source.winehq.org/git/wine.git/?a=commit;h=df019afaa3e1c858102e1964… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:15 2019 +0200 inetcomm: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index a2854be..bb0f9bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "winuser.h" #include "objbase.h" #include "ole2.h" @@ -765,13 +766,13 @@ static void init_content_encoding(MimeBody *body, header_t *header) { const char *encoding = header->value.u.pszVal; - if(!strcasecmp(encoding, "base64")) + if(!_strnicmp(encoding, "base64", -1)) body->encoding = IET_BASE64; - else if(!strcasecmp(encoding, "quoted-printable")) + else if(!_strnicmp(encoding, "quoted-printable", -1)) body->encoding = IET_QP; - else if(!strcasecmp(encoding, "7bit")) + else if(!_strnicmp(encoding, "7bit", -1)) body->encoding = IET_7BIT; - else if(!strcasecmp(encoding, "8bit")) + else if(!_strnicmp(encoding, "8bit", -1)) body->encoding = IET_8BIT; else FIXME("unknown encoding %s\n", debugstr_a(encoding));

1 0

Piotr Caban : d3d11: Don't use strcasecmp.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 87553b009dbafe9202f1800caca1ba5346958f1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=87553b009dbafe9202f1800c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:31:03 2019 +0200 d3d11: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 3 ++- dlls/d3d11/shader.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 127ea29..de40eda 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -21,6 +21,7 @@ #include "wine/port.h" #include "d3d11_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); @@ -32,7 +33,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { - if (!strcasecmp(e[i].semantic_name, semantic_name) && e[i].semantic_idx == semantic_idx + if (!_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx && e[i].stream_idx == stream_idx) return &e[i]; } diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 2276dd7..a506aac 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -21,6 +21,7 @@ #include "wine/port.h" #include "d3d11_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d11); @@ -1026,7 +1027,7 @@ static HRESULT validate_stream_output_entries(const D3D11_SO_DECLARATION_ENTRY * continue; if (e1->Stream == e2->Stream - && !strcasecmp(e1->SemanticName, e2->SemanticName) + && !_strnicmp(e1->SemanticName, e2->SemanticName, -1) && e1->SemanticIndex == e2->SemanticIndex && e1->StartComponent < e2->StartComponent + e2->ComponentCount && e1->StartComponent + e1->ComponentCount > e2->StartComponent)

1 0

Vincent Povirk : mscoree: Don' t use a shared mono install with no drive letter.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 30baa2a833a0bbd744425a85b6ce57529aa29b59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=30baa2a833a0bbd744425a85… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 8 11:03:56 2019 -0500 mscoree: Don't use a shared mono install with no drive letter. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 50d43b3..1b2abd2 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -712,6 +712,7 @@ static BOOL get_mono_path_registry(LPWSTR path) static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) { + static const WCHAR unix_prefix[] = {'\\','\\','?','\\','u','n','i','x','\\'}; static WCHAR * (CDECL *p_wine_get_dos_file_name)(const char*); LPWSTR dos_dir; WCHAR mono_dll_path[MAX_PATH]; @@ -728,6 +729,13 @@ static BOOL get_mono_path_unix(const char *unix_dir, LPWSTR path) if (!dos_dir) return FALSE; + if (memcmp(dos_dir, unix_prefix, sizeof(unix_prefix)) == 0) + { + /* No drive letter for this directory */ + heap_free(dos_dir); + return FALSE; + } + ret = find_mono_dll(dos_dir, mono_dll_path); if (ret) strcpyW(path, dos_dir);

1 0

Alistair Leslie-Hughes : hid: Implement HidD_FlushQueue().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 718b1bc54207a1fe44554041d1d02a41ebd3b365 URL: https://source.winehq.org/git/wine.git/?a=commit;h=718b1bc54207a1fe44554041… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 6 22:20:18 2019 -0500 hid: Implement HidD_FlushQueue(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45878 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index 5bf3913..5714d6c 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -1,4 +1,4 @@ -@ stub HidD_FlushQueue +@ stdcall HidD_FlushQueue(ptr) @ stdcall HidD_FreePreparsedData(ptr) @ stdcall HidD_GetAttributes(long ptr) @ stub HidD_GetConfiguration diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index e313ccb..711aff2 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -163,3 +163,9 @@ BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULO TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); } + +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file) +{ + TRACE("file %p.\n", file); + return sync_ioctl(file, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index e57a968..22f64e6 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -34,6 +34,7 @@ typedef struct _HIDD_ATTRIBUTES { USHORT VersionNumber; } HIDD_ATTRIBUTES, *PHIDD_ATTRIBUTES; +BOOLEAN WINAPI HidD_FlushQueue(HANDLE file); BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length);

1 0

Zebediah Figura : hid: Implement HidD_GetIndexedString().
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 5ae3910e93390d73105abc1171ab084a19ac02be URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ae3910e93390d73105abc11… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 22:20:17 2019 -0500 hid: Implement HidD_GetIndexedString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hid.spec | 2 +- dlls/hid/hidd.c | 6 ++++++ include/ddk/hidsdi.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/hid/hid.spec b/dlls/hid/hid.spec index e4d4202..5bf3913 100644 --- a/dlls/hid/hid.spec +++ b/dlls/hid/hid.spec @@ -4,7 +4,7 @@ @ stub HidD_GetConfiguration @ stdcall HidD_GetFeature(long ptr long) @ stdcall HidD_GetHidGuid(ptr) -@ stub HidD_GetIndexedString +@ stdcall HidD_GetIndexedString(ptr long ptr long) @ stdcall HidD_GetInputReport(long ptr long) @ stdcall HidD_GetManufacturerString(long ptr long) @ stub HidD_GetMsGenreDescriptor diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index ca14c4f..e313ccb 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -157,3 +157,9 @@ BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); } + +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length) +{ + TRACE("file %p, index %u, buffer %p, length %u.\n", file, index, buffer, length); + return sync_ioctl(file, IOCTL_HID_GET_INDEXED_STRING, &index, sizeof(index), buffer, length); +} diff --git a/include/ddk/hidsdi.h b/include/ddk/hidsdi.h index 71e50a9..e57a968 100644 --- a/include/ddk/hidsdi.h +++ b/include/ddk/hidsdi.h @@ -36,6 +36,7 @@ typedef struct _HIDD_ATTRIBUTES { BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); void WINAPI HidD_GetHidGuid(LPGUID guid); +BOOLEAN WINAPI HidD_GetIndexedString(HANDLE file, ULONG index, void *buffer, ULONG length); BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength); BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength); BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers);

1 0

Józef Kucia : wined3d: Add support for Vulkan instance extensions.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: cc9b2dba4a63b4ca8cd0bcb9445fc55f21168a50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc9b2dba4a63b4ca8cd0bcb9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:35 2019 +0200 wined3d: Add support for Vulkan instance extensions. Use VK_KHR_get_physical_device_properties2 if Vulkan 1.1 is not available. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 91 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 2c6ea25..d8937c2 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -230,8 +230,85 @@ static unsigned int wined3d_get_wine_vk_version(void) return VK_MAKE_VERSION(major, minor, 0); } +static const struct +{ + const char *name; + unsigned int core_since_version; + BOOL required; +} +vulkan_instance_extensions[] = +{ + {VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, VK_API_VERSION_1_1, FALSE}, +}; + +static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, + const char *enabled_extensions[], const struct wined3d_vk_info *vk_info) +{ + PFN_vkEnumerateInstanceExtensionProperties pfn_vkEnumerateInstanceExtensionProperties; + VkExtensionProperties *extensions = NULL; + BOOL success = FALSE, found; + unsigned int i, j, count; + VkResult vr; + + *extension_count = 0; + + if (!(pfn_vkEnumerateInstanceExtensionProperties + = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceExtensionProperties")))) + { + WARN("Failed to get 'vkEnumerateInstanceExtensionProperties'.\n"); + goto done; + } + + if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) + { + WARN("Failed to count instance extensions, vr %d.\n", vr); + goto done; + } + if (!(extensions = heap_calloc(count, sizeof(*extensions)))) + { + WARN("Out of memory.\n"); + goto done; + } + if ((vr = pfn_vkEnumerateInstanceExtensionProperties(NULL, &count, extensions)) < 0) + { + WARN("Failed to enumerate extensions, vr %d.\n", vr); + goto done; + } + + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) + { + if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) + continue; + + for (j = 0, found = FALSE; j < count; ++j) + { + if (!strcmp(extensions[j].extensionName, vulkan_instance_extensions[i].name)) + { + found = TRUE; + break; + } + } + if (found) + { + TRACE("Enabling instance extension '%s'.\n", vulkan_instance_extensions[i].name); + enabled_extensions[(*extension_count)++] = vulkan_instance_extensions[i].name; + } + else if (!found && vulkan_instance_extensions[i].required) + { + WARN("Required extension '%s' is not available.\n", vulkan_instance_extensions[i].name); + goto done; + } + } + success = TRUE; + +done: + heap_free(extensions); + return success; +} + static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + const char *enabled_instance_extensions[ARRAY_SIZE(vulkan_instance_extensions)]; PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; @@ -246,7 +323,7 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) if (!(vk_ops->vkCreateInstance = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkCreateInstance")))) { - ERR("Could not get 'vkCreateInstance'.\n"); + ERR("Failed to get 'vkCreateInstance'.\n"); goto fail; } @@ -271,6 +348,10 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pApplicationInfo = &app_info; + instance_info.ppEnabledExtensionNames = enabled_instance_extensions; + if (!enable_vulkan_instance_extensions(&instance_info.enabledExtensionCount, enabled_instance_extensions, vk_info)) + goto fail; + if ((vr = VK_CALL(vkCreateInstance(&instance_info, NULL, &instance))) < 0) { WARN("Failed to create Vulkan instance, vr %d.\n", vr); @@ -296,6 +377,12 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) #undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN +#define MAP_INSTANCE_FUNCTION(core_pfn, ext_pfn) \ + if (!vk_ops->core_pfn) \ + vk_ops->core_pfn = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #ext_pfn)); + MAP_INSTANCE_FUNCTION(vkGetPhysicalDeviceProperties2, vkGetPhysicalDeviceProperties2KHR) +#undef MAP_INSTANCE_FUNCTION + vk_info->instance = instance; return TRUE; @@ -386,7 +473,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; properties2.pNext = &id_properties; - if (vk_info->api_version >= VK_API_VERSION_1_1) + if (vk_info->vk_ops.vkGetPhysicalDeviceProperties2) VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); else VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties));

1 0

Józef Kucia : wined3d: Initialise driver and device UUID for Vulkan adapters.
by Alexandre Julliard 08 Apr '19

08 Apr '19

Module: wine Branch: master Commit: 806c97a6152743114cc539ee7c801ac7a8969595 URL: https://source.winehq.org/git/wine.git/?a=commit;h=806c97a6152743114cc539ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Apr 6 11:37:34 2019 +0200 wined3d: Initialise driver and device UUID for Vulkan adapters. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 47 ++++++++++++++++++++++++++++++++++++++++------- dlls/wined3d/wined3d_vk.h | 8 +++++++- 2 files changed, 47 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8ef0aea..2c6ea25 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -29,6 +29,12 @@ static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const st return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); } +static const char *debug_vk_version(uint32_t version) +{ + return wine_dbg_sprintf("%u.%u.%u", + VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -226,10 +232,12 @@ static unsigned int wined3d_get_wine_vk_version(void) static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) { + PFN_vkEnumerateInstanceVersion pfn_vkEnumerateInstanceVersion; struct vulkan_ops *vk_ops = &vk_info->vk_ops; VkInstance instance = VK_NULL_HANDLE; VkInstanceCreateInfo instance_info; VkApplicationInfo app_info; + uint32_t api_version = 0; char app_name[MAX_PATH]; VkResult vr; @@ -242,13 +250,23 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) goto fail; } + vk_info->api_version = VK_API_VERSION_1_0; + if ((pfn_vkEnumerateInstanceVersion = (void *)VK_CALL(vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"))) + && pfn_vkEnumerateInstanceVersion(&api_version) == VK_SUCCESS) + { + TRACE("Vulkan instance API version %s.\n", debug_vk_version(api_version)); + + if (api_version >= VK_API_VERSION_1_1) + vk_info->api_version = VK_API_VERSION_1_1; + } + memset(&app_info, 0, sizeof(app_info)); app_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; if (wined3d_get_app_name(app_name, ARRAY_SIZE(app_name))) app_info.pApplicationName = app_name; app_info.pEngineName = "Damavand"; app_info.engineVersion = wined3d_get_wine_vk_version(); - app_info.apiVersion = VK_API_VERSION_1_0; + app_info.apiVersion = vk_info->api_version; memset(&instance_info, 0, sizeof(instance_info)); instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -267,11 +285,15 @@ static BOOL wined3d_init_vulkan(struct wined3d_vk_info *vk_info) WARN("Could not get instance proc addr for '" #name "'.\n"); \ goto fail; \ } +#define LOAD_INSTANCE_OPT_PFN(name) \ + vk_ops->name = (void *)VK_CALL(vkGetInstanceProcAddr(instance, #name)); #define VK_INSTANCE_PFN LOAD_INSTANCE_PFN +#define VK_INSTANCE_EXT_PFN LOAD_INSTANCE_OPT_PFN #define VK_DEVICE_PFN LOAD_INSTANCE_PFN VK_INSTANCE_FUNCS() VK_DEVICE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN vk_info->instance = instance; @@ -324,8 +346,7 @@ const struct wined3d_gpu_description *get_vulkan_gpu_description(const VkPhysica TRACE("Device name: %s.\n", debugstr_a(properties->deviceName)); TRACE("Vendor ID: 0x%04x, Device ID: 0x%04x.\n", properties->vendorID, properties->deviceID); TRACE("Driver version: %#x.\n", properties->driverVersion); - TRACE("API version: %u.%u.%u.\n", VK_VERSION_MAJOR(properties->apiVersion), - VK_VERSION_MINOR(properties->apiVersion), VK_VERSION_PATCH(properties->apiVersion)); + TRACE("API version: %s.\n", debug_vk_version(properties->apiVersion)); if ((description = wined3d_get_gpu_description(properties->vendorID, properties->deviceID))) return description; @@ -342,7 +363,8 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; const struct wined3d_gpu_description *gpu_description; struct wined3d_adapter *adapter = &adapter_vk->a; - VkPhysicalDeviceProperties properties; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); @@ -359,16 +381,27 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) goto fail_vulkan; - VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties)); - adapter_vk->device_limits = properties.limits; + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; - if (!(gpu_description = get_vulkan_gpu_description(&properties))) + if (vk_info->api_version >= VK_API_VERSION_1_1) + VK_CALL(vkGetPhysicalDeviceProperties2(adapter_vk->physical_device, &properties2)); + else + VK_CALL(vkGetPhysicalDeviceProperties(adapter_vk->physical_device, &properties2.properties)); + adapter_vk->device_limits = properties2.properties.limits; + + if (!(gpu_description = get_vulkan_gpu_description(&properties2.properties))) { ERR("Failed to get GPU description.\n"); goto fail_vulkan; } wined3d_driver_info_init(&adapter->driver_info, gpu_description, wined3d_settings.emulated_textureram); + memcpy(&adapter->driver_uuid, id_properties.driverUUID, sizeof(adapter->driver_uuid)); + memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); + if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) goto fail_vulkan; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 784dd0c..10c706a 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -38,7 +38,9 @@ VK_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceProperties) \ VK_INSTANCE_PFN(vkGetPhysicalDeviceQueueFamilyProperties) \ - VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) + VK_INSTANCE_PFN(vkGetPhysicalDeviceSparseImageFormatProperties) \ + /* Vulkan 1.1 */ \ + VK_INSTANCE_EXT_PFN(vkGetPhysicalDeviceProperties2) #define VK_DEVICE_FUNCS() \ VK_DEVICE_PFN(vkAllocateCommandBuffers) \ @@ -167,10 +169,12 @@ struct vulkan_ops { #define VK_INSTANCE_PFN DECLARE_VK_PFN +#define VK_INSTANCE_EXT_PFN DECLARE_VK_PFN #define VK_DEVICE_PFN DECLARE_VK_PFN VK_DEVICE_FUNCS() VK_INSTANCE_FUNCS() #undef VK_INSTANCE_PFN +#undef VK_INSTANCE_EXT_PFN #undef VK_DEVICE_PFN PFN_vkCreateInstance vkCreateInstance; @@ -182,6 +186,8 @@ struct wined3d_vk_info VkInstance instance; struct vulkan_ops vk_ops; + unsigned int api_version; + #ifdef USE_WIN32_VULKAN HMODULE vulkan_lib; #endif

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019