October 2019 - Wine-commits

Alistair Leslie-Hughes : dmband: Simplify DllGetClassObject.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 422c4fbf71079ca6e3940bb9b53e5a74f78651c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=422c4fbf71079ca6e3940bb9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Oct 28 22:35:15 2019 +0100 dmband: Simplify DllGetClassObject. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmband/dmband_main.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index f72b41570b..e63678c831 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -145,16 +145,11 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { TRACE("(%s, %s, %p)\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); - if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBand) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &Band_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } else if (IsEqualCLSID (rclsid, &CLSID_DirectMusicBandTrack) && IsEqualIID (riid, &IID_IClassFactory)) { - *ppv = &BandTrack_CF; - IClassFactory_AddRef((IClassFactory*)*ppv); - return S_OK; - } - + if (IsEqualCLSID(rclsid, &CLSID_DirectMusicBand)) + return IClassFactory_QueryInterface(&Band_CF.IClassFactory_iface, riid, ppv); + else if (IsEqualCLSID(rclsid, &CLSID_DirectMusicBandTrack)) + return IClassFactory_QueryInterface(&BandTrack_CF.IClassFactory_iface, riid, ppv); + WARN("(%s, %s, %p): no interface found.\n", debugstr_dmguid(rclsid), debugstr_dmguid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

1 0

Paul Gofman : d3d8: Fix stream data skip count in convert_to_wined3d_declaration().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 5e10f1d339aaf798374917ba039363072a867c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e10f1d339aaf798374917ba… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Oct 29 02:23:12 2019 +0300 d3d8: Fix stream data skip count in convert_to_wined3d_declaration(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40364 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 17 ++++++++++++----- dlls/d3d8/vertexdeclaration.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index fc7c3cc293..310ffc59e4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7813,13 +7813,19 @@ static void test_vshader_input(void) {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, -1.0f, 0.1f}, 0x00ff8040}, {{ 1.0f, 0.0f, 0.1f}, 0x00ff8040}, - }, + }; + static const struct + { + struct vec3 position; + struct vec3 dummy; /* testing D3DVSD_SKIP */ + DWORD diffuse; + } quad3_color[] = { - {{-1.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{-1.0f, 1.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 0.0f, 0.1f}, 0x00ff8040}, - {{ 0.0f, 1.0f, 0.1f}, 0x00ff8040}, + {{-1.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{-1.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 0.0f, 0.1f}, {0.0f}, 0x00ff8040}, + {{ 0.0f, 1.0f, 0.1f}, {0.0f}, 0x00ff8040}, }; static const float quad4_color[] = { @@ -7870,6 +7876,7 @@ static void test_vshader_input(void) { D3DVSD_STREAM(0), D3DVSD_REG(0, D3DVSDT_FLOAT3), /* position */ + D3DVSD_SKIP(3), /* not used */ D3DVSD_REG(5, D3DVSDT_D3DCOLOR), /* diffuse */ D3DVSD_END() }; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index a43fb26f95..525666d680 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -291,8 +291,8 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 offset += wined3d_type_sizes[type]; } else if (token_type == D3DVSD_TOKEN_STREAMDATA && (*token & D3DVSD_DATALOADTYPEMASK)) { - TRACE(" 0x%08x SKIP(%u)\n", token_type, ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT)); - offset += sizeof(DWORD) * ((token_type & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + TRACE(" 0x%08x SKIP(%u)\n", *token, (*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); + offset += sizeof(DWORD) * ((*token & D3DVSD_SKIPCOUNTMASK) >> D3DVSD_SKIPCOUNTSHIFT); } if (element_count >= 127) {

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_transform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: a5efdaca8f8e0554955361b5a8394c0bb06a47a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5efdaca8f8e0554955361b5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:52 2019 -0500 wined3d: Introduce wined3d_stateblock_set_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/stateblock.c | 13 +++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 16 insertions(+) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index fe49fd6754..41c97b5020 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1508,6 +1508,19 @@ void CDECL wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, stateblock->changed.textures |= 1u << stage; } +void CDECL wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state d3dts, const struct wined3d_matrix *matrix) +{ + TRACE("stateblock %p, state %s, matrix %p.\n", stateblock, debug_d3dtstype(d3dts), matrix); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_11, matrix->_12, matrix->_13, matrix->_14); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_21, matrix->_22, matrix->_23, matrix->_24); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_31, matrix->_32, matrix->_33, matrix->_34); + TRACE("%.8e %.8e %.8e %.8e\n", matrix->_41, matrix->_42, matrix->_43, matrix->_44); + + stateblock->stateblock_state.transforms[d3dts] = *matrix; + stateblock->changed.transform[d3dts >> 5] |= 1u << (d3dts & 0x1f); +} + static void init_default_render_states(DWORD rs[WINEHIGHEST_RENDER_STATE + 1], const struct wined3d_d3d_info *d3d_info) { union diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d0ba31bf4e..297d3a0410 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -268,6 +268,7 @@ @ cdecl wined3d_stateblock_set_sampler_state(ptr long long long) @ cdecl wined3d_stateblock_set_texture(ptr long ptr) @ cdecl wined3d_stateblock_set_texture_stage_state(ptr long long long) +@ cdecl wined3d_stateblock_set_transform(ptr long ptr) @ cdecl wined3d_stateblock_set_vertex_declaration(ptr ptr) @ cdecl wined3d_stateblock_set_vertex_shader(ptr ptr) @ cdecl wined3d_stateblock_set_vs_consts_b(ptr long long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a567cfd2f1..298cb3b270 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2677,6 +2677,8 @@ void __cdecl wined3d_stateblock_set_sampler_state(struct wined3d_stateblock *sta void __cdecl wined3d_stateblock_set_texture(struct wined3d_stateblock *stateblock, UINT stage, struct wined3d_texture *texture); void __cdecl wined3d_stateblock_set_texture_stage_state(struct wined3d_stateblock *stateblock, UINT stage, enum wined3d_texture_stage_state state, DWORD value); +void __cdecl wined3d_stateblock_set_transform(struct wined3d_stateblock *stateblock, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix); void __cdecl wined3d_stateblock_set_vertex_declaration(struct wined3d_stateblock *stateblock, struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *stateblock, struct wined3d_shader *shader);

1 0

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: c8bbe970e30ca65ea6b5df67ec3450ab30d12ab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c8bbe970e30ca65ea6b5df67… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:54 2019 -0500 d3d8: Handle stateblocks in d3d8_device_SetTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 6b6f5edfbc..90bcfae498 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1610,7 +1610,9 @@ static HRESULT WINAPI d3d8_device_SetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d9: Handle stateblocks in d3d9_device_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 070eea856d0b8b3695f9595c14ebfa0c5de7375b URL: https://source.winehq.org/git/wine.git/?a=commit;h=070eea856d0b8b3695f9595c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:53 2019 -0500 d3d9: Handle stateblocks in d3d9_device_SetTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cd870c90a6..aa742c8c1f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2070,7 +2070,9 @@ static HRESULT WINAPI d3d9_device_SetTransform(IDirect3DDevice9Ex *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : ddraw: Handle stateblocks in d3d_device7_SetTransform().
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: 3feef4fb1d1918eb345f050da11e27442b573765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3feef4fb1d1918eb345f050d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Oct 28 18:35:55 2019 -0500 ddraw: Handle stateblocks in d3d_device7_SetTransform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9b7754bd8d..599e45c24f 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3135,7 +3135,9 @@ static HRESULT d3d_device7_SetTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_device_set_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, wined3d_state, (const struct wined3d_matrix *)matrix); + if (!device->recording) + wined3d_device_set_transform(device->wined3d_device, wined3d_state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK;

1 0

Louis Lenders : uianimation: Add IUIAnimationTimer stubbed interface.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: d8d032da8bae7172a971baadacf2fb74e5d03e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8d032da8bae7172a971baad… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Oct 29 00:28:58 2019 +0000 uianimation: Add IUIAnimationTimer stubbed interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/main.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/uianimation/main.c b/dlls/uianimation/main.c index c9ce692ebc..3f1c6a182b 100644 --- a/dlls/uianimation/main.c +++ b/dlls/uianimation/main.c @@ -351,7 +351,145 @@ static HRESULT manager_create( IUnknown *outer, REFIID iid, void **obj ) return hr; } +/*********************************************************************** + * IUIAnimationTimer + */ +struct timer +{ + IUIAnimationTimer IUIAnimationTimer_iface; + LONG ref; +}; + +struct timer *impl_from_IUIAnimationTimer( IUIAnimationTimer *iface ) +{ + return CONTAINING_RECORD( iface, struct timer, IUIAnimationTimer_iface ); +} + +static HRESULT WINAPI timer_QueryInterface( IUIAnimationTimer *iface, REFIID iid, void **obj ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + + TRACE( "(%p)->(%s %p)\n", This, debugstr_guid( iid ), obj ); + + if (IsEqualIID( iid, &IID_IUnknown ) || + IsEqualIID( iid, &IID_IUIAnimationTimer )) + { + IUIAnimationTimer_AddRef( iface ); + *obj = iface; + return S_OK; + } + + FIXME( "interface %s not implemented\n", debugstr_guid( iid ) ); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI timer_AddRef( IUIAnimationTimer *iface ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + + TRACE( "(%p) ref = %u\n", This, ref ); + return ref; +} + +static ULONG WINAPI timer_Release( IUIAnimationTimer *iface ) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE( "(%p) ref = %u\n", This, ref ); + + if (!ref) + heap_free( This ); + + return ref; +} + +static HRESULT WINAPI timer_SetTimerUpdateHandler (IUIAnimationTimer *iface, + IUIAnimationTimerUpdateHandler *update_handler, + UI_ANIMATION_IDLE_BEHAVIOR idle_behaviour) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%p, %d)\n", This, update_handler, idle_behaviour ); + return E_NOTIMPL; +} + + static HRESULT WINAPI timer_SetTimerEventHandler (IUIAnimationTimer *iface, + IUIAnimationTimerEventHandler *handler) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return S_OK; +} + +static HRESULT WINAPI timer_Enable (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return S_OK; +} + +static HRESULT WINAPI timer_Disable (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI timer_IsEnabled (IUIAnimationTimer *iface) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->()\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI timer_GetTime (IUIAnimationTimer *iface, UI_ANIMATION_SECONDS *seconds) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%p)\n", This, seconds ); + return S_OK; +} + +static HRESULT WINAPI timer_SetFrameRateThreshold (IUIAnimationTimer *iface, UINT32 frames_per_sec) +{ + struct timer *This = impl_from_IUIAnimationTimer( iface ); + FIXME( "stub (%p)->(%d)\n", This, frames_per_sec ); + return E_NOTIMPL; +} + +const struct IUIAnimationTimerVtbl timer_vtbl = +{ + timer_QueryInterface, + timer_AddRef, + timer_Release, + timer_SetTimerUpdateHandler, + timer_SetTimerEventHandler, + timer_Enable, + timer_Disable, + timer_IsEnabled, + timer_GetTime, + timer_SetFrameRateThreshold, +}; + +static HRESULT timer_create( IUnknown *outer, REFIID iid, void **obj ) +{ + struct timer *This = heap_alloc( sizeof(*This) ); + HRESULT hr; + + if (!This) + return E_OUTOFMEMORY; + This->IUIAnimationTimer_iface.lpVtbl = &timer_vtbl; + This->ref = 1; + + hr = IUIAnimationTimer_QueryInterface( &This->IUIAnimationTimer_iface, iid, obj ); + + IUIAnimationTimer_Release( &This->IUIAnimationTimer_iface ); + return hr; +} + static struct class_factory manager_cf = { { &class_factory_vtbl }, manager_create }; +static struct class_factory timer_cf = { { &class_factory_vtbl }, timer_create }; /****************************************************************** * DllGetClassObject @@ -364,6 +502,8 @@ HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID iid, void **obj ) if (IsEqualCLSID( clsid, &CLSID_UIAnimationManager )) cf = &manager_cf.IClassFactory_iface; + else if (IsEqualCLSID( clsid, &CLSID_UIAnimationTimer )) + cf = &timer_cf.IClassFactory_iface; if (!cf) return CLASS_E_CLASSNOTAVAILABLE;

1 0

Alistair Leslie-Hughes : uianimation/tests: Add IUIAnimationTimer test.
by Alexandre Julliard 29 Oct '19

29 Oct '19

Module: wine Branch: master Commit: ecb59b0b8ce4fa219065f940b75ffae0306ef1d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecb59b0b8ce4fa219065f940… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 29 00:29:00 2019 +0000 uianimation/tests: Add IUIAnimationTimer test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uianimation/tests/uianimation.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dlls/uianimation/tests/uianimation.c b/dlls/uianimation/tests/uianimation.c index 0cb2fbf2b8..5c85e8f4dc 100644 --- a/dlls/uianimation/tests/uianimation.c +++ b/dlls/uianimation/tests/uianimation.c @@ -47,6 +47,42 @@ static void test_UIAnimationManager(void) IUIAnimationManager_Release(manager); } +static void test_IUIAnimationTimer(void) +{ + HRESULT hr; + IUIAnimationTimer *timer; + + hr = CoCreateInstance( &CLSID_UIAnimationTimer, NULL, CLSCTX_ALL, &IID_IUIAnimationTimer, (void**)&timer); + if(FAILED(hr)) + { + win_skip("IUIAnimationTimer not found\n"); + return; + } + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Enable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_Disable(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + hr = IUIAnimationTimer_IsEnabled(timer); + todo_wine ok(hr == S_FALSE, "got 0x%08x\n", hr); + + IUIAnimationTimer_Release(timer); +} + START_TEST(uianimation) { HRESULT hr; @@ -57,6 +93,7 @@ START_TEST(uianimation) return; test_UIAnimationManager(); + test_IUIAnimationTimer(); CoUninitialize(); }

1 0

Jacek Caban : vbscript: Support calling VARIANT in interpreter.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 1ff55510d8fb112d735864db942e79a2d2ae0a57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ff55510d8fb112d735864db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:36 2019 +0100 vbscript: Support calling VARIANT in interpreter. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 45f15933e6..11a2a77d82 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -653,14 +653,33 @@ static HRESULT interp_icallv(exec_ctx_t *ctx) static HRESULT interp_vcall(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg_cnt = ctx->instr->arg1.uint; + VARIANT res, *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = variant_call(ctx, v, arg_cnt, &res); + VariantClear(v); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &res); } static HRESULT interp_vcallv(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const unsigned arg_cnt = ctx->instr->arg1.uint; + VARIANT *v; + HRESULT hres; + + TRACE("\n"); + + v = stack_pop(ctx); + hres = variant_call(ctx, v, arg_cnt, NULL); + VariantClear(v); + return hres; } static HRESULT do_mcall(exec_ctx_t *ctx, VARIANT *res)

1 0

Jacek Caban : vbscript/tests: Add more call tests.
by Alexandre Julliard 28 Oct '19

28 Oct '19

Module: wine Branch: master Commit: 273a3a586915e6de6e2fcd64bec1751fdde92e8c URL: https://source.winehq.org/git/wine.git/?a=commit;h=273a3a586915e6de6e2fcd64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:47 2019 +0100 vbscript/tests: Add more call tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 76 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/tests/run.c | 5 ++- 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ef31004cc4..334de7aa0e 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1246,6 +1246,59 @@ next x=1 Call ok(forarr(x) = 2, "forarr(x) = " & forarr(x)) +sub accessArr() + ok arr(1) = 1, "arr(1) = " & arr(1) + arr(1) = 2 +end sub +arr(1) = 1 +call accessArr +ok arr(1) = 2, "arr(1) = " & arr(1) + +sub accessArr2(x,y) + ok arr2(x,y) = 1, "arr2(x,y) = " & arr2(x,y) + x = arr2(x,y) + arr2(x,y) = 2 +end sub +arr2(1,2) = 1 +call accessArr2(1, 2) +ok arr2(1,2) = 2, "arr2(1,2) = " & arr2(1,2) + +x = Array(Array(3)) +call ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) + +function seta0(arr) + arr(0) = 2 + seta0 = 1 +end function + +x = Array(1) +seta0 x +ok x(0) = 2, "x(0) = " & x(0) + +x = Array(1) +seta0 (x) +todo_wine_ok x(0) = 1, "x(0) = " & x(0) + +x = Array(Array(3)) +seta0 x(0) +call ok(x(0)(0) = 2, "x(0)(0) = " & x(0)(0)) + +x = Array(Array(3)) +seta0 (x(0)) +call todo_wine_ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) + +sub changearg(x) + x = 2 +end sub + +x = Array(1) +changearg x(0) +ok x(0) = 2, "x(0) = " & x(0) + +x = Array(1) +changearg (x(0)) +todo_wine_ok x(0) = 1, "x(0) = " & x(0) + Class ArrClass Dim classarr(3) Dim classnoarr() @@ -1478,4 +1531,27 @@ Class EndTestClassWithProperty Public default Property Get defprop defprop = x End Property End Class +class TestPropSyntax + public prop + + function getProp() + set getProp = prop + end function + + public default property get def() + def = "" + end property +end class + +set x = new TestPropSyntax +set x.prop = new TestPropSyntax +set x.prop.prop = new TestPropSyntax +x.prop.prop.prop = 2 +call ok(x.getProp().getProp.prop = 2, "x.getProp().getProp.prop = " & x.getProp().getProp.prop) +x.getprop.getprop().prop = 3 +call ok(x.getProp.prop.prop = 3, "x.getProp.prop.prop = " & x.getProp.prop.prop) + +ok getVT(x) = "VT_DISPATCH*", "getVT(x) = " & getVT(x) +todo_wine_ok getVT(x()) = "VT_BSTR", "getVT(x()) = " & getVT(x()) + reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 2d34a8c80f..2c0ccdd25b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2467,7 +2467,10 @@ static void test_parse_errors(void) "Call ok(x, \"wrong case\")\n", /* Class...End Class (empty) */ - "Class C End Class" + "Class C End Class", + + /* invalid use of parentheses for call statement */ + "strcomp(\"x\", \"y\")" }; HRESULT hres; UINT i;

1 0