February 2022 - Wine-commits

Rémi Bernon : winegstreamer: Send stream-start, caps, and segment events on creation.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 227a1275b14a2ffd71a4d0c621cb655e3576ad02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=227a1275b14a2ffd71a4d0c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 25 11:43:01 2022 -0600 winegstreamer: Send stream-start, caps, and segment events on creation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_transform.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index c5aa4acb2cc..45f8588b9f1 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -47,6 +47,7 @@ struct wg_transform GstElement *container; GstPad *my_src, *my_sink; GstPad *their_sink, *their_src; + GstSegment segment; }; static GstFlowReturn transform_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) @@ -154,6 +155,7 @@ NTSTATUS wg_transform_create(void *args) GstPadTemplate *template = NULL; struct wg_transform *transform; const gchar *media_type; + GstEvent *event; if (!init_gstreamer()) return STATUS_UNSUCCESSFUL; @@ -257,6 +259,22 @@ NTSTATUS wg_transform_create(void *args) if (!gst_element_get_state(transform->container, NULL, NULL, -1)) goto out; + if (!(event = gst_event_new_stream_start("stream")) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + if (!(event = gst_event_new_caps(src_caps)) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + + /* We need to use GST_FORMAT_TIME here because it's the only format + * some elements such avdec_wmav2 correctly support. */ + gst_segment_init(&transform->segment, GST_FORMAT_TIME); + transform->segment.start = 0; + transform->segment.stop = -1; + if (!(event = gst_event_new_segment(&transform->segment)) + || !gst_pad_push_event(transform->my_src, event)) + goto out; + gst_caps_unref(sink_caps); gst_caps_unref(src_caps); @@ -278,7 +296,10 @@ out: if (src_caps) gst_caps_unref(src_caps); if (transform->container) + { + gst_element_set_state(transform->container, GST_STATE_NULL); gst_object_unref(transform->container); + } free(transform); GST_ERROR("Failed to create winegstreamer transform."); return status;

1 0

Paul Gofman : kernel32: Import RtlCaptureContext() instead of forwarding.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 40590b7a97412836cf04bb32bbd18b849820bcfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=40590b7a97412836cf04bb32… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 25 16:07:13 2022 +0300 kernel32: Import RtlCaptureContext() instead of forwarding. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 3cf85be10fd..168cbdb531c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1302,7 +1302,7 @@ @ stdcall RestoreLastError(long) NTDLL.RtlRestoreLastWin32Error @ stdcall -import ResumeThread(long) @ cdecl -arch=arm,arm64,x86_64 RtlAddFunctionTable(ptr long long) NTDLL.RtlAddFunctionTable -@ stdcall -norelay RtlCaptureContext(ptr) NTDLL.RtlCaptureContext +@ stdcall -norelay -import RtlCaptureContext(ptr) @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) NTDLL.RtlCaptureStackBackTrace @ stdcall -arch=arm,arm64,x86_64 RtlCompareMemory(ptr ptr long) NTDLL.RtlCompareMemory @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) NTDLL.RtlCopyMemory

1 0

Paul Gofman : kernel32: Import RtlRestoreContext() instead of forwarding.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 81e06c61368961ec1686d41cd27459ca50f4949e URL: https://source.winehq.org/git/wine.git/?a=commit;h=81e06c61368961ec1686d41c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 25 16:07:14 2022 +0300 kernel32: Import RtlRestoreContext() instead of forwarding. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 168cbdb531c..818e7d87a2f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1313,7 +1313,7 @@ @ stdcall RtlMoveMemory(ptr ptr long) NTDLL.RtlMoveMemory @ stdcall RtlPcToFileHeader(ptr ptr) NTDLL.RtlPcToFileHeader @ stdcall -arch=arm,arm64,x86_64 -norelay RtlRaiseException(ptr) NTDLL.RtlRaiseException -@ cdecl -arch=arm,arm64,x86_64 RtlRestoreContext(ptr ptr) NTDLL.RtlRestoreContext +@ cdecl -arch=arm,arm64,x86_64 -import RtlRestoreContext(ptr ptr) @ stdcall RtlUnwind(ptr ptr ptr long) NTDLL.RtlUnwind @ stdcall -arch=arm,arm64,x86_64 RtlUnwindEx(long long ptr long ptr) NTDLL.RtlUnwindEx @ stdcall -arch=arm,arm64,x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) NTDLL.RtlVirtualUnwind

1 0

Zebediah Figura : wined3d: Allocate a heap memory buffer in wined3d_cs_map_upload_bo() if possible.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 1b893093fd079091b0bb4368fbe3bec4f7871fc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b893093fd079091b0bb4368… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 25 11:17:31 2022 -0600 wined3d: Allocate a heap memory buffer in wined3d_cs_map_upload_bo() if possible. Based on patches by Matteo Bruni and Michael Müller. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7418c6ab4bb..9073716d456 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2753,6 +2753,14 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi context_release(context); wined3d_resource_release(resource); + + if (op->bo.flags & UPLOAD_BO_FREE_ON_UNMAP) + { + if (op->bo.addr.buffer_object) + FIXME("Free BO address %s.\n", debug_const_bo_address(&op->bo.addr)); + else + heap_free((void *)op->bo.addr.addr); + } } void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_context *context, @@ -3091,10 +3099,13 @@ static void wined3d_cs_st_finish(struct wined3d_device_context *context, enum wi static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_map_desc *map_desc, const struct wined3d_box *box, uint32_t flags) { + struct wined3d_client_resource *client = &resource->client; + const struct wined3d_format *format = resource->format; + size_t size; + if (flags & (WINED3D_MAP_DISCARD | WINED3D_MAP_NOOVERWRITE)) { const struct wined3d_d3d_info *d3d_info = &context->device->adapter->d3d_info; - struct wined3d_client_resource *client = &resource->client; struct wined3d_device *device = context->device; struct wined3d_bo_address addr; struct wined3d_bo *bo; @@ -3184,7 +3195,23 @@ static bool wined3d_cs_map_upload_bo(struct wined3d_device_context *context, str return true; } - return false; + wined3d_format_calculate_pitch(format, 1, box->right - box->left, + box->bottom - box->top, &map_desc->row_pitch, &map_desc->slice_pitch); + + size = (box->back - box->front - 1) * map_desc->slice_pitch + + ((box->bottom - box->top - 1) / format->block_height) * map_desc->row_pitch + + ((box->right - box->left + format->block_width - 1) / format->block_width) * format->block_byte_count; + + if (!(map_desc->data = heap_alloc(size))) + { + WARN_(d3d_perf)("Failed to allocate a heap memory buffer.\n"); + return false; + } + client->mapped_upload.addr.buffer_object = 0; + client->mapped_upload.addr.addr = map_desc->data; + client->mapped_upload.flags = UPLOAD_BO_UPLOAD_ON_UNMAP | UPLOAD_BO_FREE_ON_UNMAP; + client->mapped_box = *box; + return true; } static bool wined3d_bo_address_is_null(struct wined3d_const_bo_address *addr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9837911ea6..a9a71b44a0e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3382,6 +3382,7 @@ bool wined3d_driver_info_init(struct wined3d_driver_info *driver_info, #define UPLOAD_BO_UPLOAD_ON_UNMAP 0x1 #define UPLOAD_BO_RENAME_ON_UNMAP 0x2 +#define UPLOAD_BO_FREE_ON_UNMAP 0x4 struct upload_bo {

1 0

Rémi Bernon : mf/tests: Check H264 decoder formats after stream change.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: cd90f650df483eddd73c53319b2e1f5bddfb3f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd90f650df483eddd73c5331… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 24 09:50:36 2022 +0100 mf/tests: Check H264 decoder formats after stream change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e0793152d74..e61442bb512 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6550,6 +6550,80 @@ static void test_h264_decoder(void) ATTR_RATIO(MF_MT_FRAME_SIZE, 1920, 1088), {0}, }; + static const MFVideoArea actual_aperture = {.Area={78, 74}}; + static const media_type_desc actual_outputs[] = + { + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_NV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YV12), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_IYUV), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_I420), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 9600), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 80), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video), + ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_YUY2), + ATTR_RATIO(MF_MT_PIXEL_ASPECT_RATIO, 1, 1), + ATTR_RATIO(MF_MT_FRAME_RATE, 30000, 1001), + ATTR_RATIO(MF_MT_FRAME_SIZE, 80, 80), + ATTR_UINT32(MF_MT_SAMPLE_SIZE, 12800), + ATTR_UINT32(MF_MT_DEFAULT_STRIDE, 160), + /* ATTR_UINT32(MF_MT_VIDEO_ROTATION, 0), missing on Win7 */ + ATTR_UINT32(MF_MT_INTERLACE_MODE, 7), + ATTR_UINT32(MF_MT_FIXED_SIZE_SAMPLES, 1), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_BLOB(MF_MT_MINIMUM_DISPLAY_APERTURE, &actual_aperture, 16), + }, + }; MFT_REGISTER_TYPE_INFO input_type = {MFMediaType_Video, MFVideoFormat_H264}; MFT_REGISTER_TYPE_INFO output_type = {MFMediaType_Video, MFVideoFormat_NV12}; @@ -6814,6 +6888,33 @@ static void test_h264_decoder(void) ret = IMFSample_Release(output.pSample); ok(ret == 0, "Release returned %u\n", ret); + flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; + memset(&output_info, 0xcd, sizeof(output_info)); + hr = IMFTransform_GetOutputStreamInfo(transform, 0, &output_info); + todo_wine + ok(hr == S_OK, "GetOutputStreamInfo returned %#x\n", hr); + todo_wine + ok(output_info.dwFlags == flags, "got dwFlags %#x\n", output_info.dwFlags); + todo_wine + ok(output_info.cbSize == 0x3200, "got cbSize %#x\n", output_info.cbSize); + todo_wine + ok(output_info.cbAlignment == 0, "got cbAlignment %#x\n", output_info.cbAlignment); + + i = -1; + while (SUCCEEDED(hr = IMFTransform_GetOutputAvailableType(transform, 0, ++i, &media_type))) + { + winetest_push_context("out %u", i); + ok(hr == S_OK, "GetOutputAvailableType returned %#x\n", hr); + check_media_type(media_type, actual_outputs[i], -1); + ret = IMFMediaType_Release(media_type); + ok(ret == 0, "Release returned %u\n", ret); + winetest_pop_context(); + } + todo_wine + ok(hr == MF_E_NO_MORE_TYPES, "GetOutputAvailableType returned %#x\n", hr); + todo_wine + ok(i == 5, "%u output media types\n", i); + ret = IMFTransform_Release(transform); ok(ret == 0, "Release returned %u\n", ret); ret = IMFSample_Release(sample);

1 0

Alexandre Julliard : Release 7.3.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 842452d4e79b20c42d2b7e279063b2feabeb31de URL: https://source.winehq.org/git/wine.git/?a=commit;h=842452d4e79b20c42d2b7e27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 21:15:35 2022 +0100 Release 7.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1485 ++++++++++++++++++++++++++++++------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 751 insertions(+), 755 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=842452d4e79b20c42d2b…

1 0

Tag wine-7.3 : Alexandre Julliard : Release 7.3
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: refs/tags/wine-7.3 Tag: b8d916443beec79fc2a3f12b0f07fdcf3ae6e318 URL: https://source.winehq.org/git/wine.git/?a=tag;h=b8d916443beec79fc2a3f12b0f0… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 25 21:15:35 2022 +0100 Release 7.3

1 0

Eric Pouech : dplayx/tests: Use correct integral type.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 8707eecfc236997c56334db66267a9161ad7af85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8707eecfc236997c56334db6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:02 2022 +0100 dplayx/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index d71df8838f7..11d96706e9f 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6864,7 +6864,8 @@ done: /* taken from programs/winetest/main.c */ static BOOL is_stub_dll(const char *filename) { - DWORD size, ver; + UINT size; + DWORD ver; BOOL isstub = FALSE; char *p, *data;

1 0

Eric Pouech : dplayx/tests: Use function in checkFlags macro to handle integral conversion.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 72a5a29b6f39627cbfe368799c19948b8c81e8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a5a29b6f39627cbfe36879… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:08 2022 +0100 dplayx/tests: Use function in checkFlags macro to handle integral conversion. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 11d96706e9f..75c05cbb282 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -45,11 +45,15 @@ static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IU ok( (result != NULL) && (!strcmp(expected, result)), \ "expected=%s got=%s\n", \ expected, result ); -#define checkFlags(expected, result, flags) \ - ok( (expected) == (result), \ - "expected=0x%08x(%s) got=0x%08x(%s)\n", \ - expected, dwFlags2str(expected, flags), \ +static LPCSTR dwFlags2str(DWORD dwFlags, DWORD flagType); +#define checkFlags(expected, result, flags) checkFlags_(__LINE__, expected, result, flags) +static void checkFlags_(unsigned line, DWORD expected, DWORD result, DWORD flags) +{ + ok_(__FILE__, line)( expected == result, + "expected=0x%08x(%s) got=0x%08x(%s)\n", + expected, dwFlags2str(expected, flags), result, dwFlags2str(result, flags) ); +} #define checkGuid(expected, result) \ ok( IsEqualGUID(expected, result), \ "expected=%s got=%s\n", \

1 0

Eric Pouech : dplayx/tests: Enable compilation with long types.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: master Commit: 91b0ceefc7e6961c6390c543f7b2155098b31199 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b0ceefc7e6961c6390c543… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 24 11:28:14 2022 +0100 dplayx/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/Makefile.in | 1 - dlls/dplayx/tests/dplayx.c | 120 +++++++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=91b0ceefc7e6961c6390…

1 0