June 2020 - Wine-Devel - list.winehq.org

[PATCH v2 02/11] msscript.ocx: Add initial IScriptModule stub implementation.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 253 ++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 2 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 57200da..749bae8 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -50,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); #endif struct ScriptControl; +typedef struct ScriptModule ScriptModule; typedef struct ConnectionPoint ConnectionPoint; struct ConnectionPoint { @@ -65,6 +66,19 @@ struct named_item { IDispatch *disp; }; +struct module { + BSTR name; + ScriptModule *object; +}; + +struct ScriptModule { + IScriptModule IScriptModule_iface; + LONG ref; + + ScriptControl *control; + struct module *module; +}; + typedef struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -107,6 +121,8 @@ struct ScriptControl { DWORD view_sink_flags; /* modules */ + UINT num_modules; + struct module *modules; IScriptModuleCollection IScriptModuleCollection_iface; ScriptHost *host; @@ -117,6 +133,7 @@ static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, IScriptModuleCollection_tid, + IScriptModule_tid, LAST_tid } tid_t; @@ -126,6 +143,7 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, &IID_IScriptModuleCollection, + &IID_IScriptModule }; static HRESULT load_typelib(void) @@ -287,6 +305,11 @@ static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleColl return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); } +static inline ScriptModule *impl_from_IScriptModule(IScriptModule *iface) +{ + return CONTAINING_RECORD(iface, ScriptModule, IScriptModule_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -561,6 +584,216 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static void release_modules(ScriptControl *control) +{ + UINT i = control->num_modules - 1; + + if (!control->modules) return; + do + { + struct module *module = &control->modules[i]; + if (module->object) + { + module->object->control = NULL; + IScriptControl_Release(&control->IScriptControl_iface); + } + SysFreeString(module->name); + } while (i--); + + heap_free(control->modules); +} + +static HRESULT WINAPI ScriptModule_QueryInterface(IScriptModule *iface, REFIID riid, void **ppv) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptModule, riid)) + { + *ppv = &This->IScriptModule_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptModule_AddRef(IScriptModule *iface) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptModule_Release(IScriptModule *iface) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + if (This->control) + { + This->module->object = NULL; + IScriptControl_Release(&This->control->IScriptControl_iface); + } + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI ScriptModule_GetTypeInfoCount(IScriptModule *iface, UINT *pctinfo) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptModule_GetTypeInfo(IScriptModule *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptModule_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptModule_GetIDsOfNames(IScriptModule *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptModule_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModule_Invoke(IScriptModule *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptModule_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModule_get_Name(IScriptModule *iface, BSTR *pbstrName) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%p)\n", This, pbstrName); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_get_CodeObject(IScriptModule *iface, IDispatch **ppdispObject) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%p)\n", This, ppdispObject); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptProcedureCollection **ppdispProcedures) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%p)\n", This, ppdispProcedures); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_w(code)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_Eval(IScriptModule *iface, BSTR expression, VARIANT *res) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(expression), res); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_ExecuteStatement(IScriptModule *iface, BSTR statement) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%s)\n", This, debugstr_w(statement)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModule_Run(IScriptModule *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) +{ + ScriptModule *This = impl_from_IScriptModule(iface); + + FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); + + return E_NOTIMPL; +} + +static const IScriptModuleVtbl ScriptModuleVtbl = { + ScriptModule_QueryInterface, + ScriptModule_AddRef, + ScriptModule_Release, + ScriptModule_GetTypeInfoCount, + ScriptModule_GetTypeInfo, + ScriptModule_GetIDsOfNames, + ScriptModule_Invoke, + ScriptModule_get_Name, + ScriptModule_get_CodeObject, + ScriptModule_get_Procedures, + ScriptModule_AddCode, + ScriptModule_Eval, + ScriptModule_ExecuteStatement, + ScriptModule_Run +}; + static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) { ScriptControl *This = impl_from_IScriptModuleCollection(iface); @@ -677,9 +910,12 @@ static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection * { ScriptControl *This = impl_from_IScriptModuleCollection(iface); - FIXME("(%p)->(%p)\n", This, plCount); + TRACE("(%p)->(%p)\n", This, plCount); - return E_NOTIMPL; + if (!plCount) return E_POINTER; + + *plCount = This->num_modules; + return S_OK; } static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, @@ -850,6 +1086,7 @@ static ULONG WINAPI ScriptControl_Release(IScriptControl *iface) IOleClientSite_Release(This->site); if (This->host) release_script_engine(This->host); + release_modules(This); heap_free(This); } @@ -939,6 +1176,7 @@ static HRESULT WINAPI ScriptControl_get_Language(IScriptControl *iface, BSTR *p) static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR language) { ScriptControl *This = impl_from_IScriptControl(iface); + struct module *modules; CLSID clsid; TRACE("(%p)->(%s)\n", This, debugstr_w(language)); @@ -946,11 +1184,19 @@ static HRESULT WINAPI ScriptControl_put_Language(IScriptControl *iface, BSTR lan if (language && FAILED(CLSIDFromProgID(language, &clsid))) return CTL_E_INVALIDPROPERTYVALUE; + /* Alloc new global module */ + modules = heap_alloc_zero(sizeof(*modules)); + if (!modules) return E_OUTOFMEMORY; + if (This->host) { release_script_engine(This->host); This->host = NULL; } + release_modules(This); + This->modules = modules; + This->num_modules = 1; + if (!language) return S_OK; @@ -1080,6 +1326,8 @@ static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptMo TRACE("(%p)->(%p)\n", This, p); + if (!This->modules) return E_FAIL; + *p = &This->IScriptModuleCollection_iface; IScriptControl_AddRef(iface); return S_OK; @@ -2201,6 +2449,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->allow_ui = VARIANT_TRUE; script_control->use_safe_subset = VARIANT_FALSE; script_control->state = Initialized; + script_control->modules = NULL; ConnectionPoint_Init(&script_control->cp_scsource, script_control, &DIID_DScriptControlSource); ConnectionPoint_Init(&script_control->cp_propnotif, script_control, &IID_IPropertyNotifySink); -- 2.21.0

June 1, 2020

[PATCH v2 01/11] msscript.ocx: Add IScriptModuleCollection stub implementation.

by Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Split tests and use separate objects for externally referenced modules. dlls/msscript.ocx/msscript.c | 166 ++++++++++++++++++++++++++++++++++- 1 file changed, 163 insertions(+), 3 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..57200da 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -106,6 +106,9 @@ struct ScriptControl { IAdviseSink *view_sink; DWORD view_sink_flags; + /* modules */ + IScriptModuleCollection IScriptModuleCollection_iface; + ScriptHost *host; }; @@ -113,6 +116,7 @@ static HINSTANCE msscript_instance; typedef enum tid_t { IScriptControl_tid, + IScriptModuleCollection_tid, LAST_tid } tid_t; @@ -120,7 +124,8 @@ static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { - &IID_IScriptControl + &IID_IScriptControl, + &IID_IScriptModuleCollection, }; static HRESULT load_typelib(void) @@ -277,6 +282,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); +} + static inline ConnectionPoint *impl_from_IConnectionPoint(IConnectionPoint *iface) { return CONTAINING_RECORD(iface, ConnectionPoint, IConnectionPoint_iface); @@ -551,6 +561,151 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptModuleCollection_QueryInterface(IScriptModuleCollection *iface, REFIID riid, void **ppv) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptModuleCollection, riid)) + { + *ppv = &This->IScriptModuleCollection_iface; + } + else + { + WARN("unsupported interface: (%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptModuleCollection_AddRef(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_AddRef(&This->IScriptControl_iface); +} + +static ULONG WINAPI ScriptModuleCollection_Release(IScriptModuleCollection *iface) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + return IScriptControl_Release(&This->IScriptControl_iface); +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfoCount(IScriptModuleCollection *iface, UINT *pctinfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptModuleCollection_GetTypeInfo(IScriptModuleCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptModuleCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptModuleCollection_GetIDsOfNames(IScriptModuleCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_Invoke(IScriptModuleCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); + + hr = get_typeinfo(IScriptModuleCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptModuleCollection_get__NewEnum(IScriptModuleCollection *iface, IUnknown **ppenumContexts) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumContexts); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Item(IScriptModuleCollection *iface, VARIANT index, + IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppmod); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_get_Count(IScriptModuleCollection *iface, LONG *plCount) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptModuleCollection_Add(IScriptModuleCollection *iface, BSTR name, + VARIANT *object, IScriptModule **ppmod) +{ + ScriptControl *This = impl_from_IScriptModuleCollection(iface); + + FIXME("(%p)->(%s %s %p)\n", This, wine_dbgstr_w(name), wine_dbgstr_variant(object), ppmod); + + return E_NOTIMPL; +} + +static const IScriptModuleCollectionVtbl ScriptModuleCollectionVtbl = { + ScriptModuleCollection_QueryInterface, + ScriptModuleCollection_AddRef, + ScriptModuleCollection_Release, + ScriptModuleCollection_GetTypeInfoCount, + ScriptModuleCollection_GetTypeInfo, + ScriptModuleCollection_GetIDsOfNames, + ScriptModuleCollection_Invoke, + ScriptModuleCollection_get__NewEnum, + ScriptModuleCollection_get_Item, + ScriptModuleCollection_get_Count, + ScriptModuleCollection_Add +}; + static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) { IObjectSafety *objsafety; @@ -922,8 +1077,12 @@ static HRESULT WINAPI ScriptControl_put_UseSafeSubset(IScriptControl *iface, VAR static HRESULT WINAPI ScriptControl_get_Modules(IScriptControl *iface, IScriptModuleCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + *p = &This->IScriptModuleCollection_iface; + IScriptControl_AddRef(iface); + return S_OK; } static HRESULT WINAPI ScriptControl_get_Error(IScriptControl *iface, IScriptError **p) @@ -2031,6 +2190,7 @@ static HRESULT WINAPI ScriptControl_CreateInstance(IClassFactory *iface, IUnknow script_control->IViewObjectEx_iface.lpVtbl = &ViewObjectExVtbl; script_control->IPointerInactive_iface.lpVtbl = &PointerInactiveVtbl; script_control->IConnectionPointContainer_iface.lpVtbl = &ConnectionPointContainerVtbl; + script_control->IScriptModuleCollection_iface.lpVtbl = &ScriptModuleCollectionVtbl; script_control->ref = 1; script_control->site = NULL; script_control->cp_list = NULL; -- 2.21.0

June 1, 2020

Re: [PATCH resend 02/13] msscript.ocx: Add IScriptModuleCollection stub implementation.

by Gabriel Ivăncescu

On 01/06/2020 17:54, Jacek Caban wrote: > On 01.06.2020 14:17, Gabriel Ivăncescu wrote: >> On 29/05/2020 19:53, Jacek Caban wrote: >>> On 26.05.2020 14:41, Gabriel Ivăncescu wrote: >>>> diff --git a/dlls/msscript.ocx/msscript.c >>>> b/dlls/msscript.ocx/msscript.c >>>> index 6d098cd..7a18a84 100644 >>>> --- a/dlls/msscript.ocx/msscript.c >>>> +++ b/dlls/msscript.ocx/msscript.c >>>> @@ -106,6 +106,9 @@ struct ScriptControl { >>>> IAdviseSink *view_sink; >>>> DWORD view_sink_flags; >>>> + /* modules */ >>>> + IScriptModuleCollection IScriptModuleCollection_iface; >>>> + >>>> ScriptHost *host; >>>> }; >>> >>> >>> It looks like it could be a separated object (which could potentially >>> help with your references problem). >>> >>> >>> Jacek >>> >> >> It makes no difference if it's a separate object in this case. The >> module collection is tied to the control: updating the control (via >> put_Language for example) will also update an existing module >> collection, not just newly obtained ones, as tests show. > > > It may make a difference, depending on implementation details. The > potentially problematic part of your solution is that collection shares > reference counter with control instead of having a separated ref count. > It means that collection keeps the whole control alive (which may or may > not be desired, it should be testable). > Yes but it already is the case that the module collection keeps the control alive, and is only really closed when the collection is closed. To answer the other message since it's related: It's the same with non-detached modules. I did have tests for that, although not for the collection (I'll add that now).

June 1, 2020

Re: [PATCH resend 02/13] msscript.ocx: Add IScriptModuleCollection stub implementation.

by Jacek Caban

On 01.06.2020 14:17, Gabriel Ivăncescu wrote: > On 29/05/2020 19:53, Jacek Caban wrote: >> On 26.05.2020 14:41, Gabriel Ivăncescu wrote: >>> diff --git a/dlls/msscript.ocx/msscript.c >>> b/dlls/msscript.ocx/msscript.c >>> index 6d098cd..7a18a84 100644 >>> --- a/dlls/msscript.ocx/msscript.c >>> +++ b/dlls/msscript.ocx/msscript.c >>> @@ -106,6 +106,9 @@ struct ScriptControl { >>> IAdviseSink *view_sink; >>> DWORD view_sink_flags; >>> + /* modules */ >>> + IScriptModuleCollection IScriptModuleCollection_iface; >>> + >>> ScriptHost *host; >>> }; >> >> >> It looks like it could be a separated object (which could potentially >> help with your references problem). >> >> >> Jacek >> > > It makes no difference if it's a separate object in this case. The > module collection is tied to the control: updating the control (via > put_Language for example) will also update an existing module > collection, not just newly obtained ones, as tests show. It may make a difference, depending on implementation details. The potentially problematic part of your solution is that collection shares reference counter with control instead of having a separated ref count. It means that collection keeps the whole control alive (which may or may not be desired, it should be testable). Thanks, Jacek

June 1, 2020

Re: [PATCH resend 03/13] msscript.ocx: Add initial IScriptModule stub implementation.

by Jacek Caban

On 01.06.2020 14:21, Gabriel Ivăncescu wrote: >> >> Or maybe script module should just store ScriptHost reference. >> > > It wouldn't change much and we need a ref to the control anyway (to > start the script for example). I would need a deeper look to be sure, but it seems to me that it would solve all your problems by not having to store control reference in modules. Starting script doesn't really need control. It currently needs it only to access script host and check control state. Control state could be reworked to not require it (test_State() on emulated script engine would be interesting for such rework). Thanks, Jacek

June 1, 2020

Re: [PATCH v2 1/3] api-ms-win-downlevel-shell32-l1-1-0: Is win32 only.

by Francois Gouget

On Mon, 1 Jun 2020, Nikolay Sivov wrote: > On 6/1/20 12:49 PM, Francois Gouget wrote: > > On Tue, 19 May 2020, Serge Gautherie wrote: > > > > > On 19/05/2020 15:42, Nikolay Sivov wrote: > > > > > > > Could it mean that physical files for this were removed at some point, > > > > but loader still is able to resolves imports on 64-bit too? > > > I don't know. Maybe François can check/answer that. > > > In any case, either code or testbots don't match... > > I have never removed dlls from the Windows test VMs (and would never do > > such a thing). > > Does that answer the question? > > > I meant removed by Windows update obviously, not by hand. Wouldn't the error happen in w1064v1607 or later but not on the original w1064v1507 snapshot then? Similarly w2008s64 gets the same error so that would mean I should find a file called api-ms-win-downlevel-* or api-*shell32* on the original snapshot of w2008s64 which is not the case. Let me know if there are other tests I can do to help. -- Francois Gouget <fgouget(a)codeweavers.com>

June 1, 2020

[PATCH V2] ws2_32: Implement GetHostNameW() function

by Vijay Kiran Kamuju

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49286 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

June 1, 2020

Re: [PATCH] ws2_32: Implement GetHostNameW() function

by Vijay Kiran Kamuju

On Mon, Jun 1, 2020 at 2:25 PM Dmitry Timoshkov <dmitry(a)baikal.ru> wrote: > > Vijay Kiran Kamuju <infyquest(a)gmail.com> wrote: > > > +int WINAPI GetHostNameW(PWSTR name, int namelen) > > +{ > > + char *nameA = NULL; > > Initialization to NULL is redundant. I am getting warnings if we use it without initialization. > > > + int ret; > > + > > + TRACE("name %p, len %d\n", name, namelen); > > + > > + if (!name) > > + { > > + SetLastError(WSAEFAULT); > > + return SOCKET_ERROR; > > + } > > + if (name && (!(nameA = HeapAlloc(GetProcessHeap(), 0, namelen)))) > > 'name' can't be NULL at this point. 'namelen' for a multibyte string > could be longer than length for a unicode one. Should the nameA be allocated the size of namelen*sizeof(WCHAR)? > > -- > Dmitry.

June 1, 2020

Re: [PATCH] ws2_32: Implement GetHostNameW() function

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=72565 Your paranoid android. === wxppro (32 bit report) === ws2_32: sock: Timeout === w2008s64 (32 bit report) === ws2_32: sock: Timeout === w2008s64 (64 bit report) === ws2_32: sock: Timeout

June 1, 2020

Re: testbot: Report validation error

by Paul Gofman

On 6/1/20 15:22, Francois Gouget wrote: > On Mon, 1 Jun 2020, Paul Gofman wrote: > >> > I think it needs a subtest("driver4"); in test_driver4(), like is done > for driver. > > Oh yeah, that helps. Thank you very much.

June 1, 2020