November 2022 - Wine-Commits

Anton Baskanov : winegstreamer: Destroy the sample queue when stopping the quartz transform.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: dfb161624f8b159e8b37b68682db58910675b876 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb161624f8b159e8b37b68682db58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 29 18:30:07 2022 +0700 winegstreamer: Destroy the sample queue when stopping the quartz transform. This releases the samples wg_transform might have referenced before destruction. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53342 --- dlls/winegstreamer/quartz_transform.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index ccdec9454a6..09ad4862410 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -78,7 +78,6 @@ static void transform_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); - wg_sample_queue_destroy(filter->sample_queue); free(filter); } @@ -109,9 +108,15 @@ static HRESULT transform_init_stream(struct strmbase_filter *iface) if (!amt_to_wg_format(&filter->source.pin.mt, &output_format)) return E_FAIL; + if (FAILED(hr = wg_sample_queue_create(&filter->sample_queue))) + return hr; + filter->transform = wg_transform_create(&input_format, &output_format); if (!filter->transform) + { + wg_sample_queue_destroy(filter->sample_queue); return E_FAIL; + } hr = IMemAllocator_Commit(filter->source.pAllocator); if (FAILED(hr)) @@ -131,6 +136,7 @@ static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->filter.stream_cs); wg_transform_destroy(filter->transform); + wg_sample_queue_destroy(filter->sample_queue); LeaveCriticalSection(&filter->filter.stream_cs); } @@ -538,18 +544,11 @@ static const IQualityControlVtbl source_quality_control_vtbl = static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) { struct transform *object; - HRESULT hr; object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = wg_sample_queue_create(&object->sample_queue))) - { - free(object); - return hr; - } - strmbase_filter_init(&object->filter, outer, clsid, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops);

1 0

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

Nov. 23, 2022

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 profile_GetStreamByNumber.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

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 : wmvcore/tests: Add tests for IWMProfile_GetStreamByNumber.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 64debc9b1d6df218d27ac67e121f58ea5aadee24 URL: https://gitlab.winehq.org/wine/wine/-/commit/64debc9b1d6df218d27ac67e121f58… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 10:08:06 2022 +0800 wmvcore/tests: Add tests for IWMProfile_GetStreamByNumber. --- dlls/wmvcore/tests/wmvcore.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 401856eb744..a2f92e66e40 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1204,6 +1204,16 @@ static void test_sync_reader_streaming(void) ref = IWMStreamConfig_Release(config2); 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]); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1215,6 +1225,12 @@ 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

Anton Baskanov : include: Add MFSampleExtension_Discontinuity to mfapi.h.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 5a80ace06009e262f6de038265cf3cae6e621c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/5a80ace06009e262f6de038265cf3c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 17 12:11:46 2022 +0700 include: Add MFSampleExtension_Discontinuity to mfapi.h. --- include/mfapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfapi.h b/include/mfapi.h index ab336a3f4e8..24f2d6dc560 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -393,6 +393,7 @@ DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x0 DEFINE_GUID(MFSampleExtension_DecodeTimestamp, 0x73a954d4, 0x09e2, 0x4861, 0xbe, 0xfc, 0x94, 0xbd, 0x97, 0xc0, 0x8e, 0x6e); DEFINE_GUID(MFSampleExtension_CleanPoint, 0x9cdf01d8, 0xa0f0, 0x43ba, 0xb0, 0x77, 0xea, 0xa0, 0x6c, 0xbd, 0x72, 0x8a); +DEFINE_GUID(MFSampleExtension_Discontinuity, 0x9cdf01d9, 0xa0f0, 0x43ba, 0xb0, 0x77, 0xea, 0xa0, 0x6c, 0xbd, 0x72, 0x8a); DEFINE_GUID(MFSampleExtension_Timestamp, 0x1e436999, 0x69be, 0x4c7a, 0x93, 0x69, 0x70, 0x06, 0x8c, 0x02, 0x60, 0xcb); DEFINE_GUID(MFSampleExtension_Token, 0x8294da66, 0xf328, 0x4805, 0xb5, 0x51, 0x00, 0xde, 0xb4, 0xc5, 0x7a, 0x61); DEFINE_GUID(MFSampleExtension_3DVideo, 0xf86f97a4, 0xdd54, 0x4e2e, 0x9a, 0x5e, 0x55, 0xfc, 0x2d, 0x74, 0xa0, 0x05);

1 0

Anton Baskanov : winegstreamer: Allocate at least 3 buffers for MPEG audio in quartz parser.
by Alexandre Julliard Nov. 23, 2022

Nov. 23, 2022

Module: wine Branch: master Commit: 9add23322a9ff6a95a34130e06af95d47dc762e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9add23322a9ff6a95a34130e06af95… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Nov 4 19:12:36 2022 +0700 winegstreamer: Allocate at least 3 buffers for MPEG audio in quartz parser. --- dlls/winegstreamer/quartz_parser.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 87185312585..2a7845be737 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1649,6 +1649,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); + unsigned int buffer_count = 1; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; @@ -1664,11 +1665,18 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec; } + else if (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_MPEG1AudioPayload) + || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_MP3)) + { + /* mpg123audiodec requires at least 3 buffers as it will keep + * references to the last 2 samples. */ + buffer_count = 3; + } /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ - props->cBuffers = max(props->cBuffers, 1); + props->cBuffers = max(props->cBuffers, buffer_count); props->cbBuffer = max(props->cbBuffer, buffer_size); props->cbAlign = max(props->cbAlign, 1); return IMemAllocator_SetProperties(allocator, props, &ret_props);

1 0

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

Nov. 23, 2022

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 Nov. 23, 2022

Nov. 23, 2022

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 Nov. 23, 2022

Nov. 23, 2022

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

Georg Lehmann : winevulkan: Convert unions when nessecary.
by Alexandre Julliard Nov. 22, 2022

Nov. 22, 2022

Module: wine Branch: master Commit: 3759dbd645f98b53376c59a4245e0614d265ba43 URL: https://gitlab.winehq.org/wine/wine/-/commit/3759dbd645f98b53376c59a4245e06… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Mon Nov 21 20:40:31 2022 +0100 winevulkan: Convert unions when nessecary. --- dlls/winevulkan/make_vulkan | 44 ++++-- dlls/winevulkan/vulkan_thunks.c | 320 ++++++++++++++++++++++++++++++++++------ 2 files changed, 305 insertions(+), 59 deletions(-)

1 0