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

Alex Henrie : kernel32/tests: Add GetSystemFirmwareTable tests.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 774a859d42ddcf4308e1356f1647d9b8bba26c5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=774a859d42ddcf4308e1356f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:50 2018 +0200 kernel32/tests: Add GetSystemFirmwareTable tests. 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/tests/version.c | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index ebda2db..ac43d1a 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -26,11 +26,17 @@ #include "winternl.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); +static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); #define GET_PROC(func) \ p##func = (void *)GetProcAddress(hmod, #func); +/* Firmware table providers */ +#define ACPI 0x41435049 +#define FIRM 0x4649524D +#define RSMB 0x52534D42 + static void init_function_pointers(void) { HMODULE hmod; @@ -41,6 +47,7 @@ static void init_function_pointers(void) hmod = GetModuleHandleA("ntdll.dll"); + GET_PROC(NtQuerySystemInformation); GET_PROC(RtlGetVersion); } @@ -697,6 +704,44 @@ static void test_VerifyVersionInfo(void) ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError()); } +static void test_GetSystemFirmwareTable(void) +{ + static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + ULONG expected_len; + UINT len; + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + UCHAR *smbios_table; + + ok(!!sfti, "Failed to allocate memory\n"); + sfti->ProviderSignature = RSMB; + sfti->Action = SystemFirmwareTable_Get; + sfti->TableID = 0; + pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &expected_len); + if (expected_len == 0) /* xp, 2003 */ + { + skip("SystemFirmwareTableInformation is not available\n"); + HeapFree(GetProcessHeap(), 0, sfti); + return; + } + sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, expected_len); + ok(!!sfti, "Failed to allocate memory\n"); + pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, expected_len, &expected_len); + + expected_len -= min_sfti_len; + smbios_table = HeapAlloc(GetProcessHeap(), 0, expected_len); + len = GetSystemFirmwareTable(RSMB, 0, smbios_table, expected_len); + ok(len == expected_len, "Expected length %u, got %u\n", expected_len, len); + ok(len == 0 || !memcmp(smbios_table, sfti->TableBuffer, 6), + "Expected prologue %02x %02x %02x %02x %02x %02x, got %02x %02x %02x %02x %02x %02x\n", + sfti->TableBuffer[0], sfti->TableBuffer[1], sfti->TableBuffer[2], + sfti->TableBuffer[3], sfti->TableBuffer[4], sfti->TableBuffer[5], + smbios_table[0], smbios_table[1], smbios_table[2], + smbios_table[3], smbios_table[4], smbios_table[5]); + + HeapFree(GetProcessHeap(), 0, sfti); + HeapFree(GetProcessHeap(), 0, smbios_table); +} + START_TEST(version) { init_function_pointers(); @@ -704,4 +749,5 @@ START_TEST(version) test_GetProductInfo(); test_GetVersionEx(); test_VerifyVersionInfo(); + test_GetSystemFirmwareTable(); }

1 0

Alex Henrie : ntdll: Return BIOS info from NtQuerySystemInformation on Linux.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 28e8e9a1647edf2397b6333825157d53c2a65de8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e8e9a1647edf2397b63338… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:51 2018 +0200 ntdll: Return BIOS info from NtQuerySystemInformation on Linux. 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/ntdll/nt.c | 158 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/tests/info.c | 11 +++- 2 files changed, 167 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index 2ca9cd5..3c324a4 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -66,6 +66,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); +#include "pshpack1.h" + +struct smbios_prologue { + BYTE calling_method; + BYTE major_version; + BYTE minor_version; + BYTE revision; + DWORD length; +}; + +struct smbios_bios { + BYTE type; + BYTE length; + WORD handle; + BYTE vendor; + BYTE version; + WORD start; + BYTE date; + BYTE size; + UINT64 characteristics; +}; + +#include "poppack.h" + +/* Firmware table providers */ +#define ACPI 0x41435049 +#define FIRM 0x4649524D +#define RSMB 0x52534D42 + /* * Token */ @@ -1898,6 +1927,113 @@ static NTSTATUS create_logical_proc_info(SYSTEM_LOGICAL_PROCESSOR_INFORMATION ** } #endif +#ifdef linux + +static inline void copy_smbios_string(char **buffer, char *s, size_t len) +{ + if (!len) return; + memcpy(*buffer, s, len + 1); + *buffer += len + 1; +} + +static size_t get_smbios_string(const char *path, char *str, size_t size) +{ + FILE *file; + size_t len; + + if (!(file = fopen(path, "r"))) + return 0; + + len = fread(str, 1, size - 1, file); + fclose(file); + + if (len >= 1 && str[len - 1] == '\n') + len--; + + str[len] = 0; + + return len; +} + +static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) +{ + switch (sfti->ProviderSignature) + { + case RSMB: + { + char bios_vendor[128], bios_version[128], bios_date[128]; + size_t bios_vendor_len, bios_version_len, bios_date_len; + char *buffer = (char*)sfti->TableBuffer; + BYTE string_count; + struct smbios_prologue *prologue; + struct smbios_bios *bios; + +#define S(s) s, sizeof(s) + bios_vendor_len = get_smbios_string("/sys/class/dmi/id/bios_vendor", S(bios_vendor)); + bios_version_len = get_smbios_string("/sys/class/dmi/id/bios_version", S(bios_version)); + bios_date_len = get_smbios_string("/sys/class/dmi/id/bios_date", S(bios_date)); +#undef S + + *required_len = sizeof(struct smbios_prologue); + + *required_len += sizeof(struct smbios_bios); + *required_len += max(bios_vendor_len + bios_version_len + bios_date_len + 4, 2); + + sfti->TableBufferLength = *required_len; + + *required_len += FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + + if (available_len < *required_len) + return STATUS_BUFFER_TOO_SMALL; + + prologue = (struct smbios_prologue*)buffer; + prologue->calling_method = 0; + prologue->major_version = 2; + prologue->minor_version = 0; + prologue->revision = 0; + prologue->length = sfti->TableBufferLength - sizeof(struct smbios_prologue); + buffer += sizeof(struct smbios_prologue); + + string_count = 0; + bios = (struct smbios_bios*)buffer; + bios->type = 0; + bios->length = sizeof(struct smbios_bios); + bios->handle = 0; + bios->vendor = bios_vendor_len ? ++string_count : 0; + bios->version = bios_version_len ? ++string_count : 0; + bios->start = 0; + bios->date = bios_date_len ? ++string_count : 0; + bios->size = 0; + bios->characteristics = 0x4; /* not supported */ + buffer += sizeof(struct smbios_bios); + + copy_smbios_string(&buffer, bios_vendor, bios_vendor_len); + copy_smbios_string(&buffer, bios_version, bios_version_len); + copy_smbios_string(&buffer, bios_date, bios_date_len); + if (!string_count) *buffer++ = 0; + *buffer++ = 0; + + return STATUS_SUCCESS; + } + default: + { + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION provider %08x\n", sfti->ProviderSignature); + return STATUS_NOT_IMPLEMENTED; + } + } +} + +#else + +static NTSTATUS get_firmware_info(SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti, ULONG available_len, ULONG *required_len) +{ + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION\n"); + sfti->TableBufferLength = 0; + return STATUS_NOT_IMPLEMENTED; +} + +#endif + /****************************************************************************** * NtQuerySystemInformation [NTDLL.@] * ZwQuerySystemInformation [NTDLL.@] @@ -2407,6 +2543,28 @@ NTSTATUS WINAPI NtQuerySystemInformation( else ret = STATUS_INFO_LENGTH_MISMATCH; } break; + case SystemFirmwareTableInformation: + { + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti = (SYSTEM_FIRMWARE_TABLE_INFORMATION*)SystemInformation; + len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + if (Length < len) + { + ret = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + switch (sfti->Action) + { + case SystemFirmwareTable_Get: + ret = get_firmware_info(sfti, Length, &len); + break; + default: + len = 0; + ret = STATUS_NOT_IMPLEMENTED; + FIXME("info_class SYSTEM_FIRMWARE_TABLE_INFORMATION action %d\n", sfti->Action); + } + } + break; default: FIXME("(0x%08x,%p,0x%08x,%p) stub\n", SystemInformationClass,SystemInformation,Length,ResultLength); diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 3af8fdd..2ab12e4 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -59,6 +59,12 @@ static DWORD one_before_last_pid = 0; #define FIRM 0x4649524D #define RSMB 0x52534D42 +#ifdef linux +static const int firmware_todo = 0; +#else +static const int firmware_todo = 1; +#endif + static BOOL InitFunctionPtrs(void) { /* All needed functions are NT based, so using GetModuleHandle is a good check */ @@ -846,12 +852,11 @@ static void test_query_firmware(void) sfti->TableID = 0; status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1); -todo_wine ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); if (len1 == 0) /* xp, 2003 */ { - skip("SystemFirmwareTableInformation is not available\n"); + win_skip("SystemFirmwareTableInformation is not available\n"); HeapFree(GetProcessHeap(), 0, sfti); return; } @@ -865,6 +870,7 @@ todo_wine sfti->Action = SystemFirmwareTable_Get; status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); +todo_wine_if(firmware_todo) ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1); ok(sfti->TableBufferLength == len1 - min_sfti_len, @@ -874,6 +880,7 @@ todo_wine ok(!!sfti, "Failed to allocate memory\n"); status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2); +todo_wine_if(firmware_todo) ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); ok(len2 == len1, "Expected length %u, got %u\n", len1, len2); ok(sfti->TableBufferLength == len1 - min_sfti_len,

1 0

Alex Henrie : ntdll/tests: Add SystemFirmwareTableInformation tests.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 0bcee5eaf82d6fdf0a80e6d2d6fb9dc1f1c1a1ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bcee5eaf82d6fdf0a80e6d2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jul 12 00:57:49 2018 +0200 ntdll/tests: Add SystemFirmwareTableInformation tests. 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/ntdll/tests/info.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 7d60b94..3af8fdd 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -54,6 +54,11 @@ static DWORD one_before_last_pid = 0; } \ } while(0) +/* Firmware table providers */ +#define ACPI 0x41435049 +#define FIRM 0x4649524D +#define RSMB 0x52534D42 + static BOOL InitFunctionPtrs(void) { /* All needed functions are NT based, so using GetModuleHandle is a good check */ @@ -826,6 +831,57 @@ static void test_query_logicalprocex(void) } } +static void test_query_firmware(void) +{ + static const ULONG min_sfti_len = FIELD_OFFSET(SYSTEM_FIRMWARE_TABLE_INFORMATION, TableBuffer); + ULONG len1, len2; + NTSTATUS status; + SYSTEM_FIRMWARE_TABLE_INFORMATION *sfti; + + sfti = HeapAlloc(GetProcessHeap(), 0, min_sfti_len); + ok(!!sfti, "Failed to allocate memory\n"); + + sfti->ProviderSignature = 0; + sfti->Action = 0; + sfti->TableID = 0; + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len - 1, &len1); +todo_wine + ok(status == STATUS_INFO_LENGTH_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS) /* xp */, + "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + if (len1 == 0) /* xp, 2003 */ + { + skip("SystemFirmwareTableInformation is not available\n"); + HeapFree(GetProcessHeap(), 0, sfti); + return; + } + ok(len1 == min_sfti_len, "Expected length %u, got %u\n", min_sfti_len, len1); + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); + ok(status == STATUS_NOT_IMPLEMENTED, "Expected STATUS_NOT_IMPLEMENTED, got %08x\n", status); + ok(len1 == 0, "Expected length 0, got %u\n", len1); + + sfti->ProviderSignature = RSMB; + sfti->Action = SystemFirmwareTable_Get; + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, min_sfti_len, &len1); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(len1 >= min_sfti_len, "Expected length >= %u, got %u\n", min_sfti_len, len1); + ok(sfti->TableBufferLength == len1 - min_sfti_len, + "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + + sfti = HeapReAlloc(GetProcessHeap(), 0, sfti, len1); + ok(!!sfti, "Failed to allocate memory\n"); + + status = pNtQuerySystemInformation(SystemFirmwareTableInformation, sfti, len1, &len2); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(len2 == len1, "Expected length %u, got %u\n", len1, len2); + ok(sfti->TableBufferLength == len1 - min_sfti_len, + "Expected length %u, got %u\n", len1 - min_sfti_len, sfti->TableBufferLength); + + HeapFree(GetProcessHeap(), 0, sfti); +} + static void test_query_processor_power_info(void) { NTSTATUS status; @@ -2277,6 +2333,10 @@ START_TEST(info) trace("Starting test_process_debug_flags()\n"); test_query_process_debug_flags(argc, argv); + /* 0x4C SystemFirmwareTableInformation */ + trace("Starting test_query_firmware()\n"); + test_query_firmware(); + /* belongs to its own file */ trace("Starting test_readvirtualmemory()\n"); test_readvirtualmemory();

1 0

Michael Stefaniuc : dmime: Simplify the track list parser.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: wine Branch: master Commit: 23629d069a1315ad1e4b817da1ab652406c78eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=23629d069a1315ad1e4b817d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 23:43:28 2018 +0200 dmime: Simplify the track list parser. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 63 ++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 51 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 77c94f1..48fd643 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -659,8 +659,7 @@ static HRESULT load_track(IDirectMusicSegment8Impl *This, IStream *pClonedStream return S_OK; } -static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DWORD size, IStream *pStm) { HRESULT hr = E_FAIL; DMUS_PRIVATE_CHUNK Chunk; @@ -671,12 +670,7 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU DMUS_IO_TRACK_EXTRAS_HEADER track_xhdr; IDirectMusicTrack* pTrack = NULL; - if (pChunk->fccID != DMUS_FOURCC_TRACK_FORM) { - ERR_(dmfile)(": %s chunk should be a TRACK form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } - - StreamSize = pChunk->dwSize - sizeof(FOURCC); + StreamSize = size - sizeof(FOURCC); StreamCount = 0; do { @@ -819,52 +813,19 @@ static HRESULT parse_track_form(IDirectMusicSegment8Impl *This, DMUS_PRIVATE_CHU return S_OK; } -static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, DWORD StreamSize, IStream *pStm) +static HRESULT parse_track_list(IDirectMusicSegment8Impl *This, IStream *stream, + const struct chunk_entry *trkl) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry chunk = {.parent = trkl}; + HRESULT hr; - ListSize[0] = StreamSize - sizeof(FOURCC); - ListCount[0] = 0; + TRACE("Parsing track list in %p: %s\n", stream, debugstr_chunk(trkl)); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - switch (Chunk.fccID) { - case DMUS_FOURCC_TRACK_FORM: { - TRACE_(dmfile)(": TRACK form\n"); - hr = parse_track_form(This, &Chunk, pStm); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); + 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); - return S_OK; + return SUCCEEDED(hr) ? S_OK : hr; } static inline void dump_segment_header(DMUS_IO_SEGMENT_HEADER *h, DWORD size) @@ -920,7 +881,7 @@ static HRESULT parse_segment_form(IDirectMusicSegment8Impl *This, IStream *strea break; case FOURCC_LIST: if (chunk.type == DMUS_FOURCC_TRACK_LIST) - if (FAILED(hr = parse_track_list(This, chunk.size, stream))) + if (FAILED(hr = parse_track_list(This, stream, &chunk))) return hr; break; case FOURCC_RIFF:

1 0

Francois Gouget : testbot/web: Small formatting tweaks.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: tools Branch: master Commit: 2a3e1507761b6740f94ca60ab0b3627c6d39edde URL: https://source.winehq.org/git/tools.git/?a=commit;h=2a3e1507761b6740f94ca60… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 12 16:56:18 2018 +0200 testbot/web: Small formatting tweaks. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 28601d0..3fcec5d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -393,21 +393,16 @@ sub GenerateBody($) my $LogName = $MoreInfo->{Full} || $MoreInfo->{Logs}->[0] || "log"; my $ErrName = $LogName eq "log.old" ? "err.old" : "err"; - my ($EmptyDiag, $LogFirst); + my ($EmptyDiag, $LogFirst) = (undef, 1); if (open(my $LogFile, "<", "$TaskDir/$LogName")) { my $HasLogEntries; - my $CurrentDll = ""; - my $PrintedDll = ""; - $LogFirst = 1; + my ($CurrentDll, $PrintedDll) = ("", ""); foreach my $Line (<$LogFile>) { $HasLogEntries = 1; chomp $Line; - if ($Line =~ m/^([^:]+):[^ ]+ start [^ ]+ -\s*$/) - { - $CurrentDll = $1; - } + $CurrentDll = $1 if ($Line =~ m/^([_.a-z0-9-]+):[_a-z0-9]* start /); my $Html = $self->GetHtmlLine($MoreInfo->{Full}, $Line); next if (!defined $Html);

1 0

Francois Gouget : testbot: Use 'dir.exe' as the module name for programs.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: tools Branch: master Commit: 1b4f57822da483166100d652f338195d633d1cf6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=1b4f57822da483166100d65… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 12 16:55:53 2018 +0200 testbot: Use 'dir.exe' as the module name for programs. For programs one identifies test units as dir.exe:unit, So 'dir.exe' is what should be used for the Module field. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/PatchUtils.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 811c3b8..be5ce14 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -127,11 +127,12 @@ sub _LoadWineFiles() chomp $Line; $_WineFiles->{$Line} = 1; - if ($Line =~ m~^\w+/([^/]+)/tests/([^/]+)$~) + if ($Line =~ m~^(dlls|programs)/([^/]+)/tests/([^/]+)$~) { - my ($Module, $File) = ($1, $2); + my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); + $Module .= ".exe" if ($Root eq "programs"); $_TestList->{$Module}->{$File} = 1; } } @@ -156,19 +157,18 @@ sub _HandleFile($$$) if ($FilePath =~ m~^(dlls|programs)/([^/]+)/tests/([^/\s]+)$~) { - my ($Root, $Module, $File) = ($1, $2, $3); + my ($Root, $Dir, $File) = ($1, $2, $3); $Impacts->{IsWinePatch} = 1; $Impacts->{TestBuild} = 1; my $Tests = $Impacts->{Tests}; + my $Module = ($Root eq "programs") ? "$Dir.exe" : $Dir; if (!$Tests->{$Module}) { - my $ExeBase = ($Root eq "programs") ? "${Module}.exe_test" : - "${Module}_test"; $Tests->{$Module} = { "Module" => $Module, - "Path" => "$Root/$Module/tests", - "ExeBase" => $ExeBase, + "Path" => "$Root/$Dir/tests", + "ExeBase" => "${Module}_test", }; }

1 0

Francois Gouget : testbot: Fix the Type of the Wine VM steps.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: tools Branch: master Commit: cbf3a85cafd114c83f572a61557154eae3393bd8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=cbf3a85cafd114c83f572a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 12 16:53:16 2018 +0200 testbot: Fix the Type of the Wine VM steps. The default Step type is 'single' but for Wine VMs it should be a 'build' step. Fortunately it is not checked (yet). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Patches.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 87f2117..23b9217 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -246,6 +246,7 @@ sub Submit($$$) my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); $NewStep->FileType("patch"); + $NewStep->Type("build"); $NewStep->DebugLevel(0); # And a task for each VM

1 0

Francois Gouget : testbot: Remove the patchdlls vs. patchprograms distinction.
by Alexandre Julliard July 12, 2018

July 12, 2018

Module: tools Branch: master Commit: 54d18bad82267ff44b77e4cb0c3ee8eac34e1a02 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54d18bad82267ff44b77e4c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 12 17:10:47 2018 +0200 testbot: Remove the patchdlls vs. patchprograms distinction. A patch could impact tests in both Wine folders. It's up to the build task to handle whatever the patch contains. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunTask.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/ddl/update39.sql | 11 +++++++++++ testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Patches.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 2 +- testbot/web/GetFile.pl | 4 ++-- testbot/web/Submit.pl | 18 +++++++++--------- 9 files changed, 29 insertions(+), 18 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 90b9f03..10c0989 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -325,7 +325,7 @@ elsif (!$VM->GetDomain()->IsPoweredOn()) FatalError("The VM is not powered on\n"); } -if ($Step->FileType ne "patchdlls") +if ($Step->FileType ne "patch") { FatalError("Unexpected file type '". $Step->FileType ."' found\n"); } diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 0f2a093..974ff3b 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -445,7 +445,7 @@ if ($Step->Type eq "single") # If the user gave us an executable there is no telling # if it is going going to follow the Wine test standards. $IsWineTest = (defined $Step->PreviousNo and - $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patchdlls"); + $Job->Steps->GetItem($Step->PreviousNo)->FileType eq "patch"); } elsif ($Step->Type eq "suite") { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 1e43f9a..e7aa72e 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -383,7 +383,7 @@ elsif (!$VM->GetDomain()->IsPoweredOn()) } if (($Step->Type eq "suite" and $Step->FileType ne "none") or - ($Step->Type ne "suite" and $Step->FileType ne "patchdlls")) + ($Step->Type ne "suite" and $Step->FileType ne "patch")) { FatalError("Unexpected file type '". $Step->FileType ."' found\n"); } diff --git a/testbot/ddl/update39.sql b/testbot/ddl/update39.sql new file mode 100644 index 0000000..628e914 --- /dev/null +++ b/testbot/ddl/update39.sql @@ -0,0 +1,11 @@ +USE winetestbot; + +ALTER TABLE Steps + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms', 'patch') NOT NULL; + +UPDATE Steps + SET FileType = 'patch' + WHERE FileType = 'patchdlls' OR FileType = 'patchprograms'; + +ALTER TABLE Steps + MODIFY FileType ENUM('none', 'exe32', 'exe64', 'patch') NOT NULL; diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql index a6adea8..96fcdcb 100644 --- a/testbot/ddl/winetestbot.sql +++ b/testbot/ddl/winetestbot.sql @@ -133,7 +133,7 @@ CREATE TABLE Steps Type ENUM('suite', 'single', 'build', 'reconfig') NOT NULL, Status ENUM('queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped') NOT NULL, FileName VARCHAR(100) NULL, - FileType ENUM('none', 'exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL, + FileType ENUM('none', 'exe32', 'exe64', 'patch') NOT NULL, DebugLevel INT(2) NOT NULL, ReportSuccessfulTests ENUM('Y', 'N') NOT NULL, PRIMARY KEY (JobId, No), diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 2d553fe..87f2117 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -181,7 +181,7 @@ sub Submit($$$) # Create the Build Step my $BuildStep = $NewJob->Steps->Add(); $BuildStep->FileName("patch.diff"); - $BuildStep->FileType("patchdlls"); + $BuildStep->FileType("patch"); $BuildStep->Type("build"); $BuildStep->DebugLevel(0); @@ -245,7 +245,7 @@ sub Submit($$$) # Add a Wine step to the job my $NewStep = $NewJob->Steps->Add(); $NewStep->FileName("patch.diff"); - $NewStep->FileType("patchdlls"); + $NewStep->FileType("patch"); $NewStep->DebugLevel(0); # And a task for each VM diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index cb2c6ee..2f5bdb0 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -232,7 +232,7 @@ my @PropertyDescriptors = ( CreateEnumPropertyDescriptor("Status", "Status", !1, 1, ['queued', 'running', 'completed', 'badpatch', 'badbuild', 'boterror', 'canceled', 'skipped']), CreateEnumPropertyDescriptor("Type", "Step type", !1, 1, ['suite', 'single', 'build', 'reconfig']), CreateBasicPropertyDescriptor("FileName", "File name", !1, !1, "A", 100), - CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patchdlls', 'patchprograms']), + CreateEnumPropertyDescriptor("FileType", "File type", !1, 1, ['none', 'exe32', 'exe64', 'patch']), CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2), CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1), CreateDetailrefPropertyDescriptor("Tasks", "Tasks", !1, !1, \&CreateTasks), diff --git a/testbot/web/GetFile.pl b/testbot/web/GetFile.pl index 1fe1407..a869949 100644 --- a/testbot/web/GetFile.pl +++ b/testbot/web/GetFile.pl @@ -86,8 +86,8 @@ sub GetFile($$$) $Request->headers_out->add("Pragma", "no-cache"); # Text or binary file - my $MIME = $Step->FileType eq "patchdlls" ? "text/plain" : - "application/octet-stream"; + my $MIME = $Step->FileType eq "patch" ? "text/plain" : + "application/octet-stream"; $Request->content_type($MIME); $Request->headers_out->add("Content-Disposition", 'attachment; filename="' . $Step->FileName . '"'); diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index e207d78..926fcb7 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -119,7 +119,7 @@ sub GetPropertyDescriptors($) } elsif ($self->{Page} == 3) { - my $IsPatch = ($self->GetParam("FileType") eq "patchdlls"); + my $IsPatch = ($self->GetParam("FileType") eq "patch"); $self->{PropertyDescriptors3}[0]->{IsRequired} = $IsPatch; return $self->{PropertyDescriptors3}; } @@ -394,7 +394,7 @@ sub DisplayProperty($$) if ($self->{Page} == 3) { my $PropertyName = $PropertyDescriptor->GetName(); - if ($self->GetParam("FileType") eq "patchdlls") + if ($self->GetParam("FileType") eq "patch") { if ($PropertyName eq "Run64") { @@ -482,7 +482,7 @@ sub Validate($) } elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { - if (($self->GetParam("FileType") eq "patchdlls" && + if (($self->GetParam("FileType") eq "patch" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || !IsValidFileName($self->GetParam("TestExecutable"))) { @@ -608,7 +608,7 @@ sub DetermineFileType($$) else { my $TestInfo = (values %{$Impacts->{Tests}})[0]; - $FileType = "patchdlls"; + $FileType = "patch"; $ExeBase = $TestInfo->{ExeBase}; $TestUnit = (keys %{$TestInfo->{Units}})[0]; } @@ -656,7 +656,7 @@ sub OnPage1Next($) $self->{ErrMessage} = $ErrMessage; return !1; } - if ($FileType !~ /^(?:exe32|exe64|patchdlls)$/) + if ($FileType !~ /^(?:exe32|exe64|patch)$/) { $self->{ErrField} = "File"; $self->{ErrMessage} = "Unrecognized file type"; @@ -781,7 +781,7 @@ sub OnSubmit($) { next if ($Bits eq "32" && $FileType eq "exe64"); next if ($Bits eq "64" && $FileType eq "exe32"); - next if ($Bits eq "64" && $FileType eq "patchdlls" && !defined($self->GetParam("Run64"))); + next if ($Bits eq "64" && $FileType eq "patch" && !defined($self->GetParam("Run64"))); my $Tasks; my $VMs = CreateVMs(); @@ -795,7 +795,7 @@ sub OnSubmit($) if (!$Tasks) { - if (!$BuildStep and $FileType eq "patchdlls") + if (!$BuildStep and $FileType eq "patch") { # This is a patch so add a build step... $BuildStep = $Steps->Add(); @@ -824,7 +824,7 @@ sub OnSubmit($) # Then create the test step my $TestStep = $Steps->Add(); - if ($FileType eq "patchdlls") + if ($FileType eq "patch") { $TestStep->PreviousNo($BuildStep->No); my $TestExe = basename($self->GetParam("TestExecutable")); @@ -850,7 +850,7 @@ sub OnSubmit($) } } - if ($FileType eq "patchdlls") + if ($FileType eq "patch") { my $Tasks; my $VMs = CreateVMs();

1 0

Michael Stefaniuc : pdh: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: acb879c9d2feae69e8b5b1ede28523a29aef1b89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acb879c9d2feae69e8b5b1ed… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:14 2018 +0200 pdh: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index fb131bd..b648d8b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -210,7 +210,7 @@ static const struct source counter_sources[] = static BOOL is_local_machine( const WCHAR *name, DWORD len ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD buflen = sizeof(buf) / sizeof(buf[0]); + DWORD buflen = ARRAY_SIZE(buf); if (!GetComputerNameW( buf, &buflen )) return FALSE; return len == buflen && !memicmpW( name, buf, buflen ); @@ -274,7 +274,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, } *hcounter = NULL; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, path )) { @@ -867,7 +867,7 @@ PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDW FIXME("remote machine not supported\n"); return PDH_CSTATUS_NO_MACHINE; } - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (pdh_match_path( counter_sources[i].path, name )) { @@ -886,7 +886,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR PDH_STATUS ret; WCHAR *machineW = NULL; WCHAR bufferW[PDH_MAX_COUNTER_NAME]; - DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); + DWORD sizeW = ARRAY_SIZE(bufferW); TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); @@ -925,7 +925,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST if (!buffer || !size) return PDH_INVALID_ARGUMENT; if (!index) return ERROR_SUCCESS; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) { if (counter_sources[i].index == index) { @@ -1077,7 +1077,7 @@ PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) if ((ret = validate_path( path ))) return ret; - for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + for (i = 0; i < ARRAY_SIZE(counter_sources); i++) if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; return PDH_CSTATUS_NO_COUNTER;

1 0

Michael Stefaniuc : mlang: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 312cad708bd6aeb29f2f76af79d313431133ba9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=312cad708bd6aeb29f2f76af… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jul 11 22:06:13 2018 +0200 mlang: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mlang/mlang.c | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=312cad708bd6aeb29f2f…

1 0

Akihiro Sagawa : winmm: Use microsecond unit in MIDI stream position variable to simplify the code.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 16808d432c48973f26a2ab4fdacf7776127a028e URL: https://source.winehq.org/git/wine.git/?a=commit;h=16808d432c48973f26a2ab4f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:19 2018 +0900 winmm: Use microsecond unit in MIDI stream position variable to simplify the code. Since 32-bit variable overflows after approximately 70 minutes, we use 64-bit variable for this purpose. `remainder' member is removed. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/winmm.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 0328721..4b8d4de 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -915,13 +915,12 @@ typedef struct WINE_MIDIStream { CRITICAL_SECTION lock; DWORD dwTempo; DWORD dwTimeDiv; - DWORD dwPositionMS; + ULONGLONG position_usec; DWORD dwPulses; DWORD dwStartTicks; DWORD dwElapsedMS; WORD wFlags; WORD status; - WORD remainder; HANDLE hEvent; LPMIDIHDR lpMidiHdr; } WINE_MIDIStream; @@ -1008,8 +1007,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->status = MSM_STATUS_STOPPED; lpMidiStrm->dwPulses = 0; lpMidiStrm->dwElapsedMS = 0; - lpMidiStrm->dwPositionMS = 0; - lpMidiStrm->remainder = 0; + lpMidiStrm->position_usec = 0; LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); @@ -1181,15 +1179,12 @@ start_header: /* do we have to wait ? */ if (me->dwDeltaTime) { - DWORD delta; EnterCriticalSection(&lpMidiStrm->lock); - delta = lpMidiStrm->remainder + MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); - lpMidiStrm->dwPositionMS += delta / 1000; - lpMidiStrm->remainder = delta % 1000; + lpMidiStrm->position_usec += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); lpMidiStrm->dwPulses += me->dwDeltaTime; LeaveCriticalSection(&lpMidiStrm->lock); - dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; + dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; TRACE("%u/%u/%u\n", dwToGo, GetTickCount(), me->dwDeltaTime); while (dwToGo - (dwCurrTC = GetTickCount()) <= MAXLONG) { @@ -1204,7 +1199,7 @@ start_header: } } /* reset dwToGo because dwStartTicks might be updated */ - dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->dwPositionMS; + dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; } else { /* timeout, so me->dwDeltaTime is elapsed, can break the while loop */ break; @@ -1334,10 +1329,9 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, if (!lpMidiStrm) return MMSYSERR_NOMEM; - lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */ + lpMidiStrm->dwTempo = 500000; /* microseconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ - lpMidiStrm->dwPositionMS = 0; - lpMidiStrm->remainder = 0; + lpMidiStrm->position_usec = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0;

1 0

Akihiro Sagawa : winmm: Make TIME_TICKS position continuous.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: ced8ce55b499e4b8e62549a3c353324a93f8f3db URL: https://source.winehq.org/git/wine.git/?a=commit;h=ced8ce55b499e4b8e62549a3… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:23 2018 +0900 winmm: Make TIME_TICKS position continuous. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 2 +- dlls/winmm/winmm.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index c550dfa..66f35ef 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -893,7 +893,7 @@ static void test_midiStream(UINT udev, HWND hwnd) expected = ret; ret = get_position(hm, TIME_TICKS); - todo_wine ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, + ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, "TIME_TICKS position is continuous, got %u\n", ret); /* shouldn't set time division property while playing */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 4b8d4de..f2dfae9 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -919,6 +919,7 @@ typedef struct WINE_MIDIStream { DWORD dwPulses; DWORD dwStartTicks; DWORD dwElapsedMS; + DWORD dwLastPositionMS; WORD wFlags; WORD status; HANDLE hEvent; @@ -1008,6 +1009,7 @@ static BOOL MMSYSTEM_MidiStream_MessageHandler(WINE_MIDIStream* lpMidiStrm, LPWI lpMidiStrm->dwPulses = 0; lpMidiStrm->dwElapsedMS = 0; lpMidiStrm->position_usec = 0; + lpMidiStrm->dwLastPositionMS = 0; LeaveCriticalSection(&lpMidiStrm->lock); /* this is not quite what MS doc says... */ midiOutReset(lpMidiStrm->hDevice); @@ -1181,7 +1183,6 @@ start_header: if (me->dwDeltaTime) { EnterCriticalSection(&lpMidiStrm->lock); lpMidiStrm->position_usec += MMSYSTEM_MidiStream_Convert(lpMidiStrm, me->dwDeltaTime); - lpMidiStrm->dwPulses += me->dwDeltaTime; LeaveCriticalSection(&lpMidiStrm->lock); dwToGo = lpMidiStrm->dwStartTicks + lpMidiStrm->position_usec / 1000; @@ -1205,6 +1206,10 @@ start_header: break; } } + EnterCriticalSection(&lpMidiStrm->lock); + lpMidiStrm->dwPulses += me->dwDeltaTime; + lpMidiStrm->dwLastPositionMS = midistream_get_playing_position(lpMidiStrm); + LeaveCriticalSection(&lpMidiStrm->lock); } switch (MEVT_EVENTTYPE(me->dwEvent & ~MEVT_F_CALLBACK)) { case MEVT_COMMENT: @@ -1332,6 +1337,7 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, lpMidiStrm->dwTempo = 500000; /* microseconds per quarter note, i.e. 120 BPM */ lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */ lpMidiStrm->position_usec = 0; + lpMidiStrm->dwLastPositionMS = 0; lpMidiStrm->status = MSM_STATUS_PAUSED; lpMidiStrm->dwElapsedMS = 0; @@ -1467,6 +1473,24 @@ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) return midistream_post_message_and_wait(lpMidiStrm, WINE_MSM_PAUSE, 0); } +static DWORD midistream_get_current_pulse(WINE_MIDIStream* lpMidiStrm) +{ + DWORD pulses = 0; + DWORD now = midistream_get_playing_position(lpMidiStrm); + DWORD delta = now - lpMidiStrm->dwLastPositionMS; + if (lpMidiStrm->dwTimeDiv > 0x8000) { + /* SMPTE, unchecked FIXME */ + BYTE nf = 256 - HIBYTE(lpMidiStrm->dwTimeDiv); + BYTE nsf = LOBYTE(lpMidiStrm->dwTimeDiv); + pulses = (delta * nf * nsf) / 1000; + } + else if (lpMidiStrm->dwTimeDiv) { + pulses = (DWORD)((double)(delta * lpMidiStrm->dwTimeDiv) * + 1000.0 / (double)lpMidiStrm->dwTempo); + } + return lpMidiStrm->dwPulses + pulses; +} + /************************************************************************** * midiStreamPosition [WINMM.@] */ @@ -1496,7 +1520,7 @@ MMRESULT WINAPI midiStreamPosition(HMIDISTRM hMidiStrm, LPMMTIME lpMMT, UINT cbm TRACE("=> %d ms\n", lpMMT->u.ms); break; case TIME_TICKS: - lpMMT->u.ticks = lpMidiStrm->dwPulses; + lpMMT->u.ticks = midistream_get_current_pulse(lpMidiStrm); TRACE("=> %d ticks\n", lpMMT->u.ticks); break; }

1 0

Akihiro Sagawa : winmm/tests: Add more MIDI stream position tests.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: 2ae051720904a10ab3d14655ecde87012ead9aa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ae051720904a10ab3d14655… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Jul 11 22:33:21 2018 +0900 winmm/tests: Add more MIDI stream position tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/midi.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index c46286b..c550dfa 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -509,6 +509,11 @@ static void test_position(HMIDISTRM hm, UINT typein, UINT typeout) case TIME_MIDI: trace("Stream position song pointer %u\n", mmtime.u.midi.songptrpos); break; + case TIME_SMPTE: + trace("Stream position %02u:%02u:%02u.%02u/%02u\n", + mmtime.u.smpte.hour, mmtime.u.smpte.min, mmtime.u.smpte.sec, + mmtime.u.smpte.frame, mmtime.u.smpte.fps); + break; } } @@ -573,6 +578,8 @@ static DWORD get_position(HMIDISTRM hm, UINT type) return mmtime.u.ms; case TIME_TICKS: return mmtime.u.ticks; + case TIME_MIDI: + return mmtime.u.midi.songptrpos; default: return MAXDWORD; } @@ -885,6 +892,10 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret > expected && ret < expected + MARGIN, "expected greater than %ums, got %ums\n", expected, ret); expected = ret; + ret = get_position(hm, TIME_TICKS); + todo_wine ok(ret > strmNopsWithDelta[0].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime, + "TIME_TICKS position is continuous, got %u\n", ret); + /* shouldn't set time division property while playing */ midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); midiprop.tdiv.dwTimeDiv = 24; @@ -914,6 +925,16 @@ static void test_midiStream(UINT udev, HWND hwnd) ok(ret >= strmNopsWithDelta[1].dwDeltaTime && ret < strmNopsWithDelta[1].dwDeltaTime + 3, "expected %u ticks, got %u\n", strmNopsWithDelta[1].dwDeltaTime, ret); + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_GET | MIDIPROP_TIMEDIV); + ok(!rc, "midiStreamProperty(GET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + ok(midiprop.tdiv.dwTimeDiv == 24, "expected 24, got %u\n", midiprop.tdiv.dwTimeDiv); + + /* TIME_MIDI value is a quarter of TIME_TICKS, rounded */ + expected = (ret + midiprop.tdiv.dwTimeDiv/8) / (midiprop.tdiv.dwTimeDiv/4); + ret = get_position(hm, TIME_MIDI); + todo_wine ok(ret == expected, "expected song pointer %u, got %u\n", expected, ret); + ok(records.count == 2, "expected 2 MM_MOM_DONE messages, got %d\n", records.count); /* Time between midiStreamPause and midiStreamRestart isn't counted. @@ -932,6 +953,18 @@ static void test_midiStream(UINT udev, HWND hwnd) ret = get_position(hm, TIME_MS); ok(ret == 0, "expected 0ms, got %ums\n", ret); + midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv); + midiprop.tdiv.dwTimeDiv = 0xe204; /* 30 fps, 4 ticks/frame */ + rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_SET | MIDIPROP_TIMEDIV); + ok(!rc, "midiStreamProperty(SET|TIMEDIV, dev=%d) rc=%s\n", udev, mmsys_error(rc)); + + test_position(hm, TIME_MS, TIME_MS); + test_position(hm, TIME_TICKS, TIME_TICKS); + test_position(hm, TIME_MIDI, TIME_MS); + todo_wine test_position(hm, TIME_SMPTE, TIME_SMPTE); + test_position(hm, TIME_SAMPLES, TIME_MS); + test_position(hm, TIME_BYTES, TIME_MS); + rc = midiStreamClose(hm); ok(!rc, "midiStreamClose(dev=%d) rc=%s\n", udev, mmsys_error(rc)); CloseHandle(records.done);

1 0

Henri Verbeet : include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: d771bd72965b64c407db2767f13471d224e7b946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d771bd72965b64c407db2767… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 11 17:47:24 2018 +0430 include: Avoid redefining the DWRITE_GLYPH_RUN_DESCRIPTION typedef. Based on a patch by Alistair Leslie-Hughes. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite.idl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/dwrite.idl b/include/dwrite.idl index e6ab2b7..bfb2c1b 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -404,14 +404,18 @@ struct DWRITE_GLYPH_RUN UINT32 bidiLevel; }; -typedef struct DWRITE_GLYPH_RUN_DESCRIPTION +cpp_quote("#ifndef __d2d1_1_h__") +typedef struct DWRITE_GLYPH_RUN_DESCRIPTION DWRITE_GLYPH_RUN_DESCRIPTION; +cpp_quote("#endif /* __d2d1_1_h__ */") + +struct DWRITE_GLYPH_RUN_DESCRIPTION { WCHAR const* localeName; WCHAR const* string; UINT32 stringLength; UINT16 const* clusterMap; UINT32 textPosition; -} DWRITE_GLYPH_RUN_DESCRIPTION; +}; typedef struct DWRITE_UNDERLINE {

1 0

Piotr Caban : msvcp120: Test values returned by _Concurrent_vector_base_v4 ::_Internal_clear.
by Alexandre Julliard July 11, 2018

July 11, 2018

Module: wine Branch: master Commit: c9f174f0ca4e742223ff4e837a46ca6f3c5f00c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f174f0ca4e742223ff4e83… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jul 11 12:32:33 2018 +0200 msvcp120: Test values returned by _Concurrent_vector_base_v4::_Internal_clear. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index cd8a514..a130827 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2888,6 +2888,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); concurrent_vector_int_dtor(&v2); concurrent_vector_int_ctor(&v2); @@ -2921,6 +2922,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 3, "_Internal_clear returned %ld expected 3\n", (long)size); concurrent_vector_int_dtor(&v2); concurrent_vector_int_ctor(&v2); @@ -2954,6 +2956,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 2, "_Internal_clear returned %ld expected 2\n", (long)size); concurrent_vector_int_dtor(&v2); /* test for _Internal_compact */ @@ -3032,6 +3035,7 @@ static void test_vector_base_v4(void) size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); CHECK_CALLED(concurrent_vector_int_destroy); + ok(size == 4, "_Internal_clear returned %ld expected 4\n", (long)size); concurrent_vector_int_dtor(&v2); /* test for Internal_grow_by */

1 0