April 2017 - Wine-commits - list.winehq.org

Julian Rüger : Update German translation of the About page
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 59d85792ac4290c1d9d82421682e08f4063c41c2 URL: http://source.winehq.org/git/website.git/?a=commit;h=59d85792ac4290c1d9d824… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 18:29:53 2017 +0200 Update German translation of the About page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Proofreading is welcome! Please report any typos or comments to me. :) Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/about.template | 76 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/templates/de/about.template b/templates/de/about.template index be369dc..a70cc54 100644 --- a/templates/de/about.template +++ b/templates/de/about.template @@ -1,22 +1,76 @@  - <h1 class="title">Über Wine</h1> -<p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> +<p>Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine +Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter +einigen POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, +macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle +Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in +Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die +Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. +Wine erlaubt es auf diese Weise, Windows-Anwendung sauber in Ihre +Desktopumgebung zu integrieren.</p> -<p>Wine wird aktiv weiterentwickelt. Noch läuft nicht jedes Programm, aber <a href="https://wiki.winehq.org/UsageStatistics" title="Statistik zur Wine-Benutzung">mehrere Millionen Anwender (en)</a> nutzen Wine, um ihre Programme zu verwenden.</p> +<p>Das Projekt begann 1993, unter der anfänglichen Koordinierung durch Bob Amstadt, +eine Möglichkeit zu entwickeln, Windows 3.1-Programme unter Linux auszuführen. +Schon recht früh übernahm Alexandre Julliard die Projektleitung, welcher die +Wine-Entwicklung bis heute anführt. Über die Jahre haben sich die Windows-API +und Anwendungen weiterentwickelt, um Möglichkeiten neuer Hard- und Software +zu nutzen. Wine wurde fortwährend angepasst, um neue Funktionen zu unterstützen, +auf anderen Betriebsystemen lauffähig zu sein, stabiler zu werden und ein besseres +Nutzungserlebnis zu bieten.</p> -<h3>Durch Open Source und Benutzer getrieben</h3> +<p>Obgleich es per Definition bereits ein sehr ambitioniertes Projekt war, +schritt die Entwicklung von Wine im Laufe von 15 Jahren stetig voran, um im Jahre 2008 +endlich Version 1.0 zu erreichen, das erste stabile Release. Einige Jahre später +befindet sich Wine heute weiterhin unter aktiver Entwicklung. Auch wenn es noch einiges +zu tun gibt, benutzen schätzungsweise bereits +<a href="https://wiki.winehq.org/UsageStatistics" title="Wine Usage +Statistics">Millionen von Menschen</a> Wine, um Windows-Software auf dem Betriebsystem +ihrer Wahl auszuführen.</p> -<p>Wine wird immer <a href="https://wiki.winehq.org/Licensing" title="Wine-Lizensierung">Freie Software (en)</a> sein. Ungefähr die Hälfte des Quellcodes von Wine wird von Freiwilligen geschrieben. Der Rest wird von Firmen gesponsort, insbesondere <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers (en)</a>, die eine eigene Version von Wine mit Support verkaufen.</p> +<h3>Open-Source und gelenkt durch seine Benutzer</h3> -<p>Wine ist stark von seinen Anwendern abhängig. Tests von Anwendern füllen unsere <a href="//appdb.winehq.org/" title="Wine Anwendungsdatenbank">Anwendungsdatenbank (en)</a> um verfolgen zu können, wie gut einzelne Programme funktionieren, und sämtliche Antworten in den <a href="//forums.winehq.org/" title="WineHQ Foren">Foren (en)</a> kommen von Freiwilligen.</p> +<p>Wine wird immer <a href="//www.winehq.org/license" +title="Wine licensing">freie Software</a> sein. Ungefähr die Hälfte des +Quelltextes stammt von freiwilligen Entwicklern, während die übrige Arbeit durch +kommerzielle Interessen erbracht wird, insbesondere von +<a href="http://www.codeweavers.com/products/" title="CodeWeavers +CrossOver Office">CodeWeavers</a>, welche eine bezahlte Version von Wine mit +professionellem Support anbieten.</p> + +<p>Wine ist sehr auf seine Nutzergemeinschaft angewiesen. Anwender verbringen ihre +Freizeit damit, Tipps und Testergebnisse zu teilen, um in unserer +<a href="//appdb.winehq.org/" title="Wine Application +Database">Applikations-Datenbank</a> zu dokumentieren, wie gut ihre Software läuft, +Fehlerberichte in unserem <a href="//bugs.winehq.org/"title="Bugzilla">Bugtracker</a> +zu erstellen, um Entwickler auf Probleme hinzuweisen und Fragen in unseren +<a href="//forums.winehq.org/" title="WineHQ Forums">Foren</a> zu beantworten. +</p> + +<h3>Erfahren Sie mehr:</h3> + +<p><i>(Etliche der folgenden Seiten werden momentan überarbeitet und +sind daher unter Umständen nicht aktuell)</i></p> -<h3>Erfahre mehr:</h3> <ul> - <li><a href="https://wiki.winehq.org/ImportanceOfWine">Warum Wine so wichtig ist (en)</a></li> - <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Wine-Mythen aufgedeckt (en)</a></li> - <li><a href="https://wiki.winehq.org/WineHistory">Geschichte des Wine-Projekts (en)</a></li> - <li><a href="https://wiki.winehq.org/ProjectOrganization">Organisation und Leitung (en)</a></li> + <li><a href="https://wiki.winehq.org/ImportanceOfWine">Warum Wine so + wichtig ist (en)</a> + </li> + <li><a href="https://wiki.winehq.org/Debunking_Wine_Myths">Häufige + Mythen über Wine aufgedeckt (en)</a> + </li> + <li><a href="https://wiki.winehq.org/WineHistory">Geschichte des + Wine-Projekts (en)</a> + </li> + <li><a href="https://wiki.winehq.org/ProjectOrganization"> + Organisation und Leitung (en)</a> + </li> + <li><a href="https://wiki.winehq.org/WhosWho">Kurzbiografien einiger + Beitragenden (en)</a> + </li> + <li><a href="https://wiki.winehq.org/Acknowledgements">Andere + Anerkennungen (en)</a> + </li> </ul>

1 0

Julian Rüger : Update German translation of the main page
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 10d580435d88111789090e0e94b49bf55048c0f4 URL: http://source.winehq.org/git/website.git/?a=commit;h=10d580435d88111789090e… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri Apr 28 19:01:14 2017 +0200 Update German translation of the main page Signed-off-by: Julian Rüger <jr98(a)gmx.net> Again, any comments appreciated! Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/de/home.template | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/de/home.template b/templates/de/home.template index d78412c..92a42d3 100644 --- a/templates/de/home.template +++ b/templates/de/home.template @@ -1,14 +1,14 @@  - +  - +  <div class="row"> <div class="col-sm-7"> <div class="whq-page-container margin-bottom-md"> - <h3 class="title">Aktuellste Versionen</h3> + <h3 class="title">Aktuelle Versionen</h3> <div class="row"> <div class="col-sm-4 col-md-3">Stabile Version:</div> <div class="col-sm-8"> @@ -35,12 +35,12 @@ <a class="winehq_menu_item info nomargin" href="{$root}/about"> <span class="icon"></span> <span class="title">Über</span> - <span class="subtitle">Erfahre mehr über das Wine-Projekt.</span> + <span class="subtitle">Erfahren Sie mehr über das Wine-Projekt.</span> </a> <div class="clear"></div> </div> - <p>Wine ermöglicht es, Windows-Programme unter anderen Betriebssystemen laufen zu lassen. Mit Wine kannst Du diese Programme genauso installieren und laufen lassen, wie unter Windows.</p> + <p>Wine (ursprünglich ein Akronym für "Wine Is Not an Emulator") ist eine Kompatibilitätsschicht, die es ermöglicht, Windows-Anwendungen unter POSIX-konformen Betriebssystemen auszuführen, wie z.B. Linux, macOS und BSD. Statt interne Windows-Logik zu simulieren, wie eine virtuelle Maschine oder ein Emulator, übersetzt Wine die Windows-API-Aufrufe in Echtzeit zu entsprechenden POSIX-Aufrufen und eliminiert somit die Performance- und Speichereinbußen, die andere Methoden nach sich ziehen. Wine erlaubt es auf diese Weise, Windows-Anwendungen sauber in Ihre Desktopumgebung zu integrieren.</p> </div> @@ -52,7 +52,7 @@ <a class="winehq_menu_item dl" href="{$root}/download"> <span class="icon"></span> <span class="title">Download</span> - <span class="subtitle">Installiere die aktuellste Wine-Version.</span> + <span class="subtitle">Installieren Sie die neueste Wine-Version.</span> </a> <div class="clear"></div> @@ -65,15 +65,15 @@ <a class="winehq_menu_item devel" href="{$root}/getinvolved"> <span class="icon"></span> - <span class="title">Entwicklung</span> - <span class="subtitle">Werde ein Wine-Entwickler.</span> + <span class="title">Helfen Sie mit</span> + <span class="subtitle">Werden Sie ein Teil unserer Gemeinschaft.</span> </a> <div class="clear"></div> <a class="winehq_menu_item donate" href="{$root}/donate"> <span class="icon"></span> <span class="title">Spenden</span> - <span class="subtitle">Spende dem Wine-Projekt.</span> + <span class="subtitle">An das Wine-Projekt spenden.</span> </a> <div class="clear"></div>

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 2e66ba32208a59e70bb7b68161dbfe4c9c679672 URL: http://source.winehq.org/git/website.git/?a=commit;h=2e66ba32208a59e70bb7b6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Apr 28 13:37:19 2017 -0500 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Alexandre Julliard : Wine release 2.7
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: website Branch: master Commit: 504e88f92190a16fdb6d9761f01b0990bba8c3de URL: http://source.winehq.org/git/website.git/?a=commit;h=504e88f92190a16fdb6d97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 19:44:40 2017 +0200 Wine release 2.7 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017042801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017042801.xml b/news/en/2017042801.xml new file mode 100644 index 0000000..dff3b76 --- /dev/null +++ b/news/en/2017042801.xml @@ -0,0 +1,18 @@ +<news> +<date>April 28, 2017</date> +<title>Wine 2.7 Released</title> +<body> +<p> The Wine development release 2.7 is now available.</p> +<p> <a href="{$root}/announce/2.7">What's new</a> in this release: +<ul> + <li>TCP and UDP connection support in WebServices.</li> + <li>Various shader improvements for Direct3D 11.</li> + <li>Improved support for high DPI settings.</li> + <li>Partial reimplementation of the GLU library.</li> + <li>Support for recent versions of OSMesa.</li> + <li>Window management improvements on macOS.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.7.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Alexandre Julliard : configure: Add a separate variable for wineloader-specific flags.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 655e5e8c70c361d43a644fb3fe3b24fd3064d092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e5e8c70c361d43a644fb3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 28 11:57:05 2017 +0200 configure: Add a separate variable for wineloader-specific flags. And apply the common link flags also to the wineserver. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 22 ++++++++++++---------- configure.ac | 20 ++++++++++---------- loader/Makefile.in | 4 ++-- server/Makefile.in | 2 +- 5 files changed, 26 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=655e5e8c70c361d43a644…

1 0

Hans Leidekker : webservices: Support appending text with multiple WsWriteText calls.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 40b5dc95412f99bfd0322a52ee2c8d2b76a44d5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b5dc95412f99bfd0322a52e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:46 2017 +0200 webservices: Support appending text with multiple WsWriteText calls. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 175 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 130 ++++++++++++++++++++++------- 2 files changed, 276 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b5dc95412f99bfd0322…

1 0

Hans Leidekker : webservices: Implement WsWriteQualifiedName.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 992da703397758445f4190f24dfa2c2ea684fb60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=992da703397758445f4190f24… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:47 2017 +0200 webservices: Implement WsWriteQualifiedName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 79 ++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 84 +++++++++++++++++++++++++++++++++++++++ include/webservices.h | 2 + 4 files changed, 166 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8cd9762..3d01245 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3036,6 +3036,84 @@ static void test_repeating_element(void) WsFreeWriter( writer ); } +static const WS_XML_STRING *init_xmlstring( const char *src, WS_XML_STRING *str ) +{ + if (!src) return NULL; + str->length = strlen( src ); + str->bytes = (BYTE *)src; + return str; +} + +static void test_WsWriteQualifiedName(void) +{ + WS_XML_STRING prefix = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, ns = {2, (BYTE *)"ns"}; + WS_XML_WRITER *writer; + HRESULT hr; + ULONG i; + static const struct + { + const char *prefix; + const char *localname; + const char *ns; + HRESULT hr; + const char *result; + } tests[] = + { + { NULL, NULL, NULL, E_INVALIDARG, NULL }, + { NULL, "t2", NULL, E_INVALIDARG, NULL }, + { "p2", "t2", NULL, S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { NULL, "t2", "ns2", WS_E_INVALID_FORMAT, NULL }, + { NULL, "t2", "ns", S_OK, "<p:t xmlns:p=\"ns\">p:t2" }, + { "p2", "t2", "ns2", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "p2", "t2", "ns", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "p", "t", NULL, S_OK, "<p:t xmlns:p=\"ns\">p:t" }, + { NULL, "t", "ns", S_OK, "<p:t xmlns:p=\"ns\">p:t" }, + { "p2", "", "", S_OK, "<p:t xmlns:p=\"ns\">p2:" }, + { "p2", "", "ns2", S_OK, "<p:t xmlns:p=\"ns\">p2:" }, + { "p2", "t2", "", S_OK, "<p:t xmlns:p=\"ns\">p2:t2" }, + { "", "t2", "", S_OK, "<p:t xmlns:p=\"ns\">t2" }, + { "", "", "ns2", S_OK, "<p:t xmlns:p=\"ns\">" }, + { "", "", "", S_OK, "<p:t xmlns:p=\"ns\">" }, + }; + + hr = WsWriteQualifiedName( NULL, NULL, NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteQualifiedName( writer, NULL, NULL, NULL, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + WS_XML_STRING prefix2, localname2, ns2; + const WS_XML_STRING *prefix_ptr, *localname_ptr, *ns_ptr; + + hr = set_output( writer ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + prefix_ptr = init_xmlstring( tests[i].prefix, &prefix2 ); + localname_ptr = init_xmlstring( tests[i].localname, &localname2 ); + ns_ptr = init_xmlstring( tests[i].ns, &ns2 ); + + hr = WsWriteQualifiedName( writer, prefix_ptr, localname_ptr, ns_ptr, NULL ); + ok( hr == tests[i].hr, "%u: got %08x\n", i, hr ); + if (tests[i].hr == S_OK && hr == S_OK) check_output( writer, tests[i].result, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3069,4 +3147,5 @@ START_TEST(writer) test_write_option(); test_datetime(); test_repeating_element(); + test_WsWriteQualifiedName(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index aa9b58f..e63b805 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -180,7 +180,7 @@ @ stdcall WsWriteMessageEnd(ptr ptr ptr ptr) @ stdcall WsWriteMessageStart(ptr ptr ptr ptr) @ stdcall WsWriteNode(ptr ptr ptr) -@ stub WsWriteQualifiedName +@ stdcall WsWriteQualifiedName(ptr ptr ptr ptr ptr) @ stdcall WsWriteStartAttribute(ptr ptr ptr ptr long ptr) @ stdcall WsWriteStartCData(ptr ptr) @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4c9f1a9..4fd1126 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2800,6 +2800,90 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING return hr; } +static HRESULT find_prefix( struct writer *writer, const WS_XML_STRING *ns, const WS_XML_STRING **prefix ) +{ + const struct node *node; + for (node = writer->current; node_type( node ) == WS_XML_NODE_TYPE_ELEMENT; node = node->parent) + { + const WS_XML_ELEMENT_NODE *elem = &node->hdr; + ULONG i; + for (i = 0; i < elem->attributeCount; i++) + { + if (!elem->attributes[i]->isXmlNs) continue; + if (WsXmlStringEquals( elem->attributes[i]->ns, ns, NULL ) != S_OK) continue; + *prefix = elem->attributes[i]->prefix; + return S_OK; + } + } + return WS_E_INVALID_FORMAT; +} + +static HRESULT write_qualified_name( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) +{ + HRESULT hr; + if (prefix->length) + { + if ((hr = write_grow_buffer( writer, prefix->length + localname->length + 1 )) != S_OK) return hr; + write_bytes( writer, prefix->bytes, prefix->length ); + write_char( writer, ':' ); + } + else if ((hr = write_grow_buffer( writer, localname->length )) != S_OK) return hr; + write_bytes( writer, localname->bytes, localname->length ); + return S_OK; +} + +/************************************************************************** + * WsWriteQualifiedName [webservices.@] + */ +HRESULT WINAPI WsWriteQualifiedName( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %s %s %s %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), + debugstr_xmlstr(ns), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + if (writer->state != WRITER_STATE_STARTELEMENT) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_FORMAT; + } + + if (!localname || (!prefix && !ns)) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if ((hr = write_flush( writer )) != S_OK) goto done; + if (!prefix && ((hr = find_prefix( writer, ns, &prefix )) != S_OK)) goto done; + hr = write_qualified_name( writer, prefix, localname ); + +done: + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_move_to( struct writer *writer, WS_MOVE_TO move, BOOL *found ) { BOOL success = FALSE; diff --git a/include/webservices.h b/include/webservices.h index 783a6ae..a0857f6 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1675,6 +1675,8 @@ HRESULT WINAPI WsWriteEnvelopeStart(WS_MESSAGE*, WS_XML_WRITER*, WS_MESSAGE_DONE HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteNode(WS_XML_WRITER*, const WS_XML_NODE*, WS_ERROR*); +HRESULT WINAPI WsWriteQualifiedName(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, + const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); HRESULT WINAPI WsWriteStartCData(WS_XML_WRITER*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Implement WsReadQualifiedName.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: e61291479f9f5a3c85c8ce130c966d9e09b61d83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e61291479f9f5a3c85c8ce130… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:48 2017 +0200 webservices: Implement WsReadQualifiedName. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 158 +++++++++++++++++++++++++++++++++++--- dlls/webservices/tests/reader.c | 112 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 2 + 4 files changed, 262 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e61291479f9f5a3c85c8c…

1 0

Hans Leidekker : webservices: Implement WsWriteBytes.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 86738d095df8d4a28e46cb115787e2eba7bf48f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86738d095df8d4a28e46cb115… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:49 2017 +0200 webservices: Implement WsWriteBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 68 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 40 +++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 3d01245..d53cb13 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3114,6 +3114,73 @@ static void test_WsWriteQualifiedName(void) WsFreeWriter( writer ); } +static void test_WsWriteBytes(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsWriteBytes( NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, NULL, 1, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* element */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>dGVzdAA=</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* attribute */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteBytes( writer, "test", sizeof("test"), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t a=\"dGVzdAA=\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3148,4 +3215,5 @@ START_TEST(writer) test_datetime(); test_repeating_element(); test_WsWriteQualifiedName(); + test_WsWriteBytes(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 1ef8aae..304e917 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -167,7 +167,7 @@ @ stdcall WsWriteArray(ptr ptr ptr long ptr long long long ptr) @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stdcall WsWriteBody(ptr ptr long ptr long ptr) -@ stub WsWriteBytes +@ stdcall WsWriteBytes(ptr ptr long ptr) @ stub WsWriteChars @ stub WsWriteCharsUtf8 @ stdcall WsWriteElement(ptr ptr long ptr long ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4fd1126..059acb0 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1697,6 +1697,7 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E HRESULT hr; TRACE( "%p %p %p\n", handle, text, error ); + if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !text) return E_INVALIDARG; @@ -1715,6 +1716,45 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E return hr; } +/************************************************************************** + * WsWriteBytes [webservices.@] + */ +HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_BASE64_TEXT base64; + HRESULT hr; + + TRACE( "%p %p %u %p\n", handle, bytes, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + base64.text.textType = WS_XML_TEXT_TYPE_BASE64; + base64.bytes = (BYTE *)bytes; + base64.length = count; + + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &base64.text ); + else hr = write_text_node( writer, &base64.text ); + + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_type_text( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_XML_TEXT *text ) { switch (mapping)

1 0

Hans Leidekker : webservices: Implement WsWriteChars.
by Alexandre Julliard 28 Apr '17

28 Apr '17

Module: wine Branch: master Commit: 1e187771da7dbadc8a89787b569da8ca735a28d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e187771da7dbadc8a89787b5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 28 12:12:50 2017 +0200 webservices: Implement WsWriteChars. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 75 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 39 ++++++++++++++++++++ include/webservices.h | 1 + 4 files changed, 116 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index d53cb13..d0e5dee 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3181,6 +3181,80 @@ static void test_WsWriteBytes(void) WsFreeWriter( writer ); } +static void test_WsWriteChars(void) +{ + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}, ns = {0, NULL}; + static const WCHAR testW[] = {'t','e','s','t'}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsWriteChars( NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, NULL, 1, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* element */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>testtest</t>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* attribute */ + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteChars( writer, testW, 4, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t a=\"testtest\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3216,4 +3290,5 @@ START_TEST(writer) test_repeating_element(); test_WsWriteQualifiedName(); test_WsWriteBytes(); + test_WsWriteChars(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 304e917..dbed698 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -168,7 +168,7 @@ @ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stdcall WsWriteBody(ptr ptr long ptr long ptr) @ stdcall WsWriteBytes(ptr ptr long ptr) -@ stub WsWriteChars +@ stdcall WsWriteChars(ptr ptr long ptr) @ stub WsWriteCharsUtf8 @ stdcall WsWriteElement(ptr ptr long ptr long ptr) @ stdcall WsWriteEndAttribute(ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 059acb0..f094885 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1755,6 +1755,45 @@ HRESULT WINAPI WsWriteBytes( WS_XML_WRITER *handle, const void *bytes, ULONG cou return hr; } +/************************************************************************** + * WsWriteChars [webservices.@] + */ +HRESULT WINAPI WsWriteChars( WS_XML_WRITER *handle, const WCHAR *chars, ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_UTF16_TEXT utf16; + HRESULT hr; + + TRACE( "%p %s %u %p\n", handle, debugstr_wn(chars, count), count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; + } + + if (!writer->output_type) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + utf16.text.textType = WS_XML_TEXT_TYPE_UTF16; + utf16.bytes = (BYTE *)chars; + utf16.byteCount = count * sizeof(WCHAR); + + if (writer->state == WRITER_STATE_STARTATTRIBUTE) hr = write_set_attribute_value( writer, &utf16.text ); + else hr = write_text_node( writer, &utf16.text ); + + LeaveCriticalSection( &writer->cs ); + return hr; +} + static HRESULT write_type_text( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_XML_TEXT *text ) { switch (mapping) diff --git a/include/webservices.h b/include/webservices.h index 71b12ea..64c8e35 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1666,6 +1666,7 @@ HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteBytes(WS_XML_WRITER*, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteChars(WS_XML_WRITER*, const WCHAR*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*);

1 0