- Wine-Commits - list.winehq.org

Ziqing Hui : winegstreamer: Implement wg_muxer_finalize.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: b496a354fab1d662267241e6237854aa2153fb5a URL: https://gitlab.winehq.org/wine/wine/-/commit/b496a354fab1d662267241e6237854… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 9 11:18:41 2023 +0800 winegstreamer: Implement wg_muxer_finalize. --- dlls/winegstreamer/wg_muxer.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index bbe4d4d1f9d..0055d9ef16c 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -63,6 +63,9 @@ struct wg_muxer GstBuffer *buffer; pthread_mutex_t mutex; + pthread_cond_t cond; + + bool eos; guint64 offset; /* Write offset of the output buffer generated by muxer. */ struct list streams; @@ -175,6 +178,13 @@ static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *ev switch (event->type) { + case GST_EVENT_EOS: + pthread_mutex_lock(&muxer->mutex); + muxer->eos = true; + pthread_mutex_unlock(&muxer->mutex); + pthread_cond_signal(&muxer->cond); + break; + case GST_EVENT_SEGMENT: pthread_mutex_lock(&muxer->mutex); @@ -248,6 +258,7 @@ NTSTATUS wg_muxer_create(void *args) list_init(&muxer->streams); muxer->offset = GST_BUFFER_OFFSET_NONE; pthread_mutex_init(&muxer->mutex, NULL); + pthread_cond_init(&muxer->cond, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; if (!(muxer->output_queue = gst_atomic_queue_new(8))) @@ -287,6 +298,7 @@ out: gst_atomic_queue_unref(muxer->output_queue); if (muxer->container) gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -317,6 +329,7 @@ NTSTATUS wg_muxer_destroy(void *args) gst_element_set_state(muxer->container, GST_STATE_NULL); gst_object_unref(muxer->container); + pthread_cond_destroy(&muxer->cond); pthread_mutex_destroy(&muxer->mutex); free(muxer); @@ -526,6 +539,22 @@ NTSTATUS wg_muxer_read_data(void *args) NTSTATUS wg_muxer_finalize(void *args) { - GST_FIXME("Not implemented."); - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer *muxer = get_muxer(*(wg_muxer_t *)args); + struct wg_muxer_stream *stream; + + /* Notify each stream of EOS. */ + LIST_FOR_EACH_ENTRY(stream, &muxer->streams, struct wg_muxer_stream, entry) + { + if (!push_event(stream->my_src, gst_event_new_segment_done(GST_FORMAT_BYTES, -1)) + || !push_event(stream->my_src, gst_event_new_eos())) + return STATUS_UNSUCCESSFUL; + } + + /* Wait for muxer EOS. */ + pthread_mutex_lock(&muxer->mutex); + while (!muxer->eos) + pthread_cond_wait(&muxer->cond, &muxer->mutex); + pthread_mutex_unlock(&muxer->mutex); + + return STATUS_SUCCESS; }

1 0

Ziqing Hui : winegstreamer: Avoid media sink command leaking.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7e575d681d8586b50c218bc6dd25c5260221234d URL: https://gitlab.winehq.org/wine/wine/-/commit/7e575d681d8586b50c218bc6dd25c5… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Nov 24 09:13:01 2023 +0800 winegstreamer: Avoid media sink command leaking. --- dlls/winegstreamer/media_sink.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index 6996d689e83..c24e9b9a13f 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -344,8 +344,9 @@ static HRESULT WINAPI stream_sink_ProcessSample(IMFStreamSink *iface, IMFSample IMFSample_AddRef((command->u.process.sample = sample)); command->u.process.stream_id = stream_sink->id; - if (FAILED(hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &media_sink->async_callback, &command->IUnknown_iface))) - IUnknown_Release(&command->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, + &media_sink->async_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); LeaveCriticalSection(&media_sink->cs); @@ -525,7 +526,11 @@ static HRESULT media_sink_queue_command(struct media_sink *media_sink, enum asyn if (FAILED(hr = async_command_create(op, &command))) return hr; - return MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &media_sink->async_callback, &command->IUnknown_iface); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, + &media_sink->async_callback, &command->IUnknown_iface); + IUnknown_Release(&command->IUnknown_iface); + + return hr; } static HRESULT media_sink_queue_stream_event(struct media_sink *media_sink, MediaEventType type)

1 0

Nikolay Sivov : d3dx9/tests: Fix a crash when d3d9 object can't be created.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: c944db5fc049bc6284b9619e487bc2ccd06f49bd URL: https://gitlab.winehq.org/wine/wine/-/commit/c944db5fc049bc6284b9619e487bc2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 21:52:49 2023 +0100 d3dx9/tests: Fix a crash when d3d9 object can't be created. --- dlls/d3dx9_36/tests/math.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 409fa2c7dcb..3345c412481 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -4480,9 +4480,14 @@ static void test_D3DXSHProjectCubeMap(void) {-1.10743945e+3f, -9.43649292e+2f, 5.48424316e+2f, 1.65352710e+3f}}, }; - window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); - ok(!!d3d, "Failed to create a D3D object.\n"); + if (!d3d) + { + skip("Failed to create a D3D object.\n"); + return; + } + + window = create_window(); if (!(device = create_device(d3d, window))) { skip("Failed to create a D3D device, skipping tests.\n");

1 0

Anton Baskanov : amstream/tests: Test IEnumPins with two streams.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 150463b39b5b06312d8a6f06a41a6131dc61ce98 URL: https://gitlab.winehq.org/wine/wine/-/commit/150463b39b5b06312d8a6f06a41a61… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 27 17:50:54 2023 +0700 amstream/tests: Test IEnumPins with two streams. --- dlls/amstream/tests/amstream.c | 65 +++++++++++++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a2f27c1b557..e75bddfc7d1 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1839,10 +1839,10 @@ static void test_media_streams(void) static void test_enum_pins(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStream *stream0, *stream1; + IPin *pins[3], *pin0, *pin1; IMediaStreamFilter *filter; IEnumPins *enum1, *enum2; - IMediaStream *stream; - IPin *pins[3], *pin; ULONG ref, count; HRESULT hr; @@ -1877,9 +1877,13 @@ static void test_enum_pins(void) hr = IEnumPins_Skip(enum1, 1); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream0); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream1); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaStream_QueryInterface(stream0, &IID_IPin, (void **)&pin0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IMediaStream_QueryInterface(stream1, &IID_IPin, (void **)&pin1); ok(hr == S_OK, "Got hr %#lx.\n", hr); /* Reset() isn't enough; we have to call EnumPins() again to see the updated @@ -1899,20 +1903,33 @@ static void test_enum_pins(void) ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); - ref = get_refcount(pin); + ref = get_refcount(pin0); + ok(ref == 4, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin1); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); ref = get_refcount(filter); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); - ref = get_refcount(pin); + ref = get_refcount(pin0); ok(ref == 5, "Got unexpected refcount %ld.\n", ref); IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ref = get_refcount(filter); + ok(ref == 4, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); + ref = get_refcount(pin1); + todo_wine ok(ref == 5, "Got unexpected refcount %ld.\n", ref); + IPin_Release(pins[0]); + hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); @@ -1922,20 +1939,28 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(count == 1, "Got count %lu.\n", count); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(count == 1, "Got count %lu.\n", count); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, NULL); + hr = IEnumPins_Next(enum1, 3, pins, NULL); ok(hr == E_POINTER, "Got hr %#lx.\n", hr); - hr = IEnumPins_Next(enum1, 2, pins, &count); + hr = IEnumPins_Next(enum1, 3, pins, &count); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); - ok(count == 1, "Got count %lu.\n", count); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(count == 2, "Got count %lu.\n", count); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + ok(pins[1] == pin1, "Expected pin %p, got %p.\n", pin1, pins[1]); IPin_Release(pins[0]); + IPin_Release(pins[1]); hr = IEnumPins_Reset(enum1); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1946,7 +1971,7 @@ static void test_enum_pins(void) hr = IEnumPins_Skip(enum1, 0); ok(hr == S_OK, "Got hr %#lx.\n", hr); - hr = IEnumPins_Skip(enum1, 1); + hr = IEnumPins_Skip(enum1, 2); ok(hr == S_FALSE, "Got hr %#lx.\n", hr); hr = IEnumPins_Next(enum1, 1, pins, NULL); @@ -1954,7 +1979,12 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum2, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - ok(pins[0] == pin, "Expected pin %p, got %p.\n", pin, pins[0]); + ok(pins[0] == pin0, "Expected pin %p, got %p.\n", pin0, pins[0]); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); IEnumPins_Release(enum2); @@ -1963,8 +1993,11 @@ static void test_enum_pins(void) IMediaStreamFilter_Release(filter); ref = IAMMultiMediaStream_Release(mmstream); ok(!ref, "Got outstanding refcount %ld.\n", ref); - IMediaStream_Release(stream); - ref = IPin_Release(pin); + IMediaStream_Release(stream1); + IMediaStream_Release(stream0); + ref = IPin_Release(pin1); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + ref = IPin_Release(pin0); ok(!ref, "Got outstanding refcount %ld.\n", ref); }

1 0

Matteo Bruni : tools: Print the correct option in error messages.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 5d1995500792eaece879fcc84a952ed1a7eeab87 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d1995500792eaece879fcc84a952e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 24 21:48:06 2023 +0100 tools: Print the correct option in error messages. --- tools/tools.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools.h b/tools/tools.h index 67b13a0ed55..5372b5bd303 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -773,7 +773,7 @@ static inline struct strarray parse_options( int argc, char **argv, const char * char *start, *end; int i; -#define OPT_ERR(fmt) { callback( '?', strmake( fmt, argv[1] )); continue; } +#define OPT_ERR(fmt) { callback( '?', strmake( fmt, argv[i] )); continue; } for (i = 1; i < argc; i++) {

1 0

Anton Baskanov : winegstreamer: Wake all streaming threads after seeking.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 54aef5993141e415aa8858865a797543fc09dfdd URL: https://gitlab.winehq.org/wine/wine/-/commit/54aef5993141e415aa8858865a7975… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sun Nov 26 18:53:25 2023 +0700 winegstreamer: Wake all streaming threads after seeking. --- dlls/winegstreamer/quartz_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 596f7a5011a..e402e1aab52 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1895,7 +1895,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, EnterCriticalSection(&filter->streaming_cs); filter->flushing = false; LeaveCriticalSection(&filter->streaming_cs); - WakeConditionVariable(&filter->flushing_cv); + WakeAllConditionVariable(&filter->flushing_cv); return S_OK; }

1 0

Anton Baskanov : amstream: Use correct index in MediaStreamFilter's IEnumPins::Next().
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: a69c7a8aa09f88ce88e67e7192c9a59117c7d9fe URL: https://gitlab.winehq.org/wine/wine/-/commit/a69c7a8aa09f88ce88e67e7192c9a5… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon Nov 27 17:06:02 2023 +0700 amstream: Use correct index in MediaStreamFilter's IEnumPins::Next(). --- dlls/amstream/filter.c | 2 +- dlls/amstream/tests/amstream.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index c1c97630bb9..0ca0f2e2a1c 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -94,7 +94,7 @@ static HRESULT WINAPI enum_pins_Next(IEnumPins *iface, ULONG count, IPin **pins, for (i = 0; i < count && enum_pins->index < enum_pins->count; ++i) { - IPin_AddRef(pins[i] = enum_pins->pins[i]); + IPin_AddRef(pins[i] = enum_pins->pins[enum_pins->index]); enum_pins->index++; } diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index e75bddfc7d1..f1e17ef49cf 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -1921,13 +1921,13 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); ref = get_refcount(filter); ok(ref == 4, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(enum1); ok(ref == 1, "Got unexpected refcount %ld.\n", ref); ref = get_refcount(pin1); - todo_wine ok(ref == 5, "Got unexpected refcount %ld.\n", ref); + ok(ref == 5, "Got unexpected refcount %ld.\n", ref); IPin_Release(pins[0]); hr = IEnumPins_Next(enum1, 1, pins, NULL); @@ -1945,7 +1945,7 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum1, 1, pins, &count); ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(count == 1, "Got count %lu.\n", count); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); hr = IEnumPins_Reset(enum1); @@ -1984,7 +1984,7 @@ static void test_enum_pins(void) hr = IEnumPins_Next(enum2, 1, pins, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); + ok(pins[0] == pin1, "Expected pin %p, got %p.\n", pin1, pins[0]); IPin_Release(pins[0]); IEnumPins_Release(enum2);

1 0

Rémi Bernon : win32u: Remove unnecessary config_key lazy initializations.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 8e4c196c14779194b42f2c235c8f421c0d2f94c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e4c196c14779194b42f2c235c8f42… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:12:36 2023 +0100 win32u: Remove unnecessary config_key lazy initializations. --- dlls/win32u/sysparams.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 471403440b6..d0fb0f6415a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -565,8 +565,7 @@ static BOOL adapter_get_registry_settings( const struct adapter *adapter, DEVMOD mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_REGISTRY_SETTINGS, mode ); @@ -585,7 +584,6 @@ static BOOL adapter_set_registry_settings( const struct adapter *adapter, const mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { @@ -614,8 +612,7 @@ static BOOL adapter_get_current_settings( const struct adapter *adapter, DEVMODE mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; - else if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; + if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else { ret = read_adapter_mode( hkey, ENUM_CURRENT_SETTINGS, mode ); @@ -634,7 +631,6 @@ static BOOL adapter_set_current_settings( const struct adapter *adapter, const D mutex = get_display_device_init_mutex(); - if (!config_key && !(config_key = reg_open_key( NULL, config_keyW, sizeof(config_keyW) ))) ret = FALSE; if (!(hkey = reg_open_key( config_key, adapter->config_key, lstrlenW( adapter->config_key ) * sizeof(WCHAR) ))) ret = FALSE; else {

1 0

Rémi Bernon : win32u: Initialize sysparams before winstation.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 7175d8855af8bdf30440c15e60681ea9df9e0382 URL: https://gitlab.winehq.org/wine/wine/-/commit/7175d8855af8bdf30440c15e60681e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 27 19:05:38 2023 +0100 win32u: Initialize sysparams before winstation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55843 --- dlls/win32u/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 396e2285797..1fb5044b2e5 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -249,8 +249,8 @@ DLGPROC get_dialog_proc( DLGPROC ret, BOOL ansi ) static void init_user(void) { gdi_init(); - winstation_init(); sysparams_init(); + winstation_init(); register_desktop_class(); }

1 0

Zhiyi Zhang : ntdll: Fix an out-of-bounds read (Coverity).
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: 1ab1c9708745b9cbf5f9540cd799ebff654362d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/1ab1c9708745b9cbf5f9540cd799eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sat Nov 25 23:26:58 2023 +0800 ntdll: Fix an out-of-bounds read (Coverity). class FileRenameInformationEx to FileKnownFolderInformation could cause an out-of-bounds read of info_sizes. --- dlls/ntdll/unix/file.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 98e50082904..ee68e4dee9b 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4264,7 +4264,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, void *ptr, ULONG len, FILE_INFORMATION_CLASS class ) { - static const size_t info_sizes[] = + static const size_t info_sizes[FileMaximumInformation] = { 0, sizeof(FILE_DIRECTORY_INFORMATION), /* FileDirectoryInformation */ @@ -4331,6 +4331,18 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, 0, /* FileHardLinkFullIdInformation */ 0, /* FileIdExtdBothDirectoryInformation */ 0, /* FileDispositionInformationEx */ + 0, /* FileRenameInformationEx */ + 0, /* FileRenameInformationExBypassAccessCheck */ + 0, /* FileDesiredStorageClassInformation */ + 0, /* FileStatInformation */ + 0, /* FileMemoryPartitionInformation */ + 0, /* FileStatLxInformation */ + 0, /* FileCaseSensitiveInformation */ + 0, /* FileLinkInformationEx */ + 0, /* FileLinkInformationExBypassAccessCheck */ + 0, /* FileStorageReserveIdInformation */ + 0, /* FileCaseSensitiveInformationForceAccessCheck */ + 0, /* FileKnownFolderInformation */ }; struct stat st;

1 0