November 2023 - Wine-commits

Eric Pouech : ucrtbase/tests: Introduce environment tests.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 52b88199afa6b42b5f937b6aa9dc383b0b890e0e URL: https://gitlab.winehq.org/wine/wine/-/commit/52b88199afa6b42b5f937b6aa9dc38… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 ucrtbase/tests: Introduce environment tests. Mostly adapting msvcrt tests/environ.c. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/ucrtbase/tests/Makefile.in | 1 + dlls/ucrtbase/tests/environ.c | 350 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 351 insertions(+)

1 0

Piotr Caban : msvcrt: Factor out env_get_index helper.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: ca7a1139a8f690d4a6c130b2233092aa977939f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ca7a1139a8f690d4a6c130b2233092… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Factor out env_get_index helper. --- dlls/msvcrt/environ.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 2c2a3353582..f0c3705a030 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -25,25 +25,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); -static char * getenv_helper(const char *name) +static int env_get_index(const char *name) { - char **env; - size_t len; + int i, len; - if (!name) return NULL; len = strlen(name); - - for (env = MSVCRT__environ; *env; env++) + for (i = 0; MSVCRT__environ[i]; i++) { - char *str = *env; - char *pos = strchr(str,'='); - if (pos && ((pos - str) == len) && !_strnicmp(str, name, len)) - { - TRACE("(%s): got %s\n", debugstr_a(name), debugstr_a(pos + 1)); - return pos + 1; - } + if (!strncmp(name, MSVCRT__environ[i], len) && MSVCRT__environ[i][len] == '=') + return i; } - return NULL; + return i; +} + +static char * getenv_helper(const char *name) +{ + int idx; + + if (!name) return NULL; + + idx = env_get_index(name); + if (!MSVCRT__environ[idx]) return NULL; + return strchr(MSVCRT__environ[idx], '=') + 1; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Factor out wenv_get_index helper.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 55b18b143f51846f15d81594ec204eadb65082c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/55b18b143f51846f15d81594ec204e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Factor out wenv_get_index helper. --- dlls/msvcrt/environ.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index f0c3705a030..96793a8261b 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -38,6 +38,19 @@ static int env_get_index(const char *name) return i; } +static int wenv_get_index(const wchar_t *name) +{ + int i, len; + + len = wcslen(name); + for (i = 0; MSVCRT__wenviron[i]; i++) + { + if (!wcsncmp(name, MSVCRT__wenviron[i], len) && MSVCRT__wenviron[i][len] == '=') + return i; + } + return i; +} + static char * getenv_helper(const char *name) { int idx; @@ -61,27 +74,17 @@ char * CDECL getenv(const char *name) static wchar_t * wgetenv_helper(const wchar_t *name) { - wchar_t **env; - size_t len; + int idx; if (!name) return NULL; - len = wcslen(name); /* Initialize the _wenviron array if it's not already created. */ if (!MSVCRT__wenviron) MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(NULL); - for (env = MSVCRT__wenviron; *env; env++) - { - wchar_t *str = *env; - wchar_t *pos = wcschr(str,'='); - if (pos && ((pos - str) == len) && !_wcsnicmp(str, name, len)) - { - TRACE("(%s): got %s\n", debugstr_w(name), debugstr_w(pos + 1)); - return pos + 1; - } - } - return NULL; + idx = wenv_get_index(name); + if (!MSVCRT__wenviron[idx]) return NULL; + return wcschr(MSVCRT__wenviron[idx], '=') + 1; } /*********************************************************************

1 0

Eric Pouech : msvcrt: Lazily initialize ___winitenv.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: a45ca342fc418ce5e018953f60c4c1219774f254 URL: https://gitlab.winehq.org/wine/wine/-/commit/a45ca342fc418ce5e018953f60c4c1… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Lazily initialize ___winitenv. --- dlls/msvcrt/data.c | 80 ++------------------------------ dlls/msvcrt/environ.c | 105 ++++++++++++++++++++++++++++++++++++------ dlls/msvcrt/msvcrt.h | 5 +- dlls/msvcrt/tests/environ.c | 3 -- dlls/ucrtbase/tests/environ.c | 3 +- 5 files changed, 97 insertions(+), 99 deletions(-)

1 0

Eric Pouech : msvcrt: Allocate environment variables in separate allocation chunks.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: bdb624fffb1c1acc1feb2baec396d9b805cb0ce9 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdb624fffb1c1acc1feb2baec396d9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Allocate environment variables in separate allocation chunks. --- dlls/msvcrt/environ.c | 338 ++++++++++++++++++++++++++---------------- dlls/msvcrt/tests/environ.c | 4 - dlls/ucrtbase/tests/environ.c | 4 - 3 files changed, 214 insertions(+), 132 deletions(-)

1 0

Eric Pouech : msvcrt: Fix ucrtbase environment initialization.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 58155d3eb9ccaf79a2f8a481aec639568cce9f14 URL: https://gitlab.winehq.org/wine/wine/-/commit/58155d3eb9ccaf79a2f8a481aec639… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt: Fix ucrtbase environment initialization. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/data.c | 34 +++++++++++++++++++--------------- dlls/ucrtbase/tests/environ.c | 1 - 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index bec1e61e411..6e764e52eae 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -592,14 +592,6 @@ void CDECL __set_app_type(int app_type) #if _MSVCR_VER>=140 -/********************************************************************* - * _get_initial_narrow_environment (UCRTBASE.@) - */ -char** CDECL _get_initial_narrow_environment(void) -{ - return MSVCRT___initenv; -} - /********************************************************************* * _configure_narrow_argv (UCRTBASE.@) */ @@ -614,16 +606,18 @@ int CDECL _configure_narrow_argv(int mode) */ int CDECL _initialize_narrow_environment(void) { - TRACE("\n"); - return 0; + TRACE("\n"); + return env_init(FALSE, FALSE); } /********************************************************************* - * _get_initial_wide_environment (UCRTBASE.@) + * _get_initial_narrow_environment (UCRTBASE.@) */ -wchar_t** CDECL _get_initial_wide_environment(void) +char** CDECL _get_initial_narrow_environment(void) { - return MSVCRT___winitenv; + TRACE("\n"); + _initialize_narrow_environment(); + return MSVCRT___initenv; } /********************************************************************* @@ -640,8 +634,18 @@ int CDECL _configure_wide_argv(int mode) */ int CDECL _initialize_wide_environment(void) { - WARN("stub\n"); - return 0; + TRACE("\n"); + return env_init(TRUE, FALSE); +} + +/********************************************************************* + * _get_initial_wide_environment (UCRTBASE.@) + */ +wchar_t** CDECL _get_initial_wide_environment(void) +{ + TRACE("\n"); + _initialize_wide_environment(); + return MSVCRT___winitenv; } /********************************************************************* diff --git a/dlls/ucrtbase/tests/environ.c b/dlls/ucrtbase/tests/environ.c index dc31c640239..a42f64466e9 100644 --- a/dlls/ucrtbase/tests/environ.c +++ b/dlls/ucrtbase/tests/environ.c @@ -136,7 +136,6 @@ static void test_initial_environ( void ) ok( p__p__wenviron() != NULL, "Unexpected NULL _wenviron[]\n" ); ok( *p__p__wenviron() == NULL, "Unexpected non empty _wenviron[]\n" ); - todo_wine ok( p_get_initial_wide_environment() != NULL, "Unexpected empty wide initial environment\n" ); ok( p_get_initial_wide_environment() == *p__p__wenviron(), "Expecting _wenviron[] to match initial wide environment\n" ); }

1 0

Francois Gouget : advapi32/tests: Fix a service stop race condition.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 96da5a8a3572d08bbcf4323c3701e7da5f79e523 URL: https://gitlab.winehq.org/wine/wine/-/commit/96da5a8a3572d08bbcf4323c3701e7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 16 18:50:30 2023 +0100 advapi32/tests: Fix a service stop race condition. If some Windows services stop while testing EnumServicesStatusW()'s resume handle support, one possibility is that the still running services all fit in the specified buffer, invalidating the test so there is a retry in place. But in some cases the second call just returns fewer tests than expected. So retry in that case too. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53460 --- dlls/advapi32/tests/service.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 4e6aebb445d..3fb1bda1d7d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -1370,6 +1370,8 @@ static BOOL test_enum_svc(int attempt) goto retry; /* service start race condition */ ok(ret, "Expected success, got error %lu\n", GetLastError()); ok(needed == 0, "Expected 0 needed bytes as we are done, got %lu\n", needed); + if (returned < missing && strcmp(winetest_platform, "wine") && attempt) + goto retry; /* service stop race condition */ todo_wine ok(returned == missing, "Expected %lu remaining services, got %lu\n", missing, returned); ok(resume == 0, "Expected the resume handle to be 0\n");

1 0

Ziqing Hui : winestreamer: Introduce media_sink_write_stream.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 98310d218295efcc33028b5e8112a1def03d31b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/98310d218295efcc33028b5e8112a1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Aug 18 09:32:04 2023 +0800 winestreamer: Introduce media_sink_write_stream. --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 23 +++++++++++++++++++++++ dlls/winegstreamer/media_sink.c | 25 +++++++++++++++++++++++++ dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.h | 9 +++++++++ dlls/winegstreamer/wg_muxer.c | 6 ++++++ dlls/winegstreamer/wg_parser.c | 26 ++++++++++++++++++++++++++ 7 files changed, 91 insertions(+) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 8712980092b..26873edb74b 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -115,6 +115,7 @@ void wg_muxer_destroy(wg_muxer_t muxer); HRESULT wg_muxer_add_stream(wg_muxer_t muxer, UINT32 stream_id, const struct wg_format *format); HRESULT wg_muxer_start(wg_muxer_t muxer); HRESULT wg_muxer_push_sample(wg_muxer_t muxer, struct wg_sample *sample, UINT32 stream_id); +HRESULT wg_muxer_read_data(wg_muxer_t muxer, void *buffer, UINT32 *size, UINT64 *offset); unsigned int wg_format_get_bytes_for_uncompressed(wg_video_format format, unsigned int width, unsigned int height); unsigned int wg_format_get_max_size(const struct wg_format *format); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 3eb82bdccf5..900905be0d9 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -544,6 +544,29 @@ HRESULT wg_muxer_push_sample(wg_muxer_t muxer, struct wg_sample *sample, UINT32 return S_OK; } +HRESULT wg_muxer_read_data(wg_muxer_t muxer, void *buffer, UINT32 *size, UINT64 *offset) +{ + struct wg_muxer_read_data_params params = + { + .muxer = muxer, + .buffer = buffer, + .size = *size, + .offset = UINT64_MAX, + }; + NTSTATUS status; + + TRACE("muxer %#I64x, buffer %p, size %u.\n", muxer, buffer, *size); + + if (SUCCEEDED(status = WINE_UNIX_CALL(unix_wg_muxer_read_data, &params))) + { + *size = params.size; + *offset = params.offset; + TRACE("Read %u bytes, offset %#I64x.\n", *size, *offset); + } + + return HRESULT_FROM_NT(status); +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_stride(const struct wg_format *format) diff --git a/dlls/winegstreamer/media_sink.c b/dlls/winegstreamer/media_sink.c index d9c15291b61..6996d689e83 100644 --- a/dlls/winegstreamer/media_sink.c +++ b/dlls/winegstreamer/media_sink.c @@ -542,6 +542,28 @@ static HRESULT media_sink_queue_stream_event(struct media_sink *media_sink, Medi return S_OK; } +static HRESULT media_sink_write_stream(struct media_sink *media_sink) +{ + BYTE buffer[1024]; + UINT32 size = sizeof(buffer); + ULONG written; + QWORD offset; + HRESULT hr; + + while (SUCCEEDED(hr = wg_muxer_read_data(media_sink->muxer, buffer, &size, &offset))) + { + if (offset != UINT64_MAX && FAILED(hr = IMFByteStream_SetCurrentPosition(media_sink->bytestream, offset))) + return hr; + + if (FAILED(hr = IMFByteStream_Write(media_sink->bytestream, buffer, size, &written))) + return hr; + + size = sizeof(buffer); + } + + return S_OK; +} + static HRESULT media_sink_start(struct media_sink *media_sink) { HRESULT hr; @@ -577,6 +599,9 @@ static HRESULT media_sink_process(struct media_sink *media_sink, IMFSample *samp TRACE("media_sink %p, sample %p, stream_id %u.\n", media_sink, sample, stream_id); + if (FAILED(hr = media_sink_write_stream(media_sink))) + WARN("Failed to write output samples to stream, hr %#lx.\n", hr); + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) return hr; diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index f639b03bcce..070e1285b38 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -70,6 +70,7 @@ extern NTSTATUS wg_muxer_destroy(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_add_stream(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_start(void *args) DECLSPEC_HIDDEN; extern NTSTATUS wg_muxer_push_sample(void *args) DECLSPEC_HIDDEN; +extern NTSTATUS wg_muxer_read_data(void *args) DECLSPEC_HIDDEN; /* wg_allocator.c */ diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index 6c0c61f76bb..7a2a4a8da2f 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -392,6 +392,14 @@ struct wg_muxer_push_sample_params UINT32 stream_id; }; +struct wg_muxer_read_data_params +{ + wg_muxer_t muxer; + void *buffer; + UINT32 size; + UINT64 offset; +}; + enum unix_funcs { unix_wg_init_gstreamer, @@ -437,6 +445,7 @@ enum unix_funcs unix_wg_muxer_add_stream, unix_wg_muxer_start, unix_wg_muxer_push_sample, + unix_wg_muxer_read_data, unix_wg_funcs_count, }; diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 7402ba91a58..0d25687a7d1 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -451,3 +451,9 @@ NTSTATUS wg_muxer_push_sample(void *args) return STATUS_SUCCESS; } + +NTSTATUS wg_muxer_read_data(void *args) +{ + GST_FIXME("Not implemented."); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 247810b7796..84bb65dbccd 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1921,6 +1921,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = X(wg_muxer_add_stream), X(wg_muxer_start), X(wg_muxer_push_sample), + X(wg_muxer_read_data), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_wg_funcs_count); @@ -2181,6 +2182,30 @@ NTSTATUS wow64_wg_muxer_push_sample(void *args) return wg_muxer_push_sample(&params); } +NTSTATUS wow64_wg_muxer_read_data(void *args) +{ + struct + { + wg_muxer_t muxer; + PTR32 buffer; + UINT32 size; + UINT64 offset; + } *params32 = args; + struct wg_muxer_read_data_params params = + { + .muxer = params32->muxer, + .buffer = ULongToPtr(params32->buffer), + .size = params32->size, + .offset = params32->offset, + }; + NTSTATUS ret; + + ret = wg_muxer_read_data(&params); + params32->size = params.size; + params32->offset = params.offset; + return ret; +} + const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { #define X64(name) [unix_ ## name] = wow64_ ## name @@ -2227,6 +2252,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = X64(wg_muxer_add_stream), X(wg_muxer_start), X64(wg_muxer_push_sample), + X64(wg_muxer_read_data), }; C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_wg_funcs_count);

1 0

Ziqing Hui : winegstreamer: Implement wg_muxer_read_data.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 1617bd3f874ea96b2757723d82a0bd1b656f3d2f URL: https://gitlab.winehq.org/wine/wine/-/commit/1617bd3f874ea96b2757723d82a0bd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Oct 30 10:29:08 2023 +0800 winegstreamer: Implement wg_muxer_read_data. --- dlls/winegstreamer/wg_muxer.c | 76 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 0d25687a7d1..c0614807459 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -59,8 +59,11 @@ struct wg_muxer GstPad *my_sink; GstCaps *my_sink_caps; + GstAtomicQueue *output_queue; + GstBuffer *buffer; + pthread_mutex_t mutex; - guint64 offset; + guint64 offset; /* Write offset of the output buffer generated by muxer. */ struct list streams; }; @@ -198,8 +201,29 @@ static gboolean muxer_sink_event_cb(GstPad *pad, GstObject *parent, GstEvent *ev static GstFlowReturn muxer_sink_chain_cb(GstPad *pad, GstObject *parent, GstBuffer *buffer) { - GST_FIXME("Stub."); - return GST_FLOW_ERROR; + GstBuffer *buffer_writable= gst_buffer_make_writable(buffer); + struct wg_muxer *muxer = gst_pad_get_element_private(pad); + + GST_DEBUG("muxer %p, pad %"GST_PTR_FORMAT", parent %"GST_PTR_FORMAT", buffer <%"GST_PTR_FORMAT">.", + muxer, pad, parent, buffer); + + pthread_mutex_lock(&muxer->mutex); + + GST_BUFFER_OFFSET(buffer_writable) = GST_BUFFER_OFFSET_NONE; + if (muxer->offset != GST_BUFFER_OFFSET_NONE) + { + GST_BUFFER_OFFSET(buffer_writable) = muxer->offset; + muxer->offset = GST_BUFFER_OFFSET_NONE; + } + + gst_atomic_queue_push(muxer->output_queue, buffer_writable); + + GST_DEBUG("Pushed writable buffer <%"GST_PTR_FORMAT"> to output queue %p, %u buffers in queue now.", + buffer_writable, muxer->output_queue, gst_atomic_queue_length(muxer->output_queue)); + + pthread_mutex_unlock(&muxer->mutex); + + return GST_FLOW_OK; } static void stream_free(struct wg_muxer_stream *stream) @@ -226,6 +250,8 @@ NTSTATUS wg_muxer_create(void *args) pthread_mutex_init(&muxer->mutex, NULL); if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; + if (!(muxer->output_queue = gst_atomic_queue_new(8))) + goto out; /* Create sink pad. */ if (!(muxer->my_sink_caps = gst_caps_from_string(params->format))) @@ -257,6 +283,8 @@ out: gst_object_unref(template); if (muxer->my_sink_caps) gst_caps_unref(muxer->my_sink_caps); + if (muxer->output_queue) + gst_atomic_queue_unref(muxer->output_queue); if (muxer->container) gst_object_unref(muxer->container); pthread_mutex_destroy(&muxer->mutex); @@ -269,6 +297,7 @@ NTSTATUS wg_muxer_destroy(void *args) { struct wg_muxer *muxer = get_muxer(*(wg_muxer_t *)args); struct wg_muxer_stream *stream, *next; + GstBuffer *buffer; LIST_FOR_EACH_ENTRY_SAFE(stream, next, &muxer->streams, struct wg_muxer_stream, entry) { @@ -276,6 +305,13 @@ NTSTATUS wg_muxer_destroy(void *args) stream_free(stream); } + if (muxer->buffer) + gst_buffer_unref(muxer->buffer); + + while ((buffer = gst_atomic_queue_pop(muxer->output_queue))) + gst_buffer_unref(buffer); + gst_atomic_queue_unref(muxer->output_queue); + gst_object_unref(muxer->my_sink); gst_caps_unref(muxer->my_sink_caps); gst_element_set_state(muxer->container, GST_STATE_NULL); @@ -454,6 +490,36 @@ NTSTATUS wg_muxer_push_sample(void *args) NTSTATUS wg_muxer_read_data(void *args) { - GST_FIXME("Not implemented."); - return STATUS_NOT_IMPLEMENTED; + struct wg_muxer_read_data_params *params = args; + struct wg_muxer *muxer = get_muxer(params->muxer); + gsize size, copied; + + /* Pop buffer from output queue. */ + if (!muxer->buffer) + { + if (!(muxer->buffer = gst_atomic_queue_pop(muxer->output_queue))) + return STATUS_NO_MEMORY; + + /* We may continuously read data from a same buffer multiple times. + * But we only need to set the offset at the first reading. */ + if (GST_BUFFER_OFFSET_IS_VALID(muxer->buffer)) + params->offset = GST_BUFFER_OFFSET(muxer->buffer); + } + + /* Copy data. */ + size = min(gst_buffer_get_size(muxer->buffer), params->size); + copied = gst_buffer_extract(muxer->buffer, 0, params->buffer, size); + params->size = copied; + + GST_INFO("Copied %"G_GSIZE_FORMAT" bytes from buffer <%"GST_PTR_FORMAT">", copied, muxer->buffer); + + /* Unref buffer if all data is read. */ + gst_buffer_resize(muxer->buffer, (gssize)copied, -1); + if (!gst_buffer_get_size(muxer->buffer)) + { + gst_buffer_unref(muxer->buffer); + muxer->buffer = NULL; + } + + return STATUS_SUCCESS; }

1 0

Louis Lenders : wbemprox: Add StandardCimv2 namespace.
by Alexandre Julliard 21 Nov '23

21 Nov '23

Module: wine Branch: master Commit: 1e1d18a44484a595b7a519f26d9189ef1866ea37 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e1d18a44484a595b7a519f26d9189… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 21 09:19:34 2023 +0100 wbemprox: Add StandardCimv2 namespace. --- dlls/wbemprox/builtin.c | 1 + dlls/wbemprox/tests/services.c | 1 + dlls/wbemprox/wbemprox_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index fe496bdde41..e751299e4e6 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4369,6 +4369,7 @@ builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { {L"cimv2", cimv2_builtin_classes, ARRAY_SIZE(cimv2_builtin_classes)}, {L"Microsoft\\Windows\\Storage", NULL, 0}, + {L"StandardCimv2", NULL, 0}, {L"wmi", wmi_builtin_classes, ARRAY_SIZE(wmi_builtin_classes)}, }; diff --git a/dlls/wbemprox/tests/services.c b/dlls/wbemprox/tests/services.c index e7fbc90cf61..4881cee745d 100644 --- a/dlls/wbemprox/tests/services.c +++ b/dlls/wbemprox/tests/services.c @@ -256,6 +256,7 @@ static void test_namespaces(void) { {L"ROOT\\CIMV2"}, {L"ROOT\\Microsoft\\Windows\\Storage", TRUE /* Before Win8. */}, + {L"ROOT\\StandardCimv2", TRUE /* Before Win8. */}, {L"ROOT\\WMI"}, }; IWbemLocator *locator; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 2701c725c89..3c8fa403c57 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -23,6 +23,7 @@ enum wbm_namespace { WBEMPROX_NAMESPACE_CIMV2, WBEMPROX_NAMESPACE_MS_WINDOWS_STORAGE, + WBEMPROX_NAMESPACE_STANDARDCIMV2, WBEMPROX_NAMESPACE_WMI, WBEMPROX_NAMESPACE_LAST, };

1 0