wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Rémi Bernon : user32/tests: Flush remaining events before starting a new sequence.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 766ee1692e93f94d0ab6320b3450e8cdeca41ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=766ee1692e93f94d0ab6320b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:52 2019 +0100 user32/tests: Flush remaining events before starting a new sequence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3f11995e33..193a20fd95 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14375,6 +14375,7 @@ static void test_dbcs_wm_char(void) WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); ok (hwnd != 0, "Failed to create overlapped window\n"); ok (hwnd2 != 0, "Failed to create overlapped window\n"); + flush_events(); flush_sequence(); memset( wmCharSeq, 0, sizeof(wmCharSeq) );

1 0

Rémi Bernon : user32/tests: Add optional flags for alternative sequence on w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: ad5ca21de664d384f18f84d861c824e3a6ecc0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad5ca21de664d384f18f84d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:51 2019 +0100 user32/tests: Add optional flags for alternative sequence on w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6d8add4e0e..3f11995e33 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9054,11 +9054,13 @@ static const struct message WmShiftMouseButton[] = { { WM_MOUSEMOVE, sent|wparam|optional, 0, 0 }, { WM_LBUTTONDOWN, wparam, MK_LBUTTON|MK_SHIFT, 0 }, { WM_LBUTTONDOWN, sent|wparam, MK_LBUTTON|MK_SHIFT, 0 }, - { WM_LBUTTONUP, wparam, MK_SHIFT, 0 }, - { WM_LBUTTONUP, sent|wparam, MK_SHIFT, 0 }, + { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* < w1064v1809 */ + { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* < w1064v1809 */ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 }, { WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 }, + { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ { 0 } }; static const struct message WmF1Seq[] = {

1 0

Rémi Bernon : user32/tests: Skip tests expecting ascii VK wparam on non-us keyboards.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: e83486062d7f0de23aa2c24ae1583c1a070a3746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83486062d7f0de23aa2c24a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:50 2019 +0100 user32/tests: Skip tests expecting ascii VK wparam on non-us keyboards. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 43c1859e04..6d8add4e0e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9179,6 +9179,7 @@ static void test_accelerators(void) HACCEL hAccel; HWND hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); BOOL ret; assert(hwnd != 0); @@ -9201,6 +9202,12 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); flush_sequence(); + if (!us_kbd) + { + skip("skipping ascii VK events on non-us keyboard\n"); + goto done; + } + trace("testing VK_N press/release\n"); flush_sequence(); keybd_event('N', 0, 0, 0); @@ -15247,6 +15254,7 @@ static void test_menu_messages(void) HMENU hmenu, hmenu_popup; HWND hwnd; DWORD style; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); if (!pGetMenuInfo || !pSetMenuInfo) { @@ -15293,6 +15301,12 @@ static void test_menu_messages(void) style = get_menu_style(hmenu_popup); ok(style == 0, "expected 0, got %u\n", style); + if (!us_kbd) + { + skip("skipping ascii VK events on non-us keyboard\n"); + goto done; + } + /* Alt+E, Enter */ trace("testing a popup menu command\n"); flush_sequence();

1 0

Rémi Bernon : user32/tests: Update SetActiveWindow(0) test result for w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 32b3e502d9752498f54108913346344cf93223e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b3e502d9752498f5410891… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:49 2019 +0100 user32/tests: Update SetActiveWindow(0) test result for w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 08a106ee19..43c1859e04 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14218,8 +14218,8 @@ static void test_SetActiveWindow(void) trace("SetActiveWindow(0)\n"); ret = SetActiveWindow(0); - ok( ret == popup, "Failed to SetActiveWindow(0)\n"); - ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", FALSE); + ok( ret == popup || broken(ret == 0) /* w1064v1809 */, "Failed to SetActiveWindow(0), ret:%p\n", ret); + if (ret == popup) ok_sequence(SetActiveWindowSeq0, "SetActiveWindow(0)", FALSE); flush_sequence(); trace("SetActiveWindow(hwnd), hwnd visible\n");

1 0

Rémi Bernon : user32/tests: Add some wparam mask to message sequences for w1064v1809.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 37fe4b0bab2ba567c0170be201ece50bde67d6fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=37fe4b0bab2ba567c0170be2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 20:44:48 2019 +0100 user32/tests: Add some wparam mask to message sequences for w1064v1809. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 477661ab62..08a106ee19 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -780,7 +780,7 @@ static const struct message WmCreateInvisibleMaxPopupSeq[] = { static const struct message WmShowMaxPopupResizedSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_ACTIVATE, hook }, @@ -812,7 +812,7 @@ static const struct message WmShowMaxPopupResizedSeq[] = { static const struct message WmShowMaxPopupSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_NCCALCSIZE, sent|wparam, TRUE }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, { HCBT_ACTIVATE, hook }, @@ -836,7 +836,7 @@ static const struct message WmShowMaxPopupSeq[] = { { WM_ERASEBKGND, sent|optional }, { WM_NCPAINT, sent|wparam|defwinproc|optional, 1 }, { WM_ERASEBKGND, sent|defwinproc|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOMOVE|SWP_NOSIZE, 0, SWP_STATECHANGED /* w1064v1809 */ }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, { WM_SIZE, sent|defwinproc|optional }, { 0 } @@ -3476,7 +3476,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq[] = { static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { HCBT_MINMAX, hook|lparam, 0, SW_MAXIMIZE }, { WM_GETMINMAXINFO, sent }, - { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED }, + { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED, 0, SWP_STATECHANGED /* w1064v1809 */ }, { WM_GETMINMAXINFO, sent|defwinproc }, { WM_NCCALCSIZE, sent|wparam, 1 }, { EVENT_OBJECT_SHOW, winevent_hook|wparam|lparam, 0, 0 }, @@ -3495,7 +3495,7 @@ static const struct message WmMaximizeMDIchildInvisibleSeq2[] = { { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|defwinproc|optional }, { WM_MDIACTIVATE, sent|defwinproc|optional }, - { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, + { WM_WINDOWPOSCHANGED, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE, 0, SWP_STATECHANGED /* w1064v1809 */ }, { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, /* MDI child */ { WM_SIZE, sent|defwinproc|optional }, { 0 }

1 0

Gabriel Ivăncescu : vbscript: Get rid of ident_map.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: f2058389add08357910e736aab256d15cebb17e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2058389add08357910e736a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:35:16 2019 +0100 vbscript: Get rid of ident_map. 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/vbscript/vbdisp.c | 116 ++++++++++++----------------------------------- dlls/vbscript/vbscript.h | 6 --- 2 files changed, 28 insertions(+), 94 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 00e975e40b..12626e0275 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -24,6 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +#define DISPID_FUNCTION_MASK 0x20000000 #define FDEX_VERSION_MASK 0xf0000000 static inline BOOL is_func_id(vbdisp_t *This, DISPID id) @@ -526,49 +527,6 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } -struct _ident_map_t { - const WCHAR *name; - BOOL is_var; - union { - dynamic_var_t *var; - function_t *func; - } u; -}; - -static inline DISPID ident_to_id(ScriptDisp *This, ident_map_t *ident) -{ - return (ident-This->ident_map)+1; -} - -static inline ident_map_t *id_to_ident(ScriptDisp *This, DISPID id) -{ - return 0 < id && id <= This->ident_map_cnt ? This->ident_map+id-1 : NULL; -} - -static ident_map_t *add_ident(ScriptDisp *This, const WCHAR *name) -{ - ident_map_t *ret; - - if(!This->ident_map_size) { - This->ident_map = heap_alloc(4 * sizeof(*This->ident_map)); - if(!This->ident_map) - return NULL; - This->ident_map_size = 4; - }else if(This->ident_map_cnt == This->ident_map_size) { - ident_map_t *new_map; - - new_map = heap_realloc(This->ident_map, 2*This->ident_map_size*sizeof(*new_map)); - if(!new_map) - return NULL; - This->ident_map = new_map; - This->ident_map_size *= 2; - } - - ret = This->ident_map + This->ident_map_cnt++; - ret->name = name; - return ret; -} - static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -616,7 +574,6 @@ static ULONG WINAPI ScriptDisp_Release(IDispatchEx *iface) if(!ref) { assert(!This->ctx); - heap_free(This->ident_map); heap_free(This); } @@ -675,7 +632,6 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - ident_map_t *ident; unsigned i; TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); @@ -683,37 +639,16 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW if(!This->ctx) return E_UNEXPECTED; - for(ident = This->ident_map; ident < This->ident_map+This->ident_map_cnt; ident++) { - if(!wcsicmp(ident->name, bstrName)) { - *pid = ident_to_id(This, ident); - return S_OK; - } - } - for(i = 0; i < This->ctx->global_vars_cnt; i++) { - dynamic_var_t *var = This->ctx->global_vars[i]; - if(!wcsicmp(var->name, bstrName)) { - ident = add_ident(This, var->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = TRUE; - ident->u.var = var; - *pid = ident_to_id(This, ident); + if(!wcsicmp(This->ctx->global_vars[i]->name, bstrName)) { + *pid = i + 1; return S_OK; } } for(i = 0; i < This->ctx->global_funcs_cnt; i++) { - function_t *func = This->ctx->global_funcs[i]; - if(!wcsicmp(func->name, bstrName)) { - ident = add_ident(This, func->name); - if(!ident) - return E_OUTOFMEMORY; - - ident->is_var = FALSE; - ident->u.func = func; - *pid = ident_to_id(This, ident); + if(!wcsicmp(This->ctx->global_funcs[i]->name, bstrName)) { + *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } } @@ -726,35 +661,40 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - ident_map_t *ident; HRESULT hres; TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); - ident = id_to_ident(This, id); - if(!ident) - return DISP_E_MEMBERNOTFOUND; + if (id & DISPID_FUNCTION_MASK) + { + id &= ~DISPID_FUNCTION_MASK; + if (id > This->ctx->global_funcs_cnt) + return DISP_E_MEMBERNOTFOUND; - if(ident->is_var) { - if(ident->u.var->is_const) { - FIXME("const not supported\n"); - return E_NOTIMPL; + switch (wFlags) + { + case DISPATCH_METHOD: + case DISPATCH_METHOD | DISPATCH_PROPERTYGET: + hres = exec_script(This->ctx, TRUE, This->ctx->global_funcs[id - 1], NULL, pdp, pvarRes); + break; + default: + FIXME("Unsupported flags %x\n", wFlags); + hres = E_NOTIMPL; } - return invoke_variant_prop(This->ctx, &ident->u.var->v, wFlags, pdp, pvarRes); + return hres; } - switch(wFlags) { - case DISPATCH_METHOD: - case DISPATCH_METHOD|DISPATCH_PROPERTYGET: - hres = exec_script(This->ctx, TRUE, ident->u.func, NULL, pdp, pvarRes); - break; - default: - FIXME("Unsupported flags %x\n", wFlags); - hres = E_NOTIMPL; + if (id > This->ctx->global_vars_cnt) + return DISP_E_MEMBERNOTFOUND; + + if (This->ctx->global_vars[id - 1]->is_const) + { + FIXME("const not supported\n"); + return E_NOTIMPL; } - return hres; + return invoke_variant_prop(This->ctx, &This->ctx->global_vars[id - 1]->v, wFlags, pdp, pvarRes); } static HRESULT WINAPI ScriptDisp_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index a2e87790ba..9f14e147ba 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -120,16 +120,10 @@ struct _vbdisp_t { VARIANT props[1]; }; -typedef struct _ident_map_t ident_map_t; - typedef struct { IDispatchEx IDispatchEx_iface; LONG ref; - ident_map_t *ident_map; - unsigned ident_map_cnt; - unsigned ident_map_size; - script_ctx_t *ctx; } ScriptDisp;

1 0

Gabriel Ivăncescu : vbscript: Store global variables in an array.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 4699d366565f7a27ac5606c7a1a318e24242ec73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4699d366565f7a27ac5606c7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:35:04 2019 +0100 vbscript: Store global variables in an array. 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/vbscript/compile.c | 30 ++++++++++++++++++++---------- dlls/vbscript/interp.c | 45 ++++++++++++++++++++++++++++++++++++--------- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript.c | 9 +++++++-- dlls/vbscript/vbscript.h | 5 ++++- 5 files changed, 69 insertions(+), 24 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 4ccb164c4a..7b6649ec56 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1787,11 +1787,10 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) static BOOL lookup_script_identifier(script_ctx_t *script, const WCHAR *identifier) { class_desc_t *class; - dynamic_var_t *var; unsigned i; - for(var = script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, identifier)) + for(i = 0; i < script->global_vars_cnt; i++) { + if(!wcsicmp(script->global_vars[i]->name, identifier)) return TRUE; } @@ -1895,6 +1894,7 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli function_t *new_func, *func_iter; function_decl_t *func_decl; class_decl_t *class_decl; + dynamic_var_t *var_iter; compile_ctx_t ctx; vbscode_t *code; size_t cnt; @@ -1952,13 +1952,19 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli return compile_error(script, hres); } - if(ctx.global_vars) { - dynamic_var_t *var; - - for(var = ctx.global_vars; var->next; var = var->next); - - var->next = script->global_vars; - script->global_vars = ctx.global_vars; + cnt = script->global_vars_cnt; + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + cnt++; + if(cnt > script->global_vars_size) { + dynamic_var_t **new_vars; + if(script->global_vars) + new_vars = heap_realloc(script->global_vars, cnt * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * sizeof(*new_vars)); + if(!new_vars) + return compile_error(script, E_OUTOFMEMORY); + script->global_vars = new_vars; + script->global_vars_size = cnt; } cnt = script->global_funcs_cnt; @@ -1975,6 +1981,10 @@ HRESULT compile_script(script_ctx_t *script, const WCHAR *src, const WCHAR *deli script->global_funcs = new_funcs; script->global_funcs_size = cnt; } + + for(var_iter = ctx.global_vars; var_iter; var_iter = var_iter->next) + script->global_vars[script->global_vars_cnt++] = var_iter; + for(func_iter = ctx.funcs; func_iter; func_iter = func_iter->next) { unsigned i; for(i = 0; i < script->global_funcs_cnt; i++) { diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e4f982a025..3dfcf1e7f7 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -94,6 +94,22 @@ static BOOL lookup_dynamic_vars(dynamic_var_t *var, const WCHAR *name, ref_t *re return FALSE; } +static BOOL lookup_global_vars(script_ctx_t *script, const WCHAR *name, ref_t *ref) +{ + dynamic_var_t **vars = script->global_vars; + size_t i, cnt = script->global_vars_cnt; + + for(i = 0; i < cnt; i++) { + if(!wcsicmp(vars[i]->name, name)) { + ref->type = vars[i]->is_const ? REF_CONST : REF_VAR; + ref->u.v = &vars[i]->v; + return TRUE; + } + } + + return FALSE; +} + static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref) { named_item_t *item; @@ -159,7 +175,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_global_vars(ctx->script, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) { @@ -227,8 +243,19 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { - new_var->next = ctx->script->global_vars; - ctx->script->global_vars = new_var; + size_t cnt = ctx->script->global_vars_cnt + 1; + if(cnt > ctx->script->global_vars_size) { + dynamic_var_t **new_vars; + if(ctx->script->global_vars) + new_vars = heap_realloc(ctx->script->global_vars, cnt * 2 * sizeof(*new_vars)); + else + new_vars = heap_alloc(cnt * 2 * sizeof(*new_vars)); + if(!new_vars) + return E_OUTOFMEMORY; + ctx->script->global_vars = new_vars; + ctx->script->global_vars_size = cnt * 2; + } + ctx->script->global_vars[ctx->script->global_vars_cnt++] = new_var; }else { new_var->next = ctx->dynamic_vars; ctx->dynamic_vars = new_var; @@ -1118,14 +1145,14 @@ static HRESULT interp_dim(exec_ctx_t *ctx) assert(array_id < ctx->func->array_cnt); if(ctx->func->type == FUNC_GLOBAL) { - dynamic_var_t *var; - for(var = ctx->script->global_vars; var; var = var->next) { - if(!wcsicmp(var->name, ident)) + unsigned i; + for(i = 0; i < ctx->script->global_vars_cnt; i++) { + if(!wcsicmp(ctx->script->global_vars[i]->name, ident)) break; } - assert(var != NULL); - v = &var->v; - array_ref = &var->array; + assert(i < ctx->script->global_vars_cnt); + v = &ctx->script->global_vars[i]->v; + array_ref = &ctx->script->global_vars[i]->array; }else { ref_t ref; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index a5ae40d098..00e975e40b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -675,7 +675,6 @@ static HRESULT WINAPI ScriptDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); - dynamic_var_t *var; ident_map_t *ident; unsigned i; @@ -691,7 +690,8 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW } } - for(var = This->ctx->global_vars; var; var = var->next) { + for(i = 0; i < This->ctx->global_vars_cnt; i++) { + dynamic_var_t *var = This->ctx->global_vars[i]; if(!wcsicmp(var->name, bstrName)) { ident = add_ident(This, var->name); if(!ident) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 886c9d01af..6d2bb54e52 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -131,14 +131,19 @@ IDispatch *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned flag static void release_script(script_ctx_t *ctx) { class_desc_t *class_desc; + unsigned i; collect_objects(ctx); clear_ei(&ctx->ei); - release_dynamic_vars(ctx->global_vars); - ctx->global_vars = NULL; + for(i = 0; i < ctx->global_vars_cnt; i++) + VariantClear(&ctx->global_vars[i]->v); + heap_free(ctx->global_vars); heap_free(ctx->global_funcs); + ctx->global_vars = NULL; + ctx->global_vars_cnt = 0; + ctx->global_vars_size = 0; ctx->global_funcs = NULL; ctx->global_funcs_cnt = 0; ctx->global_funcs_size = 0; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ac5242d94f..a2e87790ba 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -188,11 +188,14 @@ struct _script_ctx_t { EXCEPINFO ei; + dynamic_var_t **global_vars; + size_t global_vars_cnt; + size_t global_vars_size; + function_t **global_funcs; size_t global_funcs_cnt; size_t global_funcs_size; - dynamic_var_t *global_vars; class_desc_t *classes; class_desc_t *procs;

1 0

Jacek Caban : vbscript: Store global static arrays together with global variables.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 3dea7bd7fc5114ae0d6b6bcaaa503cffcdb92eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dea7bd7fc5114ae0d6b6bca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 6 17:33:26 2019 +0100 vbscript: Store global static arrays together with global variables. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/compile.c | 1 + dlls/vbscript/interp.c | 59 ++++++++++++++++++++++++++++++++---------------- dlls/vbscript/vbscript.h | 1 + 3 files changed, 42 insertions(+), 19 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index e52b0814e0..4ccb164c4a 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1496,6 +1496,7 @@ static HRESULT compile_func(compile_ctx_t *ctx, statement_t *stat, function_t *f V_VT(&new_var->v) = VT_EMPTY; new_var->is_const = FALSE; + new_var->array = NULL; new_var->next = ctx->global_vars; ctx->global_vars = new_var; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 89f9d359da..e4f982a025 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -223,6 +223,7 @@ static HRESULT add_dynamic_var(exec_ctx_t *ctx, const WCHAR *name, memcpy(str, name, size); new_var->name = str; new_var->is_const = is_const; + new_var->array = NULL; V_VT(&new_var->v) = VT_EMPTY; if(ctx->func->type == FUNC_GLOBAL) { @@ -1108,43 +1109,61 @@ static HRESULT interp_dim(exec_ctx_t *ctx) const BSTR ident = ctx->instr->arg1.bstr; const unsigned array_id = ctx->instr->arg2.uint; const array_desc_t *array_desc; - ref_t ref; + SAFEARRAY **array_ref; + VARIANT *v; HRESULT hres; TRACE("%s\n", debugstr_w(ident)); assert(array_id < ctx->func->array_cnt); - if(!ctx->arrays) { - ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); - if(!ctx->arrays) - return E_OUTOFMEMORY; - } - hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); - if(FAILED(hres)) { - FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); - return hres; - } + if(ctx->func->type == FUNC_GLOBAL) { + dynamic_var_t *var; + for(var = ctx->script->global_vars; var; var = var->next) { + if(!wcsicmp(var->name, ident)) + break; + } + assert(var != NULL); + v = &var->v; + array_ref = &var->array; + }else { + ref_t ref; - if(ref.type != REF_VAR) { - FIXME("got ref.type = %d\n", ref.type); - return E_FAIL; + if(!ctx->arrays) { + ctx->arrays = heap_alloc_zero(ctx->func->array_cnt * sizeof(SAFEARRAY*)); + if(!ctx->arrays) + return E_OUTOFMEMORY; + } + + hres = lookup_identifier(ctx, ident, VBDISP_LET, &ref); + if(FAILED(hres)) { + FIXME("lookup %s failed: %08x\n", debugstr_w(ident), hres); + return hres; + } + + if(ref.type != REF_VAR) { + FIXME("got ref.type = %d\n", ref.type); + return E_FAIL; + } + + v = ref.u.v; + array_ref = ctx->arrays + array_id; } - if(ctx->arrays[array_id]) { + if(*array_ref) { FIXME("Array already initialized\n"); return E_FAIL; } array_desc = ctx->func->array_descs + array_id; if(array_desc->dim_cnt) { - ctx->arrays[array_id] = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); - if(!ctx->arrays[array_id]) + *array_ref = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); + if(!*array_ref) return E_OUTOFMEMORY; } - V_VT(ref.u.v) = VT_ARRAY|VT_BYREF|VT_VARIANT; - V_ARRAYREF(ref.u.v) = ctx->arrays+array_id; + V_VT(v) = VT_ARRAY|VT_BYREF|VT_VARIANT; + V_ARRAYREF(v) = array_ref; return S_OK; } @@ -2201,6 +2220,8 @@ void release_dynamic_vars(dynamic_var_t *var) { while(var) { VariantClear(&var->v); + if(var->array) + SafeArrayDestroy(var->array); var = var->next; } } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 0bd1fce156..ac5242d94f 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -169,6 +169,7 @@ typedef struct _dynamic_var_t { VARIANT v; const WCHAR *name; BOOL is_const; + SAFEARRAY *array; } dynamic_var_t; struct _script_ctx_t {

1 0

Gabriel Ivăncescu : jscript: Also clear the thread_id if the script state is set to Closed.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: d8e8d1639f5b08fc7f45336692719976cd784add URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8e8d1639f5b08fc7f453366… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:28:00 2019 +0200 jscript: Also clear the thread_id if the script state is set to Closed. 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/jscript.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 75eef39e35..2a7c028454 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -231,7 +231,7 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) FIXME("NULL ctx\n"); } - if(state == SCRIPTSTATE_UNINITIALIZED) + if(state == SCRIPTSTATE_UNINITIALIZED || state == SCRIPTSTATE_CLOSED) This->thread_id = 0; if(This->site) {

1 0

Gabriel Ivăncescu : jscript: Set the DISPID to DISPID_UNKNOWN if unknown.
by Alexandre Julliard 06 Nov '19

06 Nov '19

Module: wine Branch: master Commit: 15fce35b599998193e1890eb7cf0048e6434f09e URL: https://source.winehq.org/git/wine.git/?a=commit;h=15fce35b599998193e1890eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Nov 6 17:27:59 2019 +0200 jscript: Set the DISPID to DISPID_UNKNOWN if unknown. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index da23d18aa2..3c2733086b 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1083,6 +1083,7 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * } TRACE("not found %s\n", debugstr_w(name)); + *id = DISPID_UNKNOWN; return DISP_E_UNKNOWNNAME; }

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019