December 2019 - Wine-commits

Piotr Caban : msvcrt: Support mixing length and width in scanf format.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 7695433c0511e0cd3c035e17a1ec10d86f30dd40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7695433c0511e0cd3c035e17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 6 15:57:09 2019 +0100 msvcrt: Support mixing length and width in scanf format. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45967 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/scanf.h | 13 +++++++------ dlls/msvcrt/tests/scanf.c | 24 ++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index de2a2af975..da65bf8a6b 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -197,14 +197,14 @@ _FUNCTION_ { format++; suppress=1; } - /* look for width specification */ - while (_ISDIGIT_(*format)) { - width*=10; - width+=*format++ - '0'; - } - if (width==0) width=-1; /* no width spec seen */ /* read prefix (if any) */ while (!prefix_finished) { + /* look for width specification */ + while (_ISDIGIT_(*format)) { + width *= 10; + width += *format++ - '0'; + } + switch(*format) { case 'h': h_prefix++; break; case 'l': @@ -228,6 +228,7 @@ _FUNCTION_ { } if (!prefix_finished) format++; } + if (width==0) width=-1; /* no width spec seen */ /* read type */ switch(*format) { case 'p': diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 5db9d43935..95fd043e6f 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -205,6 +205,30 @@ static void test_sscanf( void ) ok(ret == 1, "Wrong number of arguments read: %d\n", ret); ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%02hd", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%h02d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%000h02d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead000c, "Wrong number read (%x)\n", result); + + result = 0xdeadbeef; + strcpy(buffer,"12345678"); + ret = p_sscanf(buffer, "%2h0d", &result); + ok(ret == 1, "Wrong number of arguments read: %d\n", ret); + ok(result == 0xdead614e, "Wrong number read (%x)\n", result); + result = 0xdeadbeef; ret = p_sscanf(buffer, "%hhd", &result); ok(ret == 1, "Wrong number of arguments read: %d\n", ret);

1 0

Gabriel Ivăncescu : vbscript: Move the global lists to the script dispatch object.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: cdc5ac52fc5e21e98e76147ef160c86d7e740b02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdc5ac52fc5e21e98e76147e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:21 2019 +0100 vbscript: Move the global lists to the script dispatch object. 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 | 15 ++++++----- dlls/vbscript/interp.c | 39 ++++++++++++++------------- dlls/vbscript/vbdisp.c | 34 ++++++++++++++++------- dlls/vbscript/vbscript.c | 70 ++++++++++++++++-------------------------------- dlls/vbscript/vbscript.h | 41 ++++++++++++++-------------- 5 files changed, 97 insertions(+), 102 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cdc5ac52fc5e21e98e76…

1 0

Gabriel Ivăncescu : vbscript: Reference count the vbscode_t.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 6c2f99c84e9921f03b46c09e01f17d8c01d32681 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2f99c84e9921f03b46c09e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:28 2019 +0100 vbscript: Reference count the vbscode_t. 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 | 4 +++- dlls/vbscript/vbscript.c | 11 +++++++++-- dlls/vbscript/vbscript.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9ddfacfb41..d8ae0fc313 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -1832,7 +1832,8 @@ void release_vbscode(vbscode_t *code) { unsigned i; - list_remove(&code->entry); + if(--code->ref) + return; for(i=0; i < code->bstr_cnt; i++) SysFreeString(code->bstr_pool[i]); @@ -1875,6 +1876,7 @@ static vbscode_t *alloc_vbscode(compile_ctx_t *ctx, const WCHAR *source) ret->main_code.type = FUNC_GLOBAL; ret->main_code.code_ctx = ret; + ret->ref = 1; list_init(&ret->entry); return ret; diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index f7890362c6..94daace4fe 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -223,7 +223,10 @@ static void release_script(script_ctx_t *ctx) if(code->last_class) code->last_class->next = NULL; } else + { + list_remove(&code->entry); release_vbscode(code); + } } while(!list_empty(&ctx->named_items)) { @@ -262,8 +265,12 @@ static void release_script(script_ctx_t *ctx) static void release_code_list(script_ctx_t *ctx) { - while(!list_empty(&ctx->code_list)) - release_vbscode(LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry)); + while(!list_empty(&ctx->code_list)) { + vbscode_t *iter = LIST_ENTRY(list_head(&ctx->code_list), vbscode_t, entry); + + list_remove(&iter->entry); + release_vbscode(iter); + } } static void decrease_state(VBScript *This, SCRIPTSTATE state) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index f4e7bc7b2d..2f1b61b1ab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -336,6 +336,7 @@ struct _function_t { struct _vbscode_t { instr_t *instrs; WCHAR *source; + unsigned ref; BOOL option_explicit;

1 0

Gabriel Ivăncescu : vbscript: Copy the variable names into the script dispatch's heap.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 99af868d7cd8cbbc8f83bccbc0537c22025c8db1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99af868d7cd8cbbc8f83bccb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:35 2019 +0100 vbscript: Copy the variable names into the script dispatch's heap. 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/vbscript.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/vbscript/vbscript.c b/dlls/vbscript/vbscript.c index 94daace4fe..e068d19161 100644 --- a/dlls/vbscript/vbscript.c +++ b/dlls/vbscript/vbscript.c @@ -63,6 +63,14 @@ typedef struct { EXCEPINFO ei; } VBScriptError; +static inline WCHAR *heap_pool_strdup(heap_pool_t *heap, const WCHAR *str) +{ + size_t size = (lstrlenW(str) + 1) * sizeof(WCHAR); + WCHAR *ret = heap_pool_alloc(heap, size); + if (ret) memcpy(ret, str, size); + return ret; +} + static void change_state(VBScript *This, SCRIPTSTATE state) { if(This->state == state) @@ -120,7 +128,9 @@ static HRESULT exec_global_code(script_ctx_t *ctx, vbscode_t *code, VARIANT *res if (!(var = heap_pool_alloc(&obj->heap, sizeof(*var)))) return E_OUTOFMEMORY; - var->name = code->main_code.vars[i].name; + var->name = heap_pool_strdup(&obj->heap, code->main_code.vars[i].name); + if (!var->name) + return E_OUTOFMEMORY; V_VT(&var->v) = VT_EMPTY; var->is_const = FALSE; var->array = NULL;

1 0

Gabriel Ivăncescu : vbscript: Store the necessary function and variable info in the script TypeInfo.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 3d148b8d6f4068538ec196e2c05ec3ab3c8d15bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d148b8d6f4068538ec196e2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:44 2019 +0100 vbscript: Store the necessary function and variable info in the script TypeInfo. The TypeInfo is built when it is retrieved and frozen at that moment, even if the script changes after that and more identifiers are added to it, or existing ones replaced. 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 | 45 +++++++++++++++++++++++++++++++++++++++++++++ dlls/vbscript/vbscript.h | 5 +++++ 2 files changed, 50 insertions(+) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 60a79659df..0e7fee0ed4 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -527,9 +527,20 @@ HRESULT create_vbdisp(const class_desc_t *desc, vbdisp_t **ret) return S_OK; } +struct typeinfo_func { + function_t *func; + MEMBERID memid; +}; + typedef struct { ITypeInfo ITypeInfo_iface; LONG ref; + + UINT num_vars; + UINT num_funcs; + struct typeinfo_func *funcs; + + ScriptDisp *disp; } ScriptTypeInfo; static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) @@ -569,11 +580,17 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); LONG ref = InterlockedDecrement(&This->ref); + UINT i; TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + for (i = 0; i < This->num_funcs; i++) + release_vbscode(This->funcs[i].func->code_ctx); + + IDispatchEx_Release(&This->disp->IDispatchEx_iface); + heap_free(This->funcs); heap_free(This); } return ref; @@ -857,6 +874,8 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC { ScriptDisp *This = ScriptDisp_from_IDispatchEx(iface); ScriptTypeInfo *type_info; + UINT num_funcs = 0; + unsigned i, j; TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ret); @@ -866,8 +885,34 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC if(!(type_info = heap_alloc(sizeof(*type_info)))) return E_OUTOFMEMORY; + for(i = 0; i < This->global_funcs_cnt; i++) + if(This->global_funcs[i]->is_public) + num_funcs++; + type_info->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; type_info->ref = 1; + type_info->num_funcs = num_funcs; + type_info->num_vars = This->global_vars_cnt; + type_info->disp = This; + + type_info->funcs = heap_alloc(sizeof(*type_info->funcs) * num_funcs); + if(!type_info->funcs) + { + heap_free(type_info); + return E_OUTOFMEMORY; + } + + for(j = 0, i = 0; i < This->global_funcs_cnt; i++) + { + if(!This->global_funcs[i]->is_public) continue; + + type_info->funcs[j].memid = i + 1 + DISPID_FUNCTION_MASK; + type_info->funcs[j].func = This->global_funcs[i]; + grab_vbscode(This->global_funcs[i]->code_ctx); + j++; + } + + IDispatchEx_AddRef(&This->IDispatchEx_iface); *ret = &type_info->ITypeInfo_iface; return S_OK; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2f1b61b1ab..d14b73ce82 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -357,6 +357,11 @@ struct _vbscode_t { struct list entry; }; +static inline void grab_vbscode(vbscode_t *code) +{ + code->ref++; +} + void release_vbscode(vbscode_t*) DECLSPEC_HIDDEN; HRESULT compile_script(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,vbscode_t**) DECLSPEC_HIDDEN; HRESULT compile_procedure(script_ctx_t*,const WCHAR*,const WCHAR*,DWORD,class_desc_t**) DECLSPEC_HIDDEN;

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetTypeAttr.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: ddceb911f1f99799820b42a2776802fe1af0b747 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddceb911f1f99799820b42a2… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:45:52 2019 +0100 vbscript: Implement ScriptTypeInfo_GetTypeAttr. 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 | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0e7fee0ed4..0eb8edf567 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -24,6 +24,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vbscript); +static const GUID GUID_VBScriptTypeInfo = {0xc59c6b12,0xf6c1,0x11cf,{0x88,0x35,0x00,0xa0,0xc9,0x11,0xe8,0xb2}}; + #define DISPID_FUNCTION_MASK 0x20000000 #define FDEX_VERSION_MASK 0xf0000000 @@ -599,10 +601,32 @@ static ULONG WINAPI ScriptTypeInfo_Release(ITypeInfo *iface) static HRESULT WINAPI ScriptTypeInfo_GetTypeAttr(ITypeInfo *iface, TYPEATTR **ppTypeAttr) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - - FIXME("(%p)->(%p)\n", This, ppTypeAttr); - - return E_NOTIMPL; + TYPEATTR *attr; + + TRACE("(%p)->(%p)\n", This, ppTypeAttr); + + if (!ppTypeAttr) return E_INVALIDARG; + + attr = heap_alloc_zero(sizeof(*attr)); + if (!attr) return E_OUTOFMEMORY; + + attr->guid = GUID_VBScriptTypeInfo; + attr->lcid = LOCALE_USER_DEFAULT; + attr->memidConstructor = MEMBERID_NIL; + attr->memidDestructor = MEMBERID_NIL; + attr->cbSizeInstance = 4; + attr->typekind = TKIND_DISPATCH; + attr->cFuncs = This->num_funcs; + attr->cVars = This->num_vars; + attr->cImplTypes = 1; + attr->cbSizeVft = sizeof(IDispatchVtbl); + attr->cbAlignment = 4; + attr->wTypeFlags = TYPEFLAG_FDISPATCHABLE; + attr->wMajorVerNum = VBSCRIPT_MAJOR_VERSION; + attr->wMinorVerNum = VBSCRIPT_MINOR_VERSION; + + *ppTypeAttr = attr; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **ppTComp) @@ -750,7 +774,9 @@ static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pT { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, pTypeAttr); + TRACE("(%p)->(%p)\n", This, pTypeAttr); + + heap_free(pTypeAttr); } static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pFuncDesc)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetFuncDesc.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: 2d753e2aa2e600f6739332414317e3ec5a25c2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d753e2aa2e600f673933241… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:00 2019 +0100 vbscript: Implement ScriptTypeInfo_GetFuncDesc. 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 | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 0eb8edf567..99d7dc5f5b 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -641,10 +641,33 @@ static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **p static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + function_t *func; + FUNCDESC *desc; + UINT i; - FIXME("(%p)->(%u %p)\n", This, index, ppFuncDesc); + TRACE("(%p)->(%u %p)\n", This, index, ppFuncDesc); - return E_NOTIMPL; + if (!ppFuncDesc) return E_INVALIDARG; + if (index >= This->num_funcs) return TYPE_E_ELEMENTNOTFOUND; + func = This->funcs[index].func; + + /* Store the parameter array after the FUNCDESC structure */ + desc = heap_alloc_zero(sizeof(*desc) + sizeof(ELEMDESC) * func->arg_cnt); + if (!desc) return E_OUTOFMEMORY; + + desc->memid = This->funcs[index].memid; + desc->funckind = FUNC_DISPATCH; + desc->invkind = INVOKE_FUNC; + desc->callconv = CC_STDCALL; + desc->cParams = func->arg_cnt; + desc->elemdescFunc.tdesc.vt = (func->type == FUNC_SUB) ? VT_VOID : VT_VARIANT; + + if (func->arg_cnt) desc->lprgelemdescParam = (ELEMDESC*)(desc + 1); + for (i = 0; i < func->arg_cnt; i++) + desc->lprgelemdescParam[i].tdesc.vt = VT_VARIANT; + + *ppFuncDesc = desc; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) @@ -783,7 +806,9 @@ static void WINAPI ScriptTypeInfo_ReleaseFuncDesc(ITypeInfo *iface, FUNCDESC *pF { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, pFuncDesc); + TRACE("(%p)->(%p)\n", This, pFuncDesc); + + heap_free(pFuncDesc); } static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVarDesc)

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetVarDesc.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: efab3751f660a5fd011a9f0b7e7ee5907d487e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=efab3751f660a5fd011a9f0b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:06 2019 +0100 vbscript: Implement ScriptTypeInfo_GetVarDesc. 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 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 99d7dc5f5b..d19107fd81 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -673,10 +673,22 @@ static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, F static HRESULT WINAPI ScriptTypeInfo_GetVarDesc(ITypeInfo *iface, UINT index, VARDESC **ppVarDesc) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + VARDESC *desc; - FIXME("(%p)->(%u %p)\n", This, index, ppVarDesc); + TRACE("(%p)->(%u %p)\n", This, index, ppVarDesc); - return E_NOTIMPL; + if (!ppVarDesc) return E_INVALIDARG; + if (index >= This->num_vars) return TYPE_E_ELEMENTNOTFOUND; + + desc = heap_alloc_zero(sizeof(*desc)); + if (!desc) return E_OUTOFMEMORY; + + desc->memid = index + 1; + desc->varkind = VAR_DISPATCH; + desc->elemdescVar.tdesc.vt = VT_VARIANT; + + *ppVarDesc = desc; + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetNames(ITypeInfo *iface, MEMBERID memid, BSTR *rgBstrNames, @@ -815,7 +827,9 @@ static void WINAPI ScriptTypeInfo_ReleaseVarDesc(ITypeInfo *iface, VARDESC *pVar { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, pVarDesc); + TRACE("(%p)->(%p)\n", This, pVarDesc); + + heap_free(pVarDesc); } static const ITypeInfoVtbl ScriptTypeInfoVtbl = {

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetIDsOfNames.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: cde38841d30ca9380ffd0881b6afb9be5bb782a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cde38841d30ca9380ffd0881… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:13 2019 +0100 vbscript: Implement ScriptTypeInfo_GetIDsOfNames. 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 | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/vbscript/vbscript.h | 1 + dlls/vbscript/vbscript_main.c | 25 ++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index d19107fd81..c031b80166 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -723,10 +723,51 @@ static HRESULT WINAPI ScriptTypeInfo_GetIDsOfNames(ITypeInfo *iface, LPOLESTR *r MEMBERID *pMemId) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); + ITypeInfo *disp_typeinfo; + const WCHAR *name; + HRESULT hr = S_OK; + int i, j, arg; - FIXME("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); + TRACE("(%p)->(%p %u %p)\n", This, rgszNames, cNames, pMemId); - return E_NOTIMPL; + if (!rgszNames || !cNames || !pMemId) return E_INVALIDARG; + + for (i = 0; i < cNames; i++) pMemId[i] = MEMBERID_NIL; + name = rgszNames[0]; + + for (i = 0; i < This->num_funcs; i++) + { + function_t *func = This->funcs[i].func; + + if (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)) + break; + if (arg >= 0) + pMemId[j] = arg; + else + hr = DISP_E_UNKNOWNNAME; + } + return hr; + } + + for (i = 0; i < This->num_vars; i++) + { + if (wcsicmp(name, This->disp->global_vars[i]->name)) continue; + pMemId[0] = i + 1; + return S_OK; + } + + /* Look into the inherited IDispatch */ + hr = get_dispatch_typeinfo(&disp_typeinfo); + if (FAILED(hr)) return hr; + + return ITypeInfo_GetIDsOfNames(disp_typeinfo, rgszNames, cNames, pMemId); } static HRESULT WINAPI ScriptTypeInfo_Invoke(ITypeInfo *iface, PVOID pvInstance, MEMBERID memid, WORD wFlags, diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index d14b73ce82..d79be9e6e7 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -374,6 +374,7 @@ void detach_global_objects(script_ctx_t*) DECLSPEC_HIDDEN; HRESULT get_builtin_id(BuiltinDisp*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void release_regexp_typelib(void) DECLSPEC_HIDDEN; +HRESULT get_dispatch_typeinfo(ITypeInfo**) DECLSPEC_HIDDEN; static inline BOOL is_int32(double d) { diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 6e6f386755..6dbf56d29a 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -34,6 +34,7 @@ WINE_DECLARE_DEBUG_CHANNEL(heap); DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static HINSTANCE vbscript_hinstance; +static ITypeInfo *dispatch_typeinfo; BSTR get_vbscript_string(int id) { @@ -180,6 +181,29 @@ heap_pool_t *heap_pool_mark(heap_pool_t *heap) return heap; } +HRESULT get_dispatch_typeinfo(ITypeInfo **out) +{ + ITypeInfo *typeinfo; + ITypeLib *typelib; + HRESULT hr; + + if (!dispatch_typeinfo) + { + hr = LoadRegTypeLib(&IID_StdOle, STDOLE_MAJORVERNUM, STDOLE_MINORVERNUM, STDOLE_LCID, &typelib); + if (FAILED(hr)) return hr; + + hr = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IDispatch, &typeinfo); + ITypeLib_Release(typelib); + if (FAILED(hr)) return hr; + + if (InterlockedCompareExchangePointer((void**)&dispatch_typeinfo, typeinfo, NULL)) + ITypeInfo_Release(typeinfo); + } + + *out = dispatch_typeinfo; + return S_OK; +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -256,6 +280,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) break; case DLL_PROCESS_DETACH: if (lpv) break; + if (dispatch_typeinfo) ITypeInfo_Release(dispatch_typeinfo); release_regexp_typelib(); }

1 0

Gabriel Ivăncescu : vbscript: Implement ScriptTypeInfo_GetTypeComp.
by Alexandre Julliard 06 Dec '19

06 Dec '19

Module: wine Branch: master Commit: c2e141f77c5015affa0b3e546fb698b60ac147ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2e141f77c5015affa0b3e54… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Dec 6 13:46:24 2019 +0100 vbscript: Implement ScriptTypeInfo_GetTypeComp. 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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c031b80166..2e5905120e 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -536,6 +536,7 @@ struct typeinfo_func { typedef struct { ITypeInfo ITypeInfo_iface; + ITypeComp ITypeComp_iface; LONG ref; UINT num_vars; @@ -550,12 +551,19 @@ static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeInfo(ITypeInfo *iface) return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeInfo_iface); } +static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeComp(ITypeComp *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeComp_iface); +} + static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeInfo, riid)) *ppv = &This->ITypeInfo_iface; + else if (IsEqualGUID(&IID_ITypeComp, riid)) + *ppv = &This->ITypeComp_iface; else { WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -633,9 +641,13 @@ static HRESULT WINAPI ScriptTypeInfo_GetTypeComp(ITypeInfo *iface, ITypeComp **p { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p)\n", This, ppTComp); + TRACE("(%p)->(%p)\n", This, ppTComp); - return E_NOTIMPL; + if (!ppTComp) return E_INVALIDARG; + + *ppTComp = &This->ITypeComp_iface; + ITypeInfo_AddRef(iface); + return S_OK; } static HRESULT WINAPI ScriptTypeInfo_GetFuncDesc(ITypeInfo *iface, UINT index, FUNCDESC **ppFuncDesc) @@ -898,6 +910,49 @@ static const ITypeInfoVtbl ScriptTypeInfoVtbl = { ScriptTypeInfo_ReleaseVarDesc }; +static HRESULT WINAPI ScriptTypeComp_QueryInterface(ITypeComp *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); + return ITypeInfo_QueryInterface(&This->ITypeInfo_iface, riid, ppv); +} + +static ULONG WINAPI ScriptTypeComp_AddRef(ITypeComp *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); + return ITypeInfo_AddRef(&This->ITypeInfo_iface); +} + +static ULONG WINAPI ScriptTypeComp_Release(ITypeComp *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); + return ITypeInfo_Release(&This->ITypeInfo_iface); +} + +static HRESULT WINAPI ScriptTypeComp_Bind(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal, WORD wFlags, + ITypeInfo **ppTInfo, DESCKIND *pDescKind, BINDPTR *pBindPtr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); + FIXME("(%p)->(%s %08x %d %p %p %p)\n", This, debugstr_w(szName), lHashVal, + wFlags, ppTInfo, pDescKind, pBindPtr); + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeComp_BindType(ITypeComp *iface, LPOLESTR szName, ULONG lHashVal, + ITypeInfo **ppTInfo, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeComp(iface); + FIXME("(%p)->(%s %08x %p %p)\n", This, debugstr_w(szName), lHashVal, ppTInfo, ppTComp); + return E_NOTIMPL; +} + +static const ITypeCompVtbl ScriptTypeCompVtbl = { + ScriptTypeComp_QueryInterface, + ScriptTypeComp_AddRef, + ScriptTypeComp_Release, + ScriptTypeComp_Bind, + ScriptTypeComp_BindType +}; + static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -996,6 +1051,7 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC num_funcs++; type_info->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; + type_info->ITypeComp_iface.lpVtbl = &ScriptTypeCompVtbl; type_info->ref = 1; type_info->num_funcs = num_funcs; type_info->num_vars = This->global_vars_cnt;

1 0