February 2024 - Wine-Commits

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 18b0473fe91857dd46b9ee4d640fd5d531db8c3c URL: https://gitlab.winehq.org/wine/wine/-/commit/18b0473fe91857dd46b9ee4d640fd5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:53:44 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on ARM. --- dlls/ntdll/signal_arm.c | 41 +++++++---------- dlls/ntdll/tests/unwind.c | 112 +++++++++++++++++++++++++++------------------- dlls/ntdll/unwind.c | 11 +++-- 3 files changed, 90 insertions(+), 74 deletions(-)

1 0

Alexandre Julliard : ntdll: Handle leaf functions in RtlVirtualUnwind on ARM64.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 9f555cde204a3187bcbebd8c8685b7dca6c71843 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f555cde204a3187bcbebd8c8685b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 14:52:15 2024 +0100 ntdll: Handle leaf functions in RtlVirtualUnwind on ARM64. --- dlls/ntdll/signal_arm64.c | 38 +++++-------- dlls/ntdll/tests/unwind.c | 137 ++++++++++++++++++++++++++++------------------ dlls/ntdll/unwind.c | 12 +++- 3 files changed, 109 insertions(+), 78 deletions(-)

1 0

Alexandre Julliard : include: Add new idl files to the makefile.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 852e2ffc13ba5322a382f125921ba2fe5c43e118 URL: https://gitlab.winehq.org/wine/wine/-/commit/852e2ffc13ba5322a382f125921ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 22 12:56:33 2024 +0100 include: Add new idl files to the makefile. --- include/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 3e05d259328..8d41cd109ad 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -844,12 +844,14 @@ SOURCES = \ windows.graphics.directx.idl \ windows.graphics.effects.idl \ windows.graphics.holographic.idl \ + windows.graphics.imaging.idl \ windows.h \ windows.management.deployment.idl \ windows.media.capture.idl \ windows.media.closedcaptioning.idl \ windows.media.devices.idl \ windows.media.effects.idl \ + windows.media.faceanalysis.idl \ windows.media.idl \ windows.media.render.idl \ windows.media.speechrecognition.idl \

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormatsKHR driver entry.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: f7bff8802fcecafaa571fdb870d81dec14862828 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7bff8802fcecafaa571fdb870d81d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:10:22 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormatsKHR driver entry. --- dlls/winemac.drv/vulkan.c | 14 -------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan.c | 2 +- dlls/winevulkan/vulkan_thunks.c | 4 ++-- dlls/winewayland.drv/vulkan.c | 16 ---------------- dlls/winex11.drv/vulkan.c | 13 ------------- include/wine/vulkan_driver.h | 5 +---- 7 files changed, 5 insertions(+), 52 deletions(-)

1 0

Rémi Bernon : winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormats2KHR driver entry.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 8a9840805663f1414ec88606198813c1486c807b URL: https://gitlab.winehq.org/wine/wine/-/commit/8a9840805663f1414ec88606198813… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 10 11:09:54 2023 +0100 winevulkan: Remove now unnecessary vkGetPhysicalDeviceSurfaceFormats2KHR driver entry. --- dlls/winemac.drv/vulkan.c | 16 ------------- dlls/winevulkan/make_vulkan | 3 +-- dlls/winevulkan/vulkan.c | 2 +- dlls/winewayland.drv/vulkan.c | 53 ------------------------------------------- dlls/winex11.drv/vulkan.c | 38 ------------------------------- include/wine/vulkan_driver.h | 5 +--- 6 files changed, 3 insertions(+), 114 deletions(-)

1 0

Rémi Bernon : winevulkan: Implement vkGetPhysicalDeviceSurfaceFormats2KHR fallback.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 64ced5a345c0401afa0b9f564bfbe13255c96264 URL: https://gitlab.winehq.org/wine/wine/-/commit/64ced5a345c0401afa0b9f564bfbe1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 1 12:06:35 2023 +0100 winevulkan: Implement vkGetPhysicalDeviceSurfaceFormats2KHR fallback. --- dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 50 +++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.c | 52 +++-------------------------------------- dlls/winevulkan/vulkan_thunks.h | 1 + 4 files changed, 55 insertions(+), 49 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 4417b3a04bf..be5a6c8e531 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -261,6 +261,7 @@ MANUAL_UNIX_THUNKS = { "vkGetPhysicalDevicePresentRectanglesKHR", "vkGetPhysicalDeviceSurfaceCapabilities2KHR", "vkGetPhysicalDeviceSurfaceCapabilitiesKHR", + "vkGetPhysicalDeviceSurfaceFormats2KHR", "vkMapMemory", "vkMapMemory2KHR", "vkUnmapMemory", diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 32cd900d83d..fe7072ade22 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1939,6 +1939,56 @@ VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice device_ha surface->host_surface, rect_count, rects); } +VkResult wine_vkGetPhysicalDeviceSurfaceFormatsKHR(VkPhysicalDevice device_handle, VkSurfaceKHR surface_handle, + uint32_t *format_count, VkSurfaceFormatKHR *formats) +{ + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); + struct wine_surface *surface = wine_surface_from_handle(surface_handle); + struct wine_instance *instance = physical_device->instance; + + return instance->funcs.p_vkGetPhysicalDeviceSurfaceFormatsKHR(physical_device->host_physical_device, surface->driver_surface, + format_count, formats); +} + +VkResult wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice device_handle, const VkPhysicalDeviceSurfaceInfo2KHR *surface_info, + uint32_t *format_count, VkSurfaceFormat2KHR *formats) +{ + struct wine_phys_dev *physical_device = wine_phys_dev_from_handle(device_handle); + struct wine_surface *surface = wine_surface_from_handle(surface_info->surface); + VkPhysicalDeviceSurfaceInfo2KHR surface_info_host = *surface_info; + struct wine_instance *instance = physical_device->instance; + VkResult res; + + if (!physical_device->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR) + { + VkSurfaceFormatKHR *surface_formats; + UINT i; + + /* Until the loader version exporting this function is common, emulate it using the older non-2 version. */ + if (surface_info->pNext) FIXME("Emulating vkGetPhysicalDeviceSurfaceFormats2KHR, ignoring pNext.\n"); + + if (!formats) return wine_vkGetPhysicalDeviceSurfaceFormatsKHR(device_handle, surface_info->surface, format_count, NULL); + + surface_formats = calloc(*format_count, sizeof(*surface_formats)); + if (!surface_formats) return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = wine_vkGetPhysicalDeviceSurfaceFormatsKHR(device_handle, surface_info->surface, format_count, surface_formats); + if (res == VK_SUCCESS || res == VK_INCOMPLETE) + { + for (i = 0; i < *format_count; i++) + formats[i].surfaceFormat = surface_formats[i]; + } + + free(surface_formats); + return res; + } + + surface_info_host.surface = surface->driver_surface; + + return instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(physical_device->host_physical_device, + &surface_info_host, format_count, formats); +} + VkResult wine_vkCreateDebugUtilsMessengerEXT(VkInstance handle, const VkDebugUtilsMessengerCreateInfoEXT *create_info, const VkAllocationCallbacks *allocator, diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 3667fc51d90..886186332d6 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -28124,50 +28124,6 @@ static inline void convert_VkSurfaceCapabilities2KHR_host_to_win32(const VkSurfa } } -#ifdef _WIN64 -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_driver(const VkPhysicalDeviceSurfaceInfo2KHR *in, VkPhysicalDeviceSurfaceInfo2KHR *out) -{ - if (!in) return; - - out->sType = in->sType; - out->pNext = in->pNext; - out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; -} -#endif /* _WIN64 */ - -static inline void convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_driver(struct conversion_context *ctx, const VkPhysicalDeviceSurfaceInfo2KHR32 *in, VkPhysicalDeviceSurfaceInfo2KHR *out) -{ - const VkBaseInStructure32 *in_header; - VkBaseOutStructure *out_header = (void *)out; - - if (!in) return; - - out->sType = in->sType; - out->pNext = NULL; - out->surface = in->surface ? wine_surface_from_handle(in->surface)->driver_surface : 0; - - for (in_header = UlongToPtr(in->pNext); in_header; in_header = UlongToPtr(in_header->pNext)) - { - switch (in_header->sType) - { - case VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT: - { - VkSurfacePresentModeEXT *out_ext = conversion_context_alloc(ctx, sizeof(*out_ext)); - const VkSurfacePresentModeEXT32 *in_ext = (const VkSurfacePresentModeEXT32 *)in_header; - out_ext->sType = VK_STRUCTURE_TYPE_SURFACE_PRESENT_MODE_EXT; - out_ext->pNext = NULL; - out_ext->presentMode = in_ext->presentMode; - out_header->pNext = (void *)out_ext; - out_header = (void *)out_ext; - break; - } - default: - FIXME("Unhandled sType %u.\n", in_header->sType); - break; - } - } -} - static inline void convert_VkSurfaceFormat2KHR_win32_to_host(struct conversion_context *ctx, const VkSurfaceFormat2KHR32 *in, VkSurfaceFormat2KHR *out) { const VkBaseInStructure32 *in_header; @@ -43515,12 +43471,10 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(void *args) static NTSTATUS thunk64_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) { struct vkGetPhysicalDeviceSurfaceFormats2KHR_params *params = args; - VkPhysicalDeviceSurfaceInfo2KHR pSurfaceInfo_host; TRACE("%p, %p, %p, %p\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win64_to_driver(params->pSurfaceInfo, &pSurfaceInfo_host); - params->result = wine_phys_dev_from_handle(params->physicalDevice)->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle(params->physicalDevice)->host_physical_device, &pSurfaceInfo_host, params->pSurfaceFormatCount, params->pSurfaceFormats); + params->result = wine_vkGetPhysicalDeviceSurfaceFormats2KHR(params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); return STATUS_SUCCESS; } #endif /* _WIN64 */ @@ -43543,9 +43497,9 @@ static NTSTATUS thunk32_vkGetPhysicalDeviceSurfaceFormats2KHR(void *args) TRACE("%#x, %#x, %#x, %#x\n", params->physicalDevice, params->pSurfaceInfo, params->pSurfaceFormatCount, params->pSurfaceFormats); init_conversion_context(ctx); - convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_driver(ctx, (const VkPhysicalDeviceSurfaceInfo2KHR32 *)UlongToPtr(params->pSurfaceInfo), &pSurfaceInfo_host); + convert_VkPhysicalDeviceSurfaceInfo2KHR_win32_to_unwrapped_host(ctx, (const VkPhysicalDeviceSurfaceInfo2KHR32 *)UlongToPtr(params->pSurfaceInfo), &pSurfaceInfo_host); pSurfaceFormats_host = convert_VkSurfaceFormat2KHR_array_win32_to_host(ctx, (VkSurfaceFormat2KHR32 *)UlongToPtr(params->pSurfaceFormats), *(uint32_t *)UlongToPtr(params->pSurfaceFormatCount)); - params->result = wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->instance->funcs.p_vkGetPhysicalDeviceSurfaceFormats2KHR(wine_phys_dev_from_handle((VkPhysicalDevice)UlongToPtr(params->physicalDevice))->host_physical_device, &pSurfaceInfo_host, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), pSurfaceFormats_host); + params->result = wine_vkGetPhysicalDeviceSurfaceFormats2KHR((VkPhysicalDevice)UlongToPtr(params->physicalDevice), &pSurfaceInfo_host, (uint32_t *)UlongToPtr(params->pSurfaceFormatCount), pSurfaceFormats_host); convert_VkSurfaceFormat2KHR_array_host_to_win32(pSurfaceFormats_host, (VkSurfaceFormat2KHR32 *)UlongToPtr(params->pSurfaceFormats), *(uint32_t *)UlongToPtr(params->pSurfaceFormatCount)); free_conversion_context(ctx); return STATUS_SUCCESS; diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 28a8d8a0090..2321bb91c09 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -61,6 +61,7 @@ VkResult wine_vkGetPhysicalDeviceImageFormatProperties2KHR(VkPhysicalDevice phys VkResult wine_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, uint32_t *pRectCount, VkRect2D *pRects); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, VkSurfaceCapabilities2KHR *pSurfaceCapabilities); VkResult wine_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(VkPhysicalDevice physicalDevice, VkSurfaceKHR surface, VkSurfaceCapabilitiesKHR *pSurfaceCapabilities); +VkResult wine_vkGetPhysicalDeviceSurfaceFormats2KHR(VkPhysicalDevice physicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *pSurfaceInfo, uint32_t *pSurfaceFormatCount, VkSurfaceFormat2KHR *pSurfaceFormats); VkResult wine_vkMapMemory(VkDevice device, VkDeviceMemory memory, VkDeviceSize offset, VkDeviceSize size, VkMemoryMapFlags flags, void **ppData); VkResult wine_vkMapMemory2KHR(VkDevice device, const VkMemoryMapInfoKHR *pMemoryMapInfo, void **ppData); void wine_vkUnmapMemory(VkDevice device, VkDeviceMemory memory);

1 0

Yuxuan Shui : dmime: Don't skip chunk for MIDI files.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 813b35c9d1045e1a39a5d14d36a11103fc30b15f URL: https://gitlab.winehq.org/wine/wine/-/commit/813b35c9d1045e1a39a5d14d36a111… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Feb 16 17:01:08 2024 +0000 dmime: Don't skip chunk for MIDI files. MIDI files aren't RIFF, calling stream_skip_chunk on it is invalid. --- dlls/dmime/segment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 82e06f4537d..b0485aaedd9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -844,7 +844,9 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream } } - stream_skip_chunk(stream, &chunk); + if (chunk.id != mmioFOURCC('M', 'T', 'h', 'd')) + stream_skip_chunk(stream, &chunk); + if (FAILED(hr)) { WARN("Failed to load segment from stream %p, hr %#lx\n", stream, hr);

1 0

Alex Henrie : msxml3: Use CRT allocation functions.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 73685eb080292cb6c9ba8298cc91e0321a922b1b URL: https://gitlab.winehq.org/wine/wine/-/commit/73685eb080292cb6c9ba8298cc91e0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Feb 17 22:48:26 2024 -0700 msxml3: Use CRT allocation functions. --- dlls/msxml3/attribute.c | 4 ++-- dlls/msxml3/bsc.c | 4 ++-- dlls/msxml3/cdata.c | 4 ++-- dlls/msxml3/comment.c | 4 ++-- dlls/msxml3/dispex.c | 19 +++++++-------- dlls/msxml3/docfrag.c | 4 ++-- dlls/msxml3/doctype.c | 4 ++-- dlls/msxml3/domdoc.c | 58 ++++++++++++++++++++++----------------------- dlls/msxml3/domimpl.c | 4 ++-- dlls/msxml3/element.c | 44 +++++++++++++++++----------------- dlls/msxml3/entityref.c | 4 ++-- dlls/msxml3/factory.c | 6 ++--- dlls/msxml3/httprequest.c | 34 +++++++++++++------------- dlls/msxml3/main.c | 8 +++---- dlls/msxml3/msxml_dispex.h | 1 - dlls/msxml3/msxml_private.h | 7 +++--- dlls/msxml3/mxnamespace.c | 22 ++++++++--------- dlls/msxml3/mxwriter.c | 42 ++++++++++++++++---------------- dlls/msxml3/node.c | 32 ++++++++++++------------- dlls/msxml3/nodelist.c | 4 ++-- dlls/msxml3/nodemap.c | 4 ++-- dlls/msxml3/parseerror.c | 4 ++-- dlls/msxml3/pi.c | 14 +++++------ dlls/msxml3/schema.c | 46 +++++++++++++++++------------------ dlls/msxml3/selection.c | 10 ++++---- dlls/msxml3/stylesheet.c | 14 +++++------ dlls/msxml3/text.c | 4 ++-- dlls/msxml3/xmldoc.c | 4 ++-- dlls/msxml3/xmlelem.c | 18 +++++++------- dlls/msxml3/xmlparser.c | 5 ++-- dlls/msxml3/xmlview.c | 18 +++++++------- 31 files changed, 223 insertions(+), 227 deletions(-)

1 0

Yuxuan Shui : dmime/tests: Improve error reporting from expect_track.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 5613917974af472b5c8f401991442c20d77a2ece URL: https://gitlab.winehq.org/wine/wine/-/commit/5613917974af472b5c8f401991442c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Feb 21 12:48:55 2024 +0000 dmime/tests: Improve error reporting from expect_track. Include a line number of the call site. --- dlls/dmime/tests/dmime.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6ccb944375c..7e1b419251e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1564,7 +1564,7 @@ static void test_segment(void) } static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, - DWORD index, BOOL ignore_guid) + DWORD index, BOOL ignore_guid, const char *file, UINT line) { IDirectMusicTrack *track; IPersistStream *ps; @@ -1576,17 +1576,17 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char else hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); + ok_(file, line)(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); return; } - ok(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); + ok_(file, line)(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); if (FAILED(hr)) return; hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); + ok_(file, line)(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); - ok(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", + ok_(file, line)(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); + ok_(file, line)(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", group, index, name, wine_dbgstr_guid(&class)); IPersistStream_Release(ps); @@ -1594,9 +1594,9 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char } #define expect_track(seg, class, group, index) \ - _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE) + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE, __FILE__, __LINE__) #define expect_guid_track(seg, class, group, index) \ - _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE) + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE, __FILE__, __LINE__) static void test_midi(void) { @@ -1816,15 +1816,15 @@ static void test_gettrack(void) expect_track(seg, SeqTrack, 0x1, 2); expect_track(seg, TempoTrack, 0x1, 3); expect_track(seg, WaveTrack, 0x1, 4); - _expect_track(seg, NULL, "", 0x1, 5, TRUE); - _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE); + _expect_track(seg, NULL, "", 0x1, 5, TRUE, __FILE__, __LINE__); + _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE, __FILE__, __LINE__); expect_track(seg, ParamControlTrack, 0x2, 0); expect_track(seg, WaveTrack, 0x80000000, 0); expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ - _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE); + _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE, __FILE__, __LINE__); /* Use the GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track);

1 0

Yuxuan Shui : dmime: Read through a MIDI file.
by Alexandre Julliard Feb. 22, 2024

Feb. 22, 2024

Module: wine Branch: master Commit: 8710a1cb0a205bbc9960157116c951aadc79dc13 URL: https://gitlab.winehq.org/wine/wine/-/commit/8710a1cb0a205bbc9960157116c951… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 15 18:38:11 2024 +0000 dmime: Read through a MIDI file. Add a dummy track parser, that reads through MIDI tracks and events. To make sure we understand the file structure correctly, no actual tracks or events are generated. Also add test cases to make sure we read through a MIDI file correctly. --- dlls/dmime/midi.c | 136 ++++++++++++++++++++++---- dlls/dmime/tests/dmime.c | 236 ++++++++++++++++++++++++++++++++++++---------- dlls/dmusic/dmusic_midi.h | 3 + 3 files changed, 311 insertions(+), 64 deletions(-)

1 0