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

[PATCH 1/3] msvcrt: Respect allocation mode in malloc.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/heap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] mfplat: Add MFCreateTransformActivate().
by Nikolay Sivov 29 Jan '20

29 Jan '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/main.c | 416 +++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 25 +++ include/mftransform.idl | 2 + 4 files changed, 444 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 910b923542..df11e189a2 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -65,6 +65,12 @@ static CRITICAL_SECTION local_handlers_section = { NULL, -1, 0, 0, 0, 0 }; static struct list local_scheme_handlers = LIST_INIT(local_scheme_handlers); static struct list local_bytestream_handlers = LIST_INIT(local_bytestream_handlers); +struct transform_activate +{ + struct attributes attributes; + IMFActivate IMFActivate_iface; +}; + struct system_clock { IMFClock IMFClock_iface; @@ -107,6 +113,416 @@ static struct system_clock *impl_from_IMFClock(IMFClock *iface) return CONTAINING_RECORD(iface, struct system_clock, IMFClock_iface); } +static struct transform_activate *impl_from_IMFActivate(IMFActivate *iface) +{ + return CONTAINING_RECORD(iface, struct transform_activate, IMFActivate_iface); +} + +static HRESULT WINAPI transform_activate_QueryInterface(IMFActivate *iface, REFIID riid, void **out) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); + + if (IsEqualIID(riid, &IID_IMFActivate) || + IsEqualIID(riid, &IID_IMFAttributes) || + IsEqualIID(riid, &IID_IUnknown)) + { + *out = iface; + IMFActivate_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI transform_activate_AddRef(IMFActivate *iface) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + ULONG refcount = InterlockedIncrement(&activate->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI transform_activate_Release(IMFActivate *iface) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + ULONG refcount = InterlockedDecrement(&activate->attributes.ref); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + clear_attributes_object(&activate->attributes); + heap_free(activate); + } + + return refcount; +} + +static HRESULT WINAPI transform_activate_GetItem(IMFActivate *iface, REFGUID key, PROPVARIANT *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetItem(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_GetItemType(IMFActivate *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), type); + + return attributes_GetItemType(&activate->attributes, key, type); +} + +static HRESULT WINAPI transform_activate_CompareItem(IMFActivate *iface, REFGUID key, REFPROPVARIANT value, + BOOL *result) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_propvar(value), result); + + return attributes_CompareItem(&activate->attributes, key, value, result); +} + +static HRESULT WINAPI transform_activate_Compare(IMFActivate *iface, IMFAttributes *theirs, + MF_ATTRIBUTES_MATCH_TYPE match_type, BOOL *ret) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p, %d, %p.\n", iface, theirs, match_type, ret); + + return attributes_Compare(&activate->attributes, theirs, match_type, ret); +} + +static HRESULT WINAPI transform_activate_GetUINT32(IMFActivate *iface, REFGUID key, UINT32 *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT32(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_GetUINT64(IMFActivate *iface, REFGUID key, UINT64 *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetUINT64(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_GetDouble(IMFActivate *iface, REFGUID key, double *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetDouble(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_GetGUID(IMFActivate *iface, REFGUID key, GUID *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + return attributes_GetGUID(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_GetStringLength(IMFActivate *iface, REFGUID key, UINT32 *length) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); + + return attributes_GetStringLength(&activate->attributes, key, length); +} + +static HRESULT WINAPI transform_activate_GetString(IMFActivate *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), value, size, length); + + return attributes_GetString(&activate->attributes, key, value, size, length); +} + +static HRESULT WINAPI transform_activate_GetAllocatedString(IMFActivate *iface, REFGUID key, WCHAR **value, + UINT32 *length) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + + return attributes_GetAllocatedString(&activate->attributes, key, value, length); +} + +static HRESULT WINAPI transform_activate_GetBlobSize(IMFActivate *iface, REFGUID key, UINT32 *size) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), size); + + return attributes_GetBlobSize(&activate->attributes, key, size); +} + +static HRESULT WINAPI transform_activate_GetBlob(IMFActivate *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, + UINT32 *blobsize) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), buf, bufsize, blobsize); + + return attributes_GetBlob(&activate->attributes, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI transform_activate_GetAllocatedBlob(IMFActivate *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), buf, size); + + return attributes_GetAllocatedBlob(&activate->attributes, key, buf, size); +} + +static HRESULT WINAPI transform_activate_GetUnknown(IMFActivate *iface, REFGUID key, REFIID riid, void **out) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), out); + + return attributes_GetUnknown(&activate->attributes, key, riid, out); +} + +static HRESULT WINAPI transform_activate_SetItem(IMFActivate *iface, REFGUID key, REFPROPVARIANT value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_propvar(value)); + + return attributes_SetItem(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_DeleteItem(IMFActivate *iface, REFGUID key) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s.\n", iface, debugstr_attr(key)); + + return attributes_DeleteItem(&activate->attributes, key); +} + +static HRESULT WINAPI transform_activate_DeleteAllItems(IMFActivate *iface) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return attributes_DeleteAllItems(&activate->attributes); +} + +static HRESULT WINAPI transform_activate_SetUINT32(IMFActivate *iface, REFGUID key, UINT32 value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %u.\n", iface, debugstr_attr(key), value); + + return attributes_SetUINT32(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_SetUINT64(IMFActivate *iface, REFGUID key, UINT64 value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + + return attributes_SetUINT64(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_SetDouble(IMFActivate *iface, REFGUID key, double value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); + + return attributes_SetDouble(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_SetGUID(IMFActivate *iface, REFGUID key, REFGUID value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_mf_guid(value)); + + return attributes_SetGUID(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_SetString(IMFActivate *iface, REFGUID key, const WCHAR *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + + return attributes_SetString(&activate->attributes, key, value); +} + +static HRESULT WINAPI transform_activate_SetBlob(IMFActivate *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p, %u.\n", iface, debugstr_attr(key), buf, size); + + return attributes_SetBlob(&activate->attributes, key, buf, size); +} + +static HRESULT WINAPI transform_activate_SetUnknown(IMFActivate *iface, REFGUID key, IUnknown *unknown) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + + return attributes_SetUnknown(&activate->attributes, key, unknown); +} + +static HRESULT WINAPI transform_activate_LockStore(IMFActivate *iface) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return attributes_LockStore(&activate->attributes); +} + +static HRESULT WINAPI transform_activate_UnlockStore(IMFActivate *iface) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p.\n", iface); + + return attributes_UnlockStore(&activate->attributes); +} + +static HRESULT WINAPI transform_activate_GetCount(IMFActivate *iface, UINT32 *count) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p.\n", iface, count); + + return attributes_GetCount(&activate->attributes, count); +} + +static HRESULT WINAPI transform_activate_GetItemByIndex(IMFActivate *iface, UINT32 index, GUID *key, + PROPVARIANT *value) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %u, %p, %p.\n", iface, index, key, value); + + return attributes_GetItemByIndex(&activate->attributes, index, key, value); +} + +static HRESULT WINAPI transform_activate_CopyAllItems(IMFActivate *iface, IMFAttributes *dest) +{ + struct transform_activate *activate = impl_from_IMFActivate(iface); + + TRACE("%p, %p.\n", iface, dest); + + return attributes_CopyAllItems(&activate->attributes, dest); +} + +static HRESULT WINAPI transform_activate_ActivateObject(IMFActivate *iface, REFIID riid, void **obj) +{ + FIXME("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transform_activate_ShutdownObject(IMFActivate *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI transform_activate_DetachObject(IMFActivate *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFActivateVtbl transform_activate_vtbl = +{ + transform_activate_QueryInterface, + transform_activate_AddRef, + transform_activate_Release, + transform_activate_GetItem, + transform_activate_GetItemType, + transform_activate_CompareItem, + transform_activate_Compare, + transform_activate_GetUINT32, + transform_activate_GetUINT64, + transform_activate_GetDouble, + transform_activate_GetGUID, + transform_activate_GetStringLength, + transform_activate_GetString, + transform_activate_GetAllocatedString, + transform_activate_GetBlobSize, + transform_activate_GetBlob, + transform_activate_GetAllocatedBlob, + transform_activate_GetUnknown, + transform_activate_SetItem, + transform_activate_DeleteItem, + transform_activate_DeleteAllItems, + transform_activate_SetUINT32, + transform_activate_SetUINT64, + transform_activate_SetDouble, + transform_activate_SetGUID, + transform_activate_SetString, + transform_activate_SetBlob, + transform_activate_SetUnknown, + transform_activate_LockStore, + transform_activate_UnlockStore, + transform_activate_GetCount, + transform_activate_GetItemByIndex, + transform_activate_CopyAllItems, + transform_activate_ActivateObject, + transform_activate_ShutdownObject, + transform_activate_DetachObject, +}; + +HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate) +{ + struct transform_activate *object; + HRESULT hr; + + TRACE("%p.\n", activate); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + if (FAILED(hr = init_attributes_object(&object->attributes, 0))) + { + heap_free(object); + return hr; + } + + object->IMFActivate_iface.lpVtbl = &transform_activate_vtbl; + + *activate = &object->IMFActivate_iface; + + return S_OK; +} + static const WCHAR transform_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', 'T','r','a','n','s','f','o','r','m','s',0}; static const WCHAR categories_keyW[] = {'M','e','d','i','a','F','o','u','n','d','a','t','i','o','n','\\', diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index e48242fa15..e3ec8bcb8b 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -66,7 +66,7 @@ @ stdcall MFCreateSystemTimeSource(ptr) @ stub MFCreateSystemUnderlyingClock @ stub MFCreateTempFile -@ stub MFCreateTransformActivate +@ stdcall MFCreateTransformActivate(ptr) @ stub MFCreateURLFromPath @ stub MFCreateUdpSockets @ stub MFCreateVideoMediaType diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b61d91d14e..ba896f3711 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -77,6 +77,7 @@ static HRESULT (WINAPI *pMFRemovePeriodicCallback)(DWORD key); static HRESULT (WINAPI *pMFRegisterLocalByteStreamHandler)(const WCHAR *extension, const WCHAR *mime, IMFActivate *activate); static HRESULT (WINAPI *pMFRegisterLocalSchemeHandler)(const WCHAR *scheme, IMFActivate *activate); +static HRESULT (WINAPI *pMFCreateTransformActivate)(IMFActivate **activate); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; static const WCHAR fileschemeW[] = {'f','i','l','e',':','/','/',0}; @@ -527,6 +528,7 @@ static void init_functions(void) X(MFRegisterLocalByteStreamHandler); X(MFRegisterLocalSchemeHandler); X(MFRemovePeriodicCallback); + X(MFCreateTransformActivate); #undef X if ((mod = LoadLibraryA("d3d11.dll"))) @@ -3799,6 +3801,28 @@ static void test_dxgi_device_manager(void) IMFDXGIDeviceManager_Release(manager2); } +static void test_MFCreateTransformActivate(void) +{ + IMFActivate *activate; + UINT32 count; + HRESULT hr; + + if (!pMFCreateTransformActivate) + { + win_skip("MFCreateTransformActivate() is not available.\n"); + return; + } + + hr = pMFCreateTransformActivate(&activate); + ok(hr == S_OK, "Failed to create activator, hr %#x.\n", hr); + + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Failed to get count, hr %#x.\n", hr); + ok(!count, "Unexpected attribute count %u.\n", count); + + IMFActivate_Release(activate); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -3837,6 +3861,7 @@ START_TEST(mfplat) test_local_handlers(); test_create_property_store(); test_dxgi_device_manager(); + test_MFCreateTransformActivate(); CoUninitialize(); } diff --git a/include/mftransform.idl b/include/mftransform.idl index ca2f781a6b..5c4860c367 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -121,3 +121,5 @@ interface IMFTransform : IUnknown [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, [out] DWORD *status); } + +cpp_quote("HRESULT WINAPI MFCreateTransformActivate(IMFActivate **activate);") -- 2.24.1

2 3

[PATCH 01/12] vbscript: Implement ScriptTypeInfo_GetContainingTypeLib.
by Gabriel Ivăncescu 29 Jan '20

29 Jan '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/vbscript/vbdisp.c | 153 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 151 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index c14cd7b..ed21a04 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -537,6 +537,7 @@ struct typeinfo_func { typedef struct { ITypeInfo ITypeInfo_iface; ITypeComp ITypeComp_iface; + ITypeLib typelib_ITypeLib_iface; LONG ref; UINT num_vars; @@ -576,6 +577,11 @@ static inline ScriptTypeInfo *ScriptTypeInfo_from_ITypeComp(ITypeComp *iface) return CONTAINING_RECORD(iface, ScriptTypeInfo, ITypeComp_iface); } +static inline ScriptTypeInfo *ScriptTypeInfo_from_typelib_ITypeLib(ITypeLib *iface) +{ + return CONTAINING_RECORD(iface, ScriptTypeInfo, typelib_ITypeLib_iface); +} + static HRESULT WINAPI ScriptTypeInfo_QueryInterface(ITypeInfo *iface, REFIID riid, void **ppv) { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); @@ -1037,9 +1043,14 @@ static HRESULT WINAPI ScriptTypeInfo_GetContainingTypeLib(ITypeInfo *iface, ITyp { ScriptTypeInfo *This = ScriptTypeInfo_from_ITypeInfo(iface); - FIXME("(%p)->(%p %p)\n", This, ppTLib, pIndex); + TRACE("(%p)->(%p %p)\n", This, ppTLib, pIndex); - return E_NOTIMPL; + if (pIndex) *pIndex = 0; + if (!ppTLib) return S_OK; + + *ppTLib = &This->typelib_ITypeLib_iface; + ITypeInfo_AddRef(&This->ITypeInfo_iface); + return S_OK; } static void WINAPI ScriptTypeInfo_ReleaseTypeAttr(ITypeInfo *iface, TYPEATTR *pTypeAttr) @@ -1201,6 +1212,143 @@ static const ITypeCompVtbl ScriptTypeCompVtbl = { ScriptTypeComp_BindType }; +static HRESULT WINAPI ScriptTypeLib_QueryInterface(ITypeLib *iface, REFIID riid, void **ppv) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITypeLib, riid)) + *ppv = &This->typelib_ITypeLib_iface; + else + { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ScriptTypeLib_AddRef(ITypeLib *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + return ITypeInfo_AddRef(&This->ITypeInfo_iface); +} + +static ULONG WINAPI ScriptTypeLib_Release(ITypeLib *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + return ITypeInfo_Release(&This->ITypeInfo_iface); +} + +static UINT WINAPI ScriptTypeLib_GetTypeInfoCount(ITypeLib *iface) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + TRACE("(%p)\n", This); + + return 1; +} + +static HRESULT WINAPI ScriptTypeLib_GetTypeInfo(ITypeLib *iface, UINT index, ITypeInfo **ppTInfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%u %p)\n", This, index, ppTInfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_GetTypeInfoType(ITypeLib *iface, UINT index, TYPEKIND *pTKind) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%u %p)\n", This, index, pTKind); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_GetTypeInfoOfGuid(ITypeLib *iface, REFGUID guid, ITypeInfo **ppTinfo) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(guid), ppTinfo); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_GetLibAttr(ITypeLib *iface, TLIBATTR **ppTLibAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%p)\n", This, ppTLibAttr); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_GetTypeComp(ITypeLib *iface, ITypeComp **ppTComp) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%p)\n", This, ppTComp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_GetDocumentation(ITypeLib *iface, INT index, BSTR *pBstrName, + BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%d %p %p %p %p)\n", This, index, pBstrName, pBstrDocString, pdwHelpContext, pBstrHelpFile); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_IsName(ITypeLib *iface, LPOLESTR szNameBuf, ULONG lHashVal, BOOL *pfName) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(szNameBuf), lHashVal, pfName); + + return E_NOTIMPL; +} + +static HRESULT WINAPI ScriptTypeLib_FindName(ITypeLib *iface, LPOLESTR szNameBuf, ULONG lHashVal, + ITypeInfo **ppTInfo, MEMBERID *rgMemId, USHORT *pcFound) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%s %08x %p %p %p)\n", This, debugstr_w(szNameBuf), lHashVal, + ppTInfo, rgMemId, pcFound); + + return E_NOTIMPL; +} + +static void WINAPI ScriptTypeLib_ReleaseTLibAttr(ITypeLib *iface, TLIBATTR *pTLibAttr) +{ + ScriptTypeInfo *This = ScriptTypeInfo_from_typelib_ITypeLib(iface); + + FIXME("(%p)->(%p)\n", This, pTLibAttr); +} + +static const ITypeLibVtbl ScriptTypeLibVtbl = { + ScriptTypeLib_QueryInterface, + ScriptTypeLib_AddRef, + ScriptTypeLib_Release, + ScriptTypeLib_GetTypeInfoCount, + ScriptTypeLib_GetTypeInfo, + ScriptTypeLib_GetTypeInfoType, + ScriptTypeLib_GetTypeInfoOfGuid, + ScriptTypeLib_GetLibAttr, + ScriptTypeLib_GetTypeComp, + ScriptTypeLib_GetDocumentation, + ScriptTypeLib_IsName, + ScriptTypeLib_FindName, + ScriptTypeLib_ReleaseTLibAttr +}; + static inline ScriptDisp *ScriptDisp_from_IDispatchEx(IDispatchEx *iface) { return CONTAINING_RECORD(iface, ScriptDisp, IDispatchEx_iface); @@ -1293,6 +1441,7 @@ static HRESULT WINAPI ScriptDisp_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LC type_info->ITypeInfo_iface.lpVtbl = &ScriptTypeInfoVtbl; type_info->ITypeComp_iface.lpVtbl = &ScriptTypeCompVtbl; + type_info->typelib_ITypeLib_iface.lpVtbl = &ScriptTypeLibVtbl; type_info->ref = 1; type_info->num_funcs = num_funcs; type_info->num_vars = This->global_vars_cnt; -- 2.21.0

2 15

[PATCH 4/4] msvcrt: Don't duplicate _wsearchenv_s code in _wsearchenv.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 66 ++++++----------------------------------------- 1 file changed, 8 insertions(+), 58 deletions(-)

1 0

[PATCH 3/4] msvcrt: Add support for quoted paths in _wsearchenv_s.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4] msvcrt: Don't duplicate _searchenv_s code in _searchenv.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 90 +++++------------------------------------------ 1 file changed, 8 insertions(+), 82 deletions(-)

1 0

[PATCH 1/4] msvcrt: Add support for quoted paths in _searchenv_s.
by Piotr Caban 29 Jan '20

29 Jan '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/dir.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-)

1 0

[PATCH 2/2] include: Use dllimport attribute for string.h functions.
by Jacek Caban 29 Jan '20

29 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes a noisy clang warning about _strnicmp being incompatible with winternl.h declaration. Also helps compiler to produce better code. include/msvcrt/corecrt.h | 12 +++ include/msvcrt/string.h | 180 +++++++++++++++++++-------------------- 2 files changed, 102 insertions(+), 90 deletions(-)

1 0

[PATCH v5] msvcrt: Fix the btowc() function.
by Chip Davis 29 Jan '20

29 Jan '20

This function returns WEOF on conversion failure. It should only operate on single-byte characters in the C locale. Finally, it should use the current locale's codepage, instead of the current locale itself, to do conversions. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- v5: Skip tests if setlocale(".1250") fails. --- dlls/msvcrt/locale.c | 10 +++-- dlls/msvcrt/tests/string.c | 79 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ae9f7c9c2166..72a52a20a900 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -786,9 +786,13 @@ MSVCRT_wint_t CDECL MSVCRT_btowc(int c) unsigned char letter = c; MSVCRT_wchar_t ret; - if(!MultiByteToWideChar(get_locinfo()->lc_handle[MSVCRT_LC_CTYPE], - 0, (LPCSTR)&letter, 1, &ret, 1)) - return 0; + if(c == MSVCRT_EOF) + return MSVCRT_WEOF; + if(!get_locinfo()->lc_codepage) + return c & 255; + if(!MultiByteToWideChar(get_locinfo()->lc_codepage, + MB_ERR_INVALID_CHARS, (LPCSTR)&letter, 1, &ret, 1)) + return MSVCRT_WEOF; return ret; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index da0400fa832f..8f97d8959ea9 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -90,6 +90,7 @@ static int (__cdecl *p_wcslwr_s)(wchar_t*,size_t); static errno_t (__cdecl *p_mbsupr_s)(unsigned char *str, size_t numberOfElements); static errno_t (__cdecl *p_mbslwr_s)(unsigned char *str, size_t numberOfElements); static int (__cdecl *p_wctob)(wint_t); +static wint_t (__cdecl *p_btowc)(int); static size_t (__cdecl *p_wcrtomb)(char*, wchar_t, mbstate_t*); static int (__cdecl *p_wcrtomb_s)(size_t*, char*, size_t, wchar_t, mbstate_t*); static int (__cdecl *p_tolower)(int); @@ -2880,6 +2881,82 @@ static void test_wctob(void) _setmbcp(cp); } +static void test_btowc(void) +{ + wint_t ret; + int cp = _getmbcp(); + + if(!p_btowc || !setlocale(LC_ALL, "chinese-traditional")) { + win_skip("Skipping btowc tests\n"); + return; + } + + ret = p_btowc(EOF); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + _setmbcp(1250); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == WEOF, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == WEOF, "ret = %x\n", ret); + + if(!setlocale(LC_CTYPE, ".1250")) { + win_skip("No codepage 1250 support\n"); + setlocale(LC_ALL, "C"); + _setmbcp(cp); + return; + } + + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0x155, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0x155, "ret = %x\n", ret); + + setlocale(LC_ALL, "C"); + ret = p_btowc(0x61); + ok(ret == 0x61, "ret = %x\n", ret); + + ret = p_btowc(0x81); + ok(ret == 0x81, "ret = %x\n", ret); + + ret = p_btowc(0x9f); + ok(ret == 0x9f, "ret = %x\n", ret); + + ret = p_btowc(0xe0); + ok(ret == 0xe0, "ret = %x\n", ret); + + ret = p_btowc(0x100); + ok(ret == 0x00, "ret = %x\n", ret); + + ret = p_btowc(0x1e0); + ok(ret == 0xe0, "ret = %x\n", ret); + + _setmbcp(cp); +} + static void test_wctomb(void) { mbstate_t state; @@ -4127,6 +4204,7 @@ START_TEST(string) p_wcslwr_s = (void*)GetProcAddress(hMsvcrt, "_wcslwr_s"); p_mbsupr_s = (void*)GetProcAddress(hMsvcrt, "_mbsupr_s"); p_mbslwr_s = (void*)GetProcAddress(hMsvcrt, "_mbslwr_s"); + p_btowc = (void*)GetProcAddress(hMsvcrt, "btowc"); p_wctob = (void*)GetProcAddress(hMsvcrt, "wctob"); p_wcrtomb = (void*)GetProcAddress(hMsvcrt, "wcrtomb"); p_wcrtomb_s = (void*)GetProcAddress(hMsvcrt, "wcrtomb_s"); @@ -4204,6 +4282,7 @@ START_TEST(string) test__mbsupr_s(); test__mbslwr_s(); test_wctob(); + test_btowc(); test_wctomb(); test__atodbl(); test__stricmp(); -- 2.24.0

2 1

[PATCH vkd3d 30/41] vkd3d-shader: Hook up RT output swizzle path in DXIL.
by Hans-Kristian Arntzen 29 Jan '20

29 Jan '20

Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> --- libs/vkd3d-shader/dxil.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index f3fb5a3..2a363c4 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -394,6 +394,18 @@ int vkd3d_shader_compile_dxil(const struct vkd3d_shader_code *dxbc, goto end; } } + + if (compiler_args->output_swizzle_count != 0) + { + const dxil_spv_option_output_swizzle helper = + { { DXIL_SPV_OPTION_OUTPUT_SWIZZLE }, compiler_args->output_swizzles, compiler_args->output_swizzle_count }; + if (dxil_spv_converter_add_option(converter, &helper.base) != DXIL_SPV_SUCCESS) + { + ERR("dxil-spirv does not support OUTPUT_SWIZZLE.\n"); + ret = VKD3D_ERROR_NOT_IMPLEMENTED; + goto end; + } + } } dxil_spv_converter_set_root_constant_word_count(converter, root_constant_words); -- 2.25.0

2 11