September 2018 - Wine-Devel

[PATCH 1/6] opcservices/tests: Fix uninitialized variable access (Valgrind).
by Nikolay Sivov Sept. 13, 2018

Sept. 13, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/tests/opcservices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index f6194609ed..a9c25a5924 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -518,7 +518,7 @@ static void test_rel_part_uri(void) IOpcPartUri *rel_uri2; IOpcUri *source_uri2; IUnknown *unk = NULL; - BOOL ret; + BOOL ret = FALSE; BSTR str; hr = IOpcPartUri_GetSourceUri(rel_uri, &source_uri); -- 2.18.0

1 5

[PATCH] wine.inf: Add TCP/IP DataBasePath value
by Alex Henrie Sept. 12, 2018

Sept. 12, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45821 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index f10284bedc..e1f7bc386c 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3417,6 +3417,7 @@ HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe HKLM,"System\CurrentControlSet\Services\Eventlog\Application",,16 HKLM,"System\CurrentControlSet\Services\Eventlog\System","Sources",0x10000,"" HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters",,16 +HKLM,"System\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",2,"%SystemRoot%\System32\drivers" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 HKLM,"System\CurrentControlSet\Services\Winsock\Parameters",,16 HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Catalog_Entries",,16 -- 2.19.0

1 0

[PATCH 2/2] mfplat: Implement MFCreateSample
by Alistair Leslie-Hughes Sept. 12, 2018

Sept. 12, 2018

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45617 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 17 ++ include/mfapi.h | 1 + 4 files changed, 462 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index ff04429..de3926f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2349,3 +2349,446 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) return S_OK; } + +typedef struct _mfsample +{ + mfattributes attributes; + IMFSample IMFSample_iface; +} mfsample; + +static inline mfsample *impl_from_IMFSample(IMFSample *iface) +{ + return CONTAINING_RECORD(iface, mfsample, IMFSample_iface); +} + +static HRESULT WINAPI mfsample_QueryInterface(IMFSample *iface, REFIID riid, void **out) +{ + mfsample *This = impl_from_IMFSample(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFAttributes) || + IsEqualGUID(riid, &IID_IMFSample)) + { + *out = &This->IMFSample_iface; + } + else + { + FIXME("(%s, %p)\n", debugstr_guid(riid), out); + *out = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*out); + return S_OK; +} + +static ULONG WINAPI mfsample_AddRef(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + ULONG ref = InterlockedIncrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfsample_Release(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + ULONG ref = InterlockedDecrement(&This->attributes.ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfsample_GetItem(IMFSample *iface, REFGUID key, PROPVARIANT *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetItemType(IMFSample *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); +} + +static HRESULT WINAPI mfsample_CompareItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); +} + +static HRESULT WINAPI mfsample_Compare(IMFSample *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, + BOOL *result) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result); +} + +static HRESULT WINAPI mfsample_GetUINT32(IMFSample *iface, REFGUID key, UINT32 *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetUINT64(IMFSample *iface, REFGUID key, UINT64 *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetDouble(IMFSample *iface, REFGUID key, double *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetGUID(IMFSample *iface, REFGUID key, GUID *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_GetStringLength(IMFSample *iface, REFGUID key, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); +} + +static HRESULT WINAPI mfsample_GetString(IMFSample *iface, REFGUID key, WCHAR *value, + UINT32 size, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); +} + +static HRESULT WINAPI mfsample_GetAllocatedString(IMFSample *iface, REFGUID key, + WCHAR **value, UINT32 *length) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); +} + +static HRESULT WINAPI mfsample_GetBlobSize(IMFSample *iface, REFGUID key, UINT32 *size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); +} + +static HRESULT WINAPI mfsample_GetBlob(IMFSample *iface, REFGUID key, UINT8 *buf, + UINT32 bufsize, UINT32 *blobsize) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); +} + +static HRESULT WINAPI mfsample_GetAllocatedBlob(IMFSample *iface, REFGUID key, UINT8 **buf, UINT32 *size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfsample_GetUnknown(IMFSample *iface, REFGUID key, REFIID riid, void **ppv) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); +} + +static HRESULT WINAPI mfsample_SetItem(IMFSample *iface, REFGUID key, REFPROPVARIANT value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_DeleteItem(IMFSample *iface, REFGUID key) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); +} + +static HRESULT WINAPI mfsample_DeleteAllItems(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_SetUINT32(IMFSample *iface, REFGUID key, UINT32 value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetUINT64(IMFSample *iface, REFGUID key, UINT64 value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetDouble(IMFSample *iface, REFGUID key, double value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetGUID(IMFSample *iface, REFGUID key, REFGUID value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetString(IMFSample *iface, REFGUID key, const WCHAR *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); +} + +static HRESULT WINAPI mfsample_SetBlob(IMFSample *iface, REFGUID key, const UINT8 *buf, UINT32 size) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); +} + +static HRESULT WINAPI mfsample_SetUnknown(IMFSample *iface, REFGUID key, IUnknown *unknown) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); +} + +static HRESULT WINAPI mfsample_LockStore(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_UnlockStore(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); +} + +static HRESULT WINAPI mfsample_GetCount(IMFSample *iface, UINT32 *items) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); +} + +static HRESULT WINAPI mfsample_GetItemByIndex(IMFSample *iface, UINT32 index, GUID *key, PROPVARIANT *value) +{ + mfsample *This = impl_from_IMFSample(iface); + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); +} + +static HRESULT WINAPI mfsample_CopyAllItems(IMFSample *iface, IMFAttributes *dest) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, dest); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleFlags(IMFSample *iface, DWORD *flags) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleFlags(IMFSample *iface, DWORD flags) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %x\n", This, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleTime(IMFSample *iface, LONGLONG *sampletime) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, sampletime); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleTime(IMFSample *iface, LONGLONG sampletime) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(sampletime)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetSampleDuration(IMFSample *iface, LONGLONG *duration) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, duration); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_SetSampleDuration(IMFSample *iface, LONGLONG duration) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(duration)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetBufferCount(IMFSample *iface, DWORD *count) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, count); + + if(*count) + *count = 0; + + return S_OK; +} + +static HRESULT WINAPI mfsample_GetBufferByIndex(IMFSample *iface, DWORD index, IMFMediaBuffer **buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %u, %p\n", This, index, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_ConvertToContiguousBuffer(IMFSample *iface, IMFMediaBuffer **buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_AddBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_RemoveBufferByIndex(IMFSample *iface, DWORD index) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %u\n", This, index); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_RemoveAllBuffers(IMFSample *iface) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_GetTotalLength(IMFSample *iface, DWORD *length) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfsample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buffer) +{ + mfsample *This = impl_from_IMFSample(iface); + + FIXME("%p, %p\n", This, buffer); + + return E_NOTIMPL; +} + +static const IMFSampleVtbl mfsample_vtbl = +{ + mfsample_QueryInterface, + mfsample_AddRef, + mfsample_Release, + mfsample_GetItem, + mfsample_GetItemType, + mfsample_CompareItem, + mfsample_Compare, + mfsample_GetUINT32, + mfsample_GetUINT64, + mfsample_GetDouble, + mfsample_GetGUID, + mfsample_GetStringLength, + mfsample_GetString, + mfsample_GetAllocatedString, + mfsample_GetBlobSize, + mfsample_GetBlob, + mfsample_GetAllocatedBlob, + mfsample_GetUnknown, + mfsample_SetItem, + mfsample_DeleteItem, + mfsample_DeleteAllItems, + mfsample_SetUINT32, + mfsample_SetUINT64, + mfsample_SetDouble, + mfsample_SetGUID, + mfsample_SetString, + mfsample_SetBlob, + mfsample_SetUnknown, + mfsample_LockStore, + mfsample_UnlockStore, + mfsample_GetCount, + mfsample_GetItemByIndex, + mfsample_CopyAllItems, + mfsample_GetSampleFlags, + mfsample_SetSampleFlags, + mfsample_GetSampleTime, + mfsample_SetSampleTime, + mfsample_GetSampleDuration, + mfsample_SetSampleDuration, + mfsample_GetBufferCount, + mfsample_GetBufferByIndex, + mfsample_ConvertToContiguousBuffer, + mfsample_AddBuffer, + mfsample_RemoveBufferByIndex, + mfsample_RemoveAllBuffers, + mfsample_GetTotalLength, + mfsample_CopyToBuffer +}; + +HRESULT WINAPI MFCreateSample(IMFSample **sample) +{ + mfsample *object; + + TRACE("%p\n", sample); + + object = heap_alloc(sizeof(*object)); + if(!object) + return E_OUTOFMEMORY; + + init_attribute_object(&object->attributes, 0); + object->IMFSample_iface.lpVtbl = &mfsample_vtbl; + *sample = &object->IMFSample_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index f606447..1ab2826 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -55,7 +55,7 @@ @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor -@ stub MFCreateSample +@ stdcall MFCreateSample(ptr) @ stub MFCreateSocket @ stub MFCreateSocketListener @ stdcall MFCreateSourceResolver(ptr) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ccbbfb7..17cdc46 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -363,6 +363,22 @@ static void test_MFCreateMemoryBuffer(void) IMFMediaBuffer_Release(buffer); } +static void test_MFSample(void) +{ + IMFSample *sample; + HRESULT hr; + UINT32 count; + + hr = MFCreateSample( &sample ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFSample_GetBufferCount(sample, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 0, "got %d\n", count); + + IMFSample_Release(sample); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -373,6 +389,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFSample(); test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); diff --git a/include/mfapi.h b/include/mfapi.h index 5b98187..45449b1 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -67,6 +67,7 @@ HRESULT WINAPI MFCancelWorkItem(MFWORKITEM_KEY key); HRESULT WINAPI MFCreateAttributes(IMFAttributes **attributes, UINT32 size); HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue); HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); +HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, -- 1.9.1

1 0

[PATCH 1/2] mfplat: Forward IMFStreamDescriptor to IMFAttributes
by Alistair Leslie-Hughes Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 164 ++++++++++++----------------------------------------- 1 file changed, 37 insertions(+), 127 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1c10561..ff04429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1855,8 +1855,8 @@ HRESULT WINAPI MFCreateEventQueue(IMFMediaEventQueue **queue) typedef struct _mfdescriptor { + mfattributes attributes; IMFStreamDescriptor IMFStreamDescriptor_iface; - LONG ref; } mfdescriptor; static inline mfdescriptor *impl_from_IMFStreamDescriptor(IMFStreamDescriptor *iface) @@ -1890,7 +1890,7 @@ static HRESULT WINAPI mfdescriptor_QueryInterface(IMFStreamDescriptor *iface, RE static ULONG WINAPI mfdescriptor_AddRef(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - ULONG ref = InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); @@ -1900,13 +1900,13 @@ static ULONG WINAPI mfdescriptor_AddRef(IMFStreamDescriptor *iface) static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - ULONG ref = InterlockedDecrement(&This->ref); + ULONG ref = InterlockedDecrement(&This->attributes.ref); TRACE("(%p) ref=%u\n", This, ref); if (!ref) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -1915,269 +1915,179 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) static HRESULT WINAPI mfdescriptor_GetItem(IMFStreamDescriptor *iface, REFGUID key, PROPVARIANT *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetItemType(IMFStreamDescriptor *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), type); - - return E_NOTIMPL; + return IMFAttributes_GetItemType(&This->attributes.IMFAttributes_iface, key, type); } static HRESULT WINAPI mfdescriptor_CompareItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value, BOOL *result) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, result); - - return E_NOTIMPL; + return IMFAttributes_CompareItem(&This->attributes.IMFAttributes_iface, key, value, result); } static HRESULT WINAPI mfdescriptor_Compare(IMFStreamDescriptor *iface, IMFAttributes *theirs, MF_ATTRIBUTES_MATCH_TYPE type, BOOL *result) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %p, %d, %p\n", This, theirs, type, result); - - return E_NOTIMPL; + return IMFAttributes_Compare(&This->attributes.IMFAttributes_iface, theirs, type, result); } static HRESULT WINAPI mfdescriptor_GetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetDouble(IMFStreamDescriptor *iface, REFGUID key, double *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetGUID(IMFStreamDescriptor *iface, REFGUID key, GUID *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_GetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_GetStringLength(IMFStreamDescriptor *iface, REFGUID key, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), length); - - return E_NOTIMPL; + return IMFAttributes_GetStringLength(&This->attributes.IMFAttributes_iface, key, length); } static HRESULT WINAPI mfdescriptor_GetString(IMFStreamDescriptor *iface, REFGUID key, WCHAR *value, UINT32 size, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), value, size, length); - - return E_NOTIMPL; + return IMFAttributes_GetString(&This->attributes.IMFAttributes_iface, key, value, size, length); } static HRESULT WINAPI mfdescriptor_GetAllocatedString(IMFStreamDescriptor *iface, REFGUID key, WCHAR **value, UINT32 *length) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), value, length); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedString(&This->attributes.IMFAttributes_iface, key, value, length); } static HRESULT WINAPI mfdescriptor_GetBlobSize(IMFStreamDescriptor *iface, REFGUID key, UINT32 *size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), size); - - return E_NOTIMPL; + return IMFAttributes_GetBlobSize(&This->attributes.IMFAttributes_iface, key, size); } static HRESULT WINAPI mfdescriptor_GetBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 *buf, UINT32 bufsize, UINT32 *blobsize) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d, %p\n", This, debugstr_guid(key), buf, bufsize, blobsize); - - return E_NOTIMPL; + return IMFAttributes_GetBlob(&This->attributes.IMFAttributes_iface, key, buf, bufsize, blobsize); } static HRESULT WINAPI mfdescriptor_GetAllocatedBlob(IMFStreamDescriptor *iface, REFGUID key, UINT8 **buf, UINT32 *size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %p\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_GetAllocatedBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mfdescriptor_GetUnknown(IMFStreamDescriptor *iface, REFGUID key, REFIID riid, void **ppv) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s, %p\n", This, debugstr_guid(key), debugstr_guid(riid), ppv); - - return E_NOTIMPL; + return IMFAttributes_GetUnknown(&This->attributes.IMFAttributes_iface, key, riid, ppv); } -static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT WINAPI mfdescriptor_SetItem(IMFStreamDescriptor *iface, REFGUID key, REFPROPVARIANT value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); - - return E_NOTIMPL; + return IMFAttributes_SetItem(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_DeleteItem(IMFStreamDescriptor *iface, REFGUID key) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s\n", This, debugstr_guid(key)); - - return E_NOTIMPL; + return IMFAttributes_DeleteItem(&This->attributes.IMFAttributes_iface, key); } static HRESULT WINAPI mfdescriptor_DeleteAllItems(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_DeleteAllItems(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_SetUINT32(IMFStreamDescriptor *iface, REFGUID key, UINT32 value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetUINT32(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetUINT64(IMFStreamDescriptor *iface, REFGUID key, UINT64 value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - - return E_NOTIMPL; + return IMFAttributes_SetUINT64(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetDouble(IMFStreamDescriptor *iface, REFGUID key, double value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %f\n", This, debugstr_guid(key), value); - - return E_NOTIMPL; + return IMFAttributes_SetDouble(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetGUID(IMFStreamDescriptor *iface, REFGUID key, REFGUID value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_guid(value)); - - return E_NOTIMPL; + return IMFAttributes_SetGUID(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetString(IMFStreamDescriptor *iface, REFGUID key, const WCHAR *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %s\n", This, debugstr_guid(key), debugstr_w(value)); - - return E_NOTIMPL; + return IMFAttributes_SetString(&This->attributes.IMFAttributes_iface, key, value); } static HRESULT WINAPI mfdescriptor_SetBlob(IMFStreamDescriptor *iface, REFGUID key, const UINT8 *buf, UINT32 size) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p, %d\n", This, debugstr_guid(key), buf, size); - - return E_NOTIMPL; + return IMFAttributes_SetBlob(&This->attributes.IMFAttributes_iface, key, buf, size); } static HRESULT WINAPI mfdescriptor_SetUnknown(IMFStreamDescriptor *iface, REFGUID key, IUnknown *unknown) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %s, %p\n", This, debugstr_guid(key), unknown); - - return E_NOTIMPL; + return IMFAttributes_SetUnknown(&This->attributes.IMFAttributes_iface, key, unknown); } static HRESULT WINAPI mfdescriptor_LockStore(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_LockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_UnlockStore(IMFStreamDescriptor *iface) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p\n", This); - - return E_NOTIMPL; + return IMFAttributes_UnlockStore(&This->attributes.IMFAttributes_iface); } static HRESULT WINAPI mfdescriptor_GetCount(IMFStreamDescriptor *iface, UINT32 *items) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %p\n", This, items); - - if(items) - *items = 0; - - return E_NOTIMPL; + return IMFAttributes_GetCount(&This->attributes.IMFAttributes_iface, items); } static HRESULT WINAPI mfdescriptor_GetItemByIndex(IMFStreamDescriptor *iface, UINT32 index, GUID *key, PROPVARIANT *value) { mfdescriptor *This = impl_from_IMFStreamDescriptor(iface); - - FIXME("%p, %d, %p, %p\n", This, index, key, value); - - return E_NOTIMPL; + return IMFAttributes_GetItemByIndex(&This->attributes.IMFAttributes_iface, index, key, value); } static HRESULT WINAPI mfdescriptor_CopyAllItems(IMFStreamDescriptor *iface, IMFAttributes *dest) @@ -2253,14 +2163,14 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, TRACE("%d, %d, %p, %p\n", identifier, count, types, descriptor); - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); + object = heap_alloc(sizeof(*object)); if(!object) return E_OUTOFMEMORY; - object->ref = 1; + init_attribute_object(&object->attributes, 0); object->IMFStreamDescriptor_iface.lpVtbl = &mfdescriptor_vtbl; - *descriptor = &object->IMFStreamDescriptor_iface; + return S_OK; } -- 1.9.1

1 0

[PATCH] wbemprox: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wbemprox/builtin.c | 20 ++++++++++---------- dlls/wbemprox/class.c | 4 ++-- dlls/wbemprox/query.c | 2 +- dlls/wbemprox/reg.c | 2 +- dlls/wbemprox/wbemlocator.c | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9fe22d0034..a695e7c516 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -1782,7 +1782,7 @@ static WCHAR *get_file_version( const WCHAR *filename ) void *block; WCHAR *ret; - if (!(ret = heap_alloc( (4 * 5 + sizeof(fmtW) / sizeof(fmtW[0])) * sizeof(WCHAR) ))) return NULL; + if (!(ret = heap_alloc( (4 * 5 + ARRAY_SIZE( fmtW )) * sizeof(WCHAR) ))) return NULL; if (!(size = GetFileVersionInfoSizeW( filename, NULL )) || !(block = heap_alloc( size ))) { heap_free( ret ); @@ -2041,7 +2041,7 @@ static enum fill_status fill_diskdrive( struct table *table, const struct expr * { static const WCHAR fmtW[] = {'\\','\\','\\','\\','.','\\','\\','P','H','Y','S','I','C','A','L','D','R','I','V','E','%','u',0}; - WCHAR device_id[sizeof(fmtW)/sizeof(fmtW[0]) + 10], root[] = {'A',':','\\',0}; + WCHAR device_id[ARRAY_SIZE( fmtW ) + 10], root[] = {'A',':','\\',0}; struct record_diskdrive *rec; UINT i, row = 0, offset = 0, index = 0, type; UINT64 size = 1024 * 1024 * 1024; @@ -2208,7 +2208,7 @@ static enum fill_status fill_ip4routetable( struct table *table, const struct ex static WCHAR *get_volumename( const WCHAR *root ) { WCHAR buf[MAX_PATH + 1] = {0}; - GetVolumeInformationW( root, buf, sizeof(buf)/sizeof(buf[0]), NULL, NULL, NULL, NULL, 0 ); + GetVolumeInformationW( root, buf, ARRAY_SIZE( buf ), NULL, NULL, NULL, NULL, 0 ); return heap_strdupW( buf ); } static WCHAR *get_volumeserialnumber( const WCHAR *root ) @@ -2378,7 +2378,7 @@ static WCHAR *get_dnshostname( IP_ADAPTER_UNICAST_ADDRESS *addr ) WCHAR buf[WS_NI_MAXHOST]; if (!addr) return NULL; - if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, sizeof(buf)/sizeof(buf[0]), NULL, + if (GetNameInfoW( sa->lpSockaddr, sa->iSockaddrLength, buf, ARRAY_SIZE( buf ), NULL, 0, WS_NI_NAMEREQD )) return NULL; return heap_strdupW( buf ); } @@ -2400,7 +2400,7 @@ static struct array *get_defaultipgateway( IP_ADAPTER_GATEWAY_ADDRESS *list ) } for (gateway = list; gateway; gateway = gateway->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( gateway->Address.lpSockaddr, gateway->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2432,7 +2432,7 @@ static struct array *get_dnsserversearchorder( IP_ADAPTER_DNS_SERVER_ADDRESS *li } for (server = list; server; server = server->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( server->Address.lpSockaddr, server->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2465,7 +2465,7 @@ static struct array *get_ipaddress( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) } for (address = list; address; address = address->Next) { - buflen = sizeof(buf)/sizeof(buf[0]); + buflen = ARRAY_SIZE( buf ); if (WSAAddressToStringW( address->Address.lpSockaddr, address->Address.iSockaddrLength, NULL, buf, &buflen) || !(ptr[i++] = heap_strdupW( buf ))) { @@ -2501,7 +2501,7 @@ static struct array *get_ipsubnet( IP_ADAPTER_UNICAST_ADDRESS_LH *list ) { WCHAR buf[INET_ADDRSTRLEN]; SOCKADDR_IN addr; - ULONG buflen = sizeof(buf)/sizeof(buf[0]); + ULONG buflen = ARRAY_SIZE( buf ); memset( &addr, 0, sizeof(addr) ); addr.sin_family = WS_AF_INET; @@ -3058,7 +3058,7 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) {'8','.','1',' ','P','r','o',0}; static const WCHAR win10W[] = {'1','0',' ','P','r','o',0}; - int len = sizeof(windowsW)/sizeof(windowsW[0]); + int len = ARRAY_SIZE( windowsW ); WCHAR *ret; if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; @@ -3240,7 +3240,7 @@ static enum fill_status fill_service( struct table *table, const struct expr *co ENUM_SERVICE_STATUS_PROCESSW *tmp, *services = NULL; SERVICE_STATUS_PROCESS *status; WCHAR sysnameW[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(sysnameW) / sizeof(sysnameW[0]); + DWORD len = ARRAY_SIZE( sysnameW ); UINT i, row = 0, offset = 0, size = 256, needed, count; enum fill_status fill_status = FILL_STATUS_FAILED; BOOL ret; diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 27229bd69a..92c110f5f4 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -582,7 +582,7 @@ static BSTR get_body_text( const struct table *table, UINT row, UINT *len ) { if ((value = get_value_bstr( table, row, i ))) { - *len += sizeof(fmtW) / sizeof(fmtW[0]); + *len += ARRAY_SIZE( fmtW ); *len += strlenW( table->columns[i].name ); *len += SysStringLen( value ); SysFreeString( value ); @@ -608,7 +608,7 @@ static BSTR get_object_text( const struct view *view, UINT index ) UINT len, len_body, row = view->result[index]; BSTR ret, body; - len = sizeof(fmtW) / sizeof(fmtW[0]); + len = ARRAY_SIZE( fmtW ); len += strlenW( view->table->name ); if (!(body = get_body_text( view->table, row, &len_body ))) return NULL; len += len_body; diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 76f5caa634..8a51266298 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -507,7 +507,7 @@ static BOOL is_system_prop( const WCHAR *name ) static BSTR build_servername( const struct view *view ) { WCHAR server[MAX_COMPUTERNAME_LENGTH + 1], *p; - DWORD len = sizeof(server)/sizeof(server[0]); + DWORD len = ARRAY_SIZE( server ); if (view->proplist) return NULL; diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index 9232db793b..79440dac8d 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -82,7 +82,7 @@ static HRESULT enum_key( HKEY root, const WCHAR *subkey, VARIANT *names, VARIANT HRESULT hr = S_OK; WCHAR buf[256]; BSTR *strings, *tmp; - DWORD count = 2, len = sizeof(buf)/sizeof(buf[0]); + DWORD count = 2, len = ARRAY_SIZE( buf ); LONG res, i = 0; TRACE("%p, %s\n", root, debugstr_w(subkey)); diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 6ed0aed59e..fe26a871b5 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -91,7 +91,7 @@ static BOOL is_local_machine( const WCHAR *server ) static const WCHAR dotW[] = {'.',0}; static const WCHAR localhostW[] = {'l','o','c','a','l','h','o','s','t',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmpW( server, dotW ) || !strcmpiW( server, localhostW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; @@ -133,7 +133,7 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na p = q; while (*q && *q != '\\' && *q != '/') q++; len = q - p; - if (len >= sizeof(rootW) / sizeof(rootW[0]) && memicmpW( rootW, p, len )) goto done; + if (len >= ARRAY_SIZE( rootW ) && memicmpW( rootW, p, len )) goto done; if (!*q) { hr = S_OK; @@ -141,8 +141,8 @@ static HRESULT parse_resource( const WCHAR *resource, WCHAR **server, WCHAR **na } q++; len = strlenW( q ); - if ((len != sizeof(cimv2W) / sizeof(cimv2W[0]) || memicmpW( q, cimv2W, len )) && - (len != sizeof(defaultW) / sizeof(defaultW[0]) || memicmpW( q, defaultW, len ))) + if ((len != ARRAY_SIZE( cimv2W ) || memicmpW( q, cimv2W, len )) && + (len != ARRAY_SIZE( defaultW ) || memicmpW( q, defaultW, len ))) goto done; if (!(*namespace = heap_alloc( (len + 1) * sizeof(WCHAR) ))) hr = E_OUTOFMEMORY; else -- 2.14.4

2 2

[PATCH 3/3] mshtml: Expose CSS properties names from style object via IHTMLCSSStyleDeclaration dispids.
by Jacek Caban Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 584 ++++++++++++++++++++++++++++++++------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 494 insertions(+), 91 deletions(-)

1 0

[PATCH 2/3] mshtml: Expose IHTMLCSSStyleDeclaration interface to scripts.
by Jacek Caban Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 9 ++++++++- dlls/mshtml/tests/documentmode.js | 27 +++++++++++++++++++++++++++ dlls/mshtml/tests/elements.js | 37 ++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] mshtml: Use dispex_compat_mode in update_filter.
by Jacek Caban Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)

1 0

[PATCH] ws2_32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc Sept. 12, 2018

Sept. 12, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 914df17aba..164a48ce75 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1341,7 +1341,7 @@ static int convert_flags(int flags) int i, out; if (!flags) return 0; - for (out = i = 0; flags && i < sizeof(ws_flags_map) / sizeof(ws_flags_map[0]); i++) + for (out = i = 0; flags && i < ARRAY_SIZE(ws_flags_map); i++) { if (ws_flags_map[i][0] & flags) { @@ -1370,7 +1370,7 @@ static int convert_sockopt(INT *level, INT *optname) { case WS_SOL_SOCKET: *level = SOL_SOCKET; - for(i=0; i<sizeof(ws_sock_map)/sizeof(ws_sock_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_sock_map); i++) { if( ws_sock_map[i][0] == *optname ) { *optname = ws_sock_map[i][1]; @@ -1381,7 +1381,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_TCP: *level = IPPROTO_TCP; - for(i=0; i<sizeof(ws_tcp_map)/sizeof(ws_tcp_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_tcp_map); i++) { if ( ws_tcp_map[i][0] == *optname ) { *optname = ws_tcp_map[i][1]; @@ -1392,7 +1392,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IP: *level = IPPROTO_IP; - for(i=0; i<sizeof(ws_ip_map)/sizeof(ws_ip_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ip_map); i++) { if (ws_ip_map[i][0] == *optname ) { *optname = ws_ip_map[i][1]; @@ -1403,7 +1403,7 @@ static int convert_sockopt(INT *level, INT *optname) break; case WS_IPPROTO_IPV6: *level = IPPROTO_IPV6; - for(i=0; i<sizeof(ws_ipv6_map)/sizeof(ws_ipv6_map[0]); i++) { + for(i = 0; i < ARRAY_SIZE(ws_ipv6_map); i++) { if (ws_ipv6_map[i][0] == *optname ) { *optname = ws_ipv6_map[i][1]; @@ -1484,7 +1484,7 @@ static int convert_af_w2u(int windowsaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][0] == windowsaf) return ws_af_map[i][1]; FIXME("unhandled Windows address family %d\n", windowsaf); @@ -1495,7 +1495,7 @@ static int convert_af_u2w(int unixaf) { unsigned int i; - for (i=0;i<sizeof(ws_af_map)/sizeof(ws_af_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_af_map); i++) if (ws_af_map[i][1] == unixaf) return ws_af_map[i][0]; FIXME("unhandled UNIX address family %d\n", unixaf); @@ -1506,7 +1506,7 @@ static int convert_proto_w2u(int windowsproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][0] == windowsproto) return ws_proto_map[i][1]; @@ -1522,7 +1522,7 @@ static int convert_proto_u2w(int unixproto) { unsigned int i; - for (i=0;i<sizeof(ws_proto_map)/sizeof(ws_proto_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_proto_map); i++) if (ws_proto_map[i][1] == unixproto) return ws_proto_map[i][0]; @@ -1539,7 +1539,7 @@ static int convert_socktype_w2u(int windowssocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][0] == windowssocktype) return ws_socktype_map[i][1]; FIXME("unhandled Windows socket type %d\n", windowssocktype); @@ -1550,7 +1550,7 @@ static int convert_socktype_u2w(int unixsocktype) { unsigned int i; - for (i=0;i<sizeof(ws_socktype_map)/sizeof(ws_socktype_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_socktype_map); i++) if (ws_socktype_map[i][1] == unixsocktype) return ws_socktype_map[i][0]; FIXME("unhandled UNIX socket type %d\n", unixsocktype); @@ -1560,7 +1560,7 @@ convert_socktype_u2w(int unixsocktype) { static int convert_poll_w2u(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][0] & events) { @@ -1577,7 +1577,7 @@ static int convert_poll_w2u(int events) static int convert_poll_u2w(int events) { int i, ret; - for (i = ret = 0; events && i < sizeof(ws_poll_map) / sizeof(ws_poll_map[0]); i++) + for (i = ret = 0; events && i < ARRAY_SIZE(ws_poll_map); i++) { if (ws_poll_map[i][1] & events) { @@ -1752,7 +1752,7 @@ static inline BOOL supported_pf(int pf) static inline BOOL supported_protocol(int protocol) { int i; - for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(valid_protocols); i++) if (protocol == valid_protocols[i]) return TRUE; return FALSE; @@ -4914,7 +4914,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID BOOL found = FALSE; unsigned int i; - for (i = 0; i < sizeof(guid_funcs) / sizeof(guid_funcs[0]); i++) + for (i = 0; i < ARRAY_SIZE(guid_funcs); i++) { if (IsEqualGUID(&guid_funcs[i].guid, in_buff)) { @@ -6478,7 +6478,7 @@ struct WS_protoent* WINAPI WS_getprotobyname(const char* name) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (strcasecmp( protocols[i].names[0], name )) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6512,7 +6512,7 @@ struct WS_protoent* WINAPI WS_getprotobynumber(int number) if (!retval) { unsigned int i; - for (i = 0; i < sizeof(protocols) / sizeof(protocols[0]); i++) + for (i = 0; i < ARRAY_SIZE(protocols); i++) { if (protocols[i].prot != number) continue; retval = WS_create_pe( protocols[i].names[0], (char **)protocols[i].names + 1, @@ -6586,7 +6586,7 @@ static int convert_aiflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][0] & winflags) { unixflags |= ws_aiflag_map[i][1]; winflags &= ~ws_aiflag_map[i][0]; @@ -6600,7 +6600,7 @@ static int convert_niflag_w2u(int winflags) { unsigned int i; int unixflags = 0; - for (i=0;i<sizeof(ws_niflag_map)/sizeof(ws_niflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_niflag_map); i++) if (ws_niflag_map[i][0] & winflags) { unixflags |= ws_niflag_map[i][1]; winflags &= ~ws_niflag_map[i][0]; @@ -6614,7 +6614,7 @@ static int convert_aiflag_u2w(int unixflags) { unsigned int i; int winflags = 0; - for (i=0;i<sizeof(ws_aiflag_map)/sizeof(ws_aiflag_map[0]);i++) + for (i = 0; i < ARRAY_SIZE(ws_aiflag_map); i++) if (ws_aiflag_map[i][1] & unixflags) { winflags |= ws_aiflag_map[i][0]; unixflags &= ~ws_aiflag_map[i][1]; @@ -8718,7 +8718,7 @@ INT WINAPI WSAAddressToStringW( LPSOCKADDR sockaddr, DWORD len, if (ret) return ret; - MultiByteToWideChar( CP_ACP, 0, bufAddr, size, buffer, sizeof( buffer )/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, bufAddr, size, buffer, ARRAY_SIZE(buffer)); if (*lenstr < size) { -- 2.14.4

1 0

[PATCH v4 01/10] shell32/autocomplete: Fix a vulnerability by avoiding the use of snprintf
by Gabriel Ivăncescu Sept. 12, 2018

Sept. 12, 2018

The quickComplete format can have more than one % argument, or stuff like %*.* or %1234s, which can be exploited since the format string can be read from the registry, so handle it manually instead of using sprintf. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v4: Return the length to not overestimate. dlls/shell32/autocomplete.c | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 4ec7387..587d41f 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,32 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static size_t format_quick_complete(WCHAR *dst, const WCHAR *qc, const WCHAR *str, size_t str_len) +{ + /* Replace the first %s directly without using snprintf, to avoid + exploits since the format string can be retrieved from the registry */ + WCHAR *base = dst; + UINT args = 0; + while (*qc != '\0') + { + if (qc[0] == '%') + { + if (args < 1 && qc[1] == 's') + { + memcpy(dst, str, str_len * sizeof(WCHAR)); + dst += str_len; + qc += 2; + args++; + continue; + } + qc += (qc[1] == '%'); + } + *dst++ = *qc++; + } + *dst = '\0'; + return dst - base; +} + static void destroy_autocomplete_object(IAutoCompleteImpl *ac) { ac->hwndEdit = NULL; @@ -109,7 +135,6 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, IAutoCompleteImpl *This = GetPropW(hwnd, autocomplete_propertyW); HRESULT hr; WCHAR hwndText[255]; - WCHAR *hwndQCText; RECT r; BOOL control, filled, displayall = FALSE; int cpt, height, sel; @@ -138,11 +163,16 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* If quickComplete is set and control is pressed, replace the string */ control = GetKeyState(VK_CONTROL) & 0x8000; if (control && This->quickComplete) { - hwndQCText = heap_alloc((lstrlenW(This->quickComplete)+lstrlenW(hwndText))*sizeof(WCHAR)); - sel = sprintfW(hwndQCText, This->quickComplete, hwndText); - SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)hwndQCText); - SendMessageW(hwnd, EM_SETSEL, 0, sel); - heap_free(hwndQCText); + WCHAR *buf; + size_t len = strlenW(hwndText); + size_t sz = strlenW(This->quickComplete) + 1 + len; + if ((buf = heap_alloc(sz * sizeof(WCHAR)))) + { + len = format_quick_complete(buf, This->quickComplete, hwndText, len); + SendMessageW(hwnd, WM_SETTEXT, 0, (LPARAM)buf); + SendMessageW(hwnd, EM_SETSEL, 0, len); + heap_free(buf); + } } ShowWindow(This->hwndListBox, SW_HIDE); -- 1.9.1

3 25