Gabriel Ivăncescu : vbscript: Use a helper function to lookup the global functions.
Alexandre Julliard
julliard at winehq.org
Thu Feb 13 15:36:32 CST 2020
Module: wine
Branch: master
Commit: 0b5ea35aaedacd2b6777d82a4e31dc8b3691ee2e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b5ea35aaedacd2b6777d82a4e31dc8b3691ee2e
Author: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Date: Thu Feb 13 19:49:57 2020 +0100
vbscript: Use a helper function to lookup the global functions.
Signed-off-by: Gabriel Ivăncescu <gabrielopcode at gmail.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/vbscript/interp.c | 27 ++++++++++++++++++---------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index b328674b60..f0820be7a0 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -110,6 +110,22 @@ static BOOL lookup_global_vars(ScriptDisp *script, const WCHAR *name, ref_t *ref
return FALSE;
}
+static BOOL lookup_global_funcs(ScriptDisp *script, const WCHAR *name, ref_t *ref)
+{
+ function_t **funcs = script->global_funcs;
+ size_t i, cnt = script->global_funcs_cnt;
+
+ for(i = 0; i < cnt; i++) {
+ if(!wcsicmp(funcs[i]->name, name)) {
+ ref->type = REF_FUNC;
+ ref->u.f = funcs[i];
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_t invoke_type, ref_t *ref)
{
ScriptDisp *script_obj = ctx->script->script_obj;
@@ -177,15 +193,8 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_
if(lookup_global_vars(script_obj, name, ref))
return S_OK;
-
- for(i = 0; i < script_obj->global_funcs_cnt; i++) {
- function_t *func = script_obj->global_funcs[i];
- if(!wcsicmp(func->name, name)) {
- ref->type = REF_FUNC;
- ref->u.f = func;
- return S_OK;
- }
- }
+ if(lookup_global_funcs(script_obj, name, ref))
+ return S_OK;
hres = get_builtin_id(ctx->script->global_obj, name, &id);
if(SUCCEEDED(hres)) {
More information about the wine-cvs
mailing list