August 2020 - Wine-devel - list.winehq.org

[PATCH vkd3d] vkd3d-shader: Rename vkd3d_sm4_immconst_type to vkd3d_sm4_dimension.
by Zebediah Figura 12 Aug '20

12 Aug '20

These bits are used in all register tokens, not just immediate constants. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 81c1f48..89e3c0e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -96,8 +96,8 @@ #define VKD3D_SM4_SWIZZLE_TYPE_SHIFT 2 #define VKD3D_SM4_SWIZZLE_TYPE_MASK (0x3u << VKD3D_SM4_SWIZZLE_TYPE_SHIFT) -#define VKD3D_SM4_IMMCONST_TYPE_SHIFT 0 -#define VKD3D_SM4_IMMCONST_TYPE_MASK (0x3u << VKD3D_SM4_IMMCONST_TYPE_SHIFT) +#define VKD3D_SM4_DIMENSION_SHIFT 0 +#define VKD3D_SM4_DIMENSION_MASK (0x3u << VKD3D_SM4_DIMENSION_SHIFT) #define VKD3D_SM4_WRITEMASK_SHIFT 4 #define VKD3D_SM4_WRITEMASK_MASK (0xfu << VKD3D_SM4_WRITEMASK_SHIFT) @@ -396,10 +396,11 @@ enum vkd3d_sm4_swizzle_type VKD3D_SM4_SWIZZLE_SCALAR = 0x2, }; -enum vkd3d_sm4_immconst_type +enum vkd3d_sm4_dimension { - VKD3D_SM4_IMMCONST_SCALAR = 0x1, - VKD3D_SM4_IMMCONST_VEC4 = 0x2, + VKD3D_SM4_DIMENSION_NONE = 0x0, + VKD3D_SM4_DIMENSION_SCALAR = 0x1, + VKD3D_SM4_DIMENSION_VEC4 = 0x2, }; enum vkd3d_sm4_resource_type @@ -1573,12 +1574,11 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr if (register_type == VKD3D_SM4_RT_IMMCONST) { - enum vkd3d_sm4_immconst_type immconst_type = - (token & VKD3D_SM4_IMMCONST_TYPE_MASK) >> VKD3D_SM4_IMMCONST_TYPE_SHIFT; + enum vkd3d_sm4_dimension dimension = (token & VKD3D_SM4_DIMENSION_MASK) >> VKD3D_SM4_DIMENSION_SHIFT; - switch (immconst_type) + switch (dimension) { - case VKD3D_SM4_IMMCONST_SCALAR: + case VKD3D_SM4_DIMENSION_SCALAR: param->immconst_type = VKD3D_IMMCONST_SCALAR; if (end - *ptr < 1) { @@ -1589,7 +1589,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr *ptr += 1; break; - case VKD3D_SM4_IMMCONST_VEC4: + case VKD3D_SM4_DIMENSION_VEC4: param->immconst_type = VKD3D_IMMCONST_VEC4; if (end - *ptr < VKD3D_VEC4_SIZE) { @@ -1601,7 +1601,7 @@ static bool shader_sm4_read_param(struct vkd3d_sm4_data *priv, const DWORD **ptr break; default: - FIXME("Unhandled immediate constant type %#x.\n", immconst_type); + FIXME("Unhandled dimension %#x.\n", dimension); break; } } -- 2.27.0

2 1

[PATCH 1/9] msscript.ocx: Add IScriptProcedureCollection stub implementation.
by Gabriel Ivăncescu 12 Aug '20

12 Aug '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/msscript.ocx/msscript.c | 203 +++++++++++++++++++++++++++++++++-- 1 file changed, 195 insertions(+), 8 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 3fc4aca..e986014 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -51,6 +51,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msscript); struct ScriptControl; typedef struct ConnectionPoint ConnectionPoint; +typedef struct ScriptProcedureCollection ScriptProcedureCollection; typedef struct ScriptHost ScriptHost; struct ConnectionPoint { @@ -82,8 +83,17 @@ typedef struct { BSTR name; ScriptHost *host; IDispatch *script_dispatch; + + ScriptProcedureCollection *procedures; } ScriptModule; +struct ScriptProcedureCollection { + IScriptProcedureCollection IScriptProcedureCollection_iface; + LONG ref; + + ScriptModule *module; +}; + struct ScriptHost { IActiveScriptSite IActiveScriptSite_iface; IActiveScriptSiteWindow IActiveScriptSiteWindow_iface; @@ -137,6 +147,7 @@ typedef enum tid_t { IScriptControl_tid, IScriptModuleCollection_tid, IScriptModule_tid, + IScriptProcedureCollection_tid, LAST_tid } tid_t; @@ -146,7 +157,8 @@ static ITypeInfo *typeinfos[LAST_tid]; static REFIID tid_ids[] = { &IID_IScriptControl, &IID_IScriptModuleCollection, - &IID_IScriptModule + &IID_IScriptModule, + &IID_IScriptProcedureCollection, }; static HRESULT load_typelib(void) @@ -404,6 +416,11 @@ static inline ScriptControl *impl_from_IConnectionPointContainer(IConnectionPoin return CONTAINING_RECORD(iface, ScriptControl, IConnectionPointContainer_iface); } +static inline ScriptProcedureCollection *impl_from_IScriptProcedureCollection(IScriptProcedureCollection *iface) +{ + return CONTAINING_RECORD(iface, ScriptProcedureCollection, IScriptProcedureCollection_iface); +} + static inline ScriptControl *impl_from_IScriptModuleCollection(IScriptModuleCollection *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptModuleCollection_iface); @@ -674,6 +691,154 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { ServiceProvider_QueryService }; +static HRESULT WINAPI ScriptProcedureCollection_QueryInterface(IScriptProcedureCollection *iface, REFIID riid, void **ppv) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + if (IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IScriptProcedureCollection, riid)) + { + *ppv = &This->IScriptProcedureCollection_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 ScriptProcedureCollection_AddRef(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI ScriptProcedureCollection_Release(IScriptProcedureCollection *iface) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + { + This->module->procedures = NULL; + IScriptModule_Release(&This->module->IScriptModule_iface); + heap_free(This); + } + return ref; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfoCount(IScriptProcedureCollection *iface, UINT *pctinfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; +} + +static HRESULT WINAPI ScriptProcedureCollection_GetTypeInfo(IScriptProcedureCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + + return get_typeinfo(IScriptProcedureCollection_tid, ppTInfo); +} + +static HRESULT WINAPI ScriptProcedureCollection_GetIDsOfNames(IScriptProcedureCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + + hr = get_typeinfo(IScriptProcedureCollection_tid, &typeinfo); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_Invoke(IScriptProcedureCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(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(IScriptProcedureCollection_tid, &typeinfo); + if(SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke(typeinfo, iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); + ITypeInfo_Release(typeinfo); + } + + return hr; +} + +static HRESULT WINAPI ScriptProcedureCollection_get__NewEnum(IScriptProcedureCollection *iface, IUnknown **ppenumProcedures) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, ppenumProcedures); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Item(IScriptProcedureCollection *iface, VARIANT index, + IScriptProcedure **ppdispProcedure) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%s %p)\n", This, wine_dbgstr_variant(&index), ppdispProcedure); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptProcedureCollection_get_Count(IScriptProcedureCollection *iface, LONG *plCount) +{ + ScriptProcedureCollection *This = impl_from_IScriptProcedureCollection(iface); + + FIXME("(%p)->(%p)\n", This, plCount); + + return E_NOTIMPL; +} + +static const IScriptProcedureCollectionVtbl ScriptProcedureCollectionVtbl = { + ScriptProcedureCollection_QueryInterface, + ScriptProcedureCollection_AddRef, + ScriptProcedureCollection_Release, + ScriptProcedureCollection_GetTypeInfoCount, + ScriptProcedureCollection_GetTypeInfo, + ScriptProcedureCollection_GetIDsOfNames, + ScriptProcedureCollection_Invoke, + ScriptProcedureCollection_get__NewEnum, + ScriptProcedureCollection_get_Item, + ScriptProcedureCollection_get_Count +}; + static void detach_script_host(ScriptHost *host) { if (--host->module_count) @@ -848,9 +1013,29 @@ static HRESULT WINAPI ScriptModule_get_Procedures(IScriptModule *iface, IScriptP { ScriptModule *This = impl_from_IScriptModule(iface); - FIXME("(%p)->(%p)\n", This, ppdispProcedures); + TRACE("(%p)->(%p)\n", This, ppdispProcedures); - return E_NOTIMPL; + if (!This->host) + return E_FAIL; + + if (This->procedures) + IScriptProcedureCollection_AddRef(&This->procedures->IScriptProcedureCollection_iface); + else + { + ScriptProcedureCollection *procs; + + if (!(procs = heap_alloc(sizeof(*procs)))) + return E_OUTOFMEMORY; + + procs->IScriptProcedureCollection_iface.lpVtbl = &ScriptProcedureCollectionVtbl; + procs->ref = 1; + procs->module = This; + This->procedures = procs; + IScriptModule_AddRef(&This->IScriptModule_iface); + } + + *ppdispProcedures = &This->procedures->IScriptProcedureCollection_iface; + return S_OK; } static HRESULT WINAPI ScriptModule_AddCode(IScriptModule *iface, BSTR code) @@ -1060,18 +1245,16 @@ static ScriptModule *create_module(ScriptHost *host, BSTR name) { ScriptModule *module; - if (!(module = heap_alloc(sizeof(*module)))) return NULL; + if (!(module = heap_alloc_zero(sizeof(*module)))) return NULL; module->IScriptModule_iface.lpVtbl = &ScriptModuleVtbl; module->ref = 1; - module->name = NULL; if (name && !(module->name = SysAllocString(name))) { heap_free(module); return NULL; } module->host = host; - module->script_dispatch = NULL; IActiveScriptSite_AddRef(&host->IActiveScriptSite_iface); return module; } @@ -1771,8 +1954,12 @@ static HRESULT WINAPI ScriptControl_get_CodeObject(IScriptControl *iface, IDispa static HRESULT WINAPI ScriptControl_get_Procedures(IScriptControl *iface, IScriptProcedureCollection **p) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if (!This->host) return E_FAIL; + + return IScriptModule_get_Procedures(&This->modules[0]->IScriptModule_iface, p); } static HRESULT WINAPI ScriptControl__AboutBox(IScriptControl *iface) -- 2.21.0

2 13

[PATCH 1/2] urlmon: Remove unused flags argument from parse_host.
by Jacek Caban 12 Aug '20

12 Aug '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/urlmon/uri.c | 95 +++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 53 deletions(-)

1 0

[PATCH v2 3/3] xactengine3_7: Register XACTEngine classes for xactengine2_x dlls
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/3] include: Add xact.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Differentiate interface changes between xactengine2_x dll versions. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 1/3] include: Add xact2wb.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] libport: Add wine_call_on_stack_obsolete fallback for other architectures
by André Hentschel 12 Aug '20

12 Aug '20

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- libs/wine/port.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/wine/port.c b/libs/wine/port.c index 618b280881e..0e7dcc88d91 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -137,6 +137,11 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack_obsolete, "ldr x19, [sp,#16]\n\t" /* restore register from stack */ "ldp x29, x30, [sp],#32\n\t" /* restore return address */ "ret") /* return */ +#else +int wine_call_on_stack_obsolete( int (*func)(void *), void *arg, void *stack ) +{ + return 0; +} #endif /*********************************************************************** -- 2.25.1

2 2

[PATCH 2/3] include: Add xact.h
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH 1/6] combase: Move CoGetInterfaceAndReleaseStream().
by Nikolay Sivov 12 Aug '20

12 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 19 +++++++++++++++++++ dlls/ole32/marshal.c | 30 ------------------------------ dlls/ole32/ole32.spec | 2 +- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 56dc63c4f72..8c471f5ef69 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -109,7 +109,7 @@ @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax @ stub CoGetModuleType diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index dfe6426db9a..54151e21c8e 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -21,6 +21,10 @@ #define COBJMACROS #include "objbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + /*********************************************************************** * CoMarshalHresult (combase.@) */ @@ -36,3 +40,18 @@ HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) { return IStream_Read(stream, phresult, sizeof(*phresult), NULL); } + +/*********************************************************************** + * CoGetInterfaceAndReleaseStream (combase.@) + */ +HRESULT WINAPI CoGetInterfaceAndReleaseStream(IStream *stream, REFIID riid, void **obj) +{ + HRESULT hr; + + TRACE("%p, %s, %p\n", stream, debugstr_guid(riid), obj); + + if (!stream) return E_INVALIDARG; + hr = CoUnmarshalInterface(stream, riid, obj); + IStream_Release(stream); + return hr; +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 90d24805952..51db5a7e699 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2124,36 +2124,6 @@ HRESULT WINAPI CoMarshalInterThreadInterfaceInStream( return hres; } -/*********************************************************************** - * CoGetInterfaceAndReleaseStream [OLE32.@] - * - * Unmarshalls an interface from a stream and then releases the stream. - * - * PARAMS - * pStm [I] Stream that contains the marshalled interface. - * riid [I] Interface identifier of the object to unmarshall. - * ppv [O] Address of pointer where the requested interface object will be stored. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalInterThreadInterfaceInStream() and CoUnmarshalInterface() - */ -HRESULT WINAPI CoGetInterfaceAndReleaseStream(LPSTREAM pStm, REFIID riid, - LPVOID *ppv) -{ - HRESULT hres; - - TRACE("(%p, %s, %p)\n", pStm, debugstr_guid(riid), ppv); - - if(!pStm) return E_INVALIDARG; - hres = CoUnmarshalInterface(pStm, riid, ppv); - IStream_Release(pStm); - return hres; -} - static HRESULT WINAPI StdMarshalCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppv) { diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 001e7b7ad2b..d5e5607e036 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -37,7 +37,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) combase.CoGetDefaultContext @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile @ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage -@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) +@ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) combase.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) @ stdcall CoGetObject(wstr ptr ptr ptr) -- 2.28.0

2 11

[PATCH 3/3] xactengine3_7: Register XACTEngine classes for xactengine2_x dlls
by Vijay Kiran Kamuju 12 Aug '20

12 Aug '20

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0