wine-commits March 2018

wine-commits@winehq.org

2 participants
785 discussions

Anton Romanov : wmp: Implement playback via quartz.
by Alexandre Julliard 28 Mar '18

28 Mar '18

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

Michael Müller : ieframe: Return S_OK in IViewObject: :Draw stub.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 6545037efba8f3ee48f2a48747c1528f9afeb914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6545037efba8f3ee48f2a487… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Mar 28 10:41:07 2018 -0500 ieframe: Return S_OK in IViewObject::Draw stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ieframe/view.c b/dlls/ieframe/view.c index 3e44991..546e251 100644 --- a/dlls/ieframe/view.c +++ b/dlls/ieframe/view.c @@ -60,7 +60,7 @@ static HRESULT WINAPI ViewObject_Draw(IViewObject2 *iface, DWORD dwDrawAspect, FIXME("(%p)->(%d %d %p %p %p %p %p %p %p %08lx)\n", This, dwDrawAspect, lindex, pvAspect, ptd, hdcTargetDev, hdcDraw, lprcBounds, lprcWBounds, pfnContinue, dwContinue); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI ViewObject_GetColorSet(IViewObject2 *iface, DWORD dwAspect,

1 0

Alexandre Julliard : urlmon/tests: Update the IP address for the WineHQ server.
by Alexandre Julliard 28 Mar '18

28 Mar '18

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

Alexandre Julliard : user32: Define a few more window messages.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: bb99d51dc4c9e6c620b92287a1cfa46e5a46f002 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb99d51dc4c9e6c620b92287… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 28 20:10:49 2018 +0200 user32: Define a few more window messages. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/spy.c | 35 +++++++++++++++++++++++++++++------ include/winuser.rh | 30 ++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 9fb7307..80bd0a3 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -490,13 +490,30 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_ENTERSIZEMOVE", /* 0x0231 */ "WM_EXITSIZEMOVE", /* 0x0232 */ "WM_DROPFILES", /* 0x0233 */ - "WM_MDIREFRESHMENU", NULL, NULL, NULL, - /* 0x0238*/ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_MDIREFRESHMENU", /* 0x0234 */ + NULL, NULL, NULL, + "WM_POINTERDEVICECHANGE", /* 0x0238 */ + "WM_POINTERDEVICEINRANGE", /* 0x0239 */ + "WM_POINTERDEVICEOUTOFRANGE", /* 0x023a */ + NULL, NULL, NULL, NULL, NULL, /* 0x0240 */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_TOUCH", /* 0x0240 */ + "WM_NCPOINTERUPDATE", /* 0x0241 */ + "WM_NCPOINTERDOWN", /* 0x0242 */ + "WM_NCPOINTERUP", /* 0x0243 */ + NULL, + "WM_POINTERUPDATE", /* 0x0245 */ + "WM_POINTERDOWN", /* 0x0246 */ + "WM_POINTERUP", /* 0x0247 */ + NULL, + "WM_POINTERENTER", /* 0x0249 */ + "WM_POINTERLEAVE", /* 0x024a */ + "WM_POINTERACTIVATE", /* 0x024b */ + "WM_POINTERCAPTURECHANGED", /* 0x024c */ + "WM_TOUCHHITTESTING", /* 0x024d */ + "WM_POINTERWHEEL", /* 0x024e */ + "WM_POINTERHWHEEL", /* 0x024f */ /* 0x0250 */ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -569,7 +586,13 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = "WM_TABLET_FIRST+31", /* 0x02de */ "WM_TABLET_LAST", /* 0x02df */ - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + "WM_DPICHANGED", /* 0x02e0 */ + NULL, + "WM_DPICHANGED_BEFOREPARENT",/* 0x02e2 */ + "WM_DPICHANGED_AFTERPARENT",/* 0x02e3 */ + "WM_GETDPISCALEDSIZE", /* 0x02e4 */ + NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, diff --git a/include/winuser.rh b/include/winuser.rh index 350d427..bcc7160 100644 --- a/include/winuser.rh +++ b/include/winuser.rh @@ -530,8 +530,6 @@ #define WM_MDICASCADE 0x0227 #define WM_MDIICONARRANGE 0x0228 #define WM_MDIGETACTIVE 0x0229 -#define WM_MDISETMENU 0x0230 -#define WM_MDIREFRESHMENU 0x0234 /* D&D messages */ #define WM_DROPOBJECT 0x022A /* DDK / Win16 */ @@ -541,11 +539,34 @@ #define WM_DRAGSELECT 0x022E /* DDK / Win16 */ #define WM_DRAGMOVE 0x022F /* DDK / Win16 */ +#define WM_MDISETMENU 0x0230 #define WM_ENTERSIZEMOVE 0x0231 #define WM_EXITSIZEMOVE 0x0232 #define WM_DROPFILES 0x0233 +#define WM_MDIREFRESHMENU 0x0234 + +#define WM_POINTERDEVICECHANGE 0x0238 +#define WM_POINTERDEVICEINRANGE 0x0239 +#define WM_POINTERDEVICEOUTOFRANGE 0x023a #define WM_TOUCH 0x0240 +#define WM_NCPOINTERUPDATE 0x0241 +#define WM_NCPOINTERDOWN 0x0242 +#define WM_NCPOINTERUP 0x0243 +#define WM_POINTERUPDATE 0x0245 +#define WM_POINTERDOWN 0x0246 +#define WM_POINTERUP 0x0247 +#define WM_POINTERENTER 0x0249 +#define WM_POINTERLEAVE 0x024a +#define WM_POINTERACTIVATE 0x024b +#define WM_POINTERCAPTURECHANGED 0x024c +#define WM_TOUCHHITTESTING 0x024d +#define WM_POINTERWHEEL 0x024e +#define WM_POINTERHWHEEL 0x024f + +#define WM_POINTERROUTEDTO 0x0251 +#define WM_POINTERROUTEDAWAY 0x0252 +#define WM_POINTERROUTEDRELEASED 0x0253 /* Win32 4.0 messages for IME */ #define WM_IME_SETCONTEXT 0x0281 @@ -571,6 +592,11 @@ #define WM_TABLET_FIRST 0x02c0 #define WM_TABLET_LAST 0x02df +#define WM_DPICHANGED 0x02e0 +#define WM_DPICHANGED_BEFOREPARENT 0x02e2 +#define WM_DPICHANGED_AFTERPARENT 0x02e3 +#define WM_GETDPISCALEDSIZE 0x02e4 + /* Clipboard command messages */ #define WM_CUT 0x0300 #define WM_COPY 0x0301

1 0

Alexandre Julliard : winex11: Use more common names for resizing cursors.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 9b2b9d9cb3929b17236cbedac5bb4ad4333e264f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b2b9d9cb3929b17236cbeda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 28 19:37:33 2018 +0200 winex11: Use more common names for resizing cursors. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5ace405..c3ec916 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -832,10 +832,10 @@ static const struct system_cursors user32_cursors[] = { OCR_SIZE, "fleur" }, { OCR_SIZEALL, "fleur" }, { OCR_ICON, "icon" }, - { OCR_SIZENWSE, "nwse-resize" }, - { OCR_SIZENESW, "nesw-resize" }, - { OCR_SIZEWE, "ew-resize" }, - { OCR_SIZENS, "ns-resize" }, + { OCR_SIZENWSE, "top_left_corner" }, + { OCR_SIZENESW, "top_right_corner" }, + { OCR_SIZEWE, "left_side" }, + { OCR_SIZENS, "top_side" }, { OCR_NO, "not-allowed" }, { OCR_HAND, "hand2" }, { OCR_APPSTARTING, "left_ptr_watch" },

1 0

André Hentschel : msvcrt: Accept Czechia as locale name.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 4e5e56c822b6048226fc6a3358f0209e790802bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5e56c822b6048226fc6a33… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 27 19:24:14 2018 +0200 msvcrt: Accept Czechia as locale name. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/locale.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index f87a791..ea42385 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -158,12 +158,14 @@ todo_wine ret = setlocale(LC_ALL, "csy"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "czech"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) - ok(!strcmp(ret, "Czech_Czech Republic.1250"), "ret = %s\n", ret); + ok(!strcmp(ret, "Czech_Czech Republic.1250") + || !strcmp(ret, "Czech_Czechia.1250"), "ret = %s\n", ret); ret = setlocale(LC_ALL, "dan"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n");

1 0

Owen Rudge : wsdapi: Add SequenceId to SOAP header, add test.
by Alexandre Julliard 28 Mar '18

28 Mar '18

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

Owen Rudge : wsdapi: Add InstanceId and MessageNumber to SOAP header.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 5df08c9de48b7c2158c0095da3fbd1731b5d140d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df08c9de48b7c2158c0095d… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:29 2018 +0100 wsdapi: Add InstanceId and MessageNumber to SOAP header. 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 | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/wsdapi/tests/discovery.c | 2 +- 2 files changed, 126 insertions(+), 3 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 2bfb160..06d0129 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -69,6 +69,8 @@ static const WCHAR messageIdString[] = { 'M','e','s','s','a','g','e','I','D', 0 static const WCHAR toString[] = { 'T','o', 0 }; 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 emptyString[] = { 0 }; struct discovered_namespace @@ -318,6 +320,123 @@ static void populate_soap_header(WSD_SOAP_HEADER *header, LPCWSTR to, LPCWSTR ac /* TODO: Implement RelatesTo, ReplyTo, From, FaultTo */ } +#define MAX_ULONGLONG_STRING_SIZE 25 + +static LPWSTR ulonglong_to_string(void *parent, ULONGLONG value) +{ + WCHAR formatString[] = { '%','I','6','4','u', 0 }; + LPWSTR ret; + + ret = WSDAllocateLinkedMemory(parent, MAX_ULONGLONG_STRING_SIZE * sizeof(WCHAR)); + + if (ret == NULL) + return NULL; + + wsprintfW(ret, formatString, value); + return ret; +} + +static WSDXML_ATTRIBUTE *add_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name) +{ + WSDXML_ATTRIBUTE *attribute, *cur_attrib; + WSDXML_NAME *name_obj = NULL; + + if (ns_uri == NULL) + { + name_obj = WSDAllocateLinkedMemory(NULL, sizeof(WSDXML_NAME)); + name_obj->LocalName = duplicate_string(name_obj, name); + name_obj->Space = NULL; + } + else + { + if (FAILED(IWSDXMLContext_AddNameToNamespace(xml_context, ns_uri, name, &name_obj))) + return NULL; + } + + attribute = WSDAllocateLinkedMemory(parent, sizeof(WSDXML_ATTRIBUTE)); + + if (attribute == NULL) + { + WSDFreeLinkedMemory(name_obj); + return NULL; + } + + attribute->Element = parent; + attribute->Name = name_obj; + attribute->Next = NULL; + attribute->Value = NULL; + + if (name_obj != NULL) + WSDAttachLinkedMemory(attribute, name_obj); + + if (parent->FirstAttribute == NULL) + { + /* Make this the first attribute of the parent */ + parent->FirstAttribute = attribute; + } + else + { + /* Find the last attribute and add this as the next one */ + cur_attrib = parent->FirstAttribute; + + while (cur_attrib->Next != NULL) + { + cur_attrib = cur_attrib->Next; + } + + cur_attrib->Next = attribute; + } + + return attribute; +} + +static void remove_attribute(WSDXML_ELEMENT *parent, WSDXML_ATTRIBUTE *attribute) +{ + WSDXML_ATTRIBUTE *cur_attrib; + + /* Find the last attribute and add this as the next one */ + cur_attrib = parent->FirstAttribute; + + if (cur_attrib == attribute) + parent->FirstAttribute = cur_attrib->Next; + else + { + while (cur_attrib != NULL) + { + /* Is our attribute the next attribute? */ + if (cur_attrib->Next == attribute) + { + /* Remove it from the list */ + cur_attrib->Next = attribute->Next; + break; + } + + cur_attrib = cur_attrib->Next; + } + } + + WSDFreeLinkedMemory(attribute); +} + +static BOOL add_ulonglong_attribute(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, LPCWSTR name, + ULONGLONG value) +{ + WSDXML_ATTRIBUTE *attribute = add_attribute(xml_context, parent, ns_uri, name); + + if (attribute == NULL) + return FALSE; + + attribute->Value = ulonglong_to_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; @@ -376,9 +495,13 @@ static WSDXML_ELEMENT *create_soap_header_xml_elements(IWSDXMLContext *xml_conte app_sequence_element = add_child_element(xml_context, header_element, discoveryNsUri, appSequenceString, emptyString); if (app_sequence_element == NULL) goto cleanup; - /* TODO: InstanceId attribute */ + /* InstanceId attribute */ + if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, instanceIdString, min(UINT_MAX, + header->AppSequence->InstanceId))) goto cleanup; - /* TODO: MessageNumber attribute */ + /* MessageNumber attribute */ + if (!add_ulonglong_attribute(xml_context, app_sequence_element, NULL, messageNumberString, min(UINT_MAX, + header->AppSequence->MessageNumber))) goto cleanup; /* TODO: SequenceID attribute */ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 30f90a5..1fa96b7 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -614,7 +614,7 @@ static void Publish_tests(void) ok(hello_message_seen == TRUE, "Hello message not received\n"); todo_wine ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); - todo_wine ok(app_sequence_seen == TRUE, "AppSequence not received\n"); + ok(app_sequence_seen == TRUE, "AppSequence not received\n"); todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n");

1 0

Owen Rudge : wsdapi/tests: Add tests for EndpointReference, AppSequence, MetadataVersion in Hello message.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: 14466ec6c2b5c07ffd946236c78a63e7575a7684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14466ec6c2b5c07ffd946236… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:22 2018 +0100 wsdapi/tests: Add tests for EndpointReference, AppSequence, MetadataVersion in Hello message. 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/tests/discovery.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index 563c33c..30f90a5 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -505,8 +505,8 @@ static void Publish_tests(void) LPWSTR publisherIdW = NULL; messageStorage *msgStorage; WSADATA wsaData; - BOOL messageOK; - BOOL hello_message_seen = FALSE; + BOOL messageOK, hello_message_seen = FALSE, endpoint_reference_seen = FALSE, app_sequence_seen = FALSE; + BOOL metadata_version_seen = FALSE; int ret, i; HRESULT rc; ULONG ref; @@ -597,9 +597,10 @@ static void Publish_tests(void) messageOK = FALSE; hello_message_seen = (strstr(msg, "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Hello</wsa:Action>") != NULL); - messageOK = hello_message_seen && (strstr(msg, endpointReferenceString) != NULL); - messageOK = messageOK && (strstr(msg, "<wsd:AppSequence InstanceId=\"1\" MessageNumber=\"1\"></wsd:AppSequence>") != NULL); - messageOK = messageOK && (strstr(msg, "<wsd:MetadataVersion>1</wsd:MetadataVersion>") != NULL); + endpoint_reference_seen = (strstr(msg, endpointReferenceString) != NULL); + app_sequence_seen = (strstr(msg, "<wsd:AppSequence InstanceId=\"1\" MessageNumber=\"1\"></wsd:AppSequence>") != 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; if (messageOK) break; } @@ -612,6 +613,9 @@ static void Publish_tests(void) heap_free(msgStorage); ok(hello_message_seen == TRUE, "Hello message not received\n"); + todo_wine ok(endpoint_reference_seen == TRUE, "EndpointReference not received\n"); + todo_wine ok(app_sequence_seen == TRUE, "AppSequence not received\n"); + todo_wine ok(metadata_version_seen == TRUE, "MetadataVersion not received\n"); todo_wine ok(messageOK == TRUE, "Hello message metadata not received\n"); after_publish_test:

1 0

Owen Rudge : wsdapi: Add support for writing XML attributes.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: wine Branch: master Commit: feee5ad96d0a08e096d46ee5316e875dc49c43a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feee5ad96d0a08e096d46ee5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Tue Mar 27 21:30:17 2018 +0100 wsdapi: Add support for writing XML attributes. 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 | 82 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/wsdapi/soap.c b/dlls/wsdapi/soap.c index 40edd15..2bfb160 100644 --- a/dlls/wsdapi/soap.c +++ b/dlls/wsdapi/soap.c @@ -130,18 +130,71 @@ static inline void free_xml_string(WS_XML_STRING *value) heap_free(value); } -static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) +static HRESULT write_xml_attribute(WSDXML_ATTRIBUTE *attribute, WS_XML_WRITER *writer) { WS_XML_STRING *local_name = NULL, *element_ns = NULL, *ns_prefix = NULL; WS_XML_UTF16_TEXT utf16_text; + HRESULT ret = E_OUTOFMEMORY; + int text_len; + + if (attribute == NULL) + return S_OK; + + /* Start the attribute */ + local_name = populate_xml_string(attribute->Name->LocalName); + if (local_name == NULL) goto cleanup; + + if (attribute->Name->Space == NULL) + { + element_ns = populate_xml_string(emptyString); + if (element_ns == NULL) goto cleanup; + + ns_prefix = NULL; + } + else + { + element_ns = populate_xml_string(attribute->Name->Space->Uri); + if (element_ns == NULL) goto cleanup; + + ns_prefix = populate_xml_string(attribute->Name->Space->PreferredPrefix); + if (ns_prefix == NULL) goto cleanup; + } + + ret = WsWriteStartAttribute(writer, ns_prefix, local_name, element_ns, FALSE, NULL); + if (FAILED(ret)) goto cleanup; + + text_len = lstrlenW(attribute->Value); + + utf16_text.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16_text.bytes = (BYTE *)attribute->Value; + utf16_text.byteCount = min(WSD_MAX_TEXT_LENGTH, text_len) * sizeof(WCHAR); + + ret = WsWriteText(writer, (WS_XML_TEXT *)&utf16_text, NULL); + if (FAILED(ret)) goto cleanup; + + ret = WsWriteEndAttribute(writer, NULL); + if (FAILED(ret)) goto cleanup; + +cleanup: + free_xml_string(local_name); + free_xml_string(element_ns); + free_xml_string(ns_prefix); + + return ret; +} + +static HRESULT write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) +{ + WS_XML_STRING *local_name = NULL, *element_ns = NULL, *ns_prefix = NULL; + WSDXML_ATTRIBUTE *current_attribute; + WS_XML_UTF16_TEXT utf16_text; WSDXML_NODE *current_child; WSDXML_TEXT *node_as_text; - BOOL retVal = FALSE; int text_len; - HRESULT ret; + HRESULT ret = E_OUTOFMEMORY; if (element == NULL) - return TRUE; + return S_OK; /* Start the element */ local_name = populate_xml_string(element->Name->LocalName); @@ -156,7 +209,15 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) ret = WsWriteStartElement(writer, ns_prefix, local_name, element_ns, NULL); if (FAILED(ret)) goto cleanup; - /* TODO: Write attributes */ + /* Write attributes */ + current_attribute = element->FirstAttribute; + + while (current_attribute != NULL) + { + ret = write_xml_attribute(current_attribute, writer); + if (FAILED(ret)) goto cleanup; + current_attribute = current_attribute->Next; + } /* Write child elements */ current_child = element->FirstChild; @@ -165,7 +226,8 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) { if (current_child->Type == ElementType) { - if (!write_xml_element((WSDXML_ELEMENT *)current_child, writer)) goto cleanup; + ret = write_xml_element((WSDXML_ELEMENT *)current_child, writer); + if (FAILED(ret)) goto cleanup; } else if (current_child->Type == TextType) { @@ -185,16 +247,13 @@ static BOOL write_xml_element(WSDXML_ELEMENT *element, WS_XML_WRITER *writer) /* End the element */ ret = WsWriteEndElement(writer, NULL); - if (FAILED(ret)) goto cleanup; - - retVal = TRUE; cleanup: free_xml_string(local_name); free_xml_string(element_ns); free_xml_string(ns_prefix); - return retVal; + return ret; } static WSDXML_ELEMENT *add_child_element(IWSDXMLContext *xml_context, WSDXML_ELEMENT *parent, LPCWSTR ns_uri, @@ -410,7 +469,8 @@ static HRESULT create_soap_envelope(IWSDXMLContext *xml_context, WSD_SOAP_HEADER tmp_uri = NULL; /* Write the header */ - if (!write_xml_element(header_element, writer)) goto cleanup; + ret = write_xml_element(header_element, writer); + if (FAILED(ret)) goto cleanup; ret = WsWriteEndElement(writer, NULL); if (FAILED(ret)) goto cleanup;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2018