- Wine-Commits - list.winehq.org

Ziqing Hui : winestreamer: Introduce media_sink_write_stream.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

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

Eric Pouech : ucrtbase/tests: Introduce environment tests.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

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

Paul Gofman : msvcp110: Implement std::_Xbad_function_call().
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: a2d3b27b6c90101729299314da9cae534a3c11ba URL: https://gitlab.winehq.org/wine/wine/-/commit/a2d3b27b6c90101729299314da9cae… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Nov 20 12:27:02 2023 -0600 msvcp110: Implement std::_Xbad_function_call(). --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 50 +++++++++++++++++++++++++++++++++++++ dlls/msvcp_win/msvcp_win.spec | 2 +- 6 files changed, 55 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 9c61f57a4de..bc73bd57a54 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1833,7 +1833,7 @@ @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem -@ stub ?_Xbad_function_call(a)std@@YAXXZ +@ cdecl ?_Xbad_function_call(a)std@@YAXXZ() _Xbad_function_call @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) _Xlength_error diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 835d37d3bf4..dc00344c92f 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1794,7 +1794,7 @@ @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem -@ stub ?_Xbad_function_call(a)std@@YAXXZ +@ cdecl ?_Xbad_function_call(a)std@@YAXXZ() _Xbad_function_call @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) _Xlength_error diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index c6778841ffb..dc69df9ce6a 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1794,7 +1794,7 @@ @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp120.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp120.?_XLgamma(a)std@@YAOO(a)Z @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() msvcp120.?_Xbad_alloc(a)std@@YAXXZ -@ stub ?_Xbad_function_call(a)std@@YAXXZ +@ cdecl ?_Xbad_function_call(a)std@@YAXXZ() msvcp120.?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xinvalid_argument(a)std@@YAXPBD(a)Z @ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) msvcp120.?_Xinvalid_argument(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) msvcp120.?_Xlength_error(a)std@@YAXPBD(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e3d01a9326f..ea2e7798a1d 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1677,7 +1677,7 @@ @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) std__XLgamma_double @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) std__XLgamma_double @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() _Xmem -@ stub ?_Xbad_function_call(a)std@@YAXXZ +@ cdecl ?_Xbad_function_call(a)std@@YAXXZ() _Xbad_function_call @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) _Xinvalid_argument @ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) _Xlength_error diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index ee59dbf2112..01cb2bb5dab 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -68,6 +68,8 @@ extern const vtable_ptr failure_vtable; extern const vtable_ptr bad_cast_vtable; /* ??_7range_error(a)std@@6B@ */ extern const vtable_ptr range_error_vtable; +/* ??_7bad_function_call(a)std@@6B@ */ +extern const vtable_ptr bad_function_call_vtable; /* ??0exception@@QAE(a)ABQBD@Z */ /* ??0exception@@QEAA(a)AEBQEBD@Z */ @@ -875,6 +877,33 @@ range_error* __thiscall MSVCP_range_error_assign(range_error *this, const range_ DEFINE_RTTI_DATA2(range_error, 0, &runtime_error_rtti_base_descriptor, &exception_rtti_base_descriptor, ".?AVrange_error(a)std@@") DEFINE_CXX_DATA2(range_error, &runtime_error_cxx_type_info, &exception_cxx_type_info, MSVCP_runtime_error_dtor) +#if _MSVCP_VER > 90 +/* bad_function_call class data */ +typedef exception bad_function_call; + +static bad_function_call* MSVCP_bad_function_call_ctor(bad_function_call *this) +{ + static const char *name = "bad function call"; + + TRACE("%p\n", this); + MSVCP_exception_ctor(this, EXCEPTION_NAME(name)); + this->vtable = &bad_function_call_vtable; + return this; +} + +DEFINE_THISCALL_WRAPPER(bad_function_call_copy_ctor, 8) +bad_function_call* __thiscall bad_function_call_copy_ctor(bad_function_call *this, const bad_function_call *rhs) +{ + TRACE("%p %p\n", this, rhs); + exception_copy_ctor(this, rhs); + this->vtable = &bad_function_call_vtable; + return this; +} + +DEFINE_RTTI_DATA1(bad_function_call, 0, &exception_rtti_base_descriptor, ".?AVbad_function_call(a)std@@") +DEFINE_CXX_DATA1(bad_function_call, &exception_cxx_type_info, MSVCP_exception_dtor) +#endif + /* ?_Nomemory(a)std@@YAXXZ */ void __cdecl DECLSPEC_NORETURN _Nomemory(void) { @@ -949,6 +978,19 @@ void __cdecl DECLSPEC_NORETURN _Xruntime_error(const char *str) _CxxThrowException(&e, &runtime_error_cxx_type); } +#if _MSVCP_VER > 90 +/* ?_Xbad_function_call(a)std@@YAXXZ() */ +void __cdecl _Xbad_function_call(void) +{ + exception e; + + TRACE("()\n"); + + MSVCP_bad_function_call_ctor(&e); + _CxxThrowException(&e, &bad_function_call_cxx_type); +} +#endif + /* ?uncaught_exception(a)std@@YA_NXZ */ bool __cdecl MSVCP__uncaught_exception(void) { @@ -1476,6 +1518,9 @@ __ASM_BLOCK_BEGIN(exception_vtables) EXCEPTION_VTABLE(system_error, VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) VTABLE_ADD_FUNC(MSVCP_failure_what)); + EXCEPTION_VTABLE(bad_function_call, + VTABLE_ADD_FUNC(MSVCP_exception_vector_dtor) + VTABLE_ADD_FUNC(MSVCP_exception_what)); #endif EXCEPTION_VTABLE(failure, VTABLE_ADD_FUNC(MSVCP_failure_vector_dtor) @@ -1486,6 +1531,7 @@ __ASM_BLOCK_BEGIN(exception_vtables) EXCEPTION_VTABLE(range_error, VTABLE_ADD_FUNC(MSVCP_runtime_error_vector_dtor) VTABLE_ADD_FUNC(MSVCP_runtime_error_what)); + __ASM_BLOCK_END /* Internal: throws exception */ @@ -1537,6 +1583,7 @@ void init_exception(void *base) #endif #if _MSVCP_VER > 90 init_system_error_rtti(base); + init_bad_function_call_rtti(base); #endif init_failure_rtti(base); init_bad_cast_rtti(base); @@ -1559,6 +1606,9 @@ void init_exception(void *base) init_system_error_cxx_type_info(base); #elif _MSVCP_VER > 100 init_system_error_cxx(base); +#endif +#if _MSVCP_VER > 90 + init_bad_function_call_cxx(base); #endif init_failure_cxx(base); init_range_error_cxx(base); diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index c8107094d31..9f4d8581cf3 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1677,7 +1677,7 @@ @ cdecl ?_XLgamma(a)std@@YANN(a)Z(double) msvcp140.?_XLgamma(a)std@@YANN(a)Z @ cdecl ?_XLgamma(a)std@@YAOO(a)Z(double) msvcp140.?_XLgamma(a)std@@YAOO(a)Z @ cdecl ?_Xbad_alloc(a)std@@YAXXZ() msvcp140.?_Xbad_alloc(a)std@@YAXXZ -@ stub ?_Xbad_function_call(a)std@@YAXXZ +@ cdecl ?_Xbad_function_call(a)std@@YAXXZ() msvcp140.?_Xbad_function_call(a)std@@YAXXZ @ cdecl -arch=win32 ?_Xinvalid_argument(a)std@@YAXPBD(a)Z(str) msvcp140.?_Xinvalid_argument(a)std@@YAXPBD(a)Z @ cdecl -arch=win64 ?_Xinvalid_argument(a)std@@YAXPEBD(a)Z(str) msvcp140.?_Xinvalid_argument(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Xlength_error(a)std@@YAXPBD(a)Z(str) msvcp140.?_Xlength_error(a)std@@YAXPBD(a)Z

1 0

Alexandre Julliard : tiff: Fix size_t type size detection on 64-bit.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 9011462be81d683610d2b824649068b35c58d13a URL: https://gitlab.winehq.org/wine/wine/-/commit/9011462be81d683610d2b824649068… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:15:05 2023 +0100 tiff: Fix size_t type size detection on 64-bit. --- libs/tiff/libtiff/tif_config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/tiff/libtiff/tif_config.h b/libs/tiff/libtiff/tif_config.h index 1cee0dac72c..f261bea3257 100644 --- a/libs/tiff/libtiff/tif_config.h +++ b/libs/tiff/libtiff/tif_config.h @@ -93,7 +93,11 @@ #define PACKAGE_URL "" /* The size of `size_t', as computed by sizeof. */ +#ifdef _WIN64 +#define SIZEOF_SIZE_T 8 +#else #define SIZEOF_SIZE_T 4 +#endif /* Default size of the strip in bytes (when strip chopping enabled) */ #define STRIP_SIZE_DEFAULT 8192

1 0

Piotr Caban : msvcrt: Factor out wenv_get_index helper.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

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

Alexandre Julliard : fluidsynth: Use a signed atomic type to avoid warnings.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 54ae26409ef1356b028c173d360221cfed092781 URL: https://gitlab.winehq.org/wine/wine/-/commit/54ae26409ef1356b028c173d360221… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:15:40 2023 +0100 fluidsynth: Use a signed atomic type to avoid warnings. --- libs/fluidsynth/src/synth/fluid_synth.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/fluidsynth/src/synth/fluid_synth.h b/libs/fluidsynth/src/synth/fluid_synth.h index cb838e92462..4179113c624 100644 --- a/libs/fluidsynth/src/synth/fluid_synth.h +++ b/libs/fluidsynth/src/synth/fluid_synth.h @@ -120,7 +120,7 @@ struct _fluid_synth_t int effects_channels; /**< the number of effects channels (>= 2) */ int effects_groups; /**< the number of effects units (>= 1) */ int state; /**< the synthesizer state */ - fluid_atomic_uint_t ticks_since_start; /**< the number of audio samples since the start */ + fluid_atomic_int_t ticks_since_start; /**< the number of audio samples since the start */ unsigned int start; /**< the start in msec, as returned by system clock */ fluid_overflow_prio_t overflow; /**< parameters for overflow priority (aka voice-stealing) */

1 0

Piotr Caban : msvcrt: Factor out env_get_index helper.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

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

Eric Pouech : msvcrt/tests: Test passing environment in child process.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 1c4897ec8a0273329dc9fe5f66745eb1ebbe6336 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c4897ec8a0273329dc9fe5f66745e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Nov 21 10:23:54 2023 +0100 msvcrt/tests: Test passing environment in child process. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/tests/environ.c | 49 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index f14764ea5a0..17d75733c85 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -393,12 +393,61 @@ static void test_environment_manipulation(void) ok( count == env_get_entry_countA( *p_environ ), "Unexpected modification of _environ[]\n" ); } +static void test_child_env(char** argv) +{ + STARTUPINFOA si = {sizeof(si)}; + WCHAR *cur_env, *env, *p, *q; + PROCESS_INFORMATION pi; + char tmp[1024]; + BOOL ret; + int len; + + cur_env = GetEnvironmentStringsW(); + ok( cur_env != NULL, "GetEnvironemntStrings failed\n" ); + + p = cur_env; + while (*p) p += wcslen( p ) + 1; + len = p - cur_env; + env = malloc( (len + 1024) * sizeof(*env) ); + memcpy(env, cur_env, len * sizeof(*env) ); + q = env + len; + FreeEnvironmentStringsW( cur_env ); + + wcscpy( q, L"__winetest_dog=bark" ); + q += wcslen( L"__winetest_dog=bark" ) + 1; + wcscpy( q, L"__winetest_\u263a=\u03b2" ); + q += wcslen( L"__winetest_\u263a=\u03b2" ) + 1; + *q = 0; + + snprintf( tmp, sizeof(tmp), "%s %s create", argv[0], argv[1] ); + ret = CreateProcessA( NULL, tmp, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &si, &pi ); + ok( ret, "Couldn't create child process %s\n", tmp ); + winetest_wait_child_process( pi.hProcess ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + free( env ); +} + START_TEST(environ) { + char **argv; + int argc; + init(); + argc = winetest_get_mainargs( &argv ); + if (argc == 3 && !strcmp( argv[2], "create" )) + { + ok( getenv( "__winetest_dog" ) && !strcmp( getenv( "__winetest_dog" ), "bark" ), + "Couldn't find env var\n" ); + ok( _wgetenv( L"__winetest_\u263a" ) && !wcscmp( _wgetenv( L"__winetest_\u263a" ), L"\u03b2" ), + "Couldn't find unicode env var\n" ); + return; + } + test__environ(); test__wenviron(); test_environment_manipulation(); + test_child_env(argv); test_system(); }

1 0

Alexandre Julliard : faudio: Fix a few printf formats.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 30f3a61af26428f59532cd203d893e0d9f2f9c11 URL: https://gitlab.winehq.org/wine/wine/-/commit/30f3a61af26428f59532cd203d893e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 11:17:41 2023 +0100 faudio: Fix a few printf formats. --- libs/faudio/src/FAudio_platform_win32.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index d3ded665df9..c45b4a2f4f2 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -1096,7 +1096,7 @@ static HRESULT FAudio_WMAMF_ProcessInput( copy_size = min(buffer->AudioBytes - impl->input_pos, impl->input_size); if (!copy_size) return S_FALSE; - LOG_INFO(voice->audio, "pushing %x bytes at %x", copy_size, impl->input_pos); + LOG_INFO(voice->audio, "pushing %lx bytes at %Ix", copy_size, impl->input_pos); hr = MFCreateSample(&sample); FAudio_assert(!FAILED(hr) && "Failed to create sample!"); @@ -1124,7 +1124,7 @@ static HRESULT FAudio_WMAMF_ProcessInput( if (hr == MF_E_NOTACCEPTING) return S_OK; if (FAILED(hr)) { - LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#x", hr); + LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#lx", hr); return hr; } @@ -1151,7 +1151,7 @@ static HRESULT FAudio_WMAMF_ProcessOutput( if (hr == MF_E_TRANSFORM_NEED_MORE_INPUT) return S_FALSE; if (FAILED(hr)) { - LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#x", hr); + LOG_ERROR(voice->audio, "IMFTransform_ProcessInput returned %#lx", hr); return hr; } @@ -1183,7 +1183,7 @@ static HRESULT FAudio_WMAMF_ProcessOutput( } FAudio_memcpy(impl->output_buf + impl->output_pos, copy_buf, copy_size); impl->output_pos += copy_size; - LOG_INFO(voice->audio, "pulled %x bytes at %x", copy_size, impl->output_pos); + LOG_INFO(voice->audio, "pulled %lx bytes at %Ix", copy_size, impl->output_pos); hr = IMFMediaBuffer_Unlock(media_buffer); FAudio_assert(!FAILED(hr) && "Failed to unlock buffer bytes!"); @@ -1282,7 +1282,7 @@ static void FAudio_INTERNAL_DecodeWMAMF( FAudio_zero(decodeCache + copy_size, samples_size - copy_size); LOG_INFO( voice->audio, - "decoded %x / %x bytes, copied %x / %x bytes", + "decoded %Ix / %Ix bytes, copied %Ix / %Ix bytes", impl->output_pos, impl->output_size, copy_size,

1 0

Alistair Leslie-Hughes : msado15: Correct logic when setting field value.
by Alexandre Julliard Nov. 21, 2023

Nov. 21, 2023

Module: wine Branch: master Commit: 78ba84e3c58b8c90d22cdd56da484f40d78c3ae0 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ba84e3c58b8c90d22cdd56da484f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 21 09:21:51 2023 +1100 msado15: Correct logic when setting field value. --- dlls/msado15/recordset.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index d64ccdeee3d..36938db88cc 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -299,7 +299,7 @@ static HRESULT WINAPI field_put_Value( Field *iface, VARIANT val ) field->recordset->data[row * col_count + col] = copy; - if (field->recordset->editmode != adEditNone) + if (field->recordset->editmode == adEditNone) field->recordset->editmode = adEditInProgress; return S_OK;

1 0