September 2018 - Wine-commits

Alistair Leslie-Hughes : mfplat: Implement MFCreateMemoryBuffer.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: e379bfd34edcaa889cdd911f1dc61e93762343e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e379bfd34edcaa889cdd911f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 7 00:58:41 2018 +0000 mfplat: Implement MFCreateMemoryBuffer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45715 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 176 +++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 90 +++++++++++++++++++++++ include/mfapi.h | 1 + 4 files changed, 268 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 f4b5014..ccbbfb7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -38,6 +38,8 @@ static HRESULT (WINAPI *pMFCreateSourceResolver)(IMFSourceResolver **resolver); static HRESULT (WINAPI *pMFCreateMFByteStreamOnStream)(IStream *stream, IMFByteStream **bytestream); +static HRESULT (WINAPI *pMFCreateMemoryBuffer)(DWORD max_length, IMFMediaBuffer **buffer); + DEFINE_GUID(MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0xa634a91c, 0x822b, 0x41b9, 0xa4, 0x94, 0x4d, 0xe4, 0x64, 0x36, 0x12, 0xb0); @@ -196,6 +198,7 @@ static void init_functions(void) #define X(f) if (!(p##f = (void*)GetProcAddress(mod, #f))) return; X(MFCreateSourceResolver); X(MFCreateMFByteStreamOnStream); + X(MFCreateMemoryBuffer); #undef X } @@ -274,6 +277,92 @@ static void test_MFCreateMFByteStreamOnStream(void) IMFByteStream_Release(bytestream); } +static void test_MFCreateMemoryBuffer(void) +{ + IMFMediaBuffer *buffer; + HRESULT hr; + DWORD length, max; + BYTE *data, *data2; + + if(!pMFCreateMemoryBuffer) + { + win_skip("MFCreateMemoryBuffer() not found\n"); + return; + } + + hr = pMFCreateMemoryBuffer(1024, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "got 0x%08x\n", hr); + + hr = pMFCreateMemoryBuffer(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 = pMFCreateMemoryBuffer(1024, &buffer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IMFMediaBuffer_GetMaxLength(buffer, NULL); + ok(hr == E_INVALIDARG || hr == E_POINTER, "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 || hr == E_POINTER, "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 || hr == E_POINTER, "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); @@ -285,6 +374,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 0

Gijs Vermeulen : msvcr100: Add Concurrency::wait stub.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 58e3ac93ac21c652fe1651c6e1594c0b87672b23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58e3ac93ac21c652fe1651c6… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Sep 6 22:13:04 2018 +0200 msvcr100: Add Concurrency::wait stub. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/lock.c | 10 ++++++++++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 7fe53b5..406a505 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -516,7 +516,7 @@ @ cdecl -arch=win64 ?unlock(a)critical_section@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)critical_section@Concurrency@@QEAAXXZ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 88698ca..15e88e2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -496,7 +496,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) event_wait @ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) event_wait @ cdecl -arch=win32 ?wait_for_multiple(a)event@Concurrency@@SAIPAPAV12(a)I_NI@Z(ptr long long long) event_wait_for_multiple diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3d116c4..cd7b625 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -808,7 +808,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f317d1f..44f728b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -790,7 +790,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) reader_writer_lock_unlock @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) reader_writer_lock_unlock @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) MSVCRT_vsnwprintf -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) Concurrency_wait @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) _Condition_variable_wait diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 0f5d143..935de2b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -786,7 +786,7 @@ @ thiscall -arch=win32 ?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ @ cdecl -arch=win64 ?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ(ptr) msvcr120.?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ @ cdecl ?vswprintf@@YAHPA_WIPB_WPAD(a)Z(ptr long wstr ptr) msvcr120.?vswprintf@@YAHPA_WIPB_WPAD(a)Z -@ stub ?wait(a)Concurrency@@YAXI(a)Z +@ cdecl ?wait(a)Concurrency@@YAXI(a)Z(long) msvcr120.?wait(a)Concurrency@@YAXI(a)Z @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z diff --git a/dlls/msvcrt/lock.c b/dlls/msvcrt/lock.c index 177fc2a..4646126 100644 --- a/dlls/msvcrt/lock.c +++ b/dlls/msvcrt/lock.c @@ -1404,6 +1404,16 @@ MSVCRT_bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock TRACE("(%p)\n", this); return TryEnterCriticalSection(&this->cs); } + +/* ?wait(a)Concurrency@@YAXI(a)Z */ +void __cdecl Concurrency_wait(unsigned int time) +{ + static int once; + + if (!once++) FIXME("(%d) stub!\n", time); + + Sleep(time); +} #endif #if _MSVCR_VER == 110

1 0

Nikolay Sivov : xmllite/tests: Add more writer tests.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 5e5b7b49bada1d191fa34ce9599cd92c02b27f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e5b7b49bada1d191fa34ce9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 10 15:27:30 2018 +0300 xmllite/tests: Add more writer tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 306 ++++++++++++++++++++++++++++++++++++++------ dlls/xmllite/writer.c | 3 + 2 files changed, 273 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5e5b7b49bada1d191fa3…

1 0

Nikolay Sivov : xmllite/writer: Validate local name and prefix in WriteElementString().
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 69b2ed368d5966ca16654a5a151741f53928c312 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69b2ed368d5966ca16654a5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 10 15:27:31 2018 +0300 xmllite/writer: Validate local name and prefix in WriteElementString(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- dlls/xmllite/tests/writer.c | 3 ++- dlls/xmllite/writer.c | 43 ++++++++++++++++++++++++++++++++++++------ dlls/xmllite/xmllite_private.h | 2 ++ 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index f10c718..97c269c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1524,7 +1524,7 @@ static inline BOOL is_namestartchar(WCHAR ch) } /* [4 NS] NCName ::= Name - (Char* ':' Char*) */ -static inline BOOL is_ncnamechar(WCHAR ch) +BOOL is_ncnamechar(WCHAR ch) { return (ch >= 'A' && ch <= 'Z') || (ch == '_') || (ch >= 'a' && ch <= 'z') || diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 67fe55b..7be8854 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -865,6 +865,7 @@ static void test_WriteStartElement(void) { NULL, NULL, "uri", NULL, NULL, E_INVALIDARG }, { NULL, NULL, NULL, NULL, NULL, E_INVALIDARG }, { NULL, "prefix:local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, + { "pre:fix", "local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, { NULL, ":local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, { ":", "local", "uri", NULL, NULL, WC_E_NAMECHARACTER, 1, 1 }, { NULL, "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSPREFIXDECLARATION }, @@ -1062,7 +1063,7 @@ static void test_WriteElementString(void) valueW = strdupAtoW(element_string_tests[i].value); hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); - todo_wine_if(i >= 10) + todo_wine_if(i >= 13) ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(element_string_tests[i].hr)) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index c0260ae..a6cd1aa 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -293,15 +293,16 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * } /* TODO: test if we need to validate char range */ -static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, const WCHAR *local_name) +static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, + const WCHAR *local_name, int local_len) { if (prefix) { static const WCHAR colW[] = {':'}; - write_output_buffer(output, prefix, -1); + write_output_buffer(output, prefix, prefix_len); write_output_buffer(output, colW, ARRAY_SIZE(colW)); } - write_output_buffer(output, local_name, -1); + write_output_buffer(output, local_name, local_len); return S_OK; } @@ -834,10 +835,33 @@ static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName return E_NOTIMPL; } +static HRESULT is_valid_ncname(const WCHAR *str, int *out) +{ + int len = 0; + + *out = 0; + + if (!str || !*str) + return S_OK; + + while (*str) + { + if (!is_ncnamechar(*str)) + return WC_E_NAMECHARACTER; + len++; + str++; + } + + *out = len; + return S_OK; +} + static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri, LPCWSTR value) { xmlwriter *This = impl_from_IXmlWriter(iface); + int prefix_len, local_len; + HRESULT hr; TRACE("(%p)->(%s %s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri), wine_dbgstr_w(value)); @@ -860,17 +884,24 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr if (!local_name) return E_INVALIDARG; + /* Validate prefix and local name */ + if (FAILED(hr = is_valid_ncname(prefix, &prefix_len))) + return hr; + + if (FAILED(hr = is_valid_ncname(local_name, &local_len))) + return hr; + write_encoding_bom(This); write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, local_name); + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); if (value) { write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); write_output_buffer(This->output, value, -1); write_output_buffer(This->output, closeelementW, ARRAY_SIZE(closeelementW)); - write_output_qname(This->output, prefix, local_name); + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); } else @@ -1258,7 +1289,7 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre push_element(This, element); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, local_name); + write_output_qname(This->output, prefix, -1, local_name, -1); writer_inc_indent(This); return S_OK; diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 7884e27..9fb9e82 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -60,4 +60,6 @@ HRESULT get_code_page(xml_encoding,UINT*) DECLSPEC_HIDDEN; const WCHAR *get_encoding_name(xml_encoding) DECLSPEC_HIDDEN; xml_encoding get_encoding_from_codepage(UINT) DECLSPEC_HIDDEN; +BOOL is_ncnamechar(WCHAR ch) DECLSPEC_HIDDEN; + #endif /* __XMLLITE_PRIVATE__ */

1 0

Nikolay Sivov : xmllite/writer: Validate local name and prefix in WriteStartElement().
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: b34362f2d92b8bc96c608988a067db9361e6d821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34362f2d92b8bc96c608988… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 10 15:27:32 2018 +0300 xmllite/writer: Validate local name and prefix in WriteStartElement(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/writer.c | 6 +++--- dlls/xmllite/writer.c | 17 +++++++++++++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 7be8854..cf43f30 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -858,8 +858,8 @@ static void test_WriteStartElement(void) { { "prefix", "local", "uri", "<prefix:local xmlns:prefix=\"uri\" />", "<prefix:local", S_OK, 1 }, { NULL, "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1 }, - { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1, 1 }, - { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1, 1}, + { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1 }, + { "", "local", "uri", "<local xmlns=\"uri\" />", "<local", S_OK, 1 }, { "prefix", NULL, NULL, NULL, NULL, E_INVALIDARG }, { NULL, NULL, "uri", NULL, NULL, E_INVALIDARG }, @@ -953,7 +953,7 @@ static void test_WriteStartElement(void) uriW = strdupAtoW(start_element_tests[i].uri); hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); - todo_wine_if(i >= 7) + todo_wine_if(i >= 11) ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); if (SUCCEEDED(start_element_tests[i].hr)) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index a6cd1aa..f9e8c66 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -20,7 +20,9 @@ */ #define COBJMACROS +#include <assert.h> #include <stdarg.h> + #include "windef.h" #include "winbase.h" #include "objbase.h" @@ -296,7 +298,9 @@ static HRESULT write_output_buffer_quoted(xmlwriteroutput *output, const WCHAR * static HRESULT write_output_qname(xmlwriteroutput *output, const WCHAR *prefix, int prefix_len, const WCHAR *local_name, int local_len) { - if (prefix) { + assert(prefix_len >= 0 && local_len >= 0); + + if (prefix_len) { static const WCHAR colW[] = {':'}; write_output_buffer(output, prefix, prefix_len); write_output_buffer(output, colW, ARRAY_SIZE(colW)); @@ -1253,7 +1257,9 @@ static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandal static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR prefix, LPCWSTR local_name, LPCWSTR uri) { xmlwriter *This = impl_from_IXmlWriter(iface); + int prefix_len, local_len; struct element *element; + HRESULT hr; TRACE("(%p)->(%s %s %s)\n", This, wine_dbgstr_w(prefix), wine_dbgstr_w(local_name), wine_dbgstr_w(uri)); @@ -1272,6 +1278,13 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre ; } + /* Validate prefix and local name */ + if (FAILED(hr = is_valid_ncname(prefix, &prefix_len))) + return hr; + + if (FAILED(hr = is_valid_ncname(local_name, &local_len))) + return hr; + /* close pending element */ if (This->starttagopen) write_output_buffer(This->output, gtW, ARRAY_SIZE(gtW)); @@ -1289,7 +1302,7 @@ static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pre push_element(This, element); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); - write_output_qname(This->output, prefix, -1, local_name, -1); + write_output_qname(This->output, prefix, prefix_len, local_name, local_len); writer_inc_indent(This); return S_OK;

1 0

Jacek Caban : mshtml: Added IHTMLCSSStyleDeclaration:: styleFloat property implementation.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 9d22dc476f50f18a5900862832e101c5ba34a47d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d22dc476f50f18a59008628… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 10 17:27:46 2018 +0200 mshtml: Added IHTMLCSSStyleDeclaration::styleFloat property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/tests/style.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 8cfc6e1..282dd58 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -5567,15 +5567,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_height(IHTMLCSSStyleDeclaratio static HRESULT WINAPI HTMLCSSStyleDeclaration_put_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + return set_style_property(This, STYLEID_FLOAT, v); } static HRESULT WINAPI HTMLCSSStyleDeclaration_get_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_style_property(This, STYLEID_FLOAT, p); } static HRESULT WINAPI HTMLCSSStyleDeclaration_put_clear(IHTMLCSSStyleDeclaration *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index cbd3257..ae3b2a4 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -2897,6 +2897,12 @@ static void test_body_style(IHTMLStyle *style) str = NULL; hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_styleFloat(css_style, &str); + ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -2910,6 +2916,17 @@ static void test_body_style(IHTMLStyle *style) ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); ok(!strcmp_wa(str, "right"), "styleFloat = %s\n", wine_dbgstr_w(str)); SysFreeString(str); + + str = a2bstr("left"); + hres = IHTMLCSSStyleDeclaration_put_styleFloat(css_style, str); + ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); + ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); + ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); } hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);

1 0

Józef Kucia : winevulkan: Check if instance extensions are supported.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: e84999bd7ab859746e893ed2d49b1d42b0323c3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e84999bd7ab859746e893ed2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 13:06:58 2018 +0200 winevulkan: Check if instance extensions are supported. Return VK_ERROR_EXTENSION_NOT_PRESENT for unsupported extensions. Fixes crashes in some Vulkan CTS tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 4e0d999..7485fdc 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -349,7 +349,7 @@ static BOOL wine_vk_init(void) * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. */ -static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, +static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src, VkInstanceCreateInfo *dst) { unsigned int i; @@ -400,11 +400,19 @@ static void wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *src dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled extensions: %u\n", dst->enabledExtensionCount); + TRACE("Enabled %u instance extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { - TRACE("Extension %u: %s\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + const char *extension_name = dst->ppEnabledExtensionNames[i]; + TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); + if (!wine_vk_instance_extension_supported(extension_name)) + { + WARN("Extension %s is not supported.\n", debugstr_a(extension_name)); + return VK_ERROR_EXTENSION_NOT_PRESENT; + } } + + return VK_SUCCESS; } /* Helper function which stores wrapped physical devices in the instance object. */ @@ -710,7 +718,12 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, } object->base.loader_magic = VULKAN_ICD_MAGIC_VALUE; - wine_vk_instance_convert_create_info(create_info, &create_info_host); + res = wine_vk_instance_convert_create_info(create_info, &create_info_host); + if (res != VK_SUCCESS) + { + wine_vk_instance_free(object); + return res; + } res = vk_funcs->p_vkCreateInstance(&create_info_host, NULL /* allocator */, &object->instance); if (res != VK_SUCCESS)

1 0

Józef Kucia : vulkan-1/tests: Add test for unsupported instance extensions.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 931299bd330dcfc41f5c5c025dad8080b23b78fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=931299bd330dcfc41f5c5c02… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 13:06:59 2018 +0200 vulkan-1/tests: Add test for unsupported instance extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/tests/vulkan.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 20a2452..55efa23 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -25,7 +25,6 @@ static VkResult create_instance(uint32_t extension_count, const char * const *enabled_extensions, VkInstance *vk_instance) { VkInstanceCreateInfo create_info; - VkResult vr; create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; create_info.pNext = NULL; @@ -36,22 +35,32 @@ static VkResult create_instance(uint32_t extension_count, create_info.enabledExtensionCount = extension_count; create_info.ppEnabledExtensionNames = enabled_extensions; - if ((vr = vkCreateInstance(&create_info, NULL, vk_instance)) >= 0) + return vkCreateInstance(&create_info, NULL, vk_instance); +} + +#define create_instance_skip(a, b, c) create_instance_skip_(__LINE__, a, b, c) +static VkResult create_instance_skip_(unsigned int line, uint32_t extension_count, + const char * const *enabled_extensions, VkInstance *vk_instance) +{ + VkResult vr; + + if ((vr = create_instance(extension_count, enabled_extensions, vk_instance)) >= 0) return vr; switch (vr) { case VK_ERROR_EXTENSION_NOT_PRESENT: if (extension_count == 1) - skip("Instance extension '%s' not supported.\n", enabled_extensions[0]); + skip_(__FILE__, line)("Instance extension '%s' not supported.\n", enabled_extensions[0]); else - skip("Instance extensions not supported.\n"); + skip_(__FILE__, line)("Instance extensions not supported.\n"); break; default: - skip("Failed to create Vulkan instance, vr %d.\n", vr); + skip_(__FILE__, line)("Failed to create Vulkan instance, vr %d.\n", vr); break; } + return vr; } @@ -186,7 +195,7 @@ static void test_physical_device_groups(void) VK_KHR_DEVICE_GROUP_CREATION_EXTENSION_NAME, }; - if ((vr = create_instance(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) + if ((vr = create_instance_skip(ARRAY_SIZE(extensions), extensions, &vk_instance)) < 0) return; ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -271,6 +280,26 @@ static void test_destroy_command_pool(VkPhysicalDevice vk_physical_device) vkDestroyDevice(vk_device, NULL); } +static void test_unsupported_instance_extensions(void) +{ + VkInstance vk_instance; + unsigned int i; + VkResult vr; + + static const char *extensions[] = + { + "VK_KHR_xcb_surface", + "VK_KHR_xlib_surface", + }; + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + vr = create_instance(1, &extensions[i], &vk_instance); + ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT, + "Got VkResult %d for extension %s.\n", vr, extensions[i]); + } +} + static void for_each_device(void (*test_func)(VkPhysicalDevice)) { VkPhysicalDevice *vk_physical_devices; @@ -279,7 +308,7 @@ static void for_each_device(void (*test_func)(VkPhysicalDevice)) uint32_t count; VkResult vr; - if ((vr = create_instance(0, NULL, &vk_instance)) < 0) + if ((vr = create_instance_skip(0, NULL, &vk_instance)) < 0) return; ok(vr == VK_SUCCESS, "Got unexpected VkResult %d.\n", vr); @@ -312,4 +341,5 @@ START_TEST(vulkan) for_each_device(enumerate_device_queues); test_physical_device_groups(); for_each_device(test_destroy_command_pool); + test_unsupported_instance_extensions(); }

1 0

Józef Kucia : winevulkan: Check if device extensions are supported.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 4907ffdf2a15ab3a1e3749def37f4be67b758a35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4907ffdf2a15ab3a1e3749de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Sep 10 13:07:00 2018 +0200 winevulkan: Check if device extensions are supported. Return VK_ERROR_EXTENSION_NOT_PRESENT for unsupported extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 7485fdc..83041a5 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -278,10 +278,16 @@ static VkResult wine_vk_device_convert_create_info(const VkDeviceCreateInfo *src dst->enabledLayerCount = 0; dst->ppEnabledLayerNames = NULL; - TRACE("Enabled extensions: %u.\n", dst->enabledExtensionCount); + TRACE("Enabled %u extensions.\n", dst->enabledExtensionCount); for (i = 0; i < dst->enabledExtensionCount; i++) { - TRACE("Extension %u: %s.\n", i, debugstr_a(dst->ppEnabledExtensionNames[i])); + const char *extension_name = dst->ppEnabledExtensionNames[i]; + TRACE("Extension %u: %s.\n", i, debugstr_a(extension_name)); + if (!wine_vk_device_extension_supported(extension_name)) + { + WARN("Extension %s is not supported.\n", debugstr_a(extension_name)); + return VK_ERROR_EXTENSION_NOT_PRESENT; + } } return VK_SUCCESS; @@ -632,7 +638,8 @@ VkResult WINAPI wine_vkCreateDevice(VkPhysicalDevice phys_dev, res = wine_vk_device_convert_create_info(create_info, &create_info_host); if (res != VK_SUCCESS) { - ERR("Failed to convert VkDeviceCreateInfo, res=%d.\n", res); + if (res != VK_ERROR_EXTENSION_NOT_PRESENT) + ERR("Failed to convert VkDeviceCreateInfo, res=%d.\n", res); wine_vk_device_free(object); return res; }

1 0

Henri Verbeet : wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT.
by Alexandre Julliard 10 Sep '18

10 Sep '18

Module: wine Branch: master Commit: 8ad9f777b81c513df0d895921eaaf9f187e60feb URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ad9f777b81c513df0d89592… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 10 01:20:46 2018 +0430 wined3d: Add component info for R10G10B10X2_SNORM and R10G10B10X2_UINT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 5 +++-- include/wine/wined3d.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 961e3fe..84410af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -123,8 +123,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_UINT, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, - {WINED3DFMT_R10G10B10X2_SNORM, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, @@ -155,6 +153,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_R32G32_TYPELESS, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, {WINED3DFMT_R32G8X24_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 8, 32, 8}, {WINED3DFMT_R10G10B10A2_TYPELESS, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, + {WINED3DFMT_R10G10B10X2_TYPELESS, 10, 10, 10, 0, 0, 10, 20, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_TYPELESS, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R16G16_TYPELESS, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R32_TYPELESS, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, @@ -227,6 +226,8 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, + {WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10X2_TYPELESS, "iiiX"}, + {WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_TYPELESS, "UUUX"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, {WINED3DFMT_R8G8B8A8_SNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "iiii"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 239ccd8..ac7e3dd 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -132,6 +132,7 @@ enum wined3d_format_id WINED3DFMT_R5G5_SNORM_L6_UNORM, WINED3DFMT_R8G8_SNORM_L8X8_UNORM, WINED3DFMT_R10G11B11_SNORM, + WINED3DFMT_R10G10B10X2_TYPELESS, WINED3DFMT_R10G10B10X2_UINT, WINED3DFMT_R10G10B10X2_SNORM, WINED3DFMT_R10G10B10_SNORM_A2_UNORM,

1 0