October 2019 - Wine-Commits

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

Oct. 29, 2019

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 Oct. 29, 2019

Oct. 29, 2019

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

Alexandre Julliard : kernel32/tests: Enable the ExitProcess() test on ARM64.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: fea66c28847f51de9c56e228cc08ca150f8ffba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fea66c28847f51de9c56e228… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 17:42:14 2019 +0100 kernel32/tests: Enable the ExitProcess() test on ARM64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 912e8600dd..6f143f5efd 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -683,7 +683,9 @@ static NTSTATUS map_image_section( const IMAGE_NT_HEADERS *nt_header, const IMAG else ok( 0, "%u: got unexpected path %s instead of %s\n", line, wine_dbgstr_w(path), wine_dbgstr_w(load_test_name)); pLdrUnloadDll( ldr_mod ); } - else if (ldr_status == STATUS_DLL_INIT_FAILED || ldr_status == STATUS_ACCESS_VIOLATION) + else if (ldr_status == STATUS_DLL_INIT_FAILED || + ldr_status == STATUS_ACCESS_VIOLATION || + ldr_status == STATUS_ILLEGAL_INSTRUCTION) { /* some dlls with invalid entry point will crash, but this means we loaded the test dll */ ok( !expect_fallback, "%u: got test dll but expected fallback\n", line ); @@ -2953,6 +2955,7 @@ static void child_process(const char *dll_name, DWORD target_offset) static void test_ExitProcess(void) { +#if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) #include "pshpack1.h" #ifdef __x86_64__ static struct section_data @@ -2961,13 +2964,20 @@ static void test_ExitProcess(void) void *target; BYTE jmp_rax[2]; } section_data = { { 0x48,0xb8 }, dll_entry_point, { 0xff,0xe0 } }; -#else +#elif defined(__i386__) static struct section_data { BYTE mov_eax; void *target; BYTE jmp_eax[2]; } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; +#elif defined(__aarch64__) + static struct section_data + { + DWORD ldr; /* ldr x0,target */ + DWORD br; /* br x0 */ + void *target; + } section_data = { 0x58000040, 0xd61f0000, dll_entry_point }; #endif #include "poppack.h" DWORD dummy, file_align; @@ -2986,11 +2996,6 @@ static void test_ExitProcess(void) SIZE_T size; IMAGE_NT_HEADERS nt_header; -#if !defined(__i386__) && !defined(__x86_64__) - skip("x86 specific ExitProcess test\n"); - return; -#endif - if (!pRtlDllShutdownInProgress) { win_skip("RtlDllShutdownInProgress is not available on this platform (XP+)\n"); @@ -3440,6 +3445,9 @@ if (0) ret = DeleteFileA(dll_name); ok(ret, "DeleteFile error %d\n", GetLastError()); +#else + skip("x86 specific ExitProcess test\n"); +#endif } static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd)

1 0

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

Oct. 29, 2019

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

Alexandre Julliard : msvcrt/tests: Fix signed char issues.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

Module: wine Branch: master Commit: 43d24ffbe7b668a16e06f9d9a54b92b2473fff40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43d24ffbe7b668a16e06f9d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 29 17:41:41 2019 +0100 msvcrt/tests: Fix signed char issues. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 05d7a4f28b..8d28da1315 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -2810,13 +2810,13 @@ static void test_wctob(void) ok(ret == EOF, "ret = %x\n", ret); ret = p_wctob(0x81); - ok(ret == (int)(char)0x81, "ret = %x\n", ret); + ok(ret == (signed char)0x81, "ret = %x\n", ret); ret = p_wctob(0x9f); - ok(ret == (int)(char)0x9f, "ret = %x\n", ret); + ok(ret == (signed char)0x9f, "ret = %x\n", ret); ret = p_wctob(0xe0); - ok(ret == (int)(char)0xe0, "ret = %x\n", ret); + ok(ret == (signed char)0xe0, "ret = %x\n", ret); _setmbcp(cp); }

1 0

Zebediah Figura : wined3d: Introduce wined3d_stateblock_set_transform().
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

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

Louis Lenders : uianimation: Add IUIAnimationTimer stubbed interface.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

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 : dmband: Simplify DllGetClassObject.
by Alexandre Julliard Oct. 29, 2019

Oct. 29, 2019

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

Jacek Caban : vbscript: Ignore parentheses in call expression.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 216f7146ef55d394baece2d96019f16f5e573a93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=216f7146ef55d394baece2d9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:40:56 2019 +0100 vbscript: Ignore parentheses in call expression. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 3 ++- dlls/vbscript/tests/lang.vbs | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 0cbdae6e19..5acf4c005a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -460,7 +460,8 @@ static HRESULT compile_call_expression(compile_ctx_t *ctx, call_expression_t *ex if(FAILED(hres)) return hres; - call = expr->call_expr; + for(call = expr->call_expr; call->type == EXPR_BRACKETS; call = ((unary_expression_t*)call)->subexpr); + if(call->type == EXPR_MEMBER) return compile_member_expression(ctx, (member_expression_t*)call, arg_cnt, ret_val); diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 334de7aa0e..09c6b4f0ff 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1279,6 +1279,14 @@ x = Array(1) seta0 (x) todo_wine_ok x(0) = 1, "x(0) = " & x(0) +x = Array(1) +call (((seta0))) ((x)) +todo_wine_ok x(0) = 1, "x(0) = " & x(0) + +x = Array(1) +call (((seta0))) (x) +ok x(0) = 2, "x(0) = " & x(0) + x = Array(Array(3)) seta0 x(0) call ok(x(0)(0) = 2, "x(0)(0) = " & x(0)(0)) @@ -1287,6 +1295,12 @@ x = Array(Array(3)) seta0 (x(0)) call todo_wine_ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) +y = (seta0)(x) +ok y = 1, "y = " & y + +y = ((x))(0) +ok y = 2, "y = " & y + sub changearg(x) x = 2 end sub

1 0

Jacek Caban : vbscript: Always pass arguments inside parentheses by value.
by Alexandre Julliard Oct. 28, 2019

Oct. 28, 2019

Module: wine Branch: master Commit: 2d419b7d7b2ec95e867063bf479f33f9205215c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d419b7d7b2ec95e867063bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 28 18:41:05 2019 +0100 vbscript: Always pass arguments inside parentheses by value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 3 +++ dlls/vbscript/interp.c | 17 +++++++++++++++++ dlls/vbscript/tests/lang.vbs | 10 +++++----- dlls/vbscript/vbscript.h | 1 + 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 5acf4c005a..2023261399 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -417,6 +417,9 @@ static HRESULT compile_args(compile_ctx_t *ctx, expression_t *args, unsigned *re if(FAILED(hres)) return hres; + if(args->type == EXPR_BRACKETS && !push_instr(ctx, OP_deref)) + return E_OUTOFMEMORY; + arg_cnt++; args = args->next; } diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 11a2a77d82..60c4340d6e 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1028,6 +1028,23 @@ static HRESULT interp_pop(exec_ctx_t *ctx) return S_OK; } +static HRESULT interp_deref(exec_ctx_t *ctx) +{ + VARIANT copy, *v = stack_top(ctx, 0); + HRESULT hres; + + TRACE("%s\n", debugstr_variant(v)); + + if(V_VT(v) != (VT_BYREF|VT_VARIANT)) + return S_OK; + + V_VT(&copy) = VT_EMPTY; + hres = VariantCopy(&copy, V_VARIANTREF(v)); + if(SUCCEEDED(hres)) + *v = copy; + return hres; +} + static HRESULT interp_new(exec_ctx_t *ctx) { const WCHAR *arg = ctx->instr->arg1.bstr; diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 09c6b4f0ff..8027264bf5 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1277,11 +1277,11 @@ ok x(0) = 2, "x(0) = " & x(0) x = Array(1) seta0 (x) -todo_wine_ok x(0) = 1, "x(0) = " & x(0) +ok x(0) = 1, "x(0) = " & x(0) x = Array(1) call (((seta0))) ((x)) -todo_wine_ok x(0) = 1, "x(0) = " & x(0) +ok x(0) = 1, "x(0) = " & x(0) x = Array(1) call (((seta0))) (x) @@ -1293,7 +1293,7 @@ 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)) +call ok(x(0)(0) = 3, "x(0)(0) = " & x(0)(0)) y = (seta0)(x) ok y = 1, "y = " & y @@ -1311,7 +1311,7 @@ ok x(0) = 2, "x(0) = " & x(0) x = Array(1) changearg (x(0)) -todo_wine_ok x(0) = 1, "x(0) = " & x(0) +ok x(0) = 1, "x(0) = " & x(0) Class ArrClass Dim classarr(3) @@ -1377,7 +1377,7 @@ Call ok(arr(0) = "modified", "arr(0) = " & arr(0)) arr(0) = "not modified" modifyarr(arr) -Call todo_wine_ok(arr(0) = "not modified", "arr(0) = " & arr(0)) +Call ok(arr(0) = "not modified", "arr(0) = " & arr(0)) for x = 0 to UBound(arr) arr(x) = x diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0382a80290..33eb1e8305 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -224,6 +224,7 @@ typedef enum { X(case, 0, ARG_ADDR, 0) \ X(concat, 1, 0, 0) \ X(const, 1, ARG_BSTR, 0) \ + X(deref, 1, 0, 0) \ X(dim, 1, ARG_BSTR, ARG_UINT) \ X(div, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \

1 0