September 2018 - Wine-devel

Re: [PATCH 1/2] d2d1: Return device context pointer for render targets.
by Vlad Bespalov 10 Sep '18

10 Sep '18

> > > return S_OK; > } > - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) > + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) > + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) > return > ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); > > Something feels wrong here - did you mean to have 2nd check against &IID_ID2D1DeviceContext ? Thanks, Vlad.

1 0

[PATCH 2/2] winevulkan: Enable vkGetDeviceProcAddr() quirk for idTech engine.
by Józef Kucia 10 Sep '18

10 Sep '18

For DOOM VFR. Based on a patch by Andrew Eikum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index c30f666a6296..1c721039f2f3 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -760,9 +760,7 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, app_info->engineVersion); TRACE("API version %#x.\n", app_info->apiVersion); - if (app_info->pApplicationName - && (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) + if (app_info->pEngineName && !strcmp(app_info->pEngineName, "idTech")) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } -- 2.16.4

1 0

[PATCH 1/2] winevulkan: Trace VkApplicationInfo in wine_vkCreateInstance().
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winevulkan/vulkan.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 83041a543084..c30f666a6296 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -362,16 +362,6 @@ static VkResult wine_vk_instance_convert_create_info(const VkInstanceCreateInfo *dst = *src; - if (dst->pApplicationInfo) - { - const VkApplicationInfo *app_info = dst->pApplicationInfo; - TRACE("Application name %s, application version %#x\n", - debugstr_a(app_info->pApplicationName), app_info->applicationVersion); - TRACE("Engine name %s, engine version %#x\n", debugstr_a(app_info->pEngineName), - app_info->engineVersion); - TRACE("API version %#x\n", app_info->apiVersion); - } - /* Application and loader can pass in a chain of extensions through pNext. * We can't blindly pass these through as often these contain callbacks or * they can even be pass structures for loader / ICD internal use. For now @@ -762,10 +752,17 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, return res; } - if ((app_info = create_info->pApplicationInfo) && app_info->pApplicationName) + if ((app_info = create_info->pApplicationInfo)) { - if (!strcmp(app_info->pApplicationName, "DOOM") - || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus")) + TRACE("Application name %s, application version %#x.\n", + debugstr_a(app_info->pApplicationName), app_info->applicationVersion); + TRACE("Engine name %s, engine version %#x.\n", debugstr_a(app_info->pEngineName), + app_info->engineVersion); + TRACE("API version %#x.\n", app_info->apiVersion); + + if (app_info->pApplicationName + && (!strcmp(app_info->pApplicationName, "DOOM") + || !strcmp(app_info->pApplicationName, "Wolfenstein II The New Colossus"))) object->quirks |= WINEVULKAN_QUIRK_GET_DEVICE_PROC_ADDR; } -- 2.16.4

1 0

[PATCH 1/3] xmllite/tests: Add more writer tests.
by Nikolay Sivov 10 Sep '18

10 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/xmllite/tests/writer.c | 306 +++++++++++++++++++++++++++++++----- dlls/xmllite/writer.c | 3 + 2 files changed, 273 insertions(+), 36 deletions(-) diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index 33c2f8f7d1..67fe55bb44 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -26,6 +26,8 @@ #include "winbase.h" #include "ole2.h" #include "xmllite.h" + +#include "wine/heap.h" #include "wine/test.h" #include "initguid.h" @@ -89,6 +91,19 @@ static void check_output(IStream *stream, const char *expected, BOOL todo, int l #define CHECK_OUTPUT_TODO(stream, expected) check_output(stream, expected, TRUE, __LINE__) #define CHECK_OUTPUT_RAW(stream, expected, size) check_output_raw(stream, expected, size, __LINE__) +static WCHAR *strdupAtoW(const char *str) +{ + WCHAR *ret = NULL; + DWORD len; + + if (!str) return ret; + len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + ret = heap_alloc(len * sizeof(WCHAR)); + if (ret) + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + static void writer_set_property(IXmlWriter *writer, XmlWriterProperty property) { HRESULT hr; @@ -826,13 +841,41 @@ static void test_bom(void) IXmlWriter_Release(writer); } -static void test_writestartelement(void) +static void test_WriteStartElement(void) { + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *output; + const char *output_partial; + HRESULT hr; + int todo; + int todo_partial; + } + start_element_tests[] = + { + { "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}, + + { "prefix", NULL, NULL, NULL, NULL, E_INVALIDARG }, + { 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 }, + { 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 }, + { "prefix", "local", "http://www.w3.org/2000/xmlns/", NULL, NULL, WR_E_XMLNSURIDECLARATION }, + }; static const WCHAR valueW[] = {'v','a','l','u','e',0}; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; + unsigned int i; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); @@ -843,15 +886,6 @@ static void test_writestartelement(void) stream = writer_set_output(writer); - hr = IXmlWriter_WriteStartElement(writer, aW, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteStartElement(writer, NULL, NULL, aW); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -900,6 +934,161 @@ static void test_writestartelement(void) "<a>value"); IStream_Release(stream); + + /* WriteStartElement */ + for (i = 0; i < ARRAY_SIZE(start_element_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW; + + stream = writer_set_output(writer); + + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + + prefixW = strdupAtoW(start_element_tests[i].prefix); + localW = strdupAtoW(start_element_tests[i].local); + uriW = strdupAtoW(start_element_tests[i].uri); + + hr = IXmlWriter_WriteStartElement(writer, prefixW, localW, uriW); + todo_wine_if(i >= 7) + ok(hr == start_element_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(start_element_tests[i].hr)) + { + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, start_element_tests[i].output_partial, start_element_tests[i].todo_partial, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, start_element_tests[i].output, start_element_tests[i].todo, __LINE__); + } + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + + IStream_Release(stream); + } + + IXmlWriter_Release(writer); +} + +static void test_WriteElementString(void) +{ + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *value; + const char *output; + HRESULT hr; + int todo; + } + element_string_tests[] = + { + { "prefix", "local", "uri", "value", "<prefix:local xmlns:prefix=\"uri\">value</prefix:local>", S_OK, 1 }, + { NULL, "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, + { "", "local", "uri", "value", "<local xmlns=\"uri\">value</local>", S_OK, 1 }, + { "prefix", "local", "uri", NULL, "<prefix:local xmlns:prefix=\"uri\" />", S_OK, 1 }, + { NULL, "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, + { "", "local", "uri", NULL, "<local xmlns=\"uri\" />", S_OK, 1 }, + { NULL, "local", NULL, NULL, "<local />" }, + + { "prefix", NULL, NULL, "value", NULL, E_INVALIDARG }, + { NULL, NULL, "uri", "value", NULL, E_INVALIDARG }, + { NULL, NULL, NULL, "value", NULL, E_INVALIDARG }, + { NULL, "prefix:local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { NULL, ":local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { ":", "local", "uri", "value", NULL, WC_E_NAMECHARACTER }, + { NULL, "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSPREFIXDECLARATION }, + { "prefix", "local", "http://www.w3.org/2000/xmlns/", "value", NULL, WR_E_XMLNSURIDECLARATION }, + }; + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + static const WCHAR aW[] = {'a',0}; + static const WCHAR bW[] = {'b',0}; + IXmlWriter *writer; + IStream *stream; + unsigned int i; + HRESULT hr; + + hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == E_UNEXPECTED, "got 0x%08x\n", hr); + + stream = writer_set_output(writer); + + hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, valueW); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_WriteElementString(writer, NULL, bW, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + CHECK_OUTPUT(stream, + "<a>value"); + + IStream_Release(stream); + + for (i = 0; i < ARRAY_SIZE(element_string_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW, *valueW; + + stream = writer_set_output(writer); + + writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); + + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); + + prefixW = strdupAtoW(element_string_tests[i].prefix); + localW = strdupAtoW(element_string_tests[i].local); + uriW = strdupAtoW(element_string_tests[i].uri); + valueW = strdupAtoW(element_string_tests[i].value); + + hr = IXmlWriter_WriteElementString(writer, prefixW, localW, uriW, valueW); + todo_wine_if(i >= 10) + ok(hr == element_string_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(element_string_tests[i].hr)) + { + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, element_string_tests[i].output, element_string_tests[i].todo, __LINE__); + } + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + IStream_Release(stream); + } + IXmlWriter_Release(writer); } @@ -1313,42 +1502,94 @@ static void test_indentation(void) static void test_WriteAttributeString(void) { + static const struct + { + const char *prefix; + const char *local; + const char *uri; + const char *value; + const char *output; + const char *output_partial; + HRESULT hr; + } + attribute_tests[] = + { + { NULL, "a", NULL, "b", "<e a=\"b\" />", "<e a=\"b\"" }, + { "prefix", "local", "uri", "b", "<e prefix:local=\"b\" xmlns:prefix=\"uri\" />", "<e prefix:local=\"b\"" }, + { NULL, "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e xmlns:a=\"defuri\" />", "<e xmlns:a=\"defuri\"" }, + + /* Autogenerated prefix names. */ + { NULL, "a", "defuri", NULL, "<e p1:a=\"\" xmlns:p1=\"defuri\" />", "<e p1:a=\"\"" }, + { NULL, "a", "defuri", "b", "<e p1:a=\"b\" xmlns:p1=\"defuri\" />", "<e p1:a=\"b\"" }, + + /* Failing cases. */ + { NULL, NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, NULL, "b", "<e />", "<e", E_INVALIDARG }, + { "prefix", NULL, "uri", NULL, "<e />", "<e", E_INVALIDARG }, + { "xmlns", NULL, NULL, "uri", "<e />", "<e", WR_E_NSPREFIXDECLARED }, + { "xmlns", "a", "defuri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { NULL, "xmlns", "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { "xmlns", NULL, "uri", NULL, "<e />", "<e", WR_E_XMLNSPREFIXDECLARATION }, + { "prefix", "a", "http://www.w3.org/2000/xmlns/", "defuri", "<e />", "<e", WR_E_XMLNSURIDECLARATION }, + }; + static const WCHAR prefixW[] = {'p','r','e','f','i','x',0}; static const WCHAR localW[] = {'l','o','c','a','l',0}; static const WCHAR uriW[] = {'u','r','i',0}; - static const WCHAR uri2W[] = {'u','r','i','2',0}; - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + static const WCHAR elementW[] = {'e',0}; static const WCHAR aW[] = {'a',0}; static const WCHAR bW[] = {'b',0}; IXmlWriter *writer; IStream *stream; + unsigned int i; HRESULT hr; hr = CreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - stream = writer_set_output(writer); - writer_set_property(writer, XmlWriterProperty_OmitXmlDeclaration); - hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); - ok(hr == S_OK, "got 0x%08x\n", hr); + for (i = 0; i < ARRAY_SIZE(attribute_tests); ++i) + { + WCHAR *prefixW, *localW, *uriW, *valueW; - hr = IXmlWriter_WriteStartElement(writer, NULL, aW, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); + stream = writer_set_output(writer); - hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartDocument(writer, XmlStandalone_Omit); + ok(hr == S_OK, "Failed to start document, hr %#x.\n", hr); - hr = IXmlWriter_WriteEndDocument(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXmlWriter_WriteStartElement(writer, NULL, elementW, NULL); + ok(hr == S_OK, "Failed to start element, hr %#x.\n", hr); - hr = IXmlWriter_Flush(writer); - ok(hr == S_OK, "got 0x%08x\n", hr); + prefixW = strdupAtoW(attribute_tests[i].prefix); + localW = strdupAtoW(attribute_tests[i].local); + uriW = strdupAtoW(attribute_tests[i].uri); + valueW = strdupAtoW(attribute_tests[i].value); - CHECK_OUTPUT(stream, - "<a a=\"b\" />"); - IStream_Release(stream); + hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, uriW, valueW); + todo_wine_if(i != 0) + ok(hr == attribute_tests[i].hr, "%u: unexpected hr %#x.\n", i, hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + check_output(stream, attribute_tests[i].output_partial, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); + + hr = IXmlWriter_WriteEndDocument(writer); + ok(hr == S_OK, "Failed to end document, hr %#x.\n", hr); + + hr = IXmlWriter_Flush(writer); + ok(hr == S_OK, "Failed to flush, hr %#x.\n", hr); + + heap_free(prefixW); + heap_free(localW); + heap_free(uriW); + heap_free(valueW); + + check_output(stream, attribute_tests[i].output, i == 1 || i == 2 || i == 3 || i == 4, __LINE__); + IStream_Release(stream); + } /* with namespaces */ stream = writer_set_output(writer); @@ -1370,14 +1611,6 @@ todo_wine hr = IXmlWriter_WriteAttributeString(writer, NULL, aW, NULL, bW); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, uri2W, NULL); -todo_wine - ok(hr == WR_E_XMLNSPREFIXDECLARATION, "got 0x%08x\n", hr); - - hr = IXmlWriter_WriteAttributeString(writer, NULL, xmlnsW, NULL, uri2W); -todo_wine - ok(hr == WR_E_NSPREFIXDECLARED, "got 0x%08x\n", hr); - hr = IXmlWriter_WriteAttributeString(writer, prefixW, localW, NULL, bW); todo_wine ok(hr == WR_E_DUPLICATEATTRIBUTE, "got 0x%08x\n", hr); @@ -1585,7 +1818,8 @@ START_TEST(writer) test_writer_state(); test_writeroutput(); test_writestartdocument(); - test_writestartelement(); + test_WriteStartElement(); + test_WriteElementString(); test_writeendelement(); test_flush(); test_omitxmldeclaration(); diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index 88f75b6e20..c0260ae473 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -857,6 +857,9 @@ static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pr ; } + if (!local_name) + return E_INVALIDARG; + write_encoding_bom(This); write_node_indent(This); write_output_buffer(This->output, ltW, ARRAY_SIZE(ltW)); -- 2.18.0

1 2

[PATCH 1/2] d2d1: Return device context pointer for render targets.
by Nikolay Sivov 10 Sep '18

10 Sep '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- In attempt to reduce larger patch at https://bugs.winehq.org/show_bug.cgi?id=44052. dlls/d2d1/dc_render_target.c | 3 ++- dlls/d2d1/hwnd_render_target.c | 3 ++- dlls/d2d1/wic_render_target.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index d5e4f47e6d..e55483d7c1 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -64,7 +64,8 @@ static HRESULT STDMETHODCALLTYPE d2d_dc_render_target_QueryInterface(ID2D1DCRend *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1DeviceContext)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 04d33536a6..6e91ad6a21 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -53,7 +53,8 @@ static HRESULT STDMETHODCALLTYPE d2d_hwnd_render_target_QueryInterface(ID2D1Hwnd *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 5642fd44ff..b742314d38 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -112,7 +112,8 @@ static HRESULT STDMETHODCALLTYPE d2d_wic_render_target_QueryInterface(ID2D1Rende *out = iface; return S_OK; } - else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) + else if (IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget) + || IsEqualGUID(iid, &IID_ID2D1GdiInteropRenderTarget)) return ID2D1RenderTarget_QueryInterface(render_target->dxgi_target, iid, out); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); -- 2.18.0

2 3

[PATCH 4/4] vulkan-1/tests: Add test for unsupported device extensions.
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 55efa236b041..4143af752c20 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -300,6 +300,27 @@ static void test_unsupported_instance_extensions(void) } } +static void test_unsupported_device_extensions(VkPhysicalDevice vk_physical_device) +{ + VkDevice vk_device; + unsigned int i; + VkResult vr; + + static const char *extensions[] = + { + "VK_KHR_external_fence_fd", + "VK_KHR_external_memory_fd", + "VK_KHR_external_semaphore_fd", + }; + + for (i = 0; i < ARRAY_SIZE(extensions); ++i) + { + vr = create_device(vk_physical_device, 1, &extensions[i], NULL, &vk_device); + 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; @@ -342,4 +363,5 @@ START_TEST(vulkan) test_physical_device_groups(); for_each_device(test_destroy_command_pool); test_unsupported_instance_extensions(); + for_each_device(test_unsupported_device_extensions); } -- 2.16.4

1 0

[PATCH 3/4] winevulkan: Check if device extensions are supported.
by Józef Kucia 10 Sep '18

10 Sep '18

Return VK_ERROR_EXTENSION_NOT_PRESENT for unsupported extensions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 7485fdc04669..83041a543084 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; } -- 2.16.4

1 0

[PATCH 2/4] vulkan-1/tests: Add test for unsupported instance extensions.
by Józef Kucia 10 Sep '18

10 Sep '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- 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 20a245238b02..55efa236b041 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(); } -- 2.16.4

1 0

[PATCH 1/4] winevulkan: Check if instance extensions are supported.
by Józef Kucia 10 Sep '18

10 Sep '18

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> --- 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 4e0d999ddb41..7485fdc04669 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) -- 2.16.4

1 0

[PATCH] ntdll/tests: If DEP is enabled, skip a test that will crash
by Alex Henrie 10 Sep '18

10 Sep '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- DEP is enabled by default on server editions of Windows, so this test has been consistently crashing on Windows Server 2008. --- dlls/ntdll/tests/info.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 2ab12e4257..2ee9f0deba 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -37,6 +37,7 @@ static NTSTATUS (WINAPI * pNtUnmapViewOfSection)(HANDLE,PVOID); static NTSTATUS (WINAPI * pNtClose)(HANDLE); static ULONG (WINAPI * pNtGetCurrentProcessorNumber)(void); static BOOL (WINAPI * pIsWow64Process)(HANDLE, PBOOL); +static BOOL (WINAPI * pGetProcessDEPPolicy)(HANDLE,DWORD*,BOOL*); static BOOL (WINAPI * pGetLogicalProcessorInformationEx)(LOGICAL_PROCESSOR_RELATIONSHIP,SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*,DWORD*); static BOOL is_wow64; @@ -96,6 +97,8 @@ static BOOL InitFunctionPtrs(void) pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; + pGetProcessDEPPolicy = (void *)GetProcAddress(hkernel32, "GetProcessDEPPolicy"); + /* starting with Win7 */ pNtQuerySystemInformationEx = (void *) GetProcAddress(hntdll, "NtQuerySystemInformationEx"); if (!pNtQuerySystemInformationEx) @@ -1838,6 +1841,8 @@ static void test_mapprotection(void) LARGE_INTEGER size, offset; NTSTATUS status; SIZE_T retlen, count; + DWORD dep_flags; + BOOL dep_permanent; void (*f)(void); BOOL reset_flags = FALSE; @@ -1883,18 +1888,28 @@ static void test_mapprotection(void) status = pNtMapViewOfSection ( h, GetCurrentProcess(), &addr, 0, 0, &offset, &count, ViewShare, 0, PAGE_READWRITE); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + if (pGetProcessDEPPolicy && + pGetProcessDEPPolicy(GetCurrentProcess(), &dep_flags, &dep_permanent) && + dep_flags & PROCESS_DEP_ENABLE) + { + skip("Data Execution Prevention is enabled\n"); + } + else + { #if defined(__x86_64__) || defined(__i386__) - *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ + *(unsigned char*)addr = 0xc3; /* lret ... in both i386 and x86_64 */ #elif defined(__arm__) - *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ + *(unsigned long*)addr = 0xe12fff1e; /* bx lr */ #elif defined(__aarch64__) - *(unsigned long*)addr = 0xd65f03c0; /* ret */ + *(unsigned long*)addr = 0xd65f03c0; /* ret */ #else - ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); + ok(0, "Add a return opcode for your architecture or expect a crash in this test\n"); #endif - trace("trying to execute code in the readwrite only mapped anon file...\n"); - f = addr;f(); - trace("...done.\n"); + trace("trying to execute code in the readwrite-only mapped anon file...\n"); + f = addr; + f(); + trace("...done.\n"); + } status = pNtQueryVirtualMemory( GetCurrentProcess(), addr, MemoryBasicInformation, &info, sizeof(info), &retlen ); ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); -- 2.18.0

2 2