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

Alex Villacís Lasso : user.exe16: Fix handling of DDL_DRIVES flag in DlgDirList.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 0a788caf8b4665d7f56443fc2c6d7790edf9defb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a788caf8b4665d7f56443fc… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Mon Jun 25 04:13:40 2018 +0000 user.exe16: Fix handling of DDL_DRIVES flag in DlgDirList. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18734 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/dialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index e5bf7b9..385e859 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -636,7 +636,7 @@ INT16 WINAPI DlgDirList16( HWND16 hDlg, LPSTR spec, INT16 idLBox, * be set automatically (this is different in Win32, and * DIALOG_DlgDirList sends Win32 messages to the control, * so do it here) */ - if (attrib & DDL_DRIVES) attrib |= DDL_EXCLUSIVE; + if (attrib == DDL_DRIVES) attrib |= DDL_EXCLUSIVE; return DlgDirListA( WIN_Handle32(hDlg), spec, idLBox, idStatic, attrib ); }

1 0

Dmitry Timoshkov : winspool: Add performance counters service stubs.
by Alexandre Julliard July 12, 2018

July 12, 2018

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

Józef Kucia : vulkan-1/tests: Add test for VK_KHR_device_group_creation.
by Alexandre Julliard July 12, 2018

July 12, 2018

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: Convert VkDeviceGroupDeviceCreateInfo.
by Alexandre Julliard July 12, 2018

July 12, 2018

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: Pull in 1.1 structures and enums into Vulkan header.
by Alexandre Julliard July 12, 2018

July 12, 2018

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: Pull in required types into Vulkan header.
by Alexandre Julliard July 12, 2018

July 12, 2018

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: Generate code for supported core commands.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 6a2b92a15ac198fa09d050a63b4aa066c8d31f71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a2b92a15ac198fa09d050a6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 12 11:39:39 2018 +0200 winevulkan: Generate code for supported core commands. Generate thunks for core commands if command aliases are already supported. 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 | 38 +++---- dlls/winevulkan/make_vulkan | 9 +- dlls/winevulkan/vulkan_thunks.c | 233 ++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 74 +++++++++++++ dlls/winevulkan/winevulkan.spec | 38 +++---- include/wine/vulkan.h | 38 +++++++ 6 files changed, 389 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a2b92a15ac198fa09d0…

1 0

Alex Henrie : kernel32: Connect GetSystemFirmwareTable to NtQuerySystemInformation.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 93711aee1fdfdce79b82907b9187e95630ed3055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93711aee1fdfdce79b82907b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:52 2018 +0200 kernel32: Connect GetSystemFirmwareTable to NtQuerySystemInformation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 31 +++++++++++++++++++++++++++++++ dlls/kernel32/process.c | 10 ---------- dlls/kernel32/tests/version.c | 2 +- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index ec1fd0f..1e99951 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -336,3 +336,34 @@ DWORD64 WINAPI GetEnabledXStateFeatures(void) FIXME("\n"); return 0; } + +/*********************************************************************** + * GetSystemFirmwareTable (KERNEL32.@) + */ +UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, void *buffer, DWORD size) +{ + ULONG buffer_size = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer) + size; + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, buffer_size); + NTSTATUS status; + + TRACE("(0x%08x, 0x%08x, %p, %d)\n", provider, id, buffer, size); + + if (!sfti) + { + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + + sfti->ProviderSignature = provider; + sfti->Action = SystemFirmwareTable_Get; + sfti->TableID = id; + + status = NtQuerySystemInformation(SystemFirmwareTableInformation, sfti, buffer_size, &buffer_size); + buffer_size -= FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (buffer_size <= size) + memcpy(buffer, sfti->TableBuffer, buffer_size); + + if (status) SetLastError(RtlNtStatusToDosError(status)); + HeapFree(GetProcessHeap(), 0, sfti); + return buffer_size; +} diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7787a32..4e6ba11 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -4128,16 +4128,6 @@ HRESULT WINAPI UnregisterApplicationRestart(void) return S_OK; } -/*********************************************************************** - * GetSystemFirmwareTable (KERNEL32.@) - */ -UINT WINAPI GetSystemFirmwareTable(DWORD provider, DWORD id, PVOID buffer, DWORD size) -{ - FIXME("(%d %d %p %d):stub\n", provider, id, buffer, size); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - struct proc_thread_attr { DWORD_PTR attr; diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ac43d1a..3bc04fd 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -719,7 +719,7 @@ static void test_GetSystemFirmwareTable(void) pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &expected_len); if (expected_len == 0) /* xp, 2003 */ { - skip("SystemFirmwareTableInformation is not available\n"); + win_skip("SystemFirmwareTableInformation is not available\n"); HeapFree(GetProcessHeap(), 0, sfti); return; }

1 0

Michael Stefaniuc : dmime: Reimplement the track form parser.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 3ee58034adab6275c5105c6aefb848387cbe4eea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ee58034adab6275c5105c6a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 23:44:36 2018 +0200 dmime: Reimplement the track form parser. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 239 +++++++++++++-------------------------------------- 1 file changed, 60 insertions(+), 179 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 48fd643..dc46069 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -22,7 +22,6 @@ #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegmentImpl implementation @@ -622,195 +621,77 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { }; /* IDirectMusicSegment8Impl IPersistStream part: */ -static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream, - IDirectMusicTrack **ppTrack, DMUS_IO_TRACK_HEADER *pTrack_hdr) -{ - HRESULT hr = E_FAIL; - IPersistStream* pPersistStream = NULL; - - hr = CoCreateInstance (&pTrack_hdr->guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, (LPVOID*) ppTrack); - if (FAILED(hr)) { - ERR(": could not create object\n"); - return hr; - } - /* acquire PersistStream interface */ - hr = IDirectMusicTrack_QueryInterface (*ppTrack, &IID_IPersistStream, (LPVOID*) &pPersistStream); - if (FAILED(hr)) { - ERR(": could not acquire IPersistStream\n"); - return hr; - } - /* load */ - hr = IPersistStream_Load (pPersistStream, pClonedStream); - if (FAILED(hr)) { - ERR(": failed to load object\n"); - return hr; - } - - /* release all loading-related stuff */ - IPersistStream_Release (pPersistStream); - - hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, *ppTrack, - pTrack_hdr->dwGroup); /* at dsPosition */ - if (FAILED(hr)) { - ERR(": could not insert track\n"); - return hr; - } - - return S_OK; -} - -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *riff) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - - DMUS_IO_TRACK_HEADER track_hdr; - DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; - IDirectMusicTrack* pTrack = NULL; - - StreamSize = size - sizeof(FOURCC); - StreamCount = 0; + struct chunk_entry chunk = {.parent = riff}; + IDirectMusicTrack *track = NULL; + IPersistStream *ps = NULL; + IStream *clone; + DMUS_IO_TRACK_HEADER thdr; + HRESULT hr; - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_CHUNK: { - TRACE_(dmfile)(": track chunk\n"); - IStream_Read (pStm, &track_hdr, sizeof(DMUS_IO_TRACK_HEADER), NULL); - TRACE_(dmfile)(" - class: %s\n", debugstr_guid (&track_hdr.guidClassID)); - TRACE_(dmfile)(" - dwGroup: %d\n", track_hdr.dwGroup); - TRACE_(dmfile)(" - ckid: %s\n", debugstr_fourcc (track_hdr.ckid)); - TRACE_(dmfile)(" - fccType: %s\n", debugstr_fourcc (track_hdr.fccType)); - break; - } - case DMUS_FOURCC_TRACK_EXTRAS_CHUNK: { - TRACE_(dmfile)(": track extras chunk\n"); - IStream_Read (pStm, &track_xhdr, sizeof(DMUS_IO_TRACK_EXTRAS_HEADER), NULL); - break; - } + TRACE("Parsing track form in %p: %s\n", stream, debugstr_chunk(riff)); - case DMUS_FOURCC_COMMANDTRACK_CHUNK: { - TRACE_(dmfile)(": COMMANDTRACK track\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; + /* First chunk must be the track header */ + if (FAILED(hr = stream_get_chunk(stream, &chunk))) + return hr; + if (chunk.id != DMUS_FOURCC_TRACK_CHUNK) + return DMUS_E_TRACK_HDR_NOT_FIRST_CK; + if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &thdr, sizeof(thdr)))) + return hr; + TRACE("Found DMUS_IO_TRACK_HEADER\n"); + TRACE("\tclass: %s\n", debugstr_guid (&thdr.guidClassID)); + TRACE("\tdwGroup: %d\n", thdr.dwGroup); + TRACE("\tckid: %s\n", debugstr_fourcc (thdr.ckid)); + TRACE("\tfccType: %s\n", debugstr_fourcc (thdr.fccType)); + + if (!!thdr.ckid == !!thdr.fccType) { + WARN("One and only one of the ckid (%s) and fccType (%s) need to be set\n", + debugstr_fourcc(thdr.ckid), debugstr_fourcc(thdr.fccType)); + return DMUS_E_INVALID_TRACK_HDR; } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK list\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; - } + /* Optional chunks */ + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if ((thdr.ckid && chunk.id == thdr.ckid) || + (!thdr.ckid && (chunk.id == FOURCC_LIST || chunk.id == FOURCC_RIFF) && + chunk.type == thdr.fccType)) + break; - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s\n", debugstr_fourcc(Chunk.fccID)); - - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - - if (Chunk.fccID == track_hdr.fccType && 0 == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); - - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ - - /** now safe move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - - } else { - TRACE_(dmfile)(": unknown RIFF fmt (skipping)\n"); - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - } - break; + if (chunk.id == DMUS_FOURCC_TRACK_EXTRAS_CHUNK) + FIXME("DMUS_IO_TRACK_EXTRAS_HEADER chunk not handled\n"); } + if (hr != S_OK) + return hr == S_FALSE ? DMUS_E_TRACK_NOT_FOUND : hr; - default: { - if (0 == track_hdr.fccType && Chunk.fccID == track_hdr.ckid) { - LPSTREAM pClonedStream = NULL; - - TRACE_(dmfile)(": TRACK solo\n"); - - IStream_Clone (pStm, &pClonedStream); - - liMove.QuadPart = 0; - liMove.QuadPart -= (sizeof(FOURCC) + sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + /* Some DirectMusicTrack implementation expect the stream to start with their data chunk */ + if (FAILED(hr = IStream_Clone(stream, &clone))) + return hr; + stream_reset_chunk_start(clone, &chunk); - hr = load_track(This, pClonedStream, &pTrack, &track_hdr); - if (FAILED(hr)) { - ERR(": could not load track\n"); - return hr; - } - IStream_Release (pClonedStream); - - IDirectMusicTrack_Release(pTrack); pTrack = NULL; /* now we can release at as it inserted */ + /* Load the track */ + hr = CoCreateInstance(&thdr.guidClassID, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicTrack, + (void **)&track); + if (FAILED(hr)) + goto done; + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void **)&ps); + if (FAILED(hr)) + goto done; + hr = IPersistStream_Load(ps, clone); + if (FAILED(hr)) + goto done; - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); + hr = IDirectMusicSegment8_InsertTrack(&This->IDirectMusicSegment8_iface, track, thdr.dwGroup); - break; - } +done: + if (ps) + IPersistStream_Release(ps); + if (track) + IDirectMusicTrack_Release(track); + IStream_Release(clone); - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - - return S_OK; + return hr; } static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, @@ -823,7 +704,7 @@ static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_RIFF && chunk.type == DMUS_FOURCC_TRACK_FORM) - hr = parse_track_form(This, chunk.size, stream); + hr = parse_track_form(This, stream, &chunk); return SUCCEEDED(hr) ? S_OK : hr; }

1 0

Alistair Leslie-Hughes : include: Add more DSOP defines.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: e182f4043c743687ee3ef9c2d78edb633cd9cc0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e182f4043c743687ee3ef9c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jul 12 03:45:20 2018 +0000 include: Add more DSOP defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objsel.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/objsel.h b/include/objsel.h index c01d4c7..ce97034 100644 --- a/include/objsel.h +++ b/include/objsel.h @@ -39,6 +39,8 @@ DEFINE_GUID(IID_IDsObjectPicker, 0x0c87e64e, 0x3b7a, 0x11d2, 0xb9,0xe0,0x00,0xc #define DSOP_FILTER_DOMAIN_LOCAL_GROUPS_SE (0x200) #define DSOP_FILTER_CONTACTS (0x400) #define DSOP_FILTER_COMPUTERS (0x800) +#define DSOP_FILTER_SERVICE_ACCOUNTS (0x1000) +#define DSOP_FILTER_PASSWORDSETTINGS_OBJECTS (0x2000) typedef struct _DSOP_UPLEVEL_FILTER_FLAGS { @@ -87,6 +89,8 @@ typedef struct _DSOP_FILTER_FLAGS #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_GROUPS (0x80) #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_COMPUTERS (0x100) #define DSOP_SCOPE_FLAG_DEFAULT_FILTER_CONTACTS (0x200) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_SERVICE_ACCOUNTS (0x400) +#define DSOP_SCOPE_FLAG_DEFAULT_FILTER_PASSWORDSETTINGS_OBJECTS (0x800) typedef struct _DSOP_SCOPE_INIT_INFO {

1 0