March 2018 - Wine-Commits - list.winehq.org

Owen Rudge : wsdapi: Add SequenceId to SOAP header, add test.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: dead047bdb8c3474a2a684867757e966409b9205 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dead047bdb8c3474a2a68486… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:35 2018 +0100 wsdapi: Add SequenceId to SOAP header, add test. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/soap.c | 29 +++++++++++++++++++++++++++-- dlls/wsdapi/tests/discovery.c | 15 +++++++++++---- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 06d0129..7779317 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -71,6 +71,7 @@ static const WCHAR relatesToString[] = { 'R','e','l','a','t','e','s','T','o', 0 static const WCHAR appSequenceString[] = { 'A','p','p','S','e','q','u','e','n','c','e', 0 }; static const WCHAR instanceIdString[] = { 'I','n','s','t','a','n','c','e','I','d', 0 }; static const WCHAR messageNumberString[] = { 'M','e','s','s','a','g','e','N','u','m','b','e','r', 0 }; +static const WCHAR sequenceIdString[] = { 'S','e','q','u','e','n','c','e','I','d', 0 }; static const WCHAR emptyString[] = { 0 }; struct discovered_namespace @@ -437,6 +438,25 @@ static BOOL add_ulonglong_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT return TRUE; } +static BOOL add_string_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, + LPCWSTR value) +{ + WSDXML_ATTRIBUTE *attribute = add_attribute(xml_context, parent, ns_uri, name); + + if (attribute == NULL) + return FALSE; + + attribute->Value = duplicate_string(attribute, value); + + if (attribute->Value == NULL) + { + remove_attribute(parent, attribute); + return FALSE; + } + + return TRUE; +} + static BOOL add_discovered_namespace(struct list *namespaces, WSDXML_NAMESPACE *discovered_ns) { struct discovered_namespace *ns; @@ -499,12 +519,17 @@ static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_conte if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, instanceIdString, min(UINT_MAX, header->AppSequence->InstanceId))) goto cleanup; + /* SequenceID attribute */ + if (header->AppSequence->SequenceId != NULL) + { + if (!add_string_attribute(xml_context, app_sequence_element, NULL, sequenceIdString, header->AppSequence->SequenceId)) + goto cleanup; + } + /* MessageNumber attribute */ if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, messageNumberString, min(UINT_MAX, header->AppSequence->MessageNumber))) goto cleanup; - /* TODO: SequenceID attribute */ - /* </d:AppSequence> */ /* TODO: Write any headers */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 1fa96b7..1c7619d 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -39,6 +39,7 @@ #define SEND_PORT "3702" static const char *publisherId = "urn:uuid:3AE5617D-790F-408A-9374-359A77F924A3"; +static const char *sequenceId = "urn:uuid:b14de351-72fc-4453-96f9-e58b0c9faf38"; #define MAX_CACHED_MESSAGES 5 #define MAX_LISTENING_THREADS 20 @@ -501,8 +502,8 @@ static void Publish_tests(void) IWSDiscoveryPublisher *publisher = NULL; IWSDiscoveryPublisherNotify *sink1 = NULL, *sink2 = NULL; IWSDiscoveryPublisherNotifyImpl *sink1Impl = NULL, *sink2Impl = NULL; - char endpointReferenceString[MAX_PATH]; - LPWSTR publisherIdW = NULL; + char endpointReferenceString[MAX_PATH], app_sequence_string[MAX_PATH]; + LPWSTR publisherIdW = NULL, sequenceIdW = NULL; messageStorage *msgStorage; WSADATA wsaData; BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; @@ -557,6 +558,9 @@ static void Publish_tests(void) publisherIdW = utf8_to_wide(publisherId); if (publisherIdW == NULL) goto after_publish_test; + sequenceIdW = utf8_to_wide(sequenceId); + if (sequenceIdW == NULL) goto after_publish_test; + msgStorage = heap_alloc_zero(sizeof(messageStorage)); if (msgStorage == NULL) goto after_publish_test; @@ -570,7 +574,7 @@ static void Publish_tests(void) ok(ret == TRUE, "Unable to listen on IPv4 addresses (ret == %d)\n", ret); /* Publish the service */ - rc = IWSDiscoveryPublisher_Publish(publisher, publisherIdW, 1, 1, 1, NULL, NULL, NULL, NULL); + rc = IWSDiscoveryPublisher_Publish(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL); ok(rc == S_OK, "Publish failed: %08x\n", rc); /* Wait up to 2 seconds for messages to be received */ @@ -587,6 +591,8 @@ static void Publish_tests(void) ok(msgStorage->messageCount >= 1, "No messages received\n"); sprintf(endpointReferenceString, "<wsa:EndpointReference><wsa:Address>%s</wsa:Address></wsa:EndpointReference>", publisherId); + sprintf(app_sequence_string, "<wsd:AppSequence InstanceId=\"1\" SequenceId=\"%s\" MessageNumber=\"1\"></wsd:AppSequence>", + sequenceId); messageOK = FALSE; @@ -598,7 +604,7 @@ static void Publish_tests(void) hello_message_seen = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); endpoint_reference_seen = (strstr(msg, endpointReferenceString) != NULL); - app_sequence_seen = (strstr(msg, "<wsd:AppSequence InstanceId=\"1\" MessageNumber=\"1\"></wsd:AppSequence>") != NULL); + app_sequence_seen = (strstr(msg, app_sequence_string) != NULL); metadata_version_seen = (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); messageOK = hello_message_seen && endpoint_reference_seen && app_sequence_seen && metadata_version_seen; @@ -621,6 +627,7 @@ static void Publish_tests(void) after_publish_test: if (publisherIdW != NULL) heap_free(publisherIdW); + if (sequenceIdW != NULL) heap_free(sequenceIdW); ref = IWSDiscoveryPublisher_Release(publisher); ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref);

1 0

Andrey Gusev : d3dx11: Add D3DX11CreateTextureFromFileA/W stub.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 8dedf244f615b68d9013cd1aa77c0edff0d517a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dedf244f615b68d9013cd1a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sat Mar 24 16:40:22 2018 +0200 d3dx11: Add D3DX11CreateTextureFromFileA/W stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx11_42/d3dx11_42.spec | 4 ++-- dlls/d3dx11_43/d3dx11_43.spec | 4 ++-- dlls/d3dx11_43/texture.c | 20 ++++++++++++++++++++ include/d3dx11tex.h | 8 ++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index f05e02c..cb1f780 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -20,8 +20,8 @@ @ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/d3dx11_43.spec b/dlls/d3dx11_43/d3dx11_43.spec index 1cafaa6..76a3916 100644 --- a/dlls/d3dx11_43/d3dx11_43.spec +++ b/dlls/d3dx11_43/d3dx11_43.spec @@ -20,8 +20,8 @@ @ stub D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateShaderResourceViewFromResourceA @ stub D3DX11CreateShaderResourceViewFromResourceW -@ stub D3DX11CreateTextureFromFileA -@ stub D3DX11CreateTextureFromFileW +@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) +@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) @ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr) @ stub D3DX11CreateTextureFromResourceA @ stub D3DX11CreateTextureFromResourceW diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c index fe291d9..6aaf8a7 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -35,6 +35,26 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co return E_NOTIMPL; } +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_a(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult) +{ + FIXME("device %p, filename %s, load_info %p, pump %p, texture %p, hresult %p stub.\n", + device, debugstr_w(filename), load_info, pump, texture, hresult); + + return E_NOTIMPL; +} + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data, SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) diff --git a/include/d3dx11tex.h b/include/d3dx11tex.h index 584a3bd..4f792ec 100644 --- a/include/d3dx11tex.h +++ b/include/d3dx11tex.h @@ -111,6 +111,14 @@ HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, co SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult); +HRESULT WINAPI D3DX11CreateTextureFromFileA(ID3D11Device *device, const char *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + +HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *filename, + D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, + HRESULT *hresult); + HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data, SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *loadinfo, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult);

1 0

Alexandre Julliard : urlmon/tests: Update the IP address for the WineHQ server.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 674f1337e48f0d7736ac22ceeac594a7484c4c75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=674f1337e48f0d7736ac22ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 28 21:16:10 2018 +0200 urlmon/tests: Update the IP address for the WineHQ server. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cd1d855..aa2f3e1 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -160,7 +160,7 @@ static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_ static const WCHAR wszWineHQSite[] = {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR wszWineHQIP[] = - {'2','0','9','.','3','2','.','1','4','1','.','3',0}; + {'4','.','1','5','.','1','8','4','.','7','7',0}; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -2891,7 +2891,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://209.46.25.134/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome.msg";

1 0

Anton Romanov : wmp: Implement playback via quartz.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: f762097f505a4155657333f104623d13a9350d21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f762097f505a4155657333f1… Author: Anton Romanov <theli.ua(a)gmail.com> Date: Wed Mar 28 08:31:43 2018 -0700 wmp: Implement playback via quartz. Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wmp/player.c | 89 ++++++++++++++++++++++++++++++--- dlls/wmp/tests/Makefile.in | 4 +- dlls/wmp/tests/av.mp4 | Bin 1493 -> 0 bytes dlls/wmp/tests/media.c | 120 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wmp/tests/oleobj.c | 6 +-- dlls/wmp/tests/rsrc.rc | 5 +- dlls/wmp/tests/test.mp3 | Bin 0 -> 240333 bytes dlls/wmp/wmp_private.h | 8 ++- 8 files changed, 217 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f762097f505a41556573…

1 0

Jacek Caban : msxml3/tests: Added invalid host XHR tests.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 35bd57ec5e62a984dd4223551eaa0714c06f7722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35bd57ec5e62a984dd422355… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 18:20:19 2018 +0200 msxml3/tests: Added invalid host XHR tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 5149222..f20f18f 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -1787,6 +1787,18 @@ static void test_XMLHTTP(void) SysFreeString(str); IXMLHttpRequest_Release(xhr); + + /* invalid host */ + xhr = create_xhr(); + + test_open(xhr, "GET", "http://invalid.host.test.winehq.org/test/path", S_OK); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_send(xhr, varbody); + todo_wine + ok(hr == INET_E_RESOURCE_NOT_FOUND, "send to invalid host returned %#x.\n", hr); + + IXMLHttpRequest_Release(xhr); free_bstrs(); } @@ -1819,6 +1831,18 @@ static void test_server_xhr(void) SysFreeString(response); IServerXMLHTTPRequest_Release(xhr); + + /* invalid host */ + xhr = create_server_xhr(); + + test_server_open(xhr, "GET", "http://invalid.host.test.winehq.org/test/path", S_OK); + + V_VT(&body) = VT_EMPTY; + hr = IServerXMLHTTPRequest_send(xhr, body); + todo_wine + ok(hr == WININET_E_NAME_NOT_RESOLVED, "send to invalid host returned %#x.\n", hr); + + IServerXMLHTTPRequest_Release(xhr); free_bstrs(); }

1 0

Roderick Colenbrander : vulkan-1: Add initial implementation.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: f0f232ebd1628b638b84c78331136a2e6917699a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0f232ebd1628b638b84c783… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:50 2018 -0700 vulkan-1: Add initial implementation. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/vulkan-1/Makefile.in | 7 ++ dlls/vulkan-1/version.rc | 27 ++++++++ dlls/vulkan-1/vulkan-1.spec | 159 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vulkan-1/vulkan.c | 68 +++++++++++++++++++ dlls/winevulkan/make_vulkan | 38 ++++++++++- 7 files changed, 299 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f0f232ebd1628b638b84…

1 0

André Hentschel : dwrite/tests: Use fabs for floating point numbers (clang).
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: 383fbf04cfc52a57869ef94adc307711d1021081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=383fbf04cfc52a57869ef94a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 18:54:47 2018 +0200 dwrite/tests: Use fabs for floating point numbers (clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 347d750..b54748a 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -635,7 +635,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, ok(emsize == metrics.designUnitsPerEm, "Unexpected font size %f\n", emsize); /* Expected height is in design units, allow some absolute difference from it. Seems to only happen on Vista */ - ok(abs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", + ok(fabs(metrics.capHeight - underline->runHeight) < 2.0f, "Expected runHeight %u, got %f, family %s\n", metrics.capHeight, underline->runHeight, wine_dbgstr_w(ctxt->familyW)); IDWriteFontFace_Release(fontface);

1 0

Jacek Caban : msxml3/tests: Added IServerXMLHTTPRequest tests.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: f6b5b31083ce52936837047bcd85bccbe216cac3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6b5b31083ce52936837047b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 18:20:11 2018 +0200 msxml3/tests: Added IServerXMLHTTPRequest tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/httpreq.c | 59 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index 4f51ef9..5149222 100644 --- a/dlls/msxml3/tests/httpreq.c +++ b/dlls/msxml3/tests/httpreq.c @@ -50,6 +50,9 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__, line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); } +static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; +static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; + DEFINE_GUID(SID_SContainerDispatch, 0xb722be00, 0x4e68, 0x101b, 0xa2, 0xbc, 0x00, 0xaa, 0x00, 0x40, 0x47, 0x70); DEFINE_GUID(SID_UnknownSID, 0x75dd09cb, 0x6c40, 0x11d5, 0x85, 0x43, 0x00, 0xc0, 0x4f, 0xa0, 0xfb, 0xa3); @@ -91,6 +94,13 @@ DEFINE_EXPECT(collection_get_length); static int g_unexpectedcall, g_expectedcall; +static int strcmp_wa(const WCHAR *strw, const char *stra) +{ + WCHAR buf[512]; + MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); + return lstrcmpW(strw, buf); +} + static BSTR alloc_str_from_narrow(const char *str) { int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); @@ -1431,14 +1441,26 @@ static void _test_open(unsigned line, IXMLHttpRequest *xhr, const char *method, ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); } +#define test_server_open(a,b,c,d) _test_server_open(__LINE__,a,b,c,d) +static void _test_server_open(unsigned line, IServerXMLHTTPRequest *xhr, const char *method, const char *url, HRESULT exhres) +{ + VARIANT empty, vfalse; + HRESULT hr; + + V_VT(&empty) = VT_EMPTY; + V_VT(&vfalse) = VT_BOOL; + V_BOOL(&vfalse) = VARIANT_FALSE; + + hr = IServerXMLHTTPRequest_open(xhr, _bstr_(method), _bstr_(url), vfalse, empty, empty); + ok_(__FILE__,line)(hr == exhres, "open(%s %s) failed: %08x, expected %08x\n", method, url, hr, exhres); +} + static void test_XMLHTTP(void) { static const char bodyA[] = "mode=Test"; static const char urlA[] = "http://test.winehq.org/tests/post.php"; - static const char xmltestA[] = "http://test.winehq.org/tests/xmltest.xml"; static const char referertesturl[] = "http://test.winehq.org/tests/referer.php"; static const WCHAR wszExpectedResponse[] = {'F','A','I','L','E','D',0}; - static const CHAR xmltestbodyA[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<a>TEST</a>\n"; static const WCHAR norefererW[] = {'n','o',' ','r','e','f','e','r','e','r',' ','s','e','t',0}; IXMLHttpRequest *xhr; @@ -1768,6 +1790,38 @@ static void test_XMLHTTP(void) free_bstrs(); } +static void test_server_xhr(void) +{ + IServerXMLHTTPRequest *xhr; + BSTR response; + VARIANT body; + HRESULT hr; + + /* GET request */ + xhr = create_server_xhr(); + + test_server_open(xhr, "GET", xmltestA, S_OK); + + V_VT(&body) = VT_EMPTY; + + hr = IServerXMLHTTPRequest_send(xhr, body); + if (hr == INET_E_RESOURCE_NOT_FOUND) + { + skip("No connection could be made with test.winehq.org\n"); + IServerXMLHTTPRequest_Release(xhr); + return; + } + ok(hr == S_OK, "send failed: %08x\n", hr); + + hr = IServerXMLHTTPRequest_get_responseText(xhr, &response); + ok(hr == S_OK, "get_responseText failed: %08x\n", hr); + ok(!strcmp_wa(response, xmltestbodyA), "got %s\n", wine_dbgstr_w(response)); + SysFreeString(response); + + IServerXMLHTTPRequest_Release(xhr); + free_bstrs(); +} + static void test_safe_httpreq(void) { IXMLHttpRequest *xhr; @@ -1847,6 +1901,7 @@ START_TEST(httpreq) IXMLHttpRequest_Release(xhr); test_XMLHTTP(); + test_server_xhr(); test_safe_httpreq(); test_supporterrorinfo();

1 0

Roderick Colenbrander : winevulkan: Export symbols for Core Vulkan functions.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: wine Branch: master Commit: dea298413ea2d136b3a354c8619e0cb0ab54441c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea298413ea2d136b3a354c8… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 28 00:20:49 2018 -0700 winevulkan: Export symbols for Core Vulkan functions. Signed-off-by: Roderick Colenbrander <thunderbird2k(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/Makefile.in | 1 + dlls/winevulkan/make_vulkan | 107 ++++++++++++++-- dlls/winevulkan/vulkan.c | 6 +- dlls/winevulkan/vulkan_thunks.c | 268 ++++++++++++++++++++-------------------- dlls/winevulkan/vulkan_thunks.h | 22 ++-- dlls/winevulkan/winevulkan.spec | 158 +++++++++++++++++++++++ 6 files changed, 404 insertions(+), 158 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dea298413ea2d136b3a3…

1 0

Józef Kucia : libs/vkd3d: Handle VK_ERROR_EXTENSION_NOT_PRESENT in hresult_from_vk_result().
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: vkd3d Branch: master Commit: dd461ca6b8228deb2f42001d5ac00a812444bea5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dd461ca6b8228deb2f42001… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:21 2018 +0200 libs/vkd3d: Handle VK_ERROR_EXTENSION_NOT_PRESENT in hresult_from_vk_result(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index eef194e..a62a746 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -347,6 +347,7 @@ HRESULT hresult_from_vk_result(VkResult vr) default: FIXME("Unhandled VkResult %d.\n", vr); case VK_ERROR_DEVICE_LOST: + case VK_ERROR_EXTENSION_NOT_PRESENT: return E_FAIL; } }

1 0