June 2018 - Wine-Devel - list.winehq.org

[PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message. [v2]

by Owen Rudge

v2: Fix missing string null terminator. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

June 19, 2018

[PATCH 1/2] wsdapi: Add support for parsing AppSequence header. [v2]

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-)

June 19, 2018

Re: [PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Owen Rudge

> This is failing for me: Ah, think I missed a null character off the wide GUID string - I expect it'll be that. Thanks for letting me know. Owen

June 19, 2018

Re: [PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Huw Davies

On Mon, Jun 18, 2018 at 10:41:55PM +0100, Owen Rudge wrote: > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > --- > dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > > > diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c > index 84aa67d663..13b6de0b34 100644 > --- a/dlls/wsdapi/tests/discovery.c > +++ b/dlls/wsdapi/tests/discovery.c > @@ -48,6 +48,7 @@ static const char testProbeMessage[] = "<?xml version=\"1.0\" encoding=\"utf-8\" > "xmlns:grog=\"http://more.tests/\"><soap:Header><wsa:To>urn:schemas-xmlsoap-org:ws:2005:04:discovery</wsa:To>" > "<wsa:Action>http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe</wsa:Action>" > "<wsa:MessageID>urn:uuid:%s</wsa:MessageID>" > + "<wsd:AppSequence InstanceId=\"21\" SequenceId=\"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2\" MessageNumber=\"14\"></wsd:AppSequence>" > "<grog:Perry>ExtraInfo</grog:Perry></soap:Header>" > "<soap:Body><wsd:Probe><wsd:Types>grog:Cider</wsd:Types><grog:Lager>MoreInfo</grog:Lager></wsd:Probe></soap:Body></soap:Envelope>"; > > @@ -533,6 +534,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP > static const WCHAR perry[] = {'P','e','r','r','y',0}; > static const WCHAR extra_info[] = {'E','x','t','r','a','I','n','f','o',0}; > WSD_PROBE *probe_msg = (WSD_PROBE *) pSoap->Body; > + WSD_APP_SEQUENCE *appseq = (WSD_APP_SEQUENCE *) pSoap->Header.AppSequence; > > ok(pSoap->Body != NULL, "pSoap->Body == NULL\n"); > ok(pSoap->Header.To != NULL && lstrcmpW(pSoap->Header.To, discoveryTo) == 0, > @@ -556,6 +558,22 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP > if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; > } > > + ok(appseq != NULL, "pSoap->Header.AppSequence == NULL\n"); > + > + if (appseq != NULL) > + { > + static const WCHAR seq_id[] = {'u','r','n',':','u','u','i','d',':','6','3','8','a','b','e','e','8','-', > + '1','2','4','d','-','4','b','6','a','-','8','b','8','5','-', > + '8','c','f','2','8','3','7','a','2','f','d','2'}; > + > + ok(appseq->InstanceId == 21, "pSoap->Header.AppSequence->InstanceId = %s\n", > + wine_dbgstr_longlong(appseq->InstanceId)); > + ok(lstrcmpW(appseq->SequenceId, seq_id) == 0, "pSoap->Header.AppSequence->SequenceId = '%s'\n", > + wine_dbgstr_w(appseq->SequenceId)); > + ok(appseq->MessageNumber == 14, "pSoap->Header.AppSequence->MessageNumber = %s\n", > + wine_dbgstr_longlong(appseq->MessageNumber)); > + } > + > verify_wsdxml_any_text("pSoap->Header.AnyHeaders", pSoap->Header.AnyHeaders, uri_more_tests_no_slash, > prefix_grog, perry, extra_info); > > This is failing for me: ../../../tools/runtest -q -P wine -T ../../.. -M wsdapi.dll -p wsdapi_test.exe.so discovery && touch discovery.ok 0009:fixme:hnetcfg:fw_profile_get_FirewallEnabled 0x164100, 0x32fcd2 0009:fixme:winsock:set_dont_fragment IP_DONTFRAGMENT for IPv4 not supported in this platform 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0034:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0037:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 0038:fixme:webservices:WsReadToStartElement name and/or namespace not verified discovery.c:571: Test failed: pSoap->Header.AppSequence->SequenceId = 'L"urn:uuid:638abee8-124d-4b6a-8b85-8cf2837a2fd2"' 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0049:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified 0046:fixme:webservices:WsReadToStartElement name and/or namespace not verified 004a:fixme:webservices:WsReadToStartElement name and/or namespace not verified make: *** [Makefile:225: discovery.ok] Error 4

June 19, 2018

[PATCH 2/2] wsdapi/tests: Add tests for AppSequence in Probe message.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

June 18, 2018

[PATCH 1/2] wsdapi: Add support for parsing AppSequence header.

by Owen Rudge

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-)

June 18, 2018

Status of Bug 35902

by Farmboy0

Hello everyone, I was wondering what the holdup with the staging patchset for Bug 35902 is. Is there anything to be left done in order to integrate the patches into wine? Regards Farmboy0

June 18, 2018

[PATCH 4/4] msi: Add ProductToBeRegistered property tests

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/package.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

June 18, 2018

[PATCH 3/4] msi: Add REINSTALLMODE=v installation mode test

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/tests/package.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-)

June 18, 2018

[PATCH 2/4] msi: Re-publish product if previous installation with different package is detected

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msi/action.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 7 deletions(-)

June 18, 2018