September 2022 - Wine-commits

Davide Beatrici : wineoss: Drop "oss_" prefix in unixlib enum, apply it to the functions instead.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: 5e4466a342f87aee0c43509c48bd9ddd04f5a530 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e4466a342f87aee0c43509c48bd9d… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Sep 7 05:07:56 2022 +0200 wineoss: Drop "oss_" prefix in unixlib enum, apply it to the functions instead. --- dlls/wineoss.drv/oss.c | 224 ++++++++++++++++++++++----------------------- dlls/wineoss.drv/ossmidi.c | 20 ++-- dlls/wineoss.drv/unixlib.h | 72 +++++++-------- 3 files changed, 158 insertions(+), 158 deletions(-)

1 0

Davide Beatrici : wineoss: Adapt "test_connect_params" struct to mmdevapi's.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: 03af71d470525dc86837e4a80d46d6b8b253d928 URL: https://gitlab.winehq.org/wine/wine/-/commit/03af71d470525dc86837e4a80d46d6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Sep 8 01:26:00 2022 +0200 wineoss: Adapt "test_connect_params" struct to mmdevapi's. --- dlls/wineoss.drv/mmdevdrv.c | 2 ++ dlls/wineoss.drv/oss.c | 18 +++++++++++++++++- dlls/wineoss.drv/unixlib.h | 13 +++++++------ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index dbd9c5a0490..24c2358c184 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -234,6 +234,8 @@ int WINAPI AUDDRV_GetPriority(void) { struct test_connect_params params; + params.name = NULL; + OSS_CALL(test_connect, &params); return params.priority; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 4368523684d..079384131a7 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1646,6 +1646,22 @@ unixlib_entry_t __wine_unix_call_funcs[] = typedef UINT PTR32; +static NTSTATUS oss_wow64_test_connect(void *args) +{ + struct + { + PTR32 name; + enum driver_priority priority; + } *params32 = args; + struct test_connect_params params = + { + .name = ULongToPtr(params32->name), + }; + oss_test_connect(&params); + params32->priority = params.priority; + return STATUS_SUCCESS; +} + static NTSTATUS oss_wow64_get_endpoint_ids(void *args) { struct @@ -1986,7 +2002,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - oss_test_connect, + oss_wow64_test_connect, oss_wow64_get_endpoint_ids, oss_wow64_create_stream, oss_wow64_release_stream, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index b418bb70d2d..3ed78468d27 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -21,17 +21,18 @@ typedef UINT64 stream_handle; /* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority +enum driver_priority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred + Priority_Unavailable = 0, /* driver won't work */ + Priority_Low, /* driver may work, but unlikely */ + Priority_Neutral, /* driver makes no judgment */ + Priority_Preferred /* driver thinks it's correct */ }; struct test_connect_params { - enum DriverPriority priority; + const char *name; + enum driver_priority priority; }; struct endpoint

1 0

Davide Beatrici : wineoss: Adapt "create_stream_params" struct to mmdevapi's.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: b1b71a31bea40674561f4e319d713a25794ebfb9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b1b71a31bea40674561f4e319d713a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Sep 7 05:34:10 2022 +0200 wineoss: Adapt "create_stream_params" struct to mmdevapi's. --- dlls/wineoss.drv/mmdevdrv.c | 2 ++ dlls/wineoss.drv/oss.c | 4 ++++ dlls/wineoss.drv/unixlib.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 24c2358c184..091c797c20c 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -712,6 +712,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + params.name = NULL; params.device = This->devnode; params.flow = This->dataflow; params.share = mode; @@ -719,6 +720,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, params.duration = duration; params.period = period; params.fmt = fmt; + params.channel_count = NULL; params.stream = &stream; OSS_CALL(create_stream, &params); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 079384131a7..b8c61ea0517 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1691,6 +1691,7 @@ static NTSTATUS oss_wow64_create_stream(void *args) { struct { + PTR32 name; PTR32 device; EDataFlow flow; AUDCLNT_SHAREMODE share; @@ -1699,10 +1700,12 @@ static NTSTATUS oss_wow64_create_stream(void *args) REFERENCE_TIME period; PTR32 fmt; HRESULT result; + PTR32 channel_count; PTR32 stream; } *params32 = args; struct create_stream_params params = { + .name = ULongToPtr(params32->name), .device = ULongToPtr(params32->device), .flow = params32->flow, .share = params32->share, @@ -1710,6 +1713,7 @@ static NTSTATUS oss_wow64_create_stream(void *args) .duration = params32->duration, .period = params32->period, .fmt = ULongToPtr(params32->fmt), + .channel_count = ULongToPtr(params32->channel_count), .stream = ULongToPtr(params32->stream) }; oss_create_stream(&params); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 3ed78468d27..019cf66d025 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -53,6 +53,7 @@ struct get_endpoint_ids_params struct create_stream_params { + const char *name; const char *device; EDataFlow flow; AUDCLNT_SHAREMODE share; @@ -61,6 +62,7 @@ struct create_stream_params REFERENCE_TIME period; const WAVEFORMATEX *fmt; HRESULT result; + UINT32 *channel_count; stream_handle *stream; };

1 0

Davide Beatrici : wineoss: Adapt "get_frequency_params" struct to mmdevapi's.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: ae7c8d26b258dbab8c8f21077985aeead6f394f9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae7c8d26b258dbab8c8f21077985ae… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Sep 7 05:38:18 2022 +0200 wineoss: Adapt "get_frequency_params" struct to mmdevapi's. --- dlls/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/oss.c | 6 +++--- dlls/wineoss.drv/unixlib.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 091c797c20c..7185be958fe 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1414,7 +1414,7 @@ static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) TRACE("(%p)->(%p)\n", This, freq); params.stream = This->stream; - params.frequency = freq; + params.freq = freq; OSS_CALL(get_frequency, &params); return params.result; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b8c61ea0517..36597e3da84 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1295,7 +1295,7 @@ static NTSTATUS oss_get_frequency(void *args) { struct get_frequency_params *params = args; struct oss_stream *stream = handle_get_stream(params->stream); - UINT64 *freq = params->frequency; + UINT64 *freq = params->freq; oss_lock(stream); @@ -1911,12 +1911,12 @@ static NTSTATUS oss_wow64_get_frequency(void *args) { stream_handle stream; HRESULT result; - PTR32 frequency; + PTR32 freq; } *params32 = args; struct get_frequency_params params = { .stream = params32->stream, - .frequency = ULongToPtr(params32->frequency) + .freq = ULongToPtr(params32->freq) }; oss_get_frequency(&params); params32->result = params.result; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 019cf66d025..ef72bfe71c8 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -180,7 +180,7 @@ struct get_frequency_params { stream_handle stream; HRESULT result; - UINT64 *frequency; + UINT64 *freq; }; struct get_position_params

1 0

Davide Beatrici : wineoss: Adapt "get_position_params" struct to mmdevapi's.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: 65796159a62cc0821e04dcf9b4461b304df75fdf URL: https://gitlab.winehq.org/wine/wine/-/commit/65796159a62cc0821e04dcf9b4461b… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Wed Sep 7 05:41:57 2022 +0200 wineoss: Adapt "get_position_params" struct to mmdevapi's. --- dlls/wineoss.drv/mmdevdrv.c | 3 ++- dlls/wineoss.drv/oss.c | 8 +++++--- dlls/wineoss.drv/unixlib.h | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7185be958fe..1b081e171b3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1432,7 +1432,8 @@ static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, return E_POINTER; params.stream = This->stream; - params.position = pos; + params.device = FALSE; + params.pos = pos; params.qpctime = qpctime; OSS_CALL(get_position, &params); diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 36597e3da84..62016f8fe58 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1311,7 +1311,7 @@ static NTSTATUS oss_get_position(void *args) { struct get_position_params *params = args; struct oss_stream *stream = handle_get_stream(params->stream); - UINT64 *pos = params->position, *qpctime = params->qpctime; + UINT64 *pos = params->pos, *qpctime = params->qpctime; oss_lock(stream); @@ -1928,14 +1928,16 @@ static NTSTATUS oss_wow64_get_position(void *args) struct { stream_handle stream; + BOOL device; HRESULT result; - PTR32 position; + PTR32 pos; PTR32 qpctime; } *params32 = args; struct get_position_params params = { .stream = params32->stream, - .position = ULongToPtr(params32->position), + .device = params32->device, + .pos = ULongToPtr(params32->pos), .qpctime = ULongToPtr(params32->qpctime) }; oss_get_position(&params); diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index ef72bfe71c8..2bd6e182d82 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -186,8 +186,9 @@ struct get_frequency_params struct get_position_params { stream_handle stream; + BOOL device; HRESULT result; - UINT64 *position; + UINT64 *pos; UINT64 *qpctime; };

1 0

Davide Beatrici : wineoss: Switch to mmdevapi's unixlib.h.
by Alexandre Julliard 08 Sep '22

08 Sep '22

Module: wine Branch: master Commit: 76dc764139807c602f13075af03b91d7923882c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/76dc764139807c602f13075af03b91… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Sep 8 01:26:40 2022 +0200 wineoss: Switch to mmdevapi's unixlib.h. --- dlls/wineoss.drv/oss.c | 14 ++- dlls/wineoss.drv/unixlib.h | 280 +-------------------------------------------- 2 files changed, 13 insertions(+), 281 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 62016f8fe58..221e4e2ff71 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1612,7 +1612,9 @@ static NTSTATUS oss_aux_message(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - oss_test_connect, + NULL, + NULL, + NULL, oss_get_endpoint_ids, oss_create_stream, oss_release_stream, @@ -1626,6 +1628,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_release_capture_buffer, oss_is_format_supported, oss_get_mix_format, + NULL, oss_get_buffer_size, oss_get_latency, oss_get_current_padding, @@ -1634,7 +1637,9 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_get_position, oss_set_volumes, oss_set_event_handle, + oss_test_connect, oss_is_started, + NULL, oss_midi_release, oss_midi_out_message, oss_midi_in_message, @@ -2008,7 +2013,9 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - oss_wow64_test_connect, + NULL, + NULL, + NULL, oss_wow64_get_endpoint_ids, oss_wow64_create_stream, oss_wow64_release_stream, @@ -2022,6 +2029,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_release_capture_buffer, oss_wow64_is_format_supported, oss_wow64_get_mix_format, + NULL, oss_wow64_get_buffer_size, oss_wow64_get_latency, oss_wow64_get_current_padding, @@ -2030,7 +2038,9 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_get_position, oss_wow64_set_volumes, oss_wow64_set_event_handle, + oss_wow64_test_connect, oss_is_started, + NULL, oss_midi_release, oss_wow64_midi_out_message, oss_wow64_midi_in_message, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2bd6e182d82..1c3ee7b93b3 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -16,285 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "mmdeviceapi.h" - -typedef UINT64 stream_handle; - -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum driver_priority -{ - Priority_Unavailable = 0, /* driver won't work */ - Priority_Low, /* driver may work, but unlikely */ - Priority_Neutral, /* driver makes no judgment */ - Priority_Preferred /* driver thinks it's correct */ -}; - -struct test_connect_params -{ - const char *name; - enum driver_priority priority; -}; - -struct endpoint -{ - unsigned int name; - unsigned int device; -}; - -struct get_endpoint_ids_params -{ - EDataFlow flow; - struct endpoint *endpoints; - unsigned int size; - HRESULT result; - unsigned int num; - unsigned int default_idx; -}; - -struct create_stream_params -{ - const char *name; - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - UINT flags; - REFERENCE_TIME duration; - REFERENCE_TIME period; - const WAVEFORMATEX *fmt; - HRESULT result; - UINT32 *channel_count; - stream_handle *stream; -}; - -struct release_stream_params -{ - stream_handle stream; - HANDLE timer_thread; - HRESULT result; -}; - -struct start_params -{ - stream_handle stream; - HRESULT result; -}; - -struct stop_params -{ - stream_handle stream; - HRESULT result; -}; - -struct reset_params -{ - stream_handle stream; - HRESULT result; -}; - -struct timer_loop_params -{ - stream_handle stream; -}; - -struct get_render_buffer_params -{ - stream_handle stream; - UINT32 frames; - HRESULT result; - BYTE **data; -}; - -struct release_render_buffer_params -{ - stream_handle stream; - UINT32 written_frames; - UINT flags; - HRESULT result; -}; - -struct get_capture_buffer_params -{ - stream_handle stream; - HRESULT result; - BYTE **data; - UINT32 *frames; - UINT *flags; - UINT64 *devpos; - UINT64 *qpcpos; -}; - -struct release_capture_buffer_params -{ - stream_handle stream; - UINT32 done; - HRESULT result; -}; - -struct is_format_supported_params -{ - const char *device; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - const WAVEFORMATEX *fmt_in; - WAVEFORMATEXTENSIBLE *fmt_out; - HRESULT result; -}; - -struct get_mix_format_params -{ - const char *device; - EDataFlow flow; - WAVEFORMATEXTENSIBLE *fmt; - HRESULT result; -}; - -struct get_buffer_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *size; -}; - -struct get_latency_params -{ - stream_handle stream; - HRESULT result; - REFERENCE_TIME *latency; -}; - -struct get_current_padding_params -{ - stream_handle stream; - HRESULT result; - UINT32 *padding; -}; - -struct get_next_packet_size_params -{ - stream_handle stream; - HRESULT result; - UINT32 *frames; -}; - -struct get_frequency_params -{ - stream_handle stream; - HRESULT result; - UINT64 *freq; -}; - -struct get_position_params -{ - stream_handle stream; - BOOL device; - HRESULT result; - UINT64 *pos; - UINT64 *qpctime; -}; - -struct set_volumes_params -{ - stream_handle stream; - float master_volume; - const float *volumes; - const float *session_volumes; -}; - -struct set_event_handle_params -{ - stream_handle stream; - HANDLE event; - HRESULT result; -}; - -struct is_started_params -{ - stream_handle stream; - HRESULT result; -}; - -struct notify_context -{ - BOOL send_notify; - WORD dev_id; - WORD msg; - UINT_PTR param_1; - UINT_PTR param_2; - UINT_PTR callback; - UINT flags; - HANDLE device; - UINT_PTR instance; -}; - -struct midi_out_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_in_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; - struct notify_context *notify; -}; - -struct midi_notify_wait_params -{ - BOOL *quit; - struct notify_context *notify; -}; - -struct aux_message_params -{ - UINT dev_id; - UINT msg; - UINT_PTR user; - UINT_PTR param_1; - UINT_PTR param_2; - UINT *err; -}; - -enum oss_funcs -{ - test_connect, - get_endpoint_ids, - create_stream, - release_stream, - start, - stop, - reset, - timer_loop, - get_render_buffer, - release_render_buffer, - get_capture_buffer, - release_capture_buffer, - is_format_supported, - get_mix_format, - get_buffer_size, - get_latency, - get_current_padding, - get_next_packet_size, - get_frequency, - get_position, - set_volumes, - set_event_handle, - is_started, - midi_release, - midi_out_message, - midi_in_message, - midi_notify_wait, - aux_message, -}; +#include "../mmdevapi/unixlib.h" NTSTATUS oss_midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS oss_midi_out_message(void *args) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : rpcrt4: Add SEH annotations to NdrClientCall2().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: bad509227aa534f152a17316bdcf221436f03284 URL: https://gitlab.winehq.org/wine/wine/-/commit/bad509227aa534f152a17316bdcf22… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:10:19 2022 -0500 rpcrt4: Add SEH annotations to NdrClientCall2(). --- dlls/rpcrt4/ndr_stubless.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e61294da07a..bf9313d818c 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1006,6 +1006,8 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM __ASM_GLOBAL_FUNC( NdrClientCall2, "subq $0x28,%rsp\n\t" + __ASM_SEH(".seh_stackalloc 0x28\n\t") + __ASM_SEH(".seh_endprologue\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") "movq %r8,0x40(%rsp)\n\t" "movq %r9,0x48(%rsp)\n\t"

1 0

Francois Gouget : msvcrt: Fix the spelling of a comment.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 8f51e6bd47595fb4df53e06cdcf5e0fb2612ed58 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f51e6bd47595fb4df53e06cdcf5e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 5 09:56:02 2022 +0200 msvcrt: Fix the spelling of a comment. --- dlls/msvcrt/undname.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 8eb3a12057f..eb95da98435 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1509,7 +1509,7 @@ static BOOL symbol_demangle(struct parsed_symbol* sym) case '9': function_name = "`vcall'"; break; case 'A': function_name = "`typeof'"; break; case 'B': function_name = "`local static guard'"; break; - case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native nevers undecode it) */ + case 'C': sym->result = (char*)"`string'"; /* string literal: followed by string encoding (native never undecode it) */ /* FIXME: should unmangle the whole string for error reporting */ if (*sym->current && sym->current[strlen(sym->current) - 1] == '@') ret = TRUE; goto done;

1 0

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 3f47b478b4508a2010bbe4a8a365abe70e929707 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f47b478b4508a2010bbe4a8a365ab… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Sep 2 23:16:25 2022 +0200 msvcp140: Add _ExceptionHolder::ReportUnhandledError stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53614 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/concrt140/details.c | 9 +++++++++ dlls/msvcp140/msvcp140.spec | 6 +++--- dlls/msvcp90/details.c | 9 +++++++++ dlls/msvcp_win/msvcp_win.spec | 6 +++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 8fd186eb71d..e6711db6983 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1075,6 +1075,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) return FALSE; } +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} + __ASM_BLOCK_BEGIN(concurrency_details_vtables) __ASM_VTABLE(_Concurrent_queue_base_v4, VTABLE_ADD_FUNC(_Concurrent_queue_base_v4_dummy) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index e7bdcd0378e..232a2b959a2 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() kernel32.GetCurrentThreadId @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) _ExceptionHolder__ReportUnhandledError +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) _ExceptionHolder__ReportUnhandledError @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) _Locinfo__Addcats @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) _Locinfo__Addcats diff --git a/dlls/msvcp90/details.c b/dlls/msvcp90/details.c index d2a741b4998..767b20b2334 100644 --- a/dlls/msvcp90/details.c +++ b/dlls/msvcp90/details.c @@ -1089,6 +1089,15 @@ bool __cdecl _Task_impl_base__IsNonBlockingThread(void) FIXME("() stub\n"); return FALSE; } + +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ */ +/* ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_ExceptionHolder__ReportUnhandledError, 4) +void __thiscall _ExceptionHolder__ReportUnhandledError(void *this) +{ + FIXME("(%p) stub\n", this); +} #endif __ASM_BLOCK_BEGIN(concurrency_details_vtables) diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index 3ba0ce1dfba..d2fae9f1e14 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1085,9 +1085,9 @@ @ stub -arch=win64 ?CaptureCallstack(a)platform@details(a)Concurrency@@YA_KPEAPEAX_K1(a)Z @ cdecl ?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ() msvcp140.?GetCurrentThreadId(a)platform@details(a)Concurrency@@YAJXZ @ stub ?GetNextAsyncId(a)platform@details(a)Concurrency@@YAIXZ -@ stub -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ -@ stub -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ -@ stub -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ +@ cdecl -arch=arm ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAAXXZ +@ thiscall -arch=i386 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AAEXXZ +@ cdecl -arch=win64 ?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ(ptr) msvcp140.?ReportUnhandledError(a)_ExceptionHolder@details(a)Concurrency@@AEAAXXZ @ cdecl -arch=arm ?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAAAAV12(a)HPBD@Z @ thiscall -arch=i386 ?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QAEAAV12(a)HPBD@Z @ cdecl -arch=win64 ?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z(ptr long str) msvcp140.?_Addcats(a)_Locinfo@std@@QEAAAEAV12(a)HPEBD@Z

1 0

Zebediah Figura : msvcrt: Add SEH annotations for sse2_memcpy().
by Alexandre Julliard 07 Sep '22

07 Sep '22

Module: wine Branch: master Commit: 57140421378ade6a5b5dea32bb94a1e8ab92906f URL: https://gitlab.winehq.org/wine/wine/-/commit/57140421378ade6a5b5dea32bb94a1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 17:02:24 2022 -0500 msvcrt: Add SEH annotations for sse2_memcpy(). This allows unwinding from a crash inside the function. --- dlls/msvcrt/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index dd392abd203..c598a6fa76f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2817,8 +2817,11 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) #define MEMMOVE_INIT \ "pushq " SRC_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " SRC_REG "\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "pushq " DEST_REG "\n\t" \ + __ASM_SEH(".seh_pushreg " DEST_REG "\n\t") \ + __ASM_SEH(".seh_endprologue\n\t") \ __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") \ "movq %rcx, " DEST_REG "\n\t" \ "movq %rdx, " SRC_REG "\n\t"

1 0