September 2022 - Wine-Commits

Davide Beatrici : wineoss: Adapt "test_connect_params" struct to mmdevapi's.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

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 "get_position_params" struct to mmdevapi's.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

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: Drop "oss_" prefix in unixlib enum, apply it to the functions instead.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

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 "create_stream_params" struct to mmdevapi's.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

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 Sept. 8, 2022

Sept. 8, 2022

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 : mmdevapi: Integrate wineoss's additions in unixlib.h.
by Alexandre Julliard Sept. 8, 2022

Sept. 8, 2022

Module: wine Branch: master Commit: d2c9a9f0215ec7052811b3e4e3bbc9761eeaa252 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2c9a9f0215ec7052811b3e4e3bbc9… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu Sep 8 01:24:58 2022 +0200 mmdevapi: Integrate wineoss's additions in unixlib.h. --- dlls/mmdevapi/mmdevapi.h | 11 ++--------- dlls/mmdevapi/unixlib.h | 21 ++++++++++++++++++++- dlls/winealsa.drv/alsa.c | 2 ++ dlls/winealsa.drv/mmdevdrv.c | 8 -------- dlls/winepulse.drv/mmdevdrv.c | 12 ++---------- dlls/winepulse.drv/pulse.c | 12 +++++++----- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/mmdevapi/mmdevapi.h b/dlls/mmdevapi/mmdevapi.h index db91e333cc8..d694a3930aa 100644 --- a/dlls/mmdevapi/mmdevapi.h +++ b/dlls/mmdevapi/mmdevapi.h @@ -16,20 +16,13 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "unixlib.h" + #include <wine/list.h> extern HRESULT MMDevEnum_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern void MMDevEnum_Free(void) DECLSPEC_HIDDEN; - -/* Changes to this enum must be synced in drivers. */ -enum _DriverPriority { - 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 */ -}; - typedef struct _DriverFuncs { HMODULE module; WCHAR module_name[64]; diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index 163272c4398..97a35ffbc4d 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -22,6 +22,14 @@ typedef UINT64 stream_handle; +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 endpoint { unsigned int name; @@ -211,7 +219,7 @@ struct set_event_handle_params struct test_connect_params { const char *name; - HRESULT result; + enum driver_priority priority; }; struct is_started_params @@ -273,6 +281,16 @@ struct midi_notify_wait_params 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 unix_funcs { process_attach, @@ -307,4 +325,5 @@ enum unix_funcs midi_out_message, midi_in_message, midi_notify_wait, + aux_message, }; diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 7ac404fd6a4..c3daf25c85e 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2463,6 +2463,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_midi_out_message, alsa_midi_in_message, alsa_midi_notify_wait, + NULL, }; #ifdef _WIN64 @@ -2880,6 +2881,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_wow64_midi_out_message, alsa_wow64_midi_in_message, alsa_wow64_midi_notify_wait, + NULL, }; #endif /* _WIN64 */ diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8c3d4c0340f..ad322ccfa96 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -216,14 +216,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) return TRUE; } -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred -}; - int WINAPI AUDDRV_GetPriority(void) { return Priority_Neutral; diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 78aad939198..d6765d4e26c 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -56,14 +56,6 @@ static unixlib_handle_t pulse_handle; #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -/* From <dlls/mmdevapi/mmdevapi.h> */ -enum DriverPriority { - Priority_Unavailable = 0, - Priority_Low, - Priority_Neutral, - Priority_Preferred -}; - static HANDLE pulse_thread; static struct list g_sessions = LIST_INIT(g_sessions); static struct list g_devices_cache = LIST_INIT(g_devices_cache); @@ -493,10 +485,10 @@ int WINAPI AUDDRV_GetPriority(void) struct test_connect_params params; char *name; - params.name = name = get_application_name(FALSE); + params.name = name = get_application_name(FALSE); pulse_call(test_connect, &params); free(name); - return SUCCEEDED(params.result) ? Priority_Preferred : Priority_Unavailable; + return params.priority; } static BOOL get_pulse_name_by_guid(const GUID *guid, char pulse_name[MAX_PULSE_NAME_LEN], EDataFlow *flow) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index a75184e712a..cbd9b3b97ae 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -773,7 +773,7 @@ static NTSTATUS pulse_test_connect(void *args) pa_mainloop_free(pulse_ml); pulse_ml = NULL; pulse_unlock(); - params->result = E_FAIL; + params->priority = Priority_Unavailable; return STATUS_SUCCESS; } @@ -839,7 +839,7 @@ static NTSTATUS pulse_test_connect(void *args) pulse_unlock(); - params->result = S_OK; + params->priority = Priority_Preferred; return STATUS_SUCCESS; fail: @@ -848,7 +848,7 @@ fail: pa_mainloop_free(pulse_ml); pulse_ml = NULL; pulse_unlock(); - params->result = E_FAIL; + params->priority = Priority_Unavailable; return STATUS_SUCCESS; } @@ -2392,6 +2392,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = NULL, NULL, NULL, + NULL, }; #ifdef _WIN64 @@ -2734,14 +2735,14 @@ static NTSTATUS pulse_wow64_test_connect(void *args) struct { PTR32 name; - HRESULT result; + enum driver_priority priority; } *params32 = args; struct test_connect_params params = { .name = ULongToPtr(params32->name), }; pulse_test_connect(&params); - params32->result = params.result; + params32->priority = params.priority; return STATUS_SUCCESS; } @@ -2835,6 +2836,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = NULL, NULL, NULL, + NULL, }; #endif /* _WIN64 */

1 0

Zebediah Figura : rpcrt4: Add SEH annotations to NdrClientCall2().
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

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

Zebediah Figura : rpcrt4: Make NdrClientCall2() SEH-compatible.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: a5322fc94fa7333a09456a551d70eb1bf5a8fdbd URL: https://gitlab.winehq.org/wine/wine/-/commit/a5322fc94fa7333a09456a551d70eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:10:13 2022 -0500 rpcrt4: Make NdrClientCall2() SEH-compatible. --- dlls/rpcrt4/ndr_stubless.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e3eb8a93c6d..e61294da07a 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -1005,12 +1005,12 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM #ifdef __x86_64__ __ASM_GLOBAL_FUNC( NdrClientCall2, - "movq %r8,0x18(%rsp)\n\t" - "movq %r9,0x20(%rsp)\n\t" - "leaq 0x18(%rsp),%r8\n\t" - "xorq %r9,%r9\n\t" "subq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 0x28\n\t") + "movq %r8,0x40(%rsp)\n\t" + "movq %r9,0x48(%rsp)\n\t" + "leaq 0x40(%rsp),%r8\n\t" + "xorq %r9,%r9\n\t" "call " __ASM_NAME("ndr_client_call") "\n\t" "addq $0x28,%rsp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset -0x28\n\t")

1 0

Gijs Vermeulen : msvcp140: Add _ExceptionHolder::ReportUnhandledError stub.
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

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 : rpcrt4: Add SEH annotations to Ndr64AsyncClientCall().
by Alexandre Julliard Sept. 7, 2022

Sept. 7, 2022

Module: wine Branch: master Commit: 37ae068773677a35342a594448d1bbabf9feb94a URL: https://gitlab.winehq.org/wine/wine/-/commit/37ae068773677a35342a594448d1bb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 1 20:04:49 2022 -0500 rpcrt4: Add SEH annotations to Ndr64AsyncClientCall(). --- 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 3a4bfc72df1..890b248cfb8 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -2307,6 +2307,8 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO __ASM_GLOBAL_FUNC( Ndr64AsyncClientCall, "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 %r9,0x48(%rsp)\n\t" "leaq 0x48(%rsp),%r9\n\t"

1 0