- wine-devel - winehq.org

[PATCH v2 3/4] mfplat: Implement MFCreateMFByteStreamOnStream
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 24 +++++ include/mfidl.idl | 1 + 4 files changed, 267 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_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 mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..f4b5014 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -37,6 +37,7 @@ #include "wine/test.h" static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); +static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -194,6 +195,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); + X(MFCreateMFByteStreamOnStream); #undef X } @@ -250,6 +252,27 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + if(!pMFCreateMFByteStreamOnStream) + { + win_skip("MFCreateMFByteStreamOnStream() not found\n"); + return; + } + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = pMFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +284,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") -- 1.9.1

1 0

[PATCH v2 2/4] mfplat: Add MFTUnregisterLocal stub
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */ -- 1.9.1

1 0

[PATCH v2 1/4] mfplat: Add MFTRegisterLocal stub
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 1.9.1

1 0

[PATCH 4/4] mfplat: Implement MFCreateMemoryBuffer
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45715 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 81 +++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2d87429..9f381ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2347,3 +2347,179 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, *descriptor = &object->IMFStreamDescriptor_iface; return S_OK; } + + +typedef struct _mfbuffer +{ + IMFMediaBuffer IMFMediaBuffer_iface; + LONG ref; + + BYTE *buffer; + DWORD max_length; + DWORD current; +} mfbuffer; + +static inline mfbuffer *impl_from_IMFMediaBuffer(IMFMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, mfbuffer, IMFMediaBuffer_iface); +} + +static HRESULT WINAPI mfbuffer_QueryInterface(IMFMediaBuffer *iface, REFIID riid, void **out) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFMediaBuffer)) + { + *out = &This->IMFMediaBuffer_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 mfbuffer_AddRef(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbuffer_Release(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + heap_free(This->buffer); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI mfbuffer_Lock(IMFMediaBuffer *iface, BYTE **buffer, DWORD *max, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p %p, %p\n", This, buffer, max, current); + + if(!buffer) + return E_INVALIDARG; + + *buffer = This->buffer; + if(max) + *max = This->max_length; + if(current) + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_Unlock(IMFMediaBuffer *iface) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetCurrentLength(IMFMediaBuffer *iface, DWORD *current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p\n", This); + + if(!current) + return E_INVALIDARG; + + *current = This->current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_SetCurrentLength(IMFMediaBuffer *iface, DWORD current) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %u\n", This, current); + + if(current > This->max_length) + return E_INVALIDARG; + + This->current = current; + + return S_OK; +} + +static HRESULT WINAPI mfbuffer_GetMaxLength(IMFMediaBuffer *iface, DWORD *max) +{ + mfbuffer *This = impl_from_IMFMediaBuffer(iface); + + TRACE("%p, %p\n", This, max); + + if(!max) + return E_INVALIDARG; + + *max = This->max_length; + + return S_OK; +} + +static const IMFMediaBufferVtbl mfbuffer_vtbl = +{ + mfbuffer_QueryInterface, + mfbuffer_AddRef, + mfbuffer_Release, + mfbuffer_Lock, + mfbuffer_Unlock, + mfbuffer_GetCurrentLength, + mfbuffer_SetCurrentLength, + mfbuffer_GetMaxLength +}; + +HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) +{ + mfbuffer *object; + BYTE *bytes; + + TRACE("%u, %p\n", max_length, buffer); + + if(!buffer) + return E_INVALIDARG; + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + bytes = heap_alloc( max_length ); + if(!bytes) + { + heap_free(object); + return E_OUTOFMEMORY; + } + + object->ref = 1; + object->max_length = max_length; + object->current = 0; + object->buffer = bytes; + object->IMFMediaBuffer_iface.lpVtbl = &mfbuffer_vtbl; + *buffer = &object->IMFMediaBuffer_iface; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d64420..42b0b86 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -51,7 +51,7 @@ @ stub MFCreateMediaEvent @ stdcall MFCreateMediaType(ptr) @ stub MFCreateMediaTypeFromRepresentation -@ stub MFCreateMemoryBuffer +@ stdcall MFCreateMemoryBuffer(long ptr) @ stub MFCreateMemoryStream @ stub MFCreatePathFromURL @ stub MFCreatePresentationDescriptor diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index a4cd9f3..a693117 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -266,6 +266,86 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream_Release(bytestream); } +static void test_MFCreateMemoryBuffer(void) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + DWORD length, max; + BYTE *data, *data2; + + hr = MFCreateMemoryBuffer(1024, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = MFCreateMemoryBuffer(0, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + if(buffer) + { + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + + IMFMediaBuffer_Release(buffer); + } + + hr = MFCreateMemoryBuffer(1024, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1024, "got %u\n", length); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 1025); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_SetCurrentLength(buffer, 10); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetCurrentLength(buffer, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + + length = 0; + max = 0; + hr = IMFMediaBuffer_Lock(buffer, NULL, &length, &max); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(length == 0, "got %u\n", length); + ok(max == 0, "got %u\n", length); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 10, "got %u\n", length); + ok(max == 1024, "got %u\n", max); + + /* Attempt to lock the bufer twice */ + hr = IMFMediaBuffer_Lock(buffer, &data2, &max, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(data == data2, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Lock(buffer, &data, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Extra Unlock */ + hr = IMFMediaBuffer_Unlock(buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IMFMediaBuffer_Release(buffer); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -277,6 +357,7 @@ START_TEST(mfplat) test_MFCreateMediaType(); test_MFCreateAttributes(); test_MFCreateMFByteStreamOnStream(); + test_MFCreateMemoryBuffer(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 890d7bd..5b98187 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 MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); HRESULT WINAPI MFGetTimerPeriodicity(DWORD *periodicity); HRESULT WINAPI MFTEnum(GUID category, UINT32 flags, MFT_REGISTER_TYPE_INFO *input_type, MFT_REGISTER_TYPE_INFO *output_type, IMFAttributes *attributes, -- 1.9.1

2 1

[PATCH 3/4] mfplat: Implement MFCreateMFByteStreamOnStream
by Alistair Leslie-Hughes 07 Sep '18

07 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45372 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 241 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 16 +++ include/mfidl.idl | 1 + 4 files changed, 259 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c36a5ef..2d87429 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -32,6 +32,7 @@ #include "mfidl.h" #include "mferror.h" +#include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -441,6 +442,246 @@ HRESULT WINAPI MFShutdown(void) return S_OK; } + +typedef struct _mfbytestream +{ + IMFByteStream IMFByteStream_iface; + LONG ref; +} mfbytestream; + +static inline mfbytestream *impl_from_IMFByteStream(IMFByteStream *iface) +{ + return CONTAINING_RECORD(iface, mfbytestream, IMFByteStream_iface); +} + +static HRESULT WINAPI mfbytestream_QueryInterface(IMFByteStream *iface, REFIID riid, void **out) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + + if(IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMFByteStream)) + { + *out = &This->IMFByteStream_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 mfbytestream_AddRef(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + return ref; +} + +static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%u\n", This, ref); + + if (!ref) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI mfbytestream_GetCapabilities(IMFByteStream *iface, DWORD *capabilities) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, capabilities); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetLength(IMFByteStream *iface, QWORD *length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, length); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(length)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_IsEndOfStream(IMFByteStream *iface, BOOL *endstream) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p\n", This, endstream); + + if(endstream) + *endstream = TRUE; + + return S_OK; +} + +static HRESULT WINAPI mfbytestream_Read(IMFByteStream *iface, BYTE *data, ULONG count, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *result, ULONG *byte_read) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, byte_read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p\n", This, data, count, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_BeginWrite(IMFByteStream *iface, const BYTE *data, ULONG count, + IMFAsyncCallback *callback, IUnknown *state) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %u, %p, %p\n", This, data, count, callback, state); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult *result, ULONG *written) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %p, %p\n", This, result, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, + DWORD flags, QWORD *current) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p, %u, %s, 0x%08x, %p\n", This, seek, wine_dbgstr_longlong(offset), flags, current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Flush(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) +{ + mfbytestream *This = impl_from_IMFByteStream(iface); + + FIXME("%p\n", This); + + return E_NOTIMPL; +} + +static const IMFByteStreamVtbl mfbytesteam_vtbl = +{ + mfbytestream_QueryInterface, + mfbytestream_AddRef, + mfbytestream_Release, + mfbytestream_GetCapabilities, + mfbytestream_GetLength, + mfbytestream_SetLength, + mfbytestream_GetCurrentPosition, + mfbytestream_SetCurrentPosition, + mfbytestream_IsEndOfStream, + mfbytestream_Read, + mfbytestream_BeginRead, + mfbytestream_EndRead, + mfbytestream_Write, + mfbytestream_BeginWrite, + mfbytestream_EndWrite, + mfbytestream_Seek, + mfbytestream_Flush, + mfbytestream_Close +}; + +HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream) +{ + mfbytestream *object; + + TRACE("(%p, %p): stub\n", stream, bytestream); + + object = heap_alloc( sizeof(*object) ); + if(!object) + return E_OUTOFMEMORY; + + object->ref = 1; + object->IMFByteStream_iface.lpVtbl = &mfbytesteam_vtbl; + + *bytestream = &object->IMFByteStream_iface; + + return S_OK; +} + static HRESULT WINAPI MFPluginControl_QueryInterface(IMFPluginControl *iface, REFIID riid, void **ppv) { if(IsEqualGUID(riid, &IID_IUnknown)) { diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1b33e2d..1d64420 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -45,7 +45,7 @@ @ stdcall MFCreateEventQueue(ptr) @ stub MFCreateFile @ stub MFCreateLegacyMediaBufferOnMFMediaBuffer -@ stub MFCreateMFByteStreamOnStream +@ stdcall MFCreateMFByteStreamOnStream(ptr ptr) @ stub MFCreateMFVideoFormatFromMFMediaType @ stub MFCreateMediaBufferWrapper @ stub MFCreateMediaEvent diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f3a4521..a4cd9f3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -250,6 +250,21 @@ static void test_MFCreateAttributes(void) IMFAttributes_Release(attributes); } +static void test_MFCreateMFByteStreamOnStream(void) +{ + IMFByteStream *bytestream; + IStream *stream; + HRESULT hr; + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = MFCreateMFByteStreamOnStream(stream, &bytestream ); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IStream_Release(stream); + IMFByteStream_Release(bytestream); +} START_TEST(mfplat) { @@ -261,6 +276,7 @@ START_TEST(mfplat) test_source_resolver(); test_MFCreateMediaType(); test_MFCreateAttributes(); + test_MFCreateMFByteStreamOnStream(); CoUninitialize(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index 12b351d..84be055 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -251,6 +251,7 @@ interface IMFGetService : IUnknown } cpp_quote("HRESULT WINAPI MFCreateMediaSession(IMFAttributes *config, IMFMediaSession **session);") +cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStream(IStream *stream, IMFByteStream **bytestream);" ) cpp_quote("HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver);") cpp_quote("HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD cMediaTypes,") cpp_quote(" IMFMediaType **types, IMFStreamDescriptor **descriptor);") -- 1.9.1

2 1

[PATCH 2/4] mfplat: Add MFTUnregisterLocal stub
by Alistair Leslie-Hughes 06 Sep '18

06 Sep '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 7 +++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c5c8ad8..c36a5ef 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -240,6 +240,13 @@ HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWST return S_OK; } +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory) +{ + FIXME("(%p)\n", factory); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index c143814..1b33e2d 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -141,7 +141,7 @@ @ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) -@ stub MFTUnregisterLocal +@ stdcall MFTUnregisterLocal(ptr) @ stub MFTUnregisterLocalByCLSID @ stub MFTraceError @ stub MFTraceFuncEnter diff --git a/include/mfapi.h b/include/mfapi.h index f889840..890d7bd 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -85,6 +85,7 @@ HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); HRESULT WINAPI MFTUnregister(CLSID clsid); +HRESULT WINAPI MFTUnregisterLocal(IClassFactory *factory); HRESULT WINAPI MFGetPluginControl(IMFPluginControl**); #endif /* __WINE_MFAPI_H */ -- 1.9.1

1 0

[PATCH 1/4] mfplat: Add MFTRegisterLocal stub
by Alistair Leslie-Hughes 06 Sep '18

06 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45622 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/mfplat/main.c | 10 ++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 3 +++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index df61f3c..c5c8ad8 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -230,6 +230,16 @@ HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags return hr; } +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types) +{ + FIXME("(%p, %s, %s, %x, %u, %p, %u, %p)\n", factory, debugstr_guid(category), debugstr_w(name), + flags, cinput, input_types, coutput, output_types); + + return S_OK; +} + static BOOL match_type(const WCHAR *clsid_str, const WCHAR *type_str, MFT_REGISTER_TYPE_INFO *type) { HKEY htransform, hfilter; diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index a66f4d1..c143814 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -138,7 +138,7 @@ @ stdcall MFTEnumEx(int128 long ptr ptr ptr ptr) @ stub MFTGetInfo @ stdcall MFTRegister(int128 int128 wstr long long ptr long ptr ptr) -@ stub MFTRegisterLocal +@ stub MFTRegisterLocal(ptr ptr wstr long long ptr long ptr) @ stub MFTRegisterLocalByCLSID @ stdcall MFTUnregister(int128) @ stub MFTUnregisterLocal diff --git a/include/mfapi.h b/include/mfapi.h index 5aead1e..f889840 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -78,6 +78,9 @@ HRESULT WINAPI MFLockPlatform(void); HRESULT WINAPI MFTRegister(CLSID clsid, GUID category, LPWSTR name, UINT32 flags, UINT32 cinput, MFT_REGISTER_TYPE_INFO *input_types, UINT32 coutput, MFT_REGISTER_TYPE_INFO *output_types, IMFAttributes *attributes); +HRESULT WINAPI MFTRegisterLocal(IClassFactory *factory, REFGUID category, LPCWSTR name, + UINT32 flags, UINT32 cinput, const MFT_REGISTER_TYPE_INFO *input_types, + UINT32 coutput, const MFT_REGISTER_TYPE_INFO* output_types); HRESULT WINAPI MFShutdown(void); HRESULT WINAPI MFStartup(ULONG version, DWORD flags); HRESULT WINAPI MFUnlockPlatform(void); -- 1.9.1

1 0

[PATCH 1/3] msvcp110: Export xtime_get.
by Gijs Vermeulen 06 Sep '18

06 Sep '18

This patchset makes the Bethesda Launcher start. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45784 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp110/msvcp110.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 083752663c..7bd35fa455 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3899,4 +3899,4 @@ @ cdecl towctrans(long long) @ cdecl wctrans(str) @ cdecl wctype(str) -@ stub xtime_get +@ cdecl xtime_get(ptr long) -- 2.16.4

3 5

[PATCH] ntdll: Use root of c: drive as fallback cwd during startup.
by Josh DuBois 06 Sep '18

06 Sep '18

Signed-off-by: Josh DuBois <duboisj(a)codeweavers.com> --- dlls/ntdll/server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c1f231e..a46d030 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -1215,8 +1215,10 @@ static int server_connect(void) /* retrieve the current directory */ fd_cwd = open( ".", O_RDONLY ); if (fd_cwd != -1) fcntl( fd_cwd, F_SETFD, FD_CLOEXEC ); + else WARN( "Failed to open cwd. Will cd to c:\\. (%d : %s)\n", errno, strerror( errno ) ); setup_config_dir(); + if (fd_cwd == -1) fd_cwd = open( "./drive_c", O_RDONLY ); serverdir = wine_get_server_dir(); /* chdir to the server directory */ -- 2.7.4 (Apple Git-66)

1 0

[PATCH v3 01/17] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 06 Sep '18

06 Sep '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 150480 v2: Retrieve the registry value without failing in rare race conditions. v3: Don't open the HKEY_LOCAL_MACHINE twice under some circumstances. dlls/shell32/autocomplete.c | 90 +++++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index cf8da50..051644a 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,66 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + WCHAR *key, *value; + DWORD type, sz = MAX_PATH * sizeof(WCHAR); + BOOL try_HKLM; + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); + try_HKLM = TRUE; + + /* if not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ + if (res != ERROR_SUCCESS) { + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + try_HKLM = FALSE; + } + + if (res == ERROR_SUCCESS) { + while ((qc = heap_alloc(sz)) != NULL) { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + if (res == ERROR_SUCCESS && type == REG_SZ) { + This->quickComplete = heap_realloc(qc, sz); + break; + } + heap_free(qc); + + if (res != ERROR_MORE_DATA || type != REG_SZ) { + if (!try_HKLM) + break; + RegCloseKey(hKey); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + if (res != ERROR_SUCCESS) + goto free_key_str; + sz = MAX_PATH * sizeof(WCHAR); + try_HKLM = FALSE; + } + } + RegCloseKey(hKey); + } + free_key_str: + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

3 37

Packagers: DOSBox 0.74-2 released containing Wine support patches
by André Hentschel 06 Sep '18

06 Sep '18

Hi, A maintenance release of DOSBox is available which includes Wine support patches and hopefully other patches you already applied on top of 0.74 So upgrading should be considered See also: https://wiki.winehq.org/DOSBox

1 0

Possible to call winlib function from native program ?
by Wilma Feuerstein 06 Sep '18

06 Sep '18

3 5

[PATCH 1/5] msi/tests: Add some tests for remote MSI summary info APIs.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 52 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 6332d68768..1cf24536d0 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -30,6 +30,7 @@ #include <msxml.h> #include <msi.h> #include <msiquery.h> +#include <msidefs.h> static int todo_level, todo_do_loop; @@ -279,7 +280,9 @@ static void test_db(MSIHANDLE hinst) MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r; + UINT r, count, type; + INT int_value; + FILETIME ft; hdb = MsiGetActiveDatabase(hinst); ok(hinst, hdb, "MsiGetActiveDatabase failed\n"); @@ -452,6 +455,53 @@ static void test_db(MSIHANDLE hinst) r = MsiGetSummaryInformationA(hdb, NULL, 1, &suminfo); ok(hinst, !r, "got %u\n", r); + r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + count = 0xdeadbeef; + r = MsiSummaryInfoGetPropertyCount(suminfo, &count); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, count == 5, "got %u\n", count); + + r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); +todo_wine + ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + strcpy(buffer, "deadbeef"); + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); +todo_wine + ok(hinst, !r, "got %u\n", r); +todo_wine + ok(hinst, type == 0, "got %u\n", type); +todo_wine + ok(hinst, int_value == 0, "got %u\n", int_value); + ok(hinst, sz == sizeof(buffer), "got %u\n", sz); + ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + + r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); +todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + r = MsiCloseHandle(suminfo); ok(hinst, !r, "got %u\n", r); -- 2.17.1

4 5

[PATCH 4/4] mshtml: Add IHTMLCSSStyleDeclaration2 stub implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 1897 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 9 + 4 files changed, 1908 insertions(+)

1 0

[PATCH 3/4] mshtml: Added IHTMLCSSStyleDeclaration::zoom property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 25 +++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-)

1 0

[PATCH 2/4] mshtml: Added IHTMLCSSStyleDeclaration::opacity property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 4 deletions(-)

1 0

[PATCH 1/4] mshtml: Added IHTMLCSSStyleDeclaration::backgroundClip property implementation.
by Jacek Caban 06 Sep '18

06 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 13 ++++++++----- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 23 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 5 deletions(-)

1 0

[PATCH] fltmgr.sys: Add stubs for FltAcquirePushLockExclusive, FltDeletePushLock and FltReleasePushLock.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/fltmgr.sys/fltmgr.sys.spec | 6 +++--- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index 7b1ba2983c..39ce679817 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -1,4 +1,4 @@ -@ stub FltAcquirePushLockExclusive +@ stdcall FltAcquirePushLockExclusive(ptr) @ stub FltAcquirePushLockShared @ stub FltAcquireResourceExclusive @ stub FltAcquireResourceShared @@ -40,7 +40,7 @@ @ stub FltDeleteContext @ stub FltDeleteFileContext @ stub FltDeleteInstanceContext -@ stub FltDeletePushLock +@ stdcall FltDeletePushLock(ptr) @ stub FltDeleteStreamContext @ stub FltDeleteStreamHandleContext @ stub FltDeleteVolumeContext @@ -133,7 +133,7 @@ @ stub FltReleaseContext @ stub FltReleaseContexts @ stub FltReleaseFileNameInformation -@ stub FltReleasePushLock +@ stdcall FltReleasePushLock(ptr) @ stub FltReleaseResource @ stub FltRequestOperationStatusCallback @ stub FltRetainSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 16ca2845c2..a1b81e5a89 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -43,6 +43,21 @@ void WINAPI FltInitializePushLock( EX_PUSH_LOCK *lock ) FIXME( "(%p): stub\n", lock ); } +void WINAPI FltDeletePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltAcquirePushLockExclusive( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + +void WINAPI FltReleasePushLock( EX_PUSH_LOCK *lock ) +{ + FIXME( "(%p): stub\n", lock ); +} + NTSTATUS WINAPI FltRegisterFilter( PDRIVER_OBJECT driver, const FLT_REGISTRATION *reg, PFLT_FILTER *filter ) { FIXME( "(%p,%p,%p): stub\n", driver, reg, filter ); -- 2.17.1

2 2

[PATCH] pidgen.dll: add stub for PIDGenSimpW
by Louis Lenders 06 Sep '18

06 Sep '18

For https://bugs.winehq.org/show_bug.cgi?id=45770 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/pidgen/main.c | 7 +++++++ dlls/pidgen/pidgen.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/pidgen/main.c b/dlls/pidgen/main.c index cf165eae13..95f5389cc0 100644 --- a/dlls/pidgen/main.c +++ b/dlls/pidgen/main.c @@ -50,3 +50,10 @@ int WINAPI PIDGenSimpA(LPCSTR str, int p1, int p2, int p3, int p4, int p5, int p return 0; } + +int WINAPI PIDGenSimpW(const WCHAR* str, int p1, int p2, int p3, int p4, int p5, int p6, int p7, int p8) +{ + FIXME("%s,%d,%d,%d,%d,%d,%d,%d,%d\n", debugstr_w(str), p1, p2, p3, p4, p5, p6, p7, p8); + + return 0; +} diff --git a/dlls/pidgen/pidgen.spec b/dlls/pidgen/pidgen.spec index 8b7e778b91..aba010715f 100644 --- a/dlls/pidgen/pidgen.spec +++ b/dlls/pidgen/pidgen.spec @@ -1,7 +1,7 @@ @ stub PIDGenA @ stub PIDGenW @ stdcall PIDGenSimpA(str long long long long long long long long) -@ stub PIDGenSimpW +@ stdcall PIDGenSimpW(wstr long long long long long long long long) @ stub SetupPIDGenA @ stub SetupPIDGenW @ stub VerifyPIDSequenceW -- 2.17.1

1 0

[PATCH] ntoskrnl: Add a test for a failing to load driver.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++++ dlls/ntoskrnl.exe/tests/driver3.c | 31 ++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver3.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 22 ++++++++++++++++++++ 4 files changed, 58 insertions(+) create mode 100644 dlls/ntoskrnl.exe/tests/driver3.c create mode 100644 dlls/ntoskrnl.exe/tests/driver3.spec diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in index fae11bb703..7946b8de22 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in @@ -5,10 +5,14 @@ driver_IMPORTS = winecrt0 ntoskrnl driver_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native driver2_IMPORTS = winecrt0 ntoskrnl driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native +driver3_IMPORTS = winecrt0 ntoskrnl +driver3_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native SOURCES = \ driver.c \ driver.spec \ driver2.c \ driver2.spec \ + driver3.c \ + driver3.spec \ ntoskrnl.c diff --git a/dlls/ntoskrnl.exe/tests/driver3.c b/dlls/ntoskrnl.exe/tests/driver3.c new file mode 100644 index 0000000000..a7737a960a --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.c @@ -0,0 +1,31 @@ +/* + * Copyright 2018 Dmitry Timoshkov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "winternl.h" +#include "ddk/wdm.h" + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *obj, UNICODE_STRING *path) +{ + DbgPrint("driver3: DriverEntry\n"); + + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/tests/driver3.spec b/dlls/ntoskrnl.exe/tests/driver3.spec new file mode 100644 index 0000000000..ad33444716 --- /dev/null +++ b/dlls/ntoskrnl.exe/tests/driver3.spec @@ -0,0 +1 @@ +# nothing here yet diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 73f0e85a51..fe070d4e8b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -219,6 +219,26 @@ static void test_load_driver(SC_HANDLE service) ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); } +static void test_driver3(void) +{ + char filename[MAX_PATH]; + SC_HANDLE service; + BOOL ret; + + service = load_driver(filename, "driver3.dll", "WineTestDriver3"); + ok(service != NULL, "driver3 failed to load\n"); + + ret = StartServiceA(service, 0, NULL); + ok(!ret, "driver3 should fail to start\n"); +todo_wine + ok(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED || GetLastError() == ERROR_PROC_NOT_FOUND /* XP */ || + GetLastError() == ERROR_FILE_NOT_FOUND /* Win7 */, "got %u\n", GetLastError()); + + DeleteService(service); + CloseServiceHandle(service); + DeleteFileA(filename); +} + START_TEST(ntoskrnl) { char filename[MAX_PATH], filename2[MAX_PATH]; @@ -247,4 +267,6 @@ START_TEST(ntoskrnl) unload_driver(service); ok(DeleteFileA(filename), "DeleteFile failed: %u\n", GetLastError()); ok(DeleteFileA(filename2), "DeleteFile failed: %u\n", GetLastError()); + + test_driver3(); } -- 2.17.1

2 2

[PATCH v4] kernel32: Correct ReplaceFileW behaviour
by Brock York 06 Sep '18

06 Sep '18

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file. ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 29 ++++++++++++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 081f0760a5..bc916f26c3 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + BY_HANDLE_FILE_INFORMATION file_info; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + if (!GetFileInformationByHandle(hReplaced, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1825,19 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + if (!GetFileInformationByHandle(hReplacement, &file_info)) + { + error = GetLastError(); + goto fail; + } + + if (file_info->dwFileAttributes & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

2 1

[PATCH] ntoskrnl.exe: Fix cross-compilation of the driver tests.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/tests/driver.c | 4 ++-- dlls/ntoskrnl.exe/tests/driver.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index d424396d4c..68b6730c9b 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -75,8 +75,8 @@ static void WINAPIV ok_(const char *file, int line, int condition, const char *m const char *current_file; __ms_va_list args; - if (!(current_file = strrchr(file, '/')) && - !(current_file = strrchr(file, '\\'))) + if (!(current_file = drv_strrchr(file, '/')) && + !(current_file = drv_strrchr(file, '\\'))) current_file = file; else current_file++; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index 6a4179ed00..be4a9dc837 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -35,3 +35,10 @@ struct test_input int winetest_debug; WCHAR path[1]; }; + +static inline char *drv_strrchr( const char *str, char ch ) +{ + char *ret = NULL; + do { if (*str == ch) ret = (char *)(ULONG_PTR)str; } while (*str++); + return ret; +} -- 2.17.1

1 0

[PATCH] ntoskrnl.exe: Add a stub for MmCreateSection.
by Dmitry Timoshkov 06 Sep '18

06 Sep '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 577f5b3ba4..292f89c2e7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2357,6 +2357,18 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS return NULL; } +/*********************************************************************** + * MmCreateSection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBUTES *attr, + LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, + HANDLE file, FILE_OBJECT *file_obj ) +{ + FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); + return STATUS_NOT_IMPLEMENTED; +} + /*********************************************************************** * MmFreeNonCachedMemory (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8079114966..e867dbe680 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -669,7 +669,7 @@ @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stub MmCreateMdl -@ stub MmCreateSection +@ stdcall MmCreateSection(ptr long ptr ptr long long long ptr) @ stub MmDisableModifiedWriteOfSection @ stub MmFlushImageSection @ stub MmForceSectionClosed -- 2.17.1

1 0

[PATCH 2/3] wsdapi: Implement generation of ProbeMatches message.
by Owen Rudge 06 Sep '18

06 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 169 +++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 169 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] opcservices: Implement GetSourceUri().
by Nikolay Sivov 06 Sep '18

06 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/factory.c | 2 +- dlls/opcservices/opc_private.h | 2 +- dlls/opcservices/package.c | 40 ++++++++++++++++++++----- dlls/opcservices/tests/opcservices.c | 45 +++++++++++++++++++++++++--- 4 files changed, 76 insertions(+), 13 deletions(-) diff --git a/dlls/opcservices/factory.c b/dlls/opcservices/factory.c index 0c16cc2501..4578f41d7c 100644 --- a/dlls/opcservices/factory.c +++ b/dlls/opcservices/factory.c @@ -336,7 +336,7 @@ static HRESULT WINAPI opc_factory_CreatePackage(IOpcFactory *iface, IOpcPackage { TRACE("iface %p, package %p.\n", iface, package); - return opc_package_create(package); + return opc_package_create(iface, package); } static HRESULT WINAPI opc_factory_ReadPackageFromStream(IOpcFactory *iface, IStream *stream, diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index 80b1e954b7..3c78195242 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -45,6 +45,6 @@ static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t c return TRUE; } -extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; +extern HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **package) DECLSPEC_HIDDEN; extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; extern HRESULT opc_uri_create(const WCHAR *uri, IOpcUri **opc_uri) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index cac89c523e..c69239b84e 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -37,6 +37,7 @@ struct opc_package IOpcPartSet *part_set; IOpcRelationshipSet *relationship_set; + IOpcUri *source_uri; }; struct opc_part @@ -69,6 +70,7 @@ struct opc_relationship WCHAR *type; IUri *target; OPC_URI_TARGET_MODE target_mode; + IOpcUri *source_uri; }; struct opc_relationship_set @@ -79,6 +81,7 @@ struct opc_relationship_set struct opc_relationship **relationships; size_t size; size_t count; + IOpcUri *source_uri; }; static inline struct opc_package *impl_from_IOpcPackage(IOpcPackage *iface) @@ -106,7 +109,7 @@ static inline struct opc_relationship *impl_from_IOpcRelationship(IOpcRelationsh return CONTAINING_RECORD(iface, struct opc_relationship, IOpcRelationship_iface); } -static HRESULT opc_relationship_set_create(IOpcRelationshipSet **relationship_set); +static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationshipSet **relationship_set); static WCHAR *opc_strdupW(const WCHAR *str) { @@ -177,7 +180,7 @@ static HRESULT WINAPI opc_part_GetRelationshipSet(IOpcPart *iface, IOpcRelations TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); - if (!part->relationship_set && FAILED(hr = opc_relationship_set_create(&part->relationship_set))) + if (!part->relationship_set && FAILED(hr = opc_relationship_set_create((IOpcUri *)part->name, &part->relationship_set))) return hr; *relationship_set = part->relationship_set; @@ -401,6 +404,7 @@ static ULONG WINAPI opc_relationship_Release(IOpcRelationship *iface) { CoTaskMemFree(relationship->id); CoTaskMemFree(relationship->type); + IOpcUri_Release(relationship->source_uri); IUri_Release(relationship->target); heap_free(relationship); } @@ -430,9 +434,14 @@ static HRESULT WINAPI opc_relationship_GetRelationshipType(IOpcRelationship *ifa static HRESULT WINAPI opc_relationship_GetSourceUri(IOpcRelationship *iface, IOpcUri **uri) { - FIXME("iface %p, uri %p stub!\n", iface, uri); + struct opc_relationship *relationship = impl_from_IOpcRelationship(iface); - return E_NOTIMPL; + TRACE("iface %p, uri %p.\n", iface, uri); + + *uri = relationship->source_uri; + IOpcUri_AddRef(*uri); + + return S_OK; } static HRESULT WINAPI opc_relationship_GetTargetUri(IOpcRelationship *iface, IUri **target) @@ -486,6 +495,8 @@ static HRESULT opc_relationship_create(struct opc_relationship_set *set, const W relationship->target = target_uri; IUri_AddRef(relationship->target); + relationship->source_uri = set->source_uri; + IOpcUri_AddRef(relationship->source_uri); /* FIXME: test that id is unique */ if (id) @@ -557,6 +568,7 @@ static ULONG WINAPI opc_relationship_set_Release(IOpcRelationshipSet *iface) for (i = 0; i < relationship_set->count; ++i) IOpcRelationship_Release(&relationship_set->relationships[i]->IOpcRelationship_iface); + IOpcUri_Release(relationship_set->source_uri); heap_free(relationship_set->relationships); heap_free(relationship_set); } @@ -637,7 +649,7 @@ static const IOpcRelationshipSetVtbl opc_relationship_set_vtbl = opc_relationship_set_GetRelationshipsContentStream, }; -static HRESULT opc_relationship_set_create(IOpcRelationshipSet **out) +static HRESULT opc_relationship_set_create(IOpcUri *source_uri, IOpcRelationshipSet **out) { struct opc_relationship_set *relationship_set; @@ -646,6 +658,8 @@ static HRESULT opc_relationship_set_create(IOpcRelationshipSet **out) relationship_set->IOpcRelationshipSet_iface.lpVtbl = &opc_relationship_set_vtbl; relationship_set->refcount = 1; + relationship_set->source_uri = source_uri; + IOpcUri_AddRef(relationship_set->source_uri); *out = &relationship_set->IOpcRelationshipSet_iface; TRACE("Created relationship set %p.\n", *out); @@ -691,6 +705,8 @@ static ULONG WINAPI opc_package_Release(IOpcPackage *iface) IOpcPartSet_Release(package->part_set); if (package->relationship_set) IOpcRelationshipSet_Release(package->relationship_set); + if (package->source_uri) + IOpcUri_Release(package->source_uri); heap_free(package); } @@ -728,8 +744,11 @@ static HRESULT WINAPI opc_package_GetRelationshipSet(IOpcPackage *iface, IOpcRel TRACE("iface %p, relationship_set %p.\n", iface, relationship_set); - if (!package->relationship_set && FAILED(hr = opc_relationship_set_create(&package->relationship_set))) + if (!package->relationship_set) + { + if (FAILED(hr = opc_relationship_set_create(package->source_uri, &package->relationship_set))) return hr; + } *relationship_set = package->relationship_set; IOpcRelationshipSet_AddRef(*relationship_set); @@ -746,9 +765,10 @@ static const IOpcPackageVtbl opc_package_vtbl = opc_package_GetRelationshipSet, }; -HRESULT opc_package_create(IOpcPackage **out) +HRESULT opc_package_create(IOpcFactory *factory, IOpcPackage **out) { struct opc_package *package; + HRESULT hr; if (!(package = heap_alloc_zero(sizeof(*package)))) return E_OUTOFMEMORY; @@ -756,6 +776,12 @@ HRESULT opc_package_create(IOpcPackage **out) package->IOpcPackage_iface.lpVtbl = &opc_package_vtbl; package->refcount = 1; + if (FAILED(hr = IOpcFactory_CreatePackageRootUri(factory, &package->source_uri))) + { + heap_free(package); + return hr; + } + *out = &package->IOpcPackage_iface; TRACE("Created package %p.\n", *out); return S_OK; diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index 9af7aa49b9..a2a032f406 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -38,12 +38,16 @@ static IOpcFactory *create_factory(void) static void test_package(void) { static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; + static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; static const WCHAR uriW[] = {'/','u','r','i',0}; IOpcRelationshipSet *relset, *relset2; IOpcPartSet *partset, *partset2; + IOpcRelationship *rel; IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + IOpcUri *source_uri; + IUri *target_uri; IOpcPart *part; HRESULT hr; BOOL ret; @@ -81,6 +85,22 @@ static void test_package(void) hr = IOpcPart_GetRelationshipSet(part, &relset2); ok(SUCCEEDED(hr), "Failed to get relationship set, hr %#x.\n", hr); ok(relset == relset2, "Expected same part set instance.\n"); + + hr = CreateUri(targetW, Uri_CREATE_ALLOW_RELATIVE, 0, &target_uri); + ok(SUCCEEDED(hr), "Failed to create target uri, hr %#x.\n", hr); + + hr = IOpcRelationshipSet_CreateRelationship(relset, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + + hr = IOpcRelationship_GetSourceUri(rel, &source_uri); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri == (IOpcUri *)part_uri, "Unexpected source uri.\n"); + + IOpcUri_Release(source_uri); + + IOpcRelationship_Release(rel); + IUri_Release(target_uri); + IOpcRelationshipSet_Release(relset); IOpcRelationshipSet_Release(relset2); @@ -212,11 +232,11 @@ static void test_relationship(void) static const WCHAR typeW[] = {'t','y','p','e',0}; static const WCHAR rootW[] = {'/',0}; IUri *target_uri, *target_uri2, *uri; + IOpcUri *source_uri, *source_uri2; + IOpcRelationship *rel, *rel2; IOpcRelationshipSet *rels; - IOpcRelationship *rel; IOpcFactory *factory; IOpcPackage *package; - IOpcUri *source_uri; IUnknown *unk; DWORD mode; HRESULT hr; @@ -256,6 +276,9 @@ todo_wine hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel); ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + hr = IOpcRelationshipSet_CreateRelationship(rels, NULL, typeW, target_uri, OPC_URI_TARGET_MODE_INTERNAL, &rel2); + ok(SUCCEEDED(hr), "Failed to create relationship, hr %#x.\n", hr); + /* Autogenerated relationship id */ hr = IOpcRelationship_GetId(rel, &id); ok(SUCCEEDED(hr), "Failed to get id, hr %#x.\n", hr); @@ -272,8 +295,17 @@ todo_wine ok(mode == OPC_URI_TARGET_MODE_INTERNAL, "Unexpected mode %d.\n", mode); /* Source uri */ + hr = IOpcFactory_CreatePackageRootUri(factory, &source_uri); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + + hr = IOpcFactory_CreatePackageRootUri(factory, &source_uri2); + ok(SUCCEEDED(hr), "Failed to create root uri, hr %#x.\n", hr); + ok(source_uri != source_uri2, "Unexpected uri instance.\n"); + + IOpcUri_Release(source_uri); + IOpcUri_Release(source_uri2); + hr = IOpcRelationship_GetSourceUri(rel, &source_uri); -todo_wine ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); hr = IOpcUri_QueryInterface(source_uri, &IID_IOpcPartUri, (void **)&unk); @@ -282,12 +314,17 @@ todo_wine str = NULL; hr = IOpcUri_GetRawUri(source_uri, &str); ok(SUCCEEDED(hr), "Failed to get raw uri, hr %#x.\n", hr); -todo_wine ok(!lstrcmpW(rootW, str), "Unexpected uri %s.\n", wine_dbgstr_w(str)); SysFreeString(str); + hr = IOpcRelationship_GetSourceUri(rel2, &source_uri2); + ok(SUCCEEDED(hr), "Failed to get source uri, hr %#x.\n", hr); + ok(source_uri2 == source_uri, "Unexpected source uri.\n"); + + IOpcUri_Release(source_uri2); IOpcUri_Release(source_uri); + IOpcRelationship_Release(rel2); IOpcRelationship_Release(rel); IOpcRelationshipSet_Release(rels); -- 2.18.0

1 4

[PATCH 3/3] wsdapi: Send Probe Matches message via UDP unicast.
by Owen Rudge 05 Sep '18

05 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/network.c | 32 ++++++++++++++++++++++++++++++++ dlls/wsdapi/soap.c | 4 ++-- dlls/wsdapi/tests/discovery.c | 22 +++++++++++----------- dlls/wsdapi/wsdapi_internal.h | 1 + 4 files changed, 46 insertions(+), 13 deletions(-)

1 0

[PATCH 1/3] wsdapi: Implement matching of names in MatchProbeEx.
by Owen Rudge 05 Sep '18

05 Sep '18

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/discovery.c | 58 ++++++++++++++++++++++++++++++++--- dlls/wsdapi/soap.c | 9 ++++++ dlls/wsdapi/wsdapi_internal.h | 6 ++++ 3 files changed, 69 insertions(+), 4 deletions(-)

1 0

[PATCH v5 1/3] mscoree: Add test for registration-less COM components
by Fabian Maurer 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43270 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/mscoree/tests/Makefile.in | 6 +- dlls/mscoree/tests/comtest.c | 349 ++++++++++++++++++++++++ dlls/mscoree/tests/comtest.cs | 23 ++ dlls/mscoree/tests/comtest_dll.manifest | 16 ++ dlls/mscoree/tests/comtest_exe.manifest | 11 + dlls/mscoree/tests/interfaces.idl | 33 +++ dlls/mscoree/tests/resource.rc | 30 ++ 7 files changed, 467 insertions(+), 1 deletion(-) create mode 100644 dlls/mscoree/tests/comtest.c create mode 100644 dlls/mscoree/tests/comtest.cs create mode 100644 dlls/mscoree/tests/comtest_dll.manifest create mode 100644 dlls/mscoree/tests/comtest_exe.manifest create mode 100644 dlls/mscoree/tests/interfaces.idl create mode 100644 dlls/mscoree/tests/resource.rc diff --git a/dlls/mscoree/tests/Makefile.in b/dlls/mscoree/tests/Makefile.in index 7c1ba5cb11..f65e1bc6c2 100644 --- a/dlls/mscoree/tests/Makefile.in +++ b/dlls/mscoree/tests/Makefile.in @@ -1,7 +1,11 @@ TESTDLL = mscoree.dll -IMPORTS = ole32 shlwapi uuid +IMPORTS = ole32 shlwapi uuid shell32 C_SRCS = \ + comtest.c \ debugging.c \ metahost.c \ mscoree.c + +RC_SRCS = resource.rc +IDL_SRCS = interfaces.idl diff --git a/dlls/mscoree/tests/comtest.c b/dlls/mscoree/tests/comtest.c new file mode 100644 index 0000000000..75f9421b59 --- /dev/null +++ b/dlls/mscoree/tests/comtest.c @@ -0,0 +1,349 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include <stdio.h> + +#include "windows.h" +#include "ole2.h" +#include "mscoree.h" +#include "corerror.h" +#include "shlwapi.h" +#include "shlobj.h" + +#include "wine/test.h" + +#include "initguid.h" +#include "interfaces.h" + +HMODULE hmscoree; + +typedef enum _run_type +{ + run_type_current_working_directory = 0, + run_type_exe_directory, + run_type_system32, +} run_type; + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + strcpy(path_file, path_tmp); + PathAppendA(path_file, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +static BOOL compile_cs_to_dll(char *source_path, char *dest_path) +{ + const char *path_csc = "C:\\windows\\Microsoft.NET\\Framework\\v2.0.50727\\csc.exe"; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + if (!PathFileExistsA(path_csc)) + { + skip("Can't find csc.exe\n"); + return FALSE; + } + + sprintf(cmdline, "%s /t:library /out:\"%s\" \"%s\"", path_csc, dest_path, source_path); + + si.cb = sizeof(si); + ret = CreateProcessA(path_csc, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + WaitForSingleObject(pi.hProcess, 5000); + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + ret = PathFileExistsA(dest_path); + ok(ret, "Compilation failed\n"); + return ret; +} + +static void run_test(BOOL expect_success) +{ + typedef HRESULT (WINAPI *_DllGetClassObject)(REFCLSID rclsid, REFIID riid, LPVOID *ppv); + ITest *test = NULL; + HRESULT hr; + _DllGetClassObject getClassObject; + IClassFactory *classFactory = NULL; + HRESULT result_expected = expect_success ? S_OK : HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + + hr = CoCreateInstance(&CLSID_Test, NULL, CLSCTX_INPROC_SERVER, &IID_ITest, (void**)&test); + todo_wine + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test); + } + + getClassObject = (_DllGetClassObject)GetProcAddress(hmscoree, "DllGetClassObject"); + hr = getClassObject(&CLSID_Test, &IID_IClassFactory, (void **)&classFactory); + todo_wine_if(!expect_success) + ok(hr == result_expected, "Expected %x, got %x\n", result_expected, hr); + + if (hr == S_OK) + { + ITest *test2 = NULL; + hr = IClassFactory_CreateInstance(classFactory, NULL, &IID_ITest, (void **)&test2); + todo_wine + ok(hr == S_OK, "Got %x\n", hr); + + if (hr == S_OK) + { + int i = 0; + hr = ITest_Func(test2, &i); + ok(hr == S_OK, "Got %x\n", hr); + ok(i == 42, "Expected 42, got %d\n", i); + ITest_Release(test2); + } + IClassFactory_Release(classFactory); + } +} + +static void get_dll_path_for_run(char *path_dll, UINT path_dll_size, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + + GetTempPathA(MAX_PATH, path_tmp); + + switch (run) + { + case run_type_current_working_directory: + strcpy(path_dll, path_tmp); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_exe_directory: + GetModuleFileNameA(NULL, path_dll, path_dll_size); + PathRemoveFileSpecA(path_dll); + PathAppendA(path_dll, "comtest.dll"); + break; + case run_type_system32: + GetSystemDirectoryA(path_dll, path_dll_size); + PathAppendA(path_dll, "comtest.dll"); + break; + } +} +static void prepare_and_run_test(const char *dll_source, run_type run) +{ + char path_tmp[MAX_PATH] = {0}; + char path_tmp_manifest[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_dll_source[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context = 0; + + GetTempPathA(MAX_PATH, path_tmp); + GetTempPathA(MAX_PATH, path_tmp_manifest); + PathAppendA(path_tmp_manifest, "manifests"); + + CreateDirectoryA(path_tmp_manifest, NULL); + + if (run == run_type_system32) + { + if (!IsUserAnAdmin()) + { + skip("Can't test dll in system32 due to user not being admin.\n"); + return; + } + } + + if (!write_resource_file(path_tmp, dll_source, "comtest.cs", path_dll_source)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!compile_cs_to_dll(path_dll_source, path_dll)) + goto cleanup; + + if (!write_resource_file(path_tmp_manifest, "comtest_exe.manifest", "exe.manifest", path_manifest_exe)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp_manifest, "comtest_dll.manifest", "comtest.manifest", path_manifest_dll)) + { + ok(0, "run: %d, Failed to create file for testing\n", run); + goto cleanup; + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp_manifest; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run: %d, CreateActCtxA failed: %d\n", run, GetLastError()); + + if (handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + ok(0, "run: %d, Failed to create activation context\n", run); + goto cleanup; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run: %d, ActivateActCtx failed: %d\n", run, GetLastError()); + + if (run == run_type_current_working_directory) + SetCurrentDirectoryA(path_tmp); + + run_test(run == run_type_exe_directory); + +cleanup: + if (handle_context != NULL && handle_context != INVALID_HANDLE_VALUE) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run: %d, DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if (*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_dll_source) + { + success = DeleteFileA(path_dll_source); + ok(success, "run: %d, DeleteFileA failed: %d\n", run, GetLastError()); + } + RemoveDirectoryA(path_tmp_manifest); + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + + +static void cleanup_test(run_type run) +{ + char path_dll[MAX_PATH] = {0}; + BOOL success; + + get_dll_path_for_run(path_dll, sizeof(path_dll), run); + + if (!PathFileExistsA(path_dll)) + return; + + success = DeleteFileA(path_dll); + if (!success) + { + Sleep(500); + success = DeleteFileA(path_dll); + } + ok(success, "DeleteFileA failed: %d\n", GetLastError()); +} + +static void run_child_process(const char *dll_source, run_type run) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs(&argv); + + if (strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %s %d", argv[0], argv[1], dll_source, run); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process(pi.hProcess); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_test(run); +} + +START_TEST(comtest) +{ + int argc; + char **argv; + + CoInitialize(NULL); + + hmscoree = LoadLibraryA("mscoree.dll"); + if (!hmscoree) + { + skip(".NET or mono not available\n"); + return; + } + + argc = winetest_get_mainargs(&argv); + if (argc > 2) + { + const char *dll_source = argv[2]; + run_type run = atoi(argv[3]); + prepare_and_run_test(dll_source, run); + + goto cleanup; + } + + run_child_process("comtest.cs", run_type_current_working_directory); + run_child_process("comtest.cs", run_type_exe_directory); + run_child_process("comtest.cs", run_type_system32); + +cleanup: + FreeLibrary(hmscoree); + CoUninitialize(); +} diff --git a/dlls/mscoree/tests/comtest.cs b/dlls/mscoree/tests/comtest.cs new file mode 100644 index 0000000000..4fe2a718b2 --- /dev/null +++ b/dlls/mscoree/tests/comtest.cs @@ -0,0 +1,23 @@ +/* Compile with + csc /target:library /out:dll.dll comtest.cs +*/ + +using System.Runtime.InteropServices; + +namespace DLL +{ + [Guid("1dbc4491-080d-45c5-a15d-1e3c4610bdd9"), ComVisible(true), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface ITest + { + void Func(ref int i); + } + + [Guid("2e106e50-e7a4-4489-8538-83643f100fdc"), ComVisible(true), ClassInterface(ClassInterfaceType.None)] + public class Test : ITest + { + public void Func(ref int i) + { + i = 42; + } + } +} diff --git a/dlls/mscoree/tests/comtest_dll.manifest b/dlls/mscoree/tests/comtest_dll.manifest new file mode 100644 index 0000000000..ef6924de9e --- /dev/null +++ b/dlls/mscoree/tests/comtest_dll.manifest @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32" + /> + <clrClass + clsid="{2e106e50-e7a4-4489-8538-83643f100fdc}" + threadingModel="Both" + name="DLL.Test" + runtimeVersion="v4.0.0.0"> + </clrClass> + <file name="comtest.dll"> + </file> +</assembly> diff --git a/dlls/mscoree/tests/comtest_exe.manifest b/dlls/mscoree/tests/comtest_exe.manifest new file mode 100644 index 0000000000..bc9ce4c045 --- /dev/null +++ b/dlls/mscoree/tests/comtest_exe.manifest @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity + name="comtest" + version="1.0.0.0" + type="win32"/> + </dependentAssembly> + </dependency> +</assembly> diff --git a/dlls/mscoree/tests/interfaces.idl b/dlls/mscoree/tests/interfaces.idl new file mode 100644 index 0000000000..9e64988197 --- /dev/null +++ b/dlls/mscoree/tests/interfaces.idl @@ -0,0 +1,33 @@ +/* + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "unknwn.idl" + +[ + object, + uuid(1dbc4491-080d-45c5-a15d-1e3c4610bdd9), + local +] +interface ITest : IUnknown { + HRESULT Func([in, out] int *i); +}; + +[ + uuid(2e106e50-e7a4-4489-8538-83643f100fdc), +] +coclass Test { interface ITest; }; diff --git a/dlls/mscoree/tests/resource.rc b/dlls/mscoree/tests/resource.rc new file mode 100644 index 0000000000..9a1b89f656 --- /dev/null +++ b/dlls/mscoree/tests/resource.rc @@ -0,0 +1,30 @@ +/* + * Resources for mscoree test suite. + * + * Copyright 2018 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: comtest.cs */ +comtest.cs RCDATA comtest.cs + +/* @makedep: comtest_exe.manifest */ +comtest_exe.manifest RCDATA comtest_exe.manifest + +/* @makedep: comtest_dll.manifest */ +comtest_dll.manifest RCDATA comtest_dll.manifest -- 2.18.0

2 4

[PATCH 7/7] comctl32/button: Support BCM_GETIDEALSIZE message.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24623 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 195 ++++++++++++++++++++++- dlls/comctl32/tests/button.c | 296 +++++++++++++++++++++++++++++++++++ include/commctrl.h | 2 + 3 files changed, 491 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index a9ca619e89..5621fda4f3 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -28,7 +28,6 @@ * - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED * - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button. * - WM_SYSKEYUP - * - BCM_GETIDEALSIZE * * Notifications * - BCN_HOTITEMCHANGE @@ -42,7 +41,6 @@ * * Structures/Macros/Definitions * - NMBCHOTITEM - * - Button_GetIdealSize */ #include <stdarg.h> @@ -187,6 +185,32 @@ static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = NULL, /* BS_DEFCOMMANDLINK */ }; +typedef BOOL (*pfGetIdealSize)(BUTTON_INFO *infoPtr, SIZE *size); + +static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); +static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size); + +static const pfGetIdealSize btnGetIdealSizeFunc[MAX_BTN_TYPE] = { + PB_GetIdealSize, /* BS_PUSHBUTTON */ + PB_GetIdealSize, /* BS_DEFPUSHBUTTON */ + CB_GetIdealSize, /* BS_CHECKBOX */ + CB_GetIdealSize, /* BS_AUTOCHECKBOX */ + CB_GetIdealSize, /* BS_RADIOBUTTON */ + GB_GetIdealSize, /* BS_3STATE */ + GB_GetIdealSize, /* BS_AUTO3STATE */ + GB_GetIdealSize, /* BS_GROUPBOX */ + PB_GetIdealSize, /* BS_USERBUTTON */ + CB_GetIdealSize, /* BS_AUTORADIOBUTTON */ + GB_GetIdealSize, /* BS_PUSHBOX */ + GB_GetIdealSize, /* BS_OWNERDRAW */ + /* GetIdealSize() for following types are unimplemented, use BS_PUSHBUTTON's for now */ + PB_GetIdealSize, /* BS_SPLITBUTTON */ + PB_GetIdealSize, /* BS_DEFSPLITBUTTON */ + PB_GetIdealSize, /* BS_COMMANDLINK */ + PB_GetIdealSize /* BS_DEFCOMMANDLINK */ +}; + static inline UINT get_button_type( LONG window_style ) { return (window_style & BS_TYPEMASK); @@ -846,6 +870,15 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return TRUE; } + case BCM_GETIDEALSIZE: + { + SIZE *size = (SIZE *)lParam; + + if (!size) return FALSE; + + return btnGetIdealSizeFunc[btn_type](infoPtr, size); + } + case WM_NCHITTEST: if(btn_type == BS_GROUPBOX) return HTTRANSPARENT; /* fall through */ @@ -1038,6 +1071,164 @@ static const RECT *BUTTON_GetTextMargin(const BUTTON_INFO *infoPtr) return &oneMargin; } +static void BUTTON_GetClientRectSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + RECT rect; + GetClientRect(infoPtr->hwnd, &rect); + size->cx = rect.right - rect.left; + size->cy = rect.bottom - rect.top; +} + +static void BUTTON_GetTextIdealSize(BUTTON_INFO *infoPtr, LONG maxWidth, SIZE *size) +{ + WCHAR *text = get_button_text(infoPtr); + HDC hdc; + RECT rect; + const RECT *margin = BUTTON_GetTextMargin(infoPtr); + + if (maxWidth != 0) + { + maxWidth -= margin->right + margin->right; + if (maxWidth <= 0) maxWidth = 1; + } + + hdc = GetDC(infoPtr->hwnd); + rect = BUTTON_GetTextRect(infoPtr, hdc, text, maxWidth); + ReleaseDC(infoPtr->hwnd, hdc); + heap_free(text); + + size->cx = rect.right - rect.left + margin->left + margin->right; + size->cy = rect.bottom - rect.top + margin->top + margin->bottom; +} + +static void BUTTON_GetLabelIdealSize(BUTTON_INFO *infoPtr, LONG maxWidth, SIZE *size) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + SIZE imageSize; + SIZE textSize; + BOOL horizontal; + + imageSize = BUTTON_GetImageSize(infoPtr); + if (infoPtr->imagelist.himl) + { + imageSize.cx += infoPtr->imagelist.margin.left + infoPtr->imagelist.margin.right; + imageSize.cy += infoPtr->imagelist.margin.top + infoPtr->imagelist.margin.bottom; + if (infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_TOP + || infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) + horizontal = FALSE; + else + horizontal = TRUE; + } + else + { + /* horizontal alignment flags has priority over vertical ones if both are specified */ + if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) + || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) + horizontal = TRUE; + else + horizontal = FALSE; + } + + if (horizontal) + { + if (maxWidth != 0) + { + maxWidth -= imageSize.cx; + if (maxWidth <= 0) maxWidth = 1; + } + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &textSize); + size->cx = textSize.cx + imageSize.cx; + size->cy = max(textSize.cy, imageSize.cy); + } + else + { + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &textSize); + size->cx = max(textSize.cx, imageSize.cx); + size->cy = textSize.cy + imageSize.cy; + } +} + +static BOOL GB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + BUTTON_GetClientRectSize(infoPtr, size); + return TRUE; +} + +static BOOL CB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + WCHAR *text = get_button_text(infoPtr); + HDC hdc; + HFONT hfont; + SIZE labelSize; + INT textOffset; + INT textLength = 0; + double scaleX; + double scaleY; + LONG checkboxWidth, checkboxHeight; + LONG maxWidth = 0; + + if (text) textLength = lstrlenW(text); + heap_free(text); + if (textLength == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + return TRUE; + } + + hdc = GetDC(infoPtr->hwnd); + scaleX = GetDeviceCaps(hdc, LOGPIXELSX) / 96.0; + scaleY = GetDeviceCaps(hdc, LOGPIXELSY) / 96.0; + if ((hfont = infoPtr->font)) SelectObject(hdc, hfont); + GetCharWidthW(hdc, '0', '0', &textOffset); + textOffset /= 2; + ReleaseDC(infoPtr->hwnd, hdc); + + checkboxWidth = 12 * scaleX + 1; + checkboxHeight = 12 * scaleY + 1; + if (size->cx) + { + maxWidth = size->cx - checkboxWidth - textOffset; + if (maxWidth <= 0) maxWidth = 1; + } + + /* Checkbox doesn't support both image(but not image list) and text */ + if (!(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image) + BUTTON_GetTextIdealSize(infoPtr, maxWidth, &labelSize); + else + BUTTON_GetLabelIdealSize(infoPtr, maxWidth, &labelSize); + + size->cx = labelSize.cx + checkboxWidth + textOffset; + size->cy = max(labelSize.cy, checkboxHeight); + + return TRUE; +} + +static BOOL PB_GetIdealSize(BUTTON_INFO *infoPtr, SIZE *size) +{ + WCHAR *text = get_button_text(infoPtr); + SIZE labelSize; + INT textLength = 0; + + if (text) textLength = lstrlenW(text); + + if (textLength == 0) + { + BUTTON_GetClientRectSize(infoPtr, size); + heap_free(text); + return TRUE; + } + heap_free(text); + + /* Ideal size include text size even if image only flags(BS_ICON, BS_BITMAP) are specified */ + BUTTON_GetLabelIdealSize(infoPtr, size->cx, &labelSize); + + size->cx = labelSize.cx; + size->cy = labelSize.cy; + + return TRUE; +} + /********************************************************************** * BUTTON_CalcLayoutRects * diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 1fd644b6f2..81461dee44 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1422,6 +1422,301 @@ static void test_state(void) } } +static void test_bcm_get_ideal_size(void) +{ + static const WCHAR text2_w[] = {'t', 'e', 'x', 't', '\n', 't', 'e', 'x', 't', 0}; + static const WCHAR text_w[] = {'t', 'e', 'x', 't', 0}; + static const DWORD imagelist_aligns[] = {BUTTON_IMAGELIST_ALIGN_LEFT, BUTTON_IMAGELIST_ALIGN_RIGHT, + BUTTON_IMAGELIST_ALIGN_TOP, BUTTON_IMAGELIST_ALIGN_BOTTOM, + BUTTON_IMAGELIST_ALIGN_CENTER}; + static const DWORD aligns[] = {0, BS_TOP, BS_LEFT, BS_RIGHT, BS_BOTTOM, + BS_CENTER, BS_VCENTER, BS_RIGHTBUTTON, WS_EX_RIGHT}; + DWORD default_style = WS_TABSTOP | WS_POPUP | WS_VISIBLE; + LONG client_width = 200, client_height = 200; + LONG width, height, line_count; + DWORD style, type; + BOOL ret; + HWND hwnd; + HDC hdc; + HFONT hfont; + LOGFONTA lf; + TEXTMETRICA tm; + SIZE size; + HBITMAP hmask, hbmp; + ICONINFO icon_info; + HICON hicon; + HIMAGELIST himl; + BUTTON_IMAGELIST biml = {0}; + INT i, j; + + /* Check for NULL pointer handling */ + hwnd = CreateWindowW(WC_BUTTONW, text_w, BS_PUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, 0); + ok(!ret, "Expect BCM_GETIDEALSIZE message to return false.\n"); + + /* Set font so that the test is consistent on Wine and Windows */ + ZeroMemory(&lf, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfHeight = 20; + lstrcpyA(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + + /* Get tmHeight */ + hdc = GetDC(hwnd); + GetTextMetricsA(hdc, &tm); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + + /* XP and 2003 doesn't support command links, getting ideal size with button having only text just return client size on these platforms */ + hwnd = CreateWindowA(WC_BUTTONA, "test", BS_DEFCOMMANDLINK | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (size.cx == client_width && size.cy == client_width) + { + /* on XP and 2003, buttons with image are not supported */ + win_skip("Skipping further tests on XP and 2003\n"); + return; + } + + /* Tests for image placements */ + /* Prepare bitmap */ + width = 48; + height = 48; + hdc = GetDC(0); + hmask = CreateCompatibleBitmap(hdc, width, height); + hbmp = CreateCompatibleBitmap(hdc, width, height); + + /* Only bitmap for push button, ideal size should be enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + /* Ideal size contains text rect even show bitmap only */ + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Image alignments when button has bitmap and text*/ + for (i = 0; i < ARRAY_SIZE(aligns); i++) + for (j = 0; j < ARRAY_SIZE(aligns); j++) + { + style = BS_DEFPUSHBUTTON | default_style | aligns[i] | aligns[j]; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (!(style & (BS_CENTER | BS_VCENTER)) || ((style & BS_CENTER) && (style & BS_CENTER) != BS_CENTER) + || !(style & BS_VCENTER) || (style & BS_VCENTER) == BS_VCENTER) + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, + width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + else + ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + "Style: 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, + max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + DestroyWindow(hwnd); + } + + /* Image list alignments */ + himl = pImageList_Create(width, height, ILC_COLOR, 1, 1); + pImageList_Add(himl, hbmp, 0); + biml.himl = himl; + for (i = 0; i < ARRAY_SIZE(imagelist_aligns); i++) + { + biml.uAlign = imagelist_aligns[i]; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, + NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_TOP || biml.uAlign == BUTTON_IMAGELIST_ALIGN_BOTTOM) + ok((size.cx >= max(4 * tm.tmMaxCharWidth, height) && size.cy >= height + tm.tmHeight), + "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, + max(4 * tm.tmMaxCharWidth, height), size.cy, height + tm.tmHeight); + else if (biml.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT || biml.uAlign == BUTTON_IMAGELIST_ALIGN_RIGHT) + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", biml.uAlign, size.cx, + width + 4 * tm.tmMaxCharWidth, size.cy, max(height, tm.tmHeight)); + else + ok(size.cx >= width && size.cy >= height, "Align:%d expect ideal cx %d >= %d and ideal cy %d >= %d\n", + biml.uAlign, size.cx, width, size.cy, height); + DestroyWindow(hwnd); + } + + /* Icon as image */ + /* Create icon from bitmap */ + ZeroMemory(&icon_info, sizeof(icon_info)); + icon_info.fIcon = TRUE; + icon_info.hbmMask = hmask; + icon_info.hbmColor = hbmp; + hicon = CreateIconIndirect(&icon_info); + + /* Only icon, ideal size should be enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | BS_ICON | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + /* Ideal size contains text rect even show icons only */ + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Show icon and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_DEFPUSHBUTTON | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hicon); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Checkbox */ + /* Both bitmap and text for checkbox, ideal size is only enough for text because it doesn't support image(but not image list)*/ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | default_style, 0, 0, client_width, client_height, NULL, + NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx <= width + 4 * tm.tmMaxCharWidth && size.cx >= 4 * tm.tmMaxCharWidth + && size.cy <= max(height, tm.tmHeight) && size.cy >= tm.tmHeight), + "Expect ideal cx %d within range (%d, %d ) and ideal cy %d within range (%d, %d )\n", size.cx, + 4 * tm.tmMaxCharWidth, width + 4 * tm.tmMaxCharWidth, size.cy, tm.tmHeight, max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Both image list and text for checkbox, ideal size should have enough for image list and text */ + biml.uAlign = BUTTON_IMAGELIST_ALIGN_LEFT; + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BCM_SETIMAGELIST, 0, (LPARAM)&biml); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Only bitmap for checkbox, ideal size should have enough for image and text */ + hwnd = CreateWindowA(WC_BUTTONA, "WWWW", BS_AUTOCHECKBOX | BS_BITMAP | default_style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, BM_SETIMAGE, (WPARAM)IMAGE_BITMAP, (LPARAM)hbmp); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + ok((size.cx >= width + 4 * tm.tmMaxCharWidth && size.cy >= max(height, tm.tmHeight)), + "Expect ideal cx %d >= %d and ideal cy %d >= %d\n", size.cx, width + 4 * tm.tmMaxCharWidth, size.cy, + max(height, tm.tmHeight)); + DestroyWindow(hwnd); + + /* Test button with only text */ + /* No text */ + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + style = type | default_style; + hwnd = CreateWindowA(WC_BUTTONA, "", style, 0, 0, client_width, client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + + if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) + { + todo_wine ok((size.cx == 0 && size.cy > 0), "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", + style, size.cx, 0, size.cy, 0); + } + else + { + ok(size.cx == client_width && size.cy == client_height, + "Style 0x%08x expect size.cx == %d and size.cy == %d, got size.cx: %d size.cy: %d\n", style, + client_width, client_height, size.cx, size.cy); + } + DestroyWindow(hwnd); + } + + /* Single line and multiple lines text */ + for (line_count = 1; line_count <= 2; line_count++) + { + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + style = line_count > 1 ? type | BS_MULTILINE : type; + style |= default_style; + + hwnd = CreateWindowW(WC_BUTTONW, (line_count == 2 ? text2_w : text_w), style, 0, 0, client_width, + client_height, NULL, NULL, 0, NULL); + ok(hwnd != NULL, "Expect hwnd not NULL\n"); + SendMessageA(hwnd, WM_SETFONT, (WPARAM)hfont, (LPARAM)TRUE); + ZeroMemory(&size, sizeof(size)); + ret = SendMessageA(hwnd, BCM_GETIDEALSIZE, 0, (LPARAM)&size); + ok(ret, "Expect BCM_GETIDEALSIZE message to return true\n"); + + if (type == BS_3STATE || type == BS_AUTO3STATE || type == BS_GROUPBOX || type == BS_PUSHBOX + || type == BS_OWNERDRAW) + { + ok(size.cx == client_width && size.cy == client_height, + "Style 0x%08x expect ideal size (%d,%d), got (%d,%d)\n", style, client_width, client_height, size.cx, + size.cy); + } + else if (type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK) + { + todo_wine ok((size.cx == 0 && size.cy > 0), + "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, 0, + size.cy, 0); + } + else + { + width = 0; + height = line_count == 2 ? 2 * tm.tmHeight : tm.tmHeight; + ok(size.cx >= width && size.cy >= height, + "Style 0x%08x expect ideal cx %d >= %d and ideal cy %d >= %d\n", style, size.cx, width, size.cy, + height); + } + DestroyWindow(hwnd); + } + } + + pImageList_Destroy(himl); + DestroyIcon(hicon); + DeleteObject(hbmp); + DeleteObject(hmask); + ReleaseDC(0, hdc); + DeleteObject(hfont); +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -1443,6 +1738,7 @@ START_TEST(button) test_get_set_imagelist(); test_get_set_textmargin(); test_state(); + test_bcm_get_ideal_size(); unload_v6_module(ctx_cookie, hCtx); } diff --git a/include/commctrl.h b/include/commctrl.h index 936b2e4026..77f460a99d 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1109,6 +1109,8 @@ typedef struct tagNMBCHOTITEM (BOOL)SNDMSG(button, BCM_GETTEXTMARGIN, 0, (LPARAM)(margin)) #define Button_SetTextMargin(button, margin) \ (BOOL)SNDMSG(button, BCM_SETTEXTMARGIN, 0, (LPARAM)(margin)) +#define Button_GetIdealSize(button, size) \ + (BOOL)SNDMSG(button, BCM_GETIDEALSIZE, 0, (LPARAM)(size)) /* Toolbar */ -- 2.18.0

2 1

wine-3.0.3-rc2 Available
by Michael Stefaniuc 05 Sep '18

05 Sep '18

Hello guys, I have pushed wine-3.0.3-rc2 (with tag) to https://github.com/mstefani/wine-stable/tree/stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Changes since rc1: - Dropped "mfplat: Return S_OK from MFStartup stub." as Alistair marked it as risky. bye michael

1 0

[PATCH 6/7] comctl32/button: Support text margin rendering.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 5fdfe7f936..a9ca619e89 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1027,6 +1027,17 @@ static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) return size; } +static const RECT *BUTTON_GetTextMargin(const BUTTON_INFO *infoPtr) +{ + static const RECT oneMargin = {1, 1, 1, 1}; + + /* Use text margin only when showing both image and text, and image is not imagelist */ + if (show_image_and_text(infoPtr) && !infoPtr->imagelist.himl) + return &infoPtr->text_margin; + else + return &oneMargin; +} + /********************************************************************** * BUTTON_CalcLayoutRects * @@ -1054,7 +1065,8 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la UINT dtStyle = BUTTON_BStoDT(style, ex_style); RECT labelRect, imageRect, imageRectWithMargin, textRect; LONG imageMarginWidth, imageMarginHeight; - RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; + const RECT *textMargin = BUTTON_GetTextMargin(infoPtr); + RECT emptyMargin = {0}; LONG maxTextWidth; /* Calculate label rectangle according to label type */ @@ -1118,7 +1130,7 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); /* Text doesn't use imagelist align */ - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, textMargin); } else { @@ -1143,17 +1155,17 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la /* Get text rect */ SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); /* Text doesn't use imagelist align */ - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, textMargin); } } /* Show text only */ else { if (get_button_type(style) != BS_GROUPBOX) - BUTTON_PositionRect(style, labelRc, &textRect, &oneMargin); + BUTTON_PositionRect(style, labelRc, &textRect, textMargin); else /* GroupBox is always top aligned */ - BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, &oneMargin); + BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, textMargin); labelRect = textRect; SetRectEmpty(&imageRect); } -- 2.18.0

2 1

[PATCH 5/7] comctl32/button: Support imagelist rendering.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40445 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40062 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45246 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 162 ++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2fa18f4f47..5fdfe7f936 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -876,16 +876,18 @@ static RECT BUTTON_GetTextRect(const BUTTON_INFO *infoPtr, HDC hdc, const WCHAR static BOOL show_image_only(const BUTTON_INFO *infoPtr) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); - return (style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image; + return (style & (BS_ICON | BS_BITMAP)) && (infoPtr->u.image || infoPtr->imagelist.himl); } static BOOL show_image_and_text(const BUTTON_INFO *infoPtr) { LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT type = get_button_type(style); - return !(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image - && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON - || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK); + return !(style & (BS_ICON | BS_BITMAP)) + && ((infoPtr->u.image + && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON + || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK)) + || (infoPtr->imagelist.himl && type != BS_GROUPBOX)); } static BOOL show_image(const BUTTON_INFO *infoPtr) @@ -978,13 +980,35 @@ static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRe } } +/* Convert imagelist align style to button align style */ +static UINT BUTTON_ILStoBS(UINT align) +{ + switch (align) + { + case BUTTON_IMAGELIST_ALIGN_TOP: + return BS_CENTER | BS_TOP; + case BUTTON_IMAGELIST_ALIGN_BOTTOM: + return BS_CENTER | BS_BOTTOM; + case BUTTON_IMAGELIST_ALIGN_CENTER: + return BS_CENTER | BS_VCENTER; + case BUTTON_IMAGELIST_ALIGN_RIGHT: + return BS_RIGHT | BS_VCENTER; + case BUTTON_IMAGELIST_ALIGN_LEFT: + default: + return BS_LEFT | BS_VCENTER; + } +} + static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) { ICONINFO iconInfo; BITMAP bm = {0}; SIZE size = {0}; - if (infoPtr->u.image) + /* ImageList has priority over image */ + if (infoPtr->imagelist.himl) + ImageList_GetIconSize(infoPtr->imagelist.himl, &size.cx, &size.cy); + else if (infoPtr->u.image) { if (infoPtr->image_type == IMAGE_ICON) { @@ -1024,10 +1048,12 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la { LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + LONG split_style = infoPtr->imagelist.himl ? BUTTON_ILStoBS(infoPtr->imagelist.uAlign) : style; WCHAR *text = get_button_text(infoPtr); SIZE imageSize = BUTTON_GetImageSize(infoPtr); UINT dtStyle = BUTTON_BStoDT(style, ex_style); - RECT labelRect, imageRect, textRect; + RECT labelRect, imageRect, imageRectWithMargin, textRect; + LONG imageMarginWidth, imageMarginHeight; RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; LONG maxTextWidth; @@ -1042,6 +1068,14 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la } SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); + imageRectWithMargin = imageRect; + if (infoPtr->imagelist.himl) + { + imageRectWithMargin.top -= infoPtr->imagelist.margin.top; + imageRectWithMargin.bottom += infoPtr->imagelist.margin.bottom; + imageRectWithMargin.left -= infoPtr->imagelist.margin.left; + imageRectWithMargin.right += infoPtr->imagelist.margin.right; + } /* Show image only */ if (show_image_only(infoPtr)) @@ -1064,30 +1098,53 @@ static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *la RECT boundingLabelRect, boundingImageRect, boundingTextRect; /* Get label rect */ - /* Get a label bounding rect to position the label in the user specified label rect because text and - * image need to align together. */ - boundingLabelRect = BUTTON_GetBoundingLabelRect(style, &textRect, &imageRect); - BUTTON_PositionRect(style, labelRc, &boundingLabelRect, &emptyMargin); - labelRect = boundingLabelRect; - - /* Get image rect */ - /* Split the label rect to two halves as two bounding rects for image and text */ - boundingImageRect = labelRect; - if ((style & BS_CENTER) == BS_RIGHT) - boundingImageRect.left = boundingImageRect.right - imageSize.cx; - else if ((style & BS_CENTER) == BS_LEFT) - boundingImageRect.right = boundingImageRect.left + imageSize.cx; - else if ((style & BS_VCENTER) == BS_BOTTOM) - boundingImageRect.top = boundingImageRect.bottom - imageSize.cy; - else if ((style & BS_VCENTER) == BS_TOP) - boundingImageRect.bottom = boundingImageRect.top + imageSize.cy; + /* Image list may have different alignment than the button, use the whole rect for label in this case */ + if (infoPtr->imagelist.himl) + labelRect = *labelRc; else - boundingImageRect.right = boundingImageRect.left + imageSize.cx; - BUTTON_PositionRect(style, &boundingImageRect, &imageRect, &emptyMargin); - - /* Get text rect */ - SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); - BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + { + /* Get a label bounding rectangle to position the label in the user specified label rectangle because + * text and image need to align together. */ + boundingLabelRect = BUTTON_GetBoundingLabelRect(split_style, &textRect, &imageRectWithMargin); + BUTTON_PositionRect(split_style, labelRc, &boundingLabelRect, &emptyMargin); + labelRect = boundingLabelRect; + } + + /* When imagelist has center align, use the whole rect for imagelist and text */ + if(infoPtr->imagelist.himl && infoPtr->imagelist.uAlign == BUTTON_IMAGELIST_ALIGN_CENTER) + { + boundingImageRect = labelRect; + boundingTextRect = labelRect; + BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + /* Text doesn't use imagelist align */ + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } + else + { + /* Get image rect */ + /* Split the label rect to two halves as two bounding rectangles for image and text */ + boundingImageRect = labelRect; + imageMarginWidth = imageRectWithMargin.right - imageRectWithMargin.left; + imageMarginHeight = imageRectWithMargin.bottom - imageRectWithMargin.top; + if ((split_style & BS_CENTER) == BS_RIGHT) + boundingImageRect.left = boundingImageRect.right - imageMarginWidth; + else if ((split_style & BS_CENTER) == BS_LEFT) + boundingImageRect.right = boundingImageRect.left + imageMarginWidth; + else if ((split_style & BS_VCENTER) == BS_BOTTOM) + boundingImageRect.top = boundingImageRect.bottom - imageMarginHeight; + else if ((split_style & BS_VCENTER) == BS_TOP) + boundingImageRect.bottom = boundingImageRect.top + imageMarginHeight; + else + boundingImageRect.right = boundingImageRect.left + imageMarginWidth; + BUTTON_PositionRect(split_style, &boundingImageRect, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + + /* Get text rect */ + SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); + /* Text doesn't use imagelist align */ + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } } /* Show text only */ else @@ -1144,6 +1201,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; UINT imageFlags; LONG state = infoPtr->state; + LONG draw_state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); WCHAR *text = NULL; @@ -1158,24 +1216,40 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, flags |= DSS_MONO; } - switch (infoPtr->image_type) + if (show_image(infoPtr)) { - case IMAGE_ICON: - imageFlags = flags | DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - case IMAGE_BITMAP: - imageFlags = flags | DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - default: - return; + if (infoPtr->imagelist.himl) + { + if (ImageList_GetImageCount(infoPtr->imagelist.himl) == 1) + ImageList_Draw(infoPtr->imagelist.himl, 0, hdc, imageRect->left, imageRect->top, ILD_NORMAL); + else + { + draw_state = get_draw_state(infoPtr); + ImageList_Draw(infoPtr->imagelist.himl, draw_state - 1, hdc, imageRect->left, imageRect->top, + ILD_NORMAL); + } + } + else + { + switch (infoPtr->image_type) + { + case IMAGE_ICON: + imageFlags = flags | DST_ICON; + lp = (LPARAM)infoPtr->u.icon; + break; + case IMAGE_BITMAP: + imageFlags = flags | DST_BITMAP; + lp = (LPARAM)infoPtr->u.bitmap; + break; + default: + return; + } + + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, + imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); + } } - if (show_image(infoPtr)) - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, - imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); - if (show_image_only(infoPtr)) return; /* DST_COMPLEX -- is 0 */ -- 2.18.0

2 1

[PATCH 4/7] comctl32/button: Avoid push button content covering frames.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

A focus frame maybe covered by content in the push button. Shrink the label rectangle before layout calculation so that content can never cover the frame. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 653586a748..2fa18f4f47 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1250,6 +1250,8 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) /* draw button label */ labelRect = rc; + /* Shrink label rect at all sides by 2 so that the content won't touch the surrounding frame */ + InflateRect(&labelRect, -2, -2); dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags == (UINT)-1L) -- 2.18.0

2 1

[PATCH 3/7] comctl32/button: Support displaying both image and text.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45727 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 421 +++++++++++++++++++++++++++++------------ 1 file changed, 295 insertions(+), 126 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 6f9bc39de5..653586a748 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -98,7 +98,7 @@ typedef struct _BUTTON_INFO } u; } BUTTON_INFO; -static UINT BUTTON_CalcLabelRect( const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc ); +static UINT BUTTON_CalcLayoutRects( const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc ); static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ); @@ -615,7 +615,7 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L /* FIXME: check other BS_* handlers */ if (btn_type == BS_GROUPBOX) InflateRect(&rc, -7, 1); /* GB_Paint does this */ - BUTTON_CalcLabelRect(infoPtr, hdc, &rc); + BUTTON_CalcLayoutRects(infoPtr, hdc, &rc, NULL, NULL); /* Clip by client rect bounds */ if (rc.right > client.right) rc.right = client.right; if (rc.bottom > client.bottom) rc.bottom = client.bottom; @@ -855,95 +855,257 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L return 0; } +/* If maxWidth is zero, rectangle width is unlimited */ +static RECT BUTTON_GetTextRect(const BUTTON_INFO *infoPtr, HDC hdc, const WCHAR *text, LONG maxWidth) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + LONG exStyle = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + UINT dtStyle = BUTTON_BStoDT(style, exStyle); + HFONT hPrevFont; + RECT rect = {0}; + + rect.right = maxWidth; + hPrevFont = SelectObject(hdc, infoPtr->font); + /* Calculate height without DT_VCENTER and DT_BOTTOM to get the correct height */ + DrawTextW(hdc, text, -1, &rect, (dtStyle & ~(DT_VCENTER | DT_BOTTOM)) | DT_CALCRECT); + if (hPrevFont) SelectObject(hdc, hPrevFont); + + return rect; +} + +static BOOL show_image_only(const BUTTON_INFO *infoPtr) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + return (style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image; +} + +static BOOL show_image_and_text(const BUTTON_INFO *infoPtr) +{ + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + UINT type = get_button_type(style); + return !(style & (BS_ICON | BS_BITMAP)) && infoPtr->u.image + && (type == BS_PUSHBUTTON || type == BS_DEFPUSHBUTTON || type == BS_USERBUTTON || type == BS_SPLITBUTTON + || type == BS_DEFSPLITBUTTON || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK); +} + +static BOOL show_image(const BUTTON_INFO *infoPtr) +{ + return show_image_only(infoPtr) || show_image_and_text(infoPtr); +} + +/* Get a bounding rectangle that is large enough to contain a image and a text side by side. + * Note: (left,top) of the result rectangle may not be (0,0), offset it by yourself if needed */ +static RECT BUTTON_GetBoundingLabelRect(LONG style, const RECT *textRect, const RECT *imageRect) +{ + RECT labelRect; + RECT rect = *imageRect; + INT textWidth = textRect->right - textRect->left; + INT textHeight = textRect->bottom - textRect->top; + INT imageWidth = imageRect->right - imageRect->left; + INT imageHeight = imageRect->bottom - imageRect->top; + + if ((style & BS_CENTER) == BS_RIGHT) + OffsetRect(&rect, textWidth, 0); + else if ((style & BS_CENTER) == BS_LEFT) + OffsetRect(&rect, -imageWidth, 0); + else if ((style & BS_VCENTER) == BS_BOTTOM) + OffsetRect(&rect, 0, textHeight); + else if ((style & BS_VCENTER) == BS_TOP) + OffsetRect(&rect, 0, -imageHeight); + else + OffsetRect(&rect, -imageWidth, 0); + + UnionRect(&labelRect, textRect, &rect); + return labelRect; +} + +/* Position a rectangle inside a bounding rectangle according to button alignment flags */ +static void BUTTON_PositionRect(LONG style, const RECT *outerRect, RECT *innerRect, const RECT *margin) +{ + INT width = innerRect->right - innerRect->left; + INT height = innerRect->bottom - innerRect->top; + + if ((style & WS_EX_RIGHT) && !(style & BS_CENTER)) style |= BS_CENTER; + + if (!(style & BS_CENTER)) + { + /* Push button's text is centered by default, all other types have left aligned text */ + if (get_button_type(style) <= BS_DEFPUSHBUTTON) + style |= BS_CENTER; + else + style |= BS_LEFT; + } + + if (!(style & BS_VCENTER)) + { + /* Group box's text is top aligned by default */ + if (get_button_type(style) == BS_GROUPBOX) + style |= BS_TOP; + } + + switch (style & BS_CENTER) + { + case BS_CENTER: + innerRect->left = outerRect->left + (outerRect->right - outerRect->left - width) / 2; + innerRect->right = innerRect->left + width; + break; + case BS_RIGHT: + innerRect->right = outerRect->right - margin->right; + innerRect->left = innerRect->right - width; + break; + case BS_LEFT: + default: + innerRect->left = outerRect->left + margin->left; + innerRect->right = innerRect->left + width; + break; + } + + switch (style & BS_VCENTER) + { + case BS_TOP: + innerRect->top = outerRect->top + margin->top; + innerRect->bottom = innerRect->top + height; + break; + case BS_BOTTOM: + innerRect->bottom = outerRect->bottom - margin->bottom; + innerRect->top = innerRect->bottom - height; + break; + case BS_VCENTER: + default: + innerRect->top = outerRect->top + (outerRect->bottom - outerRect->top - height) / 2; + innerRect->bottom = innerRect->top + height; + break; + } +} + +static SIZE BUTTON_GetImageSize(const BUTTON_INFO *infoPtr) +{ + ICONINFO iconInfo; + BITMAP bm = {0}; + SIZE size = {0}; + + if (infoPtr->u.image) + { + if (infoPtr->image_type == IMAGE_ICON) + { + GetIconInfo(infoPtr->u.icon, &iconInfo); + GetObjectW(iconInfo.hbmColor, sizeof(bm), &bm); + DeleteObject(iconInfo.hbmColor); + DeleteObject(iconInfo.hbmMask); + } + else if (infoPtr->image_type == IMAGE_BITMAP) + GetObjectW(infoPtr->u.bitmap, sizeof(bm), &bm); + + size.cx = bm.bmWidth; + size.cy = bm.bmHeight; + } + + return size; +} + /********************************************************************** - * BUTTON_CalcLabelRect + * BUTTON_CalcLayoutRects * - * Calculates label's rectangle depending on button style. + * Calculates the rectangles of the button label(image and text) and its parts depending on a button's style. * * Returns flags to be passed to DrawText. * Calculated rectangle doesn't take into account button state * (pushed, etc.). If there is nothing to draw (no text/image) output * rectangle is empty, and return value is (UINT)-1. + * + * PARAMS: + * infoPtr [I] Button pointer + * hdc [I] Handle to device context to draw to + * labelRc [I/O] Input the rect the label to be positioned in, and output the label rect + * imageRc [O] Optional, output the image rect + * textRc [O] Optional, output the text rect */ -static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc) +static UINT BUTTON_CalcLayoutRects(const BUTTON_INFO *infoPtr, HDC hdc, RECT *labelRc, RECT *imageRc, RECT *textRc) { LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); WCHAR *text = get_button_text(infoPtr); - ICONINFO iconInfo; - BITMAP bm = { 0 }; - UINT dtStyle = BUTTON_BStoDT( style, ex_style ); - RECT r = *rc; - INT n; + SIZE imageSize = BUTTON_GetImageSize(infoPtr); + UINT dtStyle = BUTTON_BStoDT(style, ex_style); + RECT labelRect, imageRect, textRect; + RECT emptyMargin = {0}, oneMargin = {1, 1, 1, 1}; + LONG maxTextWidth; /* Calculate label rectangle according to label type */ - /* FIXME: Doesn't support showing both image and text yet */ - if (infoPtr->u.image) - { - if (infoPtr->image_type == IMAGE_ICON) - { - GetIconInfo(infoPtr->u.icon, &iconInfo); - GetObjectW(iconInfo.hbmColor, sizeof(bm), &bm); - DeleteObject(iconInfo.hbmColor); - DeleteObject(iconInfo.hbmMask); - } - else if (infoPtr->image_type == IMAGE_BITMAP) - { - GetObjectW(infoPtr->u.bitmap, sizeof(bm), &bm); - } - - r.right = r.left + bm.bmWidth; - r.bottom = r.top + bm.bmHeight; - } - else if (text && text[0]) + if ((imageSize.cx == 0 && imageSize.cy == 0) && (text == NULL || text[0] == '\0')) { - HFONT hFont, hPrevFont = 0; - - if ((hFont = infoPtr->font)) hPrevFont = SelectObject(hdc, hFont); - DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT); - if (hPrevFont) SelectObject(hdc, hPrevFont); - } - - if ((infoPtr->u.image && bm.bmWidth == 0 && bm.bmHeight == 0) - || (text == NULL || text[0] == '\0')) - { - rc->right = r.left; - rc->bottom = r.top; + SetRectEmpty(labelRc); + SetRectEmpty(imageRc); + SetRectEmpty(textRc); heap_free(text); return (UINT)-1; } - heap_free(text); - /* Position label inside bounding rectangle according to - * alignment flags. (calculated rect is always left-top aligned). - * If label is aligned to any side - shift label in opposite - * direction to leave extra space for focus rectangle. - */ - switch (dtStyle & (DT_CENTER|DT_RIGHT)) + SetRect(&imageRect, 0, 0, imageSize.cx, imageSize.cy); + + /* Show image only */ + if (show_image_only(infoPtr)) { - case DT_LEFT: r.left++; r.right++; break; - case DT_CENTER: n = r.right - r.left; - r.left = rc->left + ((rc->right - rc->left) - n) / 2; - r.right = r.left + n; break; - case DT_RIGHT: n = r.right - r.left; - r.right = rc->right - 1; - r.left = r.right - n; - break; + BUTTON_PositionRect(style, labelRc, &imageRect, + infoPtr->imagelist.himl ? &infoPtr->imagelist.margin : &emptyMargin); + labelRect = imageRect; + SetRectEmpty(&textRect); } - - switch (dtStyle & (DT_VCENTER|DT_BOTTOM)) + else { - case DT_TOP: r.top++; r.bottom++; break; - case DT_VCENTER: n = r.bottom - r.top; - r.top = rc->top + ((rc->bottom - rc->top) - n) / 2; - r.bottom = r.top + n; break; - case DT_BOTTOM: n = r.bottom - r.top; - r.bottom = rc->bottom - 1; - r.top = r.bottom - n; - break; + /* Get text rect */ + maxTextWidth = labelRc->right - labelRc->left; + textRect = BUTTON_GetTextRect(infoPtr, hdc, text, maxTextWidth); + heap_free(text); + + /* Show image and text */ + if (show_image_and_text(infoPtr)) + { + RECT boundingLabelRect, boundingImageRect, boundingTextRect; + + /* Get label rect */ + /* Get a label bounding rect to position the label in the user specified label rect because text and + * image need to align together. */ + boundingLabelRect = BUTTON_GetBoundingLabelRect(style, &textRect, &imageRect); + BUTTON_PositionRect(style, labelRc, &boundingLabelRect, &emptyMargin); + labelRect = boundingLabelRect; + + /* Get image rect */ + /* Split the label rect to two halves as two bounding rects for image and text */ + boundingImageRect = labelRect; + if ((style & BS_CENTER) == BS_RIGHT) + boundingImageRect.left = boundingImageRect.right - imageSize.cx; + else if ((style & BS_CENTER) == BS_LEFT) + boundingImageRect.right = boundingImageRect.left + imageSize.cx; + else if ((style & BS_VCENTER) == BS_BOTTOM) + boundingImageRect.top = boundingImageRect.bottom - imageSize.cy; + else if ((style & BS_VCENTER) == BS_TOP) + boundingImageRect.bottom = boundingImageRect.top + imageSize.cy; + else + boundingImageRect.right = boundingImageRect.left + imageSize.cx; + BUTTON_PositionRect(style, &boundingImageRect, &imageRect, &emptyMargin); + + /* Get text rect */ + SubtractRect(&boundingTextRect, &labelRect, &boundingImageRect); + BUTTON_PositionRect(style, &boundingTextRect, &textRect, &oneMargin); + } + /* Show text only */ + else + { + if (get_button_type(style) != BS_GROUPBOX) + BUTTON_PositionRect(style, labelRc, &textRect, &oneMargin); + else + /* GroupBox is always top aligned */ + BUTTON_PositionRect((style & ~BS_VCENTER) | BS_TOP, labelRc, &textRect, &oneMargin); + labelRect = textRect; + SetRectEmpty(&imageRect); + } } - *rc = r; + CopyRect(labelRc, &labelRect); + CopyRect(imageRc, &imageRect); + CopyRect(textRc, &textRect); + return dtStyle; } @@ -962,19 +1124,25 @@ static BOOL CALLBACK BUTTON_DrawTextCallback(HDC hdc, LPARAM lp, WPARAM wp, int return TRUE; } - /********************************************************************** * BUTTON_DrawLabel * * Common function for drawing button label. + * + * FIXME: + * 1. When BS_SINGLELINE is specified and text contains '\t', '\n' or '\r' in the middle, they are rendered as + * squares now whereas they should be ignored. + * 2. When BS_MULTILINE is specified and text contains space in the middle, the space mistakenly be rendered as newline. */ -static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, const RECT *rc) +static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, const RECT *imageRect, + const RECT *textRect) { DRAWSTATEPROC lpOutputProc = NULL; LPARAM lp; WPARAM wp = 0; HBRUSH hbr = 0; UINT flags = IsWindowEnabled(infoPtr->hwnd) ? DSS_NORMAL : DSS_DISABLED; + UINT imageFlags; LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); WCHAR *text = NULL; @@ -990,35 +1158,34 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, flags |= DSS_MONO; } - /* FIXME: Support drawing label with both image and text */ - if (infoPtr->u.image != 0) + switch (infoPtr->image_type) { - switch (infoPtr->image_type) - { - case IMAGE_ICON: - flags |= DST_ICON; - lp = (LPARAM)infoPtr->u.icon; - break; - case IMAGE_BITMAP: - flags |= DST_BITMAP; - lp = (LPARAM)infoPtr->u.bitmap; - break; - default: - return; - } - } - else - { - /* DST_COMPLEX -- is 0 */ - lpOutputProc = BUTTON_DrawTextCallback; - if (!(text = get_button_text(infoPtr))) return; - lp = (LPARAM)text; - wp = dtFlags; + case IMAGE_ICON: + imageFlags = flags | DST_ICON; + lp = (LPARAM)infoPtr->u.icon; + break; + case IMAGE_BITMAP: + imageFlags = flags | DST_BITMAP; + lp = (LPARAM)infoPtr->u.bitmap; + break; + default: + return; } - DrawStateW(hdc, hbr, lpOutputProc, lp, wp, rc->left, rc->top, - rc->right - rc->left, rc->bottom - rc->top, flags); - heap_free( text ); + if (show_image(infoPtr)) + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, imageRect->left, imageRect->top, + imageRect->right - imageRect->left, imageRect->bottom - imageRect->top, imageFlags); + + if (show_image_only(infoPtr)) return; + + /* DST_COMPLEX -- is 0 */ + lpOutputProc = BUTTON_DrawTextCallback; + if (!(text = get_button_text(infoPtr))) return; + lp = (LPARAM)text; + wp = dtFlags; + DrawStateW(hdc, hbr, lpOutputProc, lp, wp, textRect->left, textRect->top, textRect->right - textRect->left, + textRect->bottom - textRect->top, flags); + heap_free(text); } /********************************************************************** @@ -1026,7 +1193,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags, */ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rc, r; + RECT rc, labelRect, imageRect, textRect; UINT dtFlags, uState; HPEN hOldPen, hpen; HBRUSH hOldBrush; @@ -1082,18 +1249,17 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) DrawFrameControl( hDC, &rc, DFC_BUTTON, uState ); /* draw button label */ - r = rc; - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &r); + labelRect = rc; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags == (UINT)-1L) goto cleanup; - if (pushedState) - OffsetRect(&r, 1, 1); + if (pushedState) OffsetRect(&labelRect, 1, 1); oldTxtColor = SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) ); - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &r); + BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); SetTextColor( hDC, oldTxtColor ); @@ -1119,7 +1285,7 @@ draw_focus: static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, rtext, client; + RECT rbox, labelRect, imageRect, textRect, client; HBRUSH hBrush; int delta, text_offset, checkBoxWidth, checkBoxHeight; UINT dtFlags; @@ -1137,7 +1303,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = rtext = client; + rbox = labelRect = client; checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; @@ -1155,12 +1321,12 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { - rtext.right -= checkBoxWidth + text_offset; + labelRect.right -= checkBoxWidth + text_offset; rbox.left = rbox.right - checkBoxWidth; } else { - rtext.left += checkBoxWidth + text_offset; + labelRect.left += checkBoxWidth + text_offset; rbox.right = checkBoxWidth; } @@ -1169,14 +1335,14 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (action == ODA_DRAWENTIRE) FillRect( hDC, &client, hBrush ); /* Draw label */ - client = rtext; - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &rtext); + client = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); /* Only adjust rbox when rtext is valid */ if (dtFlags != (UINT)-1L) { - rbox.top = rtext.top; - rbox.bottom = rtext.bottom; + rbox.top = labelRect.top; + rbox.bottom = labelRect.bottom; } /* Draw the check-box bitmap */ @@ -1229,16 +1395,15 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (dtFlags == (UINT)-1L) /* Noting to draw */ return; - if (action == ODA_DRAWENTIRE) - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &rtext); + if (action == ODA_DRAWENTIRE) BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); /* ... and focus */ if (action == ODA_FOCUS || (state & BST_FOCUS)) { - rtext.left--; - rtext.right++; - IntersectRect(&rtext, &rtext, &client); - DrawFocusRect( hDC, &rtext ); + labelRect.left--; + labelRect.right++; + IntersectRect(&labelRect, &labelRect, &client); + DrawFocusRect(hDC, &labelRect); } SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); @@ -1274,7 +1439,7 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rc, rcFrame; + RECT labelRect, imageRect, textRect, rcFrame; HBRUSH hbr; HFONT hFont; UINT dtFlags; @@ -1290,16 +1455,16 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hbr = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); if (!hbr) /* did the app forget to call defwindowproc ? */ hbr = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC, (WPARAM)hDC, (LPARAM)infoPtr->hwnd); - GetClientRect( infoPtr->hwnd, &rc); - rcFrame = rc; - hrgn = set_control_clipping( hDC, &rc ); + GetClientRect(infoPtr->hwnd, &labelRect); + rcFrame = labelRect; + hrgn = set_control_clipping(hDC, &labelRect); GetTextMetricsW (hDC, &tm); rcFrame.top += (tm.tmHeight / 2) - 1; DrawEdge (hDC, &rcFrame, EDGE_ETCHED, BF_RECT | ((style & BS_FLAT) ? BF_FLAT : 0)); - InflateRect(&rc, -7, 1); - dtFlags = BUTTON_CalcLabelRect(infoPtr, hDC, &rc); + InflateRect(&labelRect, -7, 1); + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); if (dtFlags != (UINT)-1) { @@ -1309,11 +1474,15 @@ static void GB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) */ /* There is 1-pixel margin at the left, right, and bottom */ - rc.left--; rc.right++; rc.bottom++; - FillRect(hDC, &rc, hbr); - rc.left++; rc.right--; rc.bottom--; - - BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &rc); + labelRect.left--; + labelRect.right++; + labelRect.bottom++; + FillRect(hDC, &labelRect, hbr); + labelRect.left++; + labelRect.right--; + labelRect.bottom--; + + BUTTON_DrawLabel(infoPtr, hDC, dtFlags, &imageRect, &textRect); } SelectClipRgn( hDC, hrgn ); if (hrgn) DeleteObject( hrgn ); -- 2.18.0

2 1

[PATCH 2/7] comctl32/button: Use get_draw_state() helper.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Use a helper so that the get draw state routine can be shared by later code. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/button.c | 118 +++++++++++++++++++++++++---------------- 1 file changed, 71 insertions(+), 47 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 56968f99e3..6f9bc39de5 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -128,15 +128,16 @@ static const WORD maxCheckState[MAX_BTN_TYPE] = BST_UNCHECKED /* BS_DEFCOMMANDLINK */ }; -/* These are indices into a states array to determine the theme state for a given theme part. */ -typedef enum +/* Generic draw states, use get_draw_state() to get specific state for button type */ +enum draw_state { STATE_NORMAL, STATE_DISABLED, STATE_HOT, STATE_PRESSED, - STATE_DEFAULTED -} ButtonState; + STATE_DEFAULTED, + DRAW_STATE_COUNT +}; typedef void (*pfPaint)( const BUTTON_INFO *infoPtr, HDC hdc, UINT action ); @@ -160,11 +161,11 @@ static const pfPaint btnPaintFunc[MAX_BTN_TYPE] = PB_Paint /* BS_DEFCOMMANDLINK */ }; -typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +typedef void (*pfThemedPaint)( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); -static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); -static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, ButtonState drawState, UINT dtflags, BOOL focused); +static void PB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void CB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); +static void GB_ThemedPaint( HTHEME theme, const BUTTON_INFO *infoPtr, HDC hdc, int drawState, UINT dtflags, BOOL focused); static const pfThemedPaint btnThemedPaintFunc[MAX_BTN_TYPE] = { @@ -286,6 +287,63 @@ static UINT BUTTON_BStoDT( DWORD style, DWORD ex_style ) return dtStyle; } +static int get_draw_state(const BUTTON_INFO *infoPtr) +{ + static const int pb_states[DRAW_STATE_COUNT] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; + static const int cb_states[3][DRAW_STATE_COUNT] = + { + { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, + { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, + { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } + }; + static const int rb_states[2][DRAW_STATE_COUNT] = + { + { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, + { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } + }; + static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; + LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); + UINT type = get_button_type(style); + int check_state = infoPtr->state & 3; + enum draw_state state; + + if (!IsWindowEnabled(infoPtr->hwnd)) + state = STATE_DISABLED; + else if (infoPtr->state & BST_PUSHED) + state = STATE_PRESSED; + else if (infoPtr->state & BST_HOT) + state = STATE_HOT; + else if (infoPtr->state & BST_FOCUS) + state = STATE_DEFAULTED; + else + state = STATE_NORMAL; + + switch (type) + { + case BS_PUSHBUTTON: + case BS_DEFPUSHBUTTON: + case BS_USERBUTTON: + case BS_SPLITBUTTON: + case BS_DEFSPLITBUTTON: + case BS_COMMANDLINK: + case BS_DEFCOMMANDLINK: + return pb_states[state]; + case BS_CHECKBOX: + case BS_AUTOCHECKBOX: + return cb_states[check_state][state]; + case BS_RADIOBUTTON: + case BS_3STATE: + case BS_AUTO3STATE: + case BS_AUTORADIOBUTTON: + return rb_states[check_state][state]; + case BS_GROUPBOX: + return gb_states[state]; + default: + WARN("Unsupported button type 0x%08x\n", type); + return PBS_NORMAL; + } +} + static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { BUTTON_INFO *infoPtr = (BUTTON_INFO *)GetWindowLongPtrW(hWnd, 0); @@ -402,20 +460,9 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L if (theme && btnThemedPaintFunc[btn_type]) { - ButtonState drawState; - UINT dtflags; + int drawState = get_draw_state(infoPtr); + UINT dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); - if (IsWindowEnabled( hWnd )) - { - if (infoPtr->state & BST_PUSHED) drawState = STATE_PRESSED; - else if (infoPtr->state & BST_HOT) drawState = STATE_HOT; - else if (infoPtr->state & BST_FOCUS) drawState = STATE_DEFAULTED; - else drawState = STATE_NORMAL; - } - else - drawState = STATE_DISABLED; - - dtflags = BUTTON_BStoDT(style, GetWindowLongW(hWnd, GWL_EXSTYLE)); btnThemedPaintFunc[btn_type](theme, infoPtr, hdc, drawState, dtflags, infoPtr->state & BST_FOCUS); } else if (btnPaintFunc[btn_type]) @@ -1352,14 +1399,11 @@ static void OB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (hrgn) DeleteObject( hrgn ); } -static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_DEFAULTED }; - RECT bgRect, textRect; HFONT font = infoPtr->font; HFONT hPrevFont = font ? SelectObject(hDC, font) : NULL; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); GetClientRect(infoPtr->hwnd, &bgRect); @@ -1392,31 +1436,14 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int cb_states[3][5] = - { - { CBS_UNCHECKEDNORMAL, CBS_UNCHECKEDDISABLED, CBS_UNCHECKEDHOT, CBS_UNCHECKEDPRESSED, CBS_UNCHECKEDNORMAL }, - { CBS_CHECKEDNORMAL, CBS_CHECKEDDISABLED, CBS_CHECKEDHOT, CBS_CHECKEDPRESSED, CBS_CHECKEDNORMAL }, - { CBS_MIXEDNORMAL, CBS_MIXEDDISABLED, CBS_MIXEDHOT, CBS_MIXEDPRESSED, CBS_MIXEDNORMAL } - }; - - static const int rb_states[2][5] = - { - { RBS_UNCHECKEDNORMAL, RBS_UNCHECKEDDISABLED, RBS_UNCHECKEDHOT, RBS_UNCHECKEDPRESSED, RBS_UNCHECKEDNORMAL }, - { RBS_CHECKEDNORMAL, RBS_CHECKEDDISABLED, RBS_CHECKEDHOT, RBS_CHECKEDPRESSED, RBS_CHECKEDNORMAL } - }; - SIZE sz; RECT bgRect, textRect; HFONT font, hPrevFont = NULL; - int checkState = infoPtr->state & 3; DWORD dwStyle = GetWindowLongW(infoPtr->hwnd, GWL_STYLE); UINT btn_type = get_button_type( dwStyle ); int part = (btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON) ? BP_RADIOBUTTON : BP_CHECKBOX; - int state = (part == BP_CHECKBOX) - ? cb_states[ checkState ][ drawState ] - : rb_states[ checkState ][ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; BOOL created_font = FALSE; @@ -1478,12 +1505,9 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, Bu if (hPrevFont) SelectObject(hDC, hPrevFont); } -static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, ButtonState drawState, UINT dtFlags, BOOL focused) +static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - static const int states[] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; - RECT bgRect, textRect, contentRect; - int state = states[ drawState ]; WCHAR *text = get_button_text(infoPtr); LOGFONTW lf; HFONT font, hPrevFont = NULL; -- 2.18.0

2 1

[PATCH 1/7] comctl32/tests: Add tests for button state.
by Zhiyi Zhang 05 Sep '18

05 Sep '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index b27ab844b7..1fd644b6f2 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -1406,6 +1406,22 @@ static void test_get_set_textmargin(void) } } +static void test_state(void) +{ + HWND hwnd; + DWORD type; + LONG state; + + /* Initial button state */ + for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++) + { + hwnd = create_button(type, NULL); + state = SendMessageA(hwnd, BM_GETSTATE, 0, 0); + ok(state == BST_UNCHECKED, "Expect state 0x%08x, got 0x%08x\n", BST_UNCHECKED, state); + DestroyWindow(hwnd); + } +} + START_TEST(button) { ULONG_PTR ctx_cookie; @@ -1426,6 +1442,7 @@ START_TEST(button) test_bm_get_set_image(); test_get_set_imagelist(); test_get_set_textmargin(); + test_state(); unload_v6_module(ctx_cookie, hCtx); } -- 2.18.0

2 1

[PATCH] xmllite/reader: Fix compiler warning.
by Nikolay Sivov 05 Sep '18

05 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9cb7f3bd77..f10c718d80 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1019,9 +1019,9 @@ static void readerinput_switchencoding(xmlreaderinput *readerinput, xml_encoding encoded_buffer *src = &readerinput->buffer->encoded; encoded_buffer *dest = &readerinput->buffer->utf16; int len, dest_len; + UINT cp = ~0u; HRESULT hr; WCHAR *ptr; - UINT cp; hr = get_code_page(enc, &cp); if (FAILED(hr)) return; -- 2.18.0

1 0

[PATCH vkd3d 6/6] tests: Add test for combined clip and cull distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 283 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 283 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38e757a28748..34b4fdf101fb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18921,6 +18921,288 @@ static void test_clip_distance(void) destroy_test_context(&context); } +static void test_combined_clip_and_cull_distances(void) +{ + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct test_context context; + struct resource_readback rb; + ID3D12CommandQueue *queue; + ID3D12Resource *vb[2]; + ID3D12Device *device; + unsigned int i, j, k; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct input + { + float4 position : POSITION; + float clip0 : CLIP_DISTANCE0; + float clip1 : CLIP_DISTANCE1; + float clip2 : CLIP_DISTANCE2; + float clip3 : CLIP_DISTANCE3; + float cull0 : CULL_DISTANCE0; + float cull1 : CULL_DISTANCE1; + float cull2 : CULL_DISTANCE2; + float cull3 : CULL_DISTANCE3; + }; + + struct vertex + { + float4 position : SV_Position; + float3 clip0 : SV_ClipDistance1; + float3 cull0 : SV_CullDistance1; + float clip1 : SV_ClipDistance2; + float cull1 : SV_CullDistance2; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.clip0 = float3(vin.clip0, vin.clip1, vin.clip2); + vertex.cull0 = float3(vin.cull0, vin.cull1, vin.cull2); + vertex.clip1 = vin.clip3; + vertex.cull1 = vin.cull3; + } +#endif + 0x43425844, 0xa24fb3ea, 0x92e2c2b0, 0xb599b1b9, 0xd671f830, 0x00000001, 0x00000374, 0x00000003, + 0x0000002c, 0x0000013c, 0x000001f0, 0x4e475349, 0x00000108, 0x00000009, 0x00000008, 0x000000e0, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000e9, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x000000e9, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000e9, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x000000e9, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000101, 0x000000f7, 0x00000000, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x000000f7, 0x00000001, 0x00000000, 0x00000003, 0x00000006, + 0x00000101, 0x000000f7, 0x00000002, 0x00000000, 0x00000003, 0x00000007, 0x00000101, 0x000000f7, + 0x00000003, 0x00000000, 0x00000003, 0x00000008, 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, + 0x49445f50, 0x4e415453, 0x43004543, 0x5f4c4c55, 0x54534944, 0x45434e41, 0xababab00, 0x4e47534f, + 0x000000ac, 0x00000005, 0x00000008, 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000008c, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000807, 0x0000008c, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000708, 0x0000009c, 0x00000000, 0x00000003, + 0x00000003, 0x00000002, 0x00000807, 0x0000009c, 0x00000001, 0x00000003, 0x00000003, 0x00000002, + 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x435f5653, 0x4470696c, 0x61747369, 0x0065636e, + 0x435f5653, 0x446c6c75, 0x61747369, 0x0065636e, 0x52444853, 0x0000017c, 0x00010040, 0x0000005f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, 0x00101012, 0x00000004, 0x0300005f, + 0x00101012, 0x00000005, 0x0300005f, 0x00101012, 0x00000006, 0x0300005f, 0x00101012, 0x00000007, + 0x0300005f, 0x00101012, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, + 0x00102072, 0x00000001, 0x00000002, 0x04000067, 0x00102082, 0x00000001, 0x00000002, 0x04000067, + 0x00102072, 0x00000002, 0x00000003, 0x04000067, 0x00102082, 0x00000002, 0x00000003, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, + 0x00000001, 0x05000036, 0x00102022, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102042, + 0x00000001, 0x0010100a, 0x00000003, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000004, + 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000005, 0x05000036, 0x00102022, 0x00000002, + 0x0010100a, 0x00000006, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000007, 0x05000036, + 0x00102082, 0x00000002, 0x0010100a, 0x00000008, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 8, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 12, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 20, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 24, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 28, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + struct + { + float clip_distance[4]; + float cull_distance[4]; + } + vertices[4] = + { + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + }; + static const struct test + { + float vertices[4]; + BOOL triangle_visible[2]; + } + cull_distance_tests[] = + { + {{-1.0f, 1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + + {{-1.0f, -1.0f, -1.0f, 1.0f}, {FALSE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, -1.0f}, {TRUE, FALSE}}, + + {{-1.0f, -1.0f, -1.0f, -1.0f}, {FALSE, FALSE}}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + vb[0] = create_upload_buffer(device, sizeof(quad), quad); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*quad); + vbv[0].SizeInBytes = sizeof(quad); + + vb[1] = create_upload_buffer(device, sizeof(vertices), vertices); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + vbv[1].StrideInBytes = sizeof(*vertices); + vbv[1].SizeInBytes = sizeof(vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices->cull_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(cull_distance_tests); ++j) + { + const struct test *test = &cull_distance_tests[j]; + unsigned int expected_color[ARRAY_SIZE(test->triangle_visible)]; + unsigned int color; + + for (k = 0; k < ARRAY_SIZE(vertices); ++k) + vertices[k].cull_distance[i] = test->vertices[k]; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + for (k = 0; k < ARRAY_SIZE(expected_color); ++k) + expected_color[k] = test->triangle_visible[k] ? 0xff00ff00 : 0xffffffff; + + if (expected_color[0] == expected_color[1]) + { + check_sub_resource_uint(context.render_target, 0, queue, command_list, expected_color[0], 0); + } + else + { + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + color = get_readback_uint(&rb, 160, 240, 0); + ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color); + color = get_readback_uint(&rb, 480, 240, 0); + ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + } + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].cull_distance[i] = 1.0f; + } + + for (i = 0; i < ARRAY_SIZE(vertices->clip_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = -1.0f; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = 1.0f; + } + + memset(vertices, 0, sizeof(vertices)); + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + for (i = 0; i < ARRAY_SIZE(vb); ++i) + ID3D12Resource_Release(vb[i]); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -19036,4 +19318,5 @@ START_TEST(d3d12) run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance); + run_test(test_combined_clip_and_cull_distances); } -- 2.16.4

2 1

[PATCH vkd3d 5/6] tests: Add test for clip distance.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 577 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 577 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1c6b65fa758a..38e757a28748 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -18345,6 +18345,582 @@ static void test_cpu_descriptors_lifetime(void) destroy_test_context(&context); } +static void check_clip_distance(struct test_context *context, + ID3D12PipelineState *pso, D3D12_VERTEX_BUFFER_VIEW vbv[2], ID3D12Resource *vb, + ID3D12Resource *vs_cb, ID3D12Resource *gs_cb) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct vertex + { + float clip_distance0; + float clip_distance1; + }; + + ID3D12GraphicsCommandList *command_list = context->list; + ID3D12CommandQueue *queue = context->queue; + struct resource_readback rb; + struct vertex vertices[4]; + unsigned int i; + D3D12_BOX box; + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 0.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context->render_target, 0, queue, command_list, 0xffffffff, 0); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 320, 0, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + release_resource_readback(&rb); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = i % 2 ? 1.0f : -1.0f; + update_buffer_data(vb, 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context->rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context->root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context->viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context->scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 2, vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context->rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(context->render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 640, 240, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 0); + set_box(&box, 0, 240, 0, 640, 240, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context->allocator); + transition_resource_state(command_list, context->render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); +} + +static void test_clip_distance(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + D3D12_ROOT_PARAMETER root_parameters[3]; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *vs_cb, *gs_cb, *vb[2]; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_VERTEX_BUFFER_VIEW vbv[2]; + struct test_context_desc desc; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12PipelineState *pso; + ID3D12Device *device; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + bool use_constant; + float clip_distance; + + struct input + { + float4 position : POSITION; + float distance0 : CLIP_DISTANCE0; + float distance1 : CLIP_DISTANCE1; + }; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float clip : SV_ClipDistance; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.user_clip = vin.distance0; + vertex.clip = vin.distance0; + if (use_constant) + vertex.clip = clip_distance; + } +#endif + 0x43425844, 0x09dfef58, 0x88570f2e, 0x1ebcf953, 0x9f97e22a, 0x00000001, 0x000001dc, 0x00000003, + 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000001, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f, + 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, + 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, + 0x52444853, 0x000000b4, 0x00010040, 0x0000002d, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002, + 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, + 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012, 0x00000002, 0x0020800a, 0x00000000, + 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a, 0x00000001, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + static const DWORD vs_multiple_code[] = + { +#if 0 + bool use_constant; + float clip_distance0; + float clip_distance1; + + struct input + { + float4 position : POSITION; + float distance0 : CLIP_DISTANCE0; + float distance1 : CLIP_DISTANCE1; + }; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float2 clip : SV_ClipDistance; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.user_clip = vin.distance0; + vertex.clip.x = vin.distance0; + if (use_constant) + vertex.clip.x = clip_distance0; + vertex.clip.y = vin.distance1; + if (use_constant) + vertex.clip.y = clip_distance1; + } +#endif + 0x43425844, 0xef5cc236, 0xe2fbfa69, 0x560b6591, 0x23037999, 0x00000001, 0x00000214, 0x00000003, + 0x0000002c, 0x0000009c, 0x00000120, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000059, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x00000059, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, 0x49445f50, 0x4e415453, 0xab004543, 0x4e47534f, + 0x0000007c, 0x00000003, 0x00000008, 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, + 0x00000000, 0x00000002, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, + 0x52444853, 0x000000ec, 0x00010040, 0x0000003b, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, + 0x04000067, 0x00102032, 0x00000002, 0x00000002, 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, + 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, 0x00000001, 0x0b000037, 0x00102012, + 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0010100a, + 0x00000001, 0x0b000037, 0x00102022, 0x00000002, 0x0020800a, 0x00000000, 0x00000000, 0x0020802a, + 0x00000000, 0x00000000, 0x0010100a, 0x00000002, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs_multiple = {vs_multiple_code, sizeof(vs_multiple_code)}; + static const DWORD gs_code[] = + { +#if 0 + bool use_constant; + float clip_distance; + + struct vertex + { + float4 position : SV_POSITION; + float user_clip : CLIP_DISTANCE; + float clip : SV_ClipDistance; + }; + + [maxvertexcount(3)] + void main(triangle vertex input[3], inout TriangleStream<vertex> output) + { + vertex o; + o = input[0]; + o.clip = input[0].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + o = input[1]; + o.clip = input[1].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + o = input[2]; + o.clip = input[2].user_clip; + if (use_constant) + o.clip = clip_distance; + output.Append(o); + } +#endif + 0x43425844, 0x9b0823e9, 0xab3ed100, 0xba0ff618, 0x1bbd1cb8, 0x00000001, 0x00000338, 0x00000003, + 0x0000002c, 0x000000b0, 0x00000134, 0x4e475349, 0x0000007c, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x0000005c, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, 0x00000002, + 0x00000001, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, 0x56530045, + 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x4e47534f, 0x0000007c, 0x00000003, 0x00000008, + 0x00000050, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, + 0x00000000, 0x00000003, 0x00000001, 0x00000e01, 0x0000006a, 0x00000000, 0x00000002, 0x00000003, + 0x00000002, 0x00000e01, 0x505f5653, 0x5449534f, 0x004e4f49, 0x50494c43, 0x5349445f, 0x434e4154, + 0x56530045, 0x696c435f, 0x73694470, 0x636e6174, 0xabab0065, 0x52444853, 0x000001fc, 0x00020040, + 0x0000007f, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x05000061, 0x002010f2, 0x00000003, + 0x00000000, 0x00000001, 0x0400005f, 0x00201012, 0x00000003, 0x00000001, 0x0400005f, 0x00201012, + 0x00000003, 0x00000002, 0x02000068, 0x00000001, 0x0100185d, 0x0100285c, 0x04000067, 0x001020f2, + 0x00000000, 0x00000001, 0x03000065, 0x00102012, 0x00000001, 0x04000067, 0x00102012, 0x00000002, + 0x00000002, 0x0200005e, 0x00000003, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000000, + 0x00000000, 0x06000036, 0x00102012, 0x00000001, 0x0020100a, 0x00000000, 0x00000001, 0x0c000037, + 0x00100012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, + 0x0020100a, 0x00000000, 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000, + 0x01000013, 0x06000036, 0x001020f2, 0x00000000, 0x00201e46, 0x00000001, 0x00000000, 0x06000036, + 0x00102012, 0x00000001, 0x0020100a, 0x00000001, 0x00000001, 0x0c000037, 0x00100012, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000001, + 0x00000001, 0x05000036, 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x06000036, + 0x001020f2, 0x00000000, 0x00201e46, 0x00000002, 0x00000000, 0x06000036, 0x00102012, 0x00000001, + 0x0020100a, 0x00000002, 0x00000001, 0x0c000037, 0x00100012, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x0020100a, 0x00000002, 0x00000001, 0x05000036, + 0x00102012, 0x00000002, 0x0010000a, 0x00000000, 0x01000013, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE gs = {gs_code, sizeof(gs_code)}; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const struct vec4 quad[] = + { + {-1.0f, -1.0f}, + {-1.0f, 1.0f}, + { 1.0f, -1.0f}, + { 1.0f, 1.0f}, + }; + struct + { + float clip_distance0; + float clip_distance1; + } + vertices[] = + { + {1.0f, 1.0f}, + {1.0f, 1.0f}, + {1.0f, 1.0f}, + {1.0f, 1.0f}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + struct + { + BOOL use_constant; + float clip_distance0; + float clip_distance1; + float padding; + } cb_data; + + memset(&desc, 0, sizeof(desc)); + desc.rt_width = 640; + desc.rt_height = 480; + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[0].Descriptor.ShaderRegister = 0; + root_parameters[0].Descriptor.RegisterSpace = 0; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_VERTEX; + root_parameters[1].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[1].Descriptor.ShaderRegister = 1; + root_parameters[1].Descriptor.RegisterSpace = 0; + root_parameters[1].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + root_parameters[2].ParameterType = D3D12_ROOT_PARAMETER_TYPE_CBV; + root_parameters[2].Descriptor.ShaderRegister = 0; + root_parameters[2].Descriptor.RegisterSpace = 0; + root_parameters[2].ShaderVisibility = D3D12_SHADER_VISIBILITY_GEOMETRY; + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.NumStaticSamplers = 0; + root_signature_desc.pStaticSamplers = NULL; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; + hr = create_root_signature(device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, &vs, NULL, &input_layout); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + vb[0] = create_upload_buffer(device, sizeof(quad), quad); + vbv[0].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[0]); + vbv[0].StrideInBytes = sizeof(*quad); + vbv[0].SizeInBytes = sizeof(quad); + + vb[1] = create_upload_buffer(device, sizeof(vertices), vertices); + vbv[1].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb[1]); + vbv[1].StrideInBytes = sizeof(*vertices); + vbv[1].SizeInBytes = sizeof(vertices); + + memset(&cb_data, 0, sizeof(cb_data)); + vs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); + gs_cb = create_upload_buffer(device, sizeof(cb_data), &cb_data); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + + /* vertex shader */ + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = -1.0f; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + + ID3D12PipelineState_Release(pso); + + /* geometry shader */ + pso_desc.GS = gs; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + check_clip_distance(&context, pso, vbv, vb[1], vs_cb, gs_cb); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = 1.0f; + update_buffer_data(gs_cb, 0, sizeof(cb_data), &cb_data); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12PipelineState_Release(pso); + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + /* multiple clip distances */ + pso_desc.VS = vs_multiple; + memset(&pso_desc.GS, 0, sizeof(pso_desc.GS)); + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&pso); + ok(hr == S_OK, "Failed to create pipeline state, hr %#x.\n", hr); + + cb_data.use_constant = FALSE; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + vertices[i].clip_distance0 = 1.0f; + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + { + vertices[i].clip_distance0 = i < 2 ? 1.0f : -1.0f; + vertices[i].clip_distance1 = i % 2 ? 1.0f : -1.0f; + } + update_buffer_data(vb[1], 0, sizeof(vertices), vertices); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 320, 240, 1); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 240, 0, 320, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + set_box(&box, 320, 0, 0, 640, 480, 1); + check_readback_data_uint(&rb, &box, 0xffffffff, 1); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + cb_data.use_constant = TRUE; + cb_data.clip_distance0 = 0.0f; + cb_data.clip_distance1 = 0.0f; + update_buffer_data(vs_cb, 0, sizeof(cb_data), &cb_data); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(vs_cb)); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 2, + ID3D12Resource_GetGPUVirtualAddress(gs_cb)); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pso); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 1, 0, 0); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + ID3D12PipelineState_Release(pso); + for (i = 0; i < ARRAY_SIZE(vb); ++i) + ID3D12Resource_Release(vb[i]); + ID3D12Resource_Release(vs_cb); + ID3D12Resource_Release(gs_cb); + destroy_test_context(&context); +} + START_TEST(d3d12) { bool enable_debug_layer = false; @@ -18459,4 +19035,5 @@ START_TEST(d3d12) run_test(test_layered_rendering); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); + run_test(test_clip_distance); } -- 2.16.4

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Correctly handle multiple clip/cull distance output registers.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ca463f85a4d1..1181c8404f35 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,7 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; - bool is_spirv_array; + uint32_t array_element_mask; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -3306,6 +3306,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, clip_distance_id, builtin->spirv_builtin); } if (cull_distance_mask) @@ -3315,6 +3316,7 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, cull_distance_id, builtin->spirv_builtin); } for (i = 0; i < output_signature->element_count; ++i) @@ -3325,10 +3327,12 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ { case VKD3D_SV_CLIP_DISTANCE: compiler->output_info[i].id = clip_distance_id; + compiler->output_info[i].array_element_mask = clip_distance_mask; break; case VKD3D_SV_CULL_DISTANCE: compiler->output_info[i].id = cull_distance_id; + compiler->output_info[i].array_element_mask = cull_distance_mask; break; default: @@ -3388,24 +3392,23 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, component_type, output_component_count); vkd3d_spirv_add_iface_variable(builder, id); - } - if (builtin) - { - vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); - } - else - { - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); - if (component_idx) - vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + if (builtin) + { + vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); + if (component_idx) + FIXME("Unhandled component index %u.\n", component_idx); + } + else + { + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationLocation, reg->idx[0].offset); + if (component_idx) + vkd3d_spirv_build_op_decorate1(builder, id, SpvDecorationComponent, component_idx); + } } compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE @@ -6361,10 +6364,10 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; - uint32_t write_mask, use_mask, uninit_mask, swizzle; + uint32_t write_mask, use_mask, uninit_mask, swizzle, mask; + uint32_t output_id, indexes[1]; unsigned int component_count; unsigned int i, index; - uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6392,7 +6395,7 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi output_id = output_info->id; - if (!output_info->is_spirv_array) + if (!output_info->array_element_mask) { vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); return; @@ -6400,10 +6403,14 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); - for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + mask = output_info->array_element_mask; + mask &= (1u << (output->semantic_index * VKD3D_VEC4_SIZE)) - 1; + for (i = 0, index = vkd3d_popcount(mask); i < VKD3D_VEC4_SIZE; ++i) { - uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + if (!(write_mask & (VKD3DSP_WRITEMASK_0 << i))) + continue; + indexes[0] = vkd3d_dxbc_compiler_get_constant_uint(compiler, index++); chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, output_id, indexes, ARRAY_SIZE(indexes)); object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, -- 2.16.4

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Implement cull distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 51 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2e8c5cf4ef7f..ca463f85a4d1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2978,6 +2978,7 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, + {VKD3D_SIV_CULL_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInCullDistance, NULL, true}}, }; static const struct { @@ -3257,12 +3258,25 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } +static void calculate_clip_or_cull_distance_mask(const struct vkd3d_shader_signature_element *e, + uint32_t *mask) +{ + if (e->semantic_index >= sizeof(*mask) * CHAR_BIT / VKD3D_VEC4_SIZE) + { + FIXME("Invalid semantic index %u for clip/cull distance.\n", e->semantic_index); + return; + } + + *mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); +} + /* Emits arrayed SPIR-V built-in variables. */ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_shader_signature *output_signature = compiler->output_signature; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t clip_distance_mask = 0, clip_distance_id = 0; + uint32_t cull_distance_mask = 0, cull_distance_id = 0; const struct vkd3d_spirv_builtin *builtin; unsigned int i, count; @@ -3273,13 +3287,11 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ switch (e->sysval_semantic) { case VKD3D_SV_CLIP_DISTANCE: - if (e->semantic_index >= sizeof(clip_distance_mask) * CHAR_BIT / VKD3D_VEC4_SIZE) - { - ERR("Invalid semantic index %u for clip distance.\n", e->semantic_index); - break; - } + calculate_clip_or_cull_distance_mask(e, &clip_distance_mask); + break; - clip_distance_mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); + case VKD3D_SV_CULL_DISTANCE: + calculate_clip_or_cull_distance_mask(e, &cull_distance_mask); break; default: @@ -3287,14 +3299,23 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ } } - if (!clip_distance_mask) - return; + if (clip_distance_mask) + { + count = vkd3d_popcount(clip_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + } - count = vkd3d_popcount(clip_distance_mask); - builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); - clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); - vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + if (cull_distance_mask) + { + count = vkd3d_popcount(cull_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CULL_DISTANCE); + cull_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, cull_distance_id); + } for (i = 0; i < output_signature->element_count; ++i) { @@ -3306,6 +3327,10 @@ static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_ compiler->output_info[i].id = clip_distance_id; break; + case VKD3D_SV_CULL_DISTANCE: + compiler->output_info[i].id = cull_distance_id; + break; + default: break; } -- 2.16.4

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Add get_type_id() helper functions.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 64 ++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d40350f18f4d..96d660136755 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2150,6 +2150,22 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_ VKD3D_TYPE_FLOAT, component_count, (const uint32_t *)values); } +static uint32_t vkd3d_dxbc_compiler_get_type_id_for_reg(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_register *reg, DWORD write_mask) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + return vkd3d_spirv_get_type_id(builder, + vkd3d_component_type_from_data_type(reg->data_type), + vkd3d_write_mask_component_count(write_mask)); +} + +static uint32_t vkd3d_dxbc_compiler_get_type_id_for_dst(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_dst_param *dst) +{ + return vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, &dst->reg, dst->write_mask); +} + static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buffer_size, const struct vkd3d_shader_register *reg) { @@ -2655,12 +2671,10 @@ static uint32_t vkd3d_dxbc_compiler_emit_abs(struct vkd3d_dxbc_compiler *compile static uint32_t vkd3d_dxbc_compiler_emit_neg(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, uint32_t val_id) { - unsigned int component_count = vkd3d_write_mask_component_count(write_mask); struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id; - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT) return vkd3d_spirv_build_op_fnegate(builder, type_id, val_id); else if (reg->data_type == VKD3D_DATA_INT) @@ -2771,8 +2785,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_sat(struct vkd3d_dxbc_compiler *compile zero_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 0.0f, component_count); one_id = vkd3d_dxbc_compiler_get_constant_float_vector(compiler, 1.0f, component_count); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(reg->data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_reg(compiler, reg, write_mask); if (reg->data_type == VKD3D_DATA_FLOAT) return vkd3d_spirv_build_op_glsl_std450_nclamp(builder, type_id, val_id, zero_id, one_id); @@ -4092,7 +4105,6 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_ids[VKD3D_DXBC_MAX_SOURCE_COUNT]; - unsigned int component_count; uint32_t type_id, val_id; unsigned int i; SpvOp op; @@ -4107,9 +4119,7 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler assert(instruction->dst_count == 1); assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); @@ -4169,7 +4179,6 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp const struct vkd3d_shader_src_param *src = instruction->src; uint32_t src_id[VKD3D_DXBC_MAX_SOURCE_COUNT]; uint32_t instr_set_id, type_id, val_id; - unsigned int component_count; enum GLSLstd450 glsl_inst; unsigned int i; @@ -4185,9 +4194,7 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp assert(instruction->dst_count == 1); assert(instruction->src_count <= VKD3D_DXBC_MAX_SOURCE_COUNT); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); for (i = 0; i < instruction->src_count; ++i) src_id[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); @@ -4353,8 +4360,7 @@ static void vkd3d_dxbc_compiler_emit_rcp(struct vkd3d_dxbc_compiler *compiler, unsigned int component_count; component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); val_id = vkd3d_spirv_build_op_fdiv(builder, type_id, @@ -4370,14 +4376,10 @@ static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, src_id, sin_id = 0, cos_id = 0; - unsigned int component_count; if (dst_sin->reg.type != VKD3DSPR_NULL) { - component_count = vkd3d_write_mask_component_count(dst_sin->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst_sin->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst_sin); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_sin->write_mask); sin_id = vkd3d_spirv_build_op_glsl_std450_sin(builder, type_id, src_id); @@ -4387,10 +4389,7 @@ static void vkd3d_dxbc_compiler_emit_sincos(struct vkd3d_dxbc_compiler *compiler { if (dst_sin->reg.type == VKD3DSPR_NULL || dst_cos->write_mask != dst_sin->write_mask) { - component_count = vkd3d_write_mask_component_count(dst_cos->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst_cos->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst_cos); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst_cos->write_mask); } @@ -4411,7 +4410,6 @@ static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; uint32_t type_id, val_id, src0_id, src1_id; - unsigned int component_count; if (dst[0].reg.type != VKD3DSPR_NULL) FIXME("Extended multiplies not implemented.\n"); /* SpvOpSMulExtended */ @@ -4419,9 +4417,7 @@ static void vkd3d_dxbc_compiler_emit_imul(struct vkd3d_dxbc_compiler *compiler, if (dst[1].reg.type == VKD3DSPR_NULL) return; - component_count = vkd3d_write_mask_component_count(dst[1].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[1].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[1]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[1].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[1].write_mask); @@ -4464,8 +4460,7 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, if (dst[0].reg.type != VKD3DSPR_NULL) { component_count = vkd3d_write_mask_component_count(dst[0].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[0].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[0]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[0].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[0].write_mask); @@ -4487,8 +4482,7 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, if (!component_count || dst[0].write_mask != dst[1].write_mask) { component_count = vkd3d_write_mask_component_count(dst[1].write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst[1].reg.data_type), component_count); + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, &dst[1]); src0_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], dst[1].write_mask); src1_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], dst[1].write_mask); @@ -5023,7 +5017,6 @@ static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compile const struct vkd3d_shader_src_param *src = instruction->src; const struct instruction_info *info; uint32_t type_id, src_id, val_id; - unsigned int component_count; unsigned int i; static const struct instruction_info @@ -5063,10 +5056,7 @@ static void vkd3d_dxbc_compiler_emit_deriv_instruction(struct vkd3d_dxbc_compile assert(instruction->dst_count == 1); assert(instruction->src_count == 1); - component_count = vkd3d_write_mask_component_count(dst->write_mask); - type_id = vkd3d_spirv_get_type_id(builder, - vkd3d_component_type_from_data_type(dst->reg.data_type), component_count); - + type_id = vkd3d_dxbc_compiler_get_type_id_for_dst(compiler, dst); src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); val_id = vkd3d_spirv_build_op_tr1(builder, &builder->function_stream, info->op, type_id, src_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); -- 2.16.4

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Implement clip distances.
by Józef Kucia 05 Sep '18

05 Sep '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 112 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 104 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 96d660136755..2e8c5cf4ef7f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1867,6 +1867,7 @@ struct vkd3d_dxbc_compiler { uint32_t id; enum vkd3d_component_type component_type; + bool is_spirv_array; } *output_info; uint32_t private_output_variable[MAX_REG_OUTPUT + 1]; /* 1 entry for oDepth */ uint32_t output_setup_function_id; @@ -1877,6 +1878,8 @@ struct vkd3d_dxbc_compiler const struct vkd3d_shader_scan_info *scan_info; }; +static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler); + struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, const struct vkd3d_shader_interface *shader_interface, @@ -1951,6 +1954,8 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader compiler->scan_info = scan_info; + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); + return compiler; } @@ -2950,6 +2955,7 @@ struct vkd3d_spirv_builtin unsigned int component_count; SpvBuiltIn spirv_builtin; vkd3d_spirv_builtin_fixup_pfn fixup_pfn; + bool is_spirv_array; }; /* @@ -2970,6 +2976,8 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}}, {VKD3D_SIV_IS_FRONT_FACE, {VKD3D_TYPE_BOOL, 1, SpvBuiltInFrontFacing, sv_front_face_fixup}}, + + {VKD3D_SIV_CLIP_DISTANCE, {VKD3D_TYPE_FLOAT, 1, SpvBuiltInClipDistance, NULL, true}}, }; static const struct { @@ -3249,6 +3257,61 @@ static unsigned int get_shader_output_swizzle(struct vkd3d_dxbc_compiler *compil return compile_args->output_swizzles[register_idx]; } +/* Emits arrayed SPIR-V built-in variables. */ +static void vkd3d_dxbc_compiler_emit_shader_signature_outputs(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *output_signature = compiler->output_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t clip_distance_mask = 0, clip_distance_id = 0; + const struct vkd3d_spirv_builtin *builtin; + unsigned int i, count; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + + switch (e->sysval_semantic) + { + case VKD3D_SV_CLIP_DISTANCE: + if (e->semantic_index >= sizeof(clip_distance_mask) * CHAR_BIT / VKD3D_VEC4_SIZE) + { + ERR("Invalid semantic index %u for clip distance.\n", e->semantic_index); + break; + } + + clip_distance_mask |= (e->mask & VKD3DSP_WRITEMASK_ALL) << (VKD3D_VEC4_SIZE * e->semantic_index); + break; + + default: + break; + } + } + + if (!clip_distance_mask) + return; + + count = vkd3d_popcount(clip_distance_mask); + builtin = get_spirv_builtin_for_sysval(VKD3D_SIV_CLIP_DISTANCE); + clip_distance_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, builtin->component_type, builtin->component_count, count); + vkd3d_spirv_add_iface_variable(builder, clip_distance_id); + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &output_signature->elements[i]; + + switch (e->sysval_semantic) + { + case VKD3D_SV_CLIP_DISTANCE: + compiler->output_info[i].id = clip_distance_id; + break; + + default: + break; + } + } +} + static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3276,22 +3339,32 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); + output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); if (builtin) { component_type = builtin->component_type; - output_component_count = builtin->component_count; + if (!builtin->is_spirv_array) + output_component_count = builtin->component_count; } else { component_type = signature_element->component_type; - output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); } assert(component_count <= output_component_count); storage_class = SpvStorageClassOutput; - id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, component_type, output_component_count); - vkd3d_spirv_add_iface_variable(builder, id); + + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + } + else + { + id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, component_type, output_component_count); + vkd3d_spirv_add_iface_variable(builder, id); + } + if (builtin) { vkd3d_dxbc_compiler_decorate_builtin(compiler, id, builtin->spirv_builtin); @@ -3307,9 +3380,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; + compiler->output_info[signature_idx].is_spirv_array = builtin && builtin->is_spirv_array; use_private_variable = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE; + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE + || (builtin && builtin->is_spirv_array); if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -6260,9 +6335,11 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi const struct vkd3d_shader_output_info *output_info, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, zero_id, ptr_type_id, chain_id, object_id; uint32_t write_mask, use_mask, uninit_mask, swizzle; unsigned int component_count; - uint32_t type_id, zero_id; + unsigned int i, index; + uint32_t output_id; write_mask = output->mask & 0xff; use_mask = (output->mask >> 8) & 0xff; @@ -6288,7 +6365,26 @@ static void vkd3d_dxbc_compiler_emit_store_shader_output(struct vkd3d_dxbc_compi val_id, zero_id, uninit_mask, output_info->component_type, component_count); } - vkd3d_spirv_build_op_store(builder, output_info->id, val_id, SpvMemoryAccessMaskNone); + output_id = output_info->id; + + if (!output_info->is_spirv_array) + { + vkd3d_spirv_build_op_store(builder, output_id, val_id, SpvMemoryAccessMaskNone); + return; + } + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); + ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + for (i = 0, index = output->semantic_index * VKD3D_VEC4_SIZE; i < component_count; ++i, ++index) + { + uint32_t indexes[] = {vkd3d_dxbc_compiler_get_constant_uint(compiler, index)}; + + chain_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, + output_id, indexes, ARRAY_SIZE(indexes)); + object_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, + write_mask, output_info->component_type, VKD3D_NO_SWIZZLE, VKD3DSP_WRITEMASK_0 << i); + vkd3d_spirv_build_op_store(builder, chain_id, object_id, SpvMemoryAccessMaskNone); + } } static void vkd3d_dxbc_compiler_emit_output_setup_function(struct vkd3d_dxbc_compiler *compiler) -- 2.16.4

2 1

[PATCH] xmllite: Prefere builtin version.
by Jacek Caban 05 Sep '18

05 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/xmllite/Makefile.in | 3 +-- dlls/xmllite/xmllite_main.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 dlls/xmllite/xmllite_main.c

2 1

[PATCH v2] userenv: Fix setting the ALLUSERSPROFILE environment variable.
by Hans Leidekker 05 Sep '18

05 Sep '18

v2: Rebased. Since 27edd4e35c1eb3827dfb20578733242d9ed3d460 ALLUSERSPROFILE is set to C:\\users\\C:\\users\\Public. This is because the expanded registry value of "Public" is appended to "ProfilesDirectory" and "Public" expands to a full path. AllUsersProfile, used before this commit, expanded to just "Public". Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/userenv/userenv_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 06c7653836..11a4f75654 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; + static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; @@ -323,8 +323,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, profiles_dir[len] = '\0'; } - memcpy(buf, profiles_dir, len*sizeof(WCHAR)); - if (get_reg_value(env, hkey, AllUsersProfileW, buf+len, UNICODE_STRING_MAX_CHARS-len)) + if (get_reg_value(env, hkey, PublicW, buf, UNICODE_STRING_MAX_CHARS)) { RtlInitUnicodeString(&us_name, ALLUSERSPROFILEW); RtlInitUnicodeString(&us_val, buf); -- 2.11.0

1 0

[PATCH] userenv: Fix setting the ALLUSERSPROFILE environment variable.
by Hans Leidekker 05 Sep '18

05 Sep '18

Since 27edd4e35c1eb3827dfb20578733242d9ed3d460 ALLUSERSPROFILE is set to C:\\users\\C:\\users\\Public. This is because the expanded registry value of "Public" is appended to "ProfilesDirectory" and "Public" expands to a full path. AllUsersProfile, used before this commit, expanded to just "Public". Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/userenv/userenv_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912b20..11a4f75654 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR PublicW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0}; @@ -323,8 +323,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, profiles_dir[len] = '\0'; } - memcpy(buf, profiles_dir, len*sizeof(WCHAR)); - if (get_reg_value(env, hkey, AllUsersProfileW, buf+len, UNICODE_STRING_MAX_CHARS-len)) + if (get_reg_value(env, hkey, PublicW, buf, UNICODE_STRING_MAX_CHARS)) { RtlInitUnicodeString(&us_name, ALLUSERSPROFILEW); RtlInitUnicodeString(&us_val, buf); -- 2.11.0

2 1

[PATCH v4] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng 05 Sep '18

05 Sep '18

Thanks Huw's advice! Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 97 +++++++++++++++++++- dlls/ole32/tests/ole2.c | 191 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 286 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..e3820b9ac2 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,102 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + CLSID clsid; + IOleObject * ole_object = NULL; + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + LPOLESTR ole_typename; + + TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt != OLERENDER_FORMAT) + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } + + if (!fmt) + return E_INVALIDARG; + + hr = IDataObject_GetData(data, fmt, &stgmedium); + if (FAILED(hr)) return hr; + + switch (fmt->cfFormat) + { + case CF_BITMAP: + case CF_DIB: + clsid = CLSID_Picture_Dib; + break; + case CF_ENHMETAFILE: + clsid = CLSID_Picture_EnhMetafile; + break; + case CF_METAFILEPICT: + clsid = CLSID_Picture_Metafile; + break; + default: + ReleaseStgMedium(&stgmedium); + return DV_E_CLIPFORMAT; + } + hr = OleCreateDefaultHandler(&clsid, NULL, &IID_IOleObject, (void **)&ole_object); + if (FAILED(hr)) goto end; + + if (client_site) + { + hr = IOleObject_SetClientSite(ole_object, client_site); + if (FAILED(hr)) goto end; + } + + hr = IOleObject_QueryInterface(ole_object, &IID_IOleCache2, (void **)&ole_cache); + if (FAILED(hr)) goto end; + + hr = IOleObject_QueryInterface(ole_object, &IID_IPersistStorage, (void **)&persist); + if (FAILED(hr)) goto end; + + hr = WriteClassStg(stg, &clsid); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_InitNew(persist, stg); + if (FAILED(hr)) goto end; + + hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection); + if (FAILED(hr)) goto end; + + hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE); + if (FAILED(hr)) goto end; + stgmedium.tymed = TYMED_NULL; + + hr = IOleObject_GetUserType(ole_object, USERCLASSTYPE_FULL, &ole_typename); + if(FAILED(hr)) + ole_typename = NULL; + hr = WriteFmtUserTypeStg(stg, fmt->cfFormat, ole_typename); + CoTaskMemFree(ole_typename); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_Save(persist, stg, TRUE); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_SaveCompleted(persist, NULL); + if (FAILED(hr)) goto end; + + hr = IOleObject_QueryInterface(ole_object, iid, obj); + +end: + if (stgmedium.tymed == TYMED_NULL) + ReleaseStgMedium(&stgmedium); + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + if (ole_object) + IOleObject_Release(ole_object); + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..9b82e49b36 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -257,6 +257,21 @@ static void create_mfpict(STGMEDIUM *med) med->pUnkForRelease = NULL; } +static void create_text(STGMEDIUM *med) +{ + HGLOBAL handle; + char *p; + + handle = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + p = GlobalLock(handle); + strcpy(p, "test"); + GlobalUnlock(handle); + + med->tymed = TYMED_HGLOBAL; + U(med)->hGlobal = handle; + med->pUnkForRelease = NULL; +} + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); @@ -1490,6 +1505,12 @@ static HRESULT WINAPI DataObject_GetData( IDataObject *iface, FORMATETC *fmt_in, case CF_BITMAP: create_bitmap( med ); return S_OK; + case CF_ENHMETAFILE: + create_emf( med ); + return S_OK; + case CF_TEXT: + create_text( med ); + return S_OK; default: trace( "unhandled fmt %d\n", fmt->cfFormat ); } @@ -4593,6 +4614,175 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + IPersist *presist; + CLSID clsid; + STATSTG statstg; + int enumerated_streams, matched_streams; + STGMEDIUM stgmed; + static FORMATETC dib_fmt[] = + { + { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { 0 } + }; + static FORMATETC emf_fmt[] = + { + { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + { 0 } + }; + static FORMATETC text_fmt[] = + { + { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { 0 } + }; + static const struct expected_method methods_create_from_dib[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_dib[] = + { + { "DataObject_GetData", 0, { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_emf[] = + { + { "DataObject_GetData", 0, { CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_text[] = + { + { "DataObject_GetData", 0, { CF_TEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL } }, + { NULL } + }; + static struct storage_def stg_def_dib = + { + &CLSID_Picture_Dib, 3, + {{ "\1Ole", -1, 0, 0, NULL, 0 }, + { "\1CompObj", -1, 0, 0, NULL, 0 }, + { "CONTENTS", -1, 0, 0, NULL, 0 }} + }; + static struct storage_def stg_def_emf = + { + &CLSID_Picture_EnhMetafile, 3, + {{ "\1Ole", -1, 0, 0, NULL, 0 }, + { "\1CompObj", -1, 0, 0, NULL, 0 }, + { "CONTENTS", -1, 0, 0, NULL, 0 }} + }; + + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + /* CF_DIB */ + g_dataobject_fmts = dib_fmt; + expected_method_list = methods_createstatic_from_dib; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + dib_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); + hr = IPersist_GetClassID(presist, &clsid); + ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_Picture_Dib), "Got wrong clsid: %s, expected: %s.\n", + wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_Dib)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok_ole_success(hr, "IStorage_Stat"); + ok(IsEqualCLSID(&CLSID_Picture_Dib, &statstg.clsid), "Wrong CLSID in storage.\n"); + enumerated_streams = matched_streams = -1; + get_stgmedium(CF_DIB, &stgmed); + get_stgdef(&stg_def_dib, CF_DIB, &stgmed, 2); + check_storage_contents(storage, &stg_def_dib, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == stg_def_dib.stream_count, "created %d != def streams %d\n", + enumerated_streams, stg_def_dib.stream_count); + ReleaseStgMedium(&stgmed); + IPersist_Release(presist); + IStorage_Release(storage); + IOleObject_Release(ole_obj); + + /* CF_ENHMETAFILE */ + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = emf_fmt; + expected_method_list = methods_createstatic_from_emf; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + emf_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + hr = IOleObject_QueryInterface(ole_obj, &IID_IPersist, (void **)&presist); + ok(hr == S_OK, "IOleObject_QueryInterface failed: 0x%08x.\n", hr); + hr = IPersist_GetClassID(presist, &clsid); + ok(hr == S_OK, "IPersist_GetClassID failed: 0x%08x.\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_Picture_EnhMetafile), "Got wrong clsid: %s, expected: %s.\n", + wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&CLSID_Picture_EnhMetafile)); + hr = IStorage_Stat(storage, &statstg, STATFLAG_NONAME); + ok_ole_success(hr, "IStorage_Stat"); + ok(IsEqualCLSID(&CLSID_Picture_EnhMetafile, &statstg.clsid), "Wrong CLSID in storage.\n"); + enumerated_streams = matched_streams = -1; + get_stgmedium(CF_ENHMETAFILE, &stgmed); + get_stgdef(&stg_def_emf, CF_ENHMETAFILE, &stgmed, 2); + check_storage_contents(storage, &stg_def_emf, &enumerated_streams, &matched_streams); + ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", + enumerated_streams, matched_streams); + ok(enumerated_streams == stg_def_emf.stream_count, "created %d != def streams %d\n", + enumerated_streams, stg_def_emf.stream_count); + ReleaseStgMedium(&stgmed); + IPersist_Release(presist); + IStorage_Release(storage); + IOleObject_Release(ole_obj); + + /* CF_TEXT */ + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = text_fmt; + expected_method_list = methods_createstatic_from_text; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + text_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == DV_E_CLIPFORMAT, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + IStorage_Release(storage); + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + ILockBytes_Release(ilb); + g_dataobject_fmts = dib_fmt; + expected_method_list = methods_create_from_dib; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, dib_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + IStorage_Release(storage); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4833,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

2 1

[PATCH 1/7] opcservices: Keep parts in a set.
by Nikolay Sivov 05 Sep '18

05 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/opc_private.h | 26 ++++++++++++++++++++++++++ dlls/opcservices/package.c | 23 +++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/dlls/opcservices/opc_private.h b/dlls/opcservices/opc_private.h index 4784b6c458..30bcb0090c 100644 --- a/dlls/opcservices/opc_private.h +++ b/dlls/opcservices/opc_private.h @@ -19,5 +19,31 @@ #include "msopc.h" #include "wine/heap.h" +static inline BOOL opc_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + extern HRESULT opc_package_create(IOpcPackage **package) DECLSPEC_HIDDEN; extern HRESULT opc_part_uri_create(const WCHAR *uri, IOpcPartUri **part_uri) DECLSPEC_HIDDEN; diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index cd4741d220..869fb036e2 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -53,6 +53,10 @@ struct opc_part_set { IOpcPartSet IOpcPartSet_iface; LONG refcount; + + struct opc_part **parts; + size_t size; + size_t count; }; struct opc_relationship @@ -220,7 +224,7 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, +static HRESULT opc_part_create(struct opc_part_set *set, IOpcPartUri *name, const WCHAR *content_type, DWORD compression_options, IOpcPart **out) { struct opc_part *part; @@ -228,6 +232,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, if (!name) return E_POINTER; + if (!opc_array_reserve((void **)&set->parts, &set->size, set->count + 1, sizeof(*set->parts))) + return E_OUTOFMEMORY; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; @@ -242,6 +249,9 @@ static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, return E_OUTOFMEMORY; } + set->parts[set->count++] = part; + IOpcPart_AddRef(&part->IOpcPart_iface); + *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); return S_OK; @@ -281,7 +291,14 @@ static ULONG WINAPI opc_part_set_Release(IOpcPartSet *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + size_t i; + + for (i = 0; i < part_set->count; ++i) + IOpcPart_Release(&part_set->parts[i]->IOpcPart_iface); + heap_free(part_set->parts); heap_free(part_set); + } return refcount; } @@ -296,10 +313,12 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { + struct opc_part_set *part_set = impl_from_IOpcPartSet(iface); + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(name, content_type, compression_options, part); + return opc_part_create(part_set, name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) -- 2.18.0

1 6

Question on launching unix binaries
by Ann and Jason Edmeades 04 Sep '18

04 Sep '18

Hello, I've been working through the 'cmd' component bugs and am looking into bug#37780 (which relates to an old wontfix bug#34730) and wanted to get confirmation from an expert. This bug complains that if you manually create a file with a .exe extension, mark it executable (from Unix permissions perspective) and contains shell script (#!/bin/bash etc) then cmd.exe can launch the process but doesn't wait for it to complete. This is true and reproducible - see 34730 for extensive details including AJ saying that is an ok to launch unix scripts (comment #23) Debugging this, it would appear our cmd code decides not to wait (which is trivial to fix), but even if we try to wait we cannot - It would appear that CreateProcess for such a '.exe' file works, BUT it does not return a valid handle which can be waited on. I cannot say I am massively surprised by this but without a valid waitable handle, we obviously cannot give the user what they want Questions/thoughts - Is it desirable to do anything about this or just close wontfix, ie launching unix shell is asynchronous? - Is it even possible to return a valid handle from CreateProcess that we can WaitForSingleObject on to know when the unix process completes? Thanks, Jason

1 0

[PATCH] winhttp: Improve WINHTTP_OPTION_CONNECT_RETRIES stub.
by Jacek Caban 04 Sep '18

04 Sep '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winhttp/session.c | 3 +++ dlls/winhttp/tests/winhttp.c | 5 +++++ 2 files changed, 8 insertions(+)

2 1

Wiki editing permissions
by Hugh McMaster 04 Sep '18

04 Sep '18

Hi, So, I had an account on the old wiki that had editing permissions. I've just created an account on the new wiki and would like to update some pages. But editing is limited to the Administrators and Trustworthy user groups. Can someone please add me to the appropriate group? Thank you -- Hugh McMaster

2 2

[PATCH 1/3 resend] kernel32/tests: Test ReplaceFileW on open "exe"
by Brock York 04 Sep '18

04 Sep '18

Replicate the scenario of an exe calling ReplaceFileW on itself. An exe calling ReplaceFileW on itself will fail in Wine currently but succeed in Windows 7. This seems to be the problem seen in bug 33845 where the WarFrame launcher will keep relaunching itself because the launcher failed to replace itself with the new version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4157279b..2e2c55bcc9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, -- 2.18.0

2 3

[PATCH 1/2] msi/tests: Remove some workarounds in test_publish_assemblies().
by Zebediah Figura 04 Sep '18

04 Sep '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index cb8514d..57044bf 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6192,11 +6192,6 @@ static void test_publish_assemblies(void) skip("Not enough rights to perform tests\n"); goto done; } - if (r == ERROR_INSTALL_FAILURE) - { - skip("No support for installing side-by-side assemblies\n"); - goto done; - } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); @@ -6211,23 +6206,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6240,7 +6232,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); @@ -6274,23 +6265,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA@Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA@Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6303,7 +6291,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); -- 2.7.4

3 4

[PATCH 2/2] ddraw: Accept d3d1 and d3d2 versions of D3DFINDDEVICERESULT in IDirect3D_FindDevice.
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

Based off a patch by Michael Muller. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 40 ++++++++++++++++++++++++++++++++++++---- dlls/ddraw/tests/d3d.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..fe81f90 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -25,6 +25,8 @@ #include "wine/port.h" #include "ddraw_private.h" +#include "ddrawi.h" +#include "d3dhal.h" #include "wine/exception.h" @@ -74,6 +76,20 @@ static struct enum_device_entry }, }; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V1 ddHwDesc; + D3DDEVICEDESC_V1 ddSwDesc; +} D3DFINDDEVICERESULT_V1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V2 ddHwDesc; + D3DDEVICEDESC_V2 ddSwDesc; +} D3DFINDDEVICERESULT_V2; + static void STDMETHODCALLTYPE ddraw_null_wined3d_object_destroyed(void *parent) {} const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops = @@ -4045,8 +4061,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (!fds || !fdr) return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) || (fdr->dwSize != sizeof(D3DFINDDEVICERESULT_V1) && + fdr->dwSize != sizeof(D3DFINDDEVICERESULT_V2) && fdr->dwSize != sizeof(D3DFINDDEVICERESULT))) return DDERR_INVALIDPARAMS; if ((fds->dwFlags & D3DFDS_COLORMODEL) @@ -4075,8 +4091,24 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd /* Now return our own GUID */ ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; - fdr->ddHwDesc = desc1; - fdr->ddSwDesc = desc1; + + if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT_V1)) + { + D3DFINDDEVICERESULT_V1 *fdr1 = (D3DFINDDEVICERESULT_V1 *)fdr; + memcpy(&fdr1->ddHwDesc, &desc1, sizeof(fdr1->ddHwDesc)); + memcpy(&fdr1->ddSwDesc, &desc1, sizeof(fdr1->ddSwDesc)); + } + else if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT_V2)) + { + D3DFINDDEVICERESULT_V2 *fdr2 = (D3DFINDDEVICERESULT_V2 *)fdr; + memcpy(&fdr2->ddHwDesc, &desc1, sizeof(fdr2->ddHwDesc)); + memcpy(&fdr2->ddSwDesc, &desc1, sizeof(fdr2->ddSwDesc)); + } + else + { + fdr->ddHwDesc = desc1; + fdr->ddSwDesc = desc1; + } TRACE("Returning Wine's wined3d device with (undumped) capabilities.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec0f8d7..2234399 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -27,6 +27,8 @@ #include "initguid.h" #include "ddraw.h" #include "d3d.h" +#include "ddrawi.h" +#include "d3dhal.h" #include "unknwn.h" static IDirectDraw7 *lpDD; @@ -44,6 +46,20 @@ static IDirect3DExecuteBuffer *ExecuteBuffer = NULL; static IDirect3DViewport *Viewport = NULL; static IDirect3DLight *Light = NULL; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V1 ddHwDesc; + D3DDEVICEDESC_V1 ddSwDesc; +} D3DFINDDEVICERESULT_V1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC_V2 ddHwDesc; + D3DDEVICEDESC_V2 ddSwDesc; +} D3DFINDDEVICERESULT_V2; + typedef struct { int total; int rgb; @@ -1628,7 +1644,6 @@ static void FindDevice(void) &IID_IDirect3DRefDevice, &IID_IDirect3DTnLHalDevice, &IID_IDirect3DNullDevice}; - D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; IDirect3DDevice *d3dhal; @@ -1671,6 +1686,18 @@ static void FindDevice(void) ok(hr == D3D_OK, "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + result.dwSize = sizeof(D3DFINDDEVICERESULT_V1); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + + result.dwSize = sizeof(D3DFINDDEVICERESULT_V2); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + /* Try an arbitrary non-device GUID. */ search.dwSize = sizeof(search); search.dwFlags = D3DFDS_GUID; -- 1.9.1

1 0

[PATCH 1/2] include: Add D3DDeviceDesc_V2/3 structures
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

This series Superseds 150562. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/d3dhal.h | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/include/d3dhal.h b/include/d3dhal.h index 9d43313..c42630d 100644 --- a/include/d3dhal.h +++ b/include/d3dhal.h @@ -47,6 +47,62 @@ typedef struct _D3DDeviceDesc_V1 { DWORD dwMaxVertexCount; } D3DDEVICEDESC_V1,*LPD3DDEVICEDESC_V1; +typedef struct _D3DDeviceDesc_V2 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + /* DirectX 5 */ + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; +} D3DDEVICEDESC_V2, *LPD3DDEVICEDESC_V2; + +typedef struct _D3DDeviceDesc_V3 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + /* DirectX 5 */ + DWORD dwMinTextureWidth, dwMinTextureHeight; + DWORD dwMaxTextureWidth, dwMaxTextureHeight; + DWORD dwMinStippleWidth, dwMaxStippleWidth; + DWORD dwMinStippleHeight, dwMaxStippleHeight; + /* DirectX 6 */ + DWORD dwMaxTextureRepeat; + DWORD dwMaxTextureAspectRatio; + DWORD dwMaxAnisotropy; + D3DVALUE dvGuardBandLeft; + D3DVALUE dvGuardBandTop; + D3DVALUE dvGuardBandRight; + D3DVALUE dvGuardBandBottom; + D3DVALUE dvExtentsAdjust; + DWORD dwStencilCaps; + DWORD dwFVFCaps; + DWORD dwTextureOpCaps; + WORD wMaxTextureBlendStages; + WORD wMaxSimultaneousTextures; +} D3DDEVICEDESC_V3, *LPD3DDEVICEDESC_V3; + typedef struct _D3DHAL_GLOBALDRIVERDATA { DWORD dwSize; D3DDEVICEDESC_V1 hwCaps; -- 1.9.1

1 0

[PATCH 1/6] opcservices: Store part properties on creation.
by Nikolay Sivov 04 Sep '18

04 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/opcservices/Makefile.in | 2 +- dlls/opcservices/package.c | 61 ++++++++++++++++++++++++---- dlls/opcservices/tests/opcservices.c | 24 +++++++++++ 3 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/opcservices/Makefile.in b/dlls/opcservices/Makefile.in index 651cb411d7..47fbbe4cca 100644 --- a/dlls/opcservices/Makefile.in +++ b/dlls/opcservices/Makefile.in @@ -1,5 +1,5 @@ MODULE = opcservices.dll -IMPORTS = uuid +IMPORTS = uuid ole32 C_SRCS = \ factory.c \ diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c index a3a2fabce7..e673f0c892 100644 --- a/dlls/opcservices/package.c +++ b/dlls/opcservices/package.c @@ -23,6 +23,7 @@ #include "winbase.h" #include "wine/debug.h" +#include "wine/unicode.h" #include "opc_private.h" @@ -40,6 +41,10 @@ struct opc_part { IOpcPart IOpcPart_iface; LONG refcount; + + IOpcPartUri *name; + WCHAR *content_type; + DWORD compression_options; }; struct opc_part_set @@ -63,6 +68,24 @@ static inline struct opc_part *impl_from_IOpcPart(IOpcPart *iface) return CONTAINING_RECORD(iface, struct opc_part, IOpcPart_iface); } +static WCHAR *opc_strdupW(const WCHAR *str) +{ + WCHAR *ret = NULL; + + if (str) + { + size_t size; + + size = (strlenW(str) + 1) * sizeof(WCHAR); + ret = CoTaskMemAlloc(size); + if (ret) + memcpy(ret, str, size); + } + + return ret; +} + + static HRESULT WINAPI opc_part_QueryInterface(IOpcPart *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -97,7 +120,11 @@ static ULONG WINAPI opc_part_Release(IOpcPart *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) + { + IOpcPartUri_Release(part->name); + CoTaskMemFree(part->content_type); heap_free(part); + } return refcount; } @@ -118,16 +145,24 @@ static HRESULT WINAPI opc_part_GetContentStream(IOpcPart *iface, IStream **strea static HRESULT WINAPI opc_part_GetName(IOpcPart *iface, IOpcPartUri **name) { - FIXME("iface %p, name %p stub!\n", iface, name); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, name %p.\n", iface, name); + + *name = part->name; + IOpcPartUri_AddRef(*name); + + return S_OK; } static HRESULT WINAPI opc_part_GetContentType(IOpcPart *iface, LPWSTR *type) { - FIXME("iface %p, type %p stub!\n", iface, type); + struct opc_part *part = impl_from_IOpcPart(iface); - return E_NOTIMPL; + TRACE("iface %p, type %p.\n", iface, type); + + *type = opc_strdupW(part->content_type); + return *type ? S_OK : E_OUTOFMEMORY; } static HRESULT WINAPI opc_part_GetCompressionOptions(IOpcPart *iface, OPC_COMPRESSION_OPTIONS *options) @@ -149,15 +184,27 @@ static const IOpcPartVtbl opc_part_vtbl = opc_part_GetCompressionOptions, }; -static HRESULT opc_part_create(IOpcPart **out) +static HRESULT opc_part_create(IOpcPartUri *name, const WCHAR *content_type, + DWORD compression_options, IOpcPart **out) { struct opc_part *part; + if (!name) + return E_POINTER; + if (!(part = heap_alloc_zero(sizeof(*part)))) return E_OUTOFMEMORY; part->IOpcPart_iface.lpVtbl = &opc_part_vtbl; part->refcount = 1; + part->name = name; + IOpcPartUri_AddRef(name); + part->compression_options = compression_options; + if (!(part->content_type = opc_strdupW(content_type))) + { + IOpcPart_Release(&part->IOpcPart_iface); + return E_OUTOFMEMORY; + } *out = &part->IOpcPart_iface; TRACE("Created part %p.\n", *out); @@ -213,10 +260,10 @@ static HRESULT WINAPI opc_part_set_GetPart(IOpcPartSet *iface, IOpcPartUri *name static HRESULT WINAPI opc_part_set_CreatePart(IOpcPartSet *iface, IOpcPartUri *name, LPCWSTR content_type, OPC_COMPRESSION_OPTIONS compression_options, IOpcPart **part) { - FIXME("iface %p, name %p, content_type %s, compression_options %#x, part %p stub!\n", iface, name, + TRACE("iface %p, name %p, content_type %s, compression_options %#x, part %p.\n", iface, name, debugstr_w(content_type), compression_options, part); - return opc_part_create(part); + return opc_part_create(name, content_type, compression_options, part); } static HRESULT WINAPI opc_part_set_DeletePart(IOpcPartSet *iface, IOpcPartUri *name) diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c index e257c6ea2c..9ef44e6cc3 100644 --- a/dlls/opcservices/tests/opcservices.c +++ b/dlls/opcservices/tests/opcservices.c @@ -36,10 +36,15 @@ static IOpcFactory *create_factory(void) static void test_package(void) { + static const WCHAR typeW[] = {'t','y','p','e','/','s','u','b','t','y','p','e',0}; + static const WCHAR uriW[] = {'/','u','r','i',0}; IOpcPartSet *partset, *partset2; + IOpcPartUri *part_uri; IOpcFactory *factory; IOpcPackage *package; + IOpcPart *part; HRESULT hr; + BOOL ret; factory = create_factory(); @@ -58,6 +63,25 @@ static void test_package(void) ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); ok(partset == partset2, "Expected same part set instance.\n"); + /* CreatePart */ + hr = IOpcFactory_CreatePartUri(factory, uriW, &part_uri); + ok(SUCCEEDED(hr), "Failed to create part uri, hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, NULL, typeW, OPC_COMPRESSION_NONE, &part); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IOpcPartSet_CreatePart(partset, part_uri, typeW, OPC_COMPRESSION_NONE, &part); + ok(SUCCEEDED(hr), "Failed to create a part, hr %#x.\n", hr); + + ret = FALSE; + hr = IOpcPartSet_PartExists(partset, part_uri, &ret); +todo_wine { + ok(SUCCEEDED(hr), "Unexpected hr %#x.\n", hr); + ok(ret, "Expected part to exist.\n"); +} + IOpcPartUri_Release(part_uri); + IOpcPart_Release(part); + IOpcPackage_Release(package); IOpcFactory_Release(factory); -- 2.18.0

1 5

[PATCH] ws2_32/tests: Mark the IPX-not-supported error code test as todo
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Wine returns WSAEPROTONOSUPPORT in this case, but all versions of Windows since XP at least return WSAEAFNOSUPPORT. This fixes the test failure on my Arch laptop, and should fix the test failures on Gentoo. --- dlls/ws2_32/tests/sock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b32d1c053d..c058869059 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2773,6 +2773,7 @@ static void test_WSASocket(void) if (sock == INVALID_SOCKET) { err = WSAGetLastError(); +todo_wine ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); skip("IPX is not supported\n"); } -- 2.18.0

2 1

[PATCH] opengl/tests: Don't run Pbuffer tests if no Pbuffer can be created
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This should fix the test failures on Debian. --- dlls/opengl32/tests/opengl.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index b69d91caf9..8105201a79 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -194,17 +194,18 @@ static void test_pbuffers(HDC hdc) { HDC pbuffer_hdc; HPBUFFERARB pbuffer = pwglCreatePbufferARB(hdc, iPixelFormat, 640 /* width */, 480 /* height */, NULL); - if(!pbuffer) - skip("Pbuffer creation failed!\n"); - - /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ - pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); - res = GetPixelFormat(pbuffer_hdc); - - ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); - trace("iPixelFormat returned by GetPixelFormat: %d\n", res); - trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); - pwglReleasePbufferDCARB(pbuffer, hdc); + if(pbuffer) + { + /* Test the pixelformat returned by GetPixelFormat on a pbuffer as the behavior is not clear */ + pbuffer_hdc = pwglGetPbufferDCARB(pbuffer); + res = GetPixelFormat(pbuffer_hdc); + + ok(res == 1, "Unexpected iPixelFormat=%d (1 expected) returned by GetPixelFormat for offscreen format %d\n", res, iPixelFormat); + trace("iPixelFormat returned by GetPixelFormat: %d\n", res); + trace("PixelFormat from wglChoosePixelFormatARB: %d\n", iPixelFormat); + pwglReleasePbufferDCARB(pbuffer, hdc); + } + else skip("Pbuffer creation failed!\n"); } else skip("Pbuffer test for offscreen pixelformat skipped as no offscreen-only format with pbuffer capabilities has been found\n"); } -- 2.18.0

1 0

[PATCH resend3] shell32/tests: Mark a shell dispatch test as todo on x64 and ARM
by Alex Henrie 04 Sep '18

04 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 5191d5e970..0d38cd02d7 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1025,6 +1025,9 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); +#ifndef __i386__ +todo_wine +#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) -- 2.18.0

1 0

[PATCH] ddraw: Accept d3d1 and d3d2 versions of D3DFINDDEVICERESULT in IDirect3D_FindDevice.
by Alistair Leslie-Hughes 04 Sep '18

04 Sep '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ddraw/ddraw.c | 24 +++++++++++++++++++---- dlls/ddraw/tests/d3d.c | 14 ++++++++++++++ include/d3dcaps.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e60c5f3..f62464c 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4045,8 +4045,8 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd if (!fds || !fdr) return DDERR_INVALIDPARAMS; - if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) - || fdr->dwSize != sizeof(D3DFINDDEVICERESULT)) + if (fds->dwSize != sizeof(D3DFINDDEVICESEARCH) || (fdr->dwSize != sizeof(D3DFINDDEVICERESULT1) && + fdr->dwSize != sizeof(D3DFINDDEVICERESULT2) && fdr->dwSize != sizeof(D3DFINDDEVICERESULT))) return DDERR_INVALIDPARAMS; if ((fds->dwFlags & D3DFDS_COLORMODEL) @@ -4075,8 +4075,24 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd /* Now return our own GUID */ ddraw_d3dcaps1_from_7(&desc1, &desc7); fdr->guid = IID_D3DDEVICE_WineD3D; - fdr->ddHwDesc = desc1; - fdr->ddSwDesc = desc1; + + if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT1)) + { + D3DFINDDEVICERESULT1 *fdr1 = (D3DFINDDEVICERESULT1 *)fdr; + memcpy(&fdr1->ddHwDesc, &desc1, sizeof(fdr1->ddHwDesc)); + memcpy(&fdr1->ddSwDesc, &desc1, sizeof(fdr1->ddSwDesc)); + } + else if (fdr->dwSize == sizeof(D3DFINDDEVICERESULT2)) + { + D3DFINDDEVICERESULT2 *fdr2 = (D3DFINDDEVICERESULT2 *)fdr; + memcpy(&fdr2->ddHwDesc, &desc1, sizeof(fdr2->ddHwDesc)); + memcpy(&fdr2->ddSwDesc, &desc1, sizeof(fdr2->ddSwDesc)); + } + else + { + fdr->ddHwDesc = desc1; + fdr->ddSwDesc = desc1; + } TRACE("Returning Wine's wined3d device with (undumped) capabilities.\n"); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index ec0f8d7..8ecb2f8 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1631,6 +1631,8 @@ static void FindDevice(void) D3DFINDDEVICESEARCH search = {0}; D3DFINDDEVICERESULT result = {0}; + D3DFINDDEVICERESULT1 result1 = {0}; + D3DFINDDEVICERESULT2 result2 = {0}; IDirect3DDevice *d3dhal; HRESULT hr; int i; @@ -1671,6 +1673,18 @@ static void FindDevice(void) ok(hr == D3D_OK, "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + result1.dwSize = sizeof(result1); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result1); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + + result2.dwSize = sizeof(result2); + + hr = IDirect3D_FindDevice(Direct3D1, &search, (D3DFINDDEVICERESULT *)&result2); + ok(hr == D3D_OK, + "Expected IDirect3D1::FindDevice to return D3D_OK, got 0x%08x\n", hr); + /* Try an arbitrary non-device GUID. */ search.dwSize = sizeof(search); search.dwFlags = D3DFDS_GUID; diff --git a/include/d3dcaps.h b/include/d3dcaps.h index 4fc76ba..51e3efa 100644 --- a/include/d3dcaps.h +++ b/include/d3dcaps.h @@ -193,6 +193,44 @@ typedef struct _D3dPrimCaps { #define D3DPTADDRESSCAPS_BORDER 0x00000008 #define D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +typedef struct _D3DDeviceDesc1 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; +} D3DDEVICEDESC1,*LPD3DDEVICEDESC1; +#define D3DDEVICEDESCSIZE1 (sizeof(D3DDEVICEDESC1)) + +typedef struct _D3DDeviceDesc2 { + DWORD dwSize; + DWORD dwFlags; + D3DCOLORMODEL dcmColorModel; + DWORD dwDevCaps; + D3DTRANSFORMCAPS dtcTransformCaps; + BOOL bClipping; + D3DLIGHTINGCAPS dlcLightingCaps; + D3DPRIMCAPS dpcLineCaps; + D3DPRIMCAPS dpcTriCaps; + DWORD dwDeviceRenderBitDepth; + DWORD dwDeviceZBufferBitDepth; + DWORD dwMaxBufferSize; + DWORD dwMaxVertexCount; + + DWORD dwMinTextureWidth,dwMinTextureHeight; + DWORD dwMaxTextureWidth,dwMaxTextureHeight; + DWORD dwMinStippleWidth,dwMaxStippleWidth; + DWORD dwMinStippleHeight,dwMaxStippleHeight; +} D3DDEVICEDESC2,*LPD3DDEVICEDESC2; +#define D3DDEVICEDESCSIZE2 (sizeof(D3DDEVICEDESC2)) typedef struct _D3DDeviceDesc { DWORD dwSize; @@ -382,6 +420,20 @@ typedef struct _D3DFINDDEVICESEARCH { D3DPRIMCAPS dpcPrimCaps; } D3DFINDDEVICESEARCH,*LPD3DFINDDEVICESEARCH; +typedef struct _D3DFINDDEVICERESULT1 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC1 ddHwDesc; + D3DDEVICEDESC1 ddSwDesc; +} D3DFINDDEVICERESULT1,*LPD3DFINDDEVICERESULT1; + +typedef struct _D3DFINDDEVICERESULT2 { + DWORD dwSize; + GUID guid; + D3DDEVICEDESC2 ddHwDesc; + D3DDEVICEDESC2 ddSwDesc; +} D3DFINDDEVICERESULT2,*LPD3DFINDDEVICERESULT2; + typedef struct _D3DFINDDEVICERESULT { DWORD dwSize; GUID guid; -- 1.9.1

1 0

[PATCH] dxgi: Implement Map()/Unmap().
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/surface.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1f53b25a91..4b1b83b84a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -182,16 +182,43 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) { - FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + struct wined3d_map_desc wined3d_map_desc; + DWORD wined3d_map_flags = 0; + HRESULT hr; + + TRACE("iface %p, mapped_rect %p, flags %#x.\n", iface, mapped_rect, flags); + + if (flags & DXGI_MAP_READ) + wined3d_map_flags |= WINED3D_MAP_READ; + if (flags & DXGI_MAP_WRITE) + wined3d_map_flags |= WINED3D_MAP_WRITE; + if (flags & DXGI_MAP_DISCARD) + wined3d_map_flags |= WINED3D_MAP_DISCARD; + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, + &wined3d_map_desc, NULL, wined3d_map_flags))) + { + mapped_rect->Pitch = wined3d_map_desc.row_pitch; + mapped_rect->pBits = wined3d_map_desc.data; + } + wined3d_mutex_unlock(); - return E_NOTIMPL; + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); + wined3d_mutex_unlock(); + + return S_OK; } /* IDXGISurface1 methods */ -- 2.18.0

2 1

[PATCH] wined3d: Use raw blit for supported depth-stencil blits.
by Andrew Wesie 03 Sep '18

03 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45747 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> --- dlls/wined3d/surface.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a297d55..d1847be 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3406,9 +3406,13 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ else dst_location = dst_texture->resource.map_binding; + if ((flags & WINED3D_BLT_RAW) || (!scale && !convert && !resolve)) + blit_op = WINED3D_BLIT_OP_RAW_BLIT; + else + blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; + context = context_acquire(device, dst_texture, dst_sub_resource_idx); - valid_locations = device->blitter->ops->blitter_blit(device->blitter, - WINED3D_BLIT_OP_DEPTH_BLIT, context, + valid_locations = device->blitter->ops->blitter_blit(device->blitter, blit_op, context, src_texture, src_sub_resource_idx, src_texture->resource.draw_binding, &src_rect, dst_texture, dst_sub_resource_idx, dst_location, &dst_rect, NULL, filter); context_release(context); -- 2.7.4

2 1

[PATCH] server: Support ObjectTypeInformation in pipe objects.
by Jacek Caban 03 Sep '18

03 Sep '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45743 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 28 +++++++++++++++++++++++++++- server/named_pipe.c | 12 ++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)

1 0

Wine staging 3.15 release
by Alistair Leslie-Hughes 03 Sep '18

03 Sep '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.15 (890 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Added * [45622] mfplat: Add MFTRegisterLocal/MFTUnRegisterLocal stubs * [45372] mfplat: Implement MFCreateMFByteStreamOnStream * [45617] mfplat: Implement MFCreateSample * [45715] mfplat: Implement MFCreateMemoryBuffer * [42631] winex11: Improve mouse support in Unity based games. * [39402] xaudio2_7: Support FXEcho interface in CreateFX Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: 2017 Just Dance * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] secur32/tests: Connect to test.winehq.org instead of www.winehq.org.
by Hans Leidekker 03 Sep '18

03 Sep '18

Also make the tests more strict. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/secur32/tests/schannel.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 1a37c5226a..2bd0e017f4 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -560,11 +560,11 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 2 || cert_cnt == 3, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); } -static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: www.winehq.org\r\nConnection: close\r\n\r\n"; +static const char http_request[] = "HEAD /test.html HTTP/1.1\r\nHost: test.winehq.org\r\nConnection: close\r\n\r\n"; static void init_buffers(SecBufferDesc *desc, unsigned count, unsigned size) { @@ -690,7 +690,7 @@ static void test_communication(void) SecBufferDesc buffers[2]; SecBuffer *buf; - unsigned buf_size = 4000; + unsigned buf_size = 8192; unsigned char *data; unsigned data_size; @@ -700,7 +700,7 @@ static void test_communication(void) return; } - /* Create a socket and connect to www.winehq.org */ + /* Create a socket and connect to test.winehq.org */ ret = WSAStartup(0x0202, &wsa_data); if (ret) { @@ -708,10 +708,10 @@ static void test_communication(void) return; } - host = gethostbyname("www.winehq.org"); + host = gethostbyname("test.winehq.org"); if (!host) { - skip("Can't resolve www.winehq.org\n"); + skip("Can't resolve test.winehq.org\n"); return; } @@ -728,7 +728,7 @@ static void test_communication(void) ret = connect(sock, (struct sockaddr *)&addr, sizeof(addr)); if (ret == SOCKET_ERROR) { - skip("Can't connect to www.winehq.org\n"); + skip("Can't connect to test.winehq.org\n"); return; } @@ -806,7 +806,7 @@ todo_wine ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); - buffers[1].cBuffers = 4; + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = 0; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", @@ -865,10 +865,9 @@ todo_wine } ok(buffers[0].pBuffers[0].cbBuffer == 0, "Output buffer size was not set to 0.\n"); - ok(status == SEC_E_OK || broken(status == SEC_E_INVALID_TOKEN) /* WinNT */, - "InitializeSecurityContext failed: %08x\n", status); + ok(status == SEC_E_OK, "InitializeSecurityContext failed: %08x\n", status); if(status != SEC_E_OK) { - win_skip("Handshake failed\n"); + skip("Handshake failed\n"); return; } -- 2.11.0

1 0

[PATCH 1/2] shlwapi: Don't reuse a function for different methods.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/istream.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 43f53ffc79..623232a047 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -274,9 +274,20 @@ static HRESULT WINAPI IStream_fnRevert(IStream *iface) } /************************************************************************** - * IStream_fnLockUnlockRegion + * IStream_fnLockRegion */ -static HRESULT WINAPI IStream_fnLockUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, +static HRESULT WINAPI IStream_fnLockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ISHFileStream *This = impl_from_IStream(iface); + TRACE("(%p,%s,%s,%d)\n", This, wine_dbgstr_longlong(libOffset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), dwLockType); + return E_NOTIMPL; +} + +/************************************************************************** + * IStream_fnUnlockRegion + */ +static HRESULT WINAPI IStream_fnUnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { ISHFileStream *This = impl_from_IStream(iface); @@ -345,8 +356,8 @@ static const IStreamVtbl SHLWAPI_fsVTable = IStream_fnCopyTo, IStream_fnCommit, IStream_fnRevert, - IStream_fnLockUnlockRegion, - IStream_fnLockUnlockRegion, + IStream_fnLockRegion, + IStream_fnUnlockRegion, IStream_fnStat, IStream_fnClone }; -- 2.18.0

1 1

[PATCH] comctl32/listbox: Fix debug channel name.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 4d389b13bc..252844ef75 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -39,7 +39,7 @@ #include "comctl32.h" -WINE_DEFAULT_DEBUG_CHANNEL(listbox2); +WINE_DEFAULT_DEBUG_CHANNEL(listbox); /* Items array granularity */ #define LB_ARRAY_GRANULARITY 16 -- 2.18.0

1 0

[PATCH 1/3] opcservices/tests: Add some tests.
by Nikolay Sivov 03 Sep '18

03 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 1 + configure.ac | 1 + dlls/opcservices/tests/Makefile.in | 5 ++ dlls/opcservices/tests/opcservices.c | 85 ++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+) create mode 100644 dlls/opcservices/tests/Makefile.in create mode 100644 dlls/opcservices/tests/opcservices.c diff --git a/configure b/configure index 5d520f045a..b800fd269a 100755 --- a/configure +++ b/configure @@ -19715,6 +19715,7 @@ wine_fn_config_makefile dlls/olesvr.dll16 enable_win16 wine_fn_config_makefile dlls/olesvr32 enable_olesvr32 wine_fn_config_makefile dlls/olethk32 enable_olethk32 wine_fn_config_makefile dlls/opcservices enable_opcservices +wine_fn_config_makefile dlls/opcservices/tests enable_tests wine_fn_config_makefile dlls/openal32 enable_openal32 wine_fn_config_makefile dlls/opencl enable_opencl wine_fn_config_makefile dlls/opengl32 enable_opengl32 diff --git a/configure.ac b/configure.ac index 2b63d6ae50..d7d5e8e6ae 100644 --- a/configure.ac +++ b/configure.ac @@ -3574,6 +3574,7 @@ WINE_CONFIG_MAKEFILE(dlls/olesvr.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/olesvr32) WINE_CONFIG_MAKEFILE(dlls/olethk32) WINE_CONFIG_MAKEFILE(dlls/opcservices) +WINE_CONFIG_MAKEFILE(dlls/opcservices/tests) WINE_CONFIG_MAKEFILE(dlls/openal32) WINE_CONFIG_MAKEFILE(dlls/opencl) WINE_CONFIG_MAKEFILE(dlls/opengl32) diff --git a/dlls/opcservices/tests/Makefile.in b/dlls/opcservices/tests/Makefile.in new file mode 100644 index 0000000000..7c0963cc60 --- /dev/null +++ b/dlls/opcservices/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = opcservices.dll +IMPORTS = ole32 + +C_SRCS = \ + opcservices.c diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c new file mode 100644 index 0000000000..e257c6ea2c --- /dev/null +++ b/dlls/opcservices/tests/opcservices.c @@ -0,0 +1,85 @@ +/* + * Font related tests + * + * Copyright 2012, 2014-2017 Nikolay Sivov for CodeWeavers + * Copyright 2014 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "windows.h" +#include "initguid.h" +#include "msopc.h" + +#include "wine/test.h" + +static IOpcFactory *create_factory(void) +{ + IOpcFactory *factory = NULL; + CoCreateInstance(&CLSID_OpcFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IOpcFactory, (void **)&factory); + return factory; +} + +static void test_package(void) +{ + IOpcPartSet *partset, *partset2; + IOpcFactory *factory; + IOpcPackage *package; + HRESULT hr; + + factory = create_factory(); + + hr = IOpcFactory_CreatePackage(factory, &package); + ok(SUCCEEDED(hr) || broken(hr == E_NOTIMPL) /* Vista */, "Failed to create a package, hr %#x.\n", hr); + if (FAILED(hr)) + { + IOpcFactory_Release(factory); + return; + } + + hr = IOpcPackage_GetPartSet(package, &partset); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + + hr = IOpcPackage_GetPartSet(package, &partset2); + ok(SUCCEEDED(hr), "Failed to create a part set, hr %#x.\n", hr); + ok(partset == partset2, "Expected same part set instance.\n"); + + IOpcPackage_Release(package); + + IOpcFactory_Release(factory); +} + +START_TEST(opcservices) +{ + IOpcFactory *factory; + HRESULT hr; + + hr = CoInitialize(NULL); + ok(SUCCEEDED(hr), "Failed to initialize COM, hr %#x.\n", hr); + + if (!(factory = create_factory())) { + win_skip("Failed to create IOpcFactory factory.\n"); + CoUninitialize(); + return; + } + + test_package(); + + IOpcFactory_Release(factory); + + CoUninitialize(); +} -- 2.18.0

1 2

[PATCH 1/3] Update POOL_TYPE enumeration based on MSDN
by Derek Lesho 03 Sep '18

03 Sep '18

Update POOL_TYPE enum to include types listed on MSDN, including NonPagedPoolExecute, which is needed for Battleye. Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- include/ddk/wdm.h | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0cd1673dbe..a639b3c7b7 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -183,14 +183,29 @@ typedef struct _VPB { } VPB, *PVPB; typedef enum _POOL_TYPE { - NonPagedPool, - PagedPool, - NonPagedPoolMustSucceed, - DontUseThisType, - NonPagedPoolCacheAligned, - PagedPoolCacheAligned, - NonPagedPoolCacheAlignedMustS, - MaxPoolType + NonPagedPool , + NonPagedPoolExecute , + PagedPool , + NonPagedPoolMustSucceed , + DontUseThisType , + NonPagedPoolCacheAligned , + PagedPoolCacheAligned , + NonPagedPoolCacheAlignedMustS , + MaxPoolType , + NonPagedPoolBase , + NonPagedPoolBaseMustSucceed , + NonPagedPoolBaseCacheAligned , + NonPagedPoolBaseCacheAlignedMustS , + NonPagedPoolSession , + PagedPoolSession , + NonPagedPoolMustSucceedSession , + DontUseThisTypeSession , + NonPagedPoolCacheAlignedSession , + PagedPoolCacheAlignedSession , + NonPagedPoolCacheAlignedMustSSession , + NonPagedPoolNx , + NonPagedPoolNxCacheAligned , + NonPagedPoolSessionNx } POOL_TYPE; typedef struct _WAIT_CONTEXT_BLOCK { -- 2.18.0

2 5

[PATCH] cmd: Don't print an empty line if no command was executed.
by Thomas Faller 01 Sep '18

01 Sep '18

Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> --- programs/cmd/wcmdmain.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7a7ee16f7d..cceb5883ed 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -335,7 +335,7 @@ void WCMD_print_error (void) { * */ -static void WCMD_show_prompt (void) { +static void WCMD_show_prompt (BOOL newLine) { int status; WCHAR out_string[MAX_PATH], curdir[MAX_PATH], prompt_string[MAX_PATH]; @@ -350,8 +350,10 @@ static void WCMD_show_prompt (void) { } p = prompt_string; q = out_string; - *q++ = '\r'; - *q++ = '\n'; + if (newLine) { + *q++ = '\r'; + *q++ = '\n'; + } *q = '\0'; while (*p != '\0') { if (*p != '$') { @@ -1886,7 +1888,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE const DWORD len = ARRAY_SIZE(echoDot); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); - WCMD_show_prompt(); + WCMD_show_prompt(TRUE); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ @@ -2395,6 +2397,7 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR *argPos = NULL; WCHAR string[1024]; WCHAR envvar[4]; + BOOL promptNewLine = TRUE; BOOL opt_q; int opt_t = 0; static const WCHAR offW[] = {'O','F','F','\0'}; @@ -2749,11 +2752,12 @@ int wmain (int argc, WCHAR *argvW[]) /* Read until EOF (which for std input is never, but if redirect in place, may occur */ - if (echo_mode) WCMD_show_prompt(); + if (echo_mode) WCMD_show_prompt(promptNewLine); if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE))) break; WCMD_process_commands(toExecute, FALSE, FALSE); WCMD_free_commands(toExecute); + promptNewLine = !!toExecute; toExecute = NULL; } return 0; -- 2.17.1

1 0

[PATCH 3/3 v2] mshtml: Implement known IHTMLCSSStyleDeclaration BSTR properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Fixed a typo in tests. dlls/mshtml/htmlstyle.c | 360 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 27 +++- 2 files changed, 206 insertions(+), 181 deletions(-)

1 0

[PATCH 2/3 resend] mshtml: Implement known IHTMLCSSStyleDeclaration VARIANT properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 296 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 83 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-)

1 0

[PATCH 1/3 resend] mshtml: Added IHTMLCSSStyleDeclaration stub implementation.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 3065 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 8 + 4 files changed, 3075 insertions(+)

1 0

[PATCH] po: Update Simplified Chinese translation.
by Jactry Zeng 31 Aug '18

31 Aug '18

From: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Zixing Liu <liushuyu011(a)gmail.com> Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- po/zh_CN.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] winhttp: Fix macOS build.
by Hans Leidekker 31 Aug '18

31 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c62fdadb06..5191a34711 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,7 +17,6 @@ */ #include "config.h" -#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,6 +33,7 @@ #include "winbase.h" #include "winsock2.h" #include "ws2ipdef.h" +#include "ws2tcpip.h" #include "winhttp.h" #include "winreg.h" #define COBJMACROS -- 2.11.0

1 0

[PATCH] testbot: Fail the task if the log contains perl errors or warnings.
by Francois Gouget 31 Aug '18

31 Aug '18

They indicate the script needs fixing and they may mask other issues. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 5120217c0..b0b804046 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -71,7 +71,11 @@ sub ParseTaskLog($) $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^Task: /) + elsif ($Line =~ /^Task: / or + # Typical perl errors + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { $Result = "failed"; } @@ -111,7 +115,9 @@ sub GetLogLineCategory($) $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors - $Line =~ /^Use of uninitialized value/) + $Line =~ /^Use of uninitialized value / or + $Line =~ /^Undefined subroutine / or + $Line =~ /^Global symbol /) { return "error"; } -- 2.18.0

1 0

[PATCH] testbot/WineRunWineTest: Remove a redundant $TaskDir variable.
by Francois Gouget 31 Aug '18

31 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 0363a26b3..e3b8b17ed 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -537,7 +537,6 @@ elsif (!defined $TAError) my $TimedOut; if ($Step->Type ne "build") { - my $TaskDir = $Task->CreateDir(); my $BuildList = $Task->CmdLineArg; $BuildList =~ s/ .*$//; foreach my $Build (split /,/, $BuildList) -- 2.18.0

1 0

[PATCH 3/3] mshtml: Implement known IHTMLCSSStyleDeclaration BSTR properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 360 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 27 +++- 2 files changed, 206 insertions(+), 181 deletions(-)

2 1

[PATCH 2/3] mshtml: Implement known IHTMLCSSStyleDeclaration VARIANT properties.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 296 +++++++++++++++++++++++----------------------- dlls/mshtml/tests/style.c | 83 +++++++++++++ 2 files changed, 231 insertions(+), 148 deletions(-)

1 0

[PATCH 1/3] mshtml: Added IHTMLCSSStyleDeclaration stub implementation.
by Jacek Caban 31 Aug '18

31 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 3065 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/style.c | 8 + 4 files changed, 3075 insertions(+)

1 0

[PATCH 1/3] msxml3/tests: Add test for treating namespaces as attributes.
by Daniel Lehman 31 Aug '18

31 Aug '18

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> --- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 35fa42a6d1..ffb9e1462d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12830,6 +12830,134 @@ todo_wine { IXMLDOMDocument2_Release(doc); } +typedef struct _namespace_as_attribute_t { + const GUID *guid; + const char *clsid; + const char *xmlns_uri; + BOOL todo; +} namespace_as_attribute_t; + +static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "", FALSE }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "", FALSE }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "", FALSE }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "", FALSE }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "", FALSE }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/", TRUE }, + { 0 } +}; + +void test_namespaces_as_attributes(void) +{ + const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; + static const char ns_as_attr_doc[] = { + "<?xml version=\"1.0\"?>" + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />" + }; + static const char *names[] = { "ns:b", "d", "xmlns:ns" }; + static const char *prefixes[] = { "ns", NULL, "xmlns" }; + static const char *basenames[] = { "b", "d", "ns" }; + static const char *uris[] = { "nshref", NULL, "" }; + static const char *texts[] = { "b attr", "d attr", "nshref" }; + IXMLDOMNamedNodeMap *map; + IXMLDOMDocument *doc; + IXMLDOMNode *node; + IXMLDOMNode *item; + VARIANT_BOOL b; + HRESULT hr; + BSTR str; + LONG len; + LONG i; + + while (entry->guid) + { + if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2)) + { + entry++; + continue; + } + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDOMDocument2, (void**)&doc); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ns_as_attr_doc), &b); + EXPECT_HR(hr, S_OK); + + node = NULL; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_attributes(node, &map); + EXPECT_HR(hr, S_OK); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + EXPECT_HR(hr, S_OK); + todo_wine ok(len == 3, "got %d\n", len); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + EXPECT_HR(hr, S_OK); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (prefixes[i]) + { + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + EXPECT_HR(hr, S_FALSE); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (uris[i]) + { + EXPECT_HR(hr, S_OK); + if (prefixes[i] && !strcmp(prefixes[i], "xmlns")) + todo_wine_if(entry->todo) + ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + EXPECT_HR(hr, S_FALSE); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_(texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + + entry++; + } + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12914,6 +13042,7 @@ START_TEST(domdoc) test_merging_text(); test_transformNodeToObject(); test_normalize_attribute_values(); + test_namespaces_as_attributes(); test_xsltemplate(); test_xsltext(); -- 2.17.1

2 4

[v2 PATCH] msxml3/tests: Add test for treating namespaces as attributes.
by Nikolay Sivov 31 Aug '18

31 Aug '18

From: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: minor cleanup. dlls/msxml3/tests/domdoc.c | 126 +++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 35fa42a6d1..b602e030a8 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12830,6 +12830,131 @@ todo_wine { IXMLDOMDocument2_Release(doc); } +typedef struct _namespace_as_attribute_t { + const GUID *guid; + const char *clsid; + const char *xmlns_uri; + BOOL todo; +} namespace_as_attribute_t; + +static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { + { &CLSID_DOMDocument, "CLSID_DOMDocument", "", FALSE }, + { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "", FALSE }, + { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "", FALSE }, + { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "", FALSE }, + { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "", FALSE }, + { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/", TRUE }, + { 0 } +}; + +void test_namespaces_as_attributes(void) +{ + const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; + static const char ns_as_attr_doc[] = { + "<?xml version=\"1.0\"?>" + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />" + }; + static const char *names[] = { "ns:b", "d", "xmlns:ns" }; + static const char *prefixes[] = { "ns", NULL, "xmlns" }; + static const char *basenames[] = { "b", "d", "ns" }; + static const char *uris[] = { "nshref", NULL, "" }; + static const char *texts[] = { "b attr", "d attr", "nshref" }; + IXMLDOMNamedNodeMap *map; + IXMLDOMNode *node, *item; + IXMLDOMDocument *doc; + VARIANT_BOOL b; + LONG len, i; + HRESULT hr; + BSTR str; + + while (entry->guid) + { + if (!is_clsid_supported(entry->guid, &IID_IXMLDOMDocument2)) + { + entry++; + continue; + } + + hr = CoCreateInstance(entry->guid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(SUCCEEDED(hr), "Failed to create document %s, hr %#x.\n", wine_dbgstr_guid(entry->guid), hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_(ns_as_attr_doc), &b); + ok(hr == S_OK, "Failed to load xml, hr %#x.\n", hr); + + node = NULL; + hr = IXMLDOMDocument_selectSingleNode(doc, _bstr_("a"), &node); + ok(SUCCEEDED(hr), "Failed to select a node, hr %#x.\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &map); + ok(SUCCEEDED(hr), "Failed to get attributes, hr %#x.\n", hr); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok(SUCCEEDED(hr), "Failed to get map length, hr %#x.\n", hr); + todo_wine ok(len == 3, "got %d\n", len); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + ok(SUCCEEDED(hr), "Failed to get item, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + ok(SUCCEEDED(hr), "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (prefixes[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + ok(SUCCEEDED(hr), "Failed to get base name, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (uris[i]) + { + ok(hr == S_OK, "Failed to get node name, hr %#x.\n", hr); + if (prefixes[i] && !strcmp(prefixes[i], "xmlns")) + todo_wine_if(entry->todo) + ok(!lstrcmpW(str, _bstr_(entry->xmlns_uri)), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Failed to get node name, hr %#x.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + ok(SUCCEEDED(hr), "Failed to get node text, hr %#x.\n", hr); + ok(!lstrcmpW(str, _bstr_(texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + + entry++; + } + free_bstrs(); +} + START_TEST(domdoc) { HRESULT hr; @@ -12914,6 +13039,7 @@ START_TEST(domdoc) test_merging_text(); test_transformNodeToObject(); test_normalize_attribute_values(); + test_namespaces_as_attributes(); test_xsltemplate(); test_xsltext(); -- 2.18.0

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 31 Aug '18

31 Aug '18

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/po/fi.po b/po/fi.po index 54a636b461..f5a7b9ce99 100644 --- a/po/fi.po +++ b/po/fi.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-20 17:38+0200\n" +"PO-Revision-Date: 2018-08-31 07:27+0200\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: Finnish\n" "Language: fi\n" @@ -399,16 +399,12 @@ msgid "&Retry" msgstr "&Uudelleen" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "P&iilota välilehdet" +msgstr "Piilota lisätiedot" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Tiedot" +msgstr "Näytä lisätiedot" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 @@ -3440,18 +3436,16 @@ msgid "Connections" msgstr "Yhteydet" #: inetcpl.rc:125 -#, fuzzy -#| msgid "Wine configuration" msgid "Automatic configuration" -msgstr "Winen asetukset" +msgstr "Automaattiset asetukset" #: inetcpl.rc:126 msgid "Use Web Proxy Auto-Discovery (WPAD)" -msgstr "" +msgstr "Käytä Web Proxy Auto-Discovery (WPAD) -protokollaa" #: inetcpl.rc:127 msgid "Use Proxy Auto-Config (PAC) script" -msgstr "" +msgstr "Käytä Proxy Auto-Config (PAC) -skriptiä" #: inetcpl.rc:128 inetcpl.rc:132 msgid "Address:" @@ -14183,11 +14177,11 @@ msgstr "&Väri:" #: winecfg.rc:304 msgid "MIME types" -msgstr "" +msgstr "MIME-tyypit" #: winecfg.rc:305 msgid "Manage file &associations" -msgstr "" +msgstr "&Muokkaa tiedostosidoksia" #: winecfg.rc:308 msgid "Folders" -- 2.18.0

1 0

[PATCH] schedsvc/tests: Check the entire entry list to find the new job
by Alex Henrie 31 Aug '18

31 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This looks like it was a typo: The code loops through all the retrieved jobs, but it only retrieved the first one. This patch should fix the tests that usually fail on Debian, as well as any intermittent failures on Windows. --- dlls/schedsvc/tests/atsvcapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 66f237ecab..d7d48a122c 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -118,7 +118,7 @@ START_TEST(atsvcapi) container.EntriesRead = 0; container.Buffer = NULL; total = start_index = 0; - ret = NetrJobEnum(server_name, &container, 1, &total, &start_index); + ret = NetrJobEnum(server_name, &container, -1, &total, &start_index); if (ret == ERROR_ACCESS_DENIED) { win_skip("NetrJobEnum: Access denied, skipping the tests\n"); -- 2.18.0

1 0

[PATCH 01/12] shell32: Add image file icon
by Alex Henrie 31 Aug '18

31 Aug '18

Adapted from image-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/image.ico | Bin 0 -> 48827 bytes dlls/shell32/resources/image.svg | 1008 ++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 1013 insertions(+) create mode 100644 dlls/shell32/resources/image.ico create mode 100644 dlls/shell32/resources/image.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 146ed11224..2c9f3d7ab5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -76,6 +76,7 @@ SVG_SRCS = \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ + resources/image.svg \ resources/internet.svg \ resources/log_off.svg \ resources/menu.svg \ diff --git a/dlls/shell32/resources/image.ico b/dlls/shell32/resources/image.ico new file mode 100644 index 0000000000000000000000000000000000000000..0d96369ce0340c2cc3afd3a923823884b6abadb7 GIT binary patch literal 48827 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/image.svg b/dlls/shell32/resources/image.svg new file mode 100644 index 0000000000..e69abe20ad --- /dev/null +++ b/dlls/shell32/resources/image.svg @@ -0,0 +1,1008 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg16168" + xml:space="preserve" + height="272" + width="632"><metadata + id="metadata16236"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + + + + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + + + + <dc:title></dc:title> +<dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> +</dc:creator> +<dc:subject> + <rdf:Bag><rdf:li>image</rdf:li><rdf:li>picture</rdf:li><rdf:li>snapshot</rdf:li><rdf:li>photo</rdf:li></rdf:Bag> +</dc:subject> +<cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> +</cc:Work> + + + + +<cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF> + + + +</metadata> + + + +<defs + id="defs16234"><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-0.52019826,0,0,0.36514455,-1632.0267,-1306.987)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719" + xlink:href="#linearGradient5060" /><linearGradient + id="linearGradient5060"><stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /><stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /></linearGradient><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(0.52019826,0,0,0.36514455,-2007.8511,-1306.987)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717" + xlink:href="#linearGradient5060" /><linearGradient + id="linearGradient5048"><stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /><stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /><stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /></linearGradient><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(0.52019826,0,0,0.36514455,-2007.9535,-1306.987)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715" + xlink:href="#linearGradient5048" /><linearGradient + id="linearGradient8171"><stop + id="stop8173" + offset="0" + style="stop-color:#bbbdba;stop-opacity:1;" /><stop + id="stop8175" + offset="1" + style="stop-color:#70746e;stop-opacity:1;" /></linearGradient><linearGradient + id="linearGradient8155"><stop + id="stop8157" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /><stop + id="stop8159" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient + id="linearGradient2224"><stop + id="stop2226" + offset="0" + style="stop-color:#7c7c7c;stop-opacity:1;" /><stop + id="stop2228" + offset="1" + style="stop-color:#b8b8b8;stop-opacity:1;" /></linearGradient><linearGradient + id="linearGradient2251"><stop + id="stop2253" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /><stop + id="stop2255" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /></linearGradient><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientUnits="userSpaceOnUse" + id="linearGradient7648"> + <stop + id="stop7650" + style="stop-color:#8595bc;stop-opacity:1;" + offset="0" /> + + + + + <stop + id="stop7652" + style="stop-color:#041a3b;stop-opacity:1;" + offset="1" /> + + + + + </linearGradient><linearGradient + id="aigrd1" + gradientUnits="userSpaceOnUse" + x1="12.4873" + y1="3.7319" + x2="31.081301" + y2="36.032799"> + <stop + offset="0" + style="stop-color:#D2D2D2;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16177" /> + + + + + <stop + offset="1" + style="stop-color:#EDEDED;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16179" /> + + + + + </linearGradient><linearGradient + id="aigrd3" + gradientUnits="userSpaceOnUse" + x1="21.9326" + y1="24.627399" + x2="21.9326" + y2="7.1090999"> + <stop + offset="0" + style="stop-color:#D0D6E5;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16199" /> + + + + + <stop + offset="1" + style="stop-color:#093A80;stroke-dasharray:none;stroke-miterlimit:4.0000000;stroke-width:1.2166667" + id="stop16201" /> + + + + + </linearGradient><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(0.20606057,0,0,-0.14788838,-1.1607128,2.4786422)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(0.20606057,0,0,0.20515975,-1.1607128,-5.3530148)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673" + xlink:href="#aigrd3" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.99008701,52.321668,2.8389222)" + gradientUnits="userSpaceOnUse" + id="linearGradient8148" + xlink:href="#aigrd1" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568333,1.8025822)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161" + xlink:href="#linearGradient8155" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475674,-3.4097878)" + gradientUnits="userSpaceOnUse" + id="linearGradient8166" + xlink:href="#linearGradient2251" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475674,-3.0347878)" + gradientUnits="userSpaceOnUse" + id="linearGradient8169" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(-2.55025e-6,2.1577629e-6)" + gradientUnits="userSpaceOnUse" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + id="linearGradient8177" + xlink:href="#linearGradient8171" /><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(2.774389,0,0,1.969706,-14397.275,-9696.68)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715-3" + xlink:href="#linearGradient5048" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(2.774389,0,0,1.969706,-14396.729,-9696.68)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717-3" + xlink:href="#linearGradient5060" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-2.774389,0,0,1.969706,-12392.333,-9696.68)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719-2" + xlink:href="#linearGradient5060" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.098989,0,0,-0.797757,-259.82885,-172.20238)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671-2" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.098989,0,0,1.106697,-259.82885,-214.44883)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673-9" + xlink:href="#aigrd3" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568325,1.8025804)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161-7" + xlink:href="#linearGradient8155" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.990087,52.321675,2.8389204)" + gradientUnits="userSpaceOnUse" + id="linearGradient1070" + xlink:href="#aigrd1" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475751,-3.0347896)" + gradientUnits="userSpaceOnUse" + id="linearGradient1072" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(5.0857998e-6)" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + gradientUnits="userSpaceOnUse" + id="linearGradient1074" + xlink:href="#linearGradient8171" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475751,-3.4097896)" + gradientUnits="userSpaceOnUse" + id="linearGradient1076" + xlink:href="#linearGradient2251" /><radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.710531,0,0,1.124849,-11.568326,1.8025772)" + r="19.96875" + fy="10.404876" + fx="12.700491" + cy="10.404876" + cx="12.700491" + id="radialGradient8161-7-6" + xlink:href="#linearGradient8155" /><linearGradient + y2="38.070381" + x2="34.170048" + y1="36.921333" + x1="33.396004" + gradientTransform="translate(5.1475774,-3.4097895)" + gradientUnits="userSpaceOnUse" + id="linearGradient1076-6" + xlink:href="#linearGradient8155" /><linearGradient + y2="37.770721" + x2="33.664921" + y1="40.458221" + x1="35.996582" + gradientTransform="translate(5.1475774,-3.0347918)" + gradientUnits="userSpaceOnUse" + id="linearGradient1072-0" + xlink:href="#linearGradient2224" /><linearGradient + gradientTransform="translate(5.0101976e-6,-3.7533736e-6)" + y2="39.984692" + x2="45" + y1="31" + x1="42.1875" + gradientUnits="userSpaceOnUse" + id="linearGradient1074-5" + xlink:href="#linearGradient8171" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.6484753,0,0,-1.2051099,-629.17272,-281.25344)" + gradientUnits="userSpaceOnUse" + id="linearGradient7671-2-7" + xlink:href="#linearGradient7648" /><linearGradient + y2="7.1090999" + x2="21.9326" + y1="24.627399" + x1="21.9326" + gradientTransform="matrix(1.6484753,0,0,1.6718017,-629.17272,-345.07189)" + gradientUnits="userSpaceOnUse" + id="linearGradient7673-9-6" + xlink:href="#aigrd3" /><linearGradient + y2="36.032799" + x2="31.081301" + y1="3.7319" + x1="12.4873" + gradientTransform="matrix(1.434003,0,0,0.990087,52.321673,2.838918)" + gradientUnits="userSpaceOnUse" + id="linearGradient1070-7" + xlink:href="#aigrd1" /><linearGradient + y2="609.50507" + x2="302.85715" + y1="366.64789" + x1="302.85715" + gradientTransform="matrix(4.1615627,0,0,2.9754828,-32212.903,-14936.877)" + gradientUnits="userSpaceOnUse" + id="linearGradient6715-3-2" + xlink:href="#linearGradient5048" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(4.1615627,0,0,2.9754828,-32212.084,-14936.877)" + gradientUnits="userSpaceOnUse" + id="radialGradient6717-3-4" + xlink:href="#linearGradient5060" /><radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-4.1615627,0,0,2.9754828,-29205.505,-14936.877)" + gradientUnits="userSpaceOnUse" + id="radialGradient6719-2-0" + xlink:href="#linearGradient5060" /></defs> + + + + + + + + + + <g + id="g6707" + transform="matrix(0.1160059,0,0,0.13449455,234.18793,187.83047)" + style="display:inline;stroke-width:0.18643716"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.18643716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713" /></g><path + id="rect7603" + d="M 22.493564,40.261362 H 239.35622 c 3.32399,0 5.99999,2.7066 5.99999,6.06861 V 175.25853 c 0,3.36201 -45.10238,43.25861 -48.42637,43.25861 H 22.493564 c -3.323994,0 -5.99999,-2.7066 -5.99999,-6.06861 V 46.329972 c 0,-3.36201 2.675996,-6.06861 5.99999,-6.06861 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8148);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<g + style="stroke-width:0.18643716" + transform="matrix(5.6254578,0,0,5.663975,3.6540074,29.635832)" + id="g7654"><path + style="fill:url(#linearGradient7671);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644" /><path + id="path16203" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673);fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:0.21554199;stroke-miterlimit:4" + id="g16205"> + <g + style="stroke-width:0.21554199" + id="g16207"> + <path + id="path16209" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16211" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16213" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16215" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16217" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16219" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:0.21554199" /> + + + + + <path + id="path16221" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none;stroke-width:0.21554199" /> + + + + + </g> + + + + + </g><path + id="path16223" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16225" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16227" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /><path + id="path16229" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:0.22683188;stroke-miterlimit:4" /></g><path + id="rect7675" + d="M 22.954685,45.645342 H 238.5799 c 0.80204,0 1.44772,0.65306 1.44772,1.46427 V 174.94603 c 0,5.10236 -37.88662,38.17748 -38.68865,38.17748 H 22.954685 c -0.802031,0 -1.447711,-0.65306 -1.447711,-1.46427 V 47.109612 c 0,-0.81121 0.64568,-1.46427 1.447711,-1.46427 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="62.0826" + x="37.332108" + height="135.1951" + width="186.99988" + id="rect8163" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210" + d="m 195.76749,218.34932 c 10.82889,1.77958 51.1402,-24.43588 49.51683,-45.84007 -8.3374,13.07095 -25.37877,6.94107 -47.29214,7.79882 0,0 2.10864,35.3441 -2.22469,38.04125 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient8169);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8177);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8166);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 203.50314,206.52766 c 7.30549,-3.68879 23.61732,-11.57871 30.54735,-21.72545 -8.5125,3.66844 -15.72165,1.13009 -30.41243,1.02711 0,0 0.86571,16.51791 -0.13494,20.69835 z" + id="path2247" /><path + id="rect8150" + d="M 24.332115,48.596802 V 167.60895 C 143.40446,172.40105 156.71675,97.145662 237.33199,97.145662 v -48.54886 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <g + id="g6707-0" + transform="matrix(0.02175112,0,0,0.02493263,314.41033,253.81157)" + style="display:inline"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711-3" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713-7" /></g><path + id="rect7603-5" + d="m 274.71761,226.45518 h 40.66177 c 0.62325,0 1.125,0.50175 1.125,1.12499 v 23.90081 c 0,0.62325 -8.4567,8.01929 -9.07995,8.01929 h -32.70682 c -0.62325,0 -1.125,-0.50175 -1.125,-1.125 v -30.7951 c 0,-0.62324 0.50175,-1.12499 1.125,-1.12499 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1070);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><g + transform="matrix(1.054774,0,0,1.049989,271.18519,224.48541)" + id="g7654-9"><path + style="fill:url(#linearGradient7671-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644-2" /><path + id="path16203-2" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673-9);fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:1.15611064;stroke-miterlimit:4" + id="g16205-8"><g + id="g16207-9"><path + id="path16209-7" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none" /><path + id="path16211-3" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none" /><path + id="path16213-6" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none" /><path + id="path16215-1" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none" /><path + id="path16217-2" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none" /><path + id="path16219-9" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none" /><path + id="path16221-3" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none" /></g></g><path + id="path16223-1" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16225-9" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16227-4" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /><path + id="path16229-7" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.2166667;stroke-miterlimit:4" /></g><path + id="rect7675-8" + d="m 274.80407,227.45326 h 40.42975 c 0.15039,0 0.27145,0.12106 0.27145,0.27144 v 23.69835 c 0,0.94588 -7.10374,7.07735 -7.25412,7.07735 h -33.44708 c -0.15038,0 -0.27144,-0.12106 -0.27144,-0.27145 V 227.7247 c 0,-0.15038 0.12106,-0.27144 0.27144,-0.27144 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="230.50041" + x="277.49985" + height="25.0625" + width="35.0625" + id="rect8163-4" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210-5" + d="m 307.20649,259.46916 c 2.03042,0.3299 9.58879,-4.52993 9.28441,-8.49784 -1.56326,2.4231 -4.75852,1.28674 -8.86728,1.44575 0,0 0.39537,6.55209 -0.41713,7.05209 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1072);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1074);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1076);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 308.65693,257.27766 c 1.36978,-0.68383 4.42825,-2.14646 5.72763,-4.02747 -1.5961,0.68006 -2.94781,0.2095 -5.70234,0.19041 0,0 0.16233,3.06209 -0.0253,3.83706 z" + id="path2247-0" /><path + id="rect8150-3" + d="m 275.06234,228.0004 v 22.0625 c 22.32608,0.88836 24.82213,-13.0625 39.9375,-13.0625 v -9 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +8NpC/NRj/FlDJiFxHCGlZDgcFuSTNMZgePe3v9lDaOoa+NUvf1GxJ4U8L/v23dvs9nrIVGbkw4B4 +GDFMh/zu4u/FzX/e3MN1agZ83//KSJftOI6xsYnjmMGgTzyM6Ha7/Prtd8Xa2trUrDmjwVEcce7c +OV4UtNb8+fKfkMOUMAoJo5Db//5IXHzv4r7jsgwoxNXrV83zOrgOgkcPH6KUZnOwyYMHq+L9996n +2+2+MD6HOMQhDnGIrwf+D/F3w+/ak6oYAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8A +AABYdEVYdENvcHlyaWdodABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVh +dGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTI5VDIxOjU4OjE5LTA2OjAwN6TyQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yOVQyMTo1ODoxOS0wNjowMEb5Sv0AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAEnRFWHRUaXRsZQBHZW5yaWMgSW1hZ2XykzdZAAAAAElFTkSuQmCC +" + id="icon:48-8" + x="328" + y="220" /><image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +8NpC/NRj/FlDJiFxHCGlZDgcFuSTNMZgePe3v9lDaOoa+NUvf1GxJ4U8L/v23dvs9nrIVGbkw4B4 +GDFMh/zu4u/FzX/e3MN1agZ83//KSJftOI6xsYnjmMGgTzyM6Ha7/Prtd8Xa2trUrDmjwVEcce7c +OV4UtNb8+fKfkMOUMAoJo5Db//5IXHzv4r7jsgwoxNXrV83zOrgOgkcPH6KUZnOwyYMHq+L9996n +2+2+MD6HOMQhDnGIrwf+D/F3w+/ak6oYAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8A +AABYdEVYdENvcHlyaWdodABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVh +dGl2ZWNvbW1vbnMub3JnL3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNy +ZWF0ZQAyMDE4LTA4LTI5VDIxOjU4OjE5LTA2OjAwN6TyQQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAx +OC0wOC0yOVQyMTo1ODoxOS0wNjowMEb5Sv0AAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5v +cmeb7jwaAAAAEnRFWHRUaXRsZQBHZW5yaWMgSW1hZ2XykzdZAAAAAElFTkSuQmCC +" + id="icon:48-4" + x="384" + y="220" /><g + id="g6707-0-7" + transform="matrix(0.01450082,0,0,0.01650487,468.36694,258.57901)" + style="display:inline;stroke-width:1.50529826"><rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect6709-2-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#linearGradient6715-3-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path6711-3-6" + d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6717-3-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.40206185;fill:url(#radialGradient6719-2-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.50529826;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z" + id="path6713-7-8" /></g><path + id="rect7603-5-8" + d="m 441.905,240.46966 h 27.10798 c 0.4155,0 0.75,0.33215 0.75,0.74472 v 15.82183 c 0,0.41258 -5.63782,5.3086 -6.05333,5.3086 H 441.905 c -0.4155,0 -0.75,-0.33215 -0.75,-0.74473 v -20.3857 c 0,-0.41257 0.3345,-0.74472 0.75,-0.74472 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1070-7);fill-opacity:1;fill-rule:nonzero;stroke:#bbbfbb;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><g + style="stroke-width:1.50529826" + transform="matrix(0.70318618,0,0,0.69507027,439.55004,239.16572)" + id="g7654-9-4"><path + style="fill:url(#linearGradient7671-2-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" + d="M 5.512695,30 H 39.643234 V 19.627375 H 5.512695 Z" + id="path7644-2-3" /><path + id="path16203-2-1" + d="M 5.512695,5.237844 H 39.643234 V 19.627375 H 5.512695 Z" + style="fill:url(#linearGradient7673-9-6);fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><g + transform="matrix(1.189217,0,0,1.189217,-3.525355,-6.535408)" + style="fill-rule:nonzero;stroke:#000000;stroke-width:1.74029136;stroke-miterlimit:4" + id="g16205-8-4"><g + style="stroke-width:1.74029136" + id="g16207-9-9"><path + id="path16209-7-2" + d="m 18.4,15.4 c 0,2.2 -1.8,4.1 -4.1,4.1 -2.2,0 -4.1,-1.8 -4.1,-4.1 0,-2.2 1.8,-4.1 4.1,-4.1 2.2,0 4.1,1.8 4.1,4.1 z" + style="opacity:0.04999994;fill:#e8f52f;stroke:none;stroke-width:1.74029136" /><path + id="path16211-3-0" + d="m 18,15.4 c 0,2 -1.6,3.7 -3.7,3.7 -2,0 -3.7,-1.6 -3.7,-3.7 0,-2 1.6,-3.7 3.7,-3.7 2,0 3.7,1.6 3.7,3.7 z" + style="opacity:0.20829994;fill:#ecf751;stroke:none;stroke-width:1.74029136" /><path + id="path16213-6-6" + d="m 17.6,15.4 c 0,1.8 -1.5,3.3 -3.3,3.3 -1.8,0 -3.3,-1.5 -3.3,-3.3 0,-1.8 1.5,-3.3 3.3,-3.3 1.8,0 3.3,1.5 3.3,3.3 z" + style="opacity:0.36669994;fill:#f0f972;stroke:none;stroke-width:1.74029136" /><path + id="path16215-1-8" + d="m 17.2,15.4 c 0,1.6 -1.3,2.9 -2.9,2.9 -1.6,0 -2.9,-1.3 -2.9,-2.9 0,-1.6 1.3,-2.9 2.9,-2.9 1.6,0 2.9,1.3 2.9,2.9 z" + style="opacity:0.525;fill:#f4fa95;stroke:none;stroke-width:1.74029136" /><path + id="path16217-2-9" + d="m 16.8,15.4 c 0,1.4 -1.1,2.5 -2.5,2.5 -1.4,0 -2.5,-1.1 -2.5,-2.5 0,-1.4 1.1,-2.5 2.5,-2.5 1.4,0 2.5,1.1 2.5,2.5 z" + style="opacity:0.6833;fill:#f7fcb7;stroke:none;stroke-width:1.74029136" /><path + id="path16219-9-2" + d="m 16.4,15.4 c 0,1.2 -1,2.1 -2.1,2.1 -1.1,0 -2.1,-1 -2.1,-2.1 0,-1.1 1,-2.1 2.1,-2.1 1.1,0 2.1,1 2.1,2.1 z" + style="opacity:0.8417;fill:#fbfddb;stroke:none;stroke-width:1.74029136" /><path + id="path16221-3-6" + d="m 16,15.4 c 0,1 -0.8,1.8 -1.8,1.8 -1,0 -1.8,-0.8 -1.8,-1.8 0,-1 0.8,-1.8 1.8,-1.8 1,0 1.8,0.8 1.8,1.8 z" + style="fill:#ffffff;stroke:none;stroke-width:1.74029136" /></g></g><path + id="path16223-1-6" + d="m 25.015859,21.649044 h 8.681289 l 1.664904,0.475688 h -2.854121 c 0,0 2.854121,0.237842 4.281184,2.021669 1.427059,1.664904 -1.664905,3.686575 -1.664905,3.686575 0,0 0,0 0,0 -0.118922,-0.356766 -0.832454,-3.210889 -2.259514,-4.400106 -1.070297,-0.951374 -2.259514,-1.189218 -2.259514,-1.189218 h -5.589323 v -0.475686 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16225-9-4" + d="m 30.724106,22.362574 h -4.994715 l 9.275897,5.232557 z" + style="opacity:0.3;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16227-4-9" + d="m 25.015859,21.767966 h 8.681289 l 1.30814,-0.832453 h -2.854121 c 0,0 2.616276,-0.475686 2.973043,-3.448731 0.356763,-2.973043 -4.043341,-6.302851 -4.043341,-6.302851 0,0 0,0 0,0.118922 0.118921,0.71353 1.308138,5.708243 0.475688,7.610993 -0.356767,1.664901 -1.427062,2.021667 -1.427062,2.021667 h -5.470401 l 0.237844,0.832453 z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /><path + id="path16229-7-5" + d="M 30.248418,20.459827 H 25.253704 L 31.19979,11.421773 Z" + style="fill:#515151;fill-rule:nonzero;stroke:none;stroke-width:1.83144629;stroke-miterlimit:4" /></g><path + id="rect7675-8-0" + d="m 441.96264,241.13037 h 26.9533 c 0.10026,0 0.18097,0.0801 0.18097,0.17969 v 15.6878 c 0,0.62615 -4.73585,4.68505 -4.83611,4.68505 h -22.29816 c -0.10025,0 -0.18096,-0.0801 -0.18096,-0.17969 v -20.19316 c 0,-0.0995 0.0807,-0.17969 0.18096,-0.17969 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><rect + y="243.14752" + x="443.75983" + height="16.590839" + width="23.375116" + id="rect8163-4-4" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.84659095;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4f4f4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + id="path2210-5-8" + d="m 463.56436,262.32421 c 1.35362,0.21839 6.39256,-2.99871 6.18964,-5.62539 -1.04218,1.60404 -3.17236,0.8518 -5.91155,0.95706 0,0 0.26358,4.33734 -0.27809,4.66833 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1072-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1074-5);stroke-width:1.00000024;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /><path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36931817;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1076-6);stroke-width:0.99999982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 464.53133,260.87349 c 0.91319,-0.45268 2.95218,-1.42091 3.81843,-2.6661 -1.06407,0.45018 -1.96521,0.13868 -3.80157,0.12604 0,0 0.10822,2.02704 -0.0169,2.54006 z" + id="path2247-0-7" /><path + id="rect8150-3-1" + d="m 442.13482,241.49257 v 14.6049 c 14.88413,0.58807 16.54817,-8.6471 26.62513,-8.6471 v -5.9578 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.30113639;fill:url(#radialGradient8161-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABBJJREFUWMPtlk1vG1UUhp87Y3scO05ip00TWlQVgUCCqLBECKlS +1Z/Br2ALq25A/AE2CKkqy0ZsWFWVQluVqhIUAlVbkRD1w3ESx07Gn+O5Xyxm7HHiNm5F1A090uie +e+/RvM85597RwGv7v5sAuLp81WJfvfKFcxdEKvIF58+df6X6136+BkAKwNoo/dXV1QRQiIHf3z84 +P2w8bG9xcXEwTx0k+/a7ywjh4AwDYLHGYqzFGIM1BmMMOh6Nida11vE8ebTWcVwUc/HLz/fp7QMQ +QpByXWreBziOQAgo5CS5nKbVFfgNB6kExli0sWhtYj8ZtbH79nUfzljmu7dHWjFSAdd1KeQ9XAfO +nOrw8YcuczMlGu0mt/7osPJgklATiVubCOukQn1/GNJYi9tzxgMIATkvTSEf8slZl/ff+pSUU2J+ +1ieTvkndl2ztTMQljYWGxfvrg70ElF3GA2AtE16aqXxIaWaClFMCHFwxQ7Eww7HiJq12ZtBTMzgb +yah7TWRzC2f6zL7WNK09HKB/erNeCmuzNFo+anYH15nFGp9m10epCXLZ9NChjEZrk8x3K/exMsCi +yJTeRWuBBXytR27UMwA0uWwaSPNwPcBJ3aBYmKQddHm4BjKcI5cVWJsARxDRvF6+h+w2sOlJtv++ +xemPjpOfngdgxxEvVoEJL4VA0Gyd4O5fAdlMj1DN0u15ZDNOv1MJgI2uaqdR59G9m3iFOfLZHFhL +o7zC/MnTAPHNEs8HADDGkPMyJHEeSoED5D0bC8dfhz4EEIaKO7d/Iuh2mF2YIu1GL7AqYDqfjQGc +wwGstWAMU/k0w2H2gNcXBtDGEkrF6p+32dvZAKBYLFKtPALg7ffOcmw6AnDHVcBaS7sT8OvvawzH +DZ+bgbA2BD1JL1Qo2aGxXWbq+DsAPN2o4m8+ZrJ0hi0/zc6dBwB0g3A8gJQSv9EAGEAkABapDL2e +RCo1WJeBT6sdYoyKSi1CjPcGza6CvV0yWTlo71iAUEoaMQAIjDEopVFaI5WOPigj5uDmFwiau7T8 +HYzRTBdP0O00qfv3KczMkS+UxgNorfF9n1BuY4wdubNjTWTITp2g06yxVXnMdGmBTmOXdnud4pwh +ZwwA9d06Nvaf0YKQvb29lxMeKUiWVM6lXt/i6y8+G9o4R3nzKeXKU6SUowD9PjVazf8GMDAPqTRv +LpzCxBkrpShXynSCzvMBTuaqRwQAYRCgtaZWq+G6LpWtCkEv4NL3l8QIgBCCb766OPCH1w/6L7p2 +d+U3lFJIKXmy8YRWq8mVpSWxvLw8VAERZb64uHhkmfereeOX66z9s0ptr8bmxiaXL/0g1tfXE1CI +/ooF4uVP/SFmraW6XaVa3UZpza3rN8XS0o9HmuBre21HYv8CrF4Qpho05YEAAAAldEVYdGRhdGU6 +Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1vZGlmeQAy +MDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-8" + x="480" + y="236" /><image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAA +B3RJTUUH1gYMFyca8+vhYAAABBJJREFUWMPtlk1vG1UUhp87Y3scO05ip00TWlQVgUCCqLBECKlS +1Z/Br2ALq25A/AE2CKkqy0ZsWFWVQluVqhIUAlVbkRD1w3ESx07Gn+O5Xyxm7HHiNm5F1A090uie +e+/RvM85597RwGv7v5sAuLp81WJfvfKFcxdEKvIF58+df6X6136+BkAKwNoo/dXV1QRQiIHf3z84 +P2w8bG9xcXEwTx0k+/a7ywjh4AwDYLHGYqzFGIM1BmMMOh6Nida11vE8ebTWcVwUc/HLz/fp7QMQ +QpByXWreBziOQAgo5CS5nKbVFfgNB6kExli0sWhtYj8ZtbH79nUfzljmu7dHWjFSAdd1KeQ9XAfO +nOrw8YcuczMlGu0mt/7osPJgklATiVubCOukQn1/GNJYi9tzxgMIATkvTSEf8slZl/ff+pSUU2J+ +1ieTvkndl2ztTMQljYWGxfvrg70ElF3GA2AtE16aqXxIaWaClFMCHFwxQ7Eww7HiJq12ZtBTMzgb +yah7TWRzC2f6zL7WNK09HKB/erNeCmuzNFo+anYH15nFGp9m10epCXLZ9NChjEZrk8x3K/exMsCi +yJTeRWuBBXytR27UMwA0uWwaSPNwPcBJ3aBYmKQddHm4BjKcI5cVWJsARxDRvF6+h+w2sOlJtv++ +xemPjpOfngdgxxEvVoEJL4VA0Gyd4O5fAdlMj1DN0u15ZDNOv1MJgI2uaqdR59G9m3iFOfLZHFhL +o7zC/MnTAPHNEs8HADDGkPMyJHEeSoED5D0bC8dfhz4EEIaKO7d/Iuh2mF2YIu1GL7AqYDqfjQGc +wwGstWAMU/k0w2H2gNcXBtDGEkrF6p+32dvZAKBYLFKtPALg7ffOcmw6AnDHVcBaS7sT8OvvawzH +DZ+bgbA2BD1JL1Qo2aGxXWbq+DsAPN2o4m8+ZrJ0hi0/zc6dBwB0g3A8gJQSv9EAGEAkABapDL2e +RCo1WJeBT6sdYoyKSi1CjPcGza6CvV0yWTlo71iAUEoaMQAIjDEopVFaI5WOPigj5uDmFwiau7T8 +HYzRTBdP0O00qfv3KczMkS+UxgNorfF9n1BuY4wdubNjTWTITp2g06yxVXnMdGmBTmOXdnud4pwh +ZwwA9d06Nvaf0YKQvb29lxMeKUiWVM6lXt/i6y8+G9o4R3nzKeXKU6SUowD9PjVazf8GMDAPqTRv +LpzCxBkrpShXynSCzvMBTuaqRwQAYRCgtaZWq+G6LpWtCkEv4NL3l8QIgBCCb766OPCH1w/6L7p2 +d+U3lFJIKXmy8YRWq8mVpSWxvLw8VAERZb64uHhkmfereeOX66z9s0ptr8bmxiaXL/0g1tfXE1CI +/ooF4uVP/SFmraW6XaVa3UZpza3rN8XS0o9HmuBre21HYv8CrF4Qpho05YEAAAAldEVYdGRhdGU6 +Y3JlYXRlADIwMTgtMDgtMjNUMjI6MTQ6NTctMDY6MDAATcIIAAAAJXRFWHRkYXRlOm1vZGlmeQAy +MDA2LTA2LTEzVDA1OjM5OjI2LTA2OjAwewtT2wAAAABJRU5ErkJggg== +" + id="icon:32-4" + x="520" + y="236" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI +WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QsKEAcSNpSytgAAAbtJREFUOMud001rE0EYwPH/7Ns0 +3ZjUBaGlBaHgpYVcxKIXU+jJg59A6GconusxGIP1CwjeevUg0kC12B4K1Z5URA8q0kMiBZUmm263 +2ZnpYenqYgohAwPz+ntmhmdEvVFbA+4zWnlCvVEzWuuRar1RMw6AMYYHj56ytfNuqLBL1QVWV5YB +cACEEOzuf2bu5h0sy8K1FYWC4veRTaI0idIopQFIlGFr500eMMbg2IKg7DMzGXO3WiQoBWzsfuft +ez9DUkDT/uc0znnDsiwu+ZIb8zGzU4sI4XL7epdvB6dEJwKlU0Apk7vOX0AISuOSTmgTJy1cu8yf +oy6+nEA6oM8BfQEggGLBo314hdd7XwjKp3w9CCiOe2htaP/4xOTVOfSFgAUlX4IQ9I59ej2D54Dr +p2/0au8lhTGPmdn5wUDS7xN1DnOTBgMGtEmj7m8/px9Hg4FON+TZ+ov0LulutNaExxFhGFGZToeb +zSZ4lzPAymmexHYkCIe+FsSJwXHHqEyfZGumJhh8AoDFWxVaP38NyL1ruV7rw8f/gaXqAhub20On +cg4QQrC6spyl5zBFSpkB643HD++N+p3PALVY4ZaLQhKrAAAAAElFTkSuQmCC +" + id="icon:16-32" + x="560" + y="252" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEWIioX+/v79/f16hpg3 +R2L29vY/UW9hf6tjga1ohKpxjadffqpbe6hXeKZUdaRQcqNDVHBzjraPpq/c5bnu88ukuKltibNp +hrFlg69hgK1FVnKAmb3E0a/+/vn///7i676Bmrh4krl1kLdyjbZHV3OOo8S2xbL3+t/8/e7R3LGM +ocGInsGGnL+Dmr5IV3OarMqdr8ezwrfF0bGhs8OYq8mWqch9iZ2VqMeTpsZJWXOot9GouNKnt9Gm +ttGltdBRUVGGkaOis85FVG6fqbueqbqeqLqcp7mBipo9Tm09T207TGsvQmIjNlk4QVFBVHRAU3Q9 +UHE4TG40SGozR2qBjaJndY8AAADMon8sAAAAAWJLR0RWCg3piQAAAAlwSFlzAAAN1wAADdcBQiib +eAAAAAd0SU1FB9ULCgIIBrR0DRoAAACYSURBVBjTY2DAAIwoACjAxMwCB8ysIBVs7BycXNw8vHx8 +/CwgASYBQSFhEVExcQkJSYiAlLSMrJy8gqKSkjJEQEVVTV1DU0tbR0cXIqCnb2BoZGxiamZuARGw +tLK2trKxtbN3cIQIODkDgYurm729O0SAxcPT08PL28fe3hcq4OcfEBgUbA8EUIGQUBiACGA4nRUJ +MGF6HgAVTBZM9cwcgAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjow +MABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTEtMTBUMDk6MDg6MDYtMDc6MDBS4S64AAAA +AElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /><image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEWIioX+/v79/f16hpg3 +R2L29vY/UW9hf6tjga1ohKpxjadffqpbe6hXeKZUdaRQcqNDVHBzjraPpq/c5bnu88ukuKltibNp +hrFlg69hgK1FVnKAmb3E0a/+/vn///7i676Bmrh4krl1kLdyjbZHV3OOo8S2xbL3+t/8/e7R3LGM +ocGInsGGnL+Dmr5IV3OarMqdr8ezwrfF0bGhs8OYq8mWqch9iZ2VqMeTpsZJWXOot9GouNKnt9Gm +ttGltdBRUVGGkaOis85FVG6fqbueqbqeqLqcp7mBipo9Tm09T207TGsvQmIjNlk4QVFBVHRAU3Q9 +UHE4TG40SGozR2qBjaJndY8AAADMon8sAAAAAWJLR0RWCg3piQAAAAlwSFlzAAAN1wAADdcBQiib +eAAAAAd0SU1FB9ULCgIIBrR0DRoAAACYSURBVBjTY2DAAIwoACjAxMwCB8ysIBVs7BycXNw8vHx8 +/CwgASYBQSFhEVExcQkJSYiAlLSMrJy8gqKSkjJEQEVVTV1DU0tbR0cXIqCnb2BoZGxiamZuARGw +tLK2trKxtbN3cIQIODkDgYurm729O0SAxcPT08PL28fe3hcq4OcfEBgUbA8EUIGQUBiACGA4nRUJ +MGF6HgAVTBZM9cwcgAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjow +MABNwggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDUtMTEtMTBUMDk6MDg6MDYtMDc6MDBS4S64AAAA +AElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /></svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 1f8fe89cf8..a044bb7770 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -810,6 +810,9 @@ IDI_SHELL_VIDEO_FILE ICON resources/video.ico /* @makedep: resources/audio.ico */ IDI_SHELL_AUDIO_FILE ICON resources/audio.ico +/* @makedep: resources/image.ico */ +IDI_SHELL_IMAGE_FILE ICON resources/image.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1f132239b3..0339bc33d9 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -295,6 +295,7 @@ #define IDI_SHELL_DOCUMENTS 223 #define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_AUDIO_FILE 225 +#define IDI_SHELL_IMAGE_FILE 226 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_CARD_READER 229 #define IDI_SHELL_ZIP_DRIVE 230 -- 2.18.0

1 11

[PATCH 01/15] shell32: Add video file icon
by Alex Henrie 31 Aug '18

31 Aug '18

Adapted from video-x-generic in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/video.ico | Bin 0 -> 64287 bytes dlls/shell32/resources/video.svg | 783 +++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 788 insertions(+) create mode 100644 dlls/shell32/resources/video.ico create mode 100644 dlls/shell32/resources/video.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 74a3c13f2b..aad12636ce 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -98,4 +98,5 @@ SVG_SRCS = \ resources/trash_file.svg \ resources/trash_full.svg \ resources/update.svg \ + resources/video.svg \ resources/window.svg diff --git a/dlls/shell32/resources/video.ico b/dlls/shell32/resources/video.ico new file mode 100644 index 0000000000000000000000000000000000000000..2edeeeef3ab09ace3468a4e60891cb7c51c8e348 GIT binary patch literal 64287 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 literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/video.svg b/dlls/shell32/resources/video.svg new file mode 100644 index 0000000000..c7a0b9ed45 --- /dev/null +++ b/dlls/shell32/resources/video.svg @@ -0,0 +1,783 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + id="svg11300" + height="272" + width="632"> + <defs + id="defs3"> + <linearGradient + id="linearGradient7087"> + <stop + id="stop7089" + offset="0" + style="stop-color:#888a85;stop-opacity:1;" /> + <stop + id="stop7091" + offset="1" + style="stop-color:#b8b9b6;stop-opacity:1;" /> + </linearGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.99999998,0,0,0.66393398,1.2374365,9.8240947)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085" + xlink:href="#linearGradient7079" /> + <linearGradient + id="linearGradient7079"> + <stop + id="stop7081" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop7083" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <radialGradient + gradientTransform="translate(1.9716765,9.2201447)" + xlink:href="#aigrd4-3" + id="radialGradient6540" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3"> + <stop + id="stop6452-6" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + id="linearGradient7093" + xlink:href="#linearGradient7087" + gradientTransform="matrix(0.76096898,0,0,0.98666301,2.9050465,0.58427473)" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + id="linearGradient7060" + xlink:href="#linearGradient7054" + gradientTransform="matrix(0.950533,0,0,0.9375,1.4509965,3.3206247)" /> + <linearGradient + id="linearGradient7054"> + <stop + id="stop7056" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop7058" + offset="1" + style="stop-color:#ffffff;stop-opacity:0;" /> + </linearGradient> + <linearGradient + gradientTransform="matrix(0.88487799,0,0,0.88487801,5.3181165,5.9431647)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075" + xlink:href="#linearGradient7069" /> + <linearGradient + id="linearGradient7069"> + <stop + id="stop7071" + offset="0" + style="stop-color:#888a85;stop-opacity:1;" /> + <stop + id="stop7073" + offset="1" + style="stop-color:#888a85;stop-opacity:0;" /> + </linearGradient> + <linearGradient + gradientTransform="translate(6.5136719e-6,2.0000047)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="translate(1.6748048e-6,1.9999997)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144-5" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="matrix(0.884878,0,0,0.884878,5.3181217,5.9431597)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075-9" + xlink:href="#linearGradient7069" /> + <radialGradient + gradientTransform="translate(1.9716817,9.2201397)" + xlink:href="#aigrd4-3-3" + id="radialGradient6540-9" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3-3"> + <stop + id="stop6452-6-6" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7-0" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.663934,1.2374417,9.8240897)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085-6" + xlink:href="#linearGradient7079" /> + <linearGradient + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + gradientTransform="matrix(0.760969,0,0,0.986663,2.9050517,0.58426974)" + gradientUnits="userSpaceOnUse" + id="linearGradient1048" + xlink:href="#linearGradient7087" /> + <linearGradient + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + gradientTransform="matrix(0.950533,0,0,0.9375,1.4510017,3.3206197)" + gradientUnits="userSpaceOnUse" + id="linearGradient1050" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="translate(5.4928296e-7,2.0000038)" + gradientUnits="userSpaceOnUse" + y2="32.133045" + x2="26.625" + y1="32.133045" + x1="43.6875" + id="linearGradient7144-5-5" + xlink:href="#linearGradient7054" /> + <linearGradient + gradientTransform="matrix(0.88487802,0,0,0.88487802,5.3181239,5.9431621)" + gradientUnits="userSpaceOnUse" + y2="34.140205" + x2="40.820396" + y1="35.24506" + x1="46.54464" + id="linearGradient7075-9-2" + xlink:href="#linearGradient7069" /> + <linearGradient + y2="-4.5986342" + x2="21.107563" + y1="31.867859" + x1="21.03167" + gradientTransform="matrix(0.95053306,0,0,0.93750001,1.4509995,3.3206198)" + gradientUnits="userSpaceOnUse" + id="linearGradient1050-7" + xlink:href="#linearGradient7054" /> + <linearGradient + y2="25.772396" + x2="29.049412" + y1="12.75" + x1="23.816254" + gradientTransform="matrix(0.760969,0,0,0.98666303,2.9050524,0.584272)" + gradientUnits="userSpaceOnUse" + id="linearGradient1048-3" + xlink:href="#linearGradient7087" /> + <radialGradient + gradientTransform="translate(1.9716838,9.2201388)" + xlink:href="#aigrd4-3-3-9" + id="radialGradient6540-9-2" + gradientUnits="userSpaceOnUse" + cx="20.655508" + cy="24.735121" + fx="20.655508" + fy="24.735121" + r="14.1515" /> + <radialGradient + gradientUnits="userSpaceOnUse" + fy="22.6138" + fx="9.3417997" + r="14.1515" + cy="22.6138" + cx="9.3417997" + id="aigrd4-3-3-9"> + <stop + id="stop6452-6-6-3" + style="stop-color:#767676" + offset="0" /> + <stop + id="stop6454-7-0-1" + style="stop-color:#484848" + offset="1" /> + </radialGradient> + <radialGradient + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.66393399,1.2374433,9.8240901)" + r="21.566757" + fy="26.963573" + fx="23.157747" + cy="26.963573" + cx="23.157747" + id="radialGradient7085-6-9" + xlink:href="#linearGradient7079" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:title></dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>video</rdf:li> + <rdf:li>audio</rdf:li> + <rdf:li>multimedia</rdf:li> + <rdf:li>movie</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <ellipse + id="path7077" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="139.2869" + cy="154.96852" + rx="116.2039" + ry="77.271484" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028" + cx="129.07542" + cy="146.19809" + rx="99.679878" + ry="68.647804" /> + <ellipse + id="path7042" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="126.29389" + cy="132.6004" + rx="60.719406" + ry="44.601574" /> + <path + id="path6456" + d="m 255.83491,227.82128 c 0,0 -44.85,-20.16662 -73.57993,-17.62872 -30.62065,2.70491 -81.77403,4.51919 -101.824885,-27.19461 85.121765,25.71126 124.395075,-16.97591 182.006765,7.06674 0,0 -6.60195,37.75659 -6.60195,37.75659 z" + style="fill:url(#radialGradient6540);fill-rule:nonzero;stroke:#3b3d39;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7093);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026" + cx="129.07545" + cy="120.31272" + rx="60.477642" + ry="43.927044" /> + <path + id="path7012" + d="m 121.49844,46.999405 c -51.496905,2.83678 -92.102881,34.61625 -92.102882,73.020875 0,40.26326 44.656612,73.02089 99.679902,73.02089 55.02329,0 99.6799,-32.75764 99.6799,-73.02089 0,-40.263245 -44.65661,-73.020875 -99.6799,-73.020875 -0.21493,0 -0.45891,-0.001 -0.67351,0 -1.28267,0.006 -2.60195,-0.0412 -3.8727,0 -0.62049,0.0201 -1.23469,-0.0284 -1.85216,0 -0.4068,0.0187 -0.77316,-0.0223 -1.17865,0 z m -7.40864,11.80476 c 0.3408,-0.0276 0.66592,0.0187 1.01027,0 0.72256,-0.0393 1.45233,0 2.18891,0 15.71382,0 28.45592,9.18587 28.45592,20.40537 0,11.2195 -12.7421,20.23674 -28.45592,20.23674 -15.71381,0 -28.455913,-9.01724 -28.455913,-20.23674 0,-10.44295 11.056139,-19.25707 25.256733,-20.40537 z m 61.96318,24.79 c 0.35912,-0.0324 0.64757,0.0232 1.01027,0 0.62907,-0.0399 1.21306,0.0113 1.85216,0 0.25971,-0.005 0.41224,0 0.67351,0 16.72173,0 30.30808,9.79028 30.30808,21.754485 0,11.96421 -13.58635,21.58585 -30.30808,21.58585 -16.72173,1e-5 -30.30807,-9.62164 -30.30807,-21.58585 -10e-6,-11.051965 11.80955,-20.413775 26.77213,-21.754485 z M 72.500381,100.62674 c 1.173668,-0.0962 2.49488,0 3.70432,0 17.20092,0 31.149969,9.94217 31.149969,22.26041 0,12.31825 -13.949049,22.26041 -31.149969,22.26041 -17.200916,0 -31.149969,-9.94216 -31.149969,-22.26041 0,-11.45211 11.927126,-20.98865 27.445649,-22.26041 z m 62.131559,27.65688 c 0.12921,-0.0151 0.20712,0.014 0.33676,0 0.0145,-6.4e-4 0.15464,-1.8e-4 0.16838,0 0.014,2.4e-4 0.1535,5.3e-4 0.16837,0 0.0334,5.7e-4 0.15119,6.2e-4 0.16838,0 0.1409,9.6e-4 0.36375,-0.002 0.50514,0 0.0172,-4.2e-4 0.13481,-4.5e-4 0.16837,0 1.29841,-0.10675 2.53473,0 3.8727,0 19.02898,0 34.51754,10.95245 34.51754,24.62136 0,13.66891 -15.48856,24.79 -34.51754,24.79 -19.02898,0 -34.51753,-11.12109 -34.51753,-24.79 0,-12.31456 12.7237,-22.71216 29.12943,-24.62136 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient7060);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="129.28571" + cy="119.43317" + rx="94.611595" + ry="67.970284" /> + <path + id="path7067" + d="m 260.41047,191.49053 -5.82757,32.64854 c -14.05766,-4.72426 -22.53331,-8.46249 -38.10017,-12.17906 l 1.78793,-26.51092 c 10.22948,-1.08634 26.20385,0.76487 42.13981,6.04144 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136" + d="m 260.41047,190.51158 -1.01027,4.7219 c -43.67003,-16.34527 -83.87156,-1.22348 -125.94691,0 57.17345,-4.7628 75.91968,-20.0514 126.95718,-4.7219 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <ellipse + id="path7077-1" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="296.39474" + cy="247.72609" + rx="21.566757" + ry="14.318913" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028-8" + cx="294.49957" + cy="246.10088" + rx="18.499996" + ry="12.720889" /> + <ellipse + id="path7042-7" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="293.98334" + cy="243.58113" + rx="11.269162" + ry="8.2649651" /> + <path + id="path6456-9" + d="m 318.02537,261.22618 c 0,0 -8.32389,-3.73701 -13.65599,-3.26672 -5.68302,0.50124 -15.17678,0.83743 -18.8981,-5.03934 15.7981,4.76446 23.08699,-3.14575 33.77938,1.30951 0,0 -1.22529,6.99655 -1.22529,6.99655 z" + style="fill:url(#radialGradient6540-9);fill-rule:nonzero;stroke:#3b3d39;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1048);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026-2" + cx="294.49957" + cy="241.30414" + rx="11.224293" + ry="8.1399698" /> + <path + id="path7012-0" + d="m 293.09332,227.71869 c -9.55752,0.52568 -17.09375,6.41462 -17.09375,13.53125 0,7.46105 8.288,13.53125 18.5,13.53125 10.212,0 18.5,-6.0702 18.5,-13.53125 0,-7.46104 -8.288,-13.53125 -18.5,-13.53125 -0.0399,0 -0.0852,-1.8e-4 -0.125,0 -0.23806,0.001 -0.48291,-0.008 -0.71875,0 -0.11516,0.004 -0.22915,-0.005 -0.34375,0 -0.0755,0.004 -0.14349,-0.004 -0.21875,0 z m -1.375,2.1875 c 0.0632,-0.005 0.12359,0.004 0.1875,0 0.1341,-0.007 0.26954,0 0.40625,0 2.91639,0 5.28125,1.70221 5.28125,3.78125 0,2.07905 -2.36486,3.75 -5.28125,3.75 -2.91639,0 -5.28125,-1.67095 -5.28125,-3.75 0,-1.93515 2.05195,-3.56846 4.6875,-3.78125 z m 11.5,4.59375 c 0.0667,-0.006 0.12019,0.004 0.1875,0 0.11675,-0.007 0.22514,0.002 0.34375,0 0.0482,-8.7e-4 0.0765,0 0.125,0 3.10345,0 5.625,1.81421 5.625,4.03125 0,2.21705 -2.52155,4 -5.625,4 -3.10345,0 -5.625,-1.78295 -5.625,-4 0,-2.048 2.19178,-3.7828 4.96875,-4.03125 z m -19.21875,3.15625 c 0.21783,-0.0178 0.46304,0 0.6875,0 3.19239,0 5.78125,1.84235 5.78125,4.125 0,2.28265 -2.58886,4.125 -5.78125,4.125 -3.19239,0 -5.78125,-1.84235 -5.78125,-4.125 0,-2.12215 2.2136,-3.88933 5.09375,-4.125 z m 11.53125,5.125 c 0.024,-0.003 0.0384,0.003 0.0625,0 0.003,-1.1e-4 0.0287,-3e-5 0.0312,0 0.003,5e-5 0.0285,1e-4 0.0312,0 0.006,1.1e-4 0.0281,1.2e-4 0.0312,0 0.0262,1.8e-4 0.0675,-3.8e-4 0.0937,0 0.003,-7e-5 0.025,-8e-5 0.0312,0 0.24098,-0.0198 0.47043,0 0.71875,0 3.53167,0 6.40625,2.02956 6.40625,4.5625 0,2.53294 -2.87458,4.59375 -6.40625,4.59375 -3.53167,0 -6.40625,-2.06081 -6.40625,-4.59375 0,-2.28197 2.36144,-4.20871 5.40625,-4.5625 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044-2" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1050);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="294.53857" + cy="241.14116" + rx="17.559353" + ry="12.59534" /> + <path + id="path7067-3" + d="m 318.87457,254.49385 -1.08156,6.04999 c -2.60902,-0.87544 -4.18205,-1.56816 -7.07117,-2.25686 l 0.33183,-4.91265 c 1.89853,-0.2013 4.86328,0.14174 7.8209,1.11952 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136-7" + d="m 318.87457,254.31244 -0.1875,0.875 c -8.1049,-3.02888 -15.56606,-0.22672 -23.375,0 10.61105,-0.88258 14.09024,-3.71565 23.5625,-0.875 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +VrtF222TxAme51Gt1mg1uyFp6AZCSKIowvM8oigijuM7JgEhBAMDA2zbvo3dD+1iZHSUxaVFfvKv +//Lp50KHDx9mbO8uZRg6Q9uHKRSLCCFwXY+33noL13Xp6+3HXq8TDF1HNwykFCSJIo4igjAkCqP1 +0bnzc9Pwm5/fBACwHRvHsclmHRzHIU4iJibeu/+jxZf+5q8pForKsgx6ewcol8tomsb58xc4c+Y0 +ppmikCuQy+cxDXP9WEWhlCJJkk2NvxvIHYkqBE7WWTe+C7FyY4WPz0+Kz3Q2Ojrax9PPHCaXdZSU +GrbtkMvlyKTTVGs1Ji9OsrK0gmmaWFYaXdfR9W4NrBKFApIkJgojojjaKPyTJOHWjl9snHLclKZp +ZHNdz9+EuHjpEnPXFj4bwCf13HNPs314GCudVoZuws1DLakR+B28jo/rufgdnzDsVlRJoroAUbzx +jFBdDyNZrykEEgFCoGsaumaQyWTWRyCL49g4WZuTp04hlS703xbg7bffBd7tugzYv38/W7b0ksnY +aGb3xXEco+KEjusyP7/M5OTkfff/1FNPEYuYKIpVJ/AIogDd0MnlsggBbtvj3V/+6vP/wfH70Fee ++wqmr4EUyjRMevt6mZ9f4FfvnPjtQ+iL0sFnDqIlUimFOPHuiS/anAd6oAf6f6//BS95WkgntXrp +AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVi +bGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2Rv +bWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI5VDIxOjQ1OjA1 +LTA2OjAwCN7M2wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yOVQyMTo0NTowNS0wNjowMHmD +dGcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0 +cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAE3RFWHRUaXRsZQBHZW5lcmljIFZpZGVvLHad +gQAAAABJRU5ErkJggg== +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +VrtF222TxAme51Gt1mg1uyFp6AZCSKIowvM8oigijuM7JgEhBAMDA2zbvo3dD+1iZHSUxaVFfvKv +//Lp50KHDx9mbO8uZRg6Q9uHKRSLCCFwXY+33noL13Xp6+3HXq8TDF1HNwykFCSJIo4igjAkCqP1 +0bnzc9Pwm5/fBACwHRvHsclmHRzHIU4iJibeu/+jxZf+5q8pForKsgx6ewcol8tomsb58xc4c+Y0 +ppmikCuQy+cxDXP9WEWhlCJJkk2NvxvIHYkqBE7WWTe+C7FyY4WPz0+Kz3Q2Ojrax9PPHCaXdZSU +GrbtkMvlyKTTVGs1Ji9OsrK0gmmaWFYaXdfR9W4NrBKFApIkJgojojjaKPyTJOHWjl9snHLclKZp +ZHNdz9+EuHjpEnPXFj4bwCf13HNPs314GCudVoZuws1DLakR+B28jo/rufgdnzDsVlRJoroAUbzx +jFBdDyNZrykEEgFCoGsaumaQyWTWRyCL49g4WZuTp04hlS703xbg7bffBd7tugzYv38/W7b0ksnY +aGb3xXEco+KEjusyP7/M5OTkfff/1FNPEYuYKIpVJ/AIogDd0MnlsggBbtvj3V/+6vP/wfH70Fee ++wqmr4EUyjRMevt6mZ9f4FfvnPjtQ+iL0sFnDqIlUimFOPHuiS/anAd6oAf6f6//BS95WkgntXrp +AAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdodABDQzAgUHVi +bGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3JnL3B1YmxpY2Rv +bWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI5VDIxOjQ1OjA1 +LTA2OjAwCN7M2wAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yOVQyMTo0NTowNS0wNjowMHmD +dGcAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRTb3VyY2UAaHR0 +cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAE3RFWHRUaXRsZQBHZW5lcmljIFZpZGVvLHad +gQAAAABJRU5ErkJggg== +" + id="icon:48-4" + x="384" + y="220" /> + <ellipse + id="path7077-1-8" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#radialGradient7085-6-9);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="456.17224" + cy="254.37633" + rx="14.28721" + ry="9.4764519" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#a1a39f;fill-opacity:1;fill-rule:evenodd;stroke:#6d6f6a;stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7028-8-4" + cx="454.91672" + cy="253.30074" + rx="12.255589" + ry="8.4188576" /> + <ellipse + id="path7042-7-5" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.97567552;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="454.57474" + cy="251.63313" + rx="7.4654193" + ry="5.4698663" /> + <path + id="path6456-9-0" + d="m 470.50174,263.31088 c 0,0 -5.51429,-2.4732 -9.04662,-2.16196 -3.76479,0.33173 -10.05407,0.55423 -12.51931,-3.3351 10.46568,3.15319 15.2943,-2.0819 22.37764,0.86665 0,0 -0.81171,4.63041 -0.81171,4.63041 z" + style="fill:url(#radialGradient6540-9-2);fill-rule:nonzero;stroke:#3b3d39;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1048-3);fill-opacity:1;fill-rule:evenodd;stroke:#757972;stroke-width:1.06933594;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="path7026-2-3" + cx="454.91672" + cy="250.12619" + rx="7.4356947" + ry="5.3871427" /> + <path + id="path7012-0-6" + d="m 453.98514,241.13517 c -6.33152,0.3479 -11.32401,4.24528 -11.32401,8.95517 0,4.93782 5.49051,8.95516 12.2556,8.95516 6.76509,0 12.25559,-4.01734 12.25559,-8.95516 0,-4.93782 -5.4905,-8.95517 -12.25559,-8.95517 -0.0264,0 -0.0564,-1.2e-4 -0.0828,0 -0.15771,6.6e-4 -0.31991,-0.005 -0.47615,0 -0.0763,0.003 -0.1518,-0.003 -0.22772,0 -0.05,0.003 -0.095,-0.003 -0.14491,0 z m -0.91089,1.44772 c 0.0419,-0.003 0.0819,0.003 0.12421,0 0.0888,-0.005 0.17856,0 0.26913,0 1.932,0 3.49864,1.12654 3.49864,2.50248 0,1.37594 -1.56664,2.4818 -3.49864,2.4818 -1.93201,0 -3.49864,-1.10586 -3.49864,-2.4818 0,-1.28071 1.35935,-2.36165 3.1053,-2.50248 z m 7.61834,3.0402 c 0.0442,-0.004 0.0796,0.003 0.12422,0 0.0773,-0.005 0.14914,0.001 0.22772,0 0.0319,-5.7e-4 0.0507,0 0.0828,0 2.05592,0 3.72636,1.20067 3.72636,2.66794 0,1.46727 -1.67044,2.64726 -3.72636,2.64726 -2.05592,0 -3.72636,-1.17999 -3.72636,-2.64726 0,-1.35539 1.45197,-2.50351 3.29162,-2.66794 z m -12.73174,2.08885 c 0.14431,-0.0118 0.30675,0 0.45544,0 2.11485,0 3.82988,1.2193 3.82988,2.72999 0,1.51068 -1.71503,2.72998 -3.82988,2.72998 -2.11484,0 -3.82986,-1.2193 -3.82986,-2.72998 0,-1.40447 1.46642,-2.57402 3.37442,-2.72999 z m 7.63904,3.3918 c 0.0159,-0.002 0.0254,0.002 0.0414,0 0.002,-7e-5 0.019,-2e-5 0.0207,0 0.002,3e-5 0.0189,6e-5 0.0207,0 0.004,7e-5 0.0186,8e-5 0.0207,0 0.0174,1.2e-4 0.0447,-2.5e-4 0.0621,0 0.002,-5e-5 0.0166,-5e-5 0.0207,0 0.15964,-0.0131 0.31164,0 0.47614,0 2.33961,0 4.24391,1.34319 4.24391,3.01952 0,1.67634 -1.9043,3.04021 -4.24391,3.04021 -2.3396,0 -4.24391,-1.36387 -4.24391,-3.04021 0,-1.51024 1.56437,-2.78538 3.58144,-3.01952 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <ellipse + id="path7044-2-1" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient1050-7);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + cx="454.94257" + cy="250.01833" + rx="11.632446" + ry="8.3357677" /> + <path + id="path7067-3-0" + d="m 471.06429,258.85534 -0.71648,4.00396 c -1.72839,-0.57938 -2.77047,-1.03783 -4.68441,-1.49362 l 0.21983,-3.25126 c 1.25771,-0.13322 3.22175,0.0938 5.18106,0.74092 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient7075-9-2);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <path + id="path7136-7-6" + d="m 471.06429,258.73528 -0.12421,0.57908 c -5.3692,-2.00455 -10.31196,-0.15004 -15.4851,0 7.02944,-0.5841 9.33428,-2.45906 15.60931,-0.57908 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.70329674;fill:url(#linearGradient7144-5-5);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +SUVORK5CYII= +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +SUVORK5CYII= +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI +WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDDonMwh5AwAAADV0RVh0Q29tbWVudAAoYykgMjAw +NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAACg0lEQVQ4y52T30tT +YRjHP+ec6ZxnxjbEmw3NYrpjWmpqGSpECf2gCNb02qsu6loEqTtB/AdCCIzubAai+CvNQL0QkpLQ +nbOoC/XCaTGlneN25qZduEnaTfXcvO8Lz/Pheb/f5xE4Fb19PR1AAKgDXEAUWAKCXZ3dA6fzhd8K +LwL9NdW1VxVFQc6Xj5OMPQNVVfm0/HEReNTV2f35BCBTPB3wtxXZC+zoRgwzmSB9kEYSJay5edjl +AvSYTvDN622gNQsRM6D+gL+tSJAgpK2wvrGGmTQBMJMm6xtrhLQVBAkC/rYioD/bgdTb19NRU137 +uLikmK/fvrC/v08opBLWwnjLvExOTBGN7uByOYnpMdxuDwKCp7KqYn1menZZBAKKoqAbMQA0Lcz8 +3AKGbhz9XzeYn1tA08IA6EYMRVHICI0FqJPzZbZ+/MThdBCPx1EUH/cf3AM4PuPxOA6nAzOZwHHG +ScYlLBmrSB+ksVgs3Ll7+4RNVquVQPvD43f6IJ29urIiRgEkUSKVSjE+NkFwcAjTzIhomgQHhxgf +myCVSiGJUhYQzQKWjD0Da24euzu72Gw2VFVjZHgUgJHhUVRVw2azsbuzizU3D2PPIDNciEBQVVXs +cgEAPl85zS1NyPajQZLtMs0tTfh85QDY5QJUVQUIAkgz07PLlVUVt7znvR6H00FMjyEIAg1X6hFF +kdJzpUQ2I6yvbdDYeI1kIsm79zOLXZ3dTwAkgJutNz6E1FV/he+C7HZ7KCwsBODw8JAcSw5l3nLq +6xpIJpK8fDUQjUS2np0tLbGGVtXNf9qFqbeTX7e3v0+ZpnkdmANeCP+zjYF2/2XgOTD6B+BvI9Du +fwpc+gUuhglRSTLyIQAAAABJRU5ErkJggg== +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAV1BMVEUAAACIioVqbGhVV1OI +ioW5urfi4+Dt7evd3dvp6ufd39rW2dLT18/e4Nu/wrvP08u6vbaSlY+JjIZVV1N+gHvM0MiprKaY +m5WLjYh9f3pydG9cXloAAABrterCAAAABHRSTlMAAAAAs5NmmgAAAAFiS0dEAIgFHUgAAAAJcEhZ +cwAACxMAAAsTAQCanBgAAAAHdElNRQfWAhQUDiATysDQAAAAgElEQVQY022P2Q7DIAwEoRjM4ZiA +Sc///8+SBClN23lcjexdpToaVrQaaLAOEZ0dkQYfYqIUg98T8BNzpsw8eVgFG3gulWqZOdiugItc +pFGTwtF1BTDl2hZaWs0Jt4AO8K/xfePny9bj2nvc7nuPz6aPizlteb5EjDqtNSM4MPIGY+0ISe9t +J8gAAAA1dEVYdENvbW1lbnQAKGMpIDIwMDQgSmFrdWIgU3RlaW5lcgoKQ3JlYXRlZCB3aXRoIFRo +ZSBHSU1QkNmLbwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABN +wggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDItMjFUMDM6MTQ6MzItMDc6MDDLd46aAAAAAElF +TkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAV1BMVEUAAACIioVqbGhVV1OI +ioW5urfi4+Dt7evd3dvp6ufd39rW2dLT18/e4Nu/wrvP08u6vbaSlY+JjIZVV1N+gHvM0MiprKaY +m5WLjYh9f3pydG9cXloAAABrterCAAAABHRSTlMAAAAAs5NmmgAAAAFiS0dEAIgFHUgAAAAJcEhZ +cwAACxMAAAsTAQCanBgAAAAHdElNRQfWAhQUDiATysDQAAAAgElEQVQY022P2Q7DIAwEoRjM4ZiA +Sc///8+SBClN23lcjexdpToaVrQaaLAOEZ0dkQYfYqIUg98T8BNzpsw8eVgFG3gulWqZOdiugItc +pFGTwtF1BTDl2hZaWs0Jt4AO8K/xfePny9bj2nvc7nuPz6aPizlteb5EjDqtNSM4MPIGY+0ISe9t +J8gAAAA1dEVYdENvbW1lbnQAKGMpIDIwMDQgSmFrdWIgU3RlaW5lcgoKQ3JlYXRlZCB3aXRoIFRo +ZSBHSU1QkNmLbwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxOC0wOC0yM1QyMjoxNDo1Ny0wNjowMABN +wggAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMDYtMDItMjFUMDM6MTQ6MzItMDc6MDDLd46aAAAAAElF +TkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 6dad8bc574..806e8ef64f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -804,6 +804,9 @@ IDI_SHELL_DVD ICON resources/optical_disc.ico /* @makedep: resources/document.ico */ IDI_SHELL_DOCUMENTS ICON resources/document.ico +/* @makedep: resources/video.ico */ +IDI_SHELL_VIDEO_FILE ICON resources/video.ico + /* FIXME: Following resource is not yet added */ /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD_95 ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 1c28a06dc8..38e444c361 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -293,6 +293,7 @@ #define IDI_SHELL_POWER_OFF 221 #define IDI_SHELL_DVD 222 #define IDI_SHELL_DOCUMENTS 223 +#define IDI_SHELL_VIDEO_FILE 224 #define IDI_SHELL_MUSIC_CD_95 228 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_MY_PICTURES 236 -- 2.18.0

2 16

[PATCH] kernel32: Fallback to default comspec when %COMSPEC% is not set.
by Alistair Leslie-Hughes 31 Aug '18

31 Aug '18

From: Qian Hong <qhong(a)codeweavers.com> Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=19801 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/kernel32/process.c | 6 +++++- programs/cmd/wcmdmain.c | 10 ++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7ac7477..85e0042 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2206,6 +2206,7 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L { static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; + static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; static const WCHAR slashscW[] = {' ','/','s','/','c',' ',0}; static const WCHAR quotW[] = {'"',0}; WCHAR comspec[MAX_PATH]; @@ -2213,7 +2214,10 @@ static BOOL create_cmd_process( LPCWSTR filename, LPWSTR cmd_line, LPVOID env, L BOOL ret; if (!GetEnvironmentVariableW( comspecW, comspec, ARRAY_SIZE( comspec ))) - return FALSE; + { + GetSystemDirectoryW( comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR) ); + strcatW( comspec, cmdW ); + } if (!(newcmdline = HeapAlloc( GetProcessHeap(), 0, (strlenW(comspec) + 7 + strlenW(cmd_line) + 2) * sizeof(WCHAR)))) return FALSE; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 7a7ee16..66a5ac0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2400,10 +2400,20 @@ int wmain (int argc, WCHAR *argvW[]) static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; + static const WCHAR comspecW[] = {'C','O','M','S','P','E','C',0}; + static const WCHAR cmdW[] = {'\\','c','m','d','.','e','x','e',0}; + WCHAR comspec[MAX_PATH]; CMD_LIST *toExecute = NULL; /* Commands left to be executed */ OSVERSIONINFOW osv; char osver[50]; + if (!GetEnvironmentVariableW(comspecW, comspec, sizeof(comspec)/sizeof(WCHAR))) + { + GetSystemDirectoryW(comspec, (sizeof(comspec) - sizeof(cmdW))/sizeof(WCHAR)); + strcatW(comspec, cmdW); + SetEnvironmentVariableW(comspecW, comspec); + } + srand(time(NULL)); /* Get the windows version being emulated */ -- 1.9.1

1 0

[PATCH] include: Add MmIsAddressValid to header
by Alistair Leslie-Hughes 31 Aug '18

31 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- include/ddk/ntddk.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 5c124ca..e76ccc9 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -214,6 +214,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ PCONFIGURATION_TYPE,PULONG,PIO_QUERY_DEVICE_ROUTINE,PVOID); void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); +BOOLEAN WINAPI MmIsAddressValid(void *); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); -- 1.9.1

1 0

[PATCH 1/3] include: Add IOpcPackage definition.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/opcbase.idl | 15 ++++ include/opcobjectmodel.idl | 174 +++++++++++++++++++++++++++++++++++++ 2 files changed, 189 insertions(+) diff --git a/include/opcbase.idl b/include/opcbase.idl index fc92675420..33f56ac077 100644 --- a/include/opcbase.idl +++ b/include/opcbase.idl @@ -25,3 +25,18 @@ typedef [v1_enum] enum OPC_STREAM_IO_READ = 1, OPC_STREAM_IO_WRITE = 2, } OPC_STREAM_IO_MODE; + +typedef [v1_enum] enum +{ + OPC_COMPRESSION_NONE = -1, + OPC_COMPRESSION_NORMAL = 0, + OPC_COMPRESSION_MAXIMUM = 1, + OPC_COMPRESSION_FAST = 2, + OPC_COMPRESSION_SUPERFAST = 3, +} OPC_COMPRESSION_OPTIONS; + +typedef [v1_enum] enum +{ + OPC_URI_TARGET_MODE_INTERNAL = 0, + OPC_URI_TARGET_MODE_EXTERNAL = 1, +} OPC_URI_TARGET_MODE; diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl index e5370d2e54..45bc8aa4a5 100644 --- a/include/opcobjectmodel.idl +++ b/include/opcobjectmodel.idl @@ -20,6 +20,11 @@ #pragma makedep install #endif +interface IOpcPart; +interface IOpcPartUri; +interface IOpcUri; +interface IOpcRelationship; + typedef [v1_enum] enum { OPC_READ_DEFAULT = 0, @@ -32,3 +37,172 @@ typedef [v1_enum] enum OPC_WRITE_DEFAULT = 0, OPC_WRITE_FORCE_ZIP32 = 1, } OPC_WRITE_FLAGS; + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee75), + pointer_default(ref) +] +interface IOpcPartEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcPart **part + ); + + HRESULT Clone( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee76), + pointer_default(ref) +] +interface IOpcRelationshipEnumerator : IUnknown +{ + HRESULT MoveNext( + [out, retval] BOOL *has_next + ); + + HRESULT MovePrevious( + [out, retval] BOOL *has_previous + ); + + HRESULT GetCurrent( + [out, retval] IOpcRelationship **relationship + ); + + HRESULT Clone( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee73), + pointer_default(ref) +] +interface IOpcPartSet : IUnknown +{ + HRESULT GetPart( + [in] IOpcPartUri *name, + [out, retval] IOpcPart **part + ); + + HRESULT CreatePart( + [in] IOpcPartUri *name, + [in, string] LPCWSTR content_type, + [in] OPC_COMPRESSION_OPTIONS compression_options, + [out, retval] IOpcPart **part + ); + + HRESULT DeletePart( + [in] IOpcPartUri *name + ); + + HRESULT PartExists( + [in] IOpcPartUri *name, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcPartEnumerator **enumerator + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee72), + pointer_default(ref) +] +interface IOpcRelationship : IUnknown +{ + HRESULT GetId( + [out, string, retval] LPWSTR *id + ); + + HRESULT GetRelationshipType( + [out, string, retval] LPWSTR *type + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **uri + ); + + HRESULT GetTargetUri( + [out, retval] IUri **target + ); + + HRESULT GetTargetMode( + [out, retval] OPC_URI_TARGET_MODE *target_mode + ); +} + + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee74), + pointer_default(ref) +] +interface IOpcRelationshipSet : IUnknown +{ + HRESULT GetRelationship( + [in, string] LPCWSTR id, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT CreateRelationship( + [in, string, unique] LPCWSTR id, + [in, string] LPCWSTR type, + [in] IUri *target_uri, + [in] OPC_URI_TARGET_MODE target_mode, + [out, retval] IOpcRelationship **relationship + ); + + HRESULT DeleteRelationship( + [in, string] LPCWSTR id + ); + + HRESULT RelationshipExists( + [in, string] LPCWSTR id, + [out, retval] BOOL *exists + ); + + HRESULT GetEnumerator( + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetEnumeratorForType( + [in, string] LPCWSTR type, + [out, retval] IOpcRelationshipEnumerator **enumerator + ); + + HRESULT GetRelationshipsContentStream( + [out, retval] IStream **stream + ); +} + +[ + object, + uuid(42195949-3b79-4fc8-89c6-fc7fb979ee70), + pointer_default(ref) +] +interface IOpcPackage : IUnknown +{ + HRESULT GetPartSet( + [out, retval] IOpcPartSet **part_set + ); + + HRESULT GetRelationshipSet( + [out, retval] IOpcRelationshipSet **relationship_set + ); +} -- 2.18.0

1 2

[PATCH 1/4] shlwapi/tests: Add a simple QI test for file streams.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shlwapi/tests/istream.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 300e9b9c00..f1854a283f 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -247,6 +247,27 @@ static void test_stream_read_write(IStream *stream, DWORD mode) ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got %02x%02x\n", buf[0], buf[1]); } +static void test_stream_qi(IStream *stream) +{ + IUnknown *unk; + HRESULT hr; + + hr = IStream_QueryInterface(stream, &IID_IStream, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IStream interface, hr %#x.\n", hr); + IUnknown_Release(unk); + + unk = NULL; + hr = IStream_QueryInterface(stream, &IID_ISequentialStream, (void **)&unk); +todo_wine + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* XP */, "Failed to get ISequentialStream interface, hr %#x.\n", hr); + if (unk) + IUnknown_Release(unk); + + hr = IStream_QueryInterface(stream, &IID_IUnknown, (void **)&unk); + ok(SUCCEEDED(hr), "Failed to get IUnknown interface, hr %#x.\n", hr); + IUnknown_Release(unk); +} + static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) { IStream * stream; @@ -310,6 +331,7 @@ if (0) /* This test crashes on WinXP SP2 */ ok(stream != NULL, "SHCreateStreamOnFileA: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -422,6 +444,7 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileW: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); @@ -551,6 +574,7 @@ static void test_SHCreateStreamOnFileEx(DWORD mode, DWORD stgm) ok(stream != NULL, "SHCreateStreamOnFileEx: expected a valid IStream object, got NULL\n"); if (stream) { + test_stream_qi(stream); test_IStream_invalid_operations(stream, mode); refcount = IStream_Release(stream); -- 2.18.0

1 3

[PATCH 1/3] kernel32/tests: Test ReplaceFileW on open "exe"
by Brock York 30 Aug '18

30 Aug '18

Replicate the scenario of an exe calling ReplaceFileW on itself. An exe calling ReplaceFileW on itself will fail in Wine currently but succeed in Windows 7. This seems to be the problem seen in bug 33845. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4157279b..d496e9273b 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, -- 2.18.0

2 8

[PATCH vkd3d 1/3] vkd3d: Use vkd3d_create_vk_buffer_view() to create counter resource views.
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d97c3dbeb88b..7dc7b384b57e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1590,11 +1590,16 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (counter_resource) { + const struct vkd3d_format *format; + assert(d3d12_resource_is_buffer(counter_resource)); assert(desc->u.Buffer.StructureByteStride); - if (!vkd3d_create_buffer_view(device, counter_resource, DXGI_FORMAT_R32_UINT, - desc->u.Buffer.CounterOffsetInBytes / sizeof(uint32_t), 1, 0, 0, &view->vk_counter_view)) + + format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); + if (!vkd3d_create_vk_buffer_view(device, counter_resource, format, + desc->u.Buffer.CounterOffsetInBytes, sizeof(uint32_t), &view->vk_counter_view)) { + WARN("Failed to create counter buffer view.\n"); view->vk_counter_view = VK_NULL_HANDLE; d3d12_desc_destroy(descriptor, device); } -- 2.16.4

2 1

[PATCH vkd3d 3/3] vkd3d: Return bool from vkd3d_create_texture_view().
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> For consistency with vkd3d_create_buffer_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 4772b3f10dbf..219b95c37194 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1341,7 +1341,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } -static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, +static bool vkd3d_create_texture_view(struct d3d12_device *device, struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -1369,18 +1369,18 @@ static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) { WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return hresult_from_vk_result(vr); + return false; } if (!(object = vkd3d_view_create())) { VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); - return E_OUTOFMEMORY; + return false; } object->u.vk_image_view = vk_view; *view = object; - return S_OK; + return true; } void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, @@ -1541,7 +1541,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; @@ -1663,7 +1663,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; @@ -1913,7 +1913,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; @@ -1985,7 +1985,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev } } - if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) + if (!vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view)) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; -- 2.16.4

2 1

[PATCH vkd3d 2/3] vkd3d: Create vkd3d_views in vkd3d_create_buffer_view().
by Józef Kucia 30 Aug '18

30 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7dc7b384b57e..4772b3f10dbf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1206,10 +1206,13 @@ static bool vkd3d_create_vk_buffer_view(struct d3d12_device *device, static bool vkd3d_create_buffer_view(struct d3d12_device *device, struct d3d12_resource *resource, DXGI_FORMAT view_format, unsigned int offset, unsigned int size, unsigned int structure_stride, - unsigned int flags, VkBufferView *vk_view) + unsigned int flags, struct vkd3d_view **view) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format; + struct vkd3d_view *object; unsigned int element_size; + VkBufferView vk_view; if (view_format == DXGI_FORMAT_R32_TYPELESS && (flags & VKD3D_VIEW_RAW_BUFFER)) { @@ -1231,8 +1234,19 @@ static bool vkd3d_create_buffer_view(struct d3d12_device *device, return false; } - return vkd3d_create_vk_buffer_view(device, resource, format, - offset * element_size, size * element_size, vk_view); + if (!vkd3d_create_vk_buffer_view(device, resource, format, + offset * element_size, size * element_size, &vk_view)) + return false; + + if (!(object = vkd3d_view_create())) + { + VK_CALL(vkDestroyBufferView(device->vk_device, vk_view, NULL)); + return false; + } + + object->u.vk_buffer_view = vk_view; + *view = object; + return true; } static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, @@ -1419,6 +1433,7 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1432,18 +1447,11 @@ static void vkd3d_create_buffer_srv(struct d3d12_desc *descriptor, return; } - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_srv_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER; @@ -1555,6 +1563,7 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { struct vkd3d_view *view; + unsigned int flags; if (!desc) { @@ -1571,18 +1580,11 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ if (desc->u.Buffer.CounterOffsetInBytes) FIXME("Ignoring counter offset %"PRIu64".\n", desc->u.Buffer.CounterOffsetInBytes); - if (!(view = vkd3d_view_create())) - return; - + flags = vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags); if (!vkd3d_create_buffer_view(device, resource, desc->Format, desc->u.Buffer.FirstElement, desc->u.Buffer.NumElements, - desc->u.Buffer.StructureByteStride, - vkd3d_view_flags_from_d3d12_buffer_uav_flags(desc->u.Buffer.Flags), - &view->u.vk_buffer_view)) - { - vkd3d_free(view); + desc->u.Buffer.StructureByteStride, flags, &view)) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; -- 2.16.4

2 1

[PATCH 3/3] wined3d: Use get_format_internal() in init_format_filter_info().
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5720cabba99e..d75cbc1a1645 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3330,7 +3330,7 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; - unsigned int fmt_idx, i; + unsigned int i; static const enum wined3d_format_id fmts16[] = { WINED3DFMT_R16_FLOAT, @@ -3339,8 +3339,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, }; BOOL filtered; + /* This was already handled by init_format_texture_info(). */ if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) - /* This was already handled by init_format_texture_info(). */ return; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3367,8 +3367,8 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, { for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format = get_format_internal(adapter, fmts16[i]); + format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } } return; @@ -3376,19 +3376,19 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { - fmt_idx = get_format_idx(fmts16[i]); - format = &adapter->formats[fmt_idx]; - if (!format->glInternal) continue; /* Not supported by GL */ + format = get_format_internal(adapter, fmts16[i]); + if (!format->glInternal) + continue; /* Not supported by GL */ - filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, format->glInternal); if (filtered) { - TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s supports filtering.\n", debug_d3dformat(format->id)); format_set_flag(format, WINED3DFMT_FLAG_FILTERING); } else { - TRACE("Format %s does not support filtering\n", debug_d3dformat(fmts16[i])); + TRACE("Format %s does not support filtering.\n", debug_d3dformat(format->id)); } } } -- 2.16.4

2 1

[PATCH 2/3] wined3d: Use get_format_internal() in apply_format_fixups().
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 198 +++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bc225878e5e8..5720cabba99e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3395,27 +3395,27 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_gl_info *gl_info) { + struct wined3d_format *format; unsigned int i; - int idx; - idx = get_format_idx(WINED3DFMT_R16_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R32_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R32_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R16G16_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R32G32_FLOAT); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R32G32_FLOAT); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by @@ -3425,163 +3425,163 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* R8G8_SNORM and R16G16_SNORM need a fixup of the undefined blue channel. OpenGL * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader * conversion for this format. */ - idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else { /* Emulate using unsigned formats. This requires load-time conversion in addition to the * fixups here. */ - idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R16G16_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_R8G8B8A8_SNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8B8A8_SNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); - idx = get_format_idx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R5G5_SNORM_L6_UNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { - idx = get_format_idx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_R8G8_SNORM_L8X8_UNORM); + format->color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { - idx = get_format_idx(WINED3DFMT_ATI1N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI1N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC]) { - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[APPLE_YCBCR_422] && (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { - idx = get_format_idx(WINED3DFMT_YUY2); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); + format = get_format_internal(adapter, WINED3DFMT_YUY2); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); - idx = get_format_idx(WINED3DFMT_UYVY); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); + format = get_format_internal(adapter, WINED3DFMT_UYVY); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { - idx = get_format_idx(WINED3DFMT_YUY2); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_YUY2); + format->glInternal = 0; - idx = get_format_idx(WINED3DFMT_UYVY); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_UYVY); + format->glInternal = 0; } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { - idx = get_format_idx(WINED3DFMT_YV12); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - adapter->formats[idx].height_scale.numerator = 3; - adapter->formats[idx].height_scale.denominator = 2; - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); + format = get_format_internal(adapter, WINED3DFMT_YV12); + format_set_flag(format, WINED3DFMT_FLAG_HEIGHT_SCALE); + format->height_scale.numerator = 3; + format->height_scale.denominator = 2; + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); - idx = get_format_idx(WINED3DFMT_NV12); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - adapter->formats[idx].height_scale.numerator = 3; - adapter->formats[idx].height_scale.denominator = 2; - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + format = get_format_internal(adapter, WINED3DFMT_NV12); + format_set_flag(format, WINED3DFMT_FLAG_HEIGHT_SCALE); + format->height_scale.numerator = 3; + format->height_scale.denominator = 2; + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); } else { - idx = get_format_idx(WINED3DFMT_YV12); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_YV12); + format->glInternal = 0; - idx = get_format_idx(WINED3DFMT_NV12); - adapter->formats[idx].glInternal = 0; + format = get_format_internal(adapter, WINED3DFMT_NV12); + format->glInternal = 0; } if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - idx = get_format_idx(WINED3DFMT_A8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_A8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); - idx = get_format_idx(WINED3DFMT_L8A8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L8A8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - idx = get_format_idx(WINED3DFMT_L4A4_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L4A4_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); - idx = get_format_idx(WINED3DFMT_L16_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L16_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); - idx = get_format_idx(WINED3DFMT_INTZ); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_INTZ); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } if (gl_info->supported[ARB_TEXTURE_RG]) { - idx = get_format_idx(WINED3DFMT_L8_UNORM); - adapter->formats[idx].color_fixup = create_color_fixup_desc( + format = get_format_internal(adapter, WINED3DFMT_L8_UNORM); + format->color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { - idx = get_format_idx(WINED3DFMT_P8_UINT); - adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + format = get_format_internal(adapter, WINED3DFMT_P8_UINT); + format->color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { - idx = get_format_idx(WINED3DFMT_B8G8R8A8_UNORM); - adapter->formats[idx].gl_vtx_format = GL_BGRA; + format = get_format_internal(adapter, WINED3DFMT_B8G8R8A8_UNORM); + format->gl_vtx_format = GL_BGRA; } if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - adapter->formats[idx].gl_vtx_type = GL_FLOAT; + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format->gl_vtx_type = GL_FLOAT; - idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - adapter->formats[idx].gl_vtx_type = GL_FLOAT; + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); + format->gl_vtx_type = GL_FLOAT; } if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { - idx = get_format_idx(WINED3DFMT_R16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); - idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); - idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_FLOAT); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } if (gl_info->quirks & WINED3D_QUIRK_BROKEN_RGBA16) { - idx = get_format_idx(WINED3DFMT_R16G16B16A16_UNORM); - format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_R16G16B16A16_UNORM); + format_clear_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* ATI instancing hack: Although ATI cards do not support Shader Model @@ -3599,8 +3599,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* FIXME: This should just check the shader backend caps. */ if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { - idx = get_format_idx(WINED3DFMT_INST); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_INST); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* Depth bound test. To query if the card supports it CheckDeviceFormat() @@ -3611,8 +3611,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * value. */ if (gl_info->supported[EXT_DEPTH_BOUNDS_TEST]) { - idx = get_format_idx(WINED3DFMT_NVDB); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format = get_format_internal(adapter, WINED3DFMT_NVDB); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE); } /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ @@ -3620,8 +3620,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * RENDERTARGET usage. */ if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { - idx = get_format_idx(WINED3DFMT_RESZ); - format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); + format = get_format_internal(adapter, WINED3DFMT_RESZ); + format_set_flag(format, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } for (i = 0; i < adapter->format_count; ++i) @@ -3650,18 +3650,18 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* These formats are not supported for 3D textures. See also * WINED3DFMT_FLAG_DECOMPRESS. */ - idx = get_format_idx(WINED3DFMT_ATI1N); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_ATI2N); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC4_UNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC4_SNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC5_UNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC5_SNORM); - adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_ATI1N); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_ATI2N); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC4_UNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC4_SNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC5_UNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + format = get_format_internal(adapter, WINED3DFMT_BC5_SNORM); + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) -- 2.16.4

2 1

[PATCH 1/3] wined3d: Move formats from gl_info to wined3d_adapter.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 5 +- dlls/wined3d/texture.c | 1 - dlls/wined3d/utils.c | 236 +++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 6 +- 4 files changed, 127 insertions(+), 121 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8fa3a2492dfe..ab6a452a2e8c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -73,7 +73,7 @@ UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) static void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) { - heap_free(adapter->gl_info.formats); + heap_free(adapter->formats); heap_free(adapter->cfgs); } @@ -2512,6 +2512,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + adapter->formats = NULL; + adapter->format_count = 0; + if (wined3d_creation_flags & WINED3D_NO3D) return wined3d_adapter_no3d_init(adapter); return wined3d_adapter_opengl_init(adapter, wined3d_creation_flags); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f72442d1ddfe..8f499d4ada60 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2656,7 +2656,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if (desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { - /* TODO: Add support for non-power-of-two compressed textures. */ if (format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE)) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0c80756e2a87..bc225878e5e8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1936,7 +1936,7 @@ static inline int get_format_idx(enum wined3d_format_id format_id) return -1; } -static struct wined3d_format *get_format_internal(struct wined3d_gl_info *gl_info, +static struct wined3d_format *get_format_internal(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id) { int fmt_idx; @@ -1947,7 +1947,7 @@ static struct wined3d_format *get_format_internal(struct wined3d_gl_info *gl_inf return NULL; } - return &gl_info->formats[fmt_idx]; + return &adapter->formats[fmt_idx]; } static void copy_format(struct wined3d_format *dst_format, const struct wined3d_format *src_format) @@ -1999,14 +1999,14 @@ static enum wined3d_channel_type map_channel_type(char t) } } -static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_base_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i, j; - gl_info->format_count = WINED3D_FORMAT_COUNT; - if (!(gl_info->formats = heap_calloc(gl_info->format_count - + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*gl_info->formats)))) + adapter->format_count = WINED3D_FORMAT_COUNT; + if (!(adapter->formats = heap_calloc(adapter->format_count + + ARRAY_SIZE(typeless_depth_stencil_formats), sizeof(*adapter->formats)))) { ERR("Failed to allocate memory.\n"); return FALSE; @@ -2014,7 +2014,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(formats); ++i) { - if (!(format = get_format_internal(gl_info, formats[i].id))) + if (!(format = get_format_internal(adapter, formats[i].id))) goto fail; format->id = formats[i].id; @@ -2039,10 +2039,10 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) const struct wined3d_format *typeless_format; DWORD flags = 0; - if (!(format = get_format_internal(gl_info, typed_formats[i].id))) + if (!(format = get_format_internal(adapter, typed_formats[i].id))) goto fail; - if (!(typeless_format = get_format_internal(gl_info, typed_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) goto fail; format->id = typed_formats[i].id; @@ -2082,7 +2082,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(ddi_formats); ++i) { - if (!(format = get_format_internal(gl_info, ddi_formats[i].id))) + if (!(format = get_format_internal(adapter, ddi_formats[i].id))) goto fail; format->ddi_format = ddi_formats[i].ddi_format; @@ -2090,7 +2090,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(format_base_flags); ++i) { - if (!(format = get_format_internal(gl_info, format_base_flags[i].id))) + if (!(format = get_format_internal(adapter, format_base_flags[i].id))) goto fail; format_set_flag(format, format_base_flags[i].flags); @@ -2099,18 +2099,18 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) return TRUE; fail: - heap_free(gl_info->formats); + heap_free(adapter->formats); return FALSE; } -static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_block_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_block_info); ++i) { - if (!(format = get_format_internal(gl_info, format_block_info[i].id))) + if (!(format = get_format_internal(adapter, format_block_info[i].id))) return FALSE; format->block_width = format_block_info[i].block_width; @@ -2135,14 +2135,14 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) * * Affected applications include "Heroes VI", "From Dust", "Halo Online" and * "Eldorado". */ -static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_decompress_info(struct wined3d_adapter *adapter) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) { - if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + if (!(format = get_format_internal(adapter, format_decompress_info[i].id))) return FALSE; format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; @@ -2723,7 +2723,8 @@ static void query_format_flag(struct wined3d_gl_info *gl_info, struct wined3d_fo } /* Context activation is done by the caller. */ -static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) +static void init_format_fbo_compat_info(const struct wined3d_adapter *adapter, + struct wined3d_caps_gl_ctx *ctx) { const struct wined3d_gl_info *gl_info = ctx->gl_info; unsigned int i, type; @@ -2731,12 +2732,12 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - GLint value; - struct wined3d_format *format = &gl_info->formats[i]; BOOL fallback_fmt_used = FALSE, regular_fmt_used = FALSE; + struct wined3d_format *format = &adapter->formats[i]; GLenum rt_internal = format->rtInternal; + GLint value; if (!format->glInternal) continue; @@ -2845,9 +2846,9 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); } - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (!format->glInternal) continue; @@ -3125,7 +3126,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { - if (!(format = get_format_internal(gl_info, format_texture_info[i].id))) + if (!(format = get_format_internal(adapter, format_texture_info[i].id))) return FALSE; if (!gl_info->supported[format_texture_info[i].extension]) @@ -3189,7 +3190,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win { if (format_srgb_info[j].base_format_id == format->id) { - if (!(srgb_format = get_format_internal(gl_info, format_srgb_info[j].srgb_format_id))) + if (!(srgb_format = get_format_internal(adapter, format_srgb_info[j].srgb_format_id))) return FALSE; break; } @@ -3324,8 +3325,10 @@ static BOOL check_filter(const struct wined3d_gl_info *gl_info, GLenum internal) return ret; } -static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3d_pci_vendor vendor) +static void init_format_filter_info(struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { + enum wined3d_pci_vendor vendor = adapter->driver_info.vendor; struct wined3d_format *format; unsigned int fmt_idx, i; static const enum wined3d_format_id fmts16[] = @@ -3365,7 +3368,7 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); - format_set_flag(&gl_info->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); + format_set_flag(&adapter->formats[fmt_idx], WINED3DFMT_FLAG_FILTERING); } } return; @@ -3374,10 +3377,10 @@ static void init_format_filter_info(struct wined3d_gl_info *gl_info, enum wined3 for (i = 0; i < ARRAY_SIZE(fmts16); ++i) { fmt_idx = get_format_idx(fmts16[i]); - format = &gl_info->formats[fmt_idx]; + format = &adapter->formats[fmt_idx]; if (!format->glInternal) continue; /* Not supported by GL */ - filtered = check_filter(gl_info, gl_info->formats[fmt_idx].glInternal); + filtered = check_filter(gl_info, adapter->formats[fmt_idx].glInternal); if (filtered) { TRACE("Format %s supports filtering\n", debug_d3dformat(fmts16[i])); @@ -3396,23 +3399,23 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ int idx; idx = get_format_idx(WINED3DFMT_R16_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R32_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R16G16_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R32G32_FLOAT); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_W); /* GL_ATI_envmap_bumpmap in theory supports R8G8_SNORM but is no longer supported by @@ -3423,10 +3426,10 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ * returns 0.0 when sampling from it, DirectX 1.0. So we always have in-shader * conversion for this format. */ idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else @@ -3434,40 +3437,40 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* Emulate using unsigned formats. This requires load-time conversion in addition to the * fixups here. */ idx = get_format_idx(WINED3DFMT_R8G8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R16G16_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_R8G8B8A8_SNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 1, CHANNEL_SOURCE_Z, 1, CHANNEL_SOURCE_W); idx = get_format_idx(WINED3DFMT_R5G5_SNORM_L6_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_ONE); } if (!gl_info->supported[NV_TEXTURE_SHADER]) { idx = get_format_idx(WINED3DFMT_R8G8_SNORM_L8X8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 1, CHANNEL_SOURCE_X, 1, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W); } if (gl_info->supported[ARB_TEXTURE_COMPRESSION_RGTC] || gl_info->supported[EXT_TEXTURE_COMPRESSION_RGTC]) { idx = get_format_idx(WINED3DFMT_ATI1N); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } else if (gl_info->supported[ATI_TEXTURE_COMPRESSION_3DC]) { idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].color_fixup= create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } @@ -3475,81 +3478,81 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YUY2); idx = get_format_idx(WINED3DFMT_UYVY); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_UYVY); } else if (!gl_info->supported[APPLE_YCBCR_422] && (!gl_info->supported[ARB_FRAGMENT_PROGRAM] && (!gl_info->supported[ARB_FRAGMENT_SHADER] || !gl_info->supported[ARB_VERTEX_SHADER]))) { idx = get_format_idx(WINED3DFMT_YUY2); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; idx = get_format_idx(WINED3DFMT_UYVY); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || (gl_info->supported[ARB_FRAGMENT_SHADER] && gl_info->supported[ARB_VERTEX_SHADER])) { idx = get_format_idx(WINED3DFMT_YV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + adapter->formats[idx].height_scale.numerator = 3; + adapter->formats[idx].height_scale.denominator = 2; + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_YV12); idx = get_format_idx(WINED3DFMT_NV12); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); - gl_info->formats[idx].height_scale.numerator = 3; - gl_info->formats[idx].height_scale.denominator = 2; - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_HEIGHT_SCALE); + adapter->formats[idx].height_scale.numerator = 3; + adapter->formats[idx].height_scale.denominator = 2; + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_NV12); } else { idx = get_format_idx(WINED3DFMT_YV12); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; idx = get_format_idx(WINED3DFMT_NV12); - gl_info->formats[idx].glInternal = 0; + adapter->formats[idx].glInternal = 0; } if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { idx = get_format_idx(WINED3DFMT_A8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_ZERO, 0, CHANNEL_SOURCE_X); idx = get_format_idx(WINED3DFMT_L8A8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); idx = get_format_idx(WINED3DFMT_L4A4_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y); idx = get_format_idx(WINED3DFMT_L16_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); idx = get_format_idx(WINED3DFMT_INTZ); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X); } if (gl_info->supported[ARB_TEXTURE_RG]) { idx = get_format_idx(WINED3DFMT_L8_UNORM); - gl_info->formats[idx].color_fixup = create_color_fixup_desc( + adapter->formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE); } if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { idx = get_format_idx(WINED3DFMT_P8_UINT); - gl_info->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); + adapter->formats[idx].color_fixup = create_complex_fixup_desc(COMPLEX_FIXUP_P8); } if (gl_info->supported[ARB_VERTEX_ARRAY_BGRA]) { idx = get_format_idx(WINED3DFMT_B8G8R8A8_UNORM); - gl_info->formats[idx].gl_vtx_format = GL_BGRA; + adapter->formats[idx].gl_vtx_format = GL_BGRA; } if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) @@ -3557,28 +3560,28 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* Do not change the size of the type, it is CPU side. We have to change the GPU-side information though. * It is the job of the vertex buffer code to make sure that the vbos have the right format */ idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_FLOAT; + adapter->formats[idx].gl_vtx_type = GL_FLOAT; idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - gl_info->formats[idx].gl_vtx_type = GL_FLOAT; + adapter->formats[idx].gl_vtx_type = GL_FLOAT; } if (!gl_info->supported[ARB_HALF_FLOAT_PIXEL]) { idx = get_format_idx(WINED3DFMT_R16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); idx = get_format_idx(WINED3DFMT_R16G16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); idx = get_format_idx(WINED3DFMT_R16G16B16A16_FLOAT); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } if (gl_info->quirks & WINED3D_QUIRK_BROKEN_RGBA16) { idx = get_format_idx(WINED3DFMT_R16G16B16A16_UNORM); - format_clear_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_clear_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* ATI instancing hack: Although ATI cards do not support Shader Model @@ -3597,7 +3600,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[ARB_VERTEX_PROGRAM] || gl_info->supported[ARB_VERTEX_SHADER]) { idx = get_format_idx(WINED3DFMT_INST); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* Depth bound test. To query if the card supports it CheckDeviceFormat() @@ -3609,7 +3612,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[EXT_DEPTH_BOUNDS_TEST]) { idx = get_format_idx(WINED3DFMT_NVDB); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE); } /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ @@ -3618,12 +3621,12 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) { idx = get_format_idx(WINED3DFMT_RESZ); - format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); + format_set_flag(&adapter->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE)) continue; @@ -3648,17 +3651,17 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ /* These formats are not supported for 3D textures. See also * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_SNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + adapter->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; } static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int component_count) @@ -3689,14 +3692,15 @@ static unsigned int calculate_vertex_attribute_size(GLenum type, unsigned int co } } -static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) +static BOOL init_format_vertex_info(const struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { struct wined3d_format *format; unsigned int i; for (i = 0; i < ARRAY_SIZE(format_vertex_info); ++i) { - if (!(format = get_format_internal(gl_info, format_vertex_info[i].id))) + if (!(format = get_format_internal(adapter, format_vertex_info[i].id))) return FALSE; if (!gl_info->supported[format_vertex_info[i].extension]) @@ -3719,7 +3723,7 @@ static BOOL init_format_vertex_info(struct wined3d_gl_info *gl_info) return TRUE; } -static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) +static BOOL init_typeless_formats(const struct wined3d_adapter *adapter) { unsigned int flags[WINED3D_GL_RES_TYPE_COUNT]; unsigned int i, j; @@ -3728,9 +3732,9 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) { struct wined3d_format *format, *typeless_format; - if (!(format = get_format_internal(gl_info, typed_formats[i].id))) + if (!(format = get_format_internal(adapter, typed_formats[i].id))) return FALSE; - if (!(typeless_format = get_format_internal(gl_info, typed_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typed_formats[i].typeless_id))) return FALSE; memcpy(flags, typeless_format->flags, sizeof(flags)); @@ -3745,12 +3749,12 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) struct wined3d_format *depth_view_format, *stencil_view_format; enum wined3d_format_id format_id; - if (!(typeless_format = get_format_internal(gl_info, typeless_depth_stencil_formats[i].typeless_id))) + if (!(typeless_format = get_format_internal(adapter, typeless_depth_stencil_formats[i].typeless_id))) return FALSE; - if (!(ds_format = get_format_internal(gl_info, typeless_depth_stencil_formats[i].depth_stencil_id))) + if (!(ds_format = get_format_internal(adapter, typeless_depth_stencil_formats[i].depth_stencil_id))) return FALSE; - typeless_ds_format = &gl_info->formats[WINED3D_FORMAT_COUNT + i]; + typeless_ds_format = &adapter->formats[WINED3D_FORMAT_COUNT + i]; typeless_ds_format->id = typeless_depth_stencil_formats[i].typeless_id; copy_format(typeless_ds_format, ds_format); for (j = 0; j < ARRAY_SIZE(typeless_ds_format->flags); ++j) @@ -3762,13 +3766,13 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) if ((format_id = typeless_depth_stencil_formats[i].depth_view_id) && typeless_depth_stencil_formats[i].separate_depth_view_format) { - if (!(depth_view_format = get_format_internal(gl_info, format_id))) + if (!(depth_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(depth_view_format, ds_format); } if ((format_id = typeless_depth_stencil_formats[i].stencil_view_id)) { - if (!(stencil_view_format = get_format_internal(gl_info, format_id))) + if (!(stencil_view_format = get_format_internal(adapter, format_id))) return FALSE; copy_format(stencil_view_format, ds_format); } @@ -3777,16 +3781,17 @@ static BOOL init_typeless_formats(struct wined3d_gl_info *gl_info) return TRUE; } -static void init_format_gen_mipmap_info(struct wined3d_gl_info *gl_info) +static void init_format_gen_mipmap_info(const struct wined3d_adapter *adapter, + struct wined3d_gl_info *gl_info) { unsigned int i, j; if (!gl_info->fbo_ops.glGenerateMipmap) return; - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; for (j = 0; j < ARRAY_SIZE(format->flags); ++j) if (!(~format->flags[j] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) @@ -3935,15 +3940,15 @@ static float wined3d_adapter_find_polyoffset_scale(struct wined3d_caps_gl_ctx *c return (float)(1u << cur); } -static void init_format_depth_bias_scale(struct wined3d_caps_gl_ctx *ctx, - const struct wined3d_d3d_info *d3d_info) +static void init_format_depth_bias_scale(struct wined3d_adapter *adapter, + struct wined3d_caps_gl_ctx *ctx) { - const struct wined3d_gl_info *gl_info = ctx->gl_info; + const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; unsigned int i; - for (i = 0; i < gl_info->format_count; ++i) + for (i = 0; i < adapter->format_count; ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format = &adapter->formats[i]; if (format->flags[WINED3D_GL_RES_TYPE_RB] & WINED3DFMT_FLAG_DEPTH) { @@ -3969,35 +3974,34 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi { struct wined3d_gl_info *gl_info = &adapter->gl_info; - if (!init_format_base_info(gl_info)) return FALSE; - if (!init_format_block_info(gl_info)) goto fail; - if (!init_format_decompress_info(gl_info)) goto fail; + if (!init_format_base_info(adapter)) return FALSE; + if (!init_format_block_info(adapter)) goto fail; + if (!init_format_decompress_info(adapter)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; if (!init_format_texture_info(adapter, gl_info)) goto fail; - if (!init_format_vertex_info(gl_info)) goto fail; + if (!init_format_vertex_info(adapter, gl_info)) goto fail; apply_format_fixups(adapter, gl_info); - init_format_fbo_compat_info(ctx); - init_format_filter_info(gl_info, adapter->driver_info.vendor); - if (!init_typeless_formats(gl_info)) goto fail; - init_format_gen_mipmap_info(gl_info); - init_format_depth_bias_scale(ctx, &adapter->d3d_info); + init_format_fbo_compat_info(adapter, ctx); + init_format_filter_info(adapter, gl_info); + if (!init_typeless_formats(adapter)) goto fail; + init_format_gen_mipmap_info(adapter, gl_info); + init_format_depth_bias_scale(adapter, ctx); return TRUE; fail: - heap_free(gl_info->formats); - gl_info->formats = NULL; + heap_free(adapter->formats); + adapter->formats = NULL; return FALSE; } const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *adapter, enum wined3d_format_id format_id, unsigned int resource_usage) { - const struct wined3d_gl_info *gl_info = &adapter->gl_info; const struct wined3d_format *format; int idx = get_format_idx(format_id); unsigned int i; @@ -4006,22 +4010,22 @@ const struct wined3d_format *wined3d_get_format(const struct wined3d_adapter *ad { FIXME("Can't find format %s (%#x) in the format lookup table.\n", debug_d3dformat(format_id), format_id); - return &gl_info->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; } - format = &gl_info->formats[idx]; + format = &adapter->formats[idx]; if (resource_usage & WINED3DUSAGE_DEPTHSTENCIL && wined3d_format_is_typeless(format)) { for (i = 0; i < ARRAY_SIZE(typeless_depth_stencil_formats); ++i) { if (typeless_depth_stencil_formats[i].typeless_id == format_id) - return &gl_info->formats[WINED3D_FORMAT_COUNT + i]; + return &adapter->formats[WINED3D_FORMAT_COUNT + i]; } FIXME("Cannot find depth/stencil typeless format %s (%#x).\n", debug_d3dformat(format_id), format_id); - return &gl_info->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; + return &adapter->formats[get_format_idx(WINED3DFMT_UNKNOWN)]; } return format; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da3cd4615686..70841683e5ba 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2599,9 +2599,6 @@ struct wined3d_gl_info HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; - - struct wined3d_format *formats; - unsigned int format_count; }; /* The driver names reflect the lowest GPU supported @@ -2682,6 +2679,9 @@ struct wined3d_adapter UINT64 vram_bytes_used; LUID luid; + struct wined3d_format *formats; + unsigned int format_count; + const struct wined3d_vertex_pipe_ops *vertex_pipe; const struct fragment_pipeline *fragment_pipe; const struct wined3d_shader_backend_ops *shader_backend; -- 2.16.4

2 1

[PATCH 1/3] dxgi: Add support for DXGI_FORMAT_R10G10B10A2_UNORM D3D12 swapchains.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index b285f3d33e0a..6eda2353152e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -917,6 +917,7 @@ static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return DXGI_FORMAT_R10G10B10A2_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return DXGI_FORMAT_UNKNOWN; @@ -929,6 +930,7 @@ static VkFormat get_swapchain_fallback_format(VkFormat vk_format) { case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_A2B10G10R10_UNORM_PACK32: return VK_FORMAT_B8G8R8A8_UNORM; default: WARN("Unhandled format %#x.\n", vk_format); return VK_FORMAT_UNDEFINED; -- 2.16.4

2 1

[PATCH 3/3] dxgi: Return actual swap effect for D3D11 swapchains.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 6eda2353152e..f8e4f8078e74 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -37,6 +37,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) +{ + switch (swap_effect) + { + case WINED3D_SWAP_EFFECT_DISCARD: + return DXGI_SWAP_EFFECT_DISCARD; + case WINED3D_SWAP_EFFECT_SEQUENTIAL: + return DXGI_SWAP_EFFECT_SEQUENTIAL; + case WINED3D_SWAP_EFFECT_FLIP_DISCARD: + return DXGI_SWAP_EFFECT_FLIP_DISCARD; + case WINED3D_SWAP_EFFECT_FLIP_SEQUENTIAL: + return DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; + default: + FIXME("Invalid swap effect %#x.\n", swap_effect); + return DXGI_SWAP_EFFECT_DISCARD; + } +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -297,7 +315,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering and Scaling.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -312,7 +330,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); return S_OK; @@ -457,7 +475,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring Stereo, Scaling, SwapEffect and AlphaMode.\n"); + FIXME("Ignoring Stereo, Scaling and AlphaMode.\n"); desc->Width = wined3d_desc.backbuffer_width; desc->Height = wined3d_desc.backbuffer_height; @@ -468,7 +486,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDesc1(IDXGISwapChain1 *iface desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; - desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + desc->SwapEffect = dxgi_swap_effect_from_wined3d(wined3d_desc.swap_effect); desc->AlphaMode = DXGI_ALPHA_MODE_IGNORE; desc->Flags = dxgi_swapchain_flags_from_wined3d(wined3d_desc.flags); -- 2.16.4

2 1

[PATCH 2/3] d3d12/tests: Add test for DXGI_FORMAT_R10G10B10A2_UNORM swapchain.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 2e2e69be0adc..7b610c0c85a9 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -47,6 +47,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM: case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_R10G10B10A2_UNORM: return 4; default: trace("Unhandled format %#x.\n", format); @@ -832,10 +833,12 @@ static void test_swapchain_draw(void) } tests[] = { - {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, - {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, - {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xc00003ff}, + {DXGI_FORMAT_R10G10B10A2_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xc00ffc00}, }; desc.no_pipeline = TRUE; -- 2.16.4

2 1

[PATCH v2] shell32/autocomplete: Revamp pwzsRegKeyPath handling so it can deal with arbitrary sizes and make it more robust
by Gabriel Ivăncescu 30 Aug '18

30 Aug '18

Handle heap_alloc failure, reg strings without a \ character at all, try harder to find the reg path (if only value fails the lookup), and read the registry value with any size. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Retrieve the registry value without failing in rare race conditions. dlls/shell32/autocomplete.c | 93 +++++++++++++++++++++++++++++---------------- 1 file changed, 61 insertions(+), 32 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 5fe48e9..99d5ae7 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -486,40 +486,69 @@ static HRESULT WINAPI IAutoComplete2_fnInit( if (This->options & ACO_AUTOSUGGEST) create_listbox(This); - if (pwzsRegKeyPath) { - WCHAR *key; - WCHAR result[MAX_PATH]; - WCHAR *value; - HKEY hKey = 0; - LONG res; - LONG len; - - /* pwszRegKeyPath contains the key as well as the value, so we split */ - key = heap_alloc((lstrlenW(pwzsRegKeyPath)+1)*sizeof(WCHAR)); - strcpyW(key, pwzsRegKeyPath); - value = strrchrW(key, '\\'); - *value = 0; - value++; - /* Now value contains the value and buffer the key */ - res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); - if (res != ERROR_SUCCESS) { - /* if the key is not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ - res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); - } - if (res == ERROR_SUCCESS) { - res = RegQueryValueW(hKey, value, result, &len); - if (res == ERROR_SUCCESS) { - This->quickComplete = heap_alloc(len*sizeof(WCHAR)); - strcpyW(This->quickComplete, result); - } - RegCloseKey(hKey); - } - heap_free(key); + if (pwzsRegKeyPath) + { + WCHAR *key, *value; + DWORD type, sz = MAX_PATH * sizeof(WCHAR); + BYTE *qc; + HKEY hKey; + LSTATUS res; + size_t len; + + /* pwszRegKeyPath contains the key as well as the value, so split it */ + value = strrchrW(pwzsRegKeyPath, '\\'); + len = value - pwzsRegKeyPath; + + if (value && (key = heap_alloc((len+1) * sizeof(*key))) != NULL) { + memcpy(key, pwzsRegKeyPath, len * sizeof(*key)); + key[len] = '\0'; + value++; + + res = RegOpenKeyExW(HKEY_CURRENT_USER, key, 0, KEY_READ, &hKey); + + /* if not found, MSDN states we must seek in HKEY_LOCAL_MACHINE */ + if (res != ERROR_SUCCESS) + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + + if (res == ERROR_SUCCESS && (qc = heap_alloc(sz)) != NULL) { + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + + if ((res != ERROR_SUCCESS && res != ERROR_MORE_DATA) || type != REG_SZ) + { + RegCloseKey(hKey); + res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, key, 0, KEY_READ, &hKey); + if (res != ERROR_SUCCESS) { + heap_free(qc); + goto free_key_str; + } + sz = MAX_PATH * sizeof(WCHAR); + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + } + + for (;;) { + if (res == ERROR_SUCCESS && type == REG_SZ) { + This->quickComplete = heap_realloc(qc, sz); + break; + } + heap_free(qc); + if (res != ERROR_MORE_DATA || type != REG_SZ) + break; + if ((qc = heap_alloc(sz)) == NULL) + break; + res = RegQueryValueExW(hKey, value, NULL, &type, qc, &sz); + } + RegCloseKey(hKey); + } + free_key_str: + heap_free(key); + } } - if ((pwszQuickComplete) && (!This->quickComplete)) { - This->quickComplete = heap_alloc((lstrlenW(pwszQuickComplete)+1)*sizeof(WCHAR)); - lstrcpyW(This->quickComplete, pwszQuickComplete); + if (!This->quickComplete && pwszQuickComplete) + { + size_t len = strlenW(pwszQuickComplete)+1; + if ((This->quickComplete = heap_alloc(len * sizeof(WCHAR))) != NULL) + memcpy(This->quickComplete, pwszQuickComplete, len * sizeof(WCHAR)); } return S_OK; -- 1.9.1

1 0

[PATCH 1/3] shell32/autocomplete: Don't crash when there's another AutoComplete object on the same edit control
by Gabriel Ivăncescu 30 Aug '18

30 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22333 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 99ce23d..5fe48e9 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -93,6 +93,14 @@ static inline IAutoCompleteImpl *impl_from_IAutoCompleteDropDown(IAutoCompleteDr return CONTAINING_RECORD(iface, IAutoCompleteImpl, IAutoCompleteDropDown_iface); } +static void destroy_autocomplete_object(IAutoCompleteImpl *ac) +{ + ac->hwndEdit = NULL; + if (ac->hwndListBox) + DestroyWindow(ac->hwndListBox); + IAutoComplete2_Release(&ac->IAutoComplete2_iface); +} + /* Window procedure for autocompletion */ @@ -276,10 +284,7 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, RemovePropW(hwnd, autocomplete_propertyW); SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)proc); - This->hwndEdit = NULL; - if (This->hwndListBox) - DestroyWindow(This->hwndListBox); - IAutoComplete2_Release(&This->IAutoComplete2_iface); + destroy_autocomplete_object(This); return CallWindowProcW(proc, hwnd, uMsg, wParam, lParam); } default: @@ -434,7 +439,7 @@ static HRESULT WINAPI IAutoComplete2_fnInit( LPCOLESTR pwzsRegKeyPath, LPCOLESTR pwszQuickComplete) { - IAutoCompleteImpl *This = impl_from_IAutoComplete2(iface); + IAutoCompleteImpl *Other, *This = impl_from_IAutoComplete2(iface); TRACE("(%p)->(%p, %p, %s, %s)\n", This, hwndEdit, punkACL, debugstr_w(pwzsRegKeyPath), debugstr_w(pwszQuickComplete)); @@ -461,10 +466,22 @@ static HRESULT WINAPI IAutoComplete2_fnInit( This->initialized = TRUE; This->hwndEdit = hwndEdit; - This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW( hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); - /* Keep at least one reference to the object until the edit window is destroyed. */ + + /* If another AutoComplete object was previously assigned to this edit control, + release it but keep the same callback on the control, to avoid an infinite + recursive loop in ACEditSubclassProc while the property is set to this object */ + Other = GetPropW(hwndEdit, autocomplete_propertyW); + SetPropW(hwndEdit, autocomplete_propertyW, This); + + if (Other && Other->initialized) { + This->wpOrigEditProc = Other->wpOrigEditProc; + destroy_autocomplete_object(Other); + } + else + This->wpOrigEditProc = (WNDPROC) SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (LONG_PTR) ACEditSubclassProc); + + /* Keep at least one reference to the object until the edit window is destroyed */ IAutoComplete2_AddRef(&This->IAutoComplete2_iface); - SetPropW( hwndEdit, autocomplete_propertyW, This ); if (This->options & ACO_AUTOSUGGEST) create_listbox(This); -- 1.9.1

2 7

[v2 PATCH 1/2] include: Add IOpcFactory and related definitions.
by Nikolay Sivov 30 Aug '18

30 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed up includes in main idl. include/Makefile.in | 4 ++ include/msopc.idl | 89 ++++++++++++++++++++++++++++++++++++++ include/opcbase.idl | 28 ++++++++++++ include/opcobjectmodel.idl | 34 +++++++++++++++ include/opcparturi.idl | 71 ++++++++++++++++++++++++++++++ 5 files changed, 226 insertions(+) create mode 100644 include/msopc.idl create mode 100644 include/opcbase.idl create mode 100644 include/opcobjectmodel.idl create mode 100644 include/opcparturi.idl diff --git a/include/Makefile.in b/include/Makefile.in index a89fef6eac..ffecb98d9e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -399,6 +399,7 @@ SOURCES = \ msident.idl \ msinkaut.idl \ msiquery.h \ + msopc.idl \ mssip.h \ msstkppg.h \ mstask.idl \ @@ -493,6 +494,9 @@ SOURCES = \ oledberr.h \ oledlg.h \ oleidl.idl \ + opcbase.idl \ + opcobjectmodel.idl \ + opcparturi.idl \ opnrst.idl \ optary.idl \ patchapi.h \ diff --git a/include/msopc.idl b/include/msopc.idl new file mode 100644 index 0000000000..12404e5a12 --- /dev/null +++ b/include/msopc.idl @@ -0,0 +1,89 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#include "opcbase.idl" +#include "opcobjectmodel.idl" +#include "opcparturi.idl" + +#ifndef __WIDL__ +#define threading(model) +#endif + +interface IOpcUri; +interface IOpcPartUri; +interface IOpcPackage; +interface IOpcDigitalSignatureManager; + +[ + object, + uuid(6d0b4446-cd73-4ab3-94f4-8ccdf6116154), + pointer_default(ref) +] +interface IOpcFactory : IUnknown +{ + HRESULT CreatePackageRootUri( + [out, retval] IOpcUri **uri + ); + + HRESULT CreatePartUri( + [in, string] LPCWSTR uri, + [out, retval] IOpcPartUri **part_uri + ); + + [local] + HRESULT CreateStreamOnFile( + [in, string] LPCWSTR filename, + [in] OPC_STREAM_IO_MODE io_mode, + [in, unique] SECURITY_ATTRIBUTES *sa, + [in] DWORD flags, + [out, retval] IStream **stream + ); + + HRESULT CreatePackage( + [out, retval] IOpcPackage **package + ); + + HRESULT ReadPackageFromStream( + [in] IStream *stream, + [in] OPC_READ_FLAGS flags, + [out, retval] IOpcPackage **package + ); + + HRESULT WritePackageToStream( + [in] IOpcPackage *package, + [in] OPC_WRITE_FLAGS flags, + [in] IStream *stream + ); + + HRESULT CreateDigitalSignatureManager( + [in] IOpcPackage *package, + [out, retval] IOpcDigitalSignatureManager **signature_manager + ); +} + +[ + threading(both), + uuid(6b2d6Ba0-9f3e-4f27-920b-313cc426a39e) +] +coclass OpcFactory +{ + interface IOpcFactory; +}; diff --git a/include/opcbase.idl b/include/opcbase.idl new file mode 100644 index 0000000000..2cfb885c12 --- /dev/null +++ b/include/opcbase.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_STREAM_IO_READ = 1, + OPC_STREAM_IO_WRITE = 2, +} OPC_STREAM_IO_MODE; + diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl new file mode 100644 index 0000000000..e5370d2e54 --- /dev/null +++ b/include/opcobjectmodel.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_READ_DEFAULT = 0, + OPC_VALIDATE_ON_LOAD = 1, + OPC_CACHE_ON_ACCESS = 2, +} OPC_READ_FLAGS; + +typedef [v1_enum] enum +{ + OPC_WRITE_DEFAULT = 0, + OPC_WRITE_FORCE_ZIP32 = 1, +} OPC_WRITE_FLAGS; diff --git a/include/opcparturi.idl b/include/opcparturi.idl new file mode 100644 index 0000000000..00b21b9598 --- /dev/null +++ b/include/opcparturi.idl @@ -0,0 +1,71 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#if 0 +#pragma makedep install +#endif + +interface IOpcPartUri; + +[ + object, + uuid(bc9c1b9b-d62c-49eb-aef0-3b4e0b28ebed), + nonextensible, + pointer_default(ref) +] +interface IOpcUri : IUri +{ + HRESULT GetRelationshipsPartUri( + [out, retval] IOpcPartUri **part_uri + ); + + HRESULT GetRelativeUri( + [in] IOpcPartUri *part_uri, + [out, retval] IUri **relative_uri + ); + + HRESULT CombinePartUri( + [in] IUri *relative_uri, + [out, retval] IOpcPartUri **combined + ); +} + +[ + object, + uuid(7d3babe7-88b2-46ba-85cb-4203cb016c87), + nonextensible, + pointer_default(ref) +] +interface IOpcPartUri : IOpcUri +{ + HRESULT ComparePartUri( + [in] IOpcPartUri *part_uri, + [out, retval] INT32 *result + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **source_uri + ); + + HRESULT IsRelationshipsPartUri( + [out, retval] BOOL *result + ); +} -- 2.18.0

1 1

[PATCH 4/4] winevulkan: Free all command buffers when vkAllocateCommandBuffers() fails.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index f500602e96d5..4e0d999ddb41 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -540,25 +540,24 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, buffers[i]->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; buffers[i]->device = device; + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); res = device->funcs.p_vkAllocateCommandBuffers(device->device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { ERR("Failed to allocate command buffer, res=%d.\n", res); + buffers[i]->command_buffer = VK_NULL_HANDLE; break; } - - list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) { - wine_vk_free_command_buffers(device, pool, i, buffers); + wine_vk_free_command_buffers(device, pool, i + 1, buffers); memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers)); - return res; } - return VK_SUCCESS; + return res; } void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer buffer, uint32_t count, -- 2.16.4

1 0

[PATCH 3/4] vulkan-1/tests: Add a test for destroying a command pool.
by Józef Kucia 30 Aug '18

30 Aug '18

The Vulkan spec says: "When a pool is destroyed, all command buffers allocated from the pool are implicitly freed and become invalid. Command buffers allocated from a given pool do not need to be freed before destroying that command pool." Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 1d2f66f5f901..20a245238b02 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -232,6 +232,45 @@ static void test_physical_device_groups(void) vkDestroyInstance(vk_instance, NULL); } +static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) +{ + VkCommandBufferAllocateInfo allocate_info; + VkCommandPoolCreateInfo pool_info; + VkCommandBuffer vk_cmd_buffers[4]; + uint32_t queue_family_index; + VkCommandPool vk_cmd_pool; + VkDevice vk_device; + VkResult vr; + + if ((vr = create_device(vk_physical_device, 0, NULL, NULL, &vk_device)) < 0) + { + skip("Failed to create device, vr %d.\n", vr); + return; + } + + find_queue_family(vk_physical_device, VK_QUEUE_GRAPHICS_BIT, &queue_family_index); + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + vr = vkCreateCommandPool(vk_device, &pool_info, NULL, &vk_cmd_pool); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = ARRAY_SIZE(vk_cmd_buffers); + vr = vkAllocateCommandBuffers(vk_device, &allocate_info, vk_cmd_buffers); + ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); + + vkDestroyCommandPool(vk_device, vk_cmd_pool, NULL); + vkDestroyCommandPool(vk_device, VK_NULL_HANDLE, NULL); + + vkDestroyDevice(vk_device, NULL); +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -272,4 +311,5 @@ START_TEST(vulkan) for_each_device(enumerate_physical_device); for_each_device(enumerate_device_queues); test_physical_device_groups(); + for_each_device(test_destroy_command_pool); } -- 2.16.4

1 0

[PATCH 2/4] winevulkan: Fix potential memory leaks when a command pool is destroyed.
by Józef Kucia 30 Aug '18

30 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 22 ++++++++++++++++++---- dlls/winevulkan/vulkan_private.h | 5 +++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 886ef0b47344..f500602e96d5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -165,6 +165,7 @@ static void wine_vk_free_command_buffers(struct VkDevice_T *device, continue; device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); + list_remove(&buffers[i]->pool_link); heap_free(buffers[i]); } } @@ -528,9 +529,8 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, allocate_info_host.level = allocate_info->level; allocate_info_host.commandBufferCount = 1; - TRACE("Creating command buffer %u, pool 0x%s, level %#x\n", i, - wine_dbgstr_longlong(allocate_info_host.commandPool), - allocate_info_host.level); + TRACE("Allocating command buffer %u from pool 0x%s.\n", + i, wine_dbgstr_longlong(allocate_info_host.commandPool)); if (!(buffers[i] = heap_alloc_zero(sizeof(**buffers)))) { @@ -544,9 +544,11 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, &allocate_info_host, &buffers[i]->command_buffer); if (res != VK_SUCCESS) { - ERR("Failed to allocate command buffer, res=%d\n", res); + ERR("Failed to allocate command buffer, res=%d.\n", res); break; } + + list_add_tail(&pool->command_buffers, &buffers[i]->pool_link); } if (res != VK_SUCCESS) @@ -1132,6 +1134,8 @@ VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCre if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; + list_init(&object->command_buffers); + res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); if (res == VK_SUCCESS) @@ -1146,6 +1150,7 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, const VkAllocationCallbacks *allocator) { struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); + struct VkCommandBuffer_T *buffer, *cursor; TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); @@ -1155,6 +1160,15 @@ void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + /* The Vulkan spec says: + * + * "When a pool is destroyed, all command buffers allocated from the pool are freed." + */ + LIST_FOR_EACH_ENTRY_SAFE(buffer, cursor, &pool->command_buffers, struct VkCommandBuffer_T, pool_link) + { + heap_free(buffer); + } + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); heap_free(pool); } diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index f31d4d5d8f52..17072d234193 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -27,6 +27,7 @@ #include "wine/debug.h" #include "wine/heap.h" +#include "wine/list.h" #define VK_NO_PROTOTYPES #include "wine/vulkan.h" #include "wine/vulkan_driver.h" @@ -62,6 +63,8 @@ struct VkCommandBuffer_T struct wine_vk_base base; struct VkDevice_T *device; /* parent */ VkCommandBuffer command_buffer; /* native command buffer */ + + struct list pool_link; }; struct VkDevice_T @@ -113,6 +116,8 @@ struct VkQueue_T struct wine_cmd_pool { VkCommandPool command_pool; + + struct list command_buffers; }; static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle) -- 2.16.4

1 0

[PATCH 1/4] winevulkan: Wrap VkCommandPools.
by Józef Kucia 30 Aug '18

30 Aug '18

We need to wrap VkCommandPools to track allocated VkCommandBuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/make_vulkan | 50 +++++++++++++++-------------- dlls/winevulkan/vulkan.c | 68 +++++++++++++++++++++++++++++++++------- dlls/winevulkan/vulkan_private.h | 15 +++++++++ dlls/winevulkan/vulkan_thunks.c | 18 ++--------- dlls/winevulkan/vulkan_thunks.h | 2 ++ 5 files changed, 103 insertions(+), 50 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 5b0f82ce355a..8e7d88ad7dec 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -157,6 +157,8 @@ FUNCTION_OVERRIDES = { # Device functions "vkAllocateCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkCmdExecuteCommands" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkCreateCommandPool" : {"dispatch": True, "driver" : False, "thunk" : False}, + "vkDestroyCommandPool" : {"dispatch": True, "driver" : False, "thunk" : False}, "vkDestroyDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkFreeCommandBuffers" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetDeviceProcAddr" : {"dispatch" : False, "driver" : True, "thunk" : False}, @@ -838,27 +840,31 @@ class VkHandle(object): def is_required(self): return self.required - def native_handle(self): - """ Provide access to the native handle of a dispatchable object. + def native_handle(self, name): + """ Provide access to the native handle of a wrapped object. """ - Dispatchable objects wrap an underlying 'native' object. - This method provides access to the native object. - """ - if not self.is_dispatchable(): - return None + if self.name == "VkCommandPool": + return "wine_cmd_pool_from_handle({0})->command_pool".format(name) + + native_handle_name = None if self.name == "VkCommandBuffer": - return "command_buffer" - elif self.name == "VkDevice": - return "device" - elif self.name == "VkInstance": - return "instance" - elif self.name == "VkPhysicalDevice": - return "phys_dev" - elif self.name == "VkQueue": - return "queue" - else: + native_handle_name = "command_buffer" + if self.name == "VkDevice": + native_handle_name = "device" + if self.name == "VkInstance": + native_handle_name = "instance" + if self.name == "VkPhysicalDevice": + native_handle_name = "phys_dev" + if self.name == "VkQueue": + native_handle_name = "queue" + + if native_handle_name: + return "{0}->{1}".format(name, native_handle_name) + + if self.is_dispatchable(): LOGGER.error("Unhandled native handle for: {0}".format(self.name)) + return None class VkMember(object): @@ -1471,17 +1477,15 @@ class VkParam(object): LOGGER.debug("TODO: setting NULL VkAllocationCallbacks for {0}".format(self.name)) return "NULL" - # Dispatchable objects wrap the native handle. For thunk generation we - # need to pass the native handle to the native Vulkan calls. - if self.is_dispatchable(): - return "{0}->{1}".format(self.name, self.handle.native_handle()) - elif conv and self.needs_conversion(): + if conv and self.needs_conversion(): if self.is_dynamic_array(): return "{0}_host".format(self.name) else: return "&{0}_host".format(self.name) else: - return self.name + # We need to pass the native handle to the native Vulkan calls. + native_handle = self.handle.native_handle(self.name) if self.is_handle() else None + return native_handle if native_handle else self.name class VkStruct(Sequence): diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 89df838f0499..886ef0b47344 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -154,9 +154,8 @@ err: return NULL; } -/* Helper function to release command buffers. */ -static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPool pool, - uint32_t count, const VkCommandBuffer *buffers) +static void wine_vk_free_command_buffers(struct VkDevice_T *device, + struct wine_cmd_pool *pool, uint32_t count, const VkCommandBuffer *buffers) { unsigned int i; @@ -165,12 +164,11 @@ static void wine_vk_command_buffers_free(struct VkDevice_T *device, VkCommandPoo if (!buffers[i]) continue; - device->funcs.p_vkFreeCommandBuffers(device->device, pool, 1, &buffers[i]->command_buffer); + device->funcs.p_vkFreeCommandBuffers(device->device, pool->command_pool, 1, &buffers[i]->command_buffer); heap_free(buffers[i]); } } -/* Helper function to create queues for a given family index. */ static struct VkQueue_T *wine_vk_device_alloc_queues(struct VkDevice_T *device, uint32_t family_index, uint32_t queue_count, VkDeviceQueueCreateFlags flags) { @@ -506,10 +504,13 @@ static void wine_vk_instance_free(struct VkInstance_T *instance) VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *allocate_info, VkCommandBuffer *buffers) { + struct wine_cmd_pool *pool; VkResult res = VK_SUCCESS; unsigned int i; - TRACE("%p %p %p\n", device, allocate_info, buffers); + TRACE("%p, %p, %p\n", device, allocate_info, buffers); + + pool = wine_cmd_pool_from_handle(allocate_info->commandPool); memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers)); @@ -523,7 +524,7 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, /* TODO: future extensions (none yet) may require pNext conversion. */ allocate_info_host.pNext = allocate_info->pNext; allocate_info_host.sType = allocate_info->sType; - allocate_info_host.commandPool = allocate_info->commandPool; + allocate_info_host.commandPool = pool->command_pool; allocate_info_host.level = allocate_info->level; allocate_info_host.commandBufferCount = 1; @@ -550,7 +551,7 @@ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, if (res != VK_SUCCESS) { - wine_vk_command_buffers_free(device, allocate_info->commandPool, i, buffers); + wine_vk_free_command_buffers(device, pool, i, buffers); memset(buffers, 0, allocate_info->commandBufferCount * sizeof(*buffers)); return res; } @@ -920,12 +921,14 @@ VkResult WINAPI wine_vkEnumeratePhysicalDevices(VkInstance instance, uint32_t *c return *count < instance->phys_dev_count ? VK_INCOMPLETE : VK_SUCCESS; } -void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool pool, uint32_t count, - const VkCommandBuffer *buffers) +void WINAPI wine_vkFreeCommandBuffers(VkDevice device, VkCommandPool pool_handle, + uint32_t count, const VkCommandBuffer *buffers) { - TRACE("%p 0x%s %u %p\n", device, wine_dbgstr_longlong(pool), count, buffers); + struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(pool_handle); - wine_vk_command_buffers_free(device, pool, count, buffers); + TRACE("%p, 0x%s, %u, %p\n", device, wine_dbgstr_longlong(pool_handle), count, buffers); + + wine_vk_free_command_buffers(device, pool, count, buffers); } PFN_vkVoidFunction WINAPI wine_vkGetDeviceProcAddr(VkDevice device, const char *name) @@ -1115,6 +1118,47 @@ err: return res; } +VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *info, + const VkAllocationCallbacks *allocator, VkCommandPool *command_pool) +{ + struct wine_cmd_pool *object; + VkResult res; + + TRACE("%p, %p, %p, %p\n", device, info, allocator, command_pool); + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return VK_ERROR_OUT_OF_HOST_MEMORY; + + res = device->funcs.p_vkCreateCommandPool(device->device, info, NULL, &object->command_pool); + + if (res == VK_SUCCESS) + *command_pool = wine_cmd_pool_to_handle(object); + else + heap_free(object); + + return res; +} + +void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool handle, + const VkAllocationCallbacks *allocator) +{ + struct wine_cmd_pool *pool = wine_cmd_pool_from_handle(handle); + + TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(handle), allocator); + + if (!handle) + return; + + if (allocator) + FIXME("Support for allocation callbacks not implemented yet\n"); + + device->funcs.p_vkDestroyCommandPool(device->device, pool->command_pool, NULL); + heap_free(pool); +} + static VkResult wine_vk_enumerate_physical_device_groups(struct VkInstance_T *instance, VkResult (*p_vkEnumeratePhysicalDeviceGroups)(VkInstance, uint32_t *, VkPhysicalDeviceGroupProperties *), uint32_t *count, VkPhysicalDeviceGroupProperties *properties) diff --git a/dlls/winevulkan/vulkan_private.h b/dlls/winevulkan/vulkan_private.h index 2e071a524b1c..f31d4d5d8f52 100644 --- a/dlls/winevulkan/vulkan_private.h +++ b/dlls/winevulkan/vulkan_private.h @@ -110,6 +110,21 @@ struct VkQueue_T VkDeviceQueueCreateFlags flags; }; +struct wine_cmd_pool +{ + VkCommandPool command_pool; +}; + +static inline struct wine_cmd_pool *wine_cmd_pool_from_handle(VkCommandPool handle) +{ + return (struct wine_cmd_pool *)(uintptr_t)handle; +} + +static inline VkCommandPool wine_cmd_pool_to_handle(struct wine_cmd_pool *cmd_pool) +{ + return (VkCommandPool)(uintptr_t)cmd_pool; +} + void *wine_vk_get_device_proc_addr(const char *name) DECLSPEC_HIDDEN; void *wine_vk_get_instance_proc_addr(const char *name) DECLSPEC_HIDDEN; diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index 9d637bf9eb92..f5cadd8c72b6 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -1744,12 +1744,6 @@ VkResult WINAPI wine_vkCreateBufferView(VkDevice device, const VkBufferViewCreat #endif } -VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool) -{ - TRACE("%p, %p, %p, %p\n", device, pCreateInfo, pAllocator, pCommandPool); - return device->funcs.p_vkCreateCommandPool(device->device, pCreateInfo, NULL, pCommandPool); -} - VkResult WINAPI wine_vkCreateComputePipelines(VkDevice device, VkPipelineCache pipelineCache, uint32_t createInfoCount, const VkComputePipelineCreateInfo *pCreateInfos, const VkAllocationCallbacks *pAllocator, VkPipeline *pPipelines) { #if defined(USE_STRUCT_CONVERSION) @@ -1979,12 +1973,6 @@ void WINAPI wine_vkDestroyBufferView(VkDevice device, VkBufferView bufferView, c device->funcs.p_vkDestroyBufferView(device->device, bufferView, NULL); } -void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator) -{ - TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(commandPool), pAllocator); - device->funcs.p_vkDestroyCommandPool(device->device, commandPool, NULL); -} - void WINAPI wine_vkDestroyDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, const VkAllocationCallbacks *pAllocator) { TRACE("%p, 0x%s, %p\n", device, wine_dbgstr_longlong(descriptorPool), pAllocator); @@ -2744,7 +2732,7 @@ VkResult WINAPI wine_vkResetCommandBuffer(VkCommandBuffer commandBuffer, VkComma VkResult WINAPI wine_vkResetCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolResetFlags flags) { TRACE("%p, 0x%s, %#x\n", device, wine_dbgstr_longlong(commandPool), flags); - return device->funcs.p_vkResetCommandPool(device->device, commandPool, flags); + return device->funcs.p_vkResetCommandPool(device->device, wine_cmd_pool_from_handle(commandPool)->command_pool, flags); } VkResult WINAPI wine_vkResetDescriptorPool(VkDevice device, VkDescriptorPool descriptorPool, VkDescriptorPoolResetFlags flags) @@ -2774,13 +2762,13 @@ VkResult WINAPI wine_vkSetEvent(VkDevice device, VkEvent event) void WINAPI wine_vkTrimCommandPool(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) { TRACE("%p, 0x%s, %#x\n", device, wine_dbgstr_longlong(commandPool), flags); - device->funcs.p_vkTrimCommandPool(device->device, commandPool, flags); + device->funcs.p_vkTrimCommandPool(device->device, wine_cmd_pool_from_handle(commandPool)->command_pool, flags); } static void WINAPI wine_vkTrimCommandPoolKHR(VkDevice device, VkCommandPool commandPool, VkCommandPoolTrimFlags flags) { TRACE("%p, 0x%s, %#x\n", device, wine_dbgstr_longlong(commandPool), flags); - device->funcs.p_vkTrimCommandPoolKHR(device->device, commandPool, flags); + device->funcs.p_vkTrimCommandPoolKHR(device->device, wine_cmd_pool_from_handle(commandPool)->command_pool, flags); } void WINAPI wine_vkUnmapMemory(VkDevice device, VkDeviceMemory memory) diff --git a/dlls/winevulkan/vulkan_thunks.h b/dlls/winevulkan/vulkan_thunks.h index 94e56bb97300..21f9b4817800 100644 --- a/dlls/winevulkan/vulkan_thunks.h +++ b/dlls/winevulkan/vulkan_thunks.h @@ -43,7 +43,9 @@ /* Functions for which we have custom implementations outside of the thunks. */ VkResult WINAPI wine_vkAllocateCommandBuffers(VkDevice device, const VkCommandBufferAllocateInfo *pAllocateInfo, VkCommandBuffer *pCommandBuffers); void WINAPI wine_vkCmdExecuteCommands(VkCommandBuffer commandBuffer, uint32_t commandBufferCount, const VkCommandBuffer *pCommandBuffers); +VkResult WINAPI wine_vkCreateCommandPool(VkDevice device, const VkCommandPoolCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkCommandPool *pCommandPool); VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCreateInfo, const VkAllocationCallbacks *pAllocator, VkDevice *pDevice); +void WINAPI wine_vkDestroyCommandPool(VkDevice device, VkCommandPool commandPool, const VkAllocationCallbacks *pAllocator); void WINAPI wine_vkDestroyDevice(VkDevice device, const VkAllocationCallbacks *pAllocator); void WINAPI wine_vkDestroyInstance(VkInstance instance, const VkAllocationCallbacks *pAllocator); VkResult WINAPI wine_vkEnumerateDeviceExtensionProperties(VkPhysicalDevice physicalDevice, const char *pLayerName, uint32_t *pPropertyCount, VkExtensionProperties *pProperties); -- 2.16.4

1 0

[PATCH 1/2] testbot/web: Make it possible to link to the top and bottom of the page.
by Francois Gouget 30 Aug '18

30 Aug '18

The PageTitle anchor identifies the page's title while the PageEnd one points to the bottom of the page. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/CollectionPage.pm | 2 +- testbot/lib/ObjectModel/CGI/FormPage.pm | 2 +- testbot/lib/WineTestBot/CGI/PageBase.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/CollectionPage.pm b/testbot/lib/ObjectModel/CGI/CollectionPage.pm index 6593afcd2..194379f40 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionPage.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionPage.pm @@ -63,7 +63,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>", $self->escapeHTML($Title), "</h1>\n"; + print "<h1 id='PageTitle'>", $self->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 3a41fe0e6..01f789489 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -86,7 +86,7 @@ sub GenerateTitle($) my $Title = $self->GetTitle(); if ($Title) { - print "<h1>", $self->CGI->escapeHTML($Title), "</h1>\n"; + print "<h1 id='PageTitle'>", $self->CGI->escapeHTML($Title), "</h1>\n"; } } diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index e5b2f2d3b..0eac6b17b 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -328,7 +328,7 @@ sub GenerateFooter($) print <<EOF; </div> - <b class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> + <b id="PageEnd" class="rbottom"><b class="r4"> </b><b class="r3"> </b><b class="r2"> </b><b class="r1"> </b></b> </div> </div> -- 2.18.0

1 1

[PATCH 1/2] testbot/web: Highlight new errors on the JobDetails page.
by Francois Gouget 30 Aug '18

30 Aug '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunBuild.pl | 31 +++++++++++++++++++++++++++ testbot/bin/WineSendLog.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 21 +++++++++++------- testbot/lib/WineTestBot/Steps.pm | 16 +++++++++----- testbot/lib/WineTestBot/StepsTasks.pm | 16 +++++++++----- testbot/web/JobDetails.pl | 24 ++++++++++++++++++++- testbot/web/WineTestBot.css | 1 + 7 files changed, 91 insertions(+), 20 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 117b06551..11b41c67a 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -471,6 +471,37 @@ foreach my $TestInfo (values %{$Impacts->{Tests}}) $TA->Disconnect(); +# +# Grab a copy of the reference logs +# + +# Note that this may be a bit inaccurate right after a Wine commit. +# See WineSendLog.pl for more details. +my $LatestDir = "$DataDir/latest"; +foreach my $TestStep (@{$Job->Steps->GetItems()}) +{ + if (($TestStep->PreviousNo || 0) == $Step->No and + $TestStep->FileType =~ /^exe/) + { + foreach my $TestTask (@{$TestStep->Tasks->GetItems()}) + { + my $RefReport = $TestTask->VM->Name ."_". $TestStep->FileType .".report"; + for my $Suffix ("", ".err") + { + if (-f "$LatestDir/$RefReport$Suffix") + { + unlink "$StepDir/$RefReport$Suffix"; + if (!link "$LatestDir/$RefReport$Suffix", "$StepDir/$RefReport$Suffix") + { + Error "Could not link '$RefReport$Suffix': $!\n"; + } + } + } + } + } +} + + # # Wrap up # diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index a4b1c823d..36d47c3a6 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -288,7 +288,7 @@ EOF { my $LogErrors = $JobErrors->{$Key}->{$LogName}; my $RefFileName = "$DataDir/latest". $StepTask->VM->Name ."_$LogName"; - my ($NewGroups, $NewErrors) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); + my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefFileName, $LogErrors->{Groups}, $LogErrors->{Errors}); if (!$NewGroups) { # There was no reference log (typical of build logs) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 17b9093aa..5120217c0 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -781,8 +781,9 @@ sub _GetLineKey($) Compares the specified errors to the reference log and returns only the ones that are new. -Returns a list of error groups containing new errors and a hashtable containing -the list of new errors for each group. +Returns a list of error groups containing new errors, a hashtable containing +the list of new errors for each group, and a hashtable containing the indices +of the new errors in the input errors list for each group. =back =cut @@ -791,10 +792,10 @@ sub GetNewLogErrors($$$) { my ($RefFileName, $Groups, $Errors) = @_; - my ($_Dummy, $RefErrors, $NoLog) = GetLogErrors($RefFileName); - return (undef, undef) if ($NoLog); + my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); + return (undef, undef) if (!$RefGroups); - my (@NewGroups, %NewErrors); + my (@NewGroups, %NewErrors, %NewIndices); foreach my $GroupName (@$Groups) { if ($RefErrors->{$GroupName}) @@ -802,7 +803,7 @@ sub GetNewLogErrors($$$) my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}, $Errors->{$GroupName}, { keyGen => \&_GetLineKey }); - my $CurrentGroup; + my ($CurrentGroup, $CurrentIndices); while ($Diff->Next()) { # Skip if there are no new lines @@ -812,20 +813,24 @@ sub GetNewLogErrors($$$) { push @NewGroups, $GroupName; $CurrentGroup = $NewErrors{$GroupName} = []; + $CurrentIndices = $NewIndices{$GroupName} = {}; } push @$CurrentGroup, $Diff->Items(2); + $CurrentIndices->{$_} = 1 for ($Diff->Range(2)); } } else { - # This module did not have errors before, so every error is new + # This group did not have errors before, so every error is new push @NewGroups, $GroupName; $NewErrors{$GroupName} = $Errors->{$GroupName}; + $NewIndices{$GroupName} = {}; my $Last = @{$Errors->{$GroupName}} - 1; + $NewIndices{$GroupName}->{$_} = 1 for (0..$Last); } } - return (\@NewGroups, \%NewErrors); + return (\@NewGroups, \%NewErrors, \%NewIndices); } 1; diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 2f5bdb070..ae1180c66 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -146,16 +146,22 @@ sub RmTree($) rmtree($Dir); } -sub GetFullFileName($) +sub GetFullFileName($;$) { - my ($self) = @_; + my ($self, $FileName) = @_; - return undef if (!defined $self->FileName); + $FileName = $self->FileName if (!defined $FileName); + return undef if (!defined $FileName); my ($JobId, $StepNo) = @{$self->GetMasterKey()}; my $Path = "$DataDir/jobs/$JobId/"; - $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); - return $Path . $self->FileName; + foreach my $StepNo ($StepNo, $self->PreviousNo) + { + next if (!$StepNo); + my $Full = "$Path$StepNo/$FileName"; + return $Full if (-f $Full); + } + return $Path . $FileName; } sub UpdateStatus($$) diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm index 4675194e6..a50f61ada 100644 --- a/testbot/lib/WineTestBot/StepsTasks.pm +++ b/testbot/lib/WineTestBot/StepsTasks.pm @@ -40,16 +40,22 @@ sub GetStepDir($) } # See WineTestBot::Step::GetFullFileName() -sub GetFullFileName($) +sub GetFullFileName($;$) { - my ($self) = @_; + my ($self, $FileName) = @_; - return undef if (!defined $self->FileName); + $FileName = $self->FileName if (!defined $FileName); + return undef if (!defined $FileName); my ($JobId, $_StepTaskId) = @{$self->GetMasterKey()}; my $Path = "$DataDir/jobs/$JobId/"; - $Path .= $self->PreviousNo ."/" if ($self->PreviousNo); - return $Path . $self->FileName; + foreach my $StepNo ($self->StepNo, $self->PreviousNo) + { + next if (!$StepNo); + my $Full = "$Path$StepNo/$FileName"; + return $Full if (-f $Full); + } + return $Path . $FileName; } sub GetTaskDir($) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 7dd6aa5e9..d8e55296d 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -25,6 +25,7 @@ package JobDetailsPage; use ObjectModel::CGI::CollectionPage; our @ISA = qw(ObjectModel::CGI::CollectionPage); +use File::Basename; use URI::Escape; use WineTestBot::Config; @@ -490,11 +491,32 @@ EOF } my $Summary = $LogSummaries->{$LogName}; + my $New; + if ($LogName =~ /\.report$/) + { + # Identify new errors in test reports + my $RefFileName = $StepTask->GetFullFileName($VM->Name ."_$LogName"); + (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefFileName, $Summary->{Groups}, $Summary->{Errors}); + } + foreach my $GroupName (@{$Summary->{Groups}}) { print "<div class='LogDllName'>$GroupName:</div>\n" if ($GroupName); + print "<pre><code>"; - print $self->escapeHTML($_), "\n" for (@{$Summary->{Errors}->{$GroupName}}); + my $ErrIndex = 0; + foreach my $Line (@{$Summary->{Errors}->{$GroupName}}) + { + if ($New and $New->{$GroupName}->{$ErrIndex}) + { + print "<span class='log-new'>", $self->escapeHTML($Line), "</span>\n"; + } + else + { + print $self->escapeHTML($Line), "\n"; + } + $ErrIndex++; + } print "</code></pre>\n"; } } diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 55c61a300..df683f863 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -381,6 +381,7 @@ pre .log-error { color: red; } .log-boterror { color: #cc0052; } .log-diag { color: #e56300; } +.log-new { color: #e56e00; font-weight: bold; } a.title { color:inherit; text-decoration: none; } -- 2.18.0

1 1

[PATCH] testbot/WineSendLog: Report TestBot errors to the mailing list too.
by Francois Gouget 29 Aug '18

29 Aug '18

TestBot errors may or may not be caused by the patch but either way they make it impossible to know if there are new errors. Thus the patch requires extra scrutiny anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index b0efa8c33..a4b1c823d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -279,13 +279,10 @@ EOF my $StepTask = $StepsTasks->GetItem($Key); my $TaskDir = $StepTask->GetTaskDir(); - if ($StepTask->Status eq "boterror") - { - # TestBot errors are not the developer's fault and prevent us from - # identifying new errors. So skip. - Error "A Task error was found in '$TaskDir/log.err'\n"; - next; - } + # Note: We could check $StepTask->Status for TestBot errors. However, + # whether they are caused by the patch or not, they prevent the TestBot + # from checking for new errors which justifies sending an email to the + # mailing list so that the patch receives greater scrutiny. foreach my $LogName (@{$JobErrors->{$Key}->{LogNames}}) { -- 2.18.0

1 0

[PATCH] testbot/web: Allow hiding the full log with a double-click.
by Francois Gouget 29 Aug '18

29 Aug '18

This saves the user from having to search for the hard to find start of the (build) log. Special care is taken to not disable word-based selection when double-clicking on the log text itself. To switch back to the summary view one must therefore double-click to the right of the end-of-line. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 41 +++++++++++++++++++++++++++++++++------ 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 37185eb1f..51fb2e9dd 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -252,7 +252,7 @@ sub InitMoreInfo($) } } -sub GenerateMoreInfoLink($$$;$) +sub GetMoreInfoLink($$$$;$) { my ($self, $LinkKey, $Label, $Set, $Value) = @_; @@ -295,6 +295,14 @@ sub GenerateMoreInfoLink($$$;$) } } $Url .= "#k" . uri_escape($LinkKey); + return ($Action, $Url); +} + +sub GenerateMoreInfoLink($$$$;$) +{ + my ($self, $LinkKey, $Label, $Set, $Value) = @_; + + my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; if ($Action eq "Hide") @@ -309,9 +317,9 @@ sub GetErrorCategory($) return "error"; } -sub GenerateFullLog($$;$) +sub GenerateFullLog($$$;$) { - my ($self, $FileName, $Header) = @_; + my ($self, $FileName, $HideLog, $Header) = @_; my $GetCategory = $FileName =~ /\.err$/ ? \&GetErrorCategory : $FileName =~ /\.report$/ ? \&GetReportLineCategory : @@ -326,7 +334,7 @@ sub GenerateFullLog($$;$) if ($IsEmpty) { print $Header if (defined $Header); - print "<pre><code>"; + print "<pre$HideLog><code>"; $IsEmpty = 0; } @@ -353,6 +361,23 @@ sub GenerateBody($) $self->InitMoreInfo(); + print <<EOF; +<script type='text/javascript'> + +</script> +EOF + print "<div class='Content'>\n"; my $Keys = $self->SortKeys(undef, $self->{Collection}->GetKeys()); foreach my $Key (@$Keys) @@ -397,7 +422,11 @@ sub GenerateBody($) # Show this log in full, highlighting the important lines # - my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}"); + my ($Action, $Url) = $self->GetMoreInfoLink($Key, GetLogLabel($MoreInfo->{Full}), "Full", $MoreInfo->{Full}); + $Url = $self->CGI->escapeHTML($Url); + my $HideLog = $Action eq "Hide" ? " ondblclick='HideLog(event, \"$Url\")'" : ""; + + my $LogIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}", $HideLog); my $EmptyDiag; if ($LogIsEmpty) { @@ -420,7 +449,7 @@ sub GenerateBody($) my $ErrHeader = $MoreInfo->{Full} =~ /\.report/ ? "report" : "task"; $ErrHeader = "old $ErrHeader" if ($MoreInfo->{Full} =~ /^old_/); $ErrHeader = "<div class='HrTitle'>". ucfirst($ErrHeader) ." errors<div class='HrLine'></div></div>"; - my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $ErrHeader); + my $ErrIsEmpty = $self->GenerateFullLog("$TaskDir/$MoreInfo->{Full}.err", $HideLog, $ErrHeader); print $EmptyDiag if ($ErrIsEmpty and defined $EmptyDiag); } else -- 2.18.0

1 0

wine-3.0.3-rc1 Available
by Michael Stefaniuc 29 Aug '18

29 Aug '18

Hello guys, I have pushed wine-3.0.3-rc1 (with tag) to https://github.com/mstefani/wine-stable/tree/stable http://static-winehq.193b.starter-ca-central-1.openshiftapps.com/stable/ Still nothing fancy so going straight to the interesting pieces from the ANNOUNCE file: What's new in this release (see below for details): - Various bug fixes ---------------------------------------------------------------- Bugs fixed in 3.0.3 (total 53): 18164 dlls/iphlpapi/ifenum.c: compiler warnings on NetBSD 18734 DlgDirList(DDL_DRIVES|DDL_DIRECTORY) on 16-bits displays files on listbox in Windows but not Wine. 21404 winedbg does not support fixed host:port parameter 24374 Driller crashes in process PE entry point due to Wine's mis-align workaround for 32-bit entry point asm wrapper (MoleBox Ultra v4.x) 24641 ProPresenter 4.x (.NET 3.5 WPF app) fails on startup (devenum CreateInstance() doesn't support IID_IUnknown) 27497 Regedit mangles registry keys containing embedded NULLs 30713 Microsoft Visual C++ 64-bit redistributables get incorrectly installed into SysWOW64 (system directory for 32-bit files) when run under 64-bit Wine 32907 AMMYY Admin v3.0 crashes at startup in Win7 mode ('NtSetInformationToken' needs to support 'TokenSessionId') 34910 WinLaunch 0.4.x (OSX Style free Launcher) complains about missing "%USERPROFILE%\\Application Data\\Microsoft\\Windows\\Themes\\" directory 35928 Crash handlers/debuggers fail to display user-interface when invoked for crashing (non-interactive) service processes (inherited Wine service window station/desktop) 38849 valgrind shows an uninitialized variable in programs/cmd/tests/batch.c:WCMD_assoc 38886 AArch64 platforms: ABI Problems wrt varargs (needs arm64 specific __builtin_ms_va_list) 39078 Visual Pinball 8.x, 9.x, 10.x crash on exit after creating a new table, needs support for VBScript IActiveScriptDebug 40271 Can't start UPlay: "Connection Lost" error 40694 Invalid behavior of "C: && echo haha" or "C: & echo haha" 40742 cmd.exe: buffer overflow while parsing qualifiers 42304 Caladrius Blaze, Raiden IV: Overkill show black screen on title menu (needs native vcrun2013) 42599 Max Payne 3 (Steam) crashes in DX9 mode 42602 ::CompareItem(LPCOMPAREITEMSTRUCT lpCompareItemStruct) bad sort compared to Windows 42669 SolveigMM Video Splitter Business Edition v6.1: Crashes inside gdi32.GetCharacterPlacementW 43300 wchar.h missing wmemchr, wmemcmp, wmemcpy, wmemmove, and wmemset 43607 Akiba's Trip Undead & Undressed requires MFStartup to return S_OK. 44001 Empire of the Ants (french version "les fourmis") - game crashed 44334 'start /W "" notepad' does not wait as on native. 44399 WickrMe 4.19.7: Crashes due to stub combase.RoGetActivationFactory 44845 Bankperfect plugin installater Echéancier hangs during install 44895 League Of Legends: Unable to log in if behind OpenWRT based router 44952 cmd.exe skips statements after if statement inside for loop 44953 Adobe Premiere Elements 14 (trial) crashes inside winmm.dll 44976 ConEmu-Maximus5 Windows console emulator causes crash of builtin 'wineconsole.exe' (division by zero) 45051 cmd.exe for loop does not resolve wildcards with subdirectory 45067 UNORM/SNORM immediate constants not supported for UAV stores (Claybook, Just Cause 3) 45078 UFOHD2 crashes inside devenum 45081 DsEnumerateDomainTrusts stubbed without A/W suffix 45118 Microsoft Windows PowerShell 6.x reports 'PowerShell Gallery is currently unavailable.' (WinHttpSetOption returns incorrect lasterror on unsupported options) 45143 Neoncron 2 Launcher crashes embedding IE browser process when clicking bottom menu items 45170 Cygwin/MSYS2 needs EXDEV error code mapped to STATUS_NOT_SAME_DEVICE (rename of cross-device links) 45179 iTunes 12.x installer freezes at the final step 45220 Regression: Hearthstone-Deck-Tracker stoped working after wine-2.21 45243 Wrong cast in some HANDLE_MSG_WM_* macros produces errors when compiling with wineg++ 45274 Multiple applications crash on unimplemented function msvcp140.dll.?_Syserror_map@std@@YAPEBDH@Z (Native Instruments Traktor Pro 2) 45299 Adobe flash player online installer fails the download 45317 updating wine mono does not change version in uninstaller.exe 45333 Add diagnostic 'mscoree.dll.CorIsLatestSvc' stub (NGEN service) to hint at broken Microsoft .NET Frameworks installation (Wine-Mono not uninstalled and/or 'mscoree.dll' placeholders not removed prior install) 45359 SHGetKnownFolderPath doesn't handle flag KF_FLAG_DONT_UNEXPAND 45378 vSphere 5.5 client 'hcmon.sys' driver crashes on unimplemented function ntoskrnl.exe.IoUnregisterPlugPlayNotification 45387 arm64_map_dwarf_register: Don't know how to map register (64-66) 45393 TextureCookerService.exe (part of ArcGIS Desktop 10.6) needs api-ms-win-crt-stdio-l1-1-0.dll.gets_s 45394 Reinstalling ArcGIS Desktop 10.6 calls unimplemented function msvcr120.dll._SetWinRTOutOfMemoryExceptionCallback 45403 dwarf2_parse_variable(): Assertion `subpgm->func' failed 45428 Crash Bandicoot N. Sane Trilogy (Steam) crashes while entering main menu in ntdll.NtGetContextThread() with NULL context 45439 Visual Basic setup toolkit fails to run if path contains a voiced Katakana character. 45445 1C:Enterprise 8 platform doesn't install ---------------------------------------------------------------- Changes since 3.0.2: Akihiro Sagawa (2): kernel32/tests: Add more LCMapString tests. kernel32: Fix LCMapString(LCMAP_HALFWIDTH) in some cases. Alex Henrie (9): comctl32/listview: Don't invalidate when new style is same as old. include: Add wmemchr to wchar.h. include: Add wmemcmp to wchar.h. include: Add wmemcpy to wchar.h. include: Add wmemmove to wchar.h. include: Add wmemset to wchar.h. iphlpapi: Cast caddr_t to char* before doing pointer arithmetic. gdi32: Add DECLSPEC_HOTPATCH to GetDIBits. gdi32: Fix memory leak on error in PATH_WidenPath (Coverity). Alex Villacís Lasso (1): user.exe16: Fix handling of DDL_DRIVES flag in DlgDirList. Alexandre Julliard (3): winex11: Don't allocate a window surface for off-screen windows. winex11: Support using an ARGB visual as default visual. winex11: Use the client window support also for XComposite child windows. Alistair Leslie-Hughes (4): msvcrtd: Forward operator_new_dbg to msvcrt. mfplat: Return S_OK from MFStartup stub. combase/tests: Add RoGetActivationFactory tests. netapi32: Add DsEnumerateDomainTrustsA/W stubs. André Hentschel (3): dbghelp: Recompute location after fixing it. dbghelp: Map SIMD dwarf registers on ARM64. winedbg: Check for visible window station before displaying crash dialog. Austin English (1): winecfg: Recommend against overriding secur32. Bernhard Übelacker (1): cmd: Avoid having first parameter to start.exe ignored. Dmitry Timoshkov (4): user32/tests: Add a test for WM_MEASUREITEM when inserting an item to an owner-drawn listbox. user32/tests: Add a message test for an owner-drawn sorted listbox. user32: Fix order of items passed in WM_COMPAREITEM data. user32: Fix the listbox sorting algorithm. Fabian Maurer (2): wineconsole: When loading settings for an application, respect a 0 in FontSize. wrc: Don't crash when parsing COMBOBOX element without style. Hans Leidekker (4): ws2_32: Enable IP_DONTFRAGMENT by default for SOCK_STREAM sockets. winhttp: Fix invalid option error returned from WinHttpSetOption. winhttp: Store the server certificate context in the request. webservices: Avoid a warning from HeapDestroy. Hugh McMaster (2): regedit/tests: Add tests for values with embedded null characters. regedit: Stop exporting REG_SZ data at the first NUL character. Jason Edmeades (5): cmd: Fix issue in WCMD_assoc highlighted by valgrind. cmd: Support "c:<space>" etc when changing drive letters. cmd: Fix subdirectory prefix in for loops. cmd: Expand the storage space for qualifiers. cmd: Fix statements after 'else' inside for loops. Johannes Brandstätter (1): ntdll: Check for NULL context in NtGetContextThread. Józef Kucia (4): shell32: Accept more flags in SHGetKnownFolderPath(). wined3d: Fix snorm/unorm immediate values for UAV writes. wined3d: Add GPU information for AMD Radeon RX Vega. wined3d: Add GPU information for Intel HD Graphics 630. Louis Lenders (4): winmm: Return error in waveOutMessage if either dwParam1 or dwParam2 is null. winmm: Return error in waveInMessage if either dwParam1 or dwParam2 is null. mscoree: Add stub for CorIsLatestSvc to hint user at broken .NET installation. ntoskrnl.exe: Add stub for IoUnregisterPlugPlayNotification. Marcos Gutierrez (1): include: Fixed casts in some HANDLE_MSG_WM_* macros. Martin Storsjo (1): arm64: Use __builtin_ms_va_list and __attribute__((ms_abi)) on arm64. Matej Špindler (1): kernel32: Check for LOCALE_NOUSEROVERRIDE for neutral locales. Michael Müller (9): include: Add activation.idl with IActivationFactory interface. include/roapi.h: Add further typedefs. combase: Implement RoGetActivationFactory. combase: Implement RoActivateInstance. secur32: Set output buffer size to zero during handshake when no data needs to be sent. ntdll: Return success for TokenSessionId in NtSetInformationToken. dxdiagn: Add several more fields for DisplayDevices. gdi32: Treat lpResults as optional in GetCharacterPlacement. msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. Nikolay Sivov (2): comctl32/trackbar: Don't update page size if it was explicitly set. comctl32/trackbar: Fix reseting to default page size. Piotr Caban (5): msvcr80: Add gets_s implementation. include/msvcrt: Add POSIX error codes to errno.h. msvcp110: Add _Syserror_map implementation. msvcp90: Don't set failbit in basic_istream::tellg. msi: Fix condition evaluation when comparing literal and integer. Qian Hong (1): server: Map EXDEV to STATUS_NOT_SAME_DEVICE. Sebastian Lackner (2): shell32: Create Microsoft\Windows\Themes directory during prefix creation. kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround. Vincent Povirk (3): mscoree: Use upgrade code to find installed Wine Mono version. gdi32: Check for truncated EMF files. gdi32: Check that emf records are within the file. Zebediah Figura (9): winedbg: Add support for starting on a user-supplied port. msi: Disable WoW redirection when installing a 64-bit package. devenum/tests: Test all registered categories. devenum: Check for null pointer in IMoniker_BindToObject(). jscript: Avoid crash when calling stringify() with no arguments. advapi32: Correctly translate SERVICE_REQUIRED_PRIVILEGES_INFO to RPC. vbscript: Add stub IActiveScriptDebug interface. devenum: Merge factory.c into devenum_main.c. devenum: Use separate factories for CLSID_SystemDeviceEnum and CLSID_CDeviceMoniker. Zhiyi Zhang (1): gdiplus: Fix a memory leak. -- Michael Stefaniuc mstefani(a)winehq.org

1 0

[PATCH] oleaut32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 29 Aug '18

29 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/oleaut.c | 6 +-- dlls/oleaut32/olefont.c | 4 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/tmarshal.c | 12 +++--- dlls/oleaut32/typelib.c | 8 ++-- dlls/oleaut32/varformat.c | 66 +++++++++++------------------ dlls/oleaut32/variant.c | 4 +- dlls/oleaut32/vartype.c | 103 +++++++++++++++++++++------------------------ 8 files changed, 90 insertions(+), 115 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index d03893a938..20e8d73318 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -122,9 +122,7 @@ static inline bstr_t *bstr_from_str(BSTR str) static inline bstr_cache_entry_t *get_cache_entry_from_idx(unsigned cache_idx) { - return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) - ? bstr_cache + cache_idx - : NULL; + return bstr_cache_enabled && cache_idx < ARRAY_SIZE(bstr_cache) ? bstr_cache + cache_idx : NULL; } static inline bstr_cache_entry_t *get_cache_entry(size_t size) @@ -304,7 +302,7 @@ void WINAPI SysFreeString(BSTR str) } } - if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { + if(cache_entry->cnt < ARRAY_SIZE(cache_entry->buf)) { cache_entry->buf[(cache_entry->head+cache_entry->cnt) % BUCKET_BUFFER_SIZE] = bstr; cache_entry->cnt++; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c20093c702..9628dc091e 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -591,7 +591,7 @@ static void realize_font(OLEFontImpl *This) if(This->gdiFont) { old_font = SelectObject(hdc, This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + GetTextFaceW(hdc, ARRAY_SIZE(text_face), text_face); SelectObject(hdc, old_font); dec_int_ref(This->gdiFont); This->gdiFont = 0; @@ -645,7 +645,7 @@ static void realize_font(OLEFontImpl *This) /* Fixup the name and charset properties so that they match the selected font */ old_font = SelectObject(get_dc(), This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + GetTextFaceW(hdc, ARRAY_SIZE(text_face), text_face); if(lstrcmpiW(text_face, This->description.lpstrName)) { HeapFree(GetProcessHeap(), 0, This->description.lpstrName); diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 0ef0ecfeb6..03fd6cf521 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -2395,7 +2395,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, if (strncmpW(szURLorPath, file, 5) == 0) { DWORD size; hRes = CoInternetParseUrl(szURLorPath, PARSE_PATH_FROM_URL, 0, path_buf, - sizeof(path_buf)/sizeof(WCHAR), &size, 0); + ARRAY_SIZE(path_buf), &size, 0); if (FAILED(hRes)) return hRes; diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index e0e1e083c4..1e1688e690 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -387,8 +387,8 @@ _get_typeinfo_for_iid(REFIID riid, ITypeInfo **typeinfo) *typeinfo = NULL; moduleW[0] = 0; - if (!actctx_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0]))) { - hres = reg_get_typelib_module(riid, moduleW, sizeof(moduleW)/sizeof(moduleW[0])); + if (!actctx_get_typelib_module(riid, moduleW, ARRAY_SIZE(moduleW))) { + hres = reg_get_typelib_module(riid, moduleW, ARRAY_SIZE(moduleW)); if (FAILED(hres)) return hres; } @@ -1470,9 +1470,9 @@ static DWORD WINAPI xCall(int method, void **args) /* Need them for hack below */ memset(names,0,sizeof(names)); - if (ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[0]),&nrofnames)) + if (ITypeInfo_GetNames(tinfo,fdesc->memid,names,ARRAY_SIZE(names),&nrofnames)) nrofnames = 0; - if (nrofnames > sizeof(names)/sizeof(names[0])) + if (nrofnames > ARRAY_SIZE(names)) ERR("Need more names!\n"); xargs = (DWORD *)(args + 1); @@ -2125,8 +2125,8 @@ TMStubImpl_Invoke( /* Need them for hack below */ memset(names,0,sizeof(names)); - ITypeInfo_GetNames(tinfo,fdesc->memid,names,sizeof(names)/sizeof(names[0]),&nrofnames); - if (nrofnames > sizeof(names)/sizeof(names[0])) { + ITypeInfo_GetNames(tinfo,fdesc->memid,names,ARRAY_SIZE(names),&nrofnames); + if (nrofnames > ARRAY_SIZE(names)) { ERR("Need more names!\n"); } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b907c96699..2c0a519679 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -328,7 +328,7 @@ static HRESULT query_typelib_path( REFGUID guid, WORD wMaj, WORD wMin, return TYPE_E_LIBNOTREGISTERED; nameW = (WCHAR*)((BYTE*)data.lpSectionBase + tlib->name_offset); - len = SearchPathW( NULL, nameW, NULL, sizeof(Path)/sizeof(WCHAR), Path, NULL ); + len = SearchPathW( NULL, nameW, NULL, ARRAY_SIZE( Path ), Path, NULL ); if (!len) return TYPE_E_LIBNOTREGISTERED; TRACE_(typelib)("got path from context %s\n", debugstr_w(Path)); @@ -969,11 +969,11 @@ enddeleteloop: /* check if there is anything besides the FLAGS/HELPDIR keys. If there is, we don't delete them */ - tmpLength = sizeof(subKeyName)/sizeof(WCHAR); + tmpLength = ARRAY_SIZE(subKeyName); deleteOtherStuff = TRUE; i = 0; while(RegEnumKeyExW(key, i++, subKeyName, &tmpLength, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { - tmpLength = sizeof(subKeyName)/sizeof(WCHAR); + tmpLength = ARRAY_SIZE(subKeyName); /* if its not FLAGS or HELPDIR, then we must keep the rest of the key */ if (!strcmpW(subKeyName, FLAGSW)) continue; @@ -7751,7 +7751,7 @@ static BOOL CALLBACK search_res_tlb(HMODULE hModule, LPCWSTR lpszType, LPWSTR lp if (!(len = GetModuleFileNameW(hModule, szPath, MAX_PATH))) return TRUE; - if (snprintfW(szPath + len, sizeof(szPath)/sizeof(WCHAR) - len, formatW, LOWORD(lpszName)) < 0) + if (snprintfW(szPath + len, ARRAY_SIZE(szPath) - len, formatW, LOWORD(lpszName)) < 0) return TRUE; ret = LoadTypeLibEx(szPath, REGKIND_NONE, &pTLib); diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index 696763e7ed..470ea4e01b 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -449,8 +449,7 @@ static inline const BYTE *VARIANT_GetNamedFormat(LPCWSTR lpszFormat) LPCNAMED_FORMAT fmt; key.name = lpszFormat; - fmt = bsearch(&key, VARIANT_NamedFormats, - sizeof(VARIANT_NamedFormats)/sizeof(NAMED_FORMAT), + fmt = bsearch(&key, VARIANT_NamedFormats, ARRAY_SIZE(VARIANT_NamedFormats), sizeof(NAMED_FORMAT), FormatCompareFn); return fmt ? fmt->format : NULL; } @@ -764,7 +763,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, TRACE("time sep\n"); } else if ((*pFormat == 'a' || *pFormat == 'A') && - !strncmpiW(pFormat, szAMPM, sizeof(szAMPM)/sizeof(WCHAR))) + !strncmpiW(pFormat, szAMPM, ARRAY_SIZE(szAMPM))) { /* Date formats: System AM/PM designation * Other formats: Literal @@ -772,8 +771,8 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, */ header->type = FMT_TYPE_DATE; NEED_SPACE(sizeof(BYTE)); - pFormat += sizeof(szAMPM)/sizeof(WCHAR); - if (!strncmpW(pFormat, szampm, sizeof(szampm)/sizeof(WCHAR))) + pFormat += ARRAY_SIZE(szAMPM); + if (!strncmpW(pFormat, szampm, ARRAY_SIZE(szampm))) *pOut++ = FMT_DATE_AMPM_SYS2; else *pOut++ = FMT_DATE_AMPM_SYS1; @@ -811,8 +810,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, *pLastHours = *pLastHours + 2; TRACE("A/P\n"); } - else if (*pFormat == 'a' && - !strncmpW(pFormat, szamSlashpm, sizeof(szamSlashpm)/sizeof(WCHAR))) + else if (*pFormat == 'a' && !strncmpW(pFormat, szamSlashpm, ARRAY_SIZE(szamSlashpm))) { /* Date formats: lowercase AM or PM designation * Other formats: Literal @@ -820,14 +818,13 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, */ header->type = FMT_TYPE_DATE; NEED_SPACE(sizeof(BYTE)); - pFormat += sizeof(szamSlashpm)/sizeof(WCHAR); + pFormat += ARRAY_SIZE(szamSlashpm); *pOut++ = FMT_DATE_AMPM_LOWER; if (pLastHours) *pLastHours = *pLastHours + 2; TRACE("AM/PM\n"); } - else if (*pFormat == 'A' && - !strncmpW(pFormat, szAMSlashPM, sizeof(szAMSlashPM)/sizeof(WCHAR))) + else if (*pFormat == 'A' && !strncmpW(pFormat, szAMSlashPM, ARRAY_SIZE(szAMSlashPM))) { /* Date formats: Uppercase AM or PM designation * Other formats: Literal @@ -835,7 +832,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, */ header->type = FMT_TYPE_DATE; NEED_SPACE(sizeof(BYTE)); - pFormat += sizeof(szAMSlashPM)/sizeof(WCHAR); + pFormat += ARRAY_SIZE(szAMSlashPM); *pOut++ = FMT_DATE_AMPM_UPPER; TRACE("AM/PM\n"); } @@ -847,7 +844,7 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, */ header->type = FMT_TYPE_DATE; NEED_SPACE(sizeof(BYTE)); - pFormat += sizeof(szAMSlashPM)/sizeof(WCHAR); + pFormat += ARRAY_SIZE(szAMSlashPM); *pOut++ = FMT_DATE_GENERAL; TRACE("gen date\n"); } @@ -989,14 +986,14 @@ HRESULT WINAPI VarTokenizeFormatString(LPOLESTR lpszFormat, LPBYTE rgbTok, fmt_state &= ~FMT_STATE_OPEN_COPY; } else if ((*pFormat == 't' || *pFormat == 'T') && - !strncmpiW(pFormat, szTTTTT, sizeof(szTTTTT)/sizeof(WCHAR))) + !strncmpiW(pFormat, szTTTTT, ARRAY_SIZE(szTTTTT))) { /* Date formats: System time specifier * Other formats: Literal * Types the format if found */ header->type = FMT_TYPE_DATE; - pFormat += sizeof(szTTTTT)/sizeof(WCHAR); + pFormat += ARRAY_SIZE(szTTTTT); NEED_SPACE(sizeof(BYTE)); *pOut++ = FMT_DATE_TIME_SYS; fmt_state &= ~FMT_STATE_OPEN_COPY; @@ -1316,8 +1313,7 @@ static HRESULT VARIANT_FormatNumber(LPVARIANT pVarIn, LPOLESTR lpszFormat, if (numHeader->flags & FMT_FLAG_THOUSANDS) { - if (!GetLocaleInfoW(lcid, LOCALE_STHOUSAND, thousandSeparator, - sizeof(thousandSeparator)/sizeof(WCHAR))) + if (!GetLocaleInfoW(lcid, LOCALE_STHOUSAND, thousandSeparator, ARRAY_SIZE(thousandSeparator))) { thousandSeparator[0] = ','; thousandSeparator[1] = 0; @@ -1555,8 +1551,7 @@ VARIANT_FormatNumber_Bool: } if (localeValue) { - if (GetLocaleInfoW(lcid, localeValue, pBuff, - sizeof(buff)/sizeof(WCHAR)-(pBuff-buff))) + if (GetLocaleInfoW(lcid, localeValue, pBuff, ARRAY_SIZE(buff)-(pBuff-buff))) { TRACE("added %s\n", debugstr_w(pBuff)); while (*pBuff) @@ -1875,8 +1870,7 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, if (localeValue) { *pBuff = '\0'; - if (GetLocaleInfoW(lcid, localeValue, pBuff, - sizeof(buff)/sizeof(WCHAR)-(pBuff-buff))) + if (GetLocaleInfoW(lcid, localeValue, pBuff, ARRAY_SIZE(buff)-(pBuff-buff))) { TRACE("added %s\n", debugstr_w(pBuff)); while (*pBuff) @@ -1892,9 +1886,8 @@ static HRESULT VARIANT_FormatDate(LPVARIANT pVarIn, LPOLESTR lpszFormat, { WCHAR fmt_buff[80]; - if (!GetLocaleInfoW(lcid, dwFmt, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || - !get_date_format(lcid, 0, &udate.st, fmt_buff, pBuff, - sizeof(buff)/sizeof(WCHAR)-(pBuff-buff))) + if (!GetLocaleInfoW(lcid, dwFmt, fmt_buff, ARRAY_SIZE(fmt_buff)) || + !get_date_format(lcid, 0, &udate.st, fmt_buff, pBuff, ARRAY_SIZE(buff)-(pBuff-buff))) { hRes = E_INVALIDARG; goto VARIANT_FormatDate_Exit; @@ -2293,8 +2286,7 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT { WCHAR grouping[16]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, - sizeof(grouping)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) @@ -2310,14 +2302,11 @@ HRESULT WINAPI VarFormatNumber(LPVARIANT pVarIn, INT nDigits, INT nLeading, INT numfmt.NegativeOrder = 1; /* 1 = "-xxx" */ numfmt.lpDecimalSep = decimal; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, - sizeof(decimal)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, - sizeof(thousands)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, thousands, ARRAY_SIZE(thousands)); - if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, - buff, sizeof(buff)/sizeof(WCHAR))) + if (GetNumberFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff))) { *pbstrOut = SysAllocString(buff); if (!*pbstrOut) @@ -2473,8 +2462,7 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, { WCHAR grouping[16]; grouping[2] = '\0'; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, - sizeof(grouping)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, grouping, ARRAY_SIZE(grouping)); numfmt.Grouping = grouping[2] == '2' ? 32 : grouping[0] - '0'; } else if (nGrouping == -1) @@ -2492,18 +2480,14 @@ HRESULT WINAPI VarFormatCurrency(LPVARIANT pVarIn, INT nDigits, INT nLeading, GETLOCALENUMBER(LOCALE_ICURRENCY, PositiveOrder); numfmt.lpDecimalSep = decimal; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, - sizeof(decimal)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, decimal, ARRAY_SIZE(decimal)); numfmt.lpThousandSep = thousands; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, - sizeof(thousands)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, thousands, ARRAY_SIZE(thousands)); numfmt.lpCurrencySymbol = currency; - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, - sizeof(currency)/sizeof(WCHAR)); + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, currency, ARRAY_SIZE(currency)); /* use NLS as per VarFormatNumber() */ - if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, - buff, sizeof(buff)/sizeof(WCHAR))) + if (GetCurrencyFormatW(LOCALE_USER_DEFAULT, 0, V_BSTR(&vStr), &numfmt, buff, ARRAY_SIZE(buff))) { *pbstrOut = SysAllocString(buff); if (!*pbstrOut) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index b9cf4b0a00..1fa2a6d6fa 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1549,7 +1549,7 @@ static void VARIANT_GetLocalisedNumberChars(VARIANT_NUMBER_CHARS *lpChars, LCID /* Local currency symbols are often 2 characters */ lpChars->cCurrencyLocal2 = '\0'; - switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, sizeof(buff)/sizeof(WCHAR))) + switch(GetLocaleInfoW(lcid, lctype|LOCALE_SCURRENCY, buff, ARRAY_SIZE(buff))) { case 3: lpChars->cCurrencyLocal2 = buff[1]; /* Fall through */ case 2: lpChars->cCurrencyLocal = buff[0]; @@ -1610,7 +1610,7 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, VARIANT_NUMBER_CHARS chars; BYTE rgbTmp[1024]; DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS; - int iMaxDigits = sizeof(rgbTmp) / sizeof(BYTE); + int iMaxDigits = ARRAY_SIZE(rgbTmp); int cchUsed = 0; TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 232a58fe27..e2df87328c 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -95,7 +95,7 @@ static HRESULT VARIANT_NumberFromBstr(OLECHAR* pStrIn, LCID lcid, ULONG ulFlags, BYTE rgb[1024]; /* Use VarParseNumFromStr/VarNumFromParseNum as MSDN indicates */ - np.cDig = sizeof(rgb) / sizeof(BYTE); + np.cDig = ARRAY_SIZE(rgb); np.dwInFlags = NUMPRS_STD; hRet = VarParseNumFromStr(pStrIn, lcid, ulFlags, &np, rgb); @@ -4496,15 +4496,15 @@ static HRESULT VARIANT_DecScale(const DECIMAL** ppDecLeft, di.scale -= i; remainder = 0; - while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD))) + while (i-- > 0 && !VARIANT_int_iszero(di.bitsnum, ARRAY_SIZE(di.bitsnum))) { - remainder = VARIANT_int_divbychar(di.bitsnum, sizeof(di.bitsnum)/sizeof(DWORD), 10); + remainder = VARIANT_int_divbychar(di.bitsnum, ARRAY_SIZE(di.bitsnum), 10); if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder); } /* round up the result - native oleaut32 does this */ if (remainder >= 5) { - for (remainder = 1, i = 0; i < sizeof(di.bitsnum)/sizeof(DWORD) && remainder; i++) { + for (remainder = 1, i = 0; i < ARRAY_SIZE(di.bitsnum) && remainder; i++) { ULONGLONG digit = di.bitsnum[i] + 1; remainder = (digit > 0xFFFFFFFF) ? 1 : 0; di.bitsnum[i] = digit & 0xFFFFFFFF; @@ -4743,7 +4743,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI memset(running, 0, sizeof(running)); /* count number of leading zero-bytes in operand A */ - for (mulstart = sizeof(a->bitsnum)/sizeof(DWORD) - 1; mulstart >= 0 && !a->bitsnum[mulstart]; mulstart--); + for (mulstart = ARRAY_SIZE(a->bitsnum) - 1; mulstart >= 0 && !a->bitsnum[mulstart]; mulstart--); if (mulstart < 0) { /* result is 0, because operand A is 0 */ result->scale = 0; @@ -4757,7 +4757,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI ULONG iOverflowMul; int iB; - for (iOverflowMul = 0, iB = 0; iB < sizeof(b->bitsnum)/sizeof(DWORD); iB++) { + for (iOverflowMul = 0, iB = 0; iB < ARRAY_SIZE(b->bitsnum); iB++) { ULONG iRV; int iR; @@ -4789,11 +4789,10 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI This operation *will* lose significant digits of the result because all the factors of 10 were consumed by the previous operation. */ - while (result->scale > 0 && !VARIANT_int_iszero( - running + sizeof(result->bitsnum) / sizeof(DWORD), - (sizeof(running) - sizeof(result->bitsnum)) / sizeof(DWORD))) { - - remainder = VARIANT_int_divbychar(running, sizeof(running) / sizeof(DWORD), 10); + while (result->scale > 0 && !VARIANT_int_iszero(running + ARRAY_SIZE(result->bitsnum), + ARRAY_SIZE(running) - ARRAY_SIZE(result->bitsnum))) { + + remainder = VARIANT_int_divbychar(running, ARRAY_SIZE(running), 10); if (remainder > 0) WARN("losing significant digits (remainder %u)...\n", remainder); result->scale--; } @@ -4801,7 +4800,7 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI /* round up the result - native oleaut32 does this */ if (remainder >= 5) { unsigned int i; - for (remainder = 1, i = 0; i < sizeof(running)/sizeof(DWORD) && remainder; i++) { + for (remainder = 1, i = 0; i < ARRAY_SIZE(running) && remainder; i++) { ULONGLONG digit = running[i] + 1; remainder = (digit > 0xFFFFFFFF) ? 1 : 0; running[i] = digit & 0xFFFFFFFF; @@ -4811,9 +4810,8 @@ static int VARIANT_DI_mul(const VARIANT_DI * a, const VARIANT_DI * b, VARIANT_DI /* Signal overflow if scale == 0 and 256-bit result still overflows, and copy result bits into result structure */ - r_overflow = !VARIANT_int_iszero( - running + sizeof(result->bitsnum)/sizeof(DWORD), - (sizeof(running) - sizeof(result->bitsnum))/sizeof(DWORD)); + r_overflow = !VARIANT_int_iszero(running + ARRAY_SIZE(result->bitsnum), + ARRAY_SIZE(running) - ARRAY_SIZE(result->bitsnum)); memcpy(result->bitsnum, running, sizeof(result->bitsnum)); } return r_overflow; @@ -4831,7 +4829,7 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n unsigned int i; /* place negative sign */ - if (!VARIANT_int_iszero(a->bitsnum, sizeof(a->bitsnum) / sizeof(DWORD)) && a->sign) { + if (!VARIANT_int_iszero(a->bitsnum, ARRAY_SIZE(a->bitsnum)) && a->sign) { if (n > 0) { *s++ = '-'; n--; @@ -4849,8 +4847,8 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n i = 0; memcpy(quotient, a->bitsnum, sizeof(a->bitsnum)); - while (!overflow && !VARIANT_int_iszero(quotient, sizeof(quotient) / sizeof(DWORD))) { - remainder = VARIANT_int_divbychar(quotient, sizeof(quotient) / sizeof(DWORD), 10); + while (!overflow && !VARIANT_int_iszero(quotient, ARRAY_SIZE(quotient))) { + remainder = VARIANT_int_divbychar(quotient, ARRAY_SIZE(quotient), 10); if (i + 2 > n) { overflow = TRUE; } else { @@ -4859,7 +4857,7 @@ static BOOL VARIANT_DI_tostringW(const VARIANT_DI * a, WCHAR * s, unsigned int n } } - if (!overflow && !VARIANT_int_iszero(a->bitsnum, sizeof(a->bitsnum) / sizeof(DWORD))) { + if (!overflow && !VARIANT_int_iszero(a->bitsnum, ARRAY_SIZE(a->bitsnum))) { /* reverse order of digits */ WCHAR * x = s; WCHAR * y = s + i - 1; @@ -5175,10 +5173,10 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di { HRESULT r_overflow = S_OK; - if (VARIANT_int_iszero(divisor->bitsnum, sizeof(divisor->bitsnum)/sizeof(DWORD))) { + if (VARIANT_int_iszero(divisor->bitsnum, ARRAY_SIZE(divisor->bitsnum))) { /* division by 0 */ r_overflow = DISP_E_DIVBYZERO; - } else if (VARIANT_int_iszero(dividend->bitsnum, sizeof(dividend->bitsnum)/sizeof(DWORD))) { + } else if (VARIANT_int_iszero(dividend->bitsnum, ARRAY_SIZE(dividend->bitsnum))) { VARIANT_DI_clear(quotient); } else { int quotientscale, remainderscale, tempquotientscale; @@ -5208,17 +5206,14 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); memcpy(remainderplusquotient, dividend->bitsnum, sizeof(dividend->bitsnum)); do { - VARIANT_int_div( - remainderplusquotient, 4, - divisor->bitsnum, sizeof(divisor->bitsnum)/sizeof(DWORD)); - underflow = VARIANT_int_addlossy( - quotient->bitsnum, &quotientscale, sizeof(quotient->bitsnum) / sizeof(DWORD), - remainderplusquotient, &tempquotientscale, 4); + VARIANT_int_div(remainderplusquotient, 4, divisor->bitsnum, ARRAY_SIZE(divisor->bitsnum)); + underflow = VARIANT_int_addlossy( quotient->bitsnum, &quotientscale, + ARRAY_SIZE(quotient->bitsnum), remainderplusquotient, &tempquotientscale, 4); if (round_remainder) { if(remainderplusquotient[4] >= 5){ unsigned int i; unsigned char remainder = 1; - for (i = 0; i < sizeof(quotient->bitsnum) / sizeof(DWORD) && remainder; i++) { + for (i = 0; i < ARRAY_SIZE(quotient->bitsnum) && remainder; i++) { ULONGLONG digit = quotient->bitsnum[i] + 1; remainder = (digit > 0xFFFFFFFF) ? 1 : 0; quotient->bitsnum[i] = digit & 0xFFFFFFFF; @@ -5239,9 +5234,9 @@ static HRESULT VARIANT_DI_div(const VARIANT_DI * dividend, const VARIANT_DI * di while (r_overflow == S_OK && quotientscale < 0) { memset(remainderplusquotient, 0, sizeof(remainderplusquotient)); memcpy(remainderplusquotient, quotient->bitsnum, sizeof(quotient->bitsnum)); - VARIANT_int_mulbychar(remainderplusquotient, sizeof(remainderplusquotient)/sizeof(DWORD), 10); - if (VARIANT_int_iszero(remainderplusquotient + sizeof(quotient->bitsnum)/sizeof(DWORD), - (sizeof(remainderplusquotient) - sizeof(quotient->bitsnum))/sizeof(DWORD))) { + VARIANT_int_mulbychar(remainderplusquotient, ARRAY_SIZE(remainderplusquotient), 10); + if (VARIANT_int_iszero(remainderplusquotient + ARRAY_SIZE(quotient->bitsnum), + ARRAY_SIZE(remainderplusquotient) - ARRAY_SIZE(quotient->bitsnum))) { quotientscale++; memcpy(quotient->bitsnum, remainderplusquotient, sizeof(quotient->bitsnum)); } else r_overflow = DISP_E_OVERFLOW; @@ -5562,9 +5557,9 @@ static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecR WARN("result scale is %u, scaling (with loss of significant digits)...\n", di_result.scale); while (di_result.scale > DEC_MAX_SCALE && - !VARIANT_int_iszero(di_result.bitsnum, sizeof(di_result.bitsnum) / sizeof(DWORD))) + !VARIANT_int_iszero(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum))) { - remainder = VARIANT_int_divbychar(di_result.bitsnum, sizeof(di_result.bitsnum) / sizeof(DWORD), 10); + remainder = VARIANT_int_divbychar(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum), 10); di_result.scale--; } if (di_result.scale > DEC_MAX_SCALE) @@ -5576,7 +5571,7 @@ static HRESULT VARIANT_do_division(const DECIMAL *pDecLeft, const DECIMAL *pDecR else if (remainder >= 5) /* round up result - native oleaut32 does this */ { unsigned int i; - for (remainder = 1, i = 0; i < sizeof(di_result.bitsnum) / sizeof(DWORD) && remainder; i++) { + for (remainder = 1, i = 0; i < ARRAY_SIZE(di_result.bitsnum) && remainder; i++) { ULONGLONG digit = di_result.bitsnum[i] + 1; remainder = (digit > 0xFFFFFFFF) ? 1 : 0; di_result.bitsnum[i] = digit & 0xFFFFFFFF; @@ -5648,9 +5643,9 @@ HRESULT WINAPI VarDecMul(const DECIMAL* pDecLeft, const DECIMAL* pDecRight, DECI WARN("result scale is %u, scaling (with loss of significant digits)...\n", di_result.scale); while (di_result.scale > DEC_MAX_SCALE && - !VARIANT_int_iszero(di_result.bitsnum, sizeof(di_result.bitsnum)/sizeof(DWORD))) + !VARIANT_int_iszero(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum))) { - VARIANT_int_divbychar(di_result.bitsnum, sizeof(di_result.bitsnum)/sizeof(DWORD), 10); + VARIANT_int_divbychar(di_result.bitsnum, ARRAY_SIZE(di_result.bitsnum), 10); di_result.scale--; } if (di_result.scale > DEC_MAX_SCALE) @@ -6357,9 +6352,8 @@ static BSTR VARIANT_MakeBstr(LCID lcid, DWORD dwFlags, WCHAR *szOut) { /* Format the number for the locale */ szConverted[0] = '\0'; - GetNumberFormatW(lcid, - dwFlags & LOCALE_NOUSEROVERRIDE, - szOut, NULL, szConverted, sizeof(szConverted)/sizeof(WCHAR)); + GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE, + szOut, NULL, szConverted, ARRAY_SIZE(szConverted)); szOut = szConverted; } return SysAllocStringByteLen((LPCSTR)szOut, strlenW(szOut) * sizeof(WCHAR)); @@ -6368,7 +6362,7 @@ static BSTR VARIANT_MakeBstr(LCID lcid, DWORD dwFlags, WCHAR *szOut) /* Create a (possibly localised) BSTR from a UI8 and sign */ static HRESULT VARIANT_BstrFromUInt(ULONG64 ulVal, LCID lcid, DWORD dwFlags, BSTR *pbstrOut) { - WCHAR szBuff[64], *szOut = szBuff + sizeof(szBuff)/sizeof(WCHAR) - 1; + WCHAR szBuff[64], *szOut = szBuff + ARRAY_SIZE(szBuff) - 1; if (!pbstrOut) return E_INVALIDARG; @@ -6472,7 +6466,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl appropriate NUMBERFMTW structure to do the job via GetNumberFormatW(). */ GetLocaleInfoW(lcid, LOCALE_SDECIMAL | (dwFlags & LOCALE_NOUSEROVERRIDE), - lpDecimalSep, sizeof(lpDecimalSep) / sizeof(WCHAR)); + lpDecimalSep, ARRAY_SIZE(lpDecimalSep)); if (lpDecimalSep[0] == '.' && lpDecimalSep[1] == '\0') { /* locale is compatible with English - return original string */ @@ -6497,7 +6491,7 @@ static BSTR VARIANT_BstrReplaceDecimal(const WCHAR * buff, LCID lcid, ULONG dwFl if (p) minFormat.NumDigits = strlenW(p + 1); numbuff[0] = '\0'; - if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, sizeof(numbuff) / sizeof(WCHAR))) + if (!GetNumberFormatW(lcid, 0, buff, &minFormat, numbuff, ARRAY_SIZE(numbuff))) { WARN("GetNumberFormatW() failed, returning raw number string instead\n"); bstrOut = SysAllocString(buff); @@ -6541,7 +6535,7 @@ static HRESULT VARIANT_BstrFromReal(DOUBLE dblIn, LCID lcid, ULONG dwFlags, /* Format the number for the locale */ numbuff[0] = '\0'; GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE, - buff, NULL, numbuff, sizeof(numbuff) / sizeof(WCHAR)); + buff, NULL, numbuff, ARRAY_SIZE(numbuff)); TRACE("created NLS string %s\n", debugstr_w(numbuff)); *pbstrOut = SysAllocString(numbuff); } @@ -6632,7 +6626,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) VARIANT_int_add(decVal.bitsnum, 3, &one, 1); } decVal.bitsnum[2] = 0; - VARIANT_DI_tostringW(&decVal, buff, sizeof(buff)/sizeof(buff[0])); + VARIANT_DI_tostringW(&decVal, buff, ARRAY_SIZE(buff)); if (dwFlags & LOCALE_USE_NLS) { @@ -6641,7 +6635,7 @@ HRESULT WINAPI VarBstrFromCy(CY cyIn, LCID lcid, ULONG dwFlags, BSTR *pbstrOut) /* Format the currency for the locale */ cybuff[0] = '\0'; GetCurrencyFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE, - buff, NULL, cybuff, sizeof(cybuff) / sizeof(WCHAR)); + buff, NULL, cybuff, ARRAY_SIZE(cybuff)); *pbstrOut = SysAllocString(cybuff); } else @@ -6814,8 +6808,8 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst if (dwFlags & VAR_TIMEVALUEONLY) date[0] = '\0'; else - if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, sizeof(fmt_buff)/sizeof(WCHAR)) || - !get_date_format(lcid, dwFlags, &st, fmt_buff, date, sizeof(date)/sizeof(WCHAR))) + if (!GetLocaleInfoW(lcid, LOCALE_SSHORTDATE, fmt_buff, ARRAY_SIZE(fmt_buff)) || + !get_date_format(lcid, dwFlags, &st, fmt_buff, date, ARRAY_SIZE(date))) return E_INVALIDARG; if (!(dwFlags & VAR_DATEVALUEONLY)) @@ -6823,8 +6817,7 @@ HRESULT WINAPI VarBstrFromDate(DATE dateIn, LCID lcid, ULONG dwFlags, BSTR* pbst time = date + strlenW(date); if (time != date) *time++ = ' '; - if (!GetTimeFormatW(lcid, dwFormatFlags, &st, NULL, time, - sizeof(date)/sizeof(WCHAR)-(time-date))) + if (!GetTimeFormatW(lcid, dwFormatFlags, &st, NULL, time, ARRAY_SIZE(date)-(time-date))) return E_INVALIDARG; } @@ -7012,7 +7005,7 @@ HRESULT WINAPI VarBstrFromDec(DECIMAL* pDecIn, LCID lcid, ULONG dwFlags, BSTR* p /* Format the number for the locale */ numbuff[0] = '\0'; GetNumberFormatW(lcid, dwFlags & LOCALE_NOUSEROVERRIDE, - buff, NULL, numbuff, sizeof(numbuff) / sizeof(WCHAR)); + buff, NULL, numbuff, ARRAY_SIZE(numbuff)); TRACE("created NLS string %s\n", debugstr_w(numbuff)); *pbstrOut = SysAllocString(numbuff); } @@ -7625,7 +7618,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd 1,2,3,4,5,6,7,8,9,10,11,12,13 }; unsigned int i; - BSTR tokens[sizeof(ParseDateTokens)/sizeof(ParseDateTokens[0])]; + BSTR tokens[ARRAY_SIZE(ParseDateTokens)]; DATEPARSE dp; DWORD dwDateSeps = 0, iDate = 0; HRESULT hRet = S_OK; @@ -7648,7 +7641,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd TRACE("iDate is %d\n", iDate); /* Get the month/day/am/pm tokens for this locale */ - for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++) + for (i = 0; i < ARRAY_SIZE(tokens); i++) { WCHAR buff[128]; LCTYPE lctype = ParseDateTokens[i] | (dwFlags & LOCALE_NOUSEROVERRIDE); @@ -7657,7 +7650,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd * GetAltMonthNames(). We should really cache these strings too. */ buff[0] = '\0'; - GetLocaleInfoW(lcid, lctype, buff, sizeof(buff)/sizeof(WCHAR)); + GetLocaleInfoW(lcid, lctype, buff, ARRAY_SIZE(buff)); tokens[i] = SysAllocString(buff); TRACE("token %d is %s\n", i, debugstr_w(tokens[i])); } @@ -7680,7 +7673,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd { BOOL bFound = FALSE; - for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++) + for (i = 0; i < ARRAY_SIZE(tokens); i++) { DWORD dwLen = strlenW(tokens[i]); if (dwLen && !strncmpiW(strIn, tokens[i], dwLen)) @@ -7940,7 +7933,7 @@ HRESULT WINAPI VarDateFromStr(OLECHAR* strIn, LCID lcid, ULONG dwFlags, DATE* pd } } - for (i = 0; i < sizeof(tokens)/sizeof(tokens[0]); i++) + for (i = 0; i < ARRAY_SIZE(tokens); i++) SysFreeString(tokens[i]); return hRet; } -- 2.14.4

1 0

[PATCH] include: Add IOpcFactory and related definitions.
by Nikolay Sivov 29 Aug '18

29 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 4 ++ include/msopc.idl | 84 ++++++++++++++++++++++++++++++++++++++ include/opcbase.idl | 28 +++++++++++++ include/opcobjectmodel.idl | 34 +++++++++++++++ include/opcparturi.idl | 71 ++++++++++++++++++++++++++++++++ 5 files changed, 221 insertions(+) create mode 100644 include/msopc.idl create mode 100644 include/opcbase.idl create mode 100644 include/opcobjectmodel.idl create mode 100644 include/opcparturi.idl diff --git a/include/Makefile.in b/include/Makefile.in index a89fef6eac..ffecb98d9e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -399,6 +399,7 @@ SOURCES = \ msident.idl \ msinkaut.idl \ msiquery.h \ + msopc.idl \ mssip.h \ msstkppg.h \ mstask.idl \ @@ -493,6 +494,9 @@ SOURCES = \ oledberr.h \ oledlg.h \ oleidl.idl \ + opcbase.idl \ + opcobjectmodel.idl \ + opcparturi.idl \ opnrst.idl \ optary.idl \ patchapi.h \ diff --git a/include/msopc.idl b/include/msopc.idl new file mode 100644 index 0000000000..f60ff68712 --- /dev/null +++ b/include/msopc.idl @@ -0,0 +1,84 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +import "opcbase.idl"; +import "opcobjectmodel.idl"; +import "opcparturi.idl"; + +interface IOpcUri; +interface IOpcPartUri; +interface IOpcPackage; +interface IOpcDigitalSignatureManager; + +[ + object, + uuid(6d0b4446-cd73-4ab3-94f4-8ccdf6116154), + pointer_default(ref) +] +interface IOpcFactory : IUnknown +{ + HRESULT CreatePackageRootUri( + [out, retval] IOpcUri **uri + ); + + HRESULT CreatePartUri( + [in, string] LPCWSTR uri, + [out, retval] IOpcPartUri **part_uri + ); + + [local] + HRESULT CreateStreamOnFile( + [in, string] LPCWSTR filename, + [in] OPC_STREAM_IO_MODE io_mode, + [in, unique] SECURITY_ATTRIBUTES *sa, + [in] DWORD flags, + [out, retval] IStream **stream + ); + + HRESULT CreatePackage( + [out, retval] IOpcPackage **package + ); + + HRESULT ReadPackageFromStream( + [in] IStream *stream, + [in] OPC_READ_FLAGS flags, + [out, retval] IOpcPackage **package + ); + + HRESULT WritePackageToStream( + [in] IOpcPackage *package, + [in] OPC_WRITE_FLAGS flags, + [in] IStream *stream + ); + + HRESULT CreateDigitalSignatureManager( + [in] IOpcPackage *package, + [out, retval] IOpcDigitalSignatureManager **signature_manager + ); +} + +[ + uuid(6b2d6Ba0-9f3e-4f27-920b-313cc426a39e) +] +coclass OpcFactory +{ + interface IOpcFactory; +}; diff --git a/include/opcbase.idl b/include/opcbase.idl new file mode 100644 index 0000000000..2cfb885c12 --- /dev/null +++ b/include/opcbase.idl @@ -0,0 +1,28 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_STREAM_IO_READ = 1, + OPC_STREAM_IO_WRITE = 2, +} OPC_STREAM_IO_MODE; + diff --git a/include/opcobjectmodel.idl b/include/opcobjectmodel.idl new file mode 100644 index 0000000000..e5370d2e54 --- /dev/null +++ b/include/opcobjectmodel.idl @@ -0,0 +1,34 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +typedef [v1_enum] enum +{ + OPC_READ_DEFAULT = 0, + OPC_VALIDATE_ON_LOAD = 1, + OPC_CACHE_ON_ACCESS = 2, +} OPC_READ_FLAGS; + +typedef [v1_enum] enum +{ + OPC_WRITE_DEFAULT = 0, + OPC_WRITE_FORCE_ZIP32 = 1, +} OPC_WRITE_FLAGS; diff --git a/include/opcparturi.idl b/include/opcparturi.idl new file mode 100644 index 0000000000..00b21b9598 --- /dev/null +++ b/include/opcparturi.idl @@ -0,0 +1,71 @@ +/* + * Copyright 2018 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "unknwn.idl"; +import "ocidl.idl"; + +#if 0 +#pragma makedep install +#endif + +interface IOpcPartUri; + +[ + object, + uuid(bc9c1b9b-d62c-49eb-aef0-3b4e0b28ebed), + nonextensible, + pointer_default(ref) +] +interface IOpcUri : IUri +{ + HRESULT GetRelationshipsPartUri( + [out, retval] IOpcPartUri **part_uri + ); + + HRESULT GetRelativeUri( + [in] IOpcPartUri *part_uri, + [out, retval] IUri **relative_uri + ); + + HRESULT CombinePartUri( + [in] IUri *relative_uri, + [out, retval] IOpcPartUri **combined + ); +} + +[ + object, + uuid(7d3babe7-88b2-46ba-85cb-4203cb016c87), + nonextensible, + pointer_default(ref) +] +interface IOpcPartUri : IOpcUri +{ + HRESULT ComparePartUri( + [in] IOpcPartUri *part_uri, + [out, retval] INT32 *result + ); + + HRESULT GetSourceUri( + [out, retval] IOpcUri **source_uri + ); + + HRESULT IsRelationshipsPartUri( + [out, retval] BOOL *result + ); +} -- 2.18.0

1 0

[PATCH] winevulkan: Add DOOM_VFR to vkGetDeviceProcAddr quirk
by Andrew Eikum 29 Aug '18

29 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 89df838f04..01c84ed6fe 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -743,6 +743,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName) { if (!strcmp(app_info->pApplicationName, "DOOM") + || !strcmp(app_info->pApplicationName, "DOOM_VFR") || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } -- 2.18.0

2 1

[PATCH] comctl32/tests: Fix a memory leak.
by Zhiyi Zhang 29 Aug '18

29 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index db8d2b0156..b27ab844b7 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -32,8 +32,9 @@ static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); -static HIMAGELIST(WINAPI *pImageList_Create)(int, int, UINT, int, int); -static int(WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); /****************** button message test *************************/ #define ID_BUTTON 0x000e @@ -82,6 +83,7 @@ static void init_functions(void) #define X(f) p##f = (void *)GetProcAddress(hmod, #f); X(ImageList_Create); X(ImageList_Add); + X(ImageList_Destroy); #undef X } @@ -1352,6 +1354,8 @@ static void test_get_set_imagelist(void) DestroyWindow(hwnd); } + + pImageList_Destroy(himl); } static void test_get_set_textmargin(void) -- 2.18.0

1 0

[PATCH 4/5] msi: Handle the remote case in MsiSummaryInfoGetProperty.
by Dmitry Timoshkov 29 Aug '18

29 Aug '18

This patch fixes the regression introduced by bf5589311de8ac2c74e3bd73bef32337a2ce8df2. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 58 +++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.c | 7 ----- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 60 insertions(+), 7 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index af8b03cacd..2045123c42 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -725,7 +725,27 @@ UINT WINAPI MsiSummaryInfoGetPropertyA( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WCHAR *buf = NULL; + + /* FIXME: should use SEH */ + if (!puiDataType || !piValue || !pftValue || !szValueBuf || !pcchValueBuf) + return RPC_X_NULL_REF_POINTER; + + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + if (!r) + r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE ); + + midl_user_free( buf ); + return r; + } + return ERROR_INVALID_HANDLE; + } str.unicode = FALSE; str.str.a = szValueBuf; @@ -753,7 +773,27 @@ UINT WINAPI MsiSummaryInfoGetPropertyW( } if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WCHAR *buf = NULL; + + /* FIXME: should use SEH */ + if (!puiDataType || !piValue || !pftValue || !szValueBuf || !pcchValueBuf) + return RPC_X_NULL_REF_POINTER; + + r = remote_SummaryInfoGetProperty( remote, uiProperty, puiDataType, piValue, pftValue, &buf ); + if (!r) + r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf ); + + midl_user_free( buf ); + return r; + } + return ERROR_INVALID_HANDLE; + } str.unicode = TRUE; str.str.w = szValueBuf; @@ -1134,3 +1174,21 @@ UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *coun { return MsiSummaryInfoGetPropertyCount( suminfo, count ); } + +UINT __cdecl s_remote_SummaryInfoGetProperty( MSIHANDLE suminfo, UINT property, UINT *type, + INT *value, FILETIME *ft, LPWSTR *buf ) +{ + WCHAR empty[1]; + DWORD size = 0; + UINT r; + + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, empty, &size ); + if (r == ERROR_MORE_DATA) + { + size++; + *buf = midl_user_allocate( size * sizeof(WCHAR) ); + if (!*buf) return ERROR_OUTOFMEMORY; + r = MsiSummaryInfoGetPropertyW( suminfo, property, type, value, ft, *buf, &size ); + } + return r; +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index eb0ed625ef..a727bbd4df 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -464,7 +464,6 @@ static void test_db(MSIHANDLE hinst) ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); type = 0xdeadbeef; @@ -472,11 +471,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); @@ -486,11 +482,8 @@ todo_wine strcpy(buffer, "deadbeef"); sz = sizeof(buffer); r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, type == 0, "got %u\n", type); -todo_wine ok(hinst, int_value == 0, "got %u\n", int_value); ok(hinst, sz == sizeof(buffer), "got %u\n", sz); ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 5a14ffdb79..ebbca82a16 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -75,6 +75,8 @@ interface IWineMsiRemote UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + UINT remote_SummaryInfoGetProperty( [in] MSIHANDLE suminfo, [in] UINT property, [out] UINT *type, [out] INT *value, + [out] FILETIME *ft, [out, string] LPWSTR *buf ); MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); -- 2.17.1

4 4

[PATCH v2] jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll.
by Piotr Caban 29 Aug '18

29 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix test failures dlls/jsproxy/main.c | 11 +++-------- dlls/jsproxy/tests/jsproxy.c | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 8 deletions(-)

1 0

[PATCH 6/6] dxgi: Rename remaining "This" variables.
by Józef Kucia 29 Aug '18

29 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/device.c | 14 +++++++------- dlls/dxgi/surface.c | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 5607c380f1ff..67cadd5a3f89 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -33,7 +33,7 @@ static inline struct dxgi_device *impl_from_IWineDXGIDevice(IWineDXGIDevice *ifa static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *iface, REFIID riid, void **object) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); TRACE("iface %p, riid %s, object %p\n", iface, debugstr_guid(riid), object); @@ -49,10 +49,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa return S_OK; } - if (This->child_layer) + if (device->child_layer) { - TRACE("forwarding to child layer %p.\n", This->child_layer); - return IUnknown_QueryInterface(This->child_layer, riid, object); + TRACE("Forwarding to child layer %p.\n", device->child_layer); + return IUnknown_QueryInterface(device->child_layer, riid, object); } WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); @@ -63,10 +63,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_QueryInterface(IWineDXGIDevice *ifa static ULONG STDMETHODCALLTYPE dxgi_device_AddRef(IWineDXGIDevice *iface) { - struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct dxgi_device *device = impl_from_IWineDXGIDevice(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u\n", device, refcount); return refcount; } diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index ad72a2c73613..1f53b25a9124 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -90,23 +90,23 @@ static inline struct dxgi_surface *impl_from_IDXGISurface1(IDXGISurface1 *iface) static HRESULT STDMETHODCALLTYPE dxgi_surface_QueryInterface(IDXGISurface1 *iface, REFIID riid, void **object) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_QueryInterface(This->outer_unknown, riid, object); + return IUnknown_QueryInterface(surface->outer_unknown, riid, object); } static ULONG STDMETHODCALLTYPE dxgi_surface_AddRef(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_AddRef(This->outer_unknown); + return IUnknown_AddRef(surface->outer_unknown); } static ULONG STDMETHODCALLTYPE dxgi_surface_Release(IDXGISurface1 *iface) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("Forwarding to outer IUnknown\n"); - return IUnknown_Release(This->outer_unknown); + return IUnknown_Release(surface->outer_unknown); } /* IDXGIObject methods */ @@ -143,22 +143,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetPrivateData(IDXGISurface1 *ifac static HRESULT STDMETHODCALLTYPE dxgi_surface_GetParent(IDXGISurface1 *iface, REFIID riid, void **parent) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, parent %p.\n", iface, debugstr_guid(riid), parent); - return IDXGIDevice_QueryInterface(This->device, riid, parent); + return IDXGIDevice_QueryInterface(surface->device, riid, parent); } /* IDXGIDeviceSubObject methods */ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDevice(IDXGISurface1 *iface, REFIID riid, void **device) { - struct dxgi_surface *This = impl_from_IDXGISurface1(iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); TRACE("iface %p, riid %s, device %p.\n", iface, debugstr_guid(riid), device); - return IDXGIDevice_QueryInterface(This->device, riid, device); + return IDXGIDevice_QueryInterface(surface->device, riid, device); } /* IDXGISurface methods */ -- 2.16.4

2 1

[PATCH 5/6] dxgi/tests: Run test_swapchain_resize() on D3D12.
by Józef Kucia 29 Aug '18

29 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/dxgi.c | 266 +++++++++++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 107 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 56065456eb0d..376c1ecd6fdf 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -3026,38 +3026,105 @@ static void test_private_data(void) ok(!refcount, "Test object has %u references left.\n", refcount); } -static void test_swapchain_resize(void) +#define check_surface_desc(a, b) check_surface_desc_(__LINE__, a, b) +static void check_surface_desc_(unsigned int line, IDXGISurface *surface, + const DXGI_SWAP_CHAIN_DESC *swapchain_desc) +{ + DXGI_SURFACE_DESC surface_desc; + HRESULT hr; + + hr = IDXGISurface_GetDesc(surface, &surface_desc); + ok_(__FILE__, line)(hr == S_OK, "Failed to get surface desc, hr %#x.\n", hr); + ok_(__FILE__, line)(surface_desc.Width == swapchain_desc->BufferDesc.Width, + "Got Width %u, expected %u.\n", surface_desc.Width, swapchain_desc->BufferDesc.Width); + ok_(__FILE__, line)(surface_desc.Height == swapchain_desc->BufferDesc.Height, + "Got Height %u, expected %u.\n", surface_desc.Height, swapchain_desc->BufferDesc.Height); + ok_(__FILE__, line)(surface_desc.Format == swapchain_desc->BufferDesc.Format, + "Got Format %#x, expected %#x.\n", surface_desc.Format, swapchain_desc->BufferDesc.Format); + ok_(__FILE__, line)(surface_desc.SampleDesc.Count == 1, + "Got unexpected SampleDesc.Count %u.\n", surface_desc.SampleDesc.Count); + ok_(__FILE__, line)(!surface_desc.SampleDesc.Quality, + "Got unexpected SampleDesc.Quality %u.\n", surface_desc.SampleDesc.Quality); +} + +#define check_texture_desc(a, b) check_texture_desc_(__LINE__, a, b) +static void check_texture_desc_(unsigned int line, ID3D10Texture2D *texture, + const DXGI_SWAP_CHAIN_DESC *swapchain_desc) { - DXGI_SWAP_CHAIN_DESC swapchain_desc; D3D10_TEXTURE2D_DESC texture_desc; - DXGI_SURFACE_DESC surface_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ok_(__FILE__, line)(texture_desc.Width == swapchain_desc->BufferDesc.Width, + "Got Width %u, expected %u.\n", texture_desc.Width, swapchain_desc->BufferDesc.Width); + ok_(__FILE__, line)(texture_desc.Height == swapchain_desc->BufferDesc.Height, + "Got Height %u, expected %u.\n", texture_desc.Height, swapchain_desc->BufferDesc.Height); + ok_(__FILE__, line)(texture_desc.MipLevels == 1, "Got unexpected MipLevels %u.\n", texture_desc.MipLevels); + ok_(__FILE__, line)(texture_desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", texture_desc.ArraySize); + ok_(__FILE__, line)(texture_desc.Format == swapchain_desc->BufferDesc.Format, + "Got Format %#x, expected %#x.\n", texture_desc.Format, swapchain_desc->BufferDesc.Format); + ok_(__FILE__, line)(texture_desc.SampleDesc.Count == 1, + "Got unexpected SampleDesc.Count %u.\n", texture_desc.SampleDesc.Count); + ok_(__FILE__, line)(!texture_desc.SampleDesc.Quality, + "Got unexpected SampleDesc.Quality %u.\n", texture_desc.SampleDesc.Quality); + ok_(__FILE__, line)(texture_desc.Usage == D3D10_USAGE_DEFAULT, + "Got unexpected Usage %#x.\n", texture_desc.Usage); + ok_(__FILE__, line)(texture_desc.BindFlags == D3D10_BIND_RENDER_TARGET, + "Got unexpected BindFlags %#x.\n", texture_desc.BindFlags); + ok_(__FILE__, line)(!texture_desc.CPUAccessFlags, + "Got unexpected CPUAccessFlags %#x.\n", texture_desc.CPUAccessFlags); + ok_(__FILE__, line)(!texture_desc.MiscFlags, "Got unexpected MiscFlags %#x.\n", texture_desc.MiscFlags); +} + +#define check_resource_desc(a, b) check_resource_desc_(__LINE__, a, b) +static void check_resource_desc_(unsigned int line, ID3D12Resource *resource, + const DXGI_SWAP_CHAIN_DESC *swapchain_desc) +{ + D3D12_RESOURCE_DESC resource_desc; + + resource_desc = ID3D12Resource_GetDesc(resource); + ok_(__FILE__, line)(resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D, + "Got unexpected Dimension %#x.\n", resource_desc.Dimension); + ok_(__FILE__, line)(resource_desc.Width == swapchain_desc->BufferDesc.Width, "Got Width %s, expected %u.\n", + wine_dbgstr_longlong(resource_desc.Width), swapchain_desc->BufferDesc.Width); + ok_(__FILE__, line)(resource_desc.Height == swapchain_desc->BufferDesc.Height, + "Got Height %u, expected %u.\n", resource_desc.Height, swapchain_desc->BufferDesc.Height); + ok_(__FILE__, line)(resource_desc.DepthOrArraySize == 1, + "Got unexpected DepthOrArraySize %u.\n", resource_desc.DepthOrArraySize); + ok_(__FILE__, line)(resource_desc.MipLevels == 1, + "Got unexpected MipLevels %u.\n", resource_desc.MipLevels); + ok_(__FILE__, line)(resource_desc.Format == swapchain_desc->BufferDesc.Format, + "Got Format %#x, expected %#x.\n", resource_desc.Format, swapchain_desc->BufferDesc.Format); + ok_(__FILE__, line)(resource_desc.SampleDesc.Count == 1, + "Got unexpected SampleDesc.Count %u.\n", resource_desc.SampleDesc.Count); + ok_(__FILE__, line)(!resource_desc.SampleDesc.Quality, + "Got unexpected SampleDesc.Quality %u.\n", resource_desc.SampleDesc.Quality); + ok_(__FILE__, line)(resource_desc.Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN, + "Got unexpected Layout %#x.\n", resource_desc.Layout); +} + +static void test_swapchain_resize(IUnknown *device, BOOL is_d3d12) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + DXGI_SWAP_EFFECT swap_effect; IDXGISwapChain *swapchain; + ID3D12Resource *resource; ID3D10Texture2D *texture; + HRESULT hr, expected_hr; IDXGISurface *surface; - IDXGIAdapter *adapter; IDXGIFactory *factory; - IDXGIDevice *device; RECT client_rect, r; ULONG refcount; HWND window; - HRESULT hr; BOOL ret; - if (!(device = create_device(0))) - { - skip("Failed to create device, skipping tests.\n"); - return; - } + get_factory(device, is_d3d12, &factory); + window = CreateWindowA("static", "dxgi_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 640, 480, NULL, NULL, NULL, NULL); ret = GetClientRect(window, &client_rect); ok(ret, "Failed to get client rect.\n"); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to get factory, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + swap_effect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.BufferDesc.Width = 640; swapchain_desc.BufferDesc.Height = 480; @@ -3069,19 +3136,25 @@ static void test_swapchain_resize(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = 2; swapchain_desc.OutputWindow = window; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = swap_effect; swapchain_desc.Flags = 0; - hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); - IDXGIFactory_Release(factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); - ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); - ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); + expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource); ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); @@ -3113,39 +3186,25 @@ static void test_swapchain_resize(void) "Got unexpected SampleDesc.Quality %u.\n", swapchain_desc.SampleDesc.Quality); ok(swapchain_desc.BufferUsage == DXGI_USAGE_RENDER_TARGET_OUTPUT, "Got unexpected BufferUsage %#x.\n", swapchain_desc.BufferUsage); - ok(swapchain_desc.BufferCount == 1, + ok(swapchain_desc.BufferCount == 2, "Got unexpected BufferCount %u.\n", swapchain_desc.BufferCount); ok(swapchain_desc.OutputWindow == window, "Got unexpected OutputWindow %p, expected %p.\n", swapchain_desc.OutputWindow, window); ok(swapchain_desc.Windowed, "Got unexpected Windowed %#x.\n", swapchain_desc.Windowed); - ok(swapchain_desc.SwapEffect == DXGI_SWAP_EFFECT_DISCARD, + ok(swapchain_desc.SwapEffect == swap_effect, "Got unexpected SwapEffect %#x.\n", swapchain_desc.SwapEffect); ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(surface_desc.Width == 640, "Got unexpected Width %u.\n", surface_desc.Width); - ok(surface_desc.Height == 480, "Got unexpected Height %u.\n", surface_desc.Height); - ok(surface_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", surface_desc.Format); - ok(surface_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", surface_desc.SampleDesc.Count); - ok(!surface_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", surface_desc.SampleDesc.Quality); + if (surface) + check_surface_desc(surface, &swapchain_desc); + if (texture) + check_texture_desc(texture, &swapchain_desc); + if (resource) + check_resource_desc(resource, &swapchain_desc); - ID3D10Texture2D_GetDesc(texture, &texture_desc); - ok(texture_desc.Width == 640, "Got unexpected Width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 480, "Got unexpected Height %u.\n", texture_desc.Height); - ok(texture_desc.MipLevels == 1, "Got unexpected MipLevels %u.\n", texture_desc.MipLevels); - ok(texture_desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", texture_desc.ArraySize); - ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", texture_desc.Format); - ok(texture_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", texture_desc.SampleDesc.Count); - ok(!texture_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", texture_desc.SampleDesc.Quality); - ok(texture_desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %#x.\n", texture_desc.Usage); - ok(texture_desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %#x.\n", texture_desc.BindFlags); - ok(!texture_desc.CPUAccessFlags, "Got unexpected CPUAccessFlags %#x.\n", texture_desc.CPUAccessFlags); - ok(!texture_desc.MiscFlags, "Got unexpected MiscFlags %#x.\n", texture_desc.MiscFlags); - - hr = IDXGISwapChain_ResizeBuffers(swapchain, 1, 320, 240, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ret = GetClientRect(window, &r); @@ -3178,46 +3237,46 @@ static void test_swapchain_resize(void) "Got unexpected SampleDesc.Quality %u.\n", swapchain_desc.SampleDesc.Quality); ok(swapchain_desc.BufferUsage == DXGI_USAGE_RENDER_TARGET_OUTPUT, "Got unexpected BufferUsage %#x.\n", swapchain_desc.BufferUsage); - ok(swapchain_desc.BufferCount == 1, + ok(swapchain_desc.BufferCount == 2, "Got unexpected BufferCount %u.\n", swapchain_desc.BufferCount); ok(swapchain_desc.OutputWindow == window, "Got unexpected OutputWindow %p, expected %p.\n", swapchain_desc.OutputWindow, window); ok(swapchain_desc.Windowed, "Got unexpected Windowed %#x.\n", swapchain_desc.Windowed); - ok(swapchain_desc.SwapEffect == DXGI_SWAP_EFFECT_DISCARD, + ok(swapchain_desc.SwapEffect == swap_effect, "Got unexpected SwapEffect %#x.\n", swapchain_desc.SwapEffect); ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(surface_desc.Width == 640, "Got unexpected Width %u.\n", surface_desc.Width); - ok(surface_desc.Height == 480, "Got unexpected Height %u.\n", surface_desc.Height); - ok(surface_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", surface_desc.Format); - ok(surface_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", surface_desc.SampleDesc.Count); - ok(!surface_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", surface_desc.SampleDesc.Quality); + if (surface) + { + check_surface_desc(surface, &swapchain_desc); + IDXGISurface_Release(surface); + } + if (texture) + { + check_texture_desc(texture, &swapchain_desc); + ID3D10Texture2D_Release(texture); + } + if (resource) + { + check_resource_desc(resource, &swapchain_desc); + ID3D12Resource_Release(resource); + } - ID3D10Texture2D_GetDesc(texture, &texture_desc); - ok(texture_desc.Width == 640, "Got unexpected Width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 480, "Got unexpected Height %u.\n", texture_desc.Height); - ok(texture_desc.MipLevels == 1, "Got unexpected MipLevels %u.\n", texture_desc.MipLevels); - ok(texture_desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", texture_desc.ArraySize); - ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM, "Got unexpected Format %#x.\n", texture_desc.Format); - ok(texture_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", texture_desc.SampleDesc.Count); - ok(!texture_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", texture_desc.SampleDesc.Quality); - ok(texture_desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %#x.\n", texture_desc.Usage); - ok(texture_desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %#x.\n", texture_desc.BindFlags); - ok(!texture_desc.CPUAccessFlags, "Got unexpected CPUAccessFlags %#x.\n", texture_desc.CPUAccessFlags); - ok(!texture_desc.MiscFlags, "Got unexpected MiscFlags %#x.\n", texture_desc.MiscFlags); - - ID3D10Texture2D_Release(texture); - IDXGISurface_Release(surface); - hr = IDXGISwapChain_ResizeBuffers(swapchain, 1, 320, 240, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 0); - ok(SUCCEEDED(hr), "Failed to resize buffers, hr %#x.\n", hr); + hr = IDXGISwapChain_ResizeBuffers(swapchain, 2, 320, 240, DXGI_FORMAT_B8G8R8A8_UNORM, 0); + ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGISurface, (void **)&surface); - ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + expected_hr = is_d3d12 ? E_NOINTERFACE : S_OK; + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!surface || hr == S_OK, "Got unexpected pointer %p.\n", surface); hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&texture); - ok(SUCCEEDED(hr), "Failed to get buffer, hr %#x.\n", hr); + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!texture || hr == S_OK, "Got unexpected pointer %p.\n", texture); + expected_hr = is_d3d12 ? S_OK : E_NOINTERFACE; + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&resource); + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok(!resource || hr == S_OK, "Got unexpected pointer %p.\n", resource); ret = GetClientRect(window, &r); ok(ret, "Failed to get client rect.\n"); @@ -3237,7 +3296,7 @@ static void test_swapchain_resize(void) ok(swapchain_desc.BufferDesc.RefreshRate.Denominator == 1, "Got unexpected BufferDesc.RefreshRate.Denominator %u.\n", swapchain_desc.BufferDesc.RefreshRate.Denominator); - ok(swapchain_desc.BufferDesc.Format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + ok(swapchain_desc.BufferDesc.Format == DXGI_FORMAT_B8G8R8A8_UNORM, "Got unexpected BufferDesc.Format %#x.\n", swapchain_desc.BufferDesc.Format); ok(swapchain_desc.BufferDesc.ScanlineOrdering == DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED, "Got unexpected BufferDesc.ScanlineOrdering %#x.\n", swapchain_desc.BufferDesc.ScanlineOrdering); @@ -3249,43 +3308,35 @@ static void test_swapchain_resize(void) "Got unexpected SampleDesc.Quality %u.\n", swapchain_desc.SampleDesc.Quality); ok(swapchain_desc.BufferUsage == DXGI_USAGE_RENDER_TARGET_OUTPUT, "Got unexpected BufferUsage %#x.\n", swapchain_desc.BufferUsage); - ok(swapchain_desc.BufferCount == 1, + ok(swapchain_desc.BufferCount == 2, "Got unexpected BufferCount %u.\n", swapchain_desc.BufferCount); ok(swapchain_desc.OutputWindow == window, "Got unexpected OutputWindow %p, expected %p.\n", swapchain_desc.OutputWindow, window); ok(swapchain_desc.Windowed, "Got unexpected Windowed %#x.\n", swapchain_desc.Windowed); - ok(swapchain_desc.SwapEffect == DXGI_SWAP_EFFECT_DISCARD, + ok(swapchain_desc.SwapEffect == swap_effect, "Got unexpected SwapEffect %#x.\n", swapchain_desc.SwapEffect); ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); - hr = IDXGISurface_GetDesc(surface, &surface_desc); - ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); - ok(surface_desc.Width == 320, "Got unexpected Width %u.\n", surface_desc.Width); - ok(surface_desc.Height == 240, "Got unexpected Height %u.\n", surface_desc.Height); - ok(surface_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, "Got unexpected Format %#x.\n", surface_desc.Format); - ok(surface_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", surface_desc.SampleDesc.Count); - ok(!surface_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", surface_desc.SampleDesc.Quality); - - ID3D10Texture2D_GetDesc(texture, &texture_desc); - ok(texture_desc.Width == 320, "Got unexpected Width %u.\n", texture_desc.Width); - ok(texture_desc.Height == 240, "Got unexpected Height %u.\n", texture_desc.Height); - ok(texture_desc.MipLevels == 1, "Got unexpected MipLevels %u.\n", texture_desc.MipLevels); - ok(texture_desc.ArraySize == 1, "Got unexpected ArraySize %u.\n", texture_desc.ArraySize); - ok(texture_desc.Format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, "Got unexpected Format %#x.\n", texture_desc.Format); - ok(texture_desc.SampleDesc.Count == 1, "Got unexpected SampleDesc.Count %u.\n", texture_desc.SampleDesc.Count); - ok(!texture_desc.SampleDesc.Quality, "Got unexpected SampleDesc.Quality %u.\n", texture_desc.SampleDesc.Quality); - ok(texture_desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected Usage %#x.\n", texture_desc.Usage); - ok(texture_desc.BindFlags == D3D10_BIND_RENDER_TARGET, "Got unexpected BindFlags %#x.\n", texture_desc.BindFlags); - ok(!texture_desc.CPUAccessFlags, "Got unexpected CPUAccessFlags %#x.\n", texture_desc.CPUAccessFlags); - ok(!texture_desc.MiscFlags, "Got unexpected MiscFlags %#x.\n", texture_desc.MiscFlags); - - ID3D10Texture2D_Release(texture); - IDXGISurface_Release(surface); + if (surface) + { + check_surface_desc(surface, &swapchain_desc); + IDXGISurface_Release(surface); + } + if (texture) + { + check_texture_desc(texture, &swapchain_desc); + ID3D10Texture2D_Release(texture); + } + if (resource) + { + check_resource_desc(resource, &swapchain_desc); + ID3D12Resource_Release(resource); + } hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); - ok(SUCCEEDED(hr), "Failed to resize buffers, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to resize buffers, hr %#x.\n", hr); memset(&swapchain_desc, 0, sizeof(swapchain_desc)); hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); @@ -3302,7 +3353,7 @@ static void test_swapchain_resize(void) ok(swapchain_desc.BufferDesc.RefreshRate.Denominator == 1, "Got unexpected BufferDesc.RefreshRate.Denominator %u.\n", swapchain_desc.BufferDesc.RefreshRate.Denominator); - ok(swapchain_desc.BufferDesc.Format == DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + ok(swapchain_desc.BufferDesc.Format == DXGI_FORMAT_B8G8R8A8_UNORM, "Got unexpected BufferDesc.Format %#x.\n", swapchain_desc.BufferDesc.Format); ok(swapchain_desc.BufferDesc.ScanlineOrdering == DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED, "Got unexpected BufferDesc.ScanlineOrdering %#x.\n", swapchain_desc.BufferDesc.ScanlineOrdering); @@ -3314,21 +3365,21 @@ static void test_swapchain_resize(void) "Got unexpected SampleDesc.Quality %u.\n", swapchain_desc.SampleDesc.Quality); ok(swapchain_desc.BufferUsage == DXGI_USAGE_RENDER_TARGET_OUTPUT, "Got unexpected BufferUsage %#x.\n", swapchain_desc.BufferUsage); - ok(swapchain_desc.BufferCount == 1, + ok(swapchain_desc.BufferCount == 2, "Got unexpected BufferCount %u.\n", swapchain_desc.BufferCount); ok(swapchain_desc.OutputWindow == window, "Got unexpected OutputWindow %p, expected %p.\n", swapchain_desc.OutputWindow, window); ok(swapchain_desc.Windowed, "Got unexpected Windowed %#x.\n", swapchain_desc.Windowed); - ok(swapchain_desc.SwapEffect == DXGI_SWAP_EFFECT_DISCARD, + ok(swapchain_desc.SwapEffect == swap_effect, "Got unexpected SwapEffect %#x.\n", swapchain_desc.SwapEffect); ok(!swapchain_desc.Flags, "Got unexpected Flags %#x.\n", swapchain_desc.Flags); IDXGISwapChain_Release(swapchain); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(window); + refcount = IDXGIFactory_Release(factory); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_swapchain_parameters(void) @@ -4143,7 +4194,6 @@ START_TEST(dxgi) queue_test(test_get_containing_output); queue_test(test_create_factory); queue_test(test_private_data); - queue_test(test_swapchain_resize); queue_test(test_swapchain_present); queue_test(test_maximum_frame_latency); queue_test(test_output_desc); @@ -4158,6 +4208,7 @@ START_TEST(dxgi) test_resize_target(); test_inexact_modes(); test_swapchain_parameters(); + run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_backbuffer_index); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) @@ -4175,6 +4226,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_backbuffer_index); FreeLibrary(d3d12_module); -- 2.16.4

2 1

[PATCH 4/6] dxgi: Implement d3d12_swapchain_ResizeBuffers().
by Józef Kucia 29 Aug '18

29 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 118 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 71183f6f20bf..b285f3d33e0a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1344,6 +1344,34 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDevice vk_device = swapchain->vk_device; + VkFence vk_fence = swapchain->vk_fence; + VkResult vr; + + if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, + VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) + { + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) + { + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) + { + ERR("Failed to reset fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + return S_OK; +} + static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1700,10 +1728,68 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { - FIXME("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + DXGI_SWAP_CHAIN_DESC1 *desc; + unsigned int i; + ULONG refcount; + HRESULT hr; + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); - return E_NOTIMPL; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + for (i = 0; i < swapchain->buffer_count; ++i) + { + ID3D12Resource_AddRef(swapchain->buffers[i]); + if ((refcount = ID3D12Resource_Release(swapchain->buffers[i]))) + { + WARN("Buffer %p has %u references left.\n", swapchain->buffers[i], refcount); + return DXGI_ERROR_INVALID_CALL; + } + } + + desc = &swapchain->desc; + + if (!buffer_count) + buffer_count = desc->BufferCount; + if (!width || !height) + { + RECT client_rect; + + if (!GetClientRect(swapchain->window, &client_rect)) + { + WARN("Failed to get client rect, last error %#x.\n", GetLastError()); + return DXGI_ERROR_INVALID_CALL; + } + + if (!width) + width = client_rect.right; + if (!height) + height = client_rect.bottom; + } + if (!format) + format = desc->Format; + + if (desc->Width == width && desc->Height == height + && desc->Format == format && desc->BufferCount == buffer_count) + return S_OK; + + d3d12_swapchain_destroy_buffers(swapchain); + + desc->Width = width; + desc->Height = height; + desc->Format = format; + desc->BufferCount = buffer_count; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + return d3d12_swapchain_acquire_next_image(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1800,34 +1886,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } -static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkDevice vk_device = swapchain->vk_device; - VkFence vk_fence = swapchain->vk_fence; - VkResult vr; - - if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, - VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) - { - ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) - { - ERR("Failed to wait for fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) - { - ERR("Failed to reset fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - return S_OK; -} - static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; -- 2.16.4

2 1

[PATCH 3/6] dxgi: Factor out d3d12_swapchain_create_vulkan_swapchain().
by Józef Kucia 29 Aug '18

29 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 228 ++++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 109 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0b651c4853bd..71183f6f20bf 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1023,8 +1023,7 @@ static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, return E_FAIL; } -static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_format) +static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; @@ -1043,8 +1042,8 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; image_info.imageType = VK_IMAGE_TYPE_2D; image_info.format = vk_format; - image_info.extent.width = swapchain_desc->Width; - image_info.extent.height = swapchain_desc->Height; + image_info.extent.width = swapchain->desc.Width; + image_info.extent.height = swapchain->desc.Height; image_info.extent.depth = 1; image_info.mipLevels = 1; image_info.arrayLayers = 1; @@ -1141,8 +1140,7 @@ static void vk_cmd_image_barrier(const struct dxgi_vk_funcs *vk_funcs, VkCommand } static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, uint32_t queue_family_index, - VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) + uint32_t queue_family_index, VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkDevice vk_device = swapchain->vk_device; @@ -1208,8 +1206,8 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s blit.srcOffsets[0].x = 0; blit.srcOffsets[0].y = 0; blit.srcOffsets[0].z = 0; - blit.srcOffsets[1].x = swapchain_desc->Width; - blit.srcOffsets[1].y = swapchain_desc->Height; + blit.srcOffsets[1].x = swapchain->desc.Width; + blit.srcOffsets[1].y = swapchain->desc.Height; blit.srcOffsets[1].z = 1; blit.dstSubresource = blit.srcSubresource; blit.dstOffsets[0] = blit.srcOffsets[0]; @@ -1252,14 +1250,15 @@ static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *s } static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - ID3D12Device *device, ID3D12CommandQueue *queue, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_swapchain_format, VkFormat vk_format) + VkFormat vk_swapchain_format, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; struct vkd3d_image_resource_create_info resource_info; VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; + ID3D12CommandQueue *queue = swapchain->command_queue; VkDevice vk_device = swapchain->vk_device; + ID3D12Device *device = swapchain->device; uint32_t image_count, queue_family_index; D3D12_COMMAND_QUEUE_DESC queue_desc; unsigned int i; @@ -1271,8 +1270,8 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); return hresult_from_vk_result(vr); } - if (image_count != swapchain_desc->BufferCount) - FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); + if (image_count != swapchain->desc.BufferCount) + FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain->desc.BufferCount); if (image_count > ARRAY_SIZE(vk_swapchain_images)) return E_FAIL; swapchain->buffer_count = image_count; @@ -1287,8 +1286,8 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.next = NULL; resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; resource_info.desc.Alignment = 0; - resource_info.desc.Width = swapchain_desc->Width; - resource_info.desc.Height = swapchain_desc->Height; + resource_info.desc.Width = swapchain->desc.Width; + resource_info.desc.Height = swapchain->desc.Height; resource_info.desc.DepthOrArraySize = 1; resource_info.desc.MipLevels = 1; resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); @@ -1311,10 +1310,10 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, TRACE("Creating user swapchain buffers for format conversion.\n"); - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, swapchain_desc, vk_format))) + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, vk_format))) return hr; - if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, swapchain_desc, + if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, queue_family_index, vk_swapchain_images))) return hr; } @@ -1391,6 +1390,103 @@ static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) } } +static HRESULT d3d12_swapchain_create_vulkan_swapchain(struct d3d12_swapchain *swapchain) +{ + VkPhysicalDevice vk_physical_device = swapchain->vk_physical_device; + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkSwapchainCreateInfoKHR vk_swapchain_desc; + VkDevice vk_device = swapchain->vk_device; + VkFormat vk_format, vk_swapchain_format; + VkSurfaceCapabilitiesKHR surface_caps; + VkSwapchainKHR vk_swapchain; + VkImageUsageFlags usage; + VkResult vr; + HRESULT hr; + + if (!(vk_format = vkd3d_get_vk_format(swapchain->desc.Format))) + { + WARN("Invalid format %#x.\n", swapchain->desc.Format); + return DXGI_ERROR_INVALID_CALL; + } + + if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, + swapchain->vk_surface, &swapchain->desc, &vk_swapchain_format))) + return hr; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, + swapchain->vk_surface, &surface_caps)) < 0) + { + WARN("Failed to get surface capabilities, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if (surface_caps.maxImageCount && (swapchain->desc.BufferCount > surface_caps.maxImageCount + || swapchain->desc.BufferCount < surface_caps.minImageCount)) + { + WARN("Buffer count %u is not supported (%u-%u).\n", swapchain->desc.BufferCount, + surface_caps.minImageCount, surface_caps.maxImageCount); + return DXGI_ERROR_UNSUPPORTED; + } + + if (swapchain->desc.Width > surface_caps.maxImageExtent.width + || swapchain->desc.Width < surface_caps.minImageExtent.width + || swapchain->desc.Height > surface_caps.maxImageExtent.height + || swapchain->desc.Height < surface_caps.minImageExtent.height) + { + FIXME("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", + swapchain->desc.Width, swapchain->desc.Height, + surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, + surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); + } + + if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) + { + FIXME("Unsupported alpha mode.\n"); + return DXGI_ERROR_UNSUPPORTED; + } + + usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; + if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) + WARN("Transfer not supported for swapchain images.\n"); + + vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; + vk_swapchain_desc.pNext = NULL; + vk_swapchain_desc.flags = 0; + vk_swapchain_desc.surface = swapchain->vk_surface; + vk_swapchain_desc.minImageCount = swapchain->desc.BufferCount; + vk_swapchain_desc.imageFormat = vk_swapchain_format; + vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; + vk_swapchain_desc.imageExtent.width = swapchain->desc.Width; + vk_swapchain_desc.imageExtent.height = swapchain->desc.Height; + vk_swapchain_desc.imageArrayLayers = 1; + vk_swapchain_desc.imageUsage = usage; + vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; + vk_swapchain_desc.queueFamilyIndexCount = 0; + vk_swapchain_desc.pQueueFamilyIndices = NULL; + vk_swapchain_desc.preTransform = surface_caps.currentTransform; + vk_swapchain_desc.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + vk_swapchain_desc.presentMode = VK_PRESENT_MODE_FIFO_KHR; + vk_swapchain_desc.clipped = VK_TRUE; + vk_swapchain_desc.oldSwapchain = swapchain->vk_swapchain; + if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) + { + WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + if (swapchain->vk_swapchain) + vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + + swapchain->vk_swapchain = vk_swapchain; + + if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, vk_swapchain_format, vk_format))) + return hr; + + return S_OK; +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -2153,20 +2249,15 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - struct VkSwapchainCreateInfoKHR vk_swapchain_desc; - struct VkWin32SurfaceCreateInfoKHR surface_desc; - VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; - VkSurfaceKHR vk_surface = VK_NULL_HANDLE; - VkFormat vk_swapchain_format, vk_format; - VkSurfaceCapabilitiesKHR surface_caps; + VkWin32SurfaceCreateInfoKHR surface_desc; VkPhysicalDevice vk_physical_device; - VkFence vk_fence = VK_NULL_HANDLE; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; - VkImageUsageFlags usage; + VkSurfaceKHR vk_surface; VkInstance vk_instance; VkBool32 supported; VkDevice vk_device; + VkFence vk_fence; VkResult vr; HRESULT hr; @@ -2194,12 +2285,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } - if (!(vk_format = vkd3d_get_vk_format(swapchain_desc->Format))) - { - WARN("Invalid format %#x.\n", swapchain_desc->Format); - return DXGI_ERROR_INVALID_CALL; - } - if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) @@ -2252,81 +2337,15 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } - if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, - vk_surface, swapchain_desc, &vk_swapchain_format))) + ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); + ID3D12Device_AddRef(swapchain->device = device); + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) { d3d12_swapchain_destroy(swapchain); return hr; } - if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, - vk_surface, &surface_caps)) < 0) - { - WARN("Failed to get surface capabilities, vr %d.\n", vr); - d3d12_swapchain_destroy(swapchain); - return hresult_from_vk_result(vr); - } - - if (surface_caps.maxImageCount && (swapchain_desc->BufferCount > surface_caps.maxImageCount - || swapchain_desc->BufferCount < surface_caps.minImageCount)) - { - WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, - surface_caps.minImageCount, surface_caps.maxImageCount); - d3d12_swapchain_destroy(swapchain); - return DXGI_ERROR_UNSUPPORTED; - } - - if (swapchain_desc->Width > surface_caps.maxImageExtent.width - || swapchain_desc->Width < surface_caps.minImageExtent.width - || swapchain_desc->Height > surface_caps.maxImageExtent.height - || swapchain_desc->Height < surface_caps.minImageExtent.height) - { - FIXME("Swapchain dimensions %ux%u are not supported (%u-%u x %u-%u).\n", - swapchain_desc->Width, swapchain_desc->Height, - surface_caps.minImageExtent.width, surface_caps.maxImageExtent.width, - surface_caps.minImageExtent.height, surface_caps.maxImageExtent.height); - } - - if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) - { - FIXME("Unsupported alpha mode.\n"); - d3d12_swapchain_destroy(swapchain); - return DXGI_ERROR_UNSUPPORTED; - } - - usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; - usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_SRC_BIT; - usage |= surface_caps.supportedUsageFlags & VK_IMAGE_USAGE_TRANSFER_DST_BIT; - if (!(usage & VK_IMAGE_USAGE_TRANSFER_SRC_BIT) || !(usage & VK_IMAGE_USAGE_TRANSFER_DST_BIT)) - WARN("Transfer not supported for swapchain images.\n"); - - vk_swapchain_desc.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; - vk_swapchain_desc.pNext = NULL; - vk_swapchain_desc.flags = 0; - vk_swapchain_desc.surface = vk_surface; - vk_swapchain_desc.minImageCount = swapchain_desc->BufferCount; - vk_swapchain_desc.imageFormat = vk_swapchain_format; - vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; - vk_swapchain_desc.imageExtent.width = swapchain_desc->Width; - vk_swapchain_desc.imageExtent.height = swapchain_desc->Height; - vk_swapchain_desc.imageArrayLayers = 1; - vk_swapchain_desc.imageUsage = usage; - vk_swapchain_desc.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; - vk_swapchain_desc.queueFamilyIndexCount = 0; - vk_swapchain_desc.pQueueFamilyIndices = NULL; - vk_swapchain_desc.preTransform = surface_caps.currentTransform; - vk_swapchain_desc.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; - vk_swapchain_desc.presentMode = VK_PRESENT_MODE_FIFO_KHR; - vk_swapchain_desc.clipped = VK_TRUE; - vk_swapchain_desc.oldSwapchain = VK_NULL_HANDLE; - if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) - { - WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); - d3d12_swapchain_destroy(swapchain); - return hresult_from_vk_result(vr); - } - swapchain->vk_swapchain = vk_swapchain; - fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_desc.pNext = NULL; fence_desc.flags = 0; @@ -2338,13 +2357,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, queue, - swapchain_desc, vk_swapchain_format, vk_format))) - { - d3d12_swapchain_destroy(swapchain); - return hr; - } - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) { WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); @@ -2352,8 +2364,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); - ID3D12Device_AddRef(swapchain->device = device); IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; -- 2.16.4

2 1

[PATCH 2/6] dxgi: Factor out d3d12_swapchain_destroy_buffers().
by Józef Kucia 29 Aug '18

29 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 84 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a2fc37d7efb9..0b651c4853bd 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1345,6 +1345,52 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkQueue vk_queue; + unsigned int i; + + if (swapchain->command_queue) + { + if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + vk_funcs->p_vkQueueWaitIdle(vk_queue); + + vkd3d_release_vk_queue(swapchain->command_queue); + } + else + { + WARN("Failed to acquire Vulkan queue.\n"); + } + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->buffers[i]) + { + vkd3d_resource_decref(swapchain->buffers[i]); + swapchain->buffers[i] = NULL; + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + } +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1388,49 +1434,18 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkQueue vk_queue; - unsigned int i; + + d3d12_swapchain_destroy_buffers(swapchain); if (swapchain->command_queue) - { - if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - vk_funcs->p_vkQueueWaitIdle(vk_queue); - - vkd3d_release_vk_queue(swapchain->command_queue); - } - else - { - WARN("Failed to acquire Vulkan queue.\n"); - } - ID3D12CommandQueue_Release(swapchain->command_queue); - } - - if (swapchain->factory) - IWineDXGIFactory_Release(swapchain->factory); wined3d_private_store_cleanup(&swapchain->private_store); - for (i = 0; i < swapchain->buffer_count; ++i) - { - if (swapchain->buffers[i]) - vkd3d_resource_decref(swapchain->buffers[i]); - - if (swapchain->vk_device) - { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - } - } - if (swapchain->vk_device) { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); - - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); } if (swapchain->vk_instance) @@ -1438,6 +1453,9 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->device) ID3D12Device_Release(swapchain->device); + + if (swapchain->factory) + IWineDXGIFactory_Release(swapchain->factory); } static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) -- 2.16.4

2 1

[PATCH 1/6] dxgi: Move D3D12 helper functions closer to the top of the file.
by Józef Kucia 29 Aug '18

29 Aug '18

We need to re-create a Vulkan swapchain in ResizeBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 872 +++++++++++++++++++++++++------------------------- 1 file changed, 436 insertions(+), 436 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 101f2d185e17..a2fc37d7efb9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -909,6 +909,442 @@ struct d3d12_swapchain DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; }; +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + +static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, + VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) +{ + VkSurfaceFormatKHR *formats; + uint32_t format_count; + VkFormat format; + unsigned int i; + VkResult vr; + + *vk_format = VK_FORMAT_UNDEFINED; + + format = vkd3d_get_vk_format(swapchain_desc->Format); + + vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, vk_surface, &format_count, NULL); + if (vr < 0 || !format_count) + { + WARN("Failed to get supported surface formats, vr %d.\n", vr); + return DXGI_ERROR_INVALID_CALL; + } + + if (!(formats = heap_calloc(format_count, sizeof(*formats)))) + return E_OUTOFMEMORY; + + if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, + vk_surface, &format_count, formats)) < 0) + { + WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); + heap_free(formats); + return hresult_from_vk_result(vr); + } + + for (i = 0; i < format_count; ++i) + { + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + break; + } + if (i == format_count) + { + /* Try to create a swapchain with format conversion. */ + format = get_swapchain_fallback_format(format); + WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); + for (i = 0; i < format_count; ++i) + { + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + { + format = formats[i].format; + break; + } + } + } + heap_free(formats); + if (i == format_count) + { + FIXME("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); + return DXGI_ERROR_UNSUPPORTED; + } + + TRACE("Using Vulkan swapchain format %#x.\n", format); + + *vk_format = format; + return S_OK; +} + +static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, + VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, + VkMemoryPropertyFlags flags, uint32_t *memory_type_index) +{ + VkPhysicalDeviceMemoryProperties memory_properties; + unsigned int i; + + vk_funcs->p_vkGetPhysicalDeviceMemoryProperties(vk_physical_device, &memory_properties); + for (i = 0; i < memory_properties.memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + + if ((memory_properties.memoryTypes[i].propertyFlags & flags) == flags) + { + *memory_type_index = i; + return S_OK; + } + } + + FIXME("Failed to find memory type (allowed types %#x).\n", memory_type_mask); + return E_FAIL; +} + +static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_format) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkDevice vk_device = swapchain->vk_device; + VkMemoryAllocateInfo allocate_info; + VkMemoryRequirements requirements; + VkImageCreateInfo image_info; + uint32_t memory_type_mask; + VkDeviceSize memory_size; + unsigned int i; + VkResult vr; + HRESULT hr; + + memset(&image_info, 0, sizeof(image_info)); + image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + image_info.imageType = VK_IMAGE_TYPE_2D; + image_info.format = vk_format; + image_info.extent.width = swapchain_desc->Width; + image_info.extent.height = swapchain_desc->Height; + image_info.extent.depth = 1; + image_info.mipLevels = 1; + image_info.arrayLayers = 1; + image_info.samples = VK_SAMPLE_COUNT_1_BIT; + image_info.tiling = VK_IMAGE_TILING_OPTIMAL; + image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT + | VK_IMAGE_USAGE_TRANSFER_DST_BIT + | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + image_info.queueFamilyIndexCount = 0; + image_info.pQueueFamilyIndices = NULL; + image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if ((vr = vk_funcs->p_vkCreateImage(vk_device, &image_info, NULL, &swapchain->vk_images[i])) < 0) + { + WARN("Failed to create Vulkan image, vr %d.\n", vr); + swapchain->vk_images[i] = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + } + + memory_size = 0; + memory_type_mask = ~0u; + for (i = 0; i < swapchain->buffer_count; ++i) + { + vk_funcs->p_vkGetImageMemoryRequirements(vk_device, swapchain->vk_images[i], &requirements); + + TRACE("Size %s, alignment %s, memory types %#x.\n", + wine_dbgstr_longlong(requirements.size), wine_dbgstr_longlong(requirements.alignment), + requirements.memoryTypeBits); + + image_offset[i] = (memory_size + (requirements.alignment - 1)) & ~(requirements.alignment - 1); + memory_size = image_offset[i] + requirements.size; + + memory_type_mask &= requirements.memoryTypeBits; + } + + TRACE("Allocating %s bytes for user images.\n", wine_dbgstr_longlong(memory_size)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_size; + + if (FAILED(hr = vk_select_memory_type(vk_funcs, swapchain->vk_physical_device, + memory_type_mask, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &allocate_info.memoryTypeIndex))) + return hr; + + if ((vr = vk_funcs->p_vkAllocateMemory(vk_device, &allocate_info, NULL, &swapchain->vk_memory)) < 0) + { + WARN("Failed to allocate device memory, vr %d.\n", vr); + swapchain->vk_memory = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if ((vr = vk_funcs->p_vkBindImageMemory(vk_device, swapchain->vk_images[i], + swapchain->vk_memory, image_offset[i])) < 0) + { + WARN("Failed to bind image memory, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + } + + return S_OK; +} + +static void vk_cmd_image_barrier(const struct dxgi_vk_funcs *vk_funcs, VkCommandBuffer cmd_buffer, + VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, + VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, + VkImageLayout old_layout, VkImageLayout new_layout, VkImage image) +{ + VkImageMemoryBarrier barrier; + + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = src_access_mask; + barrier.dstAccessMask = dst_access_mask; + barrier.oldLayout = old_layout; + barrier.newLayout = new_layout; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + vk_funcs->p_vkCmdPipelineBarrier(cmd_buffer, + src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier); +} + +static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, uint32_t queue_family_index, + VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDevice vk_device = swapchain->vk_device; + VkCommandBufferAllocateInfo allocate_info; + VkSemaphoreCreateInfo semaphore_info; + VkCommandBufferBeginInfo begin_info; + VkCommandPoolCreateInfo pool_info; + VkImageBlit blit; + unsigned int i; + VkResult vr; + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + + if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, + NULL, &swapchain->vk_cmd_pool)) < 0) + { + WARN("Failed to create command pool, vr %d.\n", vr); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = swapchain->vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = swapchain->buffer_count; + + if ((vr = vk_funcs->p_vkAllocateCommandBuffers(vk_device, &allocate_info, + swapchain->vk_cmd_buffers)) < 0) + { + WARN("Failed to allocate command buffers, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + + if ((vr = vk_funcs->p_vkBeginCommandBuffer(vk_cmd_buffer, &begin_info)) < 0) + { + WARN("Failed to begin command buffer, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, VK_ACCESS_TRANSFER_WRITE_BIT, + VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + vk_swapchain_images[i]); + + blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + blit.srcSubresource.mipLevel = 0; + blit.srcSubresource.baseArrayLayer = 0; + blit.srcSubresource.layerCount = 1; + blit.srcOffsets[0].x = 0; + blit.srcOffsets[0].y = 0; + blit.srcOffsets[0].z = 0; + blit.srcOffsets[1].x = swapchain_desc->Width; + blit.srcOffsets[1].y = swapchain_desc->Height; + blit.srcOffsets[1].z = 1; + blit.dstSubresource = blit.srcSubresource; + blit.dstOffsets[0] = blit.srcOffsets[0]; + blit.dstOffsets[1] = blit.srcOffsets[1]; + + vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, + swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, &blit, VK_FILTER_NEAREST); + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + VK_ACCESS_TRANSFER_WRITE_BIT, 0, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, + vk_swapchain_images[i]); + + if ((vr = vk_funcs->p_vkEndCommandBuffer(vk_cmd_buffer)) < 0) + { + WARN("Failed to end command buffer, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; + semaphore_info.pNext = NULL; + semaphore_info.flags = 0; + + if ((vr = vk_funcs->p_vkCreateSemaphore(vk_device, &semaphore_info, + NULL, &swapchain->vk_semaphores[i])) < 0) + { + WARN("Failed to create semaphore, vr %d.\n", vr); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + } + + return S_OK; +} + +static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, + ID3D12Device *device, ID3D12CommandQueue *queue, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_swapchain_format, VkFormat vk_format) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + struct vkd3d_image_resource_create_info resource_info; + VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; + VkDevice vk_device = swapchain->vk_device; + uint32_t image_count, queue_family_index; + D3D12_COMMAND_QUEUE_DESC queue_desc; + unsigned int i; + VkResult vr; + HRESULT hr; + + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (image_count != swapchain_desc->BufferCount) + FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); + if (image_count > ARRAY_SIZE(vk_swapchain_images)) + return E_FAIL; + swapchain->buffer_count = image_count; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, + &image_count, vk_swapchain_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_info.next = NULL; + resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_info.desc.Alignment = 0; + resource_info.desc.Width = swapchain_desc->Width; + resource_info.desc.Height = swapchain_desc->Height; + resource_info.desc.DepthOrArraySize = 1; + resource_info.desc.MipLevels = 1; + resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); + resource_info.desc.SampleDesc.Count = 1; + resource_info.desc.SampleDesc.Quality = 0; + resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; + + if (vk_swapchain_format != vk_format) + { + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) + { + /* vkCmdBlitImage() is only supported for Graphics queues. */ + FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + return E_NOTIMPL; + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); + + TRACE("Creating user swapchain buffers for format conversion.\n"); + + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, swapchain_desc, vk_format))) + return hr; + + if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, swapchain_desc, + queue_family_index, vk_swapchain_images))) + return hr; + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->vk_images[i]) + { + resource_info.vk_image = swapchain->vk_images[i]; + resource_info.present_state = D3D12_RESOURCE_STATE_COPY_SOURCE; + } + else + { + resource_info.vk_image = vk_swapchain_images[i]; + resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; + } + + if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) + { + WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); + return hr; + } + + vkd3d_resource_incref(swapchain->buffers[i]); + ID3D12Resource_Release(swapchain->buffers[i]); + } + + return S_OK; +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1694,442 +2130,6 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } -static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; - default: - WARN("Unhandled format %#x.\n", vk_format); - return DXGI_FORMAT_UNKNOWN; - } -} - -static VkFormat get_swapchain_fallback_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; - default: - WARN("Unhandled format %#x.\n", vk_format); - return VK_FORMAT_UNDEFINED; - } -} - -static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, - VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) -{ - VkSurfaceFormatKHR *formats; - uint32_t format_count; - VkFormat format; - unsigned int i; - VkResult vr; - - *vk_format = VK_FORMAT_UNDEFINED; - - format = vkd3d_get_vk_format(swapchain_desc->Format); - - vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, vk_surface, &format_count, NULL); - if (vr < 0 || !format_count) - { - WARN("Failed to get supported surface formats, vr %d.\n", vr); - return DXGI_ERROR_INVALID_CALL; - } - - if (!(formats = heap_calloc(format_count, sizeof(*formats)))) - return E_OUTOFMEMORY; - - if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, - vk_surface, &format_count, formats)) < 0) - { - WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); - heap_free(formats); - return hresult_from_vk_result(vr); - } - - for (i = 0; i < format_count; ++i) - { - if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) - break; - } - if (i == format_count) - { - /* Try to create a swapchain with format conversion. */ - format = get_swapchain_fallback_format(format); - WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); - for (i = 0; i < format_count; ++i) - { - if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) - { - format = formats[i].format; - break; - } - } - } - heap_free(formats); - if (i == format_count) - { - FIXME("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); - return DXGI_ERROR_UNSUPPORTED; - } - - TRACE("Using Vulkan swapchain format %#x.\n", format); - - *vk_format = format; - return S_OK; -} - -static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, - VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, - VkMemoryPropertyFlags flags, uint32_t *memory_type_index) -{ - VkPhysicalDeviceMemoryProperties memory_properties; - unsigned int i; - - vk_funcs->p_vkGetPhysicalDeviceMemoryProperties(vk_physical_device, &memory_properties); - for (i = 0; i < memory_properties.memoryTypeCount; ++i) - { - if (!(memory_type_mask & (1u << i))) - continue; - - if ((memory_properties.memoryTypes[i].propertyFlags & flags) == flags) - { - *memory_type_index = i; - return S_OK; - } - } - - FIXME("Failed to find memory type (allowed types %#x).\n", memory_type_mask); - return E_FAIL; -} - -static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_format) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - VkDevice vk_device = swapchain->vk_device; - VkMemoryAllocateInfo allocate_info; - VkMemoryRequirements requirements; - VkImageCreateInfo image_info; - uint32_t memory_type_mask; - VkDeviceSize memory_size; - unsigned int i; - VkResult vr; - HRESULT hr; - - memset(&image_info, 0, sizeof(image_info)); - image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; - image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; - image_info.imageType = VK_IMAGE_TYPE_2D; - image_info.format = vk_format; - image_info.extent.width = swapchain_desc->Width; - image_info.extent.height = swapchain_desc->Height; - image_info.extent.depth = 1; - image_info.mipLevels = 1; - image_info.arrayLayers = 1; - image_info.samples = VK_SAMPLE_COUNT_1_BIT; - image_info.tiling = VK_IMAGE_TILING_OPTIMAL; - image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT - | VK_IMAGE_USAGE_TRANSFER_DST_BIT - | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; - image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - image_info.queueFamilyIndexCount = 0; - image_info.pQueueFamilyIndices = NULL; - image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - - for (i = 0; i < swapchain->buffer_count; ++i) - { - if ((vr = vk_funcs->p_vkCreateImage(vk_device, &image_info, NULL, &swapchain->vk_images[i])) < 0) - { - WARN("Failed to create Vulkan image, vr %d.\n", vr); - swapchain->vk_images[i] = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - } - - memory_size = 0; - memory_type_mask = ~0u; - for (i = 0; i < swapchain->buffer_count; ++i) - { - vk_funcs->p_vkGetImageMemoryRequirements(vk_device, swapchain->vk_images[i], &requirements); - - TRACE("Size %s, alignment %s, memory types %#x.\n", - wine_dbgstr_longlong(requirements.size), wine_dbgstr_longlong(requirements.alignment), - requirements.memoryTypeBits); - - image_offset[i] = (memory_size + (requirements.alignment - 1)) & ~(requirements.alignment - 1); - memory_size = image_offset[i] + requirements.size; - - memory_type_mask &= requirements.memoryTypeBits; - } - - TRACE("Allocating %s bytes for user images.\n", wine_dbgstr_longlong(memory_size)); - - allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.allocationSize = memory_size; - - if (FAILED(hr = vk_select_memory_type(vk_funcs, swapchain->vk_physical_device, - memory_type_mask, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &allocate_info.memoryTypeIndex))) - return hr; - - if ((vr = vk_funcs->p_vkAllocateMemory(vk_device, &allocate_info, NULL, &swapchain->vk_memory)) < 0) - { - WARN("Failed to allocate device memory, vr %d.\n", vr); - swapchain->vk_memory = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - - for (i = 0; i < swapchain->buffer_count; ++i) - { - if ((vr = vk_funcs->p_vkBindImageMemory(vk_device, swapchain->vk_images[i], - swapchain->vk_memory, image_offset[i])) < 0) - { - WARN("Failed to bind image memory, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - } - - return S_OK; -} - -static void vk_cmd_image_barrier(const struct dxgi_vk_funcs *vk_funcs, VkCommandBuffer cmd_buffer, - VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, - VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, - VkImageLayout old_layout, VkImageLayout new_layout, VkImage image) -{ - VkImageMemoryBarrier barrier; - - barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; - barrier.pNext = NULL; - barrier.srcAccessMask = src_access_mask; - barrier.dstAccessMask = dst_access_mask; - barrier.oldLayout = old_layout; - barrier.newLayout = new_layout; - barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - barrier.image = image; - barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - barrier.subresourceRange.baseMipLevel = 0; - barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; - barrier.subresourceRange.baseArrayLayer = 0; - barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; - - vk_funcs->p_vkCmdPipelineBarrier(cmd_buffer, - src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier); -} - -static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, uint32_t queue_family_index, - VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkDevice vk_device = swapchain->vk_device; - VkCommandBufferAllocateInfo allocate_info; - VkSemaphoreCreateInfo semaphore_info; - VkCommandBufferBeginInfo begin_info; - VkCommandPoolCreateInfo pool_info; - VkImageBlit blit; - unsigned int i; - VkResult vr; - - pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; - pool_info.pNext = NULL; - pool_info.flags = 0; - pool_info.queueFamilyIndex = queue_family_index; - - if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, - NULL, &swapchain->vk_cmd_pool)) < 0) - { - WARN("Failed to create command pool, vr %d.\n", vr); - swapchain->vk_cmd_pool = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - - allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; - allocate_info.pNext = NULL; - allocate_info.commandPool = swapchain->vk_cmd_pool; - allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; - allocate_info.commandBufferCount = swapchain->buffer_count; - - if ((vr = vk_funcs->p_vkAllocateCommandBuffers(vk_device, &allocate_info, - swapchain->vk_cmd_buffers)) < 0) - { - WARN("Failed to allocate command buffers, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - for (i = 0; i < swapchain->buffer_count; ++i) - { - VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; - - begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; - begin_info.pNext = NULL; - begin_info.flags = 0; - begin_info.pInheritanceInfo = NULL; - - if ((vr = vk_funcs->p_vkBeginCommandBuffer(vk_cmd_buffer, &begin_info)) < 0) - { - WARN("Failed to begin command buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, - VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, - 0, VK_ACCESS_TRANSFER_WRITE_BIT, - VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - vk_swapchain_images[i]); - - blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - blit.srcSubresource.mipLevel = 0; - blit.srcSubresource.baseArrayLayer = 0; - blit.srcSubresource.layerCount = 1; - blit.srcOffsets[0].x = 0; - blit.srcOffsets[0].y = 0; - blit.srcOffsets[0].z = 0; - blit.srcOffsets[1].x = swapchain_desc->Width; - blit.srcOffsets[1].y = swapchain_desc->Height; - blit.srcOffsets[1].z = 1; - blit.dstSubresource = blit.srcSubresource; - blit.dstOffsets[0] = blit.srcOffsets[0]; - blit.dstOffsets[1] = blit.srcOffsets[1]; - - vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, - swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, &blit, VK_FILTER_NEAREST); - - vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, - VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, - VK_ACCESS_TRANSFER_WRITE_BIT, 0, - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, - vk_swapchain_images[i]); - - if ((vr = vk_funcs->p_vkEndCommandBuffer(vk_cmd_buffer)) < 0) - { - WARN("Failed to end command buffer, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - } - - for (i = 0; i < swapchain->buffer_count; ++i) - { - semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - semaphore_info.pNext = NULL; - semaphore_info.flags = 0; - - if ((vr = vk_funcs->p_vkCreateSemaphore(vk_device, &semaphore_info, - NULL, &swapchain->vk_semaphores[i])) < 0) - { - WARN("Failed to create semaphore, vr %d.\n", vr); - swapchain->vk_semaphores[i] = VK_NULL_HANDLE; - return hresult_from_vk_result(vr); - } - } - - return S_OK; -} - -static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - ID3D12Device *device, ID3D12CommandQueue *queue, - const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_swapchain_format, VkFormat vk_format) -{ - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; - struct vkd3d_image_resource_create_info resource_info; - VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; - VkDevice vk_device = swapchain->vk_device; - uint32_t image_count, queue_family_index; - D3D12_COMMAND_QUEUE_DESC queue_desc; - unsigned int i; - VkResult vr; - HRESULT hr; - - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - if (image_count != swapchain_desc->BufferCount) - FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); - if (image_count > ARRAY_SIZE(vk_swapchain_images)) - return E_FAIL; - swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, - &image_count, vk_swapchain_images)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - return hresult_from_vk_result(vr); - } - - resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; - resource_info.next = NULL; - resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_info.desc.Alignment = 0; - resource_info.desc.Width = swapchain_desc->Width; - resource_info.desc.Height = swapchain_desc->Height; - resource_info.desc.DepthOrArraySize = 1; - resource_info.desc.MipLevels = 1; - resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); - resource_info.desc.SampleDesc.Count = 1; - resource_info.desc.SampleDesc.Quality = 0; - resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; - resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - - if (vk_swapchain_format != vk_format) - { - queue_desc = ID3D12CommandQueue_GetDesc(queue); - if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) - { - /* vkCmdBlitImage() is only supported for Graphics queues. */ - FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); - return E_NOTIMPL; - } - queue_family_index = vkd3d_get_vk_queue_family_index(queue); - - TRACE("Creating user swapchain buffers for format conversion.\n"); - - if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, swapchain_desc, vk_format))) - return hr; - - if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, swapchain_desc, - queue_family_index, vk_swapchain_images))) - return hr; - } - - for (i = 0; i < swapchain->buffer_count; ++i) - { - if (swapchain->vk_images[i]) - { - resource_info.vk_image = swapchain->vk_images[i]; - resource_info.present_state = D3D12_RESOURCE_STATE_COPY_SOURCE; - } - else - { - resource_info.vk_image = vk_swapchain_images[i]; - resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; - } - - if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) - { - WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); - return hr; - } - - vkd3d_resource_incref(swapchain->buffers[i]); - ID3D12Resource_Release(swapchain->buffers[i]); - } - - return S_OK; -} - static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) -- 2.16.4

2 1

[PATCH 5/5] msi/tests: Add more tests for remote MsiSummaryInfoGetProperty.
by Dmitry Timoshkov 29 Aug '18

29 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/tests/custom.c | 69 +++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 23 deletions(-) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index a727bbd4df..f06aee0675 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -277,10 +277,14 @@ static void test_props(MSIHANDLE hinst) static void test_db(MSIHANDLE hinst) { + static const UINT prop_type[20] = { VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_EMPTY, + VT_EMPTY, VT_EMPTY, VT_LPSTR, VT_EMPTY, VT_LPSTR, + VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_I4, + VT_I4, VT_EMPTY, VT_EMPTY, VT_EMPTY, VT_EMPTY }; MSIHANDLE hdb, view, rec, rec2, suminfo; char buffer[10]; DWORD sz; - UINT r, count, type; + UINT r, count, type, i; INT int_value; FILETIME ft; @@ -466,30 +470,49 @@ static void test_db(MSIHANDLE hinst) r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_AUTHOR, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + for (i = 0; i < 20; i++) + { + /* for some reason query for PID_TITLE leads to install failure under Windows */ + if (i == PID_TITLE) continue; + + type = 0xdeadbeef; + int_value = 0xdeadbeef; + *buffer = 0; + sz = sizeof(buffer); + r = MsiSummaryInfoGetPropertyA(suminfo, i, &type, &int_value, &ft, buffer, &sz); + if (sz == sizeof(buffer) || i == PID_TEMPLATE) + ok(hinst, !r, "%u: got %u\n", i, r); + else + ok(hinst, r == ERROR_MORE_DATA, "%u: got %u\n", i, r); + ok(hinst, type == prop_type[i], "%u: expected %u, got %u\n", i, prop_type[i], type); + if (i == PID_PAGECOUNT) + ok(hinst, int_value == 100, "%u: got %u\n", i, int_value); + else + ok(hinst, int_value == 0, "%u: got %u\n", i, int_value); + if (i == PID_TEMPLATE) + { + ok(hinst, sz == 5, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, ";1033"), "%u: got %s\n", i, buffer); + } + else if (i == PID_REVNUMBER) + { + ok(hinst, sz == 76, "%u: got %u\n", i, sz); + ok(hinst, !lstrcmpA(buffer, "{004757CA"), "%u: got %s\n", i, buffer); + } + else + { + ok(hinst, sz == sizeof(buffer), "%u: got %u\n", i, sz); + ok(hinst, !*buffer, "%u: got %s\n", i, buffer); + } + } - type = 0xdeadbeef; - int_value = 0xdeadbeef; - strcpy(buffer, "deadbeef"); - sz = sizeof(buffer); - r = MsiSummaryInfoGetPropertyA(suminfo, PID_CODEPAGE, &type, &int_value, &ft, buffer, &sz); - ok(hinst, !r, "got %u\n", r); - ok(hinst, type == 0, "got %u\n", type); - ok(hinst, int_value == 0, "got %u\n", int_value); - ok(hinst, sz == sizeof(buffer), "got %u\n", sz); - ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); + GetSystemTimeAsFileTime(&ft); - r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); - ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + for (i = 0; i < 20; i++) + { + r = MsiSummaryInfoSetPropertyA(suminfo, i, prop_type[i], 1252, &ft, ""); + ok(hinst, r == ERROR_FUNCTION_FAILED, "%u: got %u\n", i, r); + } r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); -- 2.17.1

2 1

[PATCH vkd3d 9/9] vkd3d: Export vkd3d_get_dxgi_format() function.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 1 + libs/vkd3d/utils.c | 18 +++++++++++++++ libs/vkd3d/vkd3d.map | 1 + tests/vkd3d_api.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/include/vkd3d.h b/include/vkd3d.h index fcff16681fec..de805420f67a 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -144,6 +144,7 @@ HRESULT vkd3d_serialize_root_signature(const D3D12_ROOT_SIGNATURE_DESC *desc, HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer); +DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format); VkFormat vkd3d_get_vk_format(DXGI_FORMAT format); #endif /* VKD3D_NO_PROTOTYPES */ diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 11c46dd46ac7..682822e8b89a 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -200,6 +200,24 @@ bool dxgi_format_is_typeless(DXGI_FORMAT dxgi_format) } } +DXGI_FORMAT vkd3d_get_dxgi_format(VkFormat format) +{ + DXGI_FORMAT dxgi_format; + VkFormat vk_format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(vkd3d_formats); ++i) + { + vk_format = vkd3d_formats[i].vk_format; + dxgi_format = vkd3d_formats[i].dxgi_format; + if (vk_format == format && !dxgi_format_is_typeless(dxgi_format)) + return dxgi_format; + } + + FIXME("Unhandled Vulkan format %#x.\n", format); + return DXGI_FORMAT_UNKNOWN; +} + bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) { static const D3D_FEATURE_LEVEL valid_feature_levels[] = diff --git a/libs/vkd3d/vkd3d.map b/libs/vkd3d/vkd3d.map index 7d0f83889957..f43c85c1f9d4 100644 --- a/libs/vkd3d/vkd3d.map +++ b/libs/vkd3d/vkd3d.map @@ -7,6 +7,7 @@ global: vkd3d_create_instance; vkd3d_create_root_signature_deserializer; vkd3d_get_device_parent; + vkd3d_get_dxgi_format; vkd3d_get_vk_device; vkd3d_get_vk_format; vkd3d_get_vk_physical_device; diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 2c022ba1d575..e0912c549147 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -899,6 +899,69 @@ static void test_vulkan_resource_present_state(void) destroy_test_context(&context); } +static void test_formats(void) +{ + DXGI_FORMAT dxgi_format, format; + VkFormat vk_format; + unsigned int i; + + static const DXGI_FORMAT formats[] = + { + DXGI_FORMAT_R32G32B32A32_FLOAT, + DXGI_FORMAT_R32G32B32A32_UINT, + DXGI_FORMAT_R32G32B32A32_SINT, + DXGI_FORMAT_R32G32B32_FLOAT, + DXGI_FORMAT_R32G32B32_UINT, + DXGI_FORMAT_R32G32B32_SINT, + DXGI_FORMAT_R16G16B16A16_FLOAT, + DXGI_FORMAT_R16G16B16A16_UNORM, + DXGI_FORMAT_R16G16B16A16_UINT, + DXGI_FORMAT_R16G16B16A16_SNORM, + DXGI_FORMAT_R16G16B16A16_SINT, + DXGI_FORMAT_R32G32_FLOAT, + DXGI_FORMAT_R32G32_UINT, + DXGI_FORMAT_R32G32_SINT, + DXGI_FORMAT_R10G10B10A2_UNORM, + DXGI_FORMAT_R11G11B10_FLOAT, + DXGI_FORMAT_R8G8B8A8_UNORM, + DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, + DXGI_FORMAT_R8G8B8A8_UINT, + DXGI_FORMAT_R8G8B8A8_SNORM, + DXGI_FORMAT_R8G8B8A8_SINT, + DXGI_FORMAT_R16G16_FLOAT, + DXGI_FORMAT_R16G16_UNORM, + DXGI_FORMAT_R16G16_UINT, + DXGI_FORMAT_R16G16_SNORM, + DXGI_FORMAT_R16G16_SINT, + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_R32_FLOAT, + DXGI_FORMAT_R32_UINT, + DXGI_FORMAT_R32_SINT, + DXGI_FORMAT_R8G8_UNORM, + DXGI_FORMAT_R8G8_UINT, + DXGI_FORMAT_R8G8_SNORM, + DXGI_FORMAT_R8G8_SINT, + DXGI_FORMAT_R16_FLOAT, + DXGI_FORMAT_D16_UNORM, + DXGI_FORMAT_R16_UNORM, + DXGI_FORMAT_R16_UINT, + DXGI_FORMAT_R16_SNORM, + DXGI_FORMAT_R16_SINT, + DXGI_FORMAT_R8_UNORM, + DXGI_FORMAT_R8_UINT, + DXGI_FORMAT_R8_SNORM, + DXGI_FORMAT_R8_SINT, + }; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + format = formats[i]; + vk_format = vkd3d_get_vk_format(format); + dxgi_format = vkd3d_get_dxgi_format(vk_format); + ok(dxgi_format == format, "Got format %#x, expected %#x.\n", dxgi_format, format); + } +} + static bool have_d3d12_device(void) { ID3D12Device *device; @@ -927,4 +990,5 @@ START_TEST(vkd3d_api) run_test(test_vkd3d_queue); run_test(test_resource_internal_refcount); run_test(test_vulkan_resource_present_state); + run_test(test_formats); } -- 2.16.4

2 1

[PATCH vkd3d v2 5/9] vkd3d: Add support for 2D array texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b71313487d97..7acd00d44483 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1479,6 +1479,17 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2DArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + if (desc->u.Texture2DArray.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -1868,6 +1879,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -1952,6 +1971,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev case D3D12_DSV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; break; + case D3D12_DSV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.16.4

2 1

[PATCH vkd3d 8/9] vkd3d: Add few more formats.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/utils.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 18e3aa18014b..11c46dd46ac7 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -29,22 +29,37 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32A32_SINT, VK_FORMAT_R32G32B32A32_SINT, 16, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32B32_FLOAT, VK_FORMAT_R32G32B32_SFLOAT, 12, 1, 1, 1, COLOR}, - {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32B32_UINT, VK_FORMAT_R32G32B32_UINT, 12, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32B32_SINT, VK_FORMAT_R32G32B32_SINT, 12, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16B16A16_TYPELESS, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16B16A16_FLOAT, VK_FORMAT_R16G16B16A16_SFLOAT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16B16A16_UNORM, VK_FORMAT_R16G16B16A16_UNORM, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16B16A16_UINT, VK_FORMAT_R16G16B16A16_UINT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16B16A16_SNORM, VK_FORMAT_R16G16B16A16_SNORM, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16B16A16_SINT, VK_FORMAT_R16G16B16A16_SINT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32_TYPELESS, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32_UINT, VK_FORMAT_R32G32_UINT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R32G32_SINT, VK_FORMAT_R32G32_SINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_UINT, VK_FORMAT_R8G8_UINT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8_SNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8_SINT, VK_FORMAT_R8G8_SINT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_TYPELESS, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, VK_FORMAT_R8G8B8A8_SRGB, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8B8A8_UINT, VK_FORMAT_R8G8B8A8_UINT, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8B8A8_SNORM, VK_FORMAT_R8G8B8A8_SNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8G8B8A8_SINT, VK_FORMAT_R8G8B8A8_SINT, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16_TYPELESS, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16_FLOAT, VK_FORMAT_R16G16_SFLOAT, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R16G16_UNORM, VK_FORMAT_R16G16_UNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16_UINT, VK_FORMAT_R16G16_UINT, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16_SNORM, VK_FORMAT_R16G16_SNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16G16_SINT, VK_FORMAT_R16G16_SINT, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32_TYPELESS, VK_FORMAT_R32_UINT, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_D32_FLOAT, VK_FORMAT_D32_SFLOAT, 4, 1, 1, 1, DEPTH}, {DXGI_FORMAT_R32_FLOAT, VK_FORMAT_R32_SFLOAT, 4, 1, 1, 1, COLOR}, @@ -54,10 +69,14 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R16_FLOAT, VK_FORMAT_R16_SFLOAT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_D16_UNORM, VK_FORMAT_D16_UNORM, 2, 1, 1, 1, DEPTH}, {DXGI_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16_UINT, VK_FORMAT_R16_UINT, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16_SNORM, VK_FORMAT_R16_SNORM, 2, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R16_SINT, VK_FORMAT_R16_SINT, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_TYPELESS, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_UINT, VK_FORMAT_R8_UINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8_SNORM, VK_FORMAT_R8_SNORM, 1, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, -- 2.16.4

2 1

[PATCH vkd3d 7/9] vkd3d: Create vkd3d_views in vkd3d_create_texture_view().
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7acd00d44483..d97c3dbeb88b 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1327,13 +1327,15 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } -static VkResult vkd3d_create_texture_view(struct d3d12_device *device, +static HRESULT vkd3d_create_texture_view(struct d3d12_device *device, struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, - VkImageView *vk_view) + struct vkd3d_view **view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; + struct vkd3d_view *object; + VkImageView vk_view; VkResult vr; assert(d3d12_resource_is_texture(resource)); @@ -1350,9 +1352,21 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, view_desc.subresourceRange.levelCount = desc->miplevel_count; view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; view_desc.subresourceRange.layerCount = desc->layer_count; - if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, vk_view))) < 0) + if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) + { WARN("Failed to create Vulkan image view, vr %d.\n", vr); - return vr; + return hresult_from_vk_result(vr); + } + + if (!(object = vkd3d_view_create())) + { + VK_CALL(vkDestroyImageView(device->vk_device, vk_view, NULL)); + return E_OUTOFMEMORY; + } + + object->u.vk_image_view = vk_view; + *view = object; + return S_OK; } void d3d12_desc_create_cbv(struct d3d12_desc *descriptor, @@ -1519,14 +1533,8 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, } } - if (!(view = vkd3d_view_create())) - return; - - if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) - { - vkd3d_free(view); + if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_SRV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE; @@ -1648,14 +1656,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, } } - if (!(view = vkd3d_view_create())) - return; - - if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) - { - vkd3d_free(view); + if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) return; - } descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; @@ -1904,15 +1906,9 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; } - if (!(view = vkd3d_view_create())) + if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) return; - if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) - { - vkd3d_free(view); - return; - } - rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); @@ -1982,10 +1978,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev } } - if (!(view = vkd3d_view_create())) - return; - - if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) + if (FAILED(vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view))) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; -- 2.16.4

2 1

[PATCH vkd3d v2 6/9] tests: Add test for clearing 3D textures.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7261e89e82df..1c6b65fa758a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3311,10 +3311,12 @@ static void test_clear_render_target_view(void) ID3D12DescriptorHeap *rtv_heap; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; ID3D12Device *device; + D3D12_BOX box; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -3388,6 +3390,48 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 3D texture */ + ID3D12Resource_Release(resource); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.DepthOrArraySize = 32; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); + + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Texture3D.FirstWSlice = 2; + rtv_desc.Texture3D.WSize = 2; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 32, 32, 2); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 2, 32, 32, 4); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 0, 4, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.16.4

2 1

[PATCH vkd3d v2 4/9] vkd3d: Add support for 3D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 71 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index b7c657bee6be..b71313487d97 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -309,8 +309,7 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) { unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); + size = max(size, d3d12_resource_desc_get_depth(desc, 0)); return vkd3d_log2i(size) + 1; } @@ -339,6 +338,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; @@ -1298,7 +1299,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_idx = 0; desc->miplevel_count = 1; desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); switch (resource->desc.Dimension) { @@ -1478,6 +1479,13 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture3D.MipLevels; + if (desc->u.Texture3D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; @@ -1602,27 +1610,30 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc) { - if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) - { - if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - - vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; - } - else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) - { - if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - - vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; - vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; - vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; - } - else + switch (desc->ViewDimension) { - WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); - return; + case D3D12_UAV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + FIXME("Unhandled depth view %u-%u.\n", + desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } @@ -1857,10 +1868,22 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; + vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } + else if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; + } if (!(view = vkd3d_view_create())) return; @@ -1875,7 +1898,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); - rtv_desc->layer_count = resource->desc.DepthOrArraySize; + rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; } -- 2.16.4

2 1

[PATCH vkd3d v2 3/9] vkd3d: Add support for default 3D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e40ccbc5525e..b7c657bee6be 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1312,6 +1312,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; break; + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + desc->view_type = VK_IMAGE_VIEW_TYPE_3D; + desc->layer_count = 1; + break; + default: FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); return false; @@ -1899,6 +1904,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } + if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + WARN("Cannot create DSV for 3D texture.\n"); + return; + } + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; -- 2.16.4

2 1

[PATCH vkd3d v2 2/9] vkd3d: Add support for default 1D texture views.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ed2d11a41cde..e40ccbc5525e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1295,15 +1295,21 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return false; } + desc->miplevel_idx = 0; + desc->miplevel_count = 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + switch (resource->desc.Dimension) { + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_1D_ARRAY : VK_IMAGE_VIEW_TYPE_1D; + break; + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: desc->view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - desc->miplevel_idx = 0; - desc->miplevel_count = 1; - desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; break; default: @@ -1324,7 +1330,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, struct VkImageViewCreateInfo view_desc; VkResult vr; - assert(resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D); + assert(d3d12_resource_is_texture(resource)); view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_desc.pNext = NULL; -- 2.16.4

2 1

[PATCH vkd3d v2 1/9] vkd3d: Introduce vkd3d_texture_view_desc structure.
by Józef Kucia 29 Aug '18

29 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Get rid of vkd3d_view_kind. --- libs/vkd3d/resource.c | 225 ++++++++++++++++++++++++++------------------------ 1 file changed, 115 insertions(+), 110 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f6dffbfda31e..ed2d11a41cde 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1274,12 +1274,53 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, } } +struct vkd3d_texture_view_desc +{ + VkImageViewType view_type; + const struct vkd3d_format *format; + unsigned int miplevel_idx; + unsigned int miplevel_count; + unsigned int layer_idx; + unsigned int layer_count; + bool allowed_swizzle; +}; + +static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, + struct d3d12_resource *resource, DXGI_FORMAT view_format) +{ + if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, view_format))) + { + FIXME("Failed to find format (resource format %#x, view format %#x).\n", + resource->desc.Format, view_format); + return false; + } + + switch (resource->desc.Dimension) + { + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; + desc->miplevel_idx = 0; + desc->miplevel_count = 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + break; + + default: + FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + return false; + } + + desc->allowed_swizzle = false; + return true; +} + static VkResult vkd3d_create_texture_view(struct d3d12_device *device, - struct d3d12_resource *resource, const struct vkd3d_format *format, VkImageViewType view_type, - uint32_t miplevel_idx, uint32_t miplevel_count, uint32_t layer_idx, uint32_t layer_count, - bool allowed_swizzle, VkImageView *vk_view) + struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, + VkImageView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; VkResult vr; @@ -1289,14 +1330,14 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, view_desc.pNext = NULL; view_desc.flags = 0; view_desc.image = resource->u.vk_image; - view_desc.viewType = view_type; + view_desc.viewType = desc->view_type; view_desc.format = format->vk_format; - vkd3d_set_view_swizzle_for_format(&view_desc.components, format, allowed_swizzle); + vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; - view_desc.subresourceRange.baseMipLevel = miplevel_idx; - view_desc.subresourceRange.levelCount = miplevel_count; - view_desc.subresourceRange.baseArrayLayer = layer_idx; - view_desc.subresourceRange.layerCount = layer_count; + view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; + view_desc.subresourceRange.levelCount = desc->miplevel_count; + view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; + view_desc.subresourceRange.layerCount = desc->layer_count; if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, vk_view))) < 0) WARN("Failed to create Vulkan image view, vr %d.\n", vr); return vr; @@ -1387,9 +1428,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { - uint32_t miplevel_idx, miplevel_count, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; d3d12_desc_destroy(descriptor, device); @@ -1406,24 +1445,12 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - FIXME("Failed to find format for %#x.\n", resource->desc.Format); - return; - } + vkd3d_desc.miplevel_count = VK_REMAINING_MIP_LEVELS; + vkd3d_desc.allowed_swizzle = true; - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = 0; - miplevel_count = VK_REMAINING_MIP_LEVELS; - layer_idx = 0; - layer_count = VK_REMAINING_ARRAY_LAYERS; if (desc) { if (desc->Shader4ComponentMapping != D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING) @@ -1432,28 +1459,28 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_SRV_DIMENSION_TEXTURE2D: - vk_view_type = VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = desc->u.Texture2D.MostDetailedMip; - miplevel_count = desc->u.Texture2D.MipLevels; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2D.MipLevels; if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBE: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; - miplevel_idx = desc->u.TextureCube.MostDetailedMip; - miplevel_count = desc->u.TextureCube.MipLevels; - layer_count = 6; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; + vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCube.MipLevels; + vkd3d_desc.layer_count = 6; if (desc->u.TextureCube.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCube.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBEARRAY: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; - miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; - miplevel_count = desc->u.TextureCubeArray.MipLevels; - layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; + vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; @@ -1465,8 +1492,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, miplevel_count, layer_idx, layer_count, true, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1551,34 +1577,18 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { - uint32_t miplevel_idx, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - ERR("Failed to find format for %#x.\n", resource->desc.Format); - return; - } - - if (vkd3d_format_is_compressed(format)) + if (vkd3d_format_is_compressed(vkd3d_desc.format)) { WARN("UAVs cannot be created for compressed formats.\n"); return; } - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = 0; - layer_idx = 0; - layer_count = VK_REMAINING_ARRAY_LAYERS; if (desc) { if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) @@ -1586,17 +1596,17 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - miplevel_idx = desc->u.Texture2D.MipSlice; + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; } else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) { if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - vk_view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - miplevel_idx = desc->u.Texture2DArray.MipSlice; - layer_idx = desc->u.Texture2DArray.FirstArraySlice; - layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; } else { @@ -1608,8 +1618,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, layer_idx, layer_count, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1808,10 +1817,8 @@ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_devi void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1821,44 +1828,42 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (vkd3d_desc.format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create RTV for depth/stencil format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + if (desc) { - WARN("Trying to create RTV for depth/stencil format %#x.\n", format->dxgi_format); - return; + switch (desc->ViewDimension) + { + case D3D12_RTV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } } - if (desc && desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; } rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; - rtv_desc->format = format->vk_format; - rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + rtv_desc->format = vkd3d_desc.format->vk_format; + rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; rtv_desc->view = view; rtv_desc->resource = resource; @@ -1877,9 +1882,8 @@ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_devi void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { - const struct vkd3d_format *format; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1889,39 +1893,40 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (!(vkd3d_desc.format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create DSV for format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + if (desc) { - WARN("Trying to create DSV for format %#x.\n", format->dxgi_format); - return; - } + if (desc->Flags) + FIXME("Ignoring flags %#x.\n", desc->Flags); - if (desc && desc->Flags) - FIXME("Ignoring flags %#x.\n", desc->Flags); + switch (desc->ViewDimension) + { + case D3D12_DSV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } + } if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; - dsv_desc->format = format->vk_format; - dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + dsv_desc->format = vkd3d_desc.format->vk_format; + dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->view = view; dsv_desc->resource = resource; } -- 2.16.4

2 1

[PATCH] mshtml.idl: Add IHTMLCSSStyleDeclaration2 declaration.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 116 +++++++++ include/mshtml.idl | 696 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 812 insertions(+)

1 0

[PATCH 7/7] mshtml: Skip fixups in get_nsstyle_property_var in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 11 +++++------ dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-)

1 0

[PATCH 6/7] mshtml: Skip fixups in get_nsstyle_property in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 2 +- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/htmlstyle.h | 2 +- dlls/mshtml/tests/style.c | 2 -- 4 files changed, 6 insertions(+), 8 deletions(-)

1 0

[PATCH 5/7] mshtml: Introduce get_current_style_property_var helper.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 69 +++++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 32 deletions(-)

1 0

[PATCH 4/7] mshtml: Introduce get_current_style_property helper.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 59 +++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 27 deletions(-)

1 0

[PATCH 3/7] mshtml: Skip var_to_nsstyle fixups in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 10 +++++----- dlls/mshtml/tests/style.c | 40 +++------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-)

1 0

[PATCH 2/7] mshtml: Skip set_style_property fixups in IE9+ mode.
by Jacek Caban 29 Aug '18

29 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 5 +++-- dlls/mshtml/tests/style.c | 42 +++--------------------------------------- 2 files changed, 6 insertions(+), 41 deletions(-)

1 0

[PATCH 1/7] mshtml: Move value fixups to set_style_property.
by Jacek Caban 29 Aug '18

29 Aug '18

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

1 0

[PATCH 3/5] msi: Handle the remote case in MsiSummaryInfoGetPropertyCount.
by Dmitry Timoshkov 29 Aug '18

29 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 17 +++++++++++++++++ dlls/msi/tests/custom.c | 3 --- dlls/msi/winemsi.idl | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 347303acd5..af8b03cacd 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -590,7 +590,19 @@ UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE hSummaryInfo, PUINT pCount) si = msihandle2msiinfo( hSummaryInfo, MSIHANDLETYPE_SUMMARYINFO ); if( !si ) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( hSummaryInfo ))) + { + /* FIXME: should use SEH */ + if (!pCount) return RPC_X_NULL_REF_POINTER; + + return remote_SummaryInfoGetPropertyCount( remote, pCount ); + } + return ERROR_INVALID_HANDLE; + } if( pCount ) *pCount = get_property_count( si->property ); @@ -1117,3 +1129,8 @@ UINT msi_load_suminfo_properties( MSIPACKAGE *package ) msiobj_release( &si->hdr ); return r; } + +UINT __cdecl s_remote_SummaryInfoGetPropertyCount( MSIHANDLE suminfo, UINT *count ) +{ + return MsiSummaryInfoGetPropertyCount( suminfo, count ); +} diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 0ba5f10c88..eb0ed625ef 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -456,14 +456,11 @@ static void test_db(MSIHANDLE hinst) ok(hinst, !r, "got %u\n", r); r = MsiSummaryInfoGetPropertyCount(suminfo, NULL); -todo_wine ok(hinst, r == RPC_X_NULL_REF_POINTER, "got %u\n", r); count = 0xdeadbeef; r = MsiSummaryInfoGetPropertyCount(suminfo, &count); -todo_wine ok(hinst, !r, "got %u\n", r); -todo_wine ok(hinst, count == 5, "got %u\n", count); r = MsiSummaryInfoGetPropertyA(suminfo, 0, NULL, NULL, NULL, NULL, NULL); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 50f62fcbfd..5a14ffdb79 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -74,6 +74,8 @@ interface IWineMsiRemote UINT remote_DatabaseGetSummaryInformation( [in] MSIHANDLE db, [in] UINT updatecount, [out] MSIHANDLE *suminfo ); UINT remote_DatabaseOpenView( [in] MSIHANDLE db, [in, string] LPCWSTR query, [out] MSIHANDLE *view ); + UINT remote_SummaryInfoGetPropertyCount( [in] MSIHANDLE suminfo, [out] UINT *count ); + MSIHANDLE remote_GetActiveDatabase( [in] MSIHANDLE hinst ); UINT remote_GetProperty( [in] MSIHANDLE hinst, [in, string] LPCWSTR property, [out, string] LPWSTR *value, [out] DWORD *size ); UINT remote_SetProperty( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR property, [in, string, unique] LPCWSTR value ); -- 2.17.1

2 1

[PATCH v2] wined3d: Validate window before setting fullscreen mode
by Andrew Eikum 29 Aug '18

29 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- The main point here is that calling SetFullscreenState with the state that is already set succeeds, even if the window is destroyed. Unreal Engine 4 games depend on this, and Wine already passes this test. The code changes are for the failure case, when trying to change the state on a destroyed window. I don't have a game that depends on this, so if you'd prefer a todo_wine and no code changes, I'm fine with that, too. v2: Fix problems spotted by Józef dlls/dxgi/swapchain.c | 2 ++ dlls/dxgi/tests/dxgi.c | 6 +++++- dlls/wined3d/swapchain.c | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f25674..ac40eb78f6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -254,6 +254,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain->target = target; return S_OK; } + else + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; if (target) IDXGIOutput_Release(target); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 56065456eb..fc008ccdd7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2162,10 +2162,14 @@ static void test_set_fullscreen(void) } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8200bdd5e0..dc7bb641b3 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1400,6 +1400,10 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha { /* Switch from windowed to fullscreen */ HWND focus_window = device->create_parms.focus_window; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + if (!focus_window) focus_window = swapchain->device_window; if (FAILED(hr = wined3d_device_acquire_focus_window(device, focus_window))) @@ -1414,6 +1418,10 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha { /* Fullscreen -> fullscreen mode change */ BOOL filter_messages = device->filter_messages; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + device->filter_messages = TRUE; MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); @@ -1427,6 +1435,10 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha { /* Fullscreen -> windowed switch */ RECT *window_rect = NULL; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &swapchain->original_window_rect; wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); -- 2.18.0

2 1

[PATCH 2/5] msi: Handle the remote case in MsiSummaryInfoSetProperty.
by Dmitry Timoshkov 29 Aug '18

29 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msi/suminfo.c | 20 ++++++++++++++++++++ dlls/msi/tests/custom.c | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c index 288ba402dc..347303acd5 100644 --- a/dlls/msi/suminfo.c +++ b/dlls/msi/suminfo.c @@ -826,7 +826,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = TRUE; str.str.w = szValue; @@ -857,7 +867,17 @@ UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty, UINT return ERROR_INVALID_PARAMETER; if (!(si = msihandle2msiinfo( handle, MSIHANDLETYPE_SUMMARYINFO ))) + { + MSIHANDLE remote; + + if ((remote = msi_get_remote( handle ))) + { + WARN("MsiSummaryInfoSetProperty not allowed during a custom action!\n"); + return ERROR_FUNCTION_FAILED; + } + return ERROR_INVALID_HANDLE; + } str.unicode = FALSE; str.str.a = szValue; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 1cf24536d0..0ba5f10c88 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -499,7 +499,9 @@ todo_wine ok(hinst, !lstrcmpA(buffer, "deadbeef"), "got %s\n", buffer); r = MsiSummaryInfoSetPropertyA(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, ""); -todo_wine + ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); + + r = MsiSummaryInfoSetPropertyW(suminfo, PID_CODEPAGE, VT_I2, 1252, &ft, NULL); ok(hinst, r == ERROR_FUNCTION_FAILED, "got %u\n", r); r = MsiCloseHandle(suminfo); -- 2.17.1

2 1

[PATCH v3] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng 29 Aug '18

29 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42710 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 51 ++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..73d8210101 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,56 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + + TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt != OLERENDER_FORMAT) + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } + + if (!fmt) + return E_INVALIDARG; + + hr = OleCreateDefaultHandler(&CLSID_NULL, NULL, iid, (void **)obj); + if (FAILED(hr)) goto end; + + hr = IUnknown_QueryInterface((IUnknown *)*obj, &IID_IOleCache2, (void **)&ole_cache); + if (FAILED(hr)) goto end; + + hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection); + if (FAILED(hr)) goto end; + + hr = IDataObject_GetData(data, fmt, &stgmedium); + if (FAILED(hr)) goto end; + + hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE); + if (FAILED(hr)) goto end; + + hr = IOleCache2_QueryInterface(ole_cache, &IID_IPersistStorage, (void **)&persist); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_Save(persist, stg, TRUE); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_SaveCompleted(persist, NULL); + +end: + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..ceec369dc3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4593,6 +4593,62 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + static FORMATETC bitmap_fmt[] = + { + { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI }, + { 0 } + }; + static const struct expected_method methods_create_from_bitmap[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_bitmap[] = + { + { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, + { NULL } + }; + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_create_from_bitmap; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, bitmap_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_createstatic_from_bitmap; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + if (ole_obj) + IOleObject_Release(ole_obj); + + IStorage_Release(storage); + ILockBytes_Release(ilb); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4699,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

2 2

[PATCH v2] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng 29 Aug '18

29 Aug '18

Superseded patch 150331. Thanks Zhiyi's advice. For bug 42710: https://bugs.winehq.org/show_bug.cgi?id=42710 . Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 51 ++++++++++++++++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..8927267e90 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,56 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + + TRACE("(%p, %s, 0x%08x, %p, %p, %p, %p)\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt != OLERENDER_FORMAT) + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } + + if (!fmt) + return E_INVALIDARG; + + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&ole_cache); + if (FAILED(hr)) goto end; + + hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection); + if (FAILED(hr)) goto end; + + hr = IDataObject_GetData(data, fmt, &stgmedium); + if (FAILED(hr)) goto end; + + hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE); + if (FAILED(hr)) goto end; + + hr = IOleCache2_QueryInterface(ole_cache, &IID_IPersistStorage, (LPVOID *)&persist); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_Save(persist, stg, TRUE); + if (FAILED(hr)) goto end; + + hr = IPersistStorage_SaveCompleted(persist, NULL); + if (FAILED(hr)) goto end; + + hr = OleLoad(stg, iid, client_site, obj); + +end: + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + return hr; } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..ceec369dc3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4593,6 +4593,62 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + static FORMATETC bitmap_fmt[] = + { + { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI }, + { 0 } + }; + static const struct expected_method methods_create_from_bitmap[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_bitmap[] = + { + { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, + { NULL } + }; + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_create_from_bitmap; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, bitmap_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_createstatic_from_bitmap; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + if (ole_obj) + IOleObject_Release(ole_obj); + + IStorage_Release(storage); + ILockBytes_Release(ilb); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4699,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

3 2

[PATCH 01/16] shell32: Add web folder icons
by Alex Henrie 29 Aug '18

29 Aug '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/shell32.rc | 11 +++++++++++ dlls/shell32/shresdef.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 06b483e12b..749d24ea55 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -707,6 +707,17 @@ IDI_SHELL_CHECKLIST_FOLDER ICON resources/folder.ico /* @makedep: resources/network.ico */ IDI_SHELL_NET_CONNECTIONS ICON resources/network.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/folder.ico */ +IDI_SHELL_NEW_WEB_FOLDER ICON resources/folder.ico + +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/document.ico */ +IDI_SHELL_NEW_WEB_PAGE ICON resources/document.ico + +/* @makedep: resources/internet.ico */ +IDI_SHELL_WEB_FOLDERS ICON resources/internet.ico + /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 67615968fe..0e6d07088a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -263,6 +263,9 @@ #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_CHECKLIST_FOLDER 174 #define IDI_SHELL_NET_CONNECTIONS 175 +#define IDI_SHELL_NEW_WEB_FOLDER 176 +#define IDI_SHELL_NEW_WEB_PAGE 178 +#define IDI_SHELL_WEB_FOLDERS 193 #define IDI_SHELL_MY_DOCUMENTS 235 #define IDI_SHELL_RENAME 242 #define IDI_SHELL_COPY 243 -- 2.18.0

1 16

[PATCH] comsvcs: Add DispenserManager stubbed interface
by Alistair Leslie-Hughes 29 Aug '18

29 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42998 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 169 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index bd71e7de6f..b01c4f2fb9 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 3fc69de2fd..357aa06688 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -28,13 +28,120 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" - +#include "comsvcs.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); static HINSTANCE COMSVCS_hInstance; +typedef struct dispensermanager +{ + IDispenserManager IDispenserManager_iface; + LONG ref; + +} dispensermanager; + +static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) +{ + return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); +} + +static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserManager)) + { + *object = &This->IDispenserManager_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dismanager_Release(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDispenserDriver *driver, + LPCOLESTR name, IHolder **dispenser) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %p) stub\n", This, id, transid); + + return E_NOTIMPL; +} + +struct IDispenserManagerVtbl dismanager_vtbl = +{ + dismanager_QueryInterface, + dismanager_AddRef, + dismanager_Release, + dismanager_RegisterDispenser, + dismanager_GetContext +}; + +static HRESULT WINAPI CreateDispenserManager(IClassFactory *cf,IUnknown* outer, REFIID riid,void **object) +{ + dispensermanager *dismanager; + HRESULT ret; + + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); + + dismanager = heap_alloc(sizeof(*dismanager)); + if (!dismanager) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + dismanager->IDispenserManager_iface.lpVtbl = &dismanager_vtbl; + dismanager->ref = 1; + + ret = dismanager_QueryInterface(&dismanager->IDispenserManager_iface, riid, object); + dismanager_Release(&dismanager->IDispenserManager_iface); + + return ret; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) @@ -49,13 +156,69 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) return TRUE; } +typedef HRESULT (*fnCreateInstance)(void **object); + +static HRESULT WINAPI comsvcscf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv ) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI comsvcscf_AddRef(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI comsvcscf_Release(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI comsvcscf_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const struct IClassFactoryVtbl comsvcscf_vtbl = +{ + comsvcscf_QueryInterface, + comsvcscf_AddRef, + comsvcscf_Release, + CreateDispenserManager, + comsvcscf_LockServer +}; + +static IClassFactory DispenserManageFactory = { &comsvcscf_vtbl }; + /****************************************************************** * DllGetClassObject */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + if(IsEqualGUID(&CLSID_DispenserManager, rclsid)) { + TRACE("(CLSID_DispenserManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&DispenserManageFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; } -- 2.18.0

1 0

[PATCH] ntoskrnl.exe: Add DbgQueryDebugFilterState stub
by Alistair Leslie-Hughes 29 Aug '18

29 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45655 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 6 ++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 280bf27d63..5724a61176 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3722,3 +3722,9 @@ void WINAPI IoReleaseRemoveLockAndWaitEx(PIO_REMOVE_LOCK lock, PVOID tag, ULONG { FIXME("stub: %p %p %u\n", lock, tag, size); } + +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) +{ + FIXME("stub: %d %d\n", component, level); + return STATUS_NOT_IMPLEMENTED; +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 71ac860802..8079114966 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -111,7 +111,7 @@ @ varargs DbgPrintEx(long long str) @ stub DbgPrintReturnControlC @ stub DbgPrompt -@ stub DbgQueryDebugFilterState +@ stdcall DbgQueryDebugFilterState(long long) @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stub ExAcquireResourceSharedLite diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index d2f84d2688..0cd1673dbe 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1367,6 +1367,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi #define SYMBOLIC_LINK_QUERY 0x0001 #define SYMBOLIC_LINK_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | 0x1) +NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); -- 2.18.0

1 0

[PATCH] registry: Set CurrentBuild always to the same value as CurrentBuildNumber.
by Thomas Faller 28 Aug '18

28 Aug '18

Make that the registry entry HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuild has always the same value as HKLM\Software\Microsoft\Windows NT\CurrentVersion\CurrentBuildNumber This resolves: https://bugs.winehq.org/show_bug.cgi?id=42870 Signed-off-by: Thomas Faller <tfaller1(a)gmx.de> --- loader/wine.inf.in | 2 ++ programs/winecfg/appdefaults.c | 3 +++ 2 files changed, 5 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 79ac6c5805..4f241c0447 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3424,6 +3424,7 @@ HKLM,"System\CurrentControlSet\Services\Winsock2\Parameters\Protocol_Catalog9\Ca [VersionInfo] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" @@ -3434,6 +3435,7 @@ HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT" [VersionInfo.ntamd64] HKLM,%CurrentVersionNT%,"CurrentVersion",2,"6.1" HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" +HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index e098c2b31a..d598fd4f21 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -431,6 +431,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); @@ -445,6 +446,7 @@ static void on_winver_change(HWND dialog) set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", win_versions[selection].szCSDVersion); snprintf(Buffer, sizeof(Buffer), "%d", win_versions[selection].dwBuildNumber); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", Buffer); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", Buffer); snprintf(Buffer, sizeof(Buffer), "Microsoft %s", win_versions[selection].szDescription); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", Buffer); @@ -463,6 +465,7 @@ static void on_winver_change(HWND dialog) case VER_PLATFORM_WIN32s: set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CSDVersion", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentVersion", NULL); + set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuild", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "CurrentBuildNumber", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyNT, "ProductName", NULL); set_reg_key(HKEY_LOCAL_MACHINE, szKeyProdNT, "ProductType", NULL); -- 2.17.1

1 0

[PATCH v4 1/4] ntdll/actctx: Don't stop looking for manifest if dll without manifest is found
by Fabian Maurer 28 Aug '18

28 Aug '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/kernel32/tests/Makefile.in | 2 ++ dlls/kernel32/tests/actctx.c | 37 ++++++++++++++++++++++++++++++++- dlls/kernel32/tests/dummy.c | 0 dlls/kernel32/tests/dummy.spec | 0 dlls/ntdll/actctx.c | 3 ++- 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 dlls/kernel32/tests/dummy.c create mode 100644 dlls/kernel32/tests/dummy.spec diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8c3..ee0bbd2c8b 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -11,6 +11,8 @@ C_SRCS = \ debugger.c \ directory.c \ drive.c \ + dummy.c \ + dummy.spec \ environ.c \ fiber.c \ file.c \ diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 96d9b8cbb6..5f1c33f162 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2598,9 +2598,28 @@ static void delete_manifest_file(const char *filename) DeleteFileA(path); } +/* Copied from msi tests */ +static void extract_resource(const char *name, const char *type, const char *path) +{ + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + file = CreateFileA(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", path, GetLastError()); + + res = FindResourceA(NULL, name, type); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); +} + static void test_CreateActCtx(void) { - CHAR path[MAX_PATH], dir[MAX_PATH]; + CHAR path[MAX_PATH], dir[MAX_PATH], dll[MAX_PATH]; ACTCTXA actctx; HANDLE handle; @@ -2637,6 +2656,22 @@ todo_wine { } if (handle != INVALID_HANDLE_VALUE) pReleaseActCtx(handle); + /* with specified directory, that does contain dependent assembly */ + GetTempPathA(ARRAY_SIZE(dir), dir); + actctx.lpAssemblyDirectory = dir; + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE, "got handle %p\n", handle); + pReleaseActCtx(handle); + + /* Should still work if we add a dll with the same name, but without manifest */ + strcpy(dll, dir); + strcat(dll, "testdep1.dll"); + extract_resource("dummy.dll", "TESTDLL", dll); + handle = pCreateActCtxA(&actctx); + ok(handle != INVALID_HANDLE_VALUE || broken(GetLastError() == ERROR_SXS_CANT_GEN_ACTCTX) , "got error %d\n", GetLastError()); + pReleaseActCtx(handle); + DeleteFileA(dll); + delete_manifest_file("main_wndcls.manifest"); delete_manifest_file("testdep1.manifest"); delete_manifest_file("testdep2.manifest"); diff --git a/dlls/kernel32/tests/dummy.c b/dlls/kernel32/tests/dummy.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/kernel32/tests/dummy.spec b/dlls/kernel32/tests/dummy.spec new file mode 100644 index 0000000000..e69de29bb2 diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 53a8b06882..08b6c509ae 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3294,7 +3294,8 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); - break; + if (status == STATUS_SUCCESS) + break; } RtlFreeUnicodeString( &nameW ); } -- 2.18.0

3 6

[PATCH v3] kernel32/tests: Test partially overlapped buffers for MultiByteToWideChar
by Gabriel Ivăncescu 28 Aug '18

28 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Supersedes 150351 only. (minor issue) v3: Display the failed conversion properly. dlls/kernel32/tests/codepage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..38f094f 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,22 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", wine_dbgstr_wn((WCHAR *)buf, ARRAY_SIZE(strW))); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar) -- 1.9.1

1 0

[PATCH] jsproxy: Fix parameters validation in InternetInitializeAutoProxyDll.
by Piotr Caban 28 Aug '18

28 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/jsproxy/main.c | 11 +++-------- dlls/jsproxy/tests/jsproxy.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 8 deletions(-)

2 1

[PATCH v2 1/2] kernel32/tests: Test partially overlapped buffers for MultiByteToWideChar
by Gabriel Ivăncescu 28 Aug '18

28 Aug '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/codepage.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index b15a3a1..1a797eb 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -314,12 +314,22 @@ static void test_overlapped_buffers(void) char buf[256]; int ret; + /* limit such that strA's NUL terminator overlaps strW's NUL */ + size_t overlap_limit = (sizeof(strW)-sizeof(strA)) - (sizeof(strW[0])-sizeof(strA[0])); + SetLastError(0xdeadbeef); memcpy(buf + 1, strW, sizeof(strW)); ret = WideCharToMultiByte(CP_ACP, 0, (WCHAR *)(buf + 1), -1, buf, sizeof(buf), NULL, NULL); ok(ret == sizeof(strA), "unexpected ret %d\n", ret); ok(!memcmp(buf, strA, sizeof(strA)), "conversion failed: %s\n", buf); ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memcpy(buf + overlap_limit, strA, sizeof(strA)); + ret = MultiByteToWideChar(CP_ACP, 0, buf + overlap_limit, -1, (WCHAR *)buf, sizeof(buf) / sizeof(WCHAR)); + ok(ret == ARRAY_SIZE(strW), "unexpected ret %d\n", ret); + ok(!memcmp(buf, strW, sizeof(strW)), "conversion failed: %s\n", buf); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u\n", GetLastError()); } static void test_string_conversion(LPBOOL bUsedDefaultChar) -- 1.9.1

1 1

[PATCH] ntdll: fixed buffer size to MultiByteToWideChar
by Marcus Meissner 28 Aug '18

28 Aug '18

Signed-off-by: Marcus Meissner <meissner(a)suse.de> --- dlls/ntdll/tests/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 7baf474ec1..722ca99d2d 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -512,7 +512,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { - MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, sizeof(path)); + MultiByteToWideChar(CP_ACP, 0, tests[i].dos, -1, path, ARRAY_SIZE(path)); ret = pRtlDosPathNameToNtPathName_U(path, &nameW, &file_part, NULL); if (pRtlDosPathNameToNtPathName_U_WithStatus) @@ -534,7 +534,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) continue; } - MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, sizeof(path)); + MultiByteToWideChar(CP_ACP, 0, tests[i].nt, -1, path, ARRAY_SIZE(path)); ok(!lstrcmpW(nameW.Buffer, path), "%s: Expected %s, got %s.\n", tests[i].dos, tests[i].nt, wine_dbgstr_w(nameW.Buffer)); -- 2.18.0

1 0

[PATCH 8/8] mshtml/tests: Run style tests in IE9 mode.
by Jacek Caban 28 Aug '18

28 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/style.c | 350 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 300 insertions(+), 50 deletions(-)

1 0

[PATCH 7/8] mshtml: Use generic value checks for IHTMLStyle::put_overflow implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 6/8] mshtml: Use generic value checks for IHTMLStyle::put_border*Style implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 5/8] mshtml: Use generic value checks for IHTMLStyle::put_textDecoration implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 4/8] mshtml: Use generic value checks for IHTMLStyle::put_backgroundRepeat implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 3/8] mshtml: Use generic value checks for IHTMLStyle::put_fontWeight implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 2/8] mshtml: Use generic value checks for IHTMLStyle::put_fontVariant implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH 1/8] mshtml: Support using array to check for allowed values and use it in IHTMLStyle::put_fontStyle implementation.
by Jacek Caban 28 Aug '18

28 Aug '18

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

1 0

[PATCH] ole32: Partially implement OleCreateStaticFromData() for OLERENDER_FORMAT.
by Jactry Zeng 28 Aug '18

28 Aug '18

For bug 42710: https://bugs.winehq.org/show_bug.cgi?id=42710 . Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/ole2impl.c | 39 ++++++++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 57 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2impl.c b/dlls/ole32/ole2impl.c index fa5777beb0..e2ae3f262e 100644 --- a/dlls/ole32/ole2impl.c +++ b/dlls/ole32/ole2impl.c @@ -232,9 +232,44 @@ HRESULT WINAPI OleCreateStaticFromData(IDataObject *data, REFIID iid, IOleClientSite *client_site, IStorage *stg, void **obj) { - FIXME("%p,%s,%08x,%p,%p,%p,%p: semi-stub\n", + HRESULT hr; + + TRACE("%p,%s,%08x,%p,%p,%p,%p\n", data, debugstr_guid(iid), renderopt, fmt, client_site, stg, obj); - return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + + if (!obj || !stg) + return E_INVALIDARG; + + if (renderopt == OLERENDER_FORMAT) + { + IOleCache2 *ole_cache = NULL; + IPersistStorage *persist = NULL; + DWORD connection; + STGMEDIUM stgmedium; + + if (!fmt) + return E_INVALIDARG; + + if (SUCCEEDED(hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&ole_cache))) + if (SUCCEEDED(hr = IOleCache2_Cache(ole_cache, fmt, ADVF_PRIMEFIRST, &connection))) + if (SUCCEEDED(hr = IDataObject_GetData(data, fmt, &stgmedium))) + if (SUCCEEDED(hr = IOleCache2_SetData(ole_cache, fmt, &stgmedium, TRUE))) + if (SUCCEEDED(hr = IOleCache2_QueryInterface(ole_cache, &IID_IPersistStorage, + (LPVOID *)&persist))) + if (SUCCEEDED(hr = IPersistStorage_Save(persist, stg, TRUE))) + if (SUCCEEDED(hr = IPersistStorage_SaveCompleted(persist, NULL))) + hr = OleLoad(stg, iid, client_site, obj); + if (persist) + IPersistStorage_Release(persist); + if (ole_cache) + IOleCache2_Release(ole_cache); + return hr; + } + else + { + FIXME("semi-stub\n"); + return OleCreateFromData(data, iid, renderopt, fmt, client_site, stg, obj); + } } /****************************************************************************** diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 48c9e0cbab..ceec369dc3 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4593,6 +4593,62 @@ todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || } } +static void test_OleCreateStaticFromData(void) +{ + HRESULT hr; + IOleObject *ole_obj = NULL; + IStorage *storage; + ILockBytes *ilb; + static FORMATETC bitmap_fmt[] = + { + { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI }, + { 0 } + }; + static const struct expected_method methods_create_from_bitmap[] = + { + { "DataObject_EnumFormatEtc", TEST_TODO }, + { "DataObject_GetDataHere", 0 }, + { "DataObject_QueryGetData", 0, { CF_METAFILEPICT, NULL, DVASPECT_CONTENT, -1, TYMED_ISTORAGE } }, + { NULL } + }; + static const struct expected_method methods_createstatic_from_bitmap[] = + { + { "DataObject_GetData", 0, { CF_BITMAP, NULL, DVASPECT_CONTENT, -1, TYMED_GDI } }, + { NULL } + }; + + hr = CreateILockBytesOnHGlobal(NULL, TRUE, &ilb); + ok(hr == S_OK, "CreateILockBytesOnHGlobal failed: 0x%08x.\n", hr); + hr = StgCreateDocfileOnILockBytes(ilb, STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_READWRITE, + 0, &storage); + ok(hr == S_OK, "StgCreateDocfileOnILockBytes failed: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, NULL, (void **)&ole_obj); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, NULL); + ok(hr == E_INVALIDARG, "OleCreateStaticFromData should fail: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_create_from_bitmap; + hr = OleCreateFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, bitmap_fmt, NULL, + storage, (void **)&ole_obj); + todo_wine ok(hr == DV_E_FORMATETC, "OleCreateFromData should failed: 0x%08x.\n", hr); + + g_dataobject_fmts = bitmap_fmt; + expected_method_list = methods_createstatic_from_bitmap; + hr = OleCreateStaticFromData(&DataObject, &IID_IOleObject, OLERENDER_FORMAT, + bitmap_fmt, NULL, storage, (void **)&ole_obj); + ok(hr == S_OK, "OleCreateStaticFromData failed: 0x%08x.\n", hr); + if (ole_obj) + IOleObject_Release(ole_obj); + + IStorage_Release(storage); + ILockBytes_Release(ilb); +} + START_TEST(ole2) { DWORD dwRegister; @@ -4643,6 +4699,7 @@ START_TEST(ole2) test_data_cache_save(); test_data_cache_save_data(); test_data_cache_contents(); + test_OleCreateStaticFromData(); CoUninitialize(); } -- 2.18.0

1 0

[PATCH] kerberos: Avoid needless conversions between SYSTEMTIME and FILETIME.
by Dmitry Timoshkov 28 Aug '18

28 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 70895c999a..3827e5ccbc 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -751,12 +751,11 @@ static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) { - SYSTEMTIME time; FILETIME filetime; ULARGE_INTEGER tmp; - GetLocalTime( &time ); - SystemTimeToFileTime( &time, &filetime ); + GetSystemTimeAsFileTime( &filetime ); + FileTimeToLocalFileTime( &filetime, &filetime ); tmp.QuadPart = ((ULONGLONG)filetime.dwLowDateTime | (ULONGLONG)filetime.dwHighDateTime << 32) + expirytime; timestamp->LowPart = tmp.QuadPart; timestamp->HighPart = tmp.QuadPart >> 32; -- 2.17.1

2 1

[PATCH] winevulkan: Trace properties for created devices.
by Józef Kucia 28 Aug '18

28 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index a1e970daff85..89df838f0499 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -60,6 +60,9 @@ static void *wine_vk_get_global_proc_addr(const char *name); static const struct vulkan_funcs *vk_funcs; static VkResult (*p_vkEnumerateInstanceVersion)(uint32_t *version); +void WINAPI wine_vkGetPhysicalDeviceProperties(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties *properties); + static void wine_vk_physical_device_free(struct VkPhysicalDevice_T *phys_dev) { if (!phys_dev) @@ -600,6 +603,17 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); + if (TRACE_ON(vulkan)) + { + VkPhysicalDeviceProperties properties; + + wine_vkGetPhysicalDeviceProperties(phys_dev, &properties); + + TRACE("Device name: %s.\n", debugstr_a(properties.deviceName)); + TRACE("Vendor ID: %#x, Device ID: %#x.\n", properties.vendorID, properties.deviceID); + TRACE("Driver version: %#x.\n", properties.driverVersion); + } + if (!(object = heap_alloc_zero(sizeof(*object)))) return VK_ERROR_OUT_OF_HOST_MEMORY; -- 2.16.4

1 0

[PATCH 1/3] comctl32/pager: Support toolbar notification conversion.
by Zhiyi Zhang 28 Aug '18

28 Aug '18

Fix BibleWorks 10 not displaying toolbar. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 96 ++++++++ dlls/comctl32/tests/pager.c | 431 ++++++++++++++++++++++++++++++++++++ 2 files changed, 527 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index de63cad717..0367108db2 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -91,6 +91,17 @@ typedef struct #define INITIAL_DELAY 500 #define REPEAT_DELAY 50 +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +typedef enum +{ + /* Convert ANSI text from parent back to Unicode for pager */ + FROM_ANSI = 0x01, + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + TO_ANSI = 0x02, + /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ + SET_NULL_EMPTY = 0x04 +} ConversionFlag; + static void PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBottomRight, BOOL bClientCoords) { @@ -1020,6 +1031,89 @@ static LRESULT PAGER_NotifyFormat(PAGER_INFO *infoPtr, INT command) } } +static UINT PAGER_GetAnsiNtfCode(UINT code) +{ + switch (code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; + case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + } + return code; +} + +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) +{ + WCHAR emptyW[] = {0}; + WCHAR *oldText; + INT oldTextMax; + void *sendBuffer = NULL; + void *receiveBuffer = NULL; + INT bufferSize; + LRESULT ret = 0; + + oldText = *text; + oldTextMax = textMax ? *textMax : 0; + + hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + + if (oldTextMax < 0) goto done; + + if (!*text && flags & SET_NULL_EMPTY) + *text = emptyW; + + if (*text && flags & TO_ANSI) + { + bufferSize = WideCharToMultiByte(CP_ACP, 0, *text, -1, 0, 0, NULL, FALSE); + bufferSize = max(bufferSize, oldTextMax); + sendBuffer = heap_alloc(bufferSize); + if (!sendBuffer) goto done; + WideCharToMultiByte(CP_ACP, 0, *text, -1, sendBuffer, bufferSize, NULL, FALSE); + *text = sendBuffer; + } + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + if (*text && flags & FROM_ANSI) + { + bufferSize = lstrlenA((CHAR *)*text); + receiveBuffer = heap_alloc(bufferSize + 1); + if (!receiveBuffer) goto done; + memcpy(receiveBuffer, *text, bufferSize + 1); + if (!oldText) goto done; + MultiByteToWideChar(CP_ACP, 0, receiveBuffer, -1, oldText, oldTextMax); + } + +done: + heap_free(sendBuffer); + heap_free(receiveBuffer); + *text = oldText; + return ret; +} + +static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) +{ + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + + switch (hdr->code) + { + /* Toolbar */ + case TBN_GETBUTTONINFOW: + { + NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + SET_NULL_EMPTY | TO_ANSI | FROM_ANSI); + } + case TBN_GETINFOTIPW: + { + NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); + } + } + /* Other notifications or notifications above that don't have text, thus no need to convert */ + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); +} + static LRESULT WINAPI PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { @@ -1115,6 +1209,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return PAGER_NotifyFormat (infoPtr, lParam); case WM_NOTIFY: + return PAGER_Notify (infoPtr, (NMHDR *)lParam); + case WM_COMMAND: return SendMessageW (infoPtr->hwndNotify, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a1f6683a57..46f2eb0acb 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -30,10 +30,91 @@ static HWND parent_wnd, child1_wnd, child2_wnd; static INT notify_format; static BOOL notify_query_received; +static WCHAR test_w[] = {'t', 'e', 's', 't', 0}; +static CHAR test_a[] = {'t', 'e', 's', 't', 0}; +static WCHAR t_w[] = {'t', 0}; +static CHAR large_a[] = "You should have received a copy of the GNU Lesser General Public License along with this ..."; +static WCHAR buffer[64]; +static WCHAR buffer2[64]; + +/* Text field conversion behavior flags for PAGER_SendConvertedNotify() */ +typedef enum +{ + /* Convert ANSI text from parent back to Unicode for pager */ + FROM_ANSI = 0x01, + /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ + TO_ANSI = 0x02, + /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ + SET_NULL_EMPTY = 0x04 +} ConversionFlag; + +static struct notify_test_data +{ + UINT unicode; + UINT ansi; + UINT_PTR id_from; + HWND hwnd_from; + INT text_size; + /* Whether parent receive notification */ + BOOL received; + UINT sub_test_id; + /* Text field conversion behavior flags */ + ConversionFlag flags; +} notify_test_data; #define CHILD1_ID 1 #define CHILD2_ID 2 +#define expect_eq_int(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " 0x%08x, got 0x%08x\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_long(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " 0x%08lx, got 0x%08lx\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_pointer(actual, expected) \ + do \ + { \ + ok((actual) == (expected), "Code:0x%08x Subtest:0x%08x Expect " #actual " %p, got %p\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_text_a(actual, expected) \ + do \ + { \ + ok(!lstrcmpA((actual), (expected)), "Code:0x%08x Subtest:0x%08x Expect " #actual " %s, got %s\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, (expected), (actual)); \ + } while (0) + +#define expect_eq_text_w(actual, expected) \ + do \ + { \ + ok(!lstrcmpW((actual), (expected)), "Code:0x%08x Subtest:0x%08x Expect " #actual " %s, got %s\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id, wine_dbgstr_w((expected)), \ + wine_dbgstr_w((actual))); \ + } while (0) + +#define expect_text_empty(actual) \ + do \ + { \ + ok((actual) && !(actual)[0], "Code:0x%08x Subtest:0x%08x Expect " #actual " empty\n", \ + notify_test_data.unicode, notify_test_data.sub_test_id); \ + } while (0) + +#define expect_null(actual) \ + do \ + { \ + ok(!(actual), "Code:0x%08x Subtest:0x%08x Expect " #actual " NULL, got %p\n", notify_test_data.unicode, \ + notify_test_data.sub_test_id, (actual)); \ + } while (0) + static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); @@ -419,6 +500,355 @@ static void test_wm_notifyformat(void) UnregisterClassW(class_w, GetModuleHandleW(NULL)); } +static void wm_notify_text_handler(CHAR **text, INT *textMax) +{ + expect_eq_int(*textMax, notify_test_data.text_size); + switch (notify_test_data.sub_test_id) + { + case 1: + if (notify_test_data.flags & SET_NULL_EMPTY) + expect_text_empty(*text); + else + expect_null(*text); + break; + case 2: + { + INT length = lstrlenA(*text); + ok(length == 0 + || broken(length == 3) /* 2003 */ + || broken(length == 1) /* <= Win7 */, + "Wrong text length\n"); + break; + } + case 3: + if (notify_test_data.flags & TO_ANSI) + { + expect_eq_text_a(*text, test_a); + ok(*text != (CHAR *)buffer, "Expect using a new buffer\n"); + } + else + { + expect_eq_text_w((WCHAR *)*text, test_w); + expect_eq_pointer(*text, (CHAR *)buffer); + } + break; + case 4: + expect_text_empty(*text); + memcpy(*text, test_a, sizeof(test_a)); + break; + case 5: + expect_text_empty(*text); + *textMax = 1; + break; + case 6: + expect_text_empty(*text); + *text = test_a; + break; + case 7: + *text = test_a; + break; + case 8: + expect_text_empty(*text); + *text = large_a; + break; + } +} + +static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static const WCHAR test[] = {'t', 'e', 's', 't', 0}; + switch (message) + { + case WM_NOTIFY: + { + NMHDR *hdr = (NMHDR *)lParam; + + /* Not notifications we want to test */ + if (!notify_test_data.unicode) break; + ok(!notify_test_data.received, "Extra notification received\n"); + + expect_eq_long(wParam, notify_test_data.id_from); + expect_eq_int(hdr->code, notify_test_data.ansi); + expect_eq_long(hdr->idFrom, notify_test_data.id_from); + expect_eq_pointer(hdr->hwndFrom, notify_test_data.hwnd_from); + + if (hdr->code != notify_test_data.ansi) + { + skip("Notification code mismatch, skipping lParam check\n"); + return 0; + } + switch (hdr->code) + { + /* Toolbar */ + /* No conversion for TBN_SAVE and TBN_RESTORE */ + case TBN_SAVE: + { + NMTBSAVE *nmtbs = (NMTBSAVE *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_eq_text_w((WCHAR *)nmtbs->tbButton.iString, test_w); + break; + case 1: + nmtbs->tbButton.iString = (INT_PTR)test_a; + break; + } + break; + } + case TBN_RESTORE: + { + NMTBRESTORE *nmtbr = (NMTBRESTORE *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_eq_text_w((WCHAR *)nmtbr->tbButton.iString, test_w); + break; + case 1: + nmtbr->tbButton.iString = (INT_PTR)test_a; + break; + } + break; + } + case TBN_GETBUTTONINFOA: + { + NMTOOLBARA *nmtb = (NMTOOLBARA *)hdr; + wm_notify_text_handler(&nmtb->pszText, &nmtb->cchText); + break; + } + /* TBN_GETDISPINFOW doesn't get converted to TBN_GETDISPINFOA */ + case TBN_GETDISPINFOW: + { + NMTBDISPINFOW *nmtbdi = (NMTBDISPINFOW *)hdr; + expect_eq_text_w(nmtbdi->pszText, test_w); + expect_eq_int(nmtbdi->cchText, ARRAY_SIZE(buffer)); + memcpy(nmtbdi->pszText, test_a, sizeof(test_a)); + break; + } + case TBN_GETINFOTIPA: + { + NMTBGETINFOTIPA *nmtbgit = (NMTBGETINFOTIPA *)hdr; + wm_notify_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); + break; + } + default: + ok(0, "Unexpected message 0x%08x\n", hdr->code); + } + notify_test_data.received = TRUE; + ok(!lstrcmpA(test_a, "test"), "test_a got modified\n"); + ok(!lstrcmpW(test_w, test), "test_w got modified\n"); + return 0; + } + case WM_NOTIFYFORMAT: + if (lParam == NF_QUERY) return NFR_ANSI; + break; + } + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static BOOL register_test_notify_class(void) +{ + WNDCLASSA cls = {0}; + + cls.lpfnWndProc = test_notify_proc; + cls.hInstance = GetModuleHandleA(NULL); + cls.lpszClassName = "Pager notify class"; + return RegisterClassA(&cls); +} + +static void send_notify_(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOOL code_change, BOOL received) +{ + NMHDR *hdr = (NMHDR *)lParam; + + notify_test_data.unicode = unicode; + notify_test_data.id_from = 1; + notify_test_data.hwnd_from = child1_wnd; + notify_test_data.ansi = ansi; + notify_test_data.received = FALSE; + + hdr->code = unicode; + hdr->idFrom = 1; + hdr->hwndFrom = child1_wnd; + + SendMessageW(pager, WM_NOTIFY, hdr->idFrom, lParam); + expect_eq_int(notify_test_data.received, received); + expect_eq_int(hdr->code, code_change ? notify_test_data.ansi : notify_test_data.unicode); +} + +#define send_notify(a, b, c, d, e) send_notify_(pager, a, b, c, d, e) + +/* Send notify to test text field conversion. In parent proc wm_notify_text_handler() handles these messages */ +static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHAR **text, INT *textMax, + UINT code_unicode, UINT code_ansi, ConversionFlag flags) +{ + notify_test_data.flags = flags; + + /* NULL text */ + notify_test_data.sub_test_id = 1; + memset(ptr, 0, size); + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_null(*text); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Zero text max size */ + notify_test_data.sub_test_id = 2; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + /* Got *text null on Windows <= Win7 */ + ok(broken(!*text) || (!lstrlenW(*text) && *text == buffer), "Wrong *text\n"); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification */ + notify_test_data.sub_test_id = 3; + memset(ptr, 0, size); + memcpy(buffer, test_w, sizeof(test_w)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + if (!(flags & TO_ANSI) && flags & FROM_ANSI) + expect_eq_text_w(*text, t_w); + else + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent write to buffer */ + notify_test_data.sub_test_id = 4; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent set buffer size to one */ + notify_test_data.sub_test_id = 5; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, 1); + + /* Valid notification. Parent replace buffer */ + notify_test_data.sub_test_id = 6; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_eq_text_w(*text, test_w); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* NULL text. Parent replace buffer */ + notify_test_data.sub_test_id = 7; + memset(ptr, 0, size); + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + expect_null(*text); + expect_eq_int(*textMax, notify_test_data.text_size); + + /* Valid notification. Parent replace buffer with a pointer pointing to a string larger than old buffer can store */ + notify_test_data.sub_test_id = 8; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + memset(buffer2, 0, sizeof(buffer2)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + MultiByteToWideChar(CP_ACP, 0, large_a, -1, buffer2, ARRAY_SIZE(buffer2)); + ok(!memcmp(*text, buffer2, sizeof(buffer2)), "Expect memory content to be the same\n"); + expect_eq_pointer(*text, buffer); + expect_eq_int(*textMax, notify_test_data.text_size); +} + +#define test_wm_notify_text_helper(a, b, c, d, e, f, g) test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g) + +static void test_wm_notify_toolbar(HWND pager) +{ + NMTBRESTORE nmtbr; + NMTBSAVE nmtbs; + NMTOOLBARW nmtb; + NMTBDISPINFOW nmtbdi; + NMTBGETINFOTIPW nmtbgit; + + /* No conversion for TBN_SAVE */ + notify_test_data.sub_test_id = 0; + memset(&nmtbs, 0, sizeof(nmtbs)); + nmtbs.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_SAVE, TBN_SAVE, (LPARAM)&nmtbs, TRUE, TRUE); + expect_eq_text_w((WCHAR *)nmtbs.tbButton.iString, test_w); + + notify_test_data.sub_test_id = 1; + memset(&nmtbs, 0, sizeof(nmtbs)); + nmtbs.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_SAVE, TBN_SAVE, (LPARAM)&nmtbs, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbs.tbButton.iString, test_a); + + /* No conversion for TBN_RESTORE */ + notify_test_data.sub_test_id = 0; + memset(&nmtbr, 0, sizeof(nmtbr)); + nmtbr.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_RESTORE, TBN_RESTORE, (LPARAM)&nmtbr, TRUE, TRUE); + expect_eq_text_w((WCHAR *)nmtbr.tbButton.iString, test_w); + + notify_test_data.sub_test_id = 1; + memset(&nmtbr, 0, sizeof(nmtbr)); + nmtbr.tbButton.iString = (INT_PTR)test_w; + send_notify(TBN_RESTORE, TBN_RESTORE, (LPARAM)&nmtbr, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbr.tbButton.iString, test_a); + + /* TBN_GETDISPINFOW doesn't get unconverted */ + memset(&nmtbdi, 0, sizeof(nmtbdi)); + memcpy(buffer, test_w, sizeof(test_w)); + nmtbdi.dwMask = TBNF_TEXT; + nmtbdi.pszText = buffer; + nmtbdi.cchText = ARRAY_SIZE(buffer); + notify_test_data.text_size = nmtbdi.cchText; + send_notify(TBN_GETDISPINFOW, TBN_GETDISPINFOW, (LPARAM)&nmtbdi, TRUE, TRUE); + expect_eq_text_a((CHAR *)nmtbdi.pszText, test_a); + + test_wm_notify_text_helper(&nmtb, sizeof(nmtb), &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, + TBN_GETBUTTONINFOA, SET_NULL_EMPTY | TO_ANSI); + test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, + TBN_GETINFOTIPA, FROM_ANSI); +} + +static void test_wm_notify(void) +{ + static const CHAR *class = "Pager notify class"; + HWND parent, pager; + + ok(register_test_notify_class(), "Register test class failed, error 0x%08x\n", GetLastError()); + + parent = CreateWindowA(class, "parent", WS_OVERLAPPED, 0, 0, 100, 100, 0, 0, GetModuleHandleA(0), 0); + ok(parent != NULL, "CreateWindow failed\n"); + pager = CreateWindowA(WC_PAGESCROLLERA, "pager", WS_CHILD, 0, 0, 100, 100, parent, 0, GetModuleHandleA(0), 0); + ok(pager != NULL, "CreateWindow failed\n"); + child1_wnd = CreateWindowA(class, "child", WS_CHILD, 0, 0, 100, 100, pager, (HMENU)1, GetModuleHandleA(0), 0); + ok(child1_wnd != NULL, "CreateWindow failed\n"); + SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + + test_wm_notify_toolbar(pager); + + DestroyWindow(parent); + UnregisterClassA(class, GetModuleHandleA(NULL)); +} + static void init_functions(void) { HMODULE mod = LoadLibraryA("comctl32.dll"); @@ -447,6 +877,7 @@ START_TEST(pager) test_pager(); test_wm_notifyformat(); + test_wm_notify(); DestroyWindow(parent_wnd); } -- 2.18.0

2 2

[PATCH 3/3] comctl32/pager: Support comboboxex notification conversion.
by Zhiyi Zhang 28 Aug '18

28 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 59 +++++++++++++- dlls/comctl32/tests/pager.c | 148 +++++++++++++++++++++++++++++++++--- 2 files changed, 192 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 9ab492e333..37b2e52325 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -101,7 +101,11 @@ typedef enum /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ TO_ANSI = 0x02, /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ - SET_NULL_EMPTY = 0x04 + SET_NULL_EMPTY = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + NO_MASK_SET_NULL = 0x08, + /* Zero the text buffer before sending */ + ZERO_BUFFER = 0x10 } ConversionFlag; static void @@ -1038,6 +1042,10 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) { switch (code) { + /* ComboxBoxEx */ + case CBEN_DRAGBEGINW: return CBEN_DRAGBEGINA; + case CBEN_ENDEDITW: return CBEN_ENDEDITA; + case CBEN_GETDISPINFOW: return CBEN_GETDISPINFOA; /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; @@ -1060,7 +1068,8 @@ static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) return TRUE; } -static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) +static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, ConversionFlag flags) { WCHAR emptyW[] = {0}; WCHAR *oldText; @@ -1075,8 +1084,17 @@ static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR hdr->code = PAGER_GetAnsiNtfCode(hdr->code); + if (mask && !(*mask & requiredMask)) + { + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); + if (flags & NO_MASK_SET_NULL) oldText = NULL; + goto done; + } + if (oldTextMax < 0) goto done; + if (*text && flags & ZERO_BUFFER) memset(*text, 0, oldTextMax * sizeof(WCHAR)); + if (!*text && flags & SET_NULL_EMPTY) *text = emptyW; @@ -1117,17 +1135,50 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) switch (hdr->code) { + /* ComboBoxEx */ + case CBEN_GETDISPINFOW: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + return PAGER_SendConvertedNotify(infoPtr, hdr, &nmcbe->ceItem.mask, CBEIF_TEXT, &nmcbe->ceItem.pszText, + &nmcbe->ceItem.cchTextMax, NO_MASK_SET_NULL | ZERO_BUFFER | FROM_ANSI); + } + case CBEN_DRAGBEGINW: + { + NMCBEDRAGBEGINW *nmdbW = (NMCBEDRAGBEGINW *)hdr; + NMCBEDRAGBEGINA nmdbA = {0}; + nmdbA.hdr.code = PAGER_GetAnsiNtfCode(nmdbW->hdr.code); + nmdbA.hdr.hwndFrom = nmdbW->hdr.hwndFrom; + nmdbA.hdr.idFrom = nmdbW->hdr.idFrom; + nmdbA.iItemid = nmdbW->iItemid; + WideCharToMultiByte(CP_ACP, 0, nmdbW->szText, ARRAY_SIZE(nmdbW->szText), nmdbA.szText, ARRAY_SIZE(nmdbA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmdbA); + } + case CBEN_ENDEDITW: + { + NMCBEENDEDITW *nmedW = (NMCBEENDEDITW *)hdr; + NMCBEENDEDITA nmedA = {0}; + nmedA.hdr.code = PAGER_GetAnsiNtfCode(nmedW->hdr.code); + nmedA.hdr.hwndFrom = nmedW->hdr.hwndFrom; + nmedA.hdr.idFrom = nmedW->hdr.idFrom; + nmedA.fChanged = nmedW->fChanged; + nmedA.iNewSelection = nmedW->iNewSelection; + nmedA.iWhy = nmedW->iWhy; + WideCharToMultiByte(CP_ACP, 0, nmedW->szText, ARRAY_SIZE(nmedW->szText), nmedA.szText, ARRAY_SIZE(nmedA.szText), + NULL, FALSE); + return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmedA); + } /* Toolbar */ case TBN_GETBUTTONINFOW: { NMTOOLBARW *nmtb = (NMTOOLBARW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtb->pszText, &nmtb->cchText, + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtb->pszText, &nmtb->cchText, SET_NULL_EMPTY | TO_ANSI | FROM_ANSI); } case TBN_GETINFOTIPW: { NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; - return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); + return PAGER_SendConvertedNotify(infoPtr, hdr, NULL, 0, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); } /* Tooltip */ case TTN_GETDISPINFOW: diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index bf79f34c5b..ee8d36d040 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -45,7 +45,11 @@ typedef enum /* Convert Unicode text to ANSI for parent before sending. If not set, do nothing */ TO_ANSI = 0x02, /* Send empty text to parent if text is NULL, original text pointer still remain NULL */ - SET_NULL_EMPTY = 0x04 + SET_NULL_EMPTY = 0x04, + /* Set text to null after parent received the notification if the required mask is not set before sending notification */ + NO_MASK_SET_NULL = 0x08, + /* Zero the text buffer before sending */ + ZERO_BUFFER = 0x10 } ConversionFlag; static struct notify_test_data @@ -505,12 +509,15 @@ static void wm_notify_text_handler(CHAR **text, INT *textMax) expect_eq_int(*textMax, notify_test_data.text_size); switch (notify_test_data.sub_test_id) { - case 1: + case 0: if (notify_test_data.flags & SET_NULL_EMPTY) expect_text_empty(*text); else expect_null(*text); break; + case 1: + expect_text_empty(*text); + break; case 2: { INT length = lstrlenA(*text); @@ -521,7 +528,9 @@ static void wm_notify_text_handler(CHAR **text, INT *textMax) break; } case 3: - if (notify_test_data.flags & TO_ANSI) + if (notify_test_data.flags & ZERO_BUFFER) + expect_text_empty(*text); + else if (notify_test_data.flags & TO_ANSI) { expect_eq_text_a(*text, test_a); ok(*text != (CHAR *)buffer, "Expect using a new buffer\n"); @@ -579,6 +588,49 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L } switch (hdr->code) { + /* ComboBoxEx */ + /* No conversion for CBEN_INSERTITEM and CBEN_DELETEITEM */ + case CBEN_INSERTITEM: + case CBEN_DELETEITEM: + { + NMCOMBOBOXEXW *nmcbe = (NMCOMBOBOXEXW *)hdr; + expect_eq_text_w(nmcbe->ceItem.pszText, test_w); + break; + } + case CBEN_DRAGBEGINA: + { + NMCBEDRAGBEGINA *nmcbedb = (NMCBEDRAGBEGINA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_text_empty(nmcbedb->szText); + break; + case 1: + expect_eq_text_a(nmcbedb->szText, test_a); + break; + } + break; + } + case CBEN_ENDEDITA: + { + NMCBEENDEDITA *nmcbeed = (NMCBEENDEDITA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + expect_text_empty(nmcbeed->szText); + break; + case 1: + expect_eq_text_a(nmcbeed->szText, test_a); + break; + } + break; + } + case CBEN_GETDISPINFOA: + { + NMCOMBOBOXEXA *nmcbe = (NMCOMBOBOXEXA *)hdr; + wm_notify_text_handler(&nmcbe->ceItem.pszText, &nmcbe->ceItem.cchTextMax); + break; + } /* Toolbar */ /* No conversion for TBN_SAVE and TBN_RESTORE */ case TBN_SAVE: @@ -724,24 +776,46 @@ static void send_notify_(HWND pager, UINT unicode, UINT ansi, LPARAM lParam, BOO #define send_notify(a, b, c, d, e) send_notify_(pager, a, b, c, d, e) /* Send notify to test text field conversion. In parent proc wm_notify_text_handler() handles these messages */ -static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHAR **text, INT *textMax, - UINT code_unicode, UINT code_ansi, ConversionFlag flags) +static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, UINT *mask, UINT requiredMask, WCHAR **text, + INT *textMax, UINT code_unicode, UINT code_ansi, ConversionFlag flags) { notify_test_data.flags = flags; /* NULL text */ - notify_test_data.sub_test_id = 1; + notify_test_data.sub_test_id = 0; memset(ptr, 0, size); + if (mask) *mask = requiredMask; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); expect_null(*text); expect_eq_int(*textMax, notify_test_data.text_size); + if (mask) + { + /* No required mask */ + notify_test_data.sub_test_id = 1; + memset(ptr, 0, size); + memset(buffer, 0, sizeof(buffer)); + *text = buffer; + *textMax = ARRAY_SIZE(buffer); + notify_test_data.text_size = *textMax; + send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); + if (flags & NO_MASK_SET_NULL) + expect_null(*text); + else + { + expect_text_empty(*text); + expect_eq_pointer(*text, buffer); + } + expect_eq_int(*textMax, notify_test_data.text_size); + } + /* Zero text max size */ notify_test_data.sub_test_id = 2; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); @@ -753,11 +827,14 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 3; memset(ptr, 0, size); memcpy(buffer, test_w, sizeof(test_w)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); - if (!(flags & TO_ANSI) && flags & FROM_ANSI) + if (flags & ZERO_BUFFER) + expect_text_empty(*text); + else if (!(flags & TO_ANSI) && flags & FROM_ANSI) expect_eq_text_w(*text, t_w); else expect_eq_text_w(*text, test_w); @@ -768,6 +845,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 4; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -780,6 +858,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 5; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -791,6 +870,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA notify_test_data.sub_test_id = 6; memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -802,6 +882,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA /* NULL text. Parent replace buffer */ notify_test_data.sub_test_id = 7; memset(ptr, 0, size); + if (mask) *mask = requiredMask; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; send_notify(code_unicode, code_ansi, (LPARAM)ptr, TRUE, TRUE); @@ -813,6 +894,7 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA memset(ptr, 0, size); memset(buffer, 0, sizeof(buffer)); memset(buffer2, 0, sizeof(buffer2)); + if (mask) *mask = requiredMask; *text = buffer; *textMax = ARRAY_SIZE(buffer); notify_test_data.text_size = *textMax; @@ -823,7 +905,50 @@ static void test_wm_notify_text_helper_(HWND pager, void *ptr, size_t size, WCHA expect_eq_int(*textMax, notify_test_data.text_size); } -#define test_wm_notify_text_helper(a, b, c, d, e, f, g) test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g) +#define test_wm_notify_text_helper(a, b, c, d, e, f, g, h, i) \ + test_wm_notify_text_helper_(pager, a, b, c, d, e, f, g, h, i) + +static void test_wm_notify_comboboxex(HWND pager) +{ + NMCOMBOBOXEXW nmcbe; + NMCBEDRAGBEGINW nmcbedb; + NMCBEENDEDITW nmcbeed; + + /* CBEN_INSERTITEM and CBEN_DELETEITEM will be forwarded unchanged */ + memset(&nmcbe, 0, sizeof(nmcbe)); + nmcbe.ceItem.mask = CBEIF_TEXT; + nmcbe.ceItem.pszText = test_w; + nmcbe.ceItem.cchTextMax = ARRAY_SIZE(test_w); + send_notify(CBEN_INSERTITEM, CBEN_INSERTITEM, (LPARAM)&nmcbe, TRUE, TRUE); + send_notify(CBEN_DELETEITEM, CBEN_DELETEITEM, (LPARAM)&nmcbe, TRUE, TRUE); + + /* CBEN_DRAGBEGIN */ + notify_test_data.sub_test_id = 0; + memset(&nmcbedb, 0, sizeof(nmcbedb)); + send_notify(CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE, TRUE); + + notify_test_data.sub_test_id = 1; + memset(&nmcbedb, 0, sizeof(nmcbedb)); + memcpy(nmcbedb.szText, test_w, sizeof(test_w)); + send_notify(CBEN_DRAGBEGINW, CBEN_DRAGBEGINA, (LPARAM)&nmcbedb, FALSE, TRUE); + expect_eq_text_w(nmcbedb.szText, test_w); + + /* CBEN_ENDEDIT */ + notify_test_data.sub_test_id = 0; + memset(&nmcbeed, 0, sizeof(nmcbeed)); + send_notify(CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE, TRUE); + + notify_test_data.sub_test_id = 1; + memset(&nmcbeed, 0, sizeof(nmcbeed)); + memcpy(nmcbeed.szText, test_w, sizeof(test_w)); + send_notify(CBEN_ENDEDITW, CBEN_ENDEDITA, (LPARAM)&nmcbeed, FALSE, TRUE); + expect_eq_text_w(nmcbeed.szText, test_w); + + /* CBEN_GETDISPINFO */ + test_wm_notify_text_helper(&nmcbe, sizeof(nmcbe), &nmcbe.ceItem.mask, CBEIF_TEXT, &nmcbe.ceItem.pszText, + &nmcbe.ceItem.cchTextMax, CBEN_GETDISPINFOW, CBEN_GETDISPINFOA, + NO_MASK_SET_NULL | ZERO_BUFFER | FROM_ANSI); +} static void test_wm_notify_toolbar(HWND pager) { @@ -869,10 +994,10 @@ static void test_wm_notify_toolbar(HWND pager) send_notify(TBN_GETDISPINFOW, TBN_GETDISPINFOW, (LPARAM)&nmtbdi, TRUE, TRUE); expect_eq_text_a((CHAR *)nmtbdi.pszText, test_a); - test_wm_notify_text_helper(&nmtb, sizeof(nmtb), &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, + test_wm_notify_text_helper(&nmtb, sizeof(nmtb), NULL, 0, &nmtb.pszText, &nmtb.cchText, TBN_GETBUTTONINFOW, TBN_GETBUTTONINFOA, SET_NULL_EMPTY | TO_ANSI); - test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), &nmtbgit.pszText, &nmtbgit.cchTextMax, TBN_GETINFOTIPW, - TBN_GETINFOTIPA, FROM_ANSI); + test_wm_notify_text_helper(&nmtbgit, sizeof(nmtbgit), NULL, 0, &nmtbgit.pszText, &nmtbgit.cchTextMax, + TBN_GETINFOTIPW, TBN_GETINFOTIPA, FROM_ANSI); } static void test_wm_notify_tooltip(HWND pager) @@ -979,6 +1104,7 @@ static void test_wm_notify(void) ok(child1_wnd != NULL, "CreateWindow failed\n"); SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); + test_wm_notify_comboboxex(pager); test_wm_notify_toolbar(pager); test_wm_notify_tooltip(pager); -- 2.18.0

1 0

[PATCH 2/3] comctl32/pager: Support tooltip notification conversion.
by Zhiyi Zhang 28 Aug '18

28 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/pager.c | 72 +++++++++++++++++++ dlls/comctl32/tests/pager.c | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 209 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 0367108db2..9ab492e333 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -84,6 +84,8 @@ typedef struct INT TLbtnState; /* state of top or left btn */ INT BRbtnState; /* state of bottom or right btn */ INT direction; /* direction of the scroll, (e.g. PGF_SCROLLUP) */ + WCHAR *pwszBuffer;/* text buffer for converted notifications */ + INT nBufferSize;/* size of the above buffer */ } PAGER_INFO; #define TIMERID1 1 @@ -605,6 +607,7 @@ static LRESULT PAGER_Destroy (PAGER_INFO *infoPtr) { SetWindowLongPtrW (infoPtr->hwndSelf, 0, 0); + heap_free (infoPtr->pwszBuffer); heap_free (infoPtr); return 0; } @@ -1038,10 +1041,25 @@ static UINT PAGER_GetAnsiNtfCode(UINT code) /* Toolbar */ case TBN_GETBUTTONINFOW: return TBN_GETBUTTONINFOA; case TBN_GETINFOTIPW: return TBN_GETINFOTIPA; + /* Tooltip */ + case TTN_GETDISPINFOW: return TTN_GETDISPINFOA; } return code; } +static BOOL PAGER_AdjustBuffer(PAGER_INFO *infoPtr, INT size) +{ + if (!infoPtr->pwszBuffer) + infoPtr->pwszBuffer = heap_alloc(size); + else if (infoPtr->nBufferSize < size) + infoPtr->pwszBuffer = heap_realloc(infoPtr->pwszBuffer, size); + + if (!infoPtr->pwszBuffer) return FALSE; + if (infoPtr->nBufferSize < size) infoPtr->nBufferSize = size; + + return TRUE; +} + static LRESULT PAGER_SendConvertedNotify(PAGER_INFO *infoPtr, NMHDR *hdr, WCHAR **text, INT *textMax, ConversionFlag flags) { WCHAR emptyW[] = {0}; @@ -1093,6 +1111,8 @@ done: static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) { + LRESULT ret; + if (infoPtr->bUnicode) return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); switch (hdr->code) @@ -1109,6 +1129,58 @@ static LRESULT PAGER_Notify(PAGER_INFO *infoPtr, NMHDR *hdr) NMTBGETINFOTIPW *nmtbgit = (NMTBGETINFOTIPW *)hdr; return PAGER_SendConvertedNotify(infoPtr, hdr, &nmtbgit->pszText, &nmtbgit->cchTextMax, FROM_ANSI); } + /* Tooltip */ + case TTN_GETDISPINFOW: + { + NMTTDISPINFOW *nmttdiW = (NMTTDISPINFOW *)hdr; + NMTTDISPINFOA nmttdiA = {0}; + INT size; + + nmttdiA.hdr.code = PAGER_GetAnsiNtfCode(nmttdiW->hdr.code); + nmttdiA.hdr.hwndFrom = nmttdiW->hdr.hwndFrom; + nmttdiA.hdr.idFrom = nmttdiW->hdr.idFrom; + nmttdiA.hinst = nmttdiW->hinst; + nmttdiA.uFlags = nmttdiW->uFlags; + nmttdiA.lParam = nmttdiW->lParam; + nmttdiA.lpszText = nmttdiA.szText; + WideCharToMultiByte(CP_ACP, 0, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText), nmttdiA.szText, + ARRAY_SIZE(nmttdiA.szText), NULL, FALSE); + + ret = SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)&nmttdiA); + + nmttdiW->hinst = nmttdiA.hinst; + nmttdiW->uFlags = nmttdiA.uFlags; + nmttdiW->lParam = nmttdiA.lParam; + + MultiByteToWideChar(CP_ACP, 0, nmttdiA.szText, ARRAY_SIZE(nmttdiA.szText), nmttdiW->szText, + ARRAY_SIZE(nmttdiW->szText)); + if (!nmttdiA.lpszText) + nmttdiW->lpszText = nmttdiW->szText; + else if (!IS_INTRESOURCE(nmttdiA.lpszText)) + { + size = MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, 0, 0); + if (size > ARRAY_SIZE(nmttdiW->szText)) + { + if (!PAGER_AdjustBuffer(infoPtr, size * sizeof(WCHAR))) return ret; + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, infoPtr->pwszBuffer, size); + nmttdiW->lpszText = infoPtr->pwszBuffer; + /* Override content in szText */ + memcpy(nmttdiW->szText, nmttdiW->lpszText, min(sizeof(nmttdiW->szText), size * sizeof(WCHAR))); + } + else + { + MultiByteToWideChar(CP_ACP, 0, nmttdiA.lpszText, -1, nmttdiW->szText, ARRAY_SIZE(nmttdiW->szText)); + nmttdiW->lpszText = nmttdiW->szText; + } + } + else + { + nmttdiW->szText[0] = 0; + nmttdiW->lpszText = (WCHAR *)nmttdiA.lpszText; + } + + return ret; + } } /* Other notifications or notifications above that don't have text, thus no need to convert */ return SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, hdr->idFrom, (LPARAM)hdr); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 46f2eb0acb..bf79f34c5b 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -630,6 +630,53 @@ static LRESULT WINAPI test_notify_proc(HWND hwnd, UINT message, WPARAM wParam, L wm_notify_text_handler(&nmtbgit->pszText, &nmtbgit->cchTextMax); break; } + /* Tooltip */ + case TTN_GETDISPINFOA: + { + NMTTDISPINFOA *nmttdi = (NMTTDISPINFOA *)hdr; + switch (notify_test_data.sub_test_id) + { + case 0: + break; + case 1: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + break; + case 2: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = test_a; + break; + case 3: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = (CHAR *)1; + nmttdi->hinst = GetModuleHandleA(0); + break; + case 4: + memcpy(nmttdi->szText, test_a, sizeof(test_a)); + nmttdi->lpszText = test_a; + nmttdi->hinst = GetModuleHandleA(0); + break; + case 5: + nmttdi->lpszText = test_a; + break; + case 6: + memcpy(nmttdi->szText, test_a, 2); + nmttdi->szText[2] = 0; + nmttdi->lpszText = test_a; + break; + case 7: + expect_eq_text_a(nmttdi->szText, test_a); + expect_eq_pointer(nmttdi->lpszText, nmttdi->szText); + break; + case 8: + expect_text_empty(nmttdi->szText); + expect_eq_pointer(nmttdi->lpszText, nmttdi->szText); + break; + case 9: + nmttdi->lpszText = large_a; + break; + } + break; + } default: ok(0, "Unexpected message 0x%08x\n", hdr->code); } @@ -828,6 +875,95 @@ static void test_wm_notify_toolbar(HWND pager) TBN_GETINFOTIPA, FROM_ANSI); } +static void test_wm_notify_tooltip(HWND pager) +{ + NMTTDISPINFOW nmttdi; + WCHAR *buffer_w; + INT size; + + /* if lpszText is not set by parent, will be set to the address of szText, even if szText is empty */ + notify_test_data.sub_test_id = 0; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. If lpszText is not set by parent, will be set to the address of szText */ + notify_test_data.sub_test_id = 1; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. Parent replace nmttdi.lpszText with pointer */ + notify_test_data.sub_test_id = 2; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent write szText. Parent set int resource. szText end up empty */ + notify_test_data.sub_test_id = 3; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + ok(IS_INTRESOURCE(nmttdi.lpszText), "Expect int resource\n"); + ok(nmttdi.hinst != NULL, "Expect instance gets set\n"); + + /* Parent set szText, lpszText and instance */ + notify_test_data.sub_test_id = 4; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + ok(nmttdi.hinst != NULL, "Expect instance gets set\n"); + + /* Empty szText will be filled with lpszText if lpszText is set */ + notify_test_data.sub_test_id = 5; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Not empty szText will be overwritten with lpszText if lpszText is set after conversion */ + notify_test_data.sub_test_id = 6; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Set szText before send_notify. szText got converted for parent */ + notify_test_data.sub_test_id = 7; + memset(&nmttdi, 0, sizeof(nmttdi)); + memcpy(nmttdi.szText, test_w, sizeof(test_w)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_eq_text_w(nmttdi.szText, test_w); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Set lpszText before send_notify. lpszText doesn't get converted for parent */ + notify_test_data.sub_test_id = 8; + memset(&nmttdi, 0, sizeof(nmttdi)); + nmttdi.lpszText = test_w; + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + expect_text_empty(nmttdi.szText); + expect_eq_pointer(nmttdi.lpszText, nmttdi.szText); + + /* Parent set lpszText to a string larger than the size of szText array */ + notify_test_data.sub_test_id = 9; + memset(&nmttdi, 0, sizeof(nmttdi)); + send_notify(TTN_GETDISPINFOW, TTN_GETDISPINFOA, (LPARAM)&nmttdi, FALSE, TRUE); + size = MultiByteToWideChar(CP_ACP, 0, large_a, -1, 0, 0); + buffer_w = heap_alloc(size * sizeof(WCHAR)); + if (!buffer_w) return; + MultiByteToWideChar(CP_ACP, 0, large_a, -1, buffer_w, size); + expect_eq_text_w(nmttdi.lpszText, buffer_w); + buffer_w[ARRAY_SIZE(nmttdi.szText)] = 0; + expect_eq_text_w(nmttdi.szText, buffer_w); + /* nmttdi.szText is not null terminated */ + expect_eq_int(lstrlenW(nmttdi.szText), ARRAY_SIZE(nmttdi.szText)); + heap_free(buffer_w); +} + static void test_wm_notify(void) { static const CHAR *class = "Pager notify class"; @@ -844,6 +980,7 @@ static void test_wm_notify(void) SendMessageW(pager, PGM_SETCHILD, 0, (LPARAM)child1_wnd); test_wm_notify_toolbar(pager); + test_wm_notify_tooltip(pager); DestroyWindow(parent); UnregisterClassA(class, GetModuleHandleA(NULL)); -- 2.18.0

1 0

[PATCH 01/19] shell32: Add rename icon
by Alex Henrie 28 Aug '18

28 Aug '18

Adapted from document-save-as.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/rename.ico | Bin 0 -> 30995 bytes dlls/shell32/resources/rename.svg | 419 ++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 424 insertions(+) create mode 100644 dlls/shell32/resources/rename.ico create mode 100644 dlls/shell32/resources/rename.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 19e6b5be9e..e2380653e8 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -88,6 +88,7 @@ SVG_SRCS = \ resources/printer.svg \ resources/ramdisk.svg \ resources/recent.svg \ + resources/rename.svg \ resources/search.svg \ resources/shortcut.svg \ resources/shut_down.svg \ diff --git a/dlls/shell32/resources/rename.ico b/dlls/shell32/resources/rename.ico new file mode 100644 index 0000000000000000000000000000000000000000..2ae1e6242b0155882c869050279f44a09613d62d GIT binary patch literal 30995 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 Xo%~TdYvKZ;;E4bcxI2OSyq*0AOMiay literal 0 HcmV?d00001 diff --git a/dlls/shell32/resources/rename.svg b/dlls/shell32/resources/rename.svg new file mode 100644 index 0000000000..a11f8a1c8d --- /dev/null +++ b/dlls/shell32/resources/rename.svg @@ -0,0 +1,419 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="632" + height="272" + id="svg2913"> + <defs + id="defs3"> + <linearGradient + id="linearGradient6965"> + <stop + id="stop6967" + offset="0" + style="stop-color:#dddddd;stop-opacity:1;" /> + <stop + id="stop6969" + offset="1" + style="stop-color:#fdfdfd;stop-opacity:1;" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="36.437492" + x2="28.061466" + y1="31.431349" + x1="28.061466" + id="linearGradient6971" + xlink:href="#linearGradient6965" /> + <linearGradient + gradientTransform="translate(-8.8985062e-6)" + y2="36.437492" + x2="28.061466" + y1="31.431349" + x1="28.061466" + gradientUnits="userSpaceOnUse" + id="linearGradient1026" + xlink:href="#linearGradient6965" /> + <linearGradient + gradientTransform="translate(-1.5156709e-5,3.8826737e-6)" + y2="36.437492" + x2="28.061466" + y1="31.431349" + x1="28.061466" + gradientUnits="userSpaceOnUse" + id="linearGradient1026-0" + xlink:href="#linearGradient6965" /> + </defs> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:subject> + <rdf:Bag> + <rdf:li>hdd</rdf:li> + <rdf:li>hard drive</rdf:li> + <rdf:li>save as</rdf:li> + <rdf:li>io</rdf:li> + <rdf:li>store</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> + <dc:identifier /> + <dc:source>http://jimmac.musichall.cz</dc:source> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> + </rdf:RDF> + </metadata> + <rect + ry="1.6249995" + rx="1.6249996" + y="101.09085" + x="30.174999" + height="69.817146" + width="213.65556" + id="rect6951" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient6971);fill-opacity:1;fill-rule:nonzero;stroke:#7d7d7d;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + ry="0" + y="116.45295" + x="43.438541" + height="39.803806" + width="87.099823" + id="rect6953" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.59659095;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + y="110.76669" + x="135.9821" + height="51.176323" + width="5.4437389" + id="rect6957" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:256-32" + height="256" + width="256" + y="8" + x="8" + style="fill:none" /> + <rect + ry="1.6249996" + rx="1.6249996" + y="237.86078" + x="276.564" + height="12.278223" + width="39.247944" + id="rect6951-1" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1026);fill-opacity:1;fill-rule:nonzero;stroke:#7d7d7d;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + ry="0" + y="240.56241" + x="279.00049" + height="7" + width="16" + id="rect6953-2" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.59659095;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + y="239.56241" + x="296.00046" + height="9" + width="1" + id="rect6957-7" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:48-32" + height="48" + width="48" + y="220" + x="272" + style="fill:none" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +" + id="icon:48-8" + x="328" + y="220" /> + <image + width="48" + height="48" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +" + id="icon:48-4" + x="384" + y="220" /> + <rect + ry="1.6249995" + rx="1.6249998" + y="248.07381" + x="443.20901" + height="7.8521929" + width="25.832096" + id="rect6951-1-6" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient1026-0);fill-opacity:1;fill-rule:nonzero;stroke:#7d7d7d;stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + ry="0" + y="249.80159" + x="444.81265" + height="4.4766536" + width="10.530833" + id="rect6953-2-0" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:0.59659095;fill:#7d7d7d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + y="249.16206" + x="456.00165" + height="5.7556973" + width="0.65817708" + id="rect6957-7-6" + style="color:#000000;display:block;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + <rect + id="icon:32-32" + height="32" + width="32" + y="236" + x="440" + style="fill:none" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +" + id="icon:32-8" + x="480" + y="236" /> + <image + width="32" + height="32" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,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 +" + id="icon:32-4" + x="520" + y="236" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAQAAADlauupAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBsLKiB4YIh3AAABMUlEQVQ4y+3SMUjUcRQH8M//7m93 +pEScQ4aDODkbDjmEQ3trmwQaIoi4NUlDONbskA4GOTS0SjQ0FbkoOIvcYFHCoZ53at3dc/AH3iC0 +RUNfePD4vu+D9/3y+I/sbYGf29x6QaGGb3/YKBMjnGwyt0t++p7OMe2bxHPsJWEb/Zik08KdxJeI ++7QX2B8mi+DdaMTdeTqrGEnCZc7G+f2LwSnia+Jz4ojqNCtbWZZD+ZDTNWo1sg9JuMN5H6U3VB7S +fnnlIoY4mKH3FQXQIZ4QQeSpEI9QRXZdepeVw9kEtz8xUMFomj+guU9rjNoSsd5loU5zhsYS2esN +6t/pK1Nc7AoxIz4Sx8QCKom/QTyleY/HdfLyMI0qxS8UhtDTdebsVfIaqW8Rnyk+Y+DHX3+7fxIX +l+pi+sKnBHEAAAAUdEVYdEF1dGhvcgBKYWt1YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0 +AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRpb24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcv +cHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjdU +MTc6NDI6MzItMDY6MDBdLOJiAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDE4LTA4LTI3VDE3OjQyOjMy +LTA2OjAwLHFa3gAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNv +dXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFsbC5jemlm414AAAAASUVORK5CYII= +" + id="icon:16-32" + x="560" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBsLKiEPZ7jhAAAAh0lEQVQoz8XRwQoBURjF8d81t0aR +skJ5Ly/hkVhaeSplN8WCGSaNa0FjEmtndeqczr+vj/8rbBRGel+i5GwpXt01Uie4t4XGXki2aaYR +wMXN/FVPdtYhkrs4PHlqufFrIykMxKdN7eynIrWxSQdxbBGVUlg5Gco6G29XWYh9pezHmZnpv98A +Hi+eLw8bGCqAAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdo +dABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3Jn +L3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI3 +VDE3OjQyOjMzLTA2OjAw+1vp1gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yN1QxNzo0Mjoz +My0wNjowMIoGUWoAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRT +b3VyY2UAaHR0cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC +" + id="icon:16-8" + x="584" + y="252" /> + <image + width="16" + height="16" + preserveAspectRatio="none" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAABGdBTUEAALGPC/xhBQAAACBjSFJN +AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QAAKqNIzIAAAAJcEhZ +cwAAJYAAACWAAWxVCAcAAAAHdElNRQfiCBsLKiEPZ7jhAAAAh0lEQVQoz8XRwQoBURjF8d81t0aR +skJ5Ly/hkVhaeSplN8WCGSaNa0FjEmtndeqczr+vj/8rbBRGel+i5GwpXt01Uie4t4XGXki2aaYR +wMXN/FVPdtYhkrs4PHlqufFrIykMxKdN7eynIrWxSQdxbBGVUlg5Gco6G29XWYh9pezHmZnpv98A +Hi+eLw8bGCqAAAAAFHRFWHRBdXRob3IASmFrdWIgU3RlaW5lcub79y8AAABYdEVYdENvcHlyaWdo +dABDQzAgUHVibGljIERvbWFpbiBEZWRpY2F0aW9uIGh0dHA6Ly9jcmVhdGl2ZWNvbW1vbnMub3Jn +L3B1YmxpY2RvbWFpbi96ZXJvLzEuMC/G4735AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE4LTA4LTI3 +VDE3OjQyOjMzLTA2OjAw+1vp1gAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxOC0wOC0yN1QxNzo0Mjoz +My0wNjowMIoGUWoAAAAZdEVYdFNvZnR3YXJlAHd3dy5pbmtzY2FwZS5vcmeb7jwaAAAAIXRFWHRT +b3VyY2UAaHR0cDovL2ppbW1hYy5tdXNpY2hhbGwuY3ppZuNeAAAAAElFTkSuQmCC +" + id="icon:16-4" + x="608" + y="252" /> +</svg> diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 169d345786..b6043cf3d6 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -645,6 +645,9 @@ IDI_SHELL_FAVORITES_FOLDER ICON resources/favorites.ico /* @makedep: resources/mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico +/* @makedep: resources/rename.ico */ +IDI_SHELL_RENAME ICON resources/rename.ico + /* @makedep: resources/optical_disc.ico */ IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 81f41fcc43..042991c065 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -244,6 +244,7 @@ #define IDI_SHELL_DEFAULT_TO_FILE_PRINTER 170 #define IDI_SHELL_FAVORITES_FOLDER 173 #define IDI_SHELL_MY_DOCUMENTS 235 +#define IDI_SHELL_RENAME 242 #define IDI_SHELL_OPTICAL_DISC 302 #define IDI_SHELL_FAVORITES_SMALL 322 -- 2.18.0

1 18

[PATCH] dpnet: Implement IDirectPlay8Client SetSPCaps
by Alistair Leslie-Hughes 28 Aug '18

28 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/tests/client.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 3b3361f..ea491ef 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -309,9 +309,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(IDirectPlay8Client *iface, static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 47d8b01..af56d85 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -140,6 +140,9 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); @@ -415,6 +418,33 @@ static void test_get_sp_caps(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); + + /* Reset the System setting back to its default. */ + caps.dwSystemBufferSize = 0x10000; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); } static void test_lobbyclient(void) -- 1.9.1

1 0

[PATCH 1/5] [programs/cmd] REBASE+RESEND: Fix shortpath handling in for loops
by Jason Edmeades 27 Aug '18

27 Aug '18

Fixes todo in tests When 's' is used as a modifier, the paths that are presented to the other modifiers needs to be a short path. Given the 'filename' part of the path may not exist, we cannot use GetShortPathName directly without first removing the filename part to just leave the directory bit. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> --- programs/cmd/batch.c | 17 +++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 14e2539bf7..1ed5197adc 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,6 +399,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR finaloutput[MAX_PATH]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; + WCHAR *filepart = NULL; WCHAR *pos = *start+1; WCHAR *firstModifier = pos; WCHAR *lastModifier = NULL; @@ -522,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) { exists = FALSE; fullfilename[0] = 0x00; } else { @@ -598,8 +599,16 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, ARRAY_SIZE(outputparam)); + + /* Convert fullfilename's path to a short path - Save filename away as + only path is valid, name may not exist which causes GetShortPathName + to fail if it is provided */ + if (filepart) { + strcpyW(thisoutput, filepart); + *filepart = 0x00; + GetShortPathNameW(fullfilename, fullfilename, ARRAY_SIZE(fullfilename)); + strcatW(fullfilename, thisoutput); + } } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ @@ -673,7 +682,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - strcatW(finaloutput, outputparam); + strcatW(finaloutput, fullfilename); } } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ea4157c09d..35e0cf2fa5 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -530,9 +530,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' '--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' @@ -566,9 +566,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' @drive@@path@ @drive@@path@ @drive@ -- 2.17.1

1 4

[PATCH] wined3d: Validate window before setting fullscreen mode
by Andrew Eikum 27 Aug '18

27 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- The main point here is that calling SetFullscreenState with the state that is already set succeeds, even if the window is destroyed. Unreal Engine 4 games depend on this, and Wine already passes this test. The code changes are for the failure case, when trying to change the state on a destroyed window. I don't have a game that depends on this, so if you'd prefer a todo_wine and no code changes, I'm fine with that, too. dlls/dxgi/swapchain.c | 2 ++ dlls/dxgi/tests/dxgi.c | 6 +++++- dlls/wined3d/swapchain.c | 10 ++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f25674..ac40eb78f6 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -254,6 +254,8 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen swapchain->target = target; return S_OK; } + else + hr = DXGI_ERROR_NOT_CURRENTLY_AVAILABLE; if (target) IDXGIOutput_Release(target); diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 56065456eb..fc008ccdd7 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2162,10 +2162,14 @@ static void test_set_fullscreen(void) } hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + DestroyWindow(swapchain_desc.OutputWindow); + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); - DestroyWindow(swapchain_desc.OutputWindow); swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8200bdd5e0..a51027267e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1408,6 +1408,9 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha return hr; } + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + wined3d_device_setup_fullscreen_window(device, swapchain->device_window, width, height); } else @@ -1416,6 +1419,9 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha BOOL filter_messages = device->filter_messages; device->filter_messages = TRUE; + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + MoveWindow(swapchain->device_window, 0, 0, width, height, TRUE); ShowWindow(swapchain->device_window, SW_SHOW); @@ -1427,6 +1433,10 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha { /* Fullscreen -> windowed switch */ RECT *window_rect = NULL; + + if (!IsWindow(swapchain->device_window)) + return WINED3DERR_NOTAVAILABLE; + if (swapchain->desc.flags & WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT) window_rect = &swapchain->original_window_rect; wined3d_device_restore_fullscreen_window(device, swapchain->device_window, window_rect); -- 2.18.0

1 0

[PATCH vkd3d 01/10] vkd3d: Introduce vkd3d_texture_view_desc structure.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 237 +++++++++++++++++++++++++++----------------------- 1 file changed, 126 insertions(+), 111 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f6dffbfda31e..d4d1b38f7496 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1274,12 +1274,66 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, } } +enum vkd3d_view_kind +{ + VKD3D_VIEW_TYPE_DSV, + VKD3D_VIEW_TYPE_RTV, + VKD3D_VIEW_TYPE_SRV, + VKD3D_VIEW_TYPE_UAV, +}; + +struct vkd3d_texture_view_desc +{ + enum vkd3d_view_kind view_kind; + VkImageViewType view_type; + const struct vkd3d_format *format; + unsigned int miplevel_idx; + unsigned int miplevel_count; + unsigned int layer_idx; + unsigned int layer_count; + bool allowed_swizzle; +}; + +static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, + struct d3d12_resource *resource, DXGI_FORMAT view_format, enum vkd3d_view_kind view_kind) +{ + bool is_srv = view_kind == VKD3D_VIEW_TYPE_SRV; + + desc->view_kind = view_kind; + + if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, view_format))) + { + FIXME("Failed to find format (resource format %#x, view format %#x).\n", + resource->desc.Format, view_format); + return false; + } + + switch (resource->desc.Dimension) + { + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; + desc->miplevel_idx = 0; + desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + break; + + default: + FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + return false; + } + + desc->allowed_swizzle = is_srv; + return true; +} + static VkResult vkd3d_create_texture_view(struct d3d12_device *device, - struct d3d12_resource *resource, const struct vkd3d_format *format, VkImageViewType view_type, - uint32_t miplevel_idx, uint32_t miplevel_count, uint32_t layer_idx, uint32_t layer_count, - bool allowed_swizzle, VkImageView *vk_view) + struct d3d12_resource *resource, const struct vkd3d_texture_view_desc *desc, + VkImageView *vk_view) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + const struct vkd3d_format *format = desc->format; struct VkImageViewCreateInfo view_desc; VkResult vr; @@ -1289,14 +1343,14 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, view_desc.pNext = NULL; view_desc.flags = 0; view_desc.image = resource->u.vk_image; - view_desc.viewType = view_type; + view_desc.viewType = desc->view_type; view_desc.format = format->vk_format; - vkd3d_set_view_swizzle_for_format(&view_desc.components, format, allowed_swizzle); + vkd3d_set_view_swizzle_for_format(&view_desc.components, format, desc->allowed_swizzle); view_desc.subresourceRange.aspectMask = format->vk_aspect_mask; - view_desc.subresourceRange.baseMipLevel = miplevel_idx; - view_desc.subresourceRange.levelCount = miplevel_count; - view_desc.subresourceRange.baseArrayLayer = layer_idx; - view_desc.subresourceRange.layerCount = layer_count; + view_desc.subresourceRange.baseMipLevel = desc->miplevel_idx; + view_desc.subresourceRange.levelCount = desc->miplevel_count; + view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; + view_desc.subresourceRange.layerCount = desc->layer_count; if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, vk_view))) < 0) WARN("Failed to create Vulkan image view, vr %d.\n", vr); return vr; @@ -1387,9 +1441,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_SHADER_RESOURCE_VIEW_DESC *desc) { - uint32_t miplevel_idx, miplevel_count, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; d3d12_desc_destroy(descriptor, device); @@ -1406,24 +1458,9 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); - return; - } - - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - FIXME("Failed to find format for %#x.\n", resource->desc.Format); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_SRV)) return; - } - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = 0; - miplevel_count = VK_REMAINING_MIP_LEVELS; - layer_idx = 0; - layer_count = VK_REMAINING_ARRAY_LAYERS; if (desc) { if (desc->Shader4ComponentMapping != D3D12_DEFAULT_SHADER_4_COMPONENT_MAPPING) @@ -1432,28 +1469,28 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, switch (desc->ViewDimension) { case D3D12_SRV_DIMENSION_TEXTURE2D: - vk_view_type = VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = desc->u.Texture2D.MostDetailedMip; - miplevel_count = desc->u.Texture2D.MipLevels; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2D.MipLevels; if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBE: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE; - miplevel_idx = desc->u.TextureCube.MostDetailedMip; - miplevel_count = desc->u.TextureCube.MipLevels; - layer_count = 6; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; + vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCube.MipLevels; + vkd3d_desc.layer_count = 6; if (desc->u.TextureCube.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCube.ResourceMinLODClamp); break; case D3D12_SRV_DIMENSION_TEXTURECUBEARRAY: - vk_view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; - miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; - miplevel_count = desc->u.TextureCubeArray.MipLevels; - layer_idx = desc->u.TextureCubeArray.First2DArrayFace; - layer_count = 6 * desc->u.TextureCubeArray.NumCubes; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.TextureCubeArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; + vkd3d_desc.layer_count = 6 * desc->u.TextureCubeArray.NumCubes; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); break; @@ -1465,8 +1502,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, miplevel_count, layer_idx, layer_count, true, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1551,34 +1587,18 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_UNORDERED_ACCESS_VIEW_DESC *desc) { - uint32_t miplevel_idx, layer_idx, layer_count; - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_UAV)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) - { - ERR("Failed to find format for %#x.\n", resource->desc.Format); - return; - } - - if (vkd3d_format_is_compressed(format)) + if (vkd3d_format_is_compressed(vkd3d_desc.format)) { WARN("UAVs cannot be created for compressed formats.\n"); return; } - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - miplevel_idx = 0; - layer_idx = 0; - layer_count = VK_REMAINING_ARRAY_LAYERS; if (desc) { if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) @@ -1586,17 +1606,17 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - miplevel_idx = desc->u.Texture2D.MipSlice; + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; } else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) { if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - vk_view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - miplevel_idx = desc->u.Texture2DArray.MipSlice; - layer_idx = desc->u.Texture2DArray.FirstArraySlice; - layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; } else { @@ -1608,8 +1628,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (!(view = vkd3d_view_create())) return; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, layer_idx, layer_count, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; @@ -1808,10 +1827,8 @@ static void d3d12_rtv_desc_destroy(struct d3d12_rtv_desc *rtv, struct d3d12_devi void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc) { - const struct vkd3d_format *format; - VkImageViewType vk_view_type; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_rtv_desc_destroy(rtv_desc, device); @@ -1821,44 +1838,42 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_RTV)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (vkd3d_desc.format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create RTV for depth/stencil format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) + if (desc) { - WARN("Trying to create RTV for depth/stencil format %#x.\n", format->dxgi_format); - return; + switch (desc->ViewDimension) + { + case D3D12_RTV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } } - if (desc && desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - vk_view_type = resource->desc.DepthOrArraySize > 1 - ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - if (vkd3d_create_texture_view(device, resource, format, vk_view_type, - miplevel_idx, 1, 0, VK_REMAINING_ARRAY_LAYERS, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) { vkd3d_free(view); return; } rtv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_RTV; - rtv_desc->format = format->vk_format; - rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + rtv_desc->format = vkd3d_desc.format->vk_format; + rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->layer_count = resource->desc.DepthOrArraySize; rtv_desc->view = view; rtv_desc->resource = resource; @@ -1877,9 +1892,8 @@ static void d3d12_dsv_desc_destroy(struct d3d12_dsv_desc *dsv, struct d3d12_devi void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_device *device, struct d3d12_resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc) { - const struct vkd3d_format *format; + struct vkd3d_texture_view_desc vkd3d_desc; struct vkd3d_view *view; - uint32_t miplevel_idx; d3d12_dsv_desc_destroy(dsv_desc, device); @@ -1889,39 +1903,40 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } - if (resource->desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE2D) - { - FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_DSV)) return; - } - if (!(format = vkd3d_format_from_d3d12_resource_desc(&resource->desc, desc ? desc->Format : 0))) + if (!(vkd3d_desc.format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { - WARN("Invalid DXGI format.\n"); + WARN("Trying to create DSV for format %#x.\n", vkd3d_desc.format->dxgi_format); return; } - if (!(format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) + if (desc) { - WARN("Trying to create DSV for format %#x.\n", format->dxgi_format); - return; - } + if (desc->Flags) + FIXME("Ignoring flags %#x.\n", desc->Flags); - if (desc && desc->Flags) - FIXME("Ignoring flags %#x.\n", desc->Flags); + switch (desc->ViewDimension) + { + case D3D12_DSV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); + } + } if (!(view = vkd3d_view_create())) return; - miplevel_idx = desc ? desc->u.Texture2D.MipSlice : 0; - if (vkd3d_create_texture_view(device, resource, format, VK_IMAGE_VIEW_TYPE_2D, - miplevel_idx, 1, 0, 1, false, &view->u.vk_image_view) < 0) + if (vkd3d_create_texture_view(device, resource, &vkd3d_desc, &view->u.vk_image_view) < 0) return; dsv_desc->magic = VKD3D_DESCRIPTOR_MAGIC_DSV; - dsv_desc->format = format->vk_format; - dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, miplevel_idx); - dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, miplevel_idx); + dsv_desc->format = vkd3d_desc.format->vk_format; + dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); + dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->view = view; dsv_desc->resource = resource; } -- 2.16.4

2 1

[PATCH vkd3d 10/10] vkd3d-shader: Downgrade FIXME() about unhandled instruction modifiers to WARN().
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1309b7e9ab7c..3be3ca917ac3 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1622,7 +1622,7 @@ static void shader_sm4_read_instruction_modifier(DWORD modifier, struct vkd3d_sh if (modifier & ~recognized_bits) { - FIXME("Unhandled modifier 0x%08x.\n", modifier); + WARN("Unhandled modifier 0x%08x.\n", modifier); } else { -- 2.16.4

2 1

[PATCH vkd3d 08/10] tests: Implement readback for 3D textures.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 194 ++++++++++++++++++++++------------------------- tests/vkd3d_d3d12_test.h | 61 ++++++++++----- 2 files changed, 132 insertions(+), 123 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ca83680d36c9..7261e89e82df 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -57,17 +57,6 @@ typedef int HRESULT; #include "vkd3d_d3d12_test.h" -static void set_box(D3D12_BOX *box, unsigned int left, unsigned int top, unsigned int front, - unsigned int right, unsigned int bottom, unsigned int back) -{ - box->left = left; - box->top = top; - box->front = front; - box->right = right; - box->bottom = bottom; - box->back = back; -} - struct vec2 { float x, y; @@ -634,6 +623,7 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F rb->width = resource_desc.Width / format_size(format); rb->height = 1; + rb->depth = 1; rb->resource = rb_buffer; rb->row_pitch = resource_desc.Width; rb->data = NULL; @@ -646,32 +636,32 @@ static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_F static uint8_t get_readback_uint8(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(uint8_t *)get_readback_data(rb, x, y, sizeof(uint8_t)); + return *(uint8_t *)get_readback_data(rb, x, y, 0, sizeof(uint8_t)); } static uint16_t get_readback_uint16(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(uint16_t *)get_readback_data(rb, x, y, sizeof(uint16_t)); + return *(uint16_t *)get_readback_data(rb, x, y, 0, sizeof(uint16_t)); } static UINT64 get_readback_uint64(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(UINT64 *)get_readback_data(rb, x, y, sizeof(UINT64)); + return *(UINT64 *)get_readback_data(rb, x, y, 0, sizeof(UINT64)); } static float get_readback_float(struct resource_readback *rb, unsigned int x, unsigned int y) { - return *(float *)get_readback_data(rb, x, y, sizeof(float)); + return *(float *)get_readback_data(rb, x, y, 0, sizeof(float)); } static const struct vec4 *get_readback_vec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return get_readback_data(rb, x, y, sizeof(struct vec4)); + return get_readback_data(rb, x, y, 0, sizeof(struct vec4)); } static const struct uvec4 *get_readback_uvec4(struct resource_readback *rb, unsigned int x, unsigned int y) { - return get_readback_data(rb, x, y, sizeof(struct uvec4)); + return get_readback_data(rb, x, y, 0, sizeof(struct uvec4)); } #define check_readback_data_float(a, b, c, d) check_readback_data_float_(__LINE__, a, b, c, d) @@ -3416,7 +3406,7 @@ static void test_clear_unordered_access_view(void) ID3D12Device *device; UINT clear_value[4]; unsigned int i, j; - RECT rect; + D3D12_BOX box; #define BUFFER_SIZE (1024 * 1024) static const struct @@ -3507,20 +3497,19 @@ static void test_clear_unordered_access_view(void) get_cpu_descriptor_handle(&context, cpu_heap, 0), buffer, tests[i].values, 0, NULL); - rect.top = 0; - rect.bottom = 1; + set_box(&box, 0, 0, 0, 1, 1, 1); transition_resource_state(command_list, buffer, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_TYPELESS, &rb, queue, command_list); - rect.left = 0; - rect.right = uav_desc.Buffer.FirstElement; - check_readback_data_uint(&rb, &rect, clear_value[0], 0); - rect.left = uav_desc.Buffer.FirstElement; - rect.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; - check_readback_data_uint(&rb, &rect, tests[i].values[0], 0); - rect.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; - rect.right = BUFFER_SIZE / format_size(uav_desc.Format); - check_readback_data_uint(&rb, &rect, clear_value[0], 0); + box.left = 0; + box.right = uav_desc.Buffer.FirstElement; + check_readback_data_uint(&rb, &box, clear_value[0], 0); + box.left = uav_desc.Buffer.FirstElement; + box.right = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; + check_readback_data_uint(&rb, &box, tests[i].values[0], 0); + box.left = uav_desc.Buffer.FirstElement + uav_desc.Buffer.NumElements; + box.right = BUFFER_SIZE / format_size(uav_desc.Format); + check_readback_data_uint(&rb, &box, clear_value[0], 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); @@ -3994,13 +3983,13 @@ static void test_append_aligned_element(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 80, 16); + color = get_readback_uint(&rb, 80, 16, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 240, 16); + color = get_readback_uint(&rb, 240, 16, 0); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 400, 16); + color = get_readback_uint(&rb, 400, 16, 0); ok(compare_color(color, 0xffff0000, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 560, 16); + color = get_readback_uint(&rb, 560, 16, 0); ok(compare_color(color, 0xffff00ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); @@ -4414,15 +4403,15 @@ static void test_scissor(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 60); + color = get_readback_uint(&rb, 320, 60, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 80, 240); + color = get_readback_uint(&rb, 80, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240); + color = get_readback_uint(&rb, 320, 240, 0); ok(compare_color(color, 0xff00ff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 560, 240); + color = get_readback_uint(&rb, 560, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 420); + color = get_readback_uint(&rb, 320, 420, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); @@ -5117,7 +5106,7 @@ static void test_bundle_state_inheritance(void) { for (x = 0; x < rb.width; ++x) { - unsigned int v = get_readback_uint(&rb, x, y); + unsigned int v = get_readback_uint(&rb, x, y, 0); /* This works on AMD. */ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y); } @@ -5154,7 +5143,7 @@ static void test_bundle_state_inheritance(void) { for (x = 0; x < rb.width; ++x) { - unsigned int v = get_readback_uint(&rb, x, y); + unsigned int v = get_readback_uint(&rb, x, y, 0); /* This works on AMD, even though the debug layer says that the primitive topology is undefined. */ ok(v == 0xffffffff || v == 0xff00ff00, "Got unexpected value 0x%08x at (%u, %u).\n", v, x, y); } @@ -8505,7 +8494,7 @@ static void test_constant_buffer_relative_addressing(void) get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < rb.width; ++i) { - unsigned int got = get_readback_uint(&rb, i, 0); + unsigned int got = get_readback_uint(&rb, i, 0, 0); const unsigned int *expected = &cb_data[1].x; ok(got == expected[i], "Got %#x, expected %#x at %u.\n", got, expected[i], i); } @@ -9148,7 +9137,7 @@ static void test_texture(void) { for (x = 0; x < tests[i].width; ++x) { - unsigned int color = get_readback_uint(&rb, x * x_step + x_step / 2, y * y_step + y_step / 2); + unsigned int color = get_readback_uint(&rb, x * x_step + x_step / 2, y * y_step + y_step / 2, 0); ok(compare_color(color, tests[i].expected_data[tests[i].width * y + x], 1), "Got color 0x%08x, expected 0x%08x at (%u, %u).\n", color, tests[i].expected_data[tests[i].width * y + x], x, y); @@ -10210,7 +10199,7 @@ static void test_descriptor_tables_overlapping_bindings(void) get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(buffer_data); ++i) { - unsigned int value = get_readback_uint(&rb, i, 0); + unsigned int value = get_readback_uint(&rb, i, 0, 0); ok(value == buffer_data[i], "Got %#x, expected %#x.\n", value, buffer_data[i]); } release_resource_readback(&rb); @@ -10218,7 +10207,7 @@ static void test_descriptor_tables_overlapping_bindings(void) get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(buffer_data2); ++i) { - unsigned int value = get_readback_uint(&rb, i, 0); + unsigned int value = get_readback_uint(&rb, i, 0, 0); ok(value == buffer_data2[i], "Got %#x, expected %#x.\n", value, buffer_data2[i]); } release_resource_readback(&rb); @@ -10336,7 +10325,7 @@ static void test_update_root_descriptors(void) for (i = 0; i < ARRAY_SIZE(input); ++i) { unsigned int offset = input[i].uav_offset + input[i].offset; - unsigned int value = get_readback_uint(&rb, offset, 0); + unsigned int value = get_readback_uint(&rb, offset, 0, 0); ok(value == input[i].value, "Got %#x, expected %#x.\n", value, input[i].value); } release_resource_readback(&rb); @@ -10364,6 +10353,7 @@ static void test_update_descriptor_tables(void) ID3D12Resource *textures[3]; ID3D12CommandQueue *queue; unsigned int i; + D3D12_BOX box; HRESULT hr; RECT rect; @@ -10505,10 +10495,10 @@ static void test_update_descriptor_tables(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - set_rect(&rect, 0, 0, 16, 32); - check_readback_data_uint(&rb, &rect, 0xff00407f, 1); - set_rect(&rect, 16, 0, 32, 32); - check_readback_data_uint(&rb, &rect, 0xff007f40, 1); + set_box(&box, 0, 0, 0, 16, 32, 1); + check_readback_data_uint(&rb, &box, 0xff00407f, 1); + set_box(&box, 16, 0, 0, 32, 32, 1); + check_readback_data_uint(&rb, &box, 0xff007f40, 1); release_resource_readback(&rb); for (i = 0; i < ARRAY_SIZE(textures); ++i) @@ -10634,7 +10624,7 @@ static void test_update_descriptor_heap_after_closing_command_list(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - value = get_readback_uint(&rb, 0, 0); + value = get_readback_uint(&rb, 0, 0, 0); todo(value == 0xff00ff00, "Got unexpected value %#x.\n", value); release_resource_readback(&rb); @@ -11153,7 +11143,7 @@ static void test_update_compute_descriptor_tables(void) get_buffer_readback_with_command_list(output_buffers[0], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_output0); ++i) { - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == expected_output0[i], "Got %#x, expected %#x at %u.\n", data, expected_output0[i], i); } release_resource_readback(&rb); @@ -11164,7 +11154,7 @@ static void test_update_compute_descriptor_tables(void) get_buffer_readback_with_command_list(output_buffers[1], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_output1); ++i) { - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == expected_output1[i], "Got %#x, expected %#x at %u.\n", data, expected_output1[i], i); } release_resource_readback(&rb); @@ -11669,7 +11659,7 @@ static void test_copy_descriptors(void) transition_sub_resource_state(command_list, u[2], 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(u[2], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - result = get_readback_data(&rb, 0, 0, sizeof(*result)); + result = get_readback_data(&rb, 0, 0, 0, sizeof(*result)); ok(result[ 0] == cb0_data, "Got unexpected value %#x.\n", result[0]); ok(result[ 1] == cb1_data, "Got unexpected value %#x.\n", result[1]); ok(result[ 2] == cb2_data, "Got unexpected value %#x.\n", result[2]); @@ -11747,7 +11737,7 @@ static void test_copy_descriptors_range_sizes(void) ID3D12CommandQueue *queue; ID3D12Device *device; unsigned int i; - RECT rect; + D3D12_BOX box; static const DWORD ps_code[] = { @@ -11883,8 +11873,8 @@ static void test_copy_descriptors_range_sizes(void) get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); for (i = 0; i < desc.rt_width; ++i) { - set_rect(&rect, i, 0, i + 1, desc.rt_height); - check_readback_data_uint(&rb, &rect, i % 2 ? 0xffff0000 : 0xff00ff00, 0); + set_box(&box, i, 0, 0, i + 1, desc.rt_height, 1); + check_readback_data_uint(&rb, &box, i % 2 ? 0xffff0000 : 0xff00ff00, 0); } release_resource_readback(&rb); @@ -13838,7 +13828,7 @@ static void test_tgsm(void) get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < 64; ++i) { - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); expected = 33 * i; ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } @@ -13887,7 +13877,7 @@ static void test_tgsm(void) for (i = 0; i < 32; ++i) { expected = 64 * i + 32; - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -13896,7 +13886,7 @@ static void test_tgsm(void) for (i = 0; i < 32; ++i) { expected = 64 * i + 32; - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == expected || !data, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -13945,7 +13935,7 @@ static void test_tgsm(void) for (i = 0; i < 96; ++i) { expected = (i % 32 + 1) * (i / 32); - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == expected, "Got %u, expected %u (index %u).\n", data, expected, i); } release_resource_readback(&rb); @@ -14352,7 +14342,7 @@ static void test_uav_load(void) for (x = 0; x < 4; ++x) { unsigned int expected = test->expected_colors[y * 4 + x]; - unsigned int color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120); + unsigned int color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0); ok(compare_color(color, expected, 0), "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", i, color, expected, x, y); @@ -14770,7 +14760,7 @@ static unsigned int read_uav_counter(const struct test_context *context, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, context->queue, context->list); - counter = get_readback_uint(&rb, offset / sizeof(counter), 0); + counter = get_readback_uint(&rb, offset / sizeof(counter), 0, 0); release_resource_readback(&rb); reset_command_list(context->list, context->allocator); transition_sub_resource_state(context->list, counter_buffer, 0, @@ -14989,7 +14979,7 @@ static void test_uav_counters(void) get_buffer_readback_with_command_list(out_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < 8; ++i) { - data = get_readback_uint(&rb, i, 0); + data = get_readback_uint(&rb, i, 0, 0); ok(data == 0xdeadbeef, "Got data %u at %u.\n", data, i); } release_resource_readback(&rb); @@ -15359,7 +15349,7 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(ps_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - unsigned int value = get_readback_uint(&rb, j, 0); + unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; if (test->i.x < 0 @@ -15384,7 +15374,7 @@ static void test_atomic_instructions(void) { BOOL todo_instruction = !strcmp(imm_instructions[j], "imm_atomic_imax") || !strcmp(imm_instructions[j], "imm_atomic_imin"); - unsigned int value = get_readback_uint(&rb, j, 0); + unsigned int value = get_readback_uint(&rb, j, 0, 0); unsigned int expected = test->expected_result[j]; if (test->i.x < 0 && todo_instruction) @@ -15406,7 +15396,7 @@ static void test_atomic_instructions(void) get_buffer_readback_with_command_list(cs_buffer2, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (j = 0; j < ARRAY_SIZE(instructions); ++j) { - unsigned int out_value = get_readback_uint(&rb, j, 0); + unsigned int out_value = get_readback_uint(&rb, j, 0, 0); ok(out_value == test->input[j], "Got original value %u, expected %u for '%s'.\n", out_value, test->input[j], imm_instructions[j]); } @@ -15708,7 +15698,7 @@ static void test_buffer_srv(void) { for (x = 0; x < 4; ++x) { - color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120); + color = get_readback_uint(&rb, 80 + x * 160, 60 + y * 120, 0); expected_color = test->expected_colors[y * 4 + x]; ok(compare_color(color, expected_color, 1), "Test %u: Got 0x%08x, expected 0x%08x at (%u, %u).\n", @@ -15905,7 +15895,7 @@ static void test_query_pipeline_statistics(void) ok(!value, "Element %d: Got %"PRIu64", expected 0.\n", i, value); } - pipeline_statistics = get_readback_data(&rb, 1, 0, sizeof(*pipeline_statistics)); + pipeline_statistics = get_readback_data(&rb, 1, 0, 0, sizeof(*pipeline_statistics)); /* We read 3 vertices that formed one primitive. */ ok(pipeline_statistics->IAVertices == 3, "IAVertices: Got %"PRIu64", expected 3.\n", @@ -16118,7 +16108,7 @@ static void test_resolve_non_issued_query_data(void) D3D12_QUERY_TYPE_TIMESTAMP, 0, 4, readback_buffer, 0); get_buffer_readback_with_command_list(readback_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - timestamps = get_readback_data(&rb, 0, 0, sizeof(*timestamps)); + timestamps = get_readback_data(&rb, 0, 0, 0, sizeof(*timestamps)); ok(timestamps[0] != initial_data[0] && timestamps[0] > 0, "Got unexpected timestamp %#"PRIx64".\n", timestamps[0]); ok(!timestamps[1], "Got unexpected timestamp %#"PRIx64".\n", timestamps[1]); @@ -16405,7 +16395,7 @@ static void test_execute_indirect(void) get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); for (i = 0; i < rb.width; ++i) { - unsigned int ret = get_readback_uint(&rb, i, 0); + unsigned int ret = get_readback_uint(&rb, i, 0, 0); ok(ret == i, "Got unexpected result %#x at index %u.\n", ret, i); } release_resource_readback(&rb); @@ -16533,9 +16523,9 @@ static void test_dispatch_zero_thread_groups(void) transition_sub_resource_state(command_list, uav, 0, D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(uav, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); - ret = get_readback_uint(&rb, 0, 0); + ret = get_readback_uint(&rb, 0, 0, 0); ok(ret == 10, "Got unexpected result %#x.\n", ret); - ret = get_readback_uint(&rb, 64, 0); + ret = get_readback_uint(&rb, 64, 0, 0); ok(ret == 50, "Got unexpected result %#x.\n", ret); release_resource_readback(&rb); @@ -16685,29 +16675,29 @@ static void test_instance_id(void) }; static const struct { - RECT rect; + D3D12_BOX box; unsigned int color; unsigned int instance_id; } expected_results[] = { - {{ 0, 0, 10, 10}, 0xfff0f0f0, 0}, - {{10, 0, 20, 10}, 0xff808080, 1}, - {{20, 0, 30, 10}, 0xff101010, 2}, - {{30, 0, 40, 10}, 0xff404040, 3}, - {{40, 0, 50, 10}, 0xffaaaaaa, 0}, - {{50, 0, 60, 10}, 0xffbbbbbb, 1}, - {{60, 0, 70, 10}, 0xffcccccc, 2}, - {{70, 0, 80, 10}, 0xff909090, 3}, + {{ 0, 0, 0, 10, 10, 1}, 0xfff0f0f0, 0}, + {{10, 0, 0, 20, 10, 1}, 0xff808080, 1}, + {{20, 0, 0, 30, 10, 1}, 0xff101010, 2}, + {{30, 0, 0, 40, 10, 1}, 0xff404040, 3}, + {{40, 0, 0, 50, 10, 1}, 0xffaaaaaa, 0}, + {{50, 0, 0, 60, 10, 1}, 0xffbbbbbb, 1}, + {{60, 0, 0, 70, 10, 1}, 0xffcccccc, 2}, + {{70, 0, 0, 80, 10, 1}, 0xff909090, 3}, /* indirect draws results */ - {{ 0, 10, 10, 20}, 0xfff0f0f0, 0}, - {{10, 10, 20, 20}, 0xff808080, 1}, - {{20, 10, 30, 20}, 0xff101010, 2}, - {{30, 10, 40, 20}, 0xff404040, 3}, - {{40, 10, 50, 20}, 0xffaaaaaa, 0}, - {{50, 10, 60, 20}, 0xffbbbbbb, 1}, - {{60, 10, 70, 20}, 0xffcccccc, 2}, - {{70, 10, 80, 20}, 0xff909090, 3}, + {{ 0, 10, 0, 10, 20, 1}, 0xfff0f0f0, 0}, + {{10, 10, 0, 20, 20, 1}, 0xff808080, 1}, + {{20, 10, 0, 30, 20, 1}, 0xff101010, 2}, + {{30, 10, 0, 40, 20, 1}, 0xff404040, 3}, + {{40, 10, 0, 50, 20, 1}, 0xffaaaaaa, 0}, + {{50, 10, 0, 60, 20, 1}, 0xffbbbbbb, 1}, + {{60, 10, 0, 70, 20, 1}, 0xffcccccc, 2}, + {{70, 10, 0, 80, 20, 1}, 0xff909090, 3}, }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -16779,14 +16769,14 @@ static void test_instance_id(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_results); ++i) - check_readback_data_uint(&rb, &expected_results[i].rect, expected_results[i].color, 1); + check_readback_data_uint(&rb, &expected_results[i].box, expected_results[i].color, 1); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(render_target, 0, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_results); ++i) - check_readback_data_uint(&rb, &expected_results[i].rect, expected_results[i].instance_id, 0); + check_readback_data_uint(&rb, &expected_results[i].box, expected_results[i].instance_id, 0); release_resource_readback(&rb); ID3D12CommandSignature_Release(command_signature); @@ -16910,7 +16900,7 @@ static void test_copy_texture_region(void) { for (x = 0; x < 4; ++x) { - unsigned int color = get_readback_uint(&rb, x, y); + unsigned int color = get_readback_uint(&rb, x, y, 0); unsigned int expected = result_data[y * 4 + x]; ok(color == expected, @@ -17895,29 +17885,29 @@ static void test_geometry_shader(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); get_texture_readback_with_command_list(context.render_target, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 190); + color = get_readback_uint(&rb, 320, 190, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 255, 240); + color = get_readback_uint(&rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240); + color = get_readback_uint(&rb, 320, 240, 0); ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 385, 240); + color = get_readback_uint(&rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 290); + color = get_readback_uint(&rb, 320, 290, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); get_texture_readback_with_command_list(texture, 0, &rb, queue, command_list); - color = get_readback_uint(&rb, 320, 190); + color = get_readback_uint(&rb, 320, 190, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 255, 240); + color = get_readback_uint(&rb, 255, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 240); + color = get_readback_uint(&rb, 320, 240, 0); ok(compare_color(color, 0xffffff00, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 385, 240); + color = get_readback_uint(&rb, 385, 240, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); - color = get_readback_uint(&rb, 320, 290); + color = get_readback_uint(&rb, 320, 290, 0); ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); release_resource_readback(&rb); diff --git a/tests/vkd3d_d3d12_test.h b/tests/vkd3d_d3d12_test.h index 67e4ddb3aae2..b7fd5ebcc4eb 100644 --- a/tests/vkd3d_d3d12_test.h +++ b/tests/vkd3d_d3d12_test.h @@ -31,6 +31,17 @@ static void set_rect(RECT *rect, int left, int top, int right, int bottom) rect->bottom = bottom; } +static inline void set_box(D3D12_BOX *box, unsigned int left, unsigned int top, unsigned int front, + unsigned int right, unsigned int bottom, unsigned int back) +{ + box->left = left; + box->top = top; + box->front = front; + box->right = right; + box->bottom = bottom; + box->back = back; +} + static void set_viewport(D3D12_VIEWPORT *vp, float x, float y, float width, float height, float min_depth, float max_depth) { @@ -197,6 +208,7 @@ struct resource_readback { unsigned int width; unsigned int height; + unsigned int depth; ID3D12Resource *resource; unsigned int row_pitch; void *data; @@ -219,18 +231,18 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi resource_desc = ID3D12Resource_GetDesc(texture); ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_BUFFER, "Resource %p is not texture.\n", texture); - ok(resource_desc.Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D, - "Readback not implemented for 3D textures.\n"); miplevel = sub_resource % resource_desc.MipLevels; rb->width = max(1, resource_desc.Width >> miplevel); rb->height = max(1, resource_desc.Height >> miplevel); + rb->depth = resource_desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D + ? resource_desc.DepthOrArraySize : 1; rb->row_pitch = align(rb->width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); rb->data = NULL; format = resource_desc.Format; - rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height); + rb->resource = create_readback_buffer(device, rb->row_pitch * rb->height * rb->depth); dst_location.pResource = rb->resource; dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; @@ -238,7 +250,7 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi dst_location.PlacedFootprint.Footprint.Format = format; dst_location.PlacedFootprint.Footprint.Width = rb->width; dst_location.PlacedFootprint.Footprint.Height = rb->height; - dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.Depth = rb->depth; dst_location.PlacedFootprint.Footprint.RowPitch = rb->row_pitch; src_location.pResource = texture; @@ -259,15 +271,17 @@ static void get_texture_readback_with_command_list(ID3D12Resource *texture, unsi ok(SUCCEEDED(hr), "Failed to map readback buffer, hr %#x.\n", hr); } -static void *get_readback_data(struct resource_readback *rb, unsigned int x, unsigned int y, - size_t element_size) +static void *get_readback_data(struct resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z, size_t element_size) { - return &((BYTE *)rb->data)[rb->row_pitch * y + x * element_size]; + unsigned int slice_pitch = rb->row_pitch * rb->depth; + return &((BYTE *)rb->data)[slice_pitch * z + rb->row_pitch * y + x * element_size]; } -static unsigned int get_readback_uint(struct resource_readback *rb, unsigned int x, unsigned int y) +static unsigned int get_readback_uint(struct resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z) { - return *(unsigned int *)get_readback_data(rb, x, y, sizeof(unsigned int)); + return *(unsigned int *)get_readback_data(rb, x, y, z, sizeof(unsigned int)); } static void release_resource_readback(struct resource_readback *rb) @@ -279,31 +293,36 @@ static void release_resource_readback(struct resource_readback *rb) #define check_readback_data_uint(a, b, c, d) check_readback_data_uint_(__LINE__, a, b, c, d) static void check_readback_data_uint_(unsigned int line, struct resource_readback *rb, - const RECT *rect, unsigned int expected, unsigned int max_diff) + const D3D12_BOX *box, unsigned int expected, unsigned int max_diff) { - RECT r = {0, 0, rb->width, rb->height}; - unsigned int x = 0, y; + D3D12_BOX b = {0, 0, 0, rb->width, rb->height, rb->depth}; + unsigned int x = 0, y = 0, z; bool all_match = true; unsigned int got = 0; - if (rect) - r = *rect; + if (box) + b = *box; - for (y = r.top; y < r.bottom; ++y) + for (z = b.front; z < b.back; ++z) { - for (x = r.left; x < r.right; ++x) + for (y = b.top; y < b.bottom; ++y) { - got = get_readback_uint(rb, x, y); - if (!compare_color(got, expected, max_diff)) + for (x = b.left; x < b.right; ++x) { - all_match = false; - break; + got = get_readback_uint(rb, x, y, z); + if (!compare_color(got, expected, max_diff)) + { + all_match = false; + break; + } } + if (!all_match) + break; } if (!all_match) break; } - ok_(line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u).\n", got, expected, x, y); + ok_(line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u).\n", got, expected, x, y, z); } #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) -- 2.16.4

2 1

[PATCH vkd3d 07/10] vkd3d: Rename vkd3d_queue_gpu_fence() to vkd3d_enqueue_gpu_fence().
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7aa16957e114..16c61352ed76 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -78,7 +78,7 @@ static void vkd3d_queue_release(struct vkd3d_queue *queue) } /* Fence worker thread */ -static HRESULT vkd3d_queue_gpu_fence(struct vkd3d_fence_worker *worker, +static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, ID3D12Fence *fence, UINT64 value) { int rc; @@ -4486,7 +4486,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * return hresult_from_vk_result(vr); } - return vkd3d_queue_gpu_fence(&device->fence_worker, vk_fence, fence, value); + return vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value); } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface, -- 2.16.4

2 1

[PATCH vkd3d 06/10] vkd3d: Add FIXME() for ignored SampleDesc.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5e401fdd9523..446e1a65029d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2180,6 +2180,9 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->SampleDesc.Count != 1) + FIXME("Ignoring sample desc %u, %u.\n", desc->SampleDesc.Count, desc->SampleDesc.Quality); + graphics->root_signature = root_signature; state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; -- 2.16.4

2 1

[PATCH v2] kernel32: add stub for GetApplicationRestartSettings
by Louis Lenders 27 Aug '18

27 Aug '18

v2: Removed SetLastError and return E_NOTIMPL Found this trying to start newest firefox 61.0.2. This prevents crashing it. (note: also removed a superfluous extra empty line few lines above this change) To: wine-devel <wine-devel(a)winehq.org> Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 10 +++++++++- include/winbase.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c70a..f1d75b8e1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..ad61d18dbe 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3953,7 +3953,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4023,6 +4022,15 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + return E_NOTIMPL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index aa57dae818..8b26308b95 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName) -- 2.17.1

1 0

[PATCH] kernel32: add stub for GetApplicationRestartSettings
by Louis Lenders 27 Aug '18

27 Aug '18

Found this trying to start newest firefox 61.0.2. This prevents crashing it. (note: also removed a superfluous extra emply line few lines above this change) Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/process.c | 11 ++++++++++- include/winbase.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c53276c70a..f1d75b8e1c 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -543,7 +543,7 @@ @ stdcall GetActiveProcessorCount(long) @ stdcall GetActiveProcessorGroupCount() # @ stub GetApplicationRecoveryCallback -# @ stub GetApplicationRestartSettings +@ stdcall GetApplicationRestartSettings(long ptr ptr ptr) @ stdcall GetAtomNameA(long ptr long) @ stdcall GetAtomNameW(long ptr long) @ stdcall GetBinaryType(str ptr) GetBinaryTypeA diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index d615f06c4a..b2e3aeee98 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3953,7 +3953,6 @@ BOOL WINAPI CmdBatNotification( BOOL bBatchRunning ) return FALSE; } - /*********************************************************************** * RegisterApplicationRestart (KERNEL32.@) */ @@ -4023,6 +4022,16 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK return E_FAIL; } +/*********************************************************************** + * GetApplicationRestartSettings (KERNEL32.@) + */ +HRESULT WINAPI GetApplicationRestartSettings(HANDLE process, WCHAR *cmdline, DWORD *size, DWORD *flags) +{ + FIXME("%p, %p, %p, %p)\n", process, cmdline, size, flags); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return E_FAIL; +} + /********************************************************************** * GetNumaHighestNodeNumber (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index aa57dae818..8b26308b95 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2038,6 +2038,7 @@ WINBASEAPI BOOL WINAPI FreeResource(HGLOBAL); WINADVAPI PVOID WINAPI FreeSid(PSID); WINADVAPI BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); WINADVAPI BOOL WINAPI GetAclInformation(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); +WINBASEAPI HRESULT WINAPI GetApplicationRestartSettings(HANDLE,WCHAR*,DWORD*,DWORD*); WINBASEAPI UINT WINAPI GetAtomNameA(ATOM,LPSTR,INT); WINBASEAPI UINT WINAPI GetAtomNameW(ATOM,LPWSTR,INT); #define GetAtomName WINELIB_NAME_AW(GetAtomName) -- 2.17.1

2 2

[PATCH vkd3d 09/10] tests: Add test for clearing 3D textures.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 7261e89e82df..1c6b65fa758a 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3311,10 +3311,12 @@ static void test_clear_render_target_view(void) ID3D12DescriptorHeap *rtv_heap; D3D12_CLEAR_VALUE clear_value; struct test_context_desc desc; + struct resource_readback rb; struct test_context context; ID3D12CommandQueue *queue; ID3D12Resource *resource; ID3D12Device *device; + D3D12_BOX box; HRESULT hr; memset(&desc, 0, sizeof(desc)); @@ -3388,6 +3390,48 @@ static void test_clear_render_target_view(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(resource, 0, queue, command_list, 0xbf95bc59, 2); + /* 3D texture */ + ID3D12Resource_Release(resource); + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE3D; + resource_desc.DepthOrArraySize = 32; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D12Device_CreateCommittedResource(device, + &heap_properties, D3D12_HEAP_FLAG_NONE, &resource_desc, + D3D12_RESOURCE_STATE_RENDER_TARGET, &clear_value, + &IID_ID3D12Resource, (void **)&resource); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + ID3D12Device_CreateRenderTargetView(device, resource, NULL, rtv_handle); + + reset_command_list(command_list, context.allocator); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, color, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(resource, 0, queue, command_list, 0xbf4c7f19, 2); + + memset(&rtv_desc, 0, sizeof(rtv_desc)); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE3D; + rtv_desc.Texture3D.FirstWSlice = 2; + rtv_desc.Texture3D.WSize = 2; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, 32, 32, 2); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 2, 32, 32, 4); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + set_box(&box, 0, 0, 4, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.16.4

1 0

[PATCH vkd3d 05/10] vkd3d: Add support for 2D array texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d9cc48db319e..77a346ea7df7 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1489,6 +1489,17 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture2DArray.MipLevels; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + if (desc->u.Texture2DArray.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; @@ -1878,6 +1889,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; @@ -1962,6 +1981,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev case D3D12_DSV_DIMENSION_TEXTURE2D: vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; break; + case D3D12_DSV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } -- 2.16.4

1 0

[PATCH vkd3d 04/10] vkd3d: Add support for 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 71 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 24 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index faf9a710cef1..d9cc48db319e 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -309,8 +309,7 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) { unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); + size = max(size, d3d12_resource_desc_get_depth(desc, 0)); return vkd3d_log2i(size) + 1; } @@ -339,6 +338,8 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D && desc->Width == desc->Height && desc->DepthOrArraySize >= 6) image_info.flags |= VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT; + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + image_info.flags |= VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; image_info.imageType = vk_image_type_from_d3d12_resource_dimension(desc->Dimension); image_info.format = format->vk_format; @@ -1311,7 +1312,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->miplevel_idx = 0; desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + desc->layer_count = d3d12_resource_desc_get_layer_count(&resource->desc); switch (resource->desc.Dimension) { @@ -1488,6 +1489,13 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, if (desc->u.Texture2D.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); break; + case D3D12_SRV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MostDetailedMip; + vkd3d_desc.miplevel_count = desc->u.Texture3D.MipLevels; + if (desc->u.Texture3D.ResourceMinLODClamp) + FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2D.ResourceMinLODClamp); + break; case D3D12_SRV_DIMENSION_TEXTURECUBE: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_CUBE; vkd3d_desc.miplevel_idx = desc->u.TextureCube.MostDetailedMip; @@ -1612,27 +1620,30 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (desc) { - if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2D) - { - if (desc->u.Texture2D.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); - - vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; - } - else if (desc->ViewDimension == D3D12_UAV_DIMENSION_TEXTURE2DARRAY) - { - if (desc->u.Texture2DArray.PlaneSlice) - FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); - - vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; - vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; - vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; - vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; - } - else + switch (desc->ViewDimension) { - WARN("Unexpected view dimension %#x.\n", desc->ViewDimension); - return; + case D3D12_UAV_DIMENSION_TEXTURE2D: + vkd3d_desc.miplevel_idx = desc->u.Texture2D.MipSlice; + if (desc->u.Texture2D.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE2DARRAY: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; + vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + if (desc->u.Texture2DArray.PlaneSlice) + FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + break; + case D3D12_UAV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + if (desc->u.Texture3D.FirstWSlice || desc->u.Texture3D.WSize != resource->desc.DepthOrArraySize) + FIXME("Unhandled depth view %u-%u.\n", + desc->u.Texture3D.FirstWSlice, desc->u.Texture3D.WSize); + break; + default: + FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } @@ -1867,10 +1878,22 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (desc->u.Texture2D.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2D.PlaneSlice); break; + case D3D12_RTV_DIMENSION_TEXTURE3D: + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; + vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; + vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); } } + else if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; + vkd3d_desc.layer_idx = 0; + vkd3d_desc.layer_count = resource->desc.DepthOrArraySize; + } if (!(view = vkd3d_view_create())) return; @@ -1885,7 +1908,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev rtv_desc->format = vkd3d_desc.format->vk_format; rtv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); rtv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); - rtv_desc->layer_count = resource->desc.DepthOrArraySize; + rtv_desc->layer_count = vkd3d_desc.layer_count; rtv_desc->view = view; rtv_desc->resource = resource; } -- 2.16.4

1 0

[PATCH vkd3d 03/10] vkd3d: Add support for default 3D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 03015bf45cbd..faf9a710cef1 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1325,6 +1325,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; break; + case D3D12_RESOURCE_DIMENSION_TEXTURE3D: + desc->view_type = VK_IMAGE_VIEW_TYPE_3D; + desc->layer_count = 1; + break; + default: FIXME("Resource dimension %#x not implemented.\n", resource->desc.Dimension); return false; @@ -1909,6 +1914,12 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev return; } + if (resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + WARN("Cannot create DSV for 3D texture.\n"); + return; + } + if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0, VKD3D_VIEW_TYPE_DSV)) return; -- 2.16.4

1 0

[PATCH vkd3d 02/10] vkd3d: Add support for default 1D texture views.
by Józef Kucia 27 Aug '18

27 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index d4d1b38f7496..03015bf45cbd 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1308,15 +1308,21 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return false; } + desc->miplevel_idx = 0; + desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; + desc->layer_idx = 0; + desc->layer_count = VK_REMAINING_ARRAY_LAYERS; + switch (resource->desc.Dimension) { + case D3D12_RESOURCE_DIMENSION_TEXTURE1D: + desc->view_type = resource->desc.DepthOrArraySize > 1 + ? VK_IMAGE_VIEW_TYPE_1D_ARRAY : VK_IMAGE_VIEW_TYPE_1D; + break; + case D3D12_RESOURCE_DIMENSION_TEXTURE2D: desc->view_type = resource->desc.DepthOrArraySize > 1 ? VK_IMAGE_VIEW_TYPE_2D_ARRAY : VK_IMAGE_VIEW_TYPE_2D; - desc->miplevel_idx = 0; - desc->miplevel_count = is_srv ? VK_REMAINING_MIP_LEVELS : 1; - desc->layer_idx = 0; - desc->layer_count = VK_REMAINING_ARRAY_LAYERS; break; default: @@ -1337,7 +1343,7 @@ static VkResult vkd3d_create_texture_view(struct d3d12_device *device, struct VkImageViewCreateInfo view_desc; VkResult vr; - assert(resource->desc.Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE2D); + assert(d3d12_resource_is_texture(resource)); view_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; view_desc.pNext = NULL; -- 2.16.4

1 0

[PATCH 1/4] wined3d: Add max_rt_count field to d3d_info.
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/cs.c | 17 +++++++++-------- dlls/wined3d/device.c | 22 ++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8c1cce457ed0..af17df83cd02 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3657,6 +3657,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vertex_pipe = select_vertex_implementation(gl_info, adapter->shader_backend); adapter->fragment_pipe = select_fragment_implementation(gl_info, adapter->shader_backend); + d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.pointsize_max = gl_info->limits.pointsize_max; adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7bd51f4c2a19..ecfce4181235 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -588,7 +588,7 @@ static void wined3d_cs_exec_clear(struct wined3d_cs *cs, const void *data) void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) { - unsigned int rt_count = cs->device->adapter->gl_info.limits.buffers; + unsigned int rt_count = cs->device->adapter->d3d_info.limits.max_rt_count; const struct wined3d_state *state = &cs->device->state; const struct wined3d_viewport *vp = &state->viewports[0]; struct wined3d_rendertarget_view *view; @@ -839,6 +839,7 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_state *state = &cs->state; @@ -893,7 +894,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->textures[i]) wined3d_resource_release(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_release(state->fb->render_targets[i]->resource); @@ -906,7 +907,7 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) } static void acquire_graphics_pipeline_resources(const struct wined3d_state *state, - BOOL indexed, const struct wined3d_gl_info *gl_info) + BOOL indexed, const struct wined3d_d3d_info *d3d_info) { unsigned int i; @@ -927,7 +928,7 @@ static void acquire_graphics_pipeline_resources(const struct wined3d_state *stat if (state->textures[i]) wined3d_resource_acquire(&state->textures[i]->resource); } - for (i = 0; i < gl_info->limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { if (state->fb->render_targets[i]) wined3d_resource_acquire(state->fb->render_targets[i]->resource); @@ -943,7 +944,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -959,7 +960,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned op->parameters.u.direct.instance_count = instance_count; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); } @@ -967,7 +968,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, GLenum primitive_type, unsigned void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, unsigned int patch_vertex_count, struct wined3d_buffer *buffer, unsigned int offset, BOOL indexed) { - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_draw *op; @@ -980,7 +981,7 @@ void wined3d_cs_emit_draw_indirect(struct wined3d_cs *cs, GLenum primitive_type, op->parameters.u.indirect.offset = offset; op->parameters.indexed = indexed; - acquire_graphics_pipeline_resources(state, indexed, gl_info); + acquire_graphics_pipeline_resources(state, indexed, d3d_info); wined3d_resource_acquire(&buffer->resource); cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab67a967a3fa..96b8d3c247d6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -970,7 +970,7 @@ static void device_init_swapchain_state(struct wined3d_device *device, struct wi BOOL ds_enable = swapchain->desc.enable_auto_depth_stencil; unsigned int i; - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -1240,7 +1240,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) ERR("Something's still holding the auto depth/stencil view (%p).\n", view); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -4380,11 +4380,14 @@ void CDECL wined3d_device_clear_unordered_access_view_uint(struct wined3d_device struct wined3d_rendertarget_view * CDECL wined3d_device_get_rendertarget_view(const struct wined3d_device *device, unsigned int view_idx) { + unsigned int max_rt_count; + TRACE("device %p, view_idx %u.\n", device, view_idx); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return NULL; } @@ -4402,13 +4405,15 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device unsigned int view_idx, struct wined3d_rendertarget_view *view, BOOL set_viewport) { struct wined3d_rendertarget_view *prev; + unsigned int max_rt_count; TRACE("device %p, view_idx %u, view %p, set_viewport %#x.\n", device, view_idx, view, set_viewport); - if (view_idx >= device->adapter->gl_info.limits.buffers) + max_rt_count = device->adapter->d3d_info.limits.max_rt_count; + if (view_idx >= max_rt_count) { - WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); + WARN("Only %u render targets are supported.\n", max_rt_count); return WINED3DERR_INVALIDCALL; } @@ -4706,6 +4711,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_view_desc view_desc; @@ -4739,7 +4745,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, state_unbind_resources(&device->state); } - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < d3d_info->limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); } @@ -5038,7 +5044,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso if (device->d3d_initialized) { - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) + for (i = 0; i < ARRAY_SIZE(device->fb.render_targets); ++i) { if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) ERR("Resource %p is still in use as render target %u.\n", resource, i); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 774cd48caec6..8fa3a2492dfe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2201,7 +2201,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte caps->AdapterOrdinalInGroup = 0; caps->NumberOfAdaptersInGroup = 1; - caps->NumSimultaneousRTs = gl_info->limits.buffers; + caps->NumSimultaneousRTs = d3d_info->limits.max_rt_count; caps->StretchRectFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT | diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index de0b4867de79..bc031890960e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -164,6 +164,7 @@ struct wined3d_d3d_limits unsigned int ffp_vertex_blend_matrices; unsigned int active_light_count; + unsigned int max_rt_count; float pointsize_max; }; -- 2.16.4

2 1

[PATCH 2/4] wined3d: Pass context to wined3d_texture_set_compatible_renderbuffer().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9d2236bc17a0..a4cfd66dfc42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -608,7 +608,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { - wined3d_texture_set_compatible_renderbuffer(ds_texture, ds_level, &render_targets[0]); + wined3d_texture_set_compatible_renderbuffer(ds_texture, context, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7cc03fe4821e..f72442d1ddfe 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1453,15 +1453,14 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, - unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_renderbuffer_entry *entry; - const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; unsigned int width, height; GLuint renderbuffer = 0; - gl_info = &texture->resource.device->adapter->gl_info; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) return; @@ -1528,7 +1527,7 @@ void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture texture->current_renderbuffer = entry; } - checkGLcall("set_compatible_renderbuffer"); + checkGLcall("set compatible renderbuffer"); } HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT width, UINT height, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bc031890960e..8da12d7cf3f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3366,7 +3366,7 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, +void wined3d_texture_set_compatible_renderbuffer(struct wined3d_texture *texture, struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; void wined3d_texture_set_map_binding(struct wined3d_texture *texture, DWORD map_binding) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, -- 2.16.4

2 1

[PATCH 4/4] dxgi: Choose exact formats for D3D12 swapchain fallback formats.
by Józef Kucia 27 Aug '18

27 Aug '18

Mainly to avoid gamma correction issues. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 43 ++++++++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 83e0f256748f..101f2d185e17 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1694,6 +1694,32 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return TRUE; } +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static VkFormat get_swapchain_fallback_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_R8G8B8A8_SRGB: return VK_FORMAT_B8G8R8A8_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return VK_FORMAT_B8G8R8A8_UNORM; + default: + WARN("Unhandled format %#x.\n", vk_format); + return VK_FORMAT_UNDEFINED; + } +} + static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, VkSurfaceKHR vk_surface, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat *vk_format) @@ -1734,10 +1760,11 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, if (i == format_count) { /* Try to create a swapchain with format conversion. */ + format = get_swapchain_fallback_format(format); WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); for (i = 0; i < format_count; ++i) { - if (formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) { format = formats[i].format; break; @@ -1757,20 +1784,6 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, return S_OK; } -static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) -{ - switch (vk_format) - { - case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; - case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; - case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; - default: - FIXME("Unhandled format %#x.\n", vk_format); - return DXGI_FORMAT_UNKNOWN; - } -} - static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, VkMemoryPropertyFlags flags, uint32_t *memory_type_index) -- 2.16.4

2 1

[PATCH 3/4] wined3d: Avoid accessing gl_info in vertexdeclaration_init().
by Józef Kucia 27 Aug '18

27 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/vertexdeclaration.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a4cfd66dfc42..83e35638bc6e 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3683,7 +3683,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (use_vs(state)) { - if (state->vertex_declaration->half_float_conv_needed) + if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) { TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); context->use_immediate_mode_draw = TRUE; diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 9098b3225c85..c050a6dda9f1 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -174,7 +174,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_adapter *adapter = device->adapter; - const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int i; if (TRACE_ON(d3d_decl)) @@ -218,7 +217,8 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara /* Find the streams used in the declaration. The vertex buffers have * to be loaded when drawing, but filter tesselation pseudo streams. */ - if (e->input_slot >= MAX_STREAMS) continue; + if (e->input_slot >= MAX_STREAMS) + continue; if (!e->format->gl_vtx_format) { @@ -254,7 +254,7 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) { - if (!gl_info->supported[ARB_HALF_FLOAT_VERTEX]) declaration->half_float_conv_needed = TRUE; + declaration->have_half_floats = TRUE; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8da12d7cf3f3..da3cd4615686 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3463,10 +3463,10 @@ struct wined3d_vertex_declaration struct wined3d_device *device; struct wined3d_vertex_declaration_element *elements; - UINT element_count; + unsigned int element_count; BOOL position_transformed; - BOOL half_float_conv_needed; + BOOL have_half_floats; }; struct wined3d_saved_states -- 2.16.4

2 1

[PATCH] d2d1: Implement matrix inversion functions.
by Nikolay Sivov 27 Aug '18

27 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1.spec | 4 +- dlls/d2d1/factory.c | 16 ++++++++ dlls/d2d1/tests/d2d1.c | 84 ++++++++++++++++++++++++++++++++++++++++++ include/d2d1.idl | 2 + 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index 26d17c687d..3443b29505 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -1,8 +1,8 @@ @ stdcall D2D1CreateFactory(long ptr ptr ptr) @ stdcall D2D1MakeRotateMatrix(float float float ptr) @ stub D2D1MakeSkewMatrix -@ stub D2D1IsMatrixInvertible -@ stub D2D1InvertMatrix +@ stdcall D2D1IsMatrixInvertible(ptr) +@ stdcall D2D1InvertMatrix(ptr) @ stub D2D1ConvertColorSpace @ stub D2D1CreateDevice @ stub D2D1CreateDeviceContext diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 7810e957d4..d2e53879e6 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -554,6 +554,22 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } +BOOL WINAPI D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix) +{ + TRACE("matrix %p.\n", matrix); + + return (matrix->_11 * matrix->_22 - matrix->_21 * matrix->_12) != 0.0f; +} + +BOOL WINAPI D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix) +{ + D2D1_MATRIX_3X2_F m = *matrix; + + TRACE("matrix %p.\n", matrix); + + return d2d_matrix_invert(matrix, &m); +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 8e58eef658..eeae75f841 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -6968,6 +6968,89 @@ if (SUCCEEDED(hr)) ID3D10Device1_Release(d3d_device); } +static void test_invert_matrix(void) +{ + static const struct + { + D2D1_MATRIX_3X2_F matrix; + D2D1_MATRIX_3X2_F inverse; + BOOL invertible; + } + invert_tests[] = + { + { { 0 }, { 0 }, FALSE }, + { + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, 2.0f, + 1.0f, 2.0f, + 4.0f, 8.0f + }, + FALSE + }, + { + { + 2.0f, 0.0f, + 0.0f, 2.0f, + 4.0f, 8.0f + }, + { + 0.5f, -0.0f, + -0.0f, 0.5f, + -2.0f, -4.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 2.0f, 2.0f, + 4.0f, 8.0f + }, + { + 1.0f, -0.5f, + -1.0f, 1.0f, + 4.0f, -6.0f + }, + TRUE + }, + { + { + 2.0f, 1.0f, + 3.0f, 1.0f, + 4.0f, 8.0f + }, + { + -1.0f, 1.0f, + 3.0f, -2.0f, + -20.0f, 12.0f + }, + TRUE + }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(invert_tests); ++i) + { + D2D1_MATRIX_3X2_F m; + BOOL ret; + + m = invert_tests[i].matrix; + ret = D2D1InvertMatrix(&m); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + ok(!memcmp(&m, &invert_tests[i].inverse, sizeof(m)), + "%u: unexpected matrix value {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n", i, + m._11, m._12, m._21, m._22, m._31, m._32); + + ret = D2D1IsMatrixInvertible(&invert_tests[i].matrix); + ok(ret == invert_tests[i].invertible, "%u: unexpected return value %d.\n", i, ret); + } +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7009,6 +7092,7 @@ START_TEST(d2d1) queue_test(test_create_device); queue_test(test_bitmap_surface); queue_test(test_device_context); + queue_test(test_invert_matrix); run_queued_tests(); } diff --git a/include/d2d1.idl b/include/d2d1.idl index fbfb40d93d..ff2dc03cfd 100644 --- a/include/d2d1.idl +++ b/include/d2d1.idl @@ -1254,4 +1254,6 @@ interface ID2D1Factory : IUnknown [local] HRESULT __stdcall D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, const D2D1_FACTORY_OPTIONS *factory_options, void **factory); +[local] BOOL __stdcall D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix); +[local] BOOL __stdcall D2D1IsMatrixInvertible(const D2D1_MATRIX_3X2_F *matrix); [local] void __stdcall D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_3X2_F *matrix); -- 2.18.0

2 1

[PATCH] schedsvc: In case it's an old Wine prefix create c:\windows\tasks automatically.
by Dmitry Timoshkov 27 Aug '18

27 Aug '18

This patch helps to avoid manual creation of c:\windows\tasks in old Wine prefixes a user may have around. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/svc_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 8830d59970..81f5d321ae 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -74,6 +74,9 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) GetWindowsDirectoryW(path, MAX_PATH); lstrcatW(path, tasksW); + /* Just in case it's an old Wine prefix with missing c:\windows\tasks */ + CreateDirectoryW(path, NULL); + htasks = CreateFileW(path, FILE_LIST_DIRECTORY, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); if (htasks == INVALID_HANDLE_VALUE) -- 2.17.1

2 10

[PATCH v2 2/2] winhttp: Avoid double free on connection error.
by Hans Leidekker 27 Aug '18

27 Aug '18

Reported by Stefan Dösinger. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 96624022e2..c141185cf8 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -234,7 +234,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock if (!ret) { WARN("unable to connect to host (%u)\n", get_last_error()); - netconn_close( conn ); + closesocket( conn->socket ); + heap_free( conn ); return NULL; } return conn; -- 2.11.0

1 0

[PATCH v2 1/2] winhttp: Use winsock sockets.
by Hans Leidekker 27 Aug '18

27 Aug '18

v2: Rebased. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 7fbe2a707e..659b5821df 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,8 +1,8 @@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = uuid jsproxy user32 advapi32 +IMPORTS = uuid jsproxy user32 advapi32 ws2_32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index b4b25304f7..e8cc89f948 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -17,15 +17,15 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" +#include "wine/list.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 6026a49610..d08e72079f 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -19,15 +19,14 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index a63f28cf10..e6c084b979 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -18,6 +18,7 @@ #define COBJMACROS #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2625e4a9d7..96624022e2 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -18,134 +18,31 @@ */ #include "config.h" -#include "wine/port.h" - +#define NONAMELESSUNION +#include "ws2tcpip.h" #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <assert.h> -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO_H -# include <sys/filio.h> -#endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif - -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/library.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" #include "schannel.h" +#include "wine/debug.h" +#include "wine/library.h" #include "winhttp_private.h" -/* to avoid conflicts with the Unix socket headers */ -#define USE_WS_PREFIX -#include "winsock2.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#ifndef HAVE_GETADDRINFO - -/* critical section to protect non-reentrant gethostbyname() */ -static CRITICAL_SECTION cs_gethostbyname; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cs_gethostbyname, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } -}; -static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; - -#endif - -/* translate a unix error code into a winsock error code */ -static int sock_get_error( int err ) -{ -#if !defined(__MINGW32__) && !defined (_MSC_VER) - switch (err) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - default: errno = err; perror( "sock_set_error" ); return WSAEFAULT; - } -#endif - return err; -} - static int sock_send(int fd, const void *msg, size_t len, int flags) { int ret; do { - if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %s\n", strerror(errno)); + if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -154,9 +51,9 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %s\n", strerror(errno)); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -254,11 +151,32 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu return err; } +static BOOL winsock_loaded; + void netconn_unload( void ) { -#ifndef HAVE_GETADDRINFO - DeleteCriticalSection(&cs_gethostbyname); -#endif + if (winsock_loaded) WSACleanup(); +} + +static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) +{ + int ret; + WSADATA data; + if (!(ret = WSAStartup( MAKEWORD(1,1), &data ))) winsock_loaded = TRUE; + else ERR( "WSAStartup failed: %d\n", ret ); + return TRUE; +} + +void winsock_init(void) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); +} + +static void set_blocking( netconn_t *conn, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( conn->socket, FIONBIO, &state ); } netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) @@ -266,8 +184,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock netconn_t *conn; unsigned int addr_len; BOOL ret = FALSE; - int res; - ULONG state; + + winsock_init(); conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; @@ -275,8 +193,7 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { - WARN("unable to create socket (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); + WARN("unable to create socket (%u)\n", WSAGetLastError()); heap_free(conn); return NULL; } @@ -293,66 +210,38 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock assert(0); } - if (timeout > 0) - { - state = 1; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + if (timeout > 0) set_blocking( conn, FALSE ); - for (;;) + if (!connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len )) ret = TRUE; + else { - res = 0; - if (connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len ) < 0) - { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) - { - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - for (;;) - { - res = 0; - if (poll( &pfd, 1, timeout ) > 0) - { - ret = TRUE; - break; - } - else - { - res = sock_get_error( errno ); - if (res != WSAEINTR) break; - } - } - } - if (res != WSAEINTR) break; - } - else + DWORD err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS) { - ret = TRUE; - break; + FD_SET set; + TIMEVAL timeval = { 0, timeout * 1000 }; + int res; + + FD_ZERO( &set ); + FD_SET( conn->socket, &set ); + if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = TRUE; + else if (!res) set_last_error( ERROR_WINHTTP_TIMEOUT ); } } - if (timeout > 0) - { - state = 0; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + + if (timeout > 0) set_blocking( conn, TRUE ); + if (!ret) { - WARN("unable to connect to host (%d)\n", res); - set_last_error( res ); + WARN("unable to connect to host (%u)\n", get_last_error()); netconn_close( conn ); return NULL; } return conn; } -BOOL netconn_close( netconn_t *conn ) +void netconn_close( netconn_t *conn ) { - int res; - if (conn->secure) { heap_free( conn->peek_msg_mem ); @@ -360,15 +249,9 @@ BOOL netconn_close( netconn_t *conn ) heap_free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } - res = closesocket( conn->socket ); + closesocket( conn->socket ); release_host( conn->host ); heap_free(conn); - if (res == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; } BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, @@ -552,12 +435,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) @@ -700,12 +578,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } ULONG netconn_query_data_available( netconn_t *conn ) @@ -715,86 +588,54 @@ ULONG netconn_query_data_available( netconn_t *conn ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - struct timeval tv; - - /* value is in milliseconds, convert to struct timeval */ - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - - if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) + int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; + if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { - WARN("setsockopt failed (%s)\n", strerror( errno )); - return sock_get_error( errno ); + DWORD err = WSAGetLastError(); + WARN("setsockopt failed (%u)\n", err ); + return err; } return ERROR_SUCCESS; } BOOL netconn_is_alive( netconn_t *netconn ) { -#ifdef MSG_DONTWAIT - ssize_t len; - BYTE b; - - len = recv( netconn->socket, &b, 1, MSG_PEEK | MSG_DONTWAIT ); - return len == 1 || (len == -1 && errno == EWOULDBLOCK); -#elif defined(__MINGW32__) || defined(_MSC_VER) - ULONG mode; int len; char b; + DWORD err; - mode = 1; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - len = recv(netconn->socket, &b, 1, MSG_PEEK); + set_blocking( netconn, FALSE ); + len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); + err = WSAGetLastError(); + set_blocking( netconn, TRUE ); - mode = 0; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); -#else - FIXME("not supported on this platform\n"); - return TRUE; -#endif + return len == 1 || (len == -1 && err == WSAEWOULDBLOCK); } -static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_storage *sa ) +static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct sockaddr_storage *sa ) { - char *hostname; -#ifdef HAVE_GETADDRINFO - struct addrinfo *res, hints; + ADDRINFOW *res, hints; int ret; -#else - struct hostent *he; - struct sockaddr_in *sin = (struct sockaddr_in *)sa; -#endif - if (!(hostname = strdupWA( hostnameW ))) return ERROR_OUTOFMEMORY; - -#ifdef HAVE_GETADDRINFO - memset( &hints, 0, sizeof(struct addrinfo) ); + memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on * their IPv6 addresses even though they have IPv6 addresses in the DNS. */ hints.ai_family = AF_INET; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - heap_free( hostname ); + TRACE("failed to get address of %s\n", debugstr_w(name)); return ERROR_WINHTTP_NAME_NOT_RESOLVED; } } - heap_free( hostname ); memcpy( sa, res->ai_addr, res->ai_addrlen ); - /* Copy port */ switch (res->ai_family) { case AF_INET: @@ -805,27 +646,8 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc break; } - freeaddrinfo( res ); - return ERROR_SUCCESS; -#else - EnterCriticalSection( &cs_gethostbyname ); - - he = gethostbyname( hostname ); - heap_free( hostname ); - if (!he) - { - TRACE("failed to get address of %s (%d)\n", debugstr_w(hostnameW), h_errno); - LeaveCriticalSection( &cs_gethostbyname ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sin->sin_addr, he->h_addr, he->h_length ); - sin->sin_family = he->h_addrtype; - sin->sin_port = htons( port ); - - LeaveCriticalSection( &cs_gethostbyname ); + FreeAddrInfoW( res ); return ERROR_SUCCESS; -#endif } struct resolve_args diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 6f6de7c63d..3e6d2af396 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -21,13 +21,9 @@ #define COBJMACROS #include "config.h" -#include "wine/port.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <assert.h> -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #include "windef.h" #include "winbase.h" @@ -38,9 +34,8 @@ #include "schannel.h" #include "winhttp.h" -#include "winhttp_private.h" - #include "wine/debug.h" +#include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -1481,10 +1476,6 @@ static BOOL secure_proxy_connect( request_t *request ) return ret; } -#ifndef INET6_ADDRSTRLEN -#define INET6_ADDRSTRLEN 46 -#endif - static WCHAR *addr_to_str( struct sockaddr_storage *addr ) { char buf[INET6_ADDRSTRLEN]; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8da09a2e21..c62fdadb06 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,9 +17,7 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,9 +32,6 @@ #include "windef.h" #include "winbase.h" -#ifndef __MINGW32__ -#define USE_WS_PREFIX -#endif #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" @@ -46,6 +41,7 @@ #include "dispex.h" #include "activscp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -649,46 +645,8 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } -static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) { -#ifndef __MINGW32__ - switch (addr->sa_family) - { - case AF_INET: - { - const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; - struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; - char *p; - - addr_win->sin_family = WS_AF_INET; - addr_win->sin_port = addr_unix->sin_port; - memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); - p = (char *)&addr_win->sin_addr + 4; - memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); - return TRUE; - } - case AF_INET6: - { - const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; - struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; - - addr_win->sin6_family = WS_AF_INET6; - addr_win->sin6_port = addr_unix->sin6_port; - addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; - memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - addr_win->sin6_scope_id = addr_unix->sin6_scope_id; -#else - addr_win->sin6_scope_id = 0; -#endif - memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); - return TRUE; - } - default: - ERR("unhandled family %u\n", addr->sa_family); - return FALSE; - } -#else switch (addr->sa_family) { case AF_INET: @@ -711,7 +669,6 @@ static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *add ERR("unhandled family %u\n", addr->sa_family); return FALSE; } -#endif } static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) @@ -829,8 +786,8 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } if (getsockname( request->netconn->socket, &local, &len )) return FALSE; - if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; - if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + if (!copy_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!copy_sockaddr( remote, &info->RemoteAddress )) return FALSE; info->cbSize = sizeof(*info); return TRUE; } @@ -1338,11 +1295,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - int ret = -1; -#ifdef HAVE_GETNAMEINFO - ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); -#endif - return ret; + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); } static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) @@ -1434,7 +1387,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) { -#ifdef HAVE_GETADDRINFO char *fqdn, *domain, *p; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; @@ -1476,9 +1428,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } heap_free( domain ); heap_free( fqdn ); -#else - FIXME("getaddrinfo not found at build time\n"); -#endif } if (!ret) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 52a175c84d..9e040bcbff 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -17,16 +17,16 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" - #include "windef.h" #include "winbase.h" #include "winreg.h" #include "winhttp.h" #include "shlwapi.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 7b92afc7ce..838561fe66 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -27,23 +27,6 @@ #include "wine/list.h" #include "wine/unicode.h" -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#if defined(__MINGW32__) || defined (_MSC_VER) -# include <ws2tcpip.h> -#else -# define closesocket close -# define ioctlsocket ioctl -#endif - #include "ole2.h" #include "sspi.h" #include "wincrypt.h" @@ -301,7 +284,7 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; -- 2.11.0

1 0

[PATCH 2/2] winhttp: Avoid double free on connection error.
by Hans Leidekker 27 Aug '18

27 Aug '18

Reported by Stefan Dösinger. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 25644a10be..c866c9b9fd 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -233,7 +233,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock if (!ret) { WARN("unable to connect to host (%u)\n", get_last_error()); - netconn_close( conn ); + closesocket( conn->socket ); + heap_free( conn ); return NULL; } return conn; -- 2.11.0

2 1

[PATCH 1/2] winhttp: Use winsock sockets.
by Hans Leidekker 27 Aug '18

27 Aug '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/Makefile.in | 4 +- dlls/winhttp/cookie.c | 6 +- dlls/winhttp/handle.c | 5 +- dlls/winhttp/main.c | 1 + dlls/winhttp/net.c | 328 ++++++++++------------------------------- dlls/winhttp/request.c | 13 +- dlls/winhttp/session.c | 63 +------- dlls/winhttp/url.c | 4 +- dlls/winhttp/winhttp_private.h | 19 +-- 9 files changed, 94 insertions(+), 349 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 7fbe2a707e..659b5821df 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -1,8 +1,8 @@ MODULE = winhttp.dll IMPORTLIB = winhttp -IMPORTS = uuid jsproxy user32 advapi32 +IMPORTS = uuid jsproxy user32 advapi32 ws2_32 DELAYIMPORTS = oleaut32 ole32 crypt32 secur32 -EXTRALIBS = $(CORESERVICES_LIBS) $(SOCKET_LIBS) +EXTRALIBS = $(CORESERVICES_LIBS) C_SRCS = \ cookie.c \ diff --git a/dlls/winhttp/cookie.c b/dlls/winhttp/cookie.c index b4b25304f7..e8cc89f948 100644 --- a/dlls/winhttp/cookie.c +++ b/dlls/winhttp/cookie.c @@ -17,15 +17,15 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" -#include "wine/list.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" +#include "wine/list.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 6026a49610..d08e72079f 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -19,15 +19,14 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" #include "winbase.h" #include "winhttp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c index a63f28cf10..e6c084b979 100644 --- a/dlls/winhttp/main.c +++ b/dlls/winhttp/main.c @@ -18,6 +18,7 @@ #define COBJMACROS #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> #include "windef.h" diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64783..25644a10be 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -18,134 +18,31 @@ */ #include "config.h" -#include "wine/port.h" - +#define NONAMELESSUNION +#include "ws2tcpip.h" #include <stdarg.h> #include <stdio.h> -#include <errno.h> #include <assert.h> -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_SYS_IOCTL_H -# include <sys/ioctl.h> -#endif -#ifdef HAVE_SYS_FILIO_H -# include <sys/filio.h> -#endif -#ifdef HAVE_POLL_H -# include <poll.h> -#endif - -#define NONAMELESSUNION - -#include "wine/debug.h" -#include "wine/library.h" - #include "windef.h" #include "winbase.h" #include "winhttp.h" #include "schannel.h" +#include "wine/debug.h" +#include "wine/library.h" #include "winhttp_private.h" -/* to avoid conflicts with the Unix socket headers */ -#define USE_WS_PREFIX -#include "winsock2.h" - WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#ifndef HAVE_GETADDRINFO - -/* critical section to protect non-reentrant gethostbyname() */ -static CRITICAL_SECTION cs_gethostbyname; -static CRITICAL_SECTION_DEBUG critsect_debug = -{ - 0, 0, &cs_gethostbyname, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": cs_gethostbyname") } -}; -static CRITICAL_SECTION cs_gethostbyname = { &critsect_debug, -1, 0, 0, 0, 0 }; - -#endif - -/* translate a unix error code into a winsock error code */ -static int sock_get_error( int err ) -{ -#if !defined(__MINGW32__) && !defined (_MSC_VER) - switch (err) - { - case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; - case EPERM: - case EACCES: return WSAEACCES; - case EFAULT: return WSAEFAULT; - case EINVAL: return WSAEINVAL; - case EMFILE: return WSAEMFILE; - case EWOULDBLOCK: return WSAEWOULDBLOCK; - case EINPROGRESS: return WSAEINPROGRESS; - case EALREADY: return WSAEALREADY; - case ENOTSOCK: return WSAENOTSOCK; - case EDESTADDRREQ: return WSAEDESTADDRREQ; - case EMSGSIZE: return WSAEMSGSIZE; - case EPROTOTYPE: return WSAEPROTOTYPE; - case ENOPROTOOPT: return WSAENOPROTOOPT; - case EPROTONOSUPPORT: return WSAEPROTONOSUPPORT; - case ESOCKTNOSUPPORT: return WSAESOCKTNOSUPPORT; - case EOPNOTSUPP: return WSAEOPNOTSUPP; - case EPFNOSUPPORT: return WSAEPFNOSUPPORT; - case EAFNOSUPPORT: return WSAEAFNOSUPPORT; - case EADDRINUSE: return WSAEADDRINUSE; - case EADDRNOTAVAIL: return WSAEADDRNOTAVAIL; - case ENETDOWN: return WSAENETDOWN; - case ENETUNREACH: return WSAENETUNREACH; - case ENETRESET: return WSAENETRESET; - case ECONNABORTED: return WSAECONNABORTED; - case EPIPE: - case ECONNRESET: return WSAECONNRESET; - case ENOBUFS: return WSAENOBUFS; - case EISCONN: return WSAEISCONN; - case ENOTCONN: return WSAENOTCONN; - case ESHUTDOWN: return WSAESHUTDOWN; - case ETOOMANYREFS: return WSAETOOMANYREFS; - case ETIMEDOUT: return WSAETIMEDOUT; - case ECONNREFUSED: return WSAECONNREFUSED; - case ELOOP: return WSAELOOP; - case ENAMETOOLONG: return WSAENAMETOOLONG; - case EHOSTDOWN: return WSAEHOSTDOWN; - case EHOSTUNREACH: return WSAEHOSTUNREACH; - case ENOTEMPTY: return WSAENOTEMPTY; -#ifdef EPROCLIM - case EPROCLIM: return WSAEPROCLIM; -#endif -#ifdef EUSERS - case EUSERS: return WSAEUSERS; -#endif -#ifdef EDQUOT - case EDQUOT: return WSAEDQUOT; -#endif -#ifdef ESTALE - case ESTALE: return WSAESTALE; -#endif -#ifdef EREMOTE - case EREMOTE: return WSAEREMOTE; -#endif - default: errno = err; perror( "sock_set_error" ); return WSAEFAULT; - } -#endif - return err; -} - static int sock_send(int fd, const void *msg, size_t len, int flags) { int ret; do { - if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %s\n", strerror(errno)); + if ((ret = send(fd, msg, len, flags)) == -1) WARN("send error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -154,9 +51,9 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) int ret; do { - if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %s\n", strerror(errno)); + if ((ret = recv(fd, msg, len, flags)) == -1) WARN("recv error %u\n", WSAGetLastError()); } - while(ret == -1 && errno == EINTR); + while(ret == -1 && WSAGetLastError() == WSAEINTR); return ret; } @@ -253,11 +150,32 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu return err; } +static BOOL winsock_loaded; + void netconn_unload( void ) { -#ifndef HAVE_GETADDRINFO - DeleteCriticalSection(&cs_gethostbyname); -#endif + if (winsock_loaded) WSACleanup(); +} + +static BOOL WINAPI winsock_startup( INIT_ONCE *once, void *param, void **ctx ) +{ + int ret; + WSADATA data; + if (!(ret = WSAStartup( MAKEWORD(1,1), &data ))) winsock_loaded = TRUE; + else ERR( "WSAStartup failed: %d\n", ret ); + return TRUE; +} + +void winsock_init(void) +{ + static INIT_ONCE once = INIT_ONCE_STATIC_INIT; + InitOnceExecuteOnce( &once, winsock_startup, NULL, NULL ); +} + +static void set_blocking( netconn_t *conn, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( conn->socket, FIONBIO, &state ); } netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sockaddr, int timeout ) @@ -265,8 +183,8 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock netconn_t *conn; unsigned int addr_len; BOOL ret = FALSE; - int res; - ULONG state; + + winsock_init(); conn = heap_alloc_zero(sizeof(*conn)); if (!conn) return NULL; @@ -274,8 +192,7 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock conn->sockaddr = *sockaddr; if ((conn->socket = socket( sockaddr->ss_family, SOCK_STREAM, 0 )) == -1) { - WARN("unable to create socket (%s)\n", strerror(errno)); - set_last_error( sock_get_error( errno ) ); + WARN("unable to create socket (%u)\n", WSAGetLastError()); heap_free(conn); return NULL; } @@ -292,66 +209,38 @@ netconn_t *netconn_create( hostdata_t *host, const struct sockaddr_storage *sock assert(0); } - if (timeout > 0) - { - state = 1; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + if (timeout > 0) set_blocking( conn, FALSE ); - for (;;) + if (!connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len )) ret = TRUE; + else { - res = 0; - if (connect( conn->socket, (const struct sockaddr *)&conn->sockaddr, addr_len ) < 0) - { - res = sock_get_error( errno ); - if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) - { - struct pollfd pfd; - - pfd.fd = conn->socket; - pfd.events = POLLOUT; - for (;;) - { - res = 0; - if (poll( &pfd, 1, timeout ) > 0) - { - ret = TRUE; - break; - } - else - { - res = sock_get_error( errno ); - if (res != WSAEINTR) break; - } - } - } - if (res != WSAEINTR) break; - } - else + DWORD err = WSAGetLastError(); + if (err == WSAEWOULDBLOCK || err == WSAEINPROGRESS) { - ret = TRUE; - break; + FD_SET set; + TIMEVAL timeval = { 0, timeout * 1000 }; + int res; + + FD_ZERO( &set ); + FD_SET( conn->socket, &set ); + if ((res = select( conn->socket + 1, NULL, &set, NULL, &timeval )) > 0) ret = TRUE; + else if (!res) set_last_error( ERROR_WINHTTP_TIMEOUT ); } } - if (timeout > 0) - { - state = 0; - ioctlsocket( conn->socket, FIONBIO, &state ); - } + + if (timeout > 0) set_blocking( conn, TRUE ); + if (!ret) { - WARN("unable to connect to host (%d)\n", res); - set_last_error( res ); + WARN("unable to connect to host (%u)\n", get_last_error()); netconn_close( conn ); return NULL; } return conn; } -BOOL netconn_close( netconn_t *conn ) +void netconn_close( netconn_t *conn ) { - int res; - if (conn->secure) { heap_free( conn->peek_msg_mem ); @@ -359,15 +248,9 @@ BOOL netconn_close( netconn_t *conn ) heap_free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } - res = closesocket( conn->socket ); + closesocket( conn->socket ); release_host( conn->host ); heap_free(conn); - if (res == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; } BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) @@ -550,12 +433,7 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int *sent ) return TRUE; } - if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*sent = sock_send( conn->socket, msg, len, 0 )) != -1); } static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, SIZE_T *ret_size, BOOL *eof) @@ -698,12 +576,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd *recvd = size; return TRUE; } - if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) - { - set_last_error( sock_get_error( errno ) ); - return FALSE; - } - return TRUE; + return ((*recvd = sock_recv( conn->socket, buf, len, flags )) != -1); } ULONG netconn_query_data_available( netconn_t *conn ) @@ -713,86 +586,54 @@ ULONG netconn_query_data_available( netconn_t *conn ) DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) { - struct timeval tv; - - /* value is in milliseconds, convert to struct timeval */ - tv.tv_sec = value / 1000; - tv.tv_usec = (value % 1000) * 1000; - - if (setsockopt( netconn->socket, SOL_SOCKET, send ? SO_SNDTIMEO : SO_RCVTIMEO, (void*)&tv, sizeof(tv) ) == -1) + int opt = send ? SO_SNDTIMEO : SO_RCVTIMEO; + if (setsockopt( netconn->socket, SOL_SOCKET, opt, (void *)&value, sizeof(value) ) == -1) { - WARN("setsockopt failed (%s)\n", strerror( errno )); - return sock_get_error( errno ); + DWORD err = WSAGetLastError(); + WARN("setsockopt failed (%u)\n", err ); + return err; } return ERROR_SUCCESS; } BOOL netconn_is_alive( netconn_t *netconn ) { -#ifdef MSG_DONTWAIT - ssize_t len; - BYTE b; - - len = recv( netconn->socket, &b, 1, MSG_PEEK | MSG_DONTWAIT ); - return len == 1 || (len == -1 && errno == EWOULDBLOCK); -#elif defined(__MINGW32__) || defined(_MSC_VER) - ULONG mode; int len; char b; + DWORD err; - mode = 1; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - len = recv(netconn->socket, &b, 1, MSG_PEEK); + set_blocking( netconn, FALSE ); + len = sock_recv( netconn->socket, &b, 1, MSG_PEEK ); + err = WSAGetLastError(); + set_blocking( netconn, TRUE ); - mode = 0; - if(!ioctlsocket(netconn->socket, FIONBIO, &mode)) - return FALSE; - - return len == 1 || (len == -1 && WSAGetLastError() == WSAEWOULDBLOCK); -#else - FIXME("not supported on this platform\n"); - return TRUE; -#endif + return len == 1 || (len == -1 && err == WSAEWOULDBLOCK); } -static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_storage *sa ) +static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct sockaddr_storage *sa ) { - char *hostname; -#ifdef HAVE_GETADDRINFO - struct addrinfo *res, hints; + ADDRINFOW *res, hints; int ret; -#else - struct hostent *he; - struct sockaddr_in *sin = (struct sockaddr_in *)sa; -#endif - if (!(hostname = strdupWA( hostnameW ))) return ERROR_OUTOFMEMORY; - -#ifdef HAVE_GETADDRINFO - memset( &hints, 0, sizeof(struct addrinfo) ); + memset( &hints, 0, sizeof(hints) ); /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on * their IPv6 addresses even though they have IPv6 addresses in the DNS. */ hints.ai_family = AF_INET; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + TRACE("failed to get IPv4 address of %s, retrying with IPv6\n", debugstr_w(name)); hints.ai_family = AF_INET6; - ret = getaddrinfo( hostname, NULL, &hints, &res ); + ret = GetAddrInfoW( name, NULL, &hints, &res ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - heap_free( hostname ); + TRACE("failed to get address of %s\n", debugstr_w(name)); return ERROR_WINHTTP_NAME_NOT_RESOLVED; } } - heap_free( hostname ); memcpy( sa, res->ai_addr, res->ai_addrlen ); - /* Copy port */ switch (res->ai_family) { case AF_INET: @@ -803,27 +644,8 @@ static DWORD resolve_hostname( const WCHAR *hostnameW, INTERNET_PORT port, struc break; } - freeaddrinfo( res ); - return ERROR_SUCCESS; -#else - EnterCriticalSection( &cs_gethostbyname ); - - he = gethostbyname( hostname ); - heap_free( hostname ); - if (!he) - { - TRACE("failed to get address of %s (%d)\n", debugstr_w(hostnameW), h_errno); - LeaveCriticalSection( &cs_gethostbyname ); - return ERROR_WINHTTP_NAME_NOT_RESOLVED; - } - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sin->sin_addr, he->h_addr, he->h_length ); - sin->sin_family = he->h_addrtype; - sin->sin_port = htons( port ); - - LeaveCriticalSection( &cs_gethostbyname ); + FreeAddrInfoW( res ); return ERROR_SUCCESS; -#endif } struct resolve_args diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229a1f..5da951987c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -21,13 +21,9 @@ #define COBJMACROS #include "config.h" -#include "wine/port.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <assert.h> -#ifdef HAVE_ARPA_INET_H -# include <arpa/inet.h> -#endif #include "windef.h" #include "winbase.h" @@ -38,9 +34,8 @@ #include "schannel.h" #include "winhttp.h" -#include "winhttp_private.h" - #include "wine/debug.h" +#include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -1481,10 +1476,6 @@ static BOOL secure_proxy_connect( request_t *request ) return ret; } -#ifndef INET6_ADDRSTRLEN -#define INET6_ADDRSTRLEN 46 -#endif - static WCHAR *addr_to_str( struct sockaddr_storage *addr ) { char buf[INET6_ADDRSTRLEN]; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb815682c2..6e81516c8b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -17,9 +17,7 @@ */ #include "config.h" -#include "wine/port.h" -#include "wine/debug.h" - +#include "ws2tcpip.h" #include <stdarg.h> #include <stdlib.h> @@ -34,9 +32,6 @@ #include "windef.h" #include "winbase.h" -#ifndef __MINGW32__ -#define USE_WS_PREFIX -#endif #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" @@ -46,6 +41,7 @@ #include "dispex.h" #include "activscp.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); @@ -649,46 +645,8 @@ static WCHAR *blob_to_str( DWORD encoding, CERT_NAME_BLOB *blob ) return ret; } -static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) +static BOOL copy_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *addr_storage ) { -#ifndef __MINGW32__ - switch (addr->sa_family) - { - case AF_INET: - { - const struct sockaddr_in *addr_unix = (const struct sockaddr_in *)addr; - struct WS_sockaddr_in *addr_win = (struct WS_sockaddr_in *)addr_storage; - char *p; - - addr_win->sin_family = WS_AF_INET; - addr_win->sin_port = addr_unix->sin_port; - memcpy( &addr_win->sin_addr, &addr_unix->sin_addr, 4 ); - p = (char *)&addr_win->sin_addr + 4; - memset( p, 0, sizeof(*addr_storage) - (p - (char *)addr_win) ); - return TRUE; - } - case AF_INET6: - { - const struct sockaddr_in6 *addr_unix = (const struct sockaddr_in6 *)addr; - struct WS_sockaddr_in6 *addr_win = (struct WS_sockaddr_in6 *)addr_storage; - - addr_win->sin6_family = WS_AF_INET6; - addr_win->sin6_port = addr_unix->sin6_port; - addr_win->sin6_flowinfo = addr_unix->sin6_flowinfo; - memcpy( &addr_win->sin6_addr, &addr_unix->sin6_addr, 16 ); -#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID - addr_win->sin6_scope_id = addr_unix->sin6_scope_id; -#else - addr_win->sin6_scope_id = 0; -#endif - memset( addr_win + 1, 0, sizeof(*addr_storage) - sizeof(*addr_win) ); - return TRUE; - } - default: - ERR("unhandled family %u\n", addr->sa_family); - return FALSE; - } -#else switch (addr->sa_family) { case AF_INET: @@ -711,7 +669,6 @@ static BOOL convert_sockaddr( const struct sockaddr *addr, SOCKADDR_STORAGE *add ERR("unhandled family %u\n", addr->sa_family); return FALSE; } -#endif } static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) @@ -829,8 +786,8 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } if (getsockname( request->netconn->socket, &local, &len )) return FALSE; - if (!convert_sockaddr( &local, &info->LocalAddress )) return FALSE; - if (!convert_sockaddr( remote, &info->RemoteAddress )) return FALSE; + if (!copy_sockaddr( &local, &info->LocalAddress )) return FALSE; + if (!copy_sockaddr( remote, &info->RemoteAddress )) return FALSE; info->cbSize = sizeof(*info); return TRUE; } @@ -1326,11 +1283,7 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix ) static int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { - int ret = -1; -#ifdef HAVE_GETNAMEINFO - ret = getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); -#endif - return ret; + return getnameinfo( ai->ai_addr, ai->ai_addrlen, hostname, len, NULL, 0, 0 ); } static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) @@ -1422,7 +1375,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } if (flags & WINHTTP_AUTO_DETECT_TYPE_DNS_A) { -#ifdef HAVE_GETADDRINFO char *fqdn, *domain, *p; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return FALSE; @@ -1464,9 +1416,6 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) } heap_free( domain ); heap_free( fqdn ); -#else - FIXME("getaddrinfo not found at build time\n"); -#endif } if (!ret) { diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 32b30da0ce..a3f623d90d 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -17,16 +17,16 @@ */ #include "config.h" +#include "ws2tcpip.h" #include <stdarg.h> -#include "wine/debug.h" - #include "windef.h" #include "winbase.h" #include "winreg.h" #include "winhttp.h" #include "shlwapi.h" +#include "wine/debug.h" #include "winhttp_private.h" WINE_DEFAULT_DEBUG_CHANNEL(winhttp); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2deb2..5f44e5ba6a 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -27,23 +27,6 @@ #include "wine/list.h" #include "wine/unicode.h" -#include <sys/types.h> -#ifdef HAVE_SYS_SOCKET_H -# include <sys/socket.h> -#endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif -#ifdef HAVE_NETDB_H -# include <netdb.h> -#endif -#if defined(__MINGW32__) || defined (_MSC_VER) -# include <ws2tcpip.h> -#else -# define closesocket close -# define ioctlsocket ioctl -#endif - #include "ole2.h" #include "sspi.h" #include "wincrypt.h" @@ -300,7 +283,7 @@ DWORD get_last_error( void ) DECLSPEC_HIDDEN; void send_callback( object_header_t *, DWORD, LPVOID, DWORD ) DECLSPEC_HIDDEN; void close_connection( request_t * ) DECLSPEC_HIDDEN; -BOOL netconn_close( netconn_t * ) DECLSPEC_HIDDEN; +void netconn_close( netconn_t * ) DECLSPEC_HIDDEN; netconn_t *netconn_create( hostdata_t *, const struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; -- 2.11.0

2 1

[PATCH 8/8] mshtml: Pass style id instead of flags to var_to_styleval.
by Jacek Caban 27 Aug '18

27 Aug '18

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

1 0

[PATCH 7/8] mshtml: Get rid of no longer needed argument in get_nsstyle_* implementation.
by Jacek Caban 27 Aug '18

27 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlcurstyle.c | 118 ++++++++++++++++++++++----------------------- dlls/mshtml/htmlstyle.c | 19 +++++--- dlls/mshtml/htmlstyle.h | 12 +---- 3 files changed, 74 insertions(+), 75 deletions(-)

1 0

[PATCH 6/8] mshtml: Introduce get_style_property_var helper and use it instead of get_nsstyle_attr_var in HTMLStyle implementation.
by Jacek Caban 27 Aug '18

27 Aug '18

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

1 0

[PATCH 5/8] mshtml: Use get_style_property instead of get_nsstyle_attr in HTMLStyle object.
by Jacek Caban 27 Aug '18

27 Aug '18

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

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel