July 2018 - Wine-commits - list.winehq.org

Józef Kucia : winevulkan: Pull in required types into Vulkan header.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 3a2c576fd3ccb3ae03f3177c4efe0159f79d6274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a2c576fd3ccb3ae03f3177c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:40 2018 +0200 winevulkan: Pull in required types into Vulkan header. Not all types are referenced by commands. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 24 +- include/wine/vulkan.h | 1069 ++++++++++++++++++++++++++++++++++--------- 2 files changed, 870 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3a2c576fd3ccb3ae03f3…

1 0

Józef Kucia : winevulkan: Pull in 1.1 structures and enums into Vulkan header.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: fe9a7da6f313d7bc28b2a319a5ee5a19f731dcc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe9a7da6f313d7bc28b2a319… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:41 2018 +0200 winevulkan: Pull in 1.1 structures and enums into Vulkan header. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 123 ++++----- include/wine/vulkan.h | 649 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 651 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fe9a7da6f313d7bc28b2…

1 0

Józef Kucia : winevulkan: Convert VkDeviceGroupDeviceCreateInfo.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 0f11534656455d770c54f52032a78d0bdef346c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f11534656455d770c54f520… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:42 2018 +0200 winevulkan: Convert VkDeviceGroupDeviceCreateInfo. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 88 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 53d7a11..96b591a 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -38,9 +38,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(vulkan); struct wine_vk_structure_header { VkStructureType sType; - const void *pNext; + void *pNext; }; +#define wine_vk_find_struct(s, t) wine_vk_find_struct_((void *)s, VK_STRUCTURE_TYPE_##t) +static void *wine_vk_find_struct_(void *s, VkStructureType t) +{ + struct wine_vk_structure_header *header; + + for (header = s; header; header = header->pNext) + { + if (header->sType == t) + return header; + } + + return NULL; +} + static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; @@ -182,8 +196,30 @@ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, return queues; } -/* Helper function to convert win32 VkDeviceCreateInfo to host compatible. */ -static void wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, +static VkDeviceGroupDeviceCreateInfo *convert_VkDeviceGroupDeviceCreateInfo(const void *src) +{ + const VkDeviceGroupDeviceCreateInfo *in = src; + VkDeviceGroupDeviceCreateInfo *out; + VkPhysicalDevice *physical_devices; + unsigned int i; + + if (!(out = heap_alloc(sizeof(*out)))) + return NULL; + + *out = *in; + if (!(physical_devices = heap_calloc(in->physicalDeviceCount, sizeof(*physical_devices)))) + { + heap_free(out); + return NULL; + } + for (i = 0; i < in->physicalDeviceCount; ++i) + physical_devices[i] = in->pPhysicalDevices[i]->phys_dev; + out->pPhysicalDevices = physical_devices; + + return out; +} + +static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, VkDeviceCreateInfo *dst) { unsigned int i; @@ -192,13 +228,13 @@ static void wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, /* Application and loader can pass in a chain of extensions through pNext. * We can't blindly pass these through as often these contain callbacks or - * they can even be pass structures for loader / ICD internal use. For now - * we ignore everything in pNext chain, but we print FIXMEs. + * they can even be pass structures for loader / ICD internal use. */ if (src->pNext) { const struct wine_vk_structure_header *header; + dst->pNext = NULL; for (header = src->pNext; header; header = header->pNext) { switch (header->sType) @@ -209,23 +245,41 @@ static void wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src, */ break; + case VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO: + if (!(dst->pNext = convert_VkDeviceGroupDeviceCreateInfo(header))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + break; + default: FIXME("Application requested a linked structure of type %#x.\n", header->sType); } } } - /* For now don't support anything. */ - dst->pNext = NULL; /* Should be filtered out by loader as ICDs don't support layers. */ dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + TRACE("Enabled extensions: %u.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { - TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + TRACE("Extension %u: %s.\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + } + + return VK_SUCCESS; +} + +static void wine_vk_device_free_create_info(VkDeviceCreateInfo *create_info) +{ + VkDeviceGroupDeviceCreateInfo *group_info; + + if ((group_info = wine_vk_find_struct(create_info, DEVICE_GROUP_DEVICE_CREATE_INFO))) + { + heap_free((void *)group_info->pPhysicalDevices); + heap_free(group_info); } + + create_info->pNext = NULL; } /* Helper function used for freeing a device structure. This function supports full @@ -507,24 +561,30 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, VkDeviceCreateInfo create_info_host; uint32_t max_queue_families; struct VkDevice_T *object; - VkResult res; unsigned int i; + VkResult res; - TRACE("%p %p %p %p\n", phys_dev, create_info, allocator, device); + TRACE("%p, %p, %p, %p\n", phys_dev, create_info, allocator, device); if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); - object = heap_alloc_zero(sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - wine_vk_device_convert_create_info(create_info, &create_info_host); + res = wine_vk_device_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + ERR("Failed to convert VkDeviceCreateInfo, res=%d.\n", res); + wine_vk_device_free(object); + return res; + } res = phys_dev->instance->funcs.p_vkCreateDevice(phys_dev->phys_dev, &create_info_host, NULL /* allocator */, &object->device); + wine_vk_device_free_create_info(&create_info_host); if (res != VK_SUCCESS) { ERR("Failed to create device.\n");

1 0

Józef Kucia : winevulkan: Implement VK_KHR_device_group_creation.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: b27b3aeaf64cd5e8b1b8fed2d430f2476aa6e8af URL: https://source.winehq.org/git/wine.git/?a=commit;h=b27b3aeaf64cd5e8b1b8fed2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:43 2018 +0200 winevulkan: Implement VK_KHR_device_group_creation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 5 +++ dlls/winevulkan/vulkan.c | 91 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_private.h | 2 +- dlls/winevulkan/vulkan_thunks.c | 3 ++ dlls/winevulkan/vulkan_thunks.h | 6 +++ dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 6 +++ 8 files changed, 95 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b27b3aeaf64cd5e8b1b8…

1 0

Józef Kucia : vulkan-1/tests: Introduce for_each_device() helper.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: d36ecbe8dfb7a7b3f1b9a3e3ccc29b36d2b73f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d36ecbe8dfb7a7b3f1b9a3e3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:44 2018 +0200 vulkan-1/tests: Introduce for_each_device() helper. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 67da880..25e5c01 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -38,10 +38,23 @@ static VkResult create_instance(uint32_t extension_count, return vkCreateInstance(&create_info, NULL, vk_instance); } -static void test_enumerate_physical_devices(void) +static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) { - VkPhysicalDevice *vk_physical_devices; VkPhysicalDeviceProperties properties; + + vkGetPhysicalDeviceProperties(vk_physical_device, &properties); + + trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", + properties.deviceName, properties.vendorID, properties.deviceID, + VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), + VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, + VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), + VK_VERSION_PATCH(properties.apiVersion)); +} + +static void for_each_device(void (*test_func)(VkPhysicalDevice)) +{ + VkPhysicalDevice *vk_physical_devices; VkInstance vk_instance; unsigned int i; uint32_t count; @@ -63,23 +76,13 @@ static void test_enumerate_physical_devices(void) return; } - trace("Got %u physical device(s).\n", count); vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)); ok(!!vk_physical_devices, "Failed to allocate memory.\n"); vr = vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices); ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); for (i = 0; i < count; ++i) - { - vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); - - trace("Device '%s', %#x:%#x, driver version %u.%u.%u (%#x), api version %u.%u.%u.\n", - properties.deviceName, properties.vendorID, properties.deviceID, - VK_VERSION_MAJOR(properties.driverVersion), VK_VERSION_MINOR(properties.driverVersion), - VK_VERSION_PATCH(properties.driverVersion), properties.driverVersion, - VK_VERSION_MAJOR(properties.apiVersion), VK_VERSION_MINOR(properties.apiVersion), - VK_VERSION_PATCH(properties.apiVersion)); - } + test_func(vk_physical_devices[i]); heap_free(vk_physical_devices); @@ -88,5 +91,5 @@ static void test_enumerate_physical_devices(void) START_TEST(vulkan) { - test_enumerate_physical_devices(); + for_each_device(enumerate_physical_device); }

1 0

Józef Kucia : vulkan-1/tests: Add test for VK_KHR_device_group_creation.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 74215f7e29a04921fcb89af82bae8e10fa12764e URL: https://source.winehq.org/git/wine.git/?a=commit;h=74215f7e29a04921fcb89af8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:45 2018 +0200 vulkan-1/tests: Add test for VK_KHR_device_group_creation. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 143 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 139 insertions(+), 4 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 25e5c01..087ee16 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -25,6 +25,7 @@ static VkResult create_instance(uint32_t extension_count, const char * const *enabled_extensions, VkInstance *vk_instance) { VkInstanceCreateInfo create_info; + VkResult vr; create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; create_info.pNext = NULL; @@ -35,7 +36,82 @@ static VkResult create_instance(uint32_t extension_count, create_info.enabledExtensionCount = extension_count; create_info.ppEnabledExtensionNames = enabled_extensions; - return vkCreateInstance(&create_info, NULL, vk_instance); + if ((vr = vkCreateInstance(&create_info, NULL, vk_instance)) >= 0) + return vr; + + switch (vr) + { + case VK_ERROR_EXTENSION_NOT_PRESENT: + if (extension_count == 1) + skip("Instance extension '%s' not supported.\n", enabled_extensions[0]); + else + skip("Instance extensions not supported.\n"); + break; + + default: + skip("Failed to create Vulkan instance, vr %d.\n", vr); + break; + } + return vr; +} + +static VkBool32 find_queue_family(VkPhysicalDevice vk_physical_device, + VkQueueFlags flags, uint32_t *family_index) +{ + VkQueueFamilyProperties *properties; + VkBool32 ret = VK_FALSE; + uint32_t i, count; + + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, NULL); + properties = heap_calloc(count, sizeof(*properties)); + ok(!!properties, "Failed to allocate memory.\n"); + vkGetPhysicalDeviceQueueFamilyProperties(vk_physical_device, &count, properties); + + for (i = 0; i < count; ++i) + { + if ((properties[i].queueFlags & flags) == flags) + { + ret = VK_TRUE; + *family_index = i; + break; + } + } + + heap_free(properties); + return ret; +} + +static VkResult create_device(VkPhysicalDevice vk_physical_device, + uint32_t extension_count, const char * const *enabled_extensions, + const void *next, VkDevice *vk_device) +{ + VkDeviceQueueCreateInfo queue_info; + VkDeviceCreateInfo create_info; + float priority = 0.0f; + + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info.pNext = NULL; + queue_info.flags = 0; + if (!find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_info.queueFamilyIndex)) + { + trace("Failed to find queue family.\n"); + return VK_ERROR_INITIALIZATION_FAILED; + } + queue_info.queueCount = 1; + queue_info.pQueuePriorities = &priority; + + create_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + create_info.pNext = next; + create_info.flags = 0; + create_info.queueCreateInfoCount = 1; + create_info.pQueueCreateInfos = &queue_info; + create_info.enabledLayerCount = 0; + create_info.ppEnabledLayerNames = NULL; + create_info.enabledExtensionCount = extension_count; + create_info.ppEnabledExtensionNames = enabled_extensions; + create_info.pEnabledFeatures = NULL; + + return vkCreateDevice(vk_physical_device, &create_info, NULL, vk_device); } static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) @@ -52,6 +128,67 @@ static void enumerate_physical_device(VkPhysicalDevice vk_physical_device) VK_VERSION_PATCH(properties.apiVersion)); } +static void test_physical_device_groups(void) +{ + PFN_vkEnumeratePhysicalDeviceGroupsKHR vkEnumeratePhysicalDeviceGroupsKHR; + VkPhysicalDeviceGroupProperties *properties; + VkDeviceGroupDeviceCreateInfo group_info; + VkInstance vk_instance; + uint32_t i, j, count; + VkDevice vk_device; + VkResult vr; + + static const char *extensions[] = + { + VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME, + }; + + if ((vr = create_instance(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + return; + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vkEnumeratePhysicalDeviceGroupsKHR + = (void *)vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDeviceGroupsKHR"); + ok(!!vkEnumeratePhysicalDeviceGroupsKHR, "Failed to get proc addr.\n"); + + vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, NULL); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + ok(count > 0, "Unexpected device group count %u.\n", count); + + properties = heap_calloc(count, sizeof(*properties)); + ok(!!properties, "Failed to allocate memory.\n"); + vr = vkEnumeratePhysicalDeviceGroupsKHR(vk_instance, &count, properties); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + for (i = 0; i < count; ++i) + { + trace("Group[%u] count %u, subset allocation %#x\n", + i, properties[i].physicalDeviceCount, properties[i].subsetAllocation); + for (j = 0; j < properties[i].physicalDeviceCount; ++j) + enumerate_physical_device(properties[i].physicalDevices[j]); + } + + if ((vr = create_device(properties->physicalDevices[0], 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + return; + } + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + vkDestroyDevice(vk_device, NULL); + + group_info.sType = VK_STRUCTURE_TYPE_DEVICE_GROUP_DEVICE_CREATE_INFO; + group_info.pNext = NULL; + group_info.physicalDeviceCount = properties->physicalDeviceCount; + group_info.pPhysicalDevices = properties->physicalDevices; + vr = create_device(group_info.pPhysicalDevices[0], 0, NULL, &group_info, &vk_device); + ok(vr == VK_SUCCESS, "Failed to create device, VkResult %d.\n", vr); + vkDestroyDevice(vk_device, NULL); + + heap_free(properties); + + vkDestroyInstance(vk_instance, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -61,10 +198,7 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) VkResult vr; if ((vr = create_instance(0, NULL, &vk_instance)) < 0) - { - skip("Failed to create Vulkan instance, vr %d.\n", vr); return; - } ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); vr = vkEnumeratePhysicalDevices(vk_instance, &count, NULL); @@ -92,4 +226,5 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) START_TEST(vulkan) { for_each_device(enumerate_physical_device); + test_physical_device_groups(); }

1 0

Józef Kucia : winevulkan: Add TRACE() for created devices.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 29467f9da560210197144c022c3bebe074ec2a90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29467f9da560210197144c02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:46 2018 +0200 winevulkan: Add TRACE() for created devices. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 987332e..cb84c4d 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -650,6 +650,7 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, object->quirks = phys_dev->instance->quirks; *device = object; + TRACE("Created device %p (native device %p).\n", object, object->device); return VK_SUCCESS; } @@ -713,7 +714,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } *instance = object; - TRACE("Done, instance=%p native_instance=%p\n", object, object->instance); + TRACE("Created instance %p (native instance %p).\n", object, object->instance); return VK_SUCCESS; }

1 0

Huw Davies : winspool: Remove ordinals from the performance functions.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: e7059c6f126e797c570e6510c8a4b1596121c4a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7059c6f126e797c570e6510… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 12 10:52:39 2018 +0100 winspool: Remove ordinals from the performance functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/winspool.drv.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 58dc60b..f7319cb 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -2,9 +2,6 @@ 101 stub -noname ClusterSplOpen 102 stub -noname ClusterSplClose 103 stub -noname ClusterSplIsAlive -104 stub PerfClose -105 stub PerfCollect -106 stub PerfOpen 201 stdcall GetDefaultPrinterA(ptr ptr) 202 stdcall SetDefaultPrinterA(str) 203 stdcall GetDefaultPrinterW(ptr ptr) @@ -151,6 +148,9 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) +@ stub PerfClose +@ stub PerfCollect +@ stub PerfOpen @ stub PlayGdiScriptOnPrinterIC @ stub PrinterMessageBoxA @ stub PrinterMessageBoxW

1 0

Dmitry Timoshkov : winspool: Add performance counters service stubs.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 4adfa3dc2668c00254a51e0edd038708172e3d2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4adfa3dc2668c00254a51e0e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jul 12 10:52:40 2018 +0100 winspool: Add performance counters service stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 29 +++++++++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 6 +++--- loader/wine.inf.in | 7 +++++++ 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 9c24256..f63f3f6 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -8681,3 +8681,32 @@ HRESULT WINAPI UploadPrinterDriverPackageW( LPCWSTR server, LPCWSTR path, LPCWST flags, hwnd, dst, dstlen); return E_NOTIMPL; } + +/***************************************************************************** + * PerfOpen [WINSPOOL.@] + */ +DWORD WINAPI PerfOpen(LPWSTR context) +{ + FIXME("%s: stub\n", debugstr_w(context)); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfClose [WINSPOOL.@] + */ +DWORD WINAPI PerfClose(void) +{ + FIXME("stub\n"); + return ERROR_SUCCESS; +} + +/***************************************************************************** + * PerfCollect [WINSPOOL.@] + */ +DWORD WINAPI PerfCollect(LPWSTR query, LPVOID *data, LPDWORD size, LPDWORD obj_count) +{ + FIXME("%s, %p, %p, %p: stub\n", debugstr_w(query), data, size, obj_count); + *size = 0; + *obj_count = 0; + return ERROR_SUCCESS; +} diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index f7319cb..5d8a62d 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -148,9 +148,9 @@ @ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) -@ stub PerfClose -@ stub PerfCollect -@ stub PerfOpen +@ stdcall PerfClose() +@ stdcall PerfCollect(wstr ptr ptr ptr) +@ stdcall PerfOpen(wstr) @ stub PlayGdiScriptOnPrinterIC @ stub PrinterMessageBoxA @ stub PrinterMessageBoxW diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 735d965..9a76509 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3309,6 +3309,7 @@ StartType=3 ErrorControl=1 [SpoolerService] +AddReg=SpoolerServiceKeys Description="Loads files to memory for later printing" DisplayName="Print Spooler" ServiceBinary="%11%\spoolsv.exe" @@ -3317,6 +3318,12 @@ StartType=3 ErrorControl=1 LoadOrderGroup="SpoolerGroup" +[SpoolerServiceKeys] +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Library",,"winspool.drv" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Open",,"PerfOpen" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Close",,"PerfClose" +HKLM,"System\CurrentControlSet\Services\Spooler\Performance","Collect",,"PerfCollect" + [TerminalServices] Description="Remote desktop access" DisplayName="Terminal Services"

1 0

Dmitry Timoshkov : advapi32: Add initial support for querying performance counters data.
by Alexandre Julliard 12 Jul '18

12 Jul '18

Module: wine Branch: master Commit: 903de9b678fcb40191d5bdbb62ab7b8879343c9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=903de9b678fcb40191d5bdbb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jul 11 12:16:07 2018 +0800 advapi32: Add initial support for querying performance counters data. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/registry.c | 244 ++++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/registry.c | 17 +-- 2 files changed, 249 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=903de9b678fcb40191d5…

1 0