November 2022 - Wine-commits

Ziqing Hui : winegstreamer: Implement profile_GetStreamByNumber.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: aad791e9e60aa27af2f2e9f51b688529354fabd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/aad791e9e60aa27af2f2e9f51b6885… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 18 08:20:28 2022 +0800 winegstreamer: Implement profile_GetStreamByNumber. --- dlls/winegstreamer/wm_reader.c | 14 ++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 6 ------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 8ac852a99b0..804af4a9aed 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -777,8 +777,18 @@ static HRESULT WINAPI profile_GetStream(IWMProfile3 *iface, DWORD index, IWMStre static HRESULT WINAPI profile_GetStreamByNumber(IWMProfile3 *iface, WORD stream_number, IWMStreamConfig **config) { - FIXME("iface %p, stream_number %u, config %p, stub!\n", iface, stream_number, config); - return E_NOTIMPL; + HRESULT hr; + + TRACE("iface %p, stream_number %u, config %p.\n", iface, stream_number, config); + + if (!stream_number) + return NS_E_NO_STREAM; + + hr = profile_GetStream(iface, stream_number - 1, config); + if (hr == E_INVALIDARG) + hr = NS_E_NO_STREAM; + + return hr; } static HRESULT WINAPI profile_RemoveStream(IWMProfile3 *iface, IWMStreamConfig *config) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index a2f92e66e40..874fca81367 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1205,14 +1205,10 @@ static void test_sync_reader_streaming(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); hr = IWMProfile_GetStreamByNumber(profile, i + 1, &config2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); - if (hr == S_OK) - { ok(config2 != config, "Expected different objects.\n"); ref = IWMStreamConfig_Release(config2); ok(!ref, "Got outstanding refcount %ld.\n", ref); - } stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); @@ -1226,10 +1222,8 @@ static void test_sync_reader_streaming(void) hr = IWMProfile_GetStream(profile, 2, &config); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); hr = IWMProfile_GetStreamByNumber(profile, 0, &config); - todo_wine ok(hr == NS_E_NO_STREAM, "Got hr %#lx.\n", hr); hr = IWMProfile_GetStreamByNumber(profile, 3, &config); - todo_wine ok(hr == NS_E_NO_STREAM, "Got hr %#lx.\n", hr); while (!eos[0] || !eos[1])

1 0

Ziqing Hui : mf/tests: Test IMediaObject_GetStreamCount for WMV decoder.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 9d1c7692f9ae2b546ebd23e108ea41ab9e6f3734 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1c7692f9ae2b546ebd23e108ea41… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 16:34:51 2022 +0800 mf/tests: Test IMediaObject_GetStreamCount for WMV decoder. --- dlls/mf/tests/transform.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index c85a15926fa..2ff6f7dbfc4 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4475,6 +4475,57 @@ failed: CoUninitialize(); } +static void test_wmv_decoder_media_object(void) +{ + const GUID *const class_id = &CLSID_CWMVDecMediaObject; + IMediaObject *media_object; + DWORD in_count, out_count; + HRESULT hr; + ULONG ret; + + winetest_push_context("wmvdec"); + + if (!has_video_processor) + { + win_skip("Skipping inconsistent WMV decoder media object tests on Win7.\n"); + winetest_pop_context(); + return; + } + + hr = CoInitialize(NULL); + ok(hr == S_OK, "CoInitialize failed, hr %#lx.\n", hr); + + hr = CoCreateInstance(class_id, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaObject, (void **)&media_object); + ok(hr == S_OK, "CoCreateInstance returned %#lx.\n", hr); + + /* Test GetStreamCount. */ + in_count = out_count = 0xdeadbeef; + hr = IMediaObject_GetStreamCount(media_object, &in_count, &out_count); + todo_wine + ok(hr == S_OK, "GetStreamCount returned %#lx.\n", hr); + if (hr == S_OK) + { + ok(in_count == 1, "Got unexpected in_count %lu.\n", in_count); + ok(out_count == 1, "Got unexpected in_count %lu.\n", out_count); + } + + /* Test GetStreamCount with invalid arguments. */ + in_count = out_count = 0xdeadbeef; + hr = IMediaObject_GetStreamCount(media_object, NULL, &out_count); + todo_wine + ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); + ok(out_count == 0xdeadbeef, "Got unexpected out_count %lu.\n", out_count); + hr = IMediaObject_GetStreamCount(media_object, &in_count, NULL); + todo_wine + ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); + ok(in_count == 0xdeadbeef, "Got unexpected in_count %lu.\n", in_count); + + ret = IMediaObject_Release(media_object); + ok(ret == 0, "Release returned %lu\n", ret); + CoUninitialize(); + winetest_pop_context(); +} + static void test_color_convert(void) { const GUID *const class_id = &CLSID_CColorConvertDMO; @@ -5776,6 +5827,7 @@ START_TEST(transform) test_h264_decoder(); test_wmv_encoder(); test_wmv_decoder(); + test_wmv_decoder_media_object(); test_audio_convert(); test_color_convert(); test_video_processor();

1 0

Ziqing Hui : winegstreamer: Implement media_object_GetStreamCount for WMV decoder.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: b173aa7a987a66a69ff45e850ee4bec3403c5536 URL: https://gitlab.winehq.org/wine/wine/-/commit/b173aa7a987a66a69ff45e850ee4be… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 17:23:30 2022 +0800 winegstreamer: Implement media_object_GetStreamCount for WMV decoder. --- dlls/mf/tests/transform.c | 6 ------ dlls/winegstreamer/wmv_decoder.c | 10 ++++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 2ff6f7dbfc4..cc8914ff17b 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4501,22 +4501,16 @@ static void test_wmv_decoder_media_object(void) /* Test GetStreamCount. */ in_count = out_count = 0xdeadbeef; hr = IMediaObject_GetStreamCount(media_object, &in_count, &out_count); - todo_wine ok(hr == S_OK, "GetStreamCount returned %#lx.\n", hr); - if (hr == S_OK) - { ok(in_count == 1, "Got unexpected in_count %lu.\n", in_count); ok(out_count == 1, "Got unexpected in_count %lu.\n", out_count); - } /* Test GetStreamCount with invalid arguments. */ in_count = out_count = 0xdeadbeef; hr = IMediaObject_GetStreamCount(media_object, NULL, &out_count); - todo_wine ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); ok(out_count == 0xdeadbeef, "Got unexpected out_count %lu.\n", out_count); hr = IMediaObject_GetStreamCount(media_object, &in_count, NULL); - todo_wine ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); ok(in_count == 0xdeadbeef, "Got unexpected in_count %lu.\n", in_count); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index 6ee21e5b5c1..fe9870e1bc3 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -320,8 +320,14 @@ static ULONG WINAPI media_object_Release(IMediaObject *iface) static HRESULT WINAPI media_object_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) { - FIXME("iface %p, input %p, output %p stub!\n", iface, input, output); - return E_NOTIMPL; + TRACE("iface %p, input %p, output %p.\n", iface, input, output); + + if (!input || !output) + return E_POINTER; + + *input = *output = 1; + + return S_OK; } static HRESULT WINAPI media_object_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags)

1 0

Ziqing Hui : mf/tests: Test IMediaObject_GetInputType for WMV decoder.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 8844d42428caf0520a20ee8e2e9ca2c9fc84b13f URL: https://gitlab.winehq.org/wine/wine/-/commit/8844d42428caf0520a20ee8e2e9ca2… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 20:08:28 2022 +0800 mf/tests: Test IMediaObject_GetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index cc8914ff17b..972e01331b7 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -33,6 +33,7 @@ #include "propvarutil.h" #include "uuids.h" #include "wmcodecdsp.h" +#include "mediaerr.h" #include "mf_test.h" @@ -1047,6 +1048,33 @@ DWORD check_mf_sample_collection_(const char *file, int line, IMFCollection *sam return ctx.diff / count; } +#define check_dmo_media_type(a, b) check_dmo_media_type_(__LINE__, a, b) +static void check_dmo_media_type_(int line, DMO_MEDIA_TYPE *media_type, const DMO_MEDIA_TYPE *expected) +{ + ok_(__FILE__, line)(IsEqualGUID(&media_type->majortype, &expected->majortype), + "Got unexpected majortype %s, expected %s.\n", + debugstr_guid(&media_type->majortype), debugstr_guid(&expected->majortype)); + ok_(__FILE__, line)(IsEqualGUID(&media_type->subtype, &expected->subtype), + "Got unexpected subtype %s, expected %s.\n", + debugstr_guid(&media_type->subtype), debugstr_guid(&expected->subtype)); + ok_(__FILE__, line)(media_type->bFixedSizeSamples == expected->bFixedSizeSamples, + "Got unexpected bFixedSizeSamples %d, expected %d.\n", + media_type->bFixedSizeSamples, expected->bFixedSizeSamples); + ok_(__FILE__, line)(media_type->bTemporalCompression == expected->bTemporalCompression, + "Got unexpected bTemporalCompression %d, expected %d.\n", + media_type->bTemporalCompression, expected->bTemporalCompression); + ok_(__FILE__, line)(media_type->lSampleSize == expected->lSampleSize, + "Got unexpected lSampleSize %lu, expected %lu.\n", + media_type->lSampleSize, expected->lSampleSize); + + ok_(__FILE__, line)(IsEqualGUID(&media_type->formattype, &GUID_NULL), + "Got unexpected formattype %s.\n", + debugstr_guid(&media_type->formattype)); + ok_(__FILE__, line)(media_type->pUnk == NULL, "Got unexpected pUnk %p.\n", media_type->pUnk); + ok_(__FILE__, line)(media_type->cbFormat == 0, "Got unexpected cbFormat %lu.\n", media_type->cbFormat); + ok_(__FILE__, line)(media_type->pbFormat == NULL, "Got unexpected pbFormat %p.\n", media_type->pbFormat); +} + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -4478,10 +4506,23 @@ failed: static void test_wmv_decoder_media_object(void) { const GUID *const class_id = &CLSID_CWMVDecMediaObject; + const DMO_MEDIA_TYPE expected_input_types[] = + { + {MFMediaType_Video, MFVideoFormat_WMV1, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV2, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WMVA, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WMVP, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MEDIASUBTYPE_WVP2, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV_Unknown, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WVC1, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_WMV3, FALSE, TRUE, FALSE}, + {MFMediaType_Video, MFVideoFormat_VC1S, FALSE, TRUE, FALSE}, + }; IMediaObject *media_object; + DMO_MEDIA_TYPE media_type; DWORD in_count, out_count; + ULONG ret, i; HRESULT hr; - ULONG ret; winetest_push_context("wmvdec"); @@ -4514,6 +4555,40 @@ static void test_wmv_decoder_media_object(void) ok(hr == E_POINTER, "GetStreamCount returned %#lx.\n", hr); ok(in_count == 0xdeadbeef, "Got unexpected in_count %lu.\n", in_count); + /* Test GetInputType. */ + i = -1; + while (SUCCEEDED(hr = IMediaObject_GetInputType(media_object, 0, ++i, &media_type))) + { + winetest_push_context("in %lu", i); + check_dmo_media_type(&media_type, &expected_input_types[i]); + winetest_pop_context(); + } + todo_wine + ok(i == ARRAY_SIZE(expected_input_types), "%lu input types.\n", i); + + /* Test GetInputType with invalid arguments. */ + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types) - 1, &media_type); + todo_wine + ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), &media_type); + todo_wine + ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, 0, &media_type); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, 0, NULL); + todo_wine + ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, ARRAY_SIZE(expected_input_types), &media_type); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), NULL); + todo_wine + ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); + hr = IMediaObject_GetInputType(media_object, 1, 0, NULL); + todo_wine + ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Ziqing Hui : winegstreamer: Implement media_object_GetInputType for WMV decoder.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: d596f972508d0f9899a911dfcc1bccdad0a340bc URL: https://gitlab.winehq.org/wine/wine/-/commit/d596f972508d0f9899a911dfcc1bcc… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 19:36:25 2022 +0800 winegstreamer: Implement media_object_GetInputType for WMV decoder. --- dlls/mf/tests/transform.c | 8 -------- dlls/winegstreamer/wmv_decoder.c | 37 +++++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 972e01331b7..82817724a78 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -4563,30 +4563,22 @@ static void test_wmv_decoder_media_object(void) check_dmo_media_type(&media_type, &expected_input_types[i]); winetest_pop_context(); } - todo_wine ok(i == ARRAY_SIZE(expected_input_types), "%lu input types.\n", i); /* Test GetInputType with invalid arguments. */ hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types) - 1, &media_type); - todo_wine ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), &media_type); - todo_wine ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, 0, &media_type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, 0, NULL); - todo_wine ok(hr == S_OK, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, ARRAY_SIZE(expected_input_types), &media_type); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 0, ARRAY_SIZE(expected_input_types), NULL); - todo_wine ok(hr == DMO_E_NO_MORE_ITEMS, "GetInputType returned unexpected hr %#lx.\n", hr); hr = IMediaObject_GetInputType(media_object, 1, 0, NULL); - todo_wine ok(hr == DMO_E_INVALIDSTREAMINDEX, "GetInputType returned unexpected hr %#lx.\n", hr); ret = IMediaObject_Release(media_object); diff --git a/dlls/winegstreamer/wmv_decoder.c b/dlls/winegstreamer/wmv_decoder.c index fe9870e1bc3..96a2839660a 100644 --- a/dlls/winegstreamer/wmv_decoder.c +++ b/dlls/winegstreamer/wmv_decoder.c @@ -19,6 +19,7 @@ #include "mfapi.h" #include "mferror.h" +#include "mediaerr.h" #include "mfobjects.h" #include "mftransform.h" #include "wmcodecdsp.h" @@ -28,6 +29,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); +extern const GUID MFVideoFormat_VC1S; + +DEFINE_GUID(MFVideoFormat_WMV_Unknown, 0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0xb8,0xed,0x54,0x31,0x6b); + +static const GUID *const wmv_decoder_input_types[] = +{ + &MFVideoFormat_WMV1, + &MFVideoFormat_WMV2, + &MEDIASUBTYPE_WMVA, + &MEDIASUBTYPE_WMVP, + &MEDIASUBTYPE_WVP2, + &MFVideoFormat_WMV_Unknown, + &MFVideoFormat_WVC1, + &MFVideoFormat_WMV3, + &MFVideoFormat_VC1S, +}; + struct wmv_decoder { IUnknown IUnknown_inner; @@ -345,8 +363,23 @@ static HRESULT WINAPI media_object_GetOutputStreamInfo(IMediaObject *iface, DWOR static HRESULT WINAPI media_object_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - FIXME("iface %p, index %lu, type_index %lu, type %p stub!\n", iface, index, type_index, type); - return E_NOTIMPL; + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); + + if (index > 0) + return DMO_E_INVALIDSTREAMINDEX; + if (type_index >= ARRAY_SIZE(wmv_decoder_input_types)) + return DMO_E_NO_MORE_ITEMS; + if (!type) + return S_OK; + + memset(type, 0, sizeof(*type)); + type->majortype = MFMediaType_Video; + type->subtype = *wmv_decoder_input_types[type_index]; + type->bFixedSizeSamples = FALSE; + type->bTemporalCompression = TRUE; + type->lSampleSize = 0; + + return S_OK; } static HRESULT WINAPI media_object_GetOutputType(IMediaObject *iface, DWORD index, DWORD type_index,

1 0

Nikolay Sivov : vbscript/tests: Fix redim tests.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 131aa5135ba9f6aaab3a705f8010a3070ef4b604 URL: https://gitlab.winehq.org/wine/wine/-/commit/131aa5135ba9f6aaab3a705f8010a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 06:50:17 2022 +0300 vbscript/tests: Fix redim tests. --- dlls/vbscript/tests/lang.vbs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 990d830234d..529f995e764 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1562,7 +1562,8 @@ sub TestReDimList end sub call TestReDimList -dim rx(4) +dim rx +redim rx(4) sub TestReDimByRef(byref x) ok ubound(x) = 4, "ubound(x) = " & ubound(x) redim x(6)

1 0

Eric Pouech : wined3d: Use long type for interlock variables/fields.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 767a715d47fdfae53c98cdcd267895031cbefece URL: https://gitlab.winehq.org/wine/wine/-/commit/767a715d47fdfae53c98cdcd267895… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 11:08:49 2022 +0100 wined3d: Use long type for interlock variables/fields. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7d3b579ed2..c460a6b1f8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4433,8 +4433,8 @@ struct wined3d_resource struct list resource_list_entry; - int32_t srv_bind_count_device; - int32_t rtv_bind_count_device; + LONG srv_bind_count_device; + LONG rtv_bind_count_device; }; static inline ULONG wined3d_resource_incref(struct wined3d_resource *resource) @@ -5092,7 +5092,7 @@ struct wined3d_cs BOOL queries_flushed; HANDLE event; - BOOL waiting_for_event; + LONG waiting_for_event; LONG pending_presents; };

1 0

Eric Pouech : wined3d: Use pointer to non long integral type for some helpers.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: f7deca3ae65f9cc9a3d1ddc399617b4cd852bef1 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7deca3ae65f9cc9a3d1ddc399617b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 11:08:51 2022 +0100 wined3d: Use pointer to non long integral type for some helpers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/wined3d_private.h | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 40b5442ed04..e9ada251749 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1945,7 +1945,7 @@ static const char *shader_glsl_interpolation_qualifiers(enum wined3d_shader_inte } static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode( - const DWORD *packed_interpolation_mode, unsigned int register_idx) + const uint32_t *packed_interpolation_mode, unsigned int register_idx) { return wined3d_extract_bits(packed_interpolation_mode, register_idx * WINED3D_PACKED_INTERPOLATION_BIT_COUNT, WINED3D_PACKED_INTERPOLATION_BIT_COUNT); @@ -1953,7 +1953,7 @@ static enum wined3d_shader_interpolation_mode wined3d_extract_interpolation_mode static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, - const DWORD *interpolation_mode, BOOL unroll) + const uint32_t *interpolation_mode, BOOL unroll) { enum wined3d_shader_interpolation_mode mode; unsigned int i; @@ -1991,7 +1991,7 @@ static BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, - const DWORD *interpolation_mode) + const uint32_t *interpolation_mode) { enum wined3d_shader_interpolation_mode mode; unsigned int i; @@ -7335,7 +7335,7 @@ static void shader_glsl_generate_stream_output_setup(struct wined3d_string_buffe static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const uint32_t *interpolation_mode) { const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c2e77021bb3..91874898025 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -978,7 +978,7 @@ static HRESULT shader_calculate_clip_or_cull_distance_mask( return WINED3D_OK; } -static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, +static void wined3d_insert_interpolation_mode(uint32_t *packed_interpolation_mode, unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) { if (mode > WINED3DSIM_LINEAR_NOPERSPECTIVE_SAMPLE) @@ -3516,7 +3516,7 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh return WINED3D_OK; } -static void init_interpolation_compile_args(DWORD *interpolation_args, +static void init_interpolation_compile_args(uint32_t *interpolation_args, const struct wined3d_shader *pixel_shader, const struct wined3d_d3d_info *d3d_info) { if (!d3d_info->shader_output_interpolation || !pixel_shader diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c460a6b1f8c..cf82bebb972 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1159,7 +1159,7 @@ struct wined3d_shader_reg_maps WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* 32 */ unsigned int temporary_count; - DWORD *constf; /* pixel, vertex */ + uint32_t *constf; /* pixel, vertex */ struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb; union @@ -1557,7 +1557,7 @@ struct vs_compile_args { DWORD swizzle_map; /* MAX_ATTRIBS, 32 */ unsigned int next_shader_input_count; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; BYTE fog_src; BYTE clip_enabled : 1; BYTE point_size : 1; @@ -1575,14 +1575,14 @@ struct ds_compile_args unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; unsigned int padding : 12; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct gs_compile_args { unsigned int output_count; enum wined3d_primitive_type primitive_type; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_shader_backend_ops @@ -5946,7 +5946,7 @@ struct wined3d_pixel_shader BOOL force_early_depth_stencil; enum wined3d_shader_register_type depth_output; - DWORD interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; + uint32_t interpolation_mode[WINED3D_PACKED_INTERPOLATION_SIZE]; }; struct wined3d_compute_shader @@ -6443,7 +6443,7 @@ static inline uint32_t wined3d_mask_from_size(unsigned int size) return size < 32 ? (1u << size) - 1 : ~0u; } -static inline DWORD wined3d_extract_bits(const DWORD *bitstream, +static inline DWORD wined3d_extract_bits(const uint32_t *bitstream, unsigned int offset, unsigned int count) { const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; @@ -6463,7 +6463,7 @@ static inline DWORD wined3d_extract_bits(const DWORD *bitstream, return ret; } -static inline void wined3d_insert_bits(DWORD *bitstream, +static inline void wined3d_insert_bits(uint32_t *bitstream, unsigned int offset, unsigned int count, DWORD bits) { const unsigned int word_bit_count = sizeof(*bitstream) * CHAR_BIT; @@ -6816,7 +6816,7 @@ static inline unsigned int wined3d_bitmap_ffz(const uint32_t *bitmap, unsigned i return wined3d_bitmap_ffs_xor(bitmap, bit_count, start, ~0u); } -static inline BOOL wined3d_bitmap_get_range(const DWORD *bitmap, unsigned int bit_count, +static inline BOOL wined3d_bitmap_get_range(const uint32_t *bitmap, unsigned int bit_count, unsigned int start, struct wined3d_range *range) { unsigned int range_start, range_end;

1 0

Gerald Pfeifer : ntdll: Make init_builtin_dll return a value on FreeBSD.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 1d0383e2a41623d711a733899a80cb8fe1f6351a URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0383e2a41623d711a733899a80cb… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Nov 22 21:45:11 2022 +0100 ntdll: Make init_builtin_dll return a value on FreeBSD. With commit 1d1690782b167f3ea24990c260665f71a0e70d1c init_builtin_dll gained a return value, alas the FreeBSD-specific code (under #ifdef) was not adjusted and still returned void. --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f87e11f073c..deb25a8e35e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1919,7 +1919,7 @@ static NTSTATUS init_builtin_dll( void *module ) /* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */ if (offsetof(struct link_map, l_addr) == 0) if (!get_relocbase(map->l_addr, &relocbase)) - return; + return STATUS_UNSUCCESSFUL; #endif switch (dyn->d_tag) {

1 0

Nikolay Sivov : vbscript: Fix a typo in variable name in LBound().
by Alexandre Julliard 22 Nov '22

22 Nov '22

Module: wine Branch: master Commit: 9e5825ce812cc857e25b682b3243e68b23d04f30 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e5825ce812cc857e25b682b3243e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 22 19:15:54 2022 +0300 vbscript: Fix a typo in variable name in LBound(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index d07d46415e6..98c705f4712 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1170,7 +1170,7 @@ static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, { SAFEARRAY *sa; HRESULT hres; - LONG ubound; + LONG lbound; int dim; assert(args_cnt == 1 || args_cnt == 2); @@ -1197,11 +1197,11 @@ static HRESULT Global_LBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, dim = 1; } - hres = SafeArrayGetLBound(sa, dim, &ubound); + hres = SafeArrayGetLBound(sa, dim, &lbound); if(FAILED(hres)) return hres; - return return_int(res, ubound); + return return_int(res, lbound); } static HRESULT Global_UBound(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)

1 0