November 2021 - Wine-Commits

Rémi Bernon : dinput: Stub support for DIPROP_FFLOAD device property.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 3b2f7433dbd8d69e03fa673533b5d375024cc9ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b2f7433dbd8d69e03fa6735… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 24 16:09:40 2021 +0100 dinput: Stub support for DIPROP_FFLOAD device property. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 5 +++++ dlls/dinput/joystick_hid.c | 8 ++++++++ dlls/dinput8/tests/hid.c | 9 --------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 6240d640e0d..02a71e6923c 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1056,6 +1056,10 @@ static HRESULT check_property( struct dinput_device *impl, const GUID *guid, con if (!impl->object_properties) return DIERR_UNSUPPORTED; break; + case (DWORD_PTR)DIPROP_FFLOAD: + if (!(impl->caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + if (!impl->acquired || !(impl->dwCoopLevel & DISCL_EXCLUSIVE)) return DIERR_NOTEXCLUSIVEACQUIRED; + /* fallthrough */ case (DWORD_PTR)DIPROP_PRODUCTNAME: case (DWORD_PTR)DIPROP_INSTANCENAME: case (DWORD_PTR)DIPROP_VIDPID: @@ -1173,6 +1177,7 @@ static HRESULT dinput_device_get_property( IDirectInputDevice8W *iface, const GU case (DWORD_PTR)DIPROP_VIDPID: case (DWORD_PTR)DIPROP_JOYSTICKID: case (DWORD_PTR)DIPROP_GUIDANDPATH: + case (DWORD_PTR)DIPROP_FFLOAD: return impl->vtbl->get_property( iface, LOWORD( guid ), header, NULL ); case (DWORD_PTR)DIPROP_RANGE: diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 99436bd8b05..971e775867f 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -824,6 +824,14 @@ static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD pro lstrcpynW( value->wszPath, impl->device_path, MAX_PATH ); return DI_OK; } + case (DWORD_PTR)DIPROP_FFLOAD: + { + DIPROPDWORD *value = (DIPROPDWORD *)header; + if (!(impl->base.caps.dwFlags & DIDC_FORCEFEEDBACK)) return DIERR_UNSUPPORTED; + if (!impl->base.acquired || !(impl->base.dwCoopLevel & DISCL_EXCLUSIVE)) return DIERR_NOTEXCLUSIVEACQUIRED; + value->dwData = 0; + return DI_OK; + } } return DIERR_UNSUPPORTED; diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index f3d35e57ce1..bcff4b59846 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -7990,7 +7990,6 @@ static void test_force_feedback_joystick( DWORD version ) ok( prop_dword.dwData == 10000, "got %u expected %u\n", prop_dword.dwData, 10000 ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_EnumObjects( device, check_objects, &check_objects_params, DIDFT_ALL ); @@ -8061,7 +8060,6 @@ static void test_force_feedback_joystick( DWORD version ) hr = IDirectInputDevice8_SetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); ok( hr == DIERR_READONLY, "SetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine @@ -8819,7 +8817,6 @@ static void test_device_managed_effect(void) ok( hr == DI_OK, "SetDataFormat returned: %#x\n", hr ); hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); hr = IDirectInputDevice8_GetForceFeedbackState( device, &res ); todo_wine @@ -8835,9 +8832,7 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); set_hid_expect( file, NULL, 0 ); @@ -8854,9 +8849,7 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); set_hid_expect( file, NULL, 0 ); @@ -8948,9 +8941,7 @@ static void test_device_managed_effect(void) set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); prop_dword.dwData = 0xdeadbeef; hr = IDirectInputDevice8_GetProperty( device, DIPROP_FFLOAD, &prop_dword.diph ); - todo_wine ok( hr == DI_OK, "GetProperty DIPROP_FFLOAD returned %#x\n", hr ); - todo_wine ok( prop_dword.dwData == 0, "got DIPROP_FFLOAD %#x\n", prop_dword.dwData ); set_hid_expect( file, NULL, 0 );

1 0

Rémi Bernon : dinput: Stub HID joystick GetEffectStatus implementation.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 2ca15c8dc8754016a46b9884f083c2030b5417f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ca15c8dc8754016a46b9884… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 24 16:09:42 2021 +0100 dinput: Stub HID joystick GetEffectStatus implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52062 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_hid.c | 17 +++++++++++++++-- dlls/dinput8/tests/hid.c | 14 -------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 971e775867f..06be759b685 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -2707,11 +2707,24 @@ static HRESULT WINAPI hid_joystick_effect_Stop( IDirectInputEffect *iface ) static HRESULT WINAPI hid_joystick_effect_GetEffectStatus( IDirectInputEffect *iface, DWORD *status ) { - FIXME( "iface %p, status %p stub!\n", iface, status ); + struct hid_joystick_effect *impl = impl_from_IDirectInputEffect( iface ); + HRESULT hr; + + FIXME( "iface %p, status %p semi-stub!\n", iface, status ); if (!status) return E_POINTER; + *status = 0; - return DIERR_UNSUPPORTED; + EnterCriticalSection( &impl->joystick->base.crit ); + if (!impl->joystick->base.acquired || !(impl->joystick->base.dwCoopLevel & DISCL_EXCLUSIVE)) + hr = DIERR_NOTEXCLUSIVEACQUIRED; + else if (!impl->index) + hr = DIERR_NOTDOWNLOADED; + else + hr = DI_OK; + LeaveCriticalSection( &impl->joystick->base.crit ); + + return hr; } static void set_parameter_value( struct hid_joystick_effect *impl, char *report_buf, diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index bda738bc178..a8ea8eaea9f 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -8873,9 +8873,7 @@ static void test_device_managed_effect(void) ok( hr == E_POINTER, "GetEffectStatus returned %#x\n", hr ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); flags = DIEP_ALLPARAMS; @@ -8888,7 +8886,6 @@ static void test_device_managed_effect(void) set_hid_expect( file, NULL, 0 ); hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTEXCLUSIVEACQUIRED, "GetEffectStatus returned %#x\n", hr ); set_hid_expect( file, expect_reset, sizeof(expect_reset) ); @@ -8898,9 +8895,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); @@ -8919,9 +8914,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; @@ -8946,7 +8939,6 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8956,7 +8948,6 @@ static void test_device_managed_effect(void) ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8974,7 +8965,6 @@ static void test_device_managed_effect(void) ok( res == WAIT_OBJECT_0, "WaitForSingleObject returned %#x\n", res ); res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); todo_wine ok( res == DIEGES_PLAYING, "got status %#x\n", res ); @@ -8994,9 +8984,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DI_OK, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef; @@ -9014,9 +9002,7 @@ static void test_device_managed_effect(void) res = 0xdeadbeef; hr = IDirectInputEffect_GetEffectStatus( effect, &res ); - todo_wine ok( hr == DIERR_NOTDOWNLOADED, "GetEffectStatus returned %#x\n", hr ); - todo_wine ok( res == 0, "got status %#x\n", res ); set_hid_expect( file, expect_pool, sizeof(struct hid_expect) ); res = 0xdeadbeef;

1 0

Huw Davies : winecoreaudio: Move set_volumes to the unixlib.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: b3bfa1e54b4b2119703cde1b2c0dd329cbd60ea9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3bfa1e54b4b2119703cde1b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:48 2021 +0000 winecoreaudio: Move set_volumes to the unixlib. The session setvol helper has been removed to reduce the number of helper functions as the loop over the session's clients isn't very complicated. Session mute is handled by setting the master volume to zero. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 31 +++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 103 +++++++++++++------------------------ dlls/winecoreaudio.drv/unixlib.h | 10 ++++ 3 files changed, 77 insertions(+), 67 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 9636975607c..5569869de6e 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1554,6 +1554,36 @@ static NTSTATUS is_started(void *args) return STATUS_SUCCESS; } +static NTSTATUS set_volumes(void *args) +{ + struct set_volumes_params *params = args; + struct coreaudio_stream *stream = params->stream; + Float32 level = 1.0, tmp; + OSStatus sc; + UINT32 i; + + if(params->channel >= stream->fmt->nChannels || params->channel < -1){ + ERR("Incorrect channel %d\n", params->channel); + return STATUS_SUCCESS; + } + + if(params->channel == -1){ + for(i = 0; i < stream->fmt->nChannels; ++i){ + tmp = params->master_volume * params->volumes[i] * params->session_volumes[i]; + level = tmp < level ? tmp : level; + } + }else + level = params->master_volume * params->volumes[params->channel] * + params->session_volumes[params->channel]; + + sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, + kAudioUnitScope_Global, 0, level, 0); + if(sc != noErr) + WARN("Couldn't set volume: %x\n", (int)sc); + + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1575,4 +1605,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_position, get_frequency, is_started, + set_volumes, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 07260c16ff0..047979df4f3 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -176,7 +176,6 @@ static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, static struct list g_sessions = LIST_INIT(g_sessions); static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index); static inline ACImpl *impl_from_IAudioClient3(IAudioClient3 *iface) { @@ -337,6 +336,19 @@ static void get_device_guid(EDataFlow flow, DWORD device_id, GUID *guid) RegCloseKey(key); } +static void set_stream_volumes(ACImpl *This, int channel) +{ + struct set_volumes_params params; + + params.stream = This->stream; + params.master_volume = This->session->mute ? 0.0f : This->session->master_vol; + params.volumes = This->vols; + params.session_volumes = This->session->channel_vols; + params.channel = channel; + + UNIX_CALL(set_volumes, &params); +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **guids_out, UINT *num, UINT *def_index) { @@ -782,8 +794,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - ca_setvol(This, params.stream, -1); - end: if(FAILED(params.result)){ if(params.stream){ @@ -792,8 +802,10 @@ end: } HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; - }else + }else{ This->stream = params.stream; + set_stream_volumes(This, -1); + } LeaveCriticalSection(&g_sessions_lock); @@ -1818,52 +1830,6 @@ static const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl = AudioSessionControl_SetDuckingPreference }; -/* index == -1 means set all channels, otherwise sets only the given channel */ -static HRESULT ca_setvol(ACImpl *This, struct coreaudio_stream *stream, UINT32 index) -{ - Float32 level; - OSStatus sc; - - if(This->session->mute) - level = 0.; - else{ - if(index == (UINT32)-1){ - UINT32 i; - level = 1.; - for(i = 0; i < stream->fmt->nChannels; ++i){ - Float32 tmp; - tmp = This->session->master_vol * - This->session->channel_vols[i] * This->vols[i]; - level = tmp < level ? tmp : level; - } - }else - level = This->session->master_vol * - This->session->channel_vols[index] * This->vols[index]; - } - - sc = AudioUnitSetParameter(stream->unit, kHALOutputParam_Volume, - kAudioUnitScope_Global, 0, level, 0); - if(sc != noErr) - WARN("Couldn't set volume: %x\n", (int)sc); - - return S_OK; -} - -static HRESULT ca_session_setvol(AudioSession *session, UINT32 index) -{ - HRESULT ret = S_OK; - ACImpl *client; - - LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry){ - HRESULT hr; - hr = ca_setvol(client, client->stream, index); - if(FAILED(hr)) - ret = hr; - } - - return ret; -} - static HRESULT WINAPI SimpleAudioVolume_QueryInterface( ISimpleAudioVolume *iface, REFIID riid, void **ppv) { @@ -1902,7 +1868,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%f, %s)\n", session, level, wine_dbgstr_guid(context)); @@ -1916,11 +1882,12 @@ static HRESULT WINAPI SimpleAudioVolume_SetMasterVolume( session->master_vol = level; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI SimpleAudioVolume_GetMasterVolume( @@ -1944,6 +1911,7 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, { AudioSessionWrapper *This = impl_from_ISimpleAudioVolume(iface); AudioSession *session = This->session; + ACImpl *client; TRACE("(%p)->(%u, %s)\n", session, mute, debugstr_guid(context)); @@ -1954,7 +1922,8 @@ static HRESULT WINAPI SimpleAudioVolume_SetMute(ISimpleAudioVolume *iface, session->mute = mute; - ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); @@ -2040,7 +2009,6 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( IAudioStreamVolume *iface, UINT32 index, float level) { ACImpl *This = impl_from_IAudioStreamVolume(iface); - HRESULT ret; TRACE("(%p)->(%d, %f)\n", This, index, level); @@ -2055,11 +2023,11 @@ static HRESULT WINAPI AudioStreamVolume_SetChannelVolume( This->vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_setvol(This, This->stream, index); + set_stream_volumes(This, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetChannelVolume( @@ -2085,7 +2053,6 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( { ACImpl *This = impl_from_IAudioStreamVolume(iface); UINT32 i; - HRESULT ret; TRACE("(%p)->(%d, %p)\n", This, count, levels); @@ -2100,11 +2067,11 @@ static HRESULT WINAPI AudioStreamVolume_SetAllVolumes( for(i = 0; i < count; ++i) This->vols[i] = levels[i]; - ret = ca_setvol(This, This->stream, -1); + set_stream_volumes(This, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI AudioStreamVolume_GetAllVolumes( @@ -2198,7 +2165,7 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - HRESULT ret; + ACImpl *client; TRACE("(%p)->(%d, %f, %s)\n", session, index, level, wine_dbgstr_guid(context)); @@ -2217,11 +2184,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetChannelVolume( session->channel_vols[index] = level; WARN("CoreAudio doesn't support per-channel volume control\n"); - ret = ca_session_setvol(session, index); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, index); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetChannelVolume( @@ -2249,8 +2217,8 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( { AudioSessionWrapper *This = impl_from_IChannelAudioVolume(iface); AudioSession *session = This->session; - int i; - HRESULT ret; + ACImpl *client; + UINT32 i; TRACE("(%p)->(%d, %p, %s)\n", session, count, levels, wine_dbgstr_guid(context)); @@ -2269,11 +2237,12 @@ static HRESULT WINAPI ChannelAudioVolume_SetAllVolumes( for(i = 0; i < count; ++i) session->channel_vols[i] = levels[i]; - ret = ca_session_setvol(session, -1); + LIST_FOR_EACH_ENTRY(client, &session->clients, ACImpl, entry) + set_stream_volumes(client, -1); LeaveCriticalSection(&g_sessions_lock); - return ret; + return S_OK; } static HRESULT WINAPI ChannelAudioVolume_GetAllVolumes( diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index aac2df15f47..df00d27c27a 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -194,6 +194,15 @@ struct is_started_params HRESULT result; }; +struct set_volumes_params +{ + struct coreaudio_stream *stream; + float master_volume; + const float *volumes; + const float *session_volumes; + int channel; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -215,6 +224,7 @@ enum unix_funcs unix_get_position, unix_get_frequency, unix_is_started, + unix_set_volumes, }; extern unixlib_handle_t coreaudio_handle;

1 0

Gabriel Ivăncescu : jscript: Use to_primitive when getting the default value.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 464134c20f81b5ab2892e656c8408fb8b0f3b685 URL: https://source.winehq.org/git/wine.git/?a=commit;h=464134c20f81b5ab2892e656… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:34 2021 +0200 jscript: Use to_primitive when getting the default value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 16 ++++++++- dlls/jscript/tests/run.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5cf1e0aad81..6e1463b1e00 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1572,6 +1572,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc TRACE("invalid id\n"); return DISP_E_MEMBERNOTFOUND; } + if(id == DISPID_VALUE && wFlags & (DISPATCH_PROPERTYGET | DISPATCH_PROPERTYPUT)) + prop = NULL; enter_script(This->ctx, &ei); @@ -1600,7 +1602,14 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc case DISPATCH_PROPERTYGET: { jsval_t r; - hres = prop_get(This, prop, &r); + if(prop) + hres = prop_get(This, prop, &r); + else { + hres = to_primitive(This->ctx, jsval_obj(This), &r, NO_HINT); + if(hres == JS_E_TO_PRIMITIVE) + hres = DISP_E_MEMBERNOTFOUND; + } + if(SUCCEEDED(hres)) { hres = jsval_to_variant(r, pvarRes); jsval_release(r); @@ -1611,6 +1620,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc jsval_t val; DWORD i; + if(!prop) { + hres = DISP_E_MEMBERNOTFOUND; + break; + } + for(i=0; i < pdp->cNamedArgs; i++) { if(pdp->rgdispidNamedArgs[i] == DISPID_PROPERTYPUT) break; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index ef0f39f1317..0e2f6333abc 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2789,6 +2789,8 @@ static void test_retval(void) static void test_default_value(void) { + static DISPID propput_dispid = DISPID_PROPERTYPUT; + IActiveScript *script; DISPPARAMS dp = {0}; IDispatch *disp; VARIANT v; @@ -2806,9 +2808,99 @@ static void test_default_value(void) { ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); } + VariantClear(&v); + IDispatch_Release(disp); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr.valueOf = function() {return 42;}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_I4(&v) == 42, "V_I4(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr.toString = function() {return \"foo\";}; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"foo"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var arr = [5]; arr", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"5"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var obj = Object.prototype; delete obj.valueOf; obj", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == S_OK, "Invoke failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), L"[object Object]"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var obj = Object.prototype; delete obj.toString; obj", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"Object.prototype", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + dp.cArgs = dp.cNamedArgs = 1; + dp.rgdispidNamedArgs = &propput_dispid; + dp.rgvarg = &v; + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres); + IDispatch_Release(disp); + close_script(script); + + hres = parse_script_expr(L"var f = function() {return 42;}; f", &v, &script); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(v) = %d\n", V_VT(&v)); + disp = V_DISPATCH(&v); + + V_VT(&v) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYPUT, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_MEMBERNOTFOUND, "Invoke failed: %08x\n", hres); + IDispatch_Release(disp); + close_script(script); } static void test_script_exprs(void)

1 0

Huw Davies : winecoreaudio: Move get_frequency to the unixlib.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: b884ca314d64911c2ba6ea801a0196649adf43db URL: https://source.winehq.org/git/wine.git/?a=commit;h=b884ca314d64911c2ba6ea80… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:46 2021 +0000 winecoreaudio: Move get_frequency to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 15 +++++++++++++++ dlls/winecoreaudio.drv/mmdevdrv.c | 11 +++++------ dlls/winecoreaudio.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d7390c5a677..f59723d48f6 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1527,6 +1527,20 @@ static NTSTATUS get_position(void *args) return STATUS_SUCCESS; } +static NTSTATUS get_frequency(void *args) +{ + struct get_frequency_params *params = args; + struct coreaudio_stream *stream = params->stream; + + if(stream->share == AUDCLNT_SHAREMODE_SHARED) + *params->freq = (UINT64)stream->fmt->nSamplesPerSec * stream->fmt->nBlockAlign; + else + *params->freq = stream->fmt->nSamplesPerSec; + + params->result = S_OK; + return STATUS_SUCCESS; +} + unixlib_entry_t __wine_unix_call_funcs[] = { get_endpoint_ids, @@ -1546,4 +1560,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_current_padding, get_next_packet_size, get_position, + get_frequency, }; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index ebfc0543af8..f79d808d8ed 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1458,15 +1458,14 @@ static ULONG WINAPI AudioClock_Release(IAudioClock *iface) static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) { ACImpl *This = impl_from_IAudioClock(iface); + struct get_frequency_params params; TRACE("(%p)->(%p)\n", This, freq); - if(This->stream->share == AUDCLNT_SHAREMODE_SHARED) - *freq = (UINT64)This->stream->fmt->nSamplesPerSec * This->stream->fmt->nBlockAlign; - else - *freq = This->stream->fmt->nSamplesPerSec; - - return S_OK; + params.stream = This->stream; + params.freq = freq; + UNIX_CALL(get_frequency, &params); + return params.result; } static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index e9edaf82973..5dcefe2eb05 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -181,6 +181,13 @@ struct get_position_params UINT64 *qpctime; }; +struct get_frequency_params +{ + struct coreaudio_stream *stream; + HRESULT result; + UINT64 *freq; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -200,6 +207,7 @@ enum unix_funcs unix_get_current_padding, unix_get_next_packet_size, unix_get_position, + unix_get_frequency, }; extern unixlib_handle_t coreaudio_handle;

1 0

Huw Davies : winecoreaudio: Make the coreaudio_stream structure private to the unixlib.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 37265acd513961255205a0d775794dc4e3f9ff74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37265acd513961255205a0d7… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 24 11:26:49 2021 +0000 winecoreaudio: Make the coreaudio_stream structure private to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 23 +++++++++++++++++++++++ dlls/winecoreaudio.drv/unixlib.h | 23 +---------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5569869de6e..fd32a2a99ac 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -72,6 +72,29 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); +struct coreaudio_stream +{ + OSSpinLock lock; + AudioComponentInstance unit; + AudioConverterRef converter; + AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ + AudioDeviceID dev_id; + EDataFlow flow; + AUDCLNT_SHAREMODE share; + + BOOL playing; + UINT32 period_ms, period_frames; + UINT32 bufsize_frames, resamp_bufsize_frames; + UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; + UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; + UINT32 wrap_bufsize_frames; + UINT64 written_frames; + INT32 getbuf_last; + WAVEFORMATEX *fmt; + BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; + SIZE_T local_buffer_size, tmp_buffer_size; +}; + static HRESULT osstatus_to_hresult(OSStatus sc) { switch(sc){ diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index df00d27c27a..6f51c7877fa 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -18,28 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -struct coreaudio_stream /* To be made private */ -{ - OSSpinLock lock; - AudioComponentInstance unit; - AudioConverterRef converter; - AudioStreamBasicDescription dev_desc; /* audio unit format, not necessarily the same as fmt */ - AudioDeviceID dev_id; - EDataFlow flow; - AUDCLNT_SHAREMODE share; - - BOOL playing; - UINT32 period_ms, period_frames; - UINT32 bufsize_frames, resamp_bufsize_frames; - UINT32 lcl_offs_frames, held_frames, wri_offs_frames, tmp_buffer_frames; - UINT32 cap_bufsize_frames, cap_offs_frames, cap_held_frames; - UINT32 wrap_bufsize_frames; - UINT64 written_frames; - INT32 getbuf_last; - WAVEFORMATEX *fmt; - BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; -}; +struct coreaudio_stream; struct endpoint {

1 0

Gabriel Ivăncescu : jscript: Treat prototype refs as non-existent when deleting.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 58722dfe35a1c760ba6baee809845923a409f293 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58722dfe35a1c760ba6baee8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:30 2021 +0200 jscript: Treat prototype refs as non-existent when deleting. Delete only affects own properties. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 5 +++++ dlls/jscript/tests/lang.js | 5 +++++ dlls/mshtml/tests/documentmode.js | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e64a5203564..df81e1a0d99 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1621,6 +1621,11 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) { + if(prop->type == PROP_PROTREF) { + *ret = TRUE; + return S_OK; + } + if(!(prop->flags & PROPF_CONFIGURABLE)) { *ret = FALSE; return S_OK; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 63aa6696f89..f259c70e92e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1565,6 +1565,11 @@ ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); +ok(!("test1" in inobj), "test1 is still in inobj after delete"); +ok((delete inobj.test3) === true, "delete inobj.test3 returned false"); +ok("test3" in inobj, "test3 is not in inobj after delete"); + tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5f33dd9521..041025c8032 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1192,7 +1192,6 @@ sync_test("__proto__", function() { ok(obj.__proto__ === ctor.prototype, "obj.__proto__ !== ctor.prototype"); r = (delete x.__proto__); - todo_wine. ok(r, "delete x.__proto__ returned " + r); ok(Object.prototype.hasOwnProperty("__proto__"), "__proto__ is not a property of Object.prototype after delete"); r = Object.getPrototypeOf(x);

1 0

Gabriel Ivăncescu : jscript: Use ~0 to mark invalid bucket.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 5842ec60e26dae52d4426a404625da33baf21729 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5842ec60e26dae52d4426a40… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:35 2021 +0200 jscript: Use ~0 to mark invalid bucket. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 6e1463b1e00..eba3b738b12 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -181,8 +181,8 @@ static inline HRESULT resize_props(jsdisp_t *This) This->props = props; for(i=0; i<This->buf_size; i++) { - This->props[i].bucket_head = 0; - This->props[i].bucket_next = 0; + This->props[i].bucket_head = ~0; + This->props[i].bucket_next = ~0; } for(i=1; i<This->prop_cnt; i++) { @@ -233,14 +233,14 @@ static dispex_prop_t *alloc_protref(jsdisp_t *This, const WCHAR *name, DWORD ref static HRESULT find_prop_name(jsdisp_t *This, unsigned hash, const WCHAR *name, dispex_prop_t **ret) { const builtin_prop_t *builtin; - unsigned bucket, pos, prev = 0; + unsigned bucket, pos, prev = ~0; dispex_prop_t *prop; bucket = get_props_idx(This, hash); pos = This->props[bucket].bucket_head; - while(pos != 0) { + while(pos != ~0) { if(!wcscmp(name, This->props[pos].name)) { - if(prev != 0) { + if(prev != ~0) { This->props[prev].bucket_next = This->props[pos].bucket_next; This->props[pos].bucket_next = This->props[bucket].bucket_head; This->props[bucket].bucket_head = pos; @@ -1423,7 +1423,7 @@ static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC /* If two identifiers differ only by case, the TypeInfo fails */ pos = This->props[get_props_idx(This, prop->hash)].bucket_head; - while (pos) + while (pos != ~0) { cur = This->props + pos; @@ -1795,6 +1795,8 @@ jsdisp_t *to_jsdisp(IDispatch *disp) HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *prototype) { + unsigned i; + TRACE("%p (%p)\n", dispex, prototype); dispex->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; @@ -1806,6 +1808,11 @@ HRESULT init_dispex(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *b if(!dispex->props) return E_OUTOFMEMORY; + for(i = 0; i < dispex->buf_size; i++) { + dispex->props[i].bucket_head = ~0; + dispex->props[i].bucket_next = ~0; + } + dispex->prototype = prototype; if(prototype) jsdisp_addref(prototype);

1 0

Gabriel Ivăncescu : jscript: Access the PROTREF with proper index instead of get_prop.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 8b3afbe402f41e5de46ea9fd610336dc9d52dd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b3afbe402f41e5de46ea9fd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:36 2021 +0200 jscript: Access the PROTREF with proper index instead of get_prop. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index eba3b738b12..a00e36b9654 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -109,8 +109,12 @@ static inline BOOL is_function_prop(dispex_prop_t *prop) static DWORD get_flags(jsdisp_t *This, dispex_prop_t *prop) { if(prop->type == PROP_PROTREF) { - dispex_prop_t *parent = get_prop(This->prototype, prop->u.ref); - if(!parent) { + dispex_prop_t *parent = NULL; + + if(prop->u.ref < This->prototype->prop_cnt) + parent = &This->prototype->props[prop->u.ref]; + + if(!parent || parent->type == PROP_DELETED) { prop->type = PROP_DELETED; return 0; }

1 0

Gabriel Ivăncescu : jscript: Support deletion for accessor, builtin and idx props.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: c1861dc7d0426264280c180654b728b4a808dc3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1861dc7d0426264280c1806… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 24 16:10:33 2021 +0200 jscript: Support deletion for accessor, builtin and idx props. IDX props are not configurable, thus they cannot be deleted, so it makes no sense to special-case them anyway. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/dispex.c | 13 ++++++++----- dlls/jscript/tests/lang.js | 7 +++++++ dlls/mshtml/tests/es5.js | 15 ++++++++++++++- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 8c0d84b8023..5cf1e0aad81 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1651,14 +1651,17 @@ static HRESULT delete_prop(dispex_prop_t *prop, BOOL *ret) return S_OK; } - *ret = TRUE; /* FIXME: not exactly right */ + *ret = TRUE; - if(prop->type == PROP_JSVAL) { + if(prop->type == PROP_JSVAL) jsval_release(prop->u.val); - prop->type = PROP_DELETED; + if(prop->type == PROP_ACCESSOR) { + if(prop->u.accessor.getter) + jsdisp_release(prop->u.accessor.getter); + if(prop->u.accessor.setter) + jsdisp_release(prop->u.accessor.setter); } - if(prop->type == PROP_ACCESSOR) - FIXME("not supported on accessor property\n"); + prop->type = PROP_DELETED; return S_OK; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index e4f5882246a..23c9c798016 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1589,6 +1589,13 @@ ok((delete tmp["test"]) === true, "delete returned false"); ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); ok(!("test" in tmp), "test is still in tmp after delete?"); +arr = [1, 2, 3]; +ok(arr.length === 3, "arr.length = " + arr.length); +ok((delete arr.length) === false, "delete arr.length returned true"); +ok("reverse" in arr, "reverse not in arr"); +ok((delete Array.prototype.reverse) === true, "delete Array.prototype.reverse returned false"); +ok(!("reverse" in arr), "reverse is still in arr after delete from prototype"); + tmp.testWith = true; with(tmp) ok(testWith === true, "testWith !== true"); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index ede94191ab6..58b0d43e274 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -342,7 +342,8 @@ sync_test("defineProperty", function() { }, set: function(v) { getsetprop_value = v; - } + }, + configurable: true }; Object.defineProperty(obj, "getsetprop", desc); test_accessor_prop_desc(obj, "getsetprop", desc); @@ -353,6 +354,9 @@ sync_test("defineProperty", function() { test_accessor_prop_desc(obj, "getsetprop", desc); ok(obj.getsetprop === 2, "getsetprop = " + obj.getsetprop); + ok((delete obj.getsetprop) === true, "delete getsetprop returned false"); + ok(!("getsetprop" in obj), "getsetprop still in obj after delete"); + Object.defineProperty(obj, "notConf", {writable: true, enumerable: true, configurable: false, value: 1}); test_own_data_prop_desc(obj, "notConf", true, true, false); @@ -631,6 +635,15 @@ sync_test("property_definitions", function() { ok(obj[0] === 7, "obj.prop = " + obj[0]); }); +sync_test("string_idx", function() { + var s = "foobar"; + ok(s[0] === "f", "s[0] = " + s[0]); + ok(s[5] === "r", "s[5] = " + s[5]); + ok(s[6] === undefined, "s[6] = " + s[6]); + ok((delete s[0]) === false, "delete s[0] returned true"); + ok((delete s[6]) === true, "delete s[6] returned false"); +}); + sync_test("string_trim", function() { function test_trim(value, expected) { var r = String.prototype.trim.call(value);

1 0