From: Francis De Brabandere <francisdb@gmail.com> --- dlls/vbscript/compile.c | 30 +++++++++++++++--------------- dlls/vbscript/global.c | 26 +++++++++++++------------- dlls/vbscript/vbdisp.c | 18 +++++++++--------- dlls/vbscript/vbscript.c | 6 +++--- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 3777624c6d4..c6132587984 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -417,7 +417,7 @@ static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, B const_decl_t *decl; for(decl = ctx->const_decls; decl; decl = decl->next) { - if(!wcsicmp(decl->name, name)) + if(!vbs_wcsicmp(decl->name, name)) return decl->value_expr; } @@ -425,7 +425,7 @@ static expression_t *lookup_const_decls(compile_ctx_t *ctx, const WCHAR *name, B return NULL; for(decl = ctx->global_consts; decl; decl = decl->next) { - if(!wcsicmp(decl->name, name)) + if(!vbs_wcsicmp(decl->name, name)) return decl->value_expr; } @@ -437,7 +437,7 @@ static BOOL lookup_args_name(compile_ctx_t *ctx, const WCHAR *name) unsigned i; for(i = 0; i < ctx->func->arg_cnt; i++) { - if(!wcsicmp(ctx->func->args[i].name, name)) + if(!vbs_wcsicmp(ctx->func->args[i].name, name)) return TRUE; } @@ -449,7 +449,7 @@ static BOOL lookup_dim_decls(compile_ctx_t *ctx, const WCHAR *name) dim_decl_t *dim_decl; for(dim_decl = ctx->dim_decls; dim_decl; dim_decl = dim_decl->next) { - if(!wcsicmp(dim_decl->name, name)) + if(!vbs_wcsicmp(dim_decl->name, name)) return TRUE; } @@ -1722,7 +1722,7 @@ static BOOL lookup_funcs_name(compile_ctx_t *ctx, const WCHAR *name) function_t *iter; for(iter = ctx->code->funcs; iter; iter = iter->next) { - if(!wcsicmp(iter->name, name)) + if(!vbs_wcsicmp(iter->name, name)) return TRUE; } @@ -1788,7 +1788,7 @@ static BOOL lookup_class_name(compile_ctx_t *ctx, const WCHAR *name) class_desc_t *iter; for(iter = ctx->code->classes; iter; iter = iter->next) { - if(!wcsicmp(iter->name, name)) + if(!vbs_wcsicmp(iter->name, name)) return TRUE; } @@ -1839,7 +1839,7 @@ static BOOL lookup_class_funcs(class_desc_t *class_desc, const WCHAR *name) unsigned i; for(i=0; i < class_desc->func_cnt; i++) { - if(class_desc->funcs[i].name && !wcsicmp(class_desc->funcs[i].name, name)) + if(class_desc->funcs[i].name && !vbs_wcsicmp(class_desc->funcs[i].name, name)) return TRUE; } @@ -1899,14 +1899,14 @@ static HRESULT compile_class(compile_ctx_t *ctx, class_decl_t *class_decl) } } - if(!wcsicmp(L"class_initialize", func_decl->name)) { + if(!vbs_wcsicmp(L"class_initialize", func_decl->name)) { if(func_decl->type != FUNC_SUB) { FIXME("class initializer is not sub\n"); return E_FAIL; } class_desc->class_initialize_id = i; - }else if(!wcsicmp(L"class_terminate", func_decl->name)) { + }else if(!vbs_wcsicmp(L"class_terminate", func_decl->name)) { if(func_decl->type != FUNC_SUB) { FIXME("class terminator is not sub\n"); return E_FAIL; @@ -1976,17 +1976,17 @@ static BOOL lookup_script_identifier(compile_ctx_t *ctx, script_ctx_t *script, c if(!contexts[c]) continue; for(i = 0; i < contexts[c]->global_vars_cnt; i++) { - if(!wcsicmp(contexts[c]->global_vars[i]->name, identifier)) + if(!vbs_wcsicmp(contexts[c]->global_vars[i]->name, identifier)) return TRUE; } for(i = 0; i < contexts[c]->global_funcs_cnt; i++) { - if(!wcsicmp(contexts[c]->global_funcs[i]->name, identifier)) + if(!vbs_wcsicmp(contexts[c]->global_funcs[i]->name, identifier)) return TRUE; } for(class = contexts[c]->classes; class; class = class->next) { - if(!wcsicmp(class->name, identifier)) + if(!vbs_wcsicmp(class->name, identifier)) return TRUE; } } @@ -2000,17 +2000,17 @@ static BOOL lookup_script_identifier(compile_ctx_t *ctx, script_ctx_t *script, c continue; for(i = 0; i < var_cnt; i++) { - if(!wcsicmp(vars[i].name, identifier)) + if(!vbs_wcsicmp(vars[i].name, identifier)) return TRUE; } for(func = code->funcs; func; func = func->next) { - if(!wcsicmp(func->name, identifier)) + if(!vbs_wcsicmp(func->name, identifier)) return TRUE; } for(class = code->classes; class; class = class->next) { - if(!wcsicmp(class->name, identifier)) + if(!vbs_wcsicmp(class->name, identifier)) return TRUE; } } diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index b6a32fdacdb..3578625d154 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -126,7 +126,7 @@ HRESULT get_builtin_id(BuiltinDisp *disp, const WCHAR *name, DISPID *id) while(min <= max) { i = (min + max) / 2; - r = wcsicmp(disp->members[i].name, name); + r = vbs_wcsicmp(disp->members[i].name, name); if(!r) { *id = i; return S_OK; @@ -2465,25 +2465,25 @@ static HRESULT Global_DateAdd(BuiltinDisp *This, VARIANT *args, unsigned args_cn hres = to_system_time(args + 2, &ud.st); if (SUCCEEDED(hres)) { - if (!wcsicmp(interval, L"yyyy")) + if (!vbs_wcsicmp(interval, L"yyyy")) ud.st.wYear += count; - else if (!wcsicmp(interval, L"q")) + else if (!vbs_wcsicmp(interval, L"q")) ud.st.wMonth += 3 * count; - else if (!wcsicmp(interval, L"m")) + else if (!vbs_wcsicmp(interval, L"m")) ud.st.wMonth += count; - else if (!wcsicmp(interval, L"y") - || !wcsicmp(interval, L"d") - || !wcsicmp(interval, L"w")) + else if (!vbs_wcsicmp(interval, L"y") + || !vbs_wcsicmp(interval, L"d") + || !vbs_wcsicmp(interval, L"w")) { ud.st.wDay += count; } - else if (!wcsicmp(interval, L"ww")) + else if (!vbs_wcsicmp(interval, L"ww")) ud.st.wDay += 7 * count; - else if (!wcsicmp(interval, L"h")) + else if (!vbs_wcsicmp(interval, L"h")) ud.st.wHour += count; - else if (!wcsicmp(interval, L"n")) + else if (!vbs_wcsicmp(interval, L"n")) ud.st.wMinute += count; - else if (!wcsicmp(interval, L"s")) + else if (!vbs_wcsicmp(interval, L"s")) ud.st.wSecond += count; else { @@ -3629,7 +3629,7 @@ static HRESULT Global_GetRef(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, funcs = item->script_obj->global_funcs; cnt = item->script_obj->global_funcs_cnt; for(i = 0; i < cnt; i++) { - if(!wcsicmp(funcs[i]->name, name)) { + if(!vbs_wcsicmp(funcs[i]->name, name)) { hres = create_func_ref(This->ctx, funcs[i], &disp); if(FAILED(hres)) return hres; @@ -3644,7 +3644,7 @@ static HRESULT Global_GetRef(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, funcs = This->ctx->script_obj->global_funcs; cnt = This->ctx->script_obj->global_funcs_cnt; for(i = 0; i < cnt; i++) { - if(!wcsicmp(funcs[i]->name, name)) { + if(!vbs_wcsicmp(funcs[i]->name, name)) { hres = create_func_ref(This->ctx, funcs[i], &disp); if(FAILED(hres)) return hres; diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 66d1b84abf6..79b1a728a52 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -48,7 +48,7 @@ static BOOL get_func_id(vbdisp_t *This, const WCHAR *name, vbdisp_invoke_type_t continue; } - if(This->desc->funcs[i].name && !wcsicmp(This->desc->funcs[i].name, name)) { + if(This->desc->funcs[i].name && !vbs_wcsicmp(This->desc->funcs[i].name, name)) { *id = i; return TRUE; } @@ -68,7 +68,7 @@ HRESULT vbdisp_get_id(vbdisp_t *This, BSTR name, vbdisp_invoke_type_t invoke_typ if(!search_private && !This->desc->props[i].is_public) continue; - if(!wcsicmp(This->desc->props[i].name, name)) { + if(!vbs_wcsicmp(This->desc->props[i].name, name)) { *id = i + This->desc->func_cnt; return S_OK; } @@ -972,14 +972,14 @@ static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *r { function_t *func = This->funcs[i].func; - if (wcsicmp(name, func->name)) continue; + if (vbs_wcsicmp(name, func->name)) continue; pMemId[0] = This->funcs[i].memid; for (j = 1; j < cNames; j++) { name = rgszNames[j]; for (arg = func->arg_cnt; --arg >= 0;) - if (!wcsicmp(name, func->args[arg].name)) + if (!vbs_wcsicmp(name, func->args[arg].name)) break; if (arg >= 0) pMemId[j] = arg; @@ -991,7 +991,7 @@ static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *r for (i = 0; i < This->num_vars; i++) { - if (wcsicmp(name, This->disp->global_vars[i]->name)) continue; + if (vbs_wcsicmp(name, This->disp->global_vars[i]->name)) continue; pMemId[0] = i + 1; return S_OK; } @@ -1279,7 +1279,7 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO for (i = 0; i < This->num_funcs; i++) { - if (wcsicmp(szName, This->funcs[i].func->name)) continue; + if (vbs_wcsicmp(szName, This->funcs[i].func->name)) continue; if (!(flags & INVOKE_FUNC)) return TYPE_E_TYPEMISMATCH; hr = ITypeInfo_GetFuncDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpfuncdesc); @@ -1293,7 +1293,7 @@ static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULO for (i = 0; i < This->num_vars; i++) { - if (wcsicmp(szName, This->disp->global_vars[i]->name)) continue; + if (vbs_wcsicmp(szName, This->disp->global_vars[i]->name)) continue; if (!(flags & INVOKE_PROPERTYGET)) return TYPE_E_TYPEMISMATCH; hr = ITypeInfo_GetVarDesc(&This->ITypeInfo_iface, i, &pBindPtr->lpvardesc); @@ -1520,14 +1520,14 @@ static HRESULT WINAPI ScriptDisp_GetDispID(IDispatchEx *iface, BSTR bstrName, DW return E_UNEXPECTED; for(i = 0; i < This->global_vars_cnt; i++) { - if(!wcsicmp(This->global_vars[i]->name, bstrName)) { + if(!vbs_wcsicmp(This->global_vars[i]->name, bstrName)) { *pid = i + 1; return S_OK; } } for(i = 0; i < This->global_funcs_cnt; i++) { - if(!wcsicmp(This->global_funcs[i]->name, bstrName)) { + if(!vbs_wcsicmp(This->global_funcs[i]->name, bstrName)) { *pid = i + 1 + DISPID_FUNCTION_MASK; return S_OK; } diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 2e2fa6498da..6fff84e5359 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -145,7 +145,7 @@ HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res, BOOL for (j = 0; j < obj->global_vars_cnt; j++) { - if (!wcsicmp(obj->global_vars[j]->name, code->main_code.vars[i].name)) + if (!vbs_wcsicmp(obj->global_vars[j]->name, code->main_code.vars[i].name)) { found = TRUE; break; @@ -171,7 +171,7 @@ HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res, BOOL { for (i = 0; i < obj->global_funcs_cnt; i++) { - if (!wcsicmp(obj->global_funcs[i]->name, func_iter->name)) + if (!vbs_wcsicmp(obj->global_funcs[i]->name, func_iter->name)) { /* global function already exists, replace it */ obj->global_funcs[i] = func_iter; @@ -245,7 +245,7 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *name, unsigned f HRESULT hres; LIST_FOR_EACH_ENTRY(item, &ctx->named_items, named_item_t, entry) { - if((item->flags & flags) == flags && !wcsicmp(item->name, name)) { + if((item->flags & flags) == flags && !vbs_wcsicmp(item->name, name)) { if(!item->script_obj && !(item->flags & SCRIPTITEM_GLOBALMEMBERS)) { hres = create_script_disp(ctx, &item->script_obj); if(FAILED(hres)) return NULL; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10544