July 2020 - Wine-Commits - list.winehq.org

Zebediah Figura : dsdmo: Implement IDirectSoundFXParamEq parameters methods.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 3ba24075f2740d379824edef7f56d3b0c73f6577 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ba24075f2740d379824edef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:05 2020 -0500 dsdmo: Implement IDirectSoundFXParamEq parameters methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 19 +++++++++++++++---- dlls/dsdmo/tests/dsdmo.c | 28 +++++++++++++++++++++------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index ff103be159..57214b3275 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -438,6 +438,7 @@ struct eq { struct effect effect; IDirectSoundFXParamEq IDirectSoundFXParamEq_iface; + DSFXParamEq params; }; static struct eq *impl_from_IDirectSoundFXParamEq(IDirectSoundFXParamEq *iface) @@ -467,18 +468,24 @@ static HRESULT WINAPI eq_params_SetAllParameters(IDirectSoundFXParamEq *iface, c { struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); - FIXME("effect %p, params %p, stub!\n", effect, params); + TRACE("effect %p, params %p.\n", effect, params); - return E_NOTIMPL; + EnterCriticalSection(&effect->effect.cs); + effect->params = *params; + LeaveCriticalSection(&effect->effect.cs); + return S_OK; } static HRESULT WINAPI eq_params_GetAllParameters(IDirectSoundFXParamEq *iface, DSFXParamEq *params) { struct eq *effect = impl_from_IDirectSoundFXParamEq(iface); - FIXME("effect %p, params %p, stub!\n", effect, params); + TRACE("effect %p, params %p.\n", effect, params); - return E_NOTIMPL; + EnterCriticalSection(&effect->effect.cs); + *params = effect->params; + LeaveCriticalSection(&effect->effect.cs); + return S_OK; } static const IDirectSoundFXParamEqVtbl eq_params_vtbl = @@ -527,6 +534,10 @@ static HRESULT eq_create(IUnknown *outer, IUnknown **out) effect_init(&object->effect, outer, &eq_ops); object->IDirectSoundFXParamEq_iface.lpVtbl = &eq_params_vtbl; + object->params.fCenter = 8000.0f; + object->params.fBandwidth = 12.0f; + object->params.fGain = 0.0f; + TRACE("Created equalizer effect %p.\n", object); *out = &object->effect.IUnknown_inner; return S_OK; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index c59361e5fc..1ecafeb7ce 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -453,13 +453,27 @@ static void test_eq_parameters(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectSoundFXParamEq_GetAllParameters(eq, &params); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(params.fCenter == 8000.0f, "Got center frequency %.8e Hz.\n", params.fCenter); - ok(params.fBandwidth == 12.0f, "Got band width %.8e semitones.\n", params.fBandwidth); - ok(params.fGain == 0.0f, "Got gain %.8e.\n", params.fGain); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(params.fCenter == 8000.0f, "Got center frequency %.8e Hz.\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "Got band width %.8e semitones.\n", params.fBandwidth); + ok(params.fGain == 0.0f, "Got gain %.8e.\n", params.fGain); + + params.fCenter = 79.0f; + hr = IDirectSoundFXParamEq_SetAllParameters(eq, &params); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + params.fCenter = 16001.0f; + hr = IDirectSoundFXParamEq_SetAllParameters(eq, &params); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + params.fCenter = 738.0f; + hr = IDirectSoundFXParamEq_SetAllParameters(eq, &params); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&params, 0xcc, sizeof(params)); + hr = IDirectSoundFXParamEq_GetAllParameters(eq, &params); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(params.fCenter == 738.0f, "Got center frequency %.8e Hz.\n", params.fCenter); + ok(params.fBandwidth == 12.0f, "Got band width %.8e semitones.\n", params.fBandwidth); + ok(params.fGain == 0.0f, "Got gain %.8e.\n", params.fGain); ref = IDirectSoundFXParamEq_Release(eq); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Alexandre Julliard : ntdll: Reimplement RtlRaiseException() to build a correct context on ARM.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: d775b9fd93ecfbbd12945f1e167e4bb381612c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d775b9fd93ecfbbd12945f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:40:13 2020 +0200 ntdll: Reimplement RtlRaiseException() to build a correct context on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 8e1df477ff..e9f6cc6212 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -239,14 +239,21 @@ void WINAPI RtlUnwind( void *endframe, void *target_ip, EXCEPTION_RECORD *rec, v /*********************************************************************** * RtlRaiseException (NTDLL.@) */ -void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) -{ - CONTEXT context; - - RtlCaptureContext( &context ); - rec->ExceptionAddress = (LPVOID)context.Pc; - RtlRaiseStatus( NtRaiseException( rec, &context, TRUE )); -} +__ASM_STDCALL_FUNC( RtlRaiseException, 4, + "push {r0, lr}\n\t" + "sub sp, sp, #0x1a0\n\t" /* sizeof(CONTEXT) */ + "mov r0, sp\n\t" /* context */ + "bl " __ASM_NAME("RtlCaptureContext") "\n\t" + "ldr r0, [sp, #0x1a0]\n\t" /* rec */ + "ldr r1, [sp, #0x1a4]\n\t" + "str r1, [sp, #0x40]\n\t" /* context->Pc */ + "str r1, [r0, #12]\n\t" /* rec->ExceptionAddress */ + "add r1, sp, #0x1a8\n\t" + "str r1, [sp, #0x38]\n\t" /* context->Sp */ + "mov r1, sp\n\t" + "mov r2, #1\n\t" + "bl " __ASM_NAME("NtRaiseException") "\n\t" + "bl " __ASM_NAME("RtlRaiseStatus") ) /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@)

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputCharacterW.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 300a01f467e84bb69bf6387e52545ddbc9c456dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=300a01f467e84bb69bf6387e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:10:32 2020 +0200 kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputCharacterW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 23f0696124..63e9b20292 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -99,6 +99,7 @@ static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_co status = STATUS_INVALID_HANDLE; break; } + if (read) *read = 0; return set_ntstatus( status ); } @@ -849,6 +850,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputCharacterA( HANDLE handle, LPSTR BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputCharacterW( HANDLE handle, LPWSTR buffer, DWORD length, COORD coord, DWORD *count ) { + struct condrv_output_params params; BOOL ret; TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, buffer, length, coord.X, coord.Y, count ); @@ -859,18 +861,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputCharacterW( HANDLE handle, LPWSTR return FALSE; } - *count = 0; - SERVER_START_REQ( read_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_TEXT; - req->wrap = TRUE; - wine_server_set_reply( req, buffer, length * sizeof(WCHAR) ); - if ((ret = !wine_server_call_err( req ))) *count = wine_server_reply_size(reply) / sizeof(WCHAR); - } - SERVER_END_REQ; + params.mode = CHAR_INFO_MODE_TEXT; + params.x = coord.X; + params.y = coord.Y; + params.width = 0; + ret = console_ioctl( handle, IOCTL_CONDRV_READ_OUTPUT, &params, sizeof(params), buffer, + length * sizeof(*buffer), count ); + *count /= sizeof(*buffer); return ret; }

1 0

Zebediah Figura : dsdmo: Add a stub equalizer effect.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: ac528a492b719f6a8759d919710ca733f5acf167 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac528a492b719f6a8759d919… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:03 2020 -0500 dsdmo: Add a stub equalizer effect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/dsdmo.idl | 8 +++++ dlls/dsdmo/main.c | 43 +++++++++++++++++++++++++++ dlls/dsound/tests/dsound8.c | 71 ++++++++++++++++++--------------------------- 3 files changed, 80 insertions(+), 42 deletions(-) diff --git a/dlls/dsdmo/dsdmo.idl b/dlls/dsdmo/dsdmo.idl index e5735b42f7..7f17208482 100644 --- a/dlls/dsdmo/dsdmo.idl +++ b/dlls/dsdmo/dsdmo.idl @@ -26,6 +26,14 @@ ] coclass DirectSoundI3DL2ReverbDMO {} +[ + threading(both), + progid("Microsoft.DirectSoundParamEqDMO.1"), + vi_progid("Microsoft.DirectSoundParamEqDMO"), + uuid(120ced89-3bf4-4173-a132-3cb406cf3231) +] +coclass DirectSoundParamEqDMO {} + [ threading(both), progid("Microsoft.DirectSoundWavesReverbDMO.1"), diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 5755c6f144..482b8202db 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -434,6 +434,48 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff effect->ops = ops; } +struct eq +{ + struct effect effect; +}; + +static struct eq *impl_eq_from_effect(struct effect *iface) +{ + return CONTAINING_RECORD(iface, struct eq, effect); +} + +static void *eq_query_interface(struct effect *iface, REFIID iid) +{ + return NULL; +} + +static void eq_destroy(struct effect *iface) +{ + struct eq *effect = impl_eq_from_effect(iface); + + free(effect); +} + +static const struct effect_ops eq_ops = +{ + .destroy = eq_destroy, + .query_interface = eq_query_interface, +}; + +static HRESULT eq_create(IUnknown *outer, IUnknown **out) +{ + struct eq *object; + + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; + + effect_init(&object->effect, outer, &eq_ops); + + TRACE("Created equalizer effect %p.\n", object); + *out = &object->effect.IUnknown_inner; + return S_OK; +} + struct reverb { struct effect effect; @@ -787,6 +829,7 @@ static struct class_factories[] = { {&GUID_DSFX_STANDARD_I3DL2REVERB, {{&class_factory_vtbl}, reverb_create}}, + {&GUID_DSFX_STANDARD_PARAMEQ, {{&class_factory_vtbl}, eq_create}}, {&GUID_DSFX_WAVES_REVERB, {{&class_factory_vtbl}, waves_reverb_create}}, }; diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 702cd4b2ba..05dfabbd25 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1617,8 +1617,8 @@ static void test_effects(void) results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); hr = IDirectSoundBuffer8_Lock(buffer8, 0, 0, &ptr1, &size1, &ptr2, &size2, DSBLOCK_ENTIREBUFFER); ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1648,38 +1648,33 @@ static void test_effects(void) effects[0].guidDSFXClass = GUID_DSFX_STANDARD_PARAMEQ; results[0] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 1, effects, results); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, NULL); - todo_wine ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); + ok(hr == DSERR_INVALIDPARAM, "Got hr %#x.\n", hr); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &GUID_NULL, (void **)&dmo); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); - todo_wine ok(!dmo, "Got object %p.\n", dmo); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!dmo, "Got object %p.\n", dmo); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_NULL, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); + ok(hr == DSERR_OBJECTNOTFOUND, "Got hr %#x.\n", hr); ok(dmo == (IMediaObject *)0xdeadbeef, "Got object %p.\n", dmo); dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - { - ok(!!dmo, "Expected a non-NULL object.\n"); - IMediaObject_Release(dmo); - } + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(!!dmo, "Expected a non-NULL object.\n"); + IMediaObject_Release(dmo); dmo = NULL; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - if (hr == DS_OK) - { - ok(!!dmo, "Expected a non-NULL object.\n"); - IMediaObject_Release(dmo); - } + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(!!dmo, "Expected a non-NULL object.\n"); + IMediaObject_Release(dmo); dmo = (IMediaObject *)0xdeadbeef; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); @@ -1691,7 +1686,7 @@ static void test_effects(void) results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); ok(hr == REGDB_E_CLASSNOTREG, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_PRESENT, "Got result %#x.\n", results[0]); + ok(results[0] == DSFXR_PRESENT, "Got result %#x.\n", results[0]); ok(results[1] == DSFXR_UNKNOWN, "Got result %#x.\n", results[1]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); @@ -1701,14 +1696,13 @@ static void test_effects(void) effects[1].guidDSFXClass = GUID_DSFX_STANDARD_I3DL2REVERB; results[0] = results[1] = 0xdeadbeef; hr = IDirectSoundBuffer8_SetFX(buffer8, 2, effects, results); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - todo_wine ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); - todo_wine ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[1]); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(results[0] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[0]); + ok(results[1] == DSFXR_LOCSOFTWARE, "Got result %#x.\n", results[1]); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_PARAMEQ, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - echo = dmo; + ok(hr == DS_OK, "Got hr %#x.\n", hr); + echo = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IMediaObject, (void **)&dmo); todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); @@ -1716,20 +1710,14 @@ static void test_effects(void) reverb = dmo; hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - { - ok(dmo == echo, "Expected %p, got %p.\n", echo, dmo); - IMediaObject_Release(dmo); - } + ok(hr == DS_OK, "Got hr %#x.\n", hr); + ok(dmo == echo, "Expected %p, got %p.\n", echo, dmo); + IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IMediaObject, (void **)&dmo); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - { - ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); - IMediaObject_Release(dmo); - } + ok(hr == DS_OK, "Got hr %#x.\n", hr); + todo_wine ok(dmo == reverb, "Expected %p, got %p.\n", reverb, dmo); + IMediaObject_Release(dmo); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 1, &IID_IMediaObject, (void **)&dmo); @@ -1748,13 +1736,12 @@ static void test_effects(void) hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_All_Objects, 1, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk); - todo_wine ok(hr == DS_OK, "Got hr %#x.\n", hr); - if (hr == DS_OK) - IUnknown_Release(unk); + ok(hr == DS_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); hr = IDirectSoundBuffer8_GetObjectInPath(buffer8, &GUID_DSFX_STANDARD_I3DL2REVERB, 0, &IID_IDirectSoundFXI3DL2Reverb, (void **)&unk);

1 0

Zebediah Figura : dsdmo: Implement IDirectSoundFXI3DL2Reverb parameters methods.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: baddd55817c4d8560aa86dea4c06d6bd4e00e129 URL: https://source.winehq.org/git/wine.git/?a=commit;h=baddd55817c4d8560aa86dea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:02 2020 -0500 dsdmo: Implement IDirectSoundFXI3DL2Reverb parameters methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 28 ++++++++++++++++++++++++---- dlls/dsdmo/tests/dsdmo.c | 44 ++++++++++++++++++++++++++++---------------- 2 files changed, 52 insertions(+), 20 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index 8efef855b2..5755c6f144 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -438,6 +438,7 @@ struct reverb { struct effect effect; IDirectSoundFXI3DL2Reverb IDirectSoundFXI3DL2Reverb_iface; + DSFXI3DL2Reverb params; }; static struct reverb *impl_from_IDirectSoundFXI3DL2Reverb(IDirectSoundFXI3DL2Reverb *iface) @@ -467,18 +468,24 @@ static HRESULT WINAPI reverb_params_SetAllParameters(IDirectSoundFXI3DL2Reverb * { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, params %p, stub!\n", effect, params); + TRACE("effect %p, params %p.\n", effect, params); - return E_NOTIMPL; + EnterCriticalSection(&effect->effect.cs); + effect->params = *params; + LeaveCriticalSection(&effect->effect.cs); + return S_OK; } static HRESULT WINAPI reverb_params_GetAllParameters(IDirectSoundFXI3DL2Reverb *iface, DSFXI3DL2Reverb *params) { struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); - FIXME("effect %p, params %p, stub!\n", effect, params); + TRACE("effect %p, params %p.\n", effect, params); - return E_NOTIMPL; + EnterCriticalSection(&effect->effect.cs); + *params = effect->params; + LeaveCriticalSection(&effect->effect.cs); + return S_OK; } static HRESULT WINAPI reverb_params_SetPreset(IDirectSoundFXI3DL2Reverb *iface, DWORD preset) @@ -567,6 +574,19 @@ static HRESULT reverb_create(IUnknown *outer, IUnknown **out) effect_init(&object->effect, outer, &reverb_ops); object->IDirectSoundFXI3DL2Reverb_iface.lpVtbl = &reverb_params_vtbl; + object->params.lRoom = DSFX_I3DL2REVERB_ROOM_DEFAULT; + object->params.lRoomHF = DSFX_I3DL2REVERB_ROOMHF_DEFAULT; + object->params.flRoomRolloffFactor = DSFX_I3DL2REVERB_ROOMROLLOFFFACTOR_DEFAULT; + object->params.flDecayTime = DSFX_I3DL2REVERB_DECAYTIME_DEFAULT; + object->params.flDecayHFRatio = DSFX_I3DL2REVERB_DECAYHFRATIO_DEFAULT; + object->params.lReflections = DSFX_I3DL2REVERB_REFLECTIONS_DEFAULT; + object->params.flReflectionsDelay = DSFX_I3DL2REVERB_REFLECTIONSDELAY_DEFAULT; + object->params.lReverb = DSFX_I3DL2REVERB_REVERB_DEFAULT; + object->params.flReverbDelay = DSFX_I3DL2REVERB_REVERBDELAY_DEFAULT; + object->params.flDiffusion = DSFX_I3DL2REVERB_DIFFUSION_DEFAULT; + object->params.flDensity = DSFX_I3DL2REVERB_DENSITY_DEFAULT; + object->params.flHFReference = DSFX_I3DL2REVERB_HFREFERENCE_DEFAULT; + TRACE("Created I3DL2 reverb effect %p.\n", object); *out = &object->effect.IUnknown_inner; return S_OK; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index f949d02e88..349e300f02 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -476,22 +476,34 @@ static void test_reverb_parameters(void) ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr == S_OK) - { - ok(params.lRoom == -1000, "Got room attenuation %d mB.\n", params.lRoom); - ok(params.lRoomHF == -100, "Got room high-frequency attenuation %d mB.\n", params.lRoomHF); - ok(params.flRoomRolloffFactor == 0.0f, "Got room rolloff factor %.8e.\n", params.flRoomRolloffFactor); - ok(params.flDecayTime == 1.49f, "Got decay time %.8e s.\n", params.flDecayTime); - ok(params.flDecayHFRatio == 0.83f, "Got decay time ratio %.8e.\n", params.flDecayHFRatio); - ok(params.lReflections == -2602, "Got early reflection attenuation %d mB.\n", params.lReflections); - ok(params.flReflectionsDelay == 0.007f, "Got first reflection delay %.8e s.\n", params.flReflectionsDelay); - ok(params.lReverb == 200, "Got reverb attenuation %d mB.\n", params.lReverb); - ok(params.flReverbDelay == 0.011f, "Got reverb delay %.8e s.\n", params.flReverbDelay); - ok(params.flDiffusion == 100.0f, "Got diffusion %.8e%%.\n", params.flDiffusion); - ok(params.flDensity == 100.0f, "Got density %.8e%%.\n", params.flDensity); - ok(params.flHFReference == 5000.0f, "Got reference high frequency %.8e Hz.\n", params.flHFReference); - } + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(params.lRoom == -1000, "Got room attenuation %d mB.\n", params.lRoom); + ok(params.lRoomHF == -100, "Got room high-frequency attenuation %d mB.\n", params.lRoomHF); + ok(params.flRoomRolloffFactor == 0.0f, "Got room rolloff factor %.8e.\n", params.flRoomRolloffFactor); + ok(params.flDecayTime == 1.49f, "Got decay time %.8e s.\n", params.flDecayTime); + ok(params.flDecayHFRatio == 0.83f, "Got decay time ratio %.8e.\n", params.flDecayHFRatio); + ok(params.lReflections == -2602, "Got early reflection attenuation %d mB.\n", params.lReflections); + ok(params.flReflectionsDelay == 0.007f, "Got first reflection delay %.8e s.\n", params.flReflectionsDelay); + ok(params.lReverb == 200, "Got reverb attenuation %d mB.\n", params.lReverb); + ok(params.flReverbDelay == 0.011f, "Got reverb delay %.8e s.\n", params.flReverbDelay); + ok(params.flDiffusion == 100.0f, "Got diffusion %.8e%%.\n", params.flDiffusion); + ok(params.flDensity == 100.0f, "Got density %.8e%%.\n", params.flDensity); + ok(params.flHFReference == 5000.0f, "Got reference high frequency %.8e Hz.\n", params.flHFReference); + + params.lRoom = -10001; + hr = IDirectSoundFXI3DL2Reverb_SetAllParameters(reverb, &params); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + params.lRoom = 1; + hr = IDirectSoundFXI3DL2Reverb_SetAllParameters(reverb, &params); + todo_wine ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + params.lRoom = -900; + hr = IDirectSoundFXI3DL2Reverb_SetAllParameters(reverb, &params); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + memset(&params, 0xcc, sizeof(params)); + hr = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(params.lRoom == -900, "Got room attenuation %d mB.\n", params.lRoom); ref = IDirectSoundFXI3DL2Reverb_Release(reverb); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : dsdmo: Stub IDirectSoundFXI3DL2Reverb.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 9faa7af99a1e3cb2acf49e607974f57400664ee2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9faa7af99a1e3cb2acf49e60… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 27 20:26:01 2020 -0500 dsdmo: Stub IDirectSoundFXI3DL2Reverb. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsdmo/main.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsdmo/tests/dsdmo.c | 35 +++++++++--------- 2 files changed, 114 insertions(+), 17 deletions(-) diff --git a/dlls/dsdmo/main.c b/dlls/dsdmo/main.c index f42d29f58b..8efef855b2 100644 --- a/dlls/dsdmo/main.c +++ b/dlls/dsdmo/main.c @@ -437,6 +437,97 @@ static void effect_init(struct effect *effect, IUnknown *outer, const struct eff struct reverb { struct effect effect; + IDirectSoundFXI3DL2Reverb IDirectSoundFXI3DL2Reverb_iface; +}; + +static struct reverb *impl_from_IDirectSoundFXI3DL2Reverb(IDirectSoundFXI3DL2Reverb *iface) +{ + return CONTAINING_RECORD(iface, struct reverb, IDirectSoundFXI3DL2Reverb_iface); +} + +static HRESULT WINAPI reverb_params_QueryInterface(IDirectSoundFXI3DL2Reverb *iface, REFIID iid, void **out) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + return IUnknown_QueryInterface(effect->effect.outer_unk, iid, out); +} + +static ULONG WINAPI reverb_params_AddRef(IDirectSoundFXI3DL2Reverb *iface) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + return IUnknown_AddRef(effect->effect.outer_unk); +} + +static ULONG WINAPI reverb_params_Release(IDirectSoundFXI3DL2Reverb *iface) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + return IUnknown_Release(effect->effect.outer_unk); +} + +static HRESULT WINAPI reverb_params_SetAllParameters(IDirectSoundFXI3DL2Reverb *iface, const DSFXI3DL2Reverb *params) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reverb_params_GetAllParameters(IDirectSoundFXI3DL2Reverb *iface, DSFXI3DL2Reverb *params) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, params %p, stub!\n", effect, params); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reverb_params_SetPreset(IDirectSoundFXI3DL2Reverb *iface, DWORD preset) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, preset %u, stub!\n", effect, preset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reverb_params_GetPreset(IDirectSoundFXI3DL2Reverb *iface, DWORD *preset) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, preset %p, stub!\n", effect, preset); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reverb_params_SetQuality(IDirectSoundFXI3DL2Reverb *iface, LONG quality) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, quality %u, stub!\n", effect, quality); + + return E_NOTIMPL; +} + +static HRESULT WINAPI reverb_params_GetQuality(IDirectSoundFXI3DL2Reverb *iface, LONG *quality) +{ + struct reverb *effect = impl_from_IDirectSoundFXI3DL2Reverb(iface); + + FIXME("effect %p, quality %p, stub!\n", effect, quality); + + return E_NOTIMPL; +} + +static const IDirectSoundFXI3DL2ReverbVtbl reverb_params_vtbl = +{ + reverb_params_QueryInterface, + reverb_params_AddRef, + reverb_params_Release, + reverb_params_SetAllParameters, + reverb_params_GetAllParameters, + reverb_params_SetPreset, + reverb_params_GetPreset, + reverb_params_SetQuality, + reverb_params_GetQuality, }; static struct reverb *impl_reverb_from_effect(struct effect *iface) @@ -446,6 +537,10 @@ static struct reverb *impl_reverb_from_effect(struct effect *iface) static void *reverb_query_interface(struct effect *iface, REFIID iid) { + struct reverb *effect = impl_reverb_from_effect(iface); + + if (IsEqualGUID(iid, &IID_IDirectSoundFXI3DL2Reverb)) + return &effect->IDirectSoundFXI3DL2Reverb_iface; return NULL; } @@ -470,6 +565,7 @@ static HRESULT reverb_create(IUnknown *outer, IUnknown **out) return E_OUTOFMEMORY; effect_init(&object->effect, outer, &reverb_ops); + object->IDirectSoundFXI3DL2Reverb_iface.lpVtbl = &reverb_params_vtbl; TRACE("Created I3DL2 reverb effect %p.\n", object); *out = &object->effect.IUnknown_inner; diff --git a/dlls/dsdmo/tests/dsdmo.c b/dlls/dsdmo/tests/dsdmo.c index 9026728f6c..f949d02e88 100644 --- a/dlls/dsdmo/tests/dsdmo.c +++ b/dlls/dsdmo/tests/dsdmo.c @@ -473,24 +473,25 @@ static void test_reverb_parameters(void) hr = CoCreateInstance(&GUID_DSFX_STANDARD_I3DL2REVERB, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFXI3DL2Reverb, (void **)&reverb); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - if (hr != S_OK) - return; + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IDirectSoundFXI3DL2Reverb_GetAllParameters(reverb, &params); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(params.lRoom == -1000, "Got room attenuation %d mB.\n", params.lRoom); - ok(params.lRoomHF == -100, "Got room high-frequency attenuation %d mB.\n", params.lRoomHF); - ok(params.flRoomRolloffFactor == 0.0f, "Got room rolloff factor %.8e.\n", params.flRoomRolloffFactor); - ok(params.flDecayTime == 1.49f, "Got decay time %.8e s.\n", params.flDecayTime); - ok(params.flDecayHFRatio == 0.83f, "Got decay time ratio %.8e.\n", params.flDecayHFRatio); - ok(params.lReflections == -2602, "Got early reflection attenuation %d mB.\n", params.lReflections); - ok(params.flReflectionsDelay == 0.007f, "Got first reflection delay %.8e s.\n", params.flReflectionsDelay); - ok(params.lReverb == 200, "Got reverb attenuation %d mB.\n", params.lReverb); - ok(params.flReverbDelay == 0.011f, "Got reverb delay %.8e s.\n", params.flReverbDelay); - ok(params.flDiffusion == 100.0f, "Got diffusion %.8e%%.\n", params.flDiffusion); - ok(params.flDensity == 100.0f, "Got density %.8e%%.\n", params.flDensity); - ok(params.flHFReference == 5000.0f, "Got reference high frequency %.8e Hz.\n", params.flHFReference); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(params.lRoom == -1000, "Got room attenuation %d mB.\n", params.lRoom); + ok(params.lRoomHF == -100, "Got room high-frequency attenuation %d mB.\n", params.lRoomHF); + ok(params.flRoomRolloffFactor == 0.0f, "Got room rolloff factor %.8e.\n", params.flRoomRolloffFactor); + ok(params.flDecayTime == 1.49f, "Got decay time %.8e s.\n", params.flDecayTime); + ok(params.flDecayHFRatio == 0.83f, "Got decay time ratio %.8e.\n", params.flDecayHFRatio); + ok(params.lReflections == -2602, "Got early reflection attenuation %d mB.\n", params.lReflections); + ok(params.flReflectionsDelay == 0.007f, "Got first reflection delay %.8e s.\n", params.flReflectionsDelay); + ok(params.lReverb == 200, "Got reverb attenuation %d mB.\n", params.lReverb); + ok(params.flReverbDelay == 0.011f, "Got reverb delay %.8e s.\n", params.flReverbDelay); + ok(params.flDiffusion == 100.0f, "Got diffusion %.8e%%.\n", params.flDiffusion); + ok(params.flDensity == 100.0f, "Got density %.8e%%.\n", params.flDensity); + ok(params.flHFReference == 5000.0f, "Got reference high frequency %.8e Hz.\n", params.flHFReference); + } ref = IDirectSoundFXI3DL2Reverb_Release(reverb); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -512,7 +513,7 @@ START_TEST(dsdmo) {&GUID_DSFX_STANDARD_ECHO, &IID_IDirectSoundFXEcho, TRUE}, {&GUID_DSFX_STANDARD_FLANGER, &IID_IDirectSoundFXFlanger, TRUE}, {&GUID_DSFX_STANDARD_GARGLE, &IID_IDirectSoundFXGargle, TRUE}, - {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb, TRUE}, + {&GUID_DSFX_STANDARD_I3DL2REVERB, &IID_IDirectSoundFXI3DL2Reverb}, {&GUID_DSFX_STANDARD_PARAMEQ, &IID_IDirectSoundFXParamEq, TRUE}, {&GUID_DSFX_WAVES_REVERB, &IID_IDirectSoundFXWavesReverb}, };

1 0

Alexandre Julliard : ntdll/tests: Add tests for RtlCaptureContext() and NtGetContextThread() on x86_64.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 06c09fca3127fce9d3a3d1b4714173404ee58629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06c09fca3127fce9d3a3d1b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:41:11 2020 +0200 ntdll/tests: Add tests for RtlCaptureContext() and NtGetContextThread() on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/tests/exception.c | 202 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 196 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=06c09fca3127fce9d3a3…

1 0

Alexandre Julliard : ntdll/tests: Enable more exception tests on ARM platforms.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 8e5c11b964e844696c7f5882d3b8dd7ff70a7869 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e5c11b964e844696c7f5882… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:40:06 2020 +0200 ntdll/tests: Enable more exception tests on ARM platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 239 +++++++++++++++++++++-------------------- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_arm64.c | 1 + 3 files changed, 124 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8e5c11b964e844696c7f…

1 0

Alexandre Julliard : winebuild: Store the syscall frame in the thread data on ARM64.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 15b3584603205b93e6e6a0bace6159438ce22ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b3584603205b93e6e6a0ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:03:00 2020 +0200 winebuild: Store the syscall frame in the thread data on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 19 +++++++++++--- tools/winebuild/import.c | 59 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 2930833908..b8f1176871 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -116,18 +116,31 @@ static DWORD64 get_fault_esr( ucontext_t *sigcontext ) static pthread_key_t teb_key; +struct syscall_frame +{ + ULONG64 x29; + ULONG64 thunk_addr; + ULONG64 x0, x1, x2, x3, x4, x5, x6, x7, x8; + struct syscall_frame *prev_frame; + ULONG64 x19, x20, x21, x22, x23, x24, x25, x26, x27, x28; + ULONG64 thunk_x29; + ULONG64 ret_addr; +}; + struct arm64_thread_data { - void *exit_frame; /* 02f0 exit frame pointer */ - CONTEXT *context; /* 02f8 context to set with SIGUSR2 */ + void *exit_frame; /* 02f0 exit frame pointer */ + struct syscall_frame *syscall_frame; /* 02f8 frame pointer on syscall entry */ + CONTEXT *context; /* 0300 context to set with SIGUSR2 */ }; C_ASSERT( sizeof(struct arm64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, exit_frame ) == 0x2f0 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm64_thread_data, syscall_frame ) == 0x2f8 ); static inline struct arm64_thread_data *arm64_thread_data(void) { - return (struct x86_thread_data *)ntdll_get_thread_data()->cpu_data; + return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 3819225c7c..34761ea4c5 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1594,7 +1594,7 @@ void output_syscalls( DLLSPEC *spec ) output( "\tstr r8, [r7]\n" ); /* prev frame */ output( "\tsub sp, r6, #40\n" ); output( "\tpop {r5-r11,pc}\n" ); - output( "5:\tldr r0,9f\n" ); + output( "5:\tldr r0, 9f\n" ); output( "\tpop {r5-r11,pc}\n" ); output( "6:\t.long .Lsyscall_table-4b\n" ); output( "7:\t.long .Lsyscall_args-1b\n" ); @@ -1603,12 +1603,56 @@ void output_syscalls( DLLSPEC *spec ) break; case CPU_ARM64: output( "\tcmp x8, %u\n", count ); - output( "\tbcs 1f\n" ); - output( "\tadrp x16, .Lsyscall_table\n" ); + output( "\tbcs 3f\n" ); + output( "\tstp x29, x30, [sp,#-176]!\n" ); + output( "\tmov x29, sp\n" ); + output( "\tstp x27, x28, [sp, #160]\n" ); + output( "\tstp x25, x26, [sp, #144]\n" ); + output( "\tstp x23, x24, [sp, #128]\n" ); + output( "\tstp x21, x22, [sp, #112]\n" ); + output( "\tstp x19, x20, [sp, #96]\n" ); + output( "\tstr x8, [sp, #80]\n" ); + output( "\tstp x6, x7, [sp, #64]\n" ); + output( "\tstp x4, x5, [sp, #48]\n" ); + output( "\tstp x2, x3, [sp, #32]\n" ); + output( "\tstp x0, x1, [sp, #16]\n" ); + output( "\tbl %s\n", asm_name("NtCurrentTeb") ); + output( "\tadd x19, x0, #0x2f8\n" ); /* arm64_thread_data()->syscall_frame */ + output( "\tldp x0, x1, [sp, #16]\n" ); + output( "\tldp x2, x3, [sp, #32]\n" ); + output( "\tldp x4, x5, [sp, #48]\n" ); + output( "\tldp x6, x7, [sp, #64]\n" ); + output( "\tldr x8, [sp, #80]\n" ); + output( "\tldr x20, [x19]\n" ); /* prev frame */ + output( "\tstr x20, [sp, #88]\n" ); + output( "\tstr x29, [x19]\n" ); /* syscall frame */ + output( "\tadrp x16, .Lsyscall_args\n" ); + output( "\tadd x16, x16, #:lo12:.Lsyscall_args\n" ); + output( "\tldrb w9, [x16, x8]\n" ); + output( "\tsubs x9, x9, #64\n" ); + output( "\tbls 2f\n" ); + output( "\tadd x11, x29, #192\n" ); + output( "\tsub sp, sp, x9\n" ); + output( "\ttbz x9, #3, 1f\n" ); + output( "\tsub SP, SP, #8\n" ); + output( "1:\tsub x9, x9, #8\n" ); + output( "\tldr x10, [x11, x9]\n" ); + output( "\tstr x10, [sp, x9]\n" ); + output( "\tcbnz x9, 1b\n" ); + output( "2:\tadrp x16, .Lsyscall_table\n" ); output( "\tadd x16, x16, #:lo12:.Lsyscall_table\n" ); output( "\tldr x16, [x16, x8, lsl 3]\n" ); - output( "\tbr x16\n" ); - output( "1:\tmov x0, #0x%x\n", invalid_param & 0xffff0000 ); + output( "\tblr x16\n" ); + output( "\tmov sp, x29\n" ); + output( "\tstr x20, [x19]\n" ); /* prev frame */ + output( "\tldp x19, x20, [sp, #96]\n" ); + output( "\tldp x21, x22, [sp, #112]\n" ); + output( "\tldp x23, x24, [sp, #128]\n" ); + output( "\tldp x25, x26, [sp, #144]\n" ); + output( "\tldp x27, x28, [sp, #160]\n" ); + output( "\tldp x29, x30, [sp], #176\n" ); + output( "\tret\n" ); + output( "3:\tmov x0, #0x%x\n", invalid_param & 0xffff0000 ); output( "\tmovk x0, #0x%x\n", invalid_param & 0x0000ffff ); output( "\tret\n" ); break; @@ -1694,10 +1738,13 @@ void output_syscalls( DLLSPEC *spec ) output( "3:\t.long %u\n", i ); break; case CPU_ARM64: + output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x8, #%u\n", i ); output( "\tadrp x16, %s\n", asm_name("__wine_syscall_dispatcher") ); output( "\tldr x16, [x16, #:lo12:%s]\n", asm_name("__wine_syscall_dispatcher") ); - output( "\tbr x16\n"); + output( "\tblr x16\n"); + output( "\tldp x29, x30, [sp], #16\n" ); + output( "\tret\n" ); break; default: assert(0);

1 0

Alexandre Julliard : winebuild: Store the syscall frame in the thread data on ARM.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 28e443d9e2a3bfea936b4f6f97bf78f6ccf6a91a URL: https://source.winehq.org/git/wine.git/?a=commit;h=28e443d9e2a3bfea936b4f6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:01:46 2020 +0200 winebuild: Store the syscall frame in the thread data on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 31 +++++++++++++++++++++ tools/winebuild/import.c | 66 ++++++++++++++++++++++++++++++-------------- 2 files changed, 77 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 30f2302045..19a952b03f 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -172,6 +172,37 @@ enum arm_trap_code TRAP_ARM_ALIGNFLT = 17, /* Alignment check exception */ }; +struct syscall_frame +{ + struct syscall_frame *prev_frame; + DWORD cpsr; + DWORD r5; + DWORD r6; + DWORD r7; + DWORD r8; + DWORD r9; + DWORD r10; + DWORD r11; + DWORD thunk_addr; + DWORD r4; + DWORD ret_addr; +}; + +struct arm_thread_data +{ + void *exit_frame; /* 1d4 exit frame pointer */ + struct syscall_frame *syscall_frame; /* 1d8 frame pointer on syscall entry */ +}; + +C_ASSERT( sizeof(struct arm_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, exit_frame ) == 0x1d4 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct arm_thread_data, syscall_frame ) == 0x1d8 ); + +static inline struct arm_thread_data *arm_thread_data(void) +{ + return (struct arm_thread_data *)ntdll_get_thread_data()->cpu_data; +} + /*********************************************************************** * unwind_builtin_dll diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 09cb320b5d..3819225c7c 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1561,20 +1561,45 @@ void output_syscalls( DLLSPEC *spec ) output( "\tjmp 3b\n" ); break; case CPU_ARM: - output( "\tldr r1, 4f\n" ); - output( "\tcmp r0, r1\n" ); - output( "\tbcs 2f\n" ); - output( "\tldr r1, 3f\n"); - output( "\tadd r1, pc\n"); - output( "\tldr ip, [r1, r0, lsl #2]\n"); - output( "1:\tpop {r0-r1}\n" ); - output( "\tbx ip\n"); - output( "2:\tpop {r0-r1}\n" ); - output( "\tldr r0,5f\n" ); - output( "bx lr\n" ); - output( "3:\t.long .Lsyscall_table-1b\n" ); - output( "4:\t.long %u\n", count ); - output( "5:\t.long 0x%x\n", invalid_param ); + output( "\tpush {r5-r11,lr}\n" ); + output( "\tadd r6, sp, #40\n" ); /* stack parameters */ + output( "\tldr r5, 8f\n" ); + output( "\tcmp r4, r5\n" ); + output( "\tbcs 5f\n" ); + output( "\tsub sp, sp, #8\n" ); + output( "\tpush {r0-r3}\n" ); + output( "\tbl %s\n", asm_name("NtCurrentTeb") ); + output( "\tadd r7, r0, #0x1d8\n" ); /* arm_thread_data()->syscall_frame */ + output( "\tpop {r0-r3}\n" ); + output( "\tldr r8, [r7]\n" ); + output( "\tstr r8, [sp]\n" ); /* prev frame */ + output( "\tstr sp, [r7]\n" ); /* syscall frame */ + output( "\tmrs ip, CPSR\n" ); + output( "\tstr ip, [sp, #4]\n" ); + output( "\tldr r5, 7f\n"); + output( "\tadd r5, pc\n"); + output( "\tldrb r5, [r5, r4]\n" ); /* syscall args */ + output( "1:\tsubs r5, #16\n" ); /* first 4 args are in registers */ + output( "\tble 3f\n" ); + output( "\tsub sp, r5\n" ); + output( "\tand sp, #~7\n" ); + output( "2:\tsubs r5, r5, #4\n" ); + output( "\tldr ip, [r6, r5]\n" ); + output( "\tstr ip, [sp, r5]\n" ); + output( "\tbgt 2b\n" ); + output( "3:\tldr r5, 6f\n"); + output( "\tadd r5, pc\n"); + output( "\tldr ip, [r5, r4, lsl #2]\n"); /* syscall table */ + output( "4:\tblx ip\n"); + output( "\tstr r8, [r7]\n" ); /* prev frame */ + output( "\tsub sp, r6, #40\n" ); + output( "\tpop {r5-r11,pc}\n" ); + output( "5:\tldr r0,9f\n" ); + output( "\tpop {r5-r11,pc}\n" ); + output( "6:\t.long .Lsyscall_table-4b\n" ); + output( "7:\t.long .Lsyscall_args-1b\n" ); + output( "8:\t.long %u\n", count ); + output( "9:\t.long 0x%x\n", invalid_param ); break; case CPU_ARM64: output( "\tcmp x8, %u\n", count ); @@ -1658,12 +1683,13 @@ void output_syscalls( DLLSPEC *spec ) output( "\tret\n" ); break; case CPU_ARM: - output( "\tpush {r0-r1}\n" ); - output( "\tldr r0, 3f\n"); - output( "\tldr r1, 2f\n"); - output( "\tadd r1, pc\n"); - output( "\tldr ip, [r1]\n"); - output( "1:\tbx ip\n"); + output( "\tpush {r4,lr}\n" ); + output( "\tldr r4, 3f\n"); + output( "\tldr ip, 2f\n"); + output( "\tadd ip, pc\n"); + output( "\tldr ip, [ip]\n"); + output( "1:\tblx ip\n"); + output( "\tpop {r4,pc}\n" ); output( "2:\t.long %s-1b\n", asm_name("__wine_syscall_dispatcher") ); output( "3:\t.long %u\n", i ); break;

1 0