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

Francois Gouget : testbot: Add Emacs directives to automatically get 2-space indentation.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: tools Branch: master Commit: b04414adc3ccf0dfb760ecc9b8a467c0ba91f3a0 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b04414adc3ccf0dfb760ecc9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 20 16:13:17 2017 +0100 testbot: Add Emacs directives to automatically get 2-space indentation. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 1 + testbot/bin/RevertVM.pl | 1 + testbot/bin/WinePatchesMLSubmit.pl | 1 + testbot/bin/WinePatchesWebSubmit.pl | 1 + testbot/bin/WineRunBuild.pl | 1 + testbot/bin/WineRunReconfig.pl | 1 + testbot/bin/WineRunTask.pl | 1 + testbot/bin/WineSendLog.pl | 1 + testbot/lib/ObjectModel/BackEnd.pm | 1 + testbot/lib/ObjectModel/BasicPropertyDescriptor.pm | 1 + testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 1 + testbot/lib/ObjectModel/CGI/CollectionBlockForPage.pm | 1 + testbot/lib/ObjectModel/CGI/CollectionPage.pm | 1 + testbot/lib/ObjectModel/CGI/FormPage.pm | 1 + testbot/lib/ObjectModel/CGI/ItemPage.pm | 1 + testbot/lib/ObjectModel/CGI/Page.pm | 1 + testbot/lib/ObjectModel/Collection.pm | 1 + testbot/lib/ObjectModel/DBIBackEnd.pm | 1 + testbot/lib/ObjectModel/DetailrefPropertyDescriptor.pm | 1 + testbot/lib/ObjectModel/EnumPropertyDescriptor.pm | 1 + testbot/lib/ObjectModel/Item.pm | 1 + testbot/lib/ObjectModel/ItemrefPropertyDescriptor.pm | 1 + testbot/lib/ObjectModel/PropertyDescriptor.pm | 1 + testbot/lib/WineTestBot/Branches.pm | 1 + testbot/lib/WineTestBot/CGI/PageBase.pm | 1 + testbot/lib/WineTestBot/CGI/Sessions.pm | 1 + testbot/lib/WineTestBot/Config.pm | 1 + testbot/lib/WineTestBot/Engine/Events.pm | 1 + testbot/lib/WineTestBot/Engine/Notify.pm | 1 + testbot/lib/WineTestBot/Jobs.pm | 1 + testbot/lib/WineTestBot/Log.pm | 1 + testbot/lib/WineTestBot/Patches.pm | 1 + testbot/lib/WineTestBot/PendingPatchSets.pm | 1 + testbot/lib/WineTestBot/PendingPatches.pm | 1 + testbot/lib/WineTestBot/Roles.pm | 1 + testbot/lib/WineTestBot/Steps.pm | 1 + testbot/lib/WineTestBot/StepsTasks.pm | 1 + testbot/lib/WineTestBot/Tasks.pm | 1 + testbot/lib/WineTestBot/TestAgent.pm | 1 + testbot/lib/WineTestBot/UserRoles.pm | 1 + testbot/lib/WineTestBot/Users.pm | 1 + testbot/lib/WineTestBot/Utils.pm | 1 + testbot/lib/WineTestBot/VMs.pm | 1 + testbot/lib/WineTestBot/WineTestBotObjects.pm | 1 + testbot/web/Feedback.pl | 1 + testbot/web/ForgotPassword.pl | 1 + testbot/web/GetFile.pl | 1 + testbot/web/JobDetails.pl | 1 + testbot/web/Login.pl | 1 + testbot/web/Logout.pl | 1 + testbot/web/PatchesList.pl | 1 + testbot/web/Register.pl | 1 + testbot/web/ResetPassword.pl | 1 + testbot/web/Screenshot.pl | 1 + testbot/web/Submit.pl | 1 + testbot/web/admin/BranchDetails.pl | 1 + testbot/web/admin/BranchesList.pl | 1 + testbot/web/admin/UserDetails.pl | 1 + testbot/web/admin/UsersList.pl | 1 + testbot/web/admin/VMDetails.pl | 1 + testbot/web/admin/VMsList.pl | 1 + testbot/web/index.pl | 1 + 62 files changed, 62 insertions(+) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=b04414adc3ccf0dfb760…

1 0

Francois Gouget : testbot: Add the LGPL header to the screenshot CGI script.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: tools Branch: master Commit: 8eaae0131fc3509ee757bbdbcaa3969fef796cd1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8eaae0131fc3509ee757bbdb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 15:39:44 2017 +0100 testbot: Add the LGPL header to the screenshot CGI script. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Screenshot.pl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/testbot/web/Screenshot.pl b/testbot/web/Screenshot.pl index 095d966..67e63a1 100644 --- a/testbot/web/Screenshot.pl +++ b/testbot/web/Screenshot.pl @@ -1,3 +1,21 @@ +# Sends a Task's current screenshot +# +# Copyright 2009 Ge van Geldorp +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + use strict; use Apache2::Const -compile => qw(REDIRECT);

1 0

Francois Gouget : winetest: Add a link to the rejected reports list.
by Alexandre Julliard March 20, 2017

March 20, 2017

Module: tools Branch: master Commit: a598800356ee0c6bcf0e7a0a2c967d9a5537e4dc URL: http://source.winehq.org/git/tools.git/?a=commit;h=a598800356ee0c6bcf0e7a0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 15:38:24 2017 +0100 winetest: Add a link to the rejected reports list. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 349144f..b3fdc53 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -299,7 +299,8 @@ print OUT <<"EOF"; </table></div> <div class="navbar"> To run the tests on your Windows machine, download the <a href="/builds/winetest-latest.exe">latest winetest.exe</a> build. -If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>. +If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-latest.exe">64-bit winetest</a>.<br> +If you don't see your results, check the <a href="/data/errors.html">rejected reports</a> list. </div> </body></html> EOF

1 0

Alexandre Julliard : Wine release 2.4
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: website Branch: master Commit: 25a499b621a6f0e2238863693cecd13603721bc8 URL: http://source.winehq.org/git/website.git/?a=commit;h=25a499b621a6f0e2238863… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 21:19:55 2017 +0100 Wine release 2.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017031701.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2017031701.xml b/news/en/2017031701.xml new file mode 100644 index 0000000..a9cee1d --- /dev/null +++ b/news/en/2017031701.xml @@ -0,0 +1,17 @@ +<news> +<date>March 17, 2017</date> +<title>Wine 2.4 Released</title> +<body> +<p> The Wine development release 2.4 is now available.</p> +<p> <a href="{$root}/announce/2.4">What's new</a> in this release: +<ul> + <li>Built-in implementation of cryptographic hashes.</li> + <li>Mono engine updated with upstream fixes.</li> + <li>More Direct3D command stream work.</li> + <li>Simulated bold and italic in DirectWrite.</li> + <li>Improvements to the XML reader.</li> + <li>Various bug fixes.</li> +</ul> +<p>The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.4.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

Alistair Leslie-Hughes : dpnet/tests: Show that async handlers are per object.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: 4239e2156ba1d066561f30936637b888a273d92a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4239e2156ba1d066561f30936… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 9 04:13:54 2017 +0000 dpnet/tests: Show that async handlers are per object. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 6503bc3..4415503 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -306,6 +306,13 @@ static void test_enum_hosts(void) todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); todo_wine ok(lastAsyncHandle == async, "got 0x%08x\n", async); + hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got %x\n", hr); + + /* Show that handlers are per object. */ + hr = IDirectPlay8Client_CancelAsyncOperation(client2, async2, 0); + todo_wine ok(hr == DPNERR_INVALIDHANDLE, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08x\n", hr); + lastAsyncCode = E_FAIL; lastAsyncHandle = 0xdeadbeef; hr = IDirectPlay8Client_CancelAsyncOperation(client, async2, 0);

1 0

Austin English : setupapi: Add SetupDiEnumDriverInfoA/W stubs.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: 852cd999f3de5b95444b99a1912ed6900a64a37b URL: http://source.winehq.org/git/wine.git/?a=commit;h=852cd999f3de5b95444b99a19… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Mar 16 13:49:25 2017 -0500 setupapi: Add SetupDiEnumDriverInfoA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 12de7da..99509e1 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -311,8 +311,8 @@ @ stdcall SetupDiDrawMiniIcon(ptr int128 long long) @ stdcall SetupDiEnumDeviceInfo(long long ptr) @ stdcall SetupDiEnumDeviceInterfaces(long ptr ptr long ptr) -@ stub SetupDiEnumDriverInfoA -@ stub SetupDiEnumDriverInfoW +@ stdcall SetupDiEnumDriverInfoA(ptr ptr long long ptr) +@ stdcall SetupDiEnumDriverInfoW(ptr ptr long long ptr) @ stdcall SetupDiGetActualSectionToInstallA(long str str long ptr ptr) @ stdcall SetupDiGetActualSectionToInstallW(long wstr wstr long ptr ptr) @ stdcall SetupDiGetClassBitmapIndex(ptr ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 9ea23b7..990974d 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -675,3 +675,25 @@ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVI return TRUE; } + +/*********************************************************************** + * SetupDiEnumDriverInfoA (SETUPAPI.@) + */ +BOOL WINAPI SetupDiEnumDriverInfoA(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType, DWORD MemberIndex, PSP_DRVINFO_DATA_A DriverInfoData) +{ + FIXME("(%p, %p, 0x%x, %u, %p stub\n", DeviceInfoSet, DeviceInfoData, DriverType, MemberIndex, DriverInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** + * SetupDiEnumDriverInfoW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType, DWORD MemberIndex, PSP_DRVINFO_DATA_W DriverInfoData) +{ + FIXME("(%p, %p, 0x%x, %u, %p stub\n", DeviceInfoSet, DeviceInfoData, DriverType, MemberIndex, DriverInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Nikolay Sivov : xmllite/reader: For elements without a prefix return same string for both local and qualified names.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: d7057a34b3e6e8a89e489eee9fdbf6fbe9289fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7057a34b3e6e8a89e489eee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 16:46:12 2017 +0300 xmllite/reader: For elements without a prefix return same string for both local and qualified names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 17 ++++++++++++----- dlls/xmllite/tests/reader.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 5ba787e..ca8602c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -490,6 +490,7 @@ static void reader_clear_elements(xmlreader *reader) } list_init(&reader->elements); reader_free_strvalued(reader, &reader->empty_element.localname); + reader_free_strvalued(reader, &reader->empty_element.qname); reader->is_empty_element = FALSE; } @@ -2227,10 +2228,11 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* skip '/>' */ reader_skipn(reader, 2); + reader_free_strvalued(reader, &element->qname); reader_free_strvalued(reader, &element->localname); element->prefix = *prefix; - element->qname = *qname; + reader_strvaldup(reader, qname, &element->qname); reader_strvaldup(reader, local, &element->localname); element->position = position; reader_mark_ns_nodes(reader, element); @@ -2980,6 +2982,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + struct element *element; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -2998,14 +3001,18 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam break; case XmlNodeType_Element: case XmlNodeType_EndElement: - if (!This->is_empty_element) + element = reader_get_element(This); + if (element->prefix.len) { - struct element *element = reader_get_element(This); *name = element->qname.str; *len = element->qname.len; - break; } - /* fallthrough */ + else + { + *name = element->localname.str; + *len = element->localname.len; + } + break; default: *name = This->strvalues[StringValue_QualifiedName].str; *len = This->strvalues[StringValue_QualifiedName].len; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 8660bb8..82880ae 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1494,6 +1494,8 @@ static void test_read_element(void) i = 0; while (IXmlReader_Read(reader, &type) == S_OK) { + UINT count; + ok(type == XmlNodeType_Element || type == XmlNodeType_EndElement || type == XmlNodeType_Text, "Unexpected node type %d\n", type); @@ -1502,10 +1504,44 @@ static void test_read_element(void) ok(hr == S_OK, "got %08x\n", hr); ok(depth == depths[i], "%u: got depth %u, expected %u\n", i, depth, depths[i]); - if (type == XmlNodeType_Element) + if (type == XmlNodeType_Element || type == XmlNodeType_EndElement) + { + const WCHAR *prefix; + + prefix = NULL; + hr = IXmlReader_GetPrefix(reader, &prefix, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(prefix != NULL, "got %p\n", prefix); + + if (!*prefix) + { + const WCHAR *local, *qname; + + local = NULL; + hr = IXmlReader_GetLocalName(reader, &local, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(local != NULL, "got %p\n", local); + + qname = NULL; + hr = IXmlReader_GetQualifiedName(reader, &qname, NULL); + ok(hr == S_OK, "got %08x\n", hr); + ok(qname != NULL, "got %p\n", qname); + + ok(local == qname, "expected same pointer\n"); + } + } + + if (type == XmlNodeType_EndElement) { - UINT count = 0; + count = 1; + hr = IXmlReader_GetAttributeCount(reader, &count); + ok(hr == S_OK, "got %08x\n", hr); + ok(count == 0, "got %u\n", count); + } + if (type == XmlNodeType_Element) + { + count = 0; hr = IXmlReader_GetAttributeCount(reader, &count); ok(hr == S_OK, "got %08x\n", hr);

1 0

Nikolay Sivov : xmllite/reader: Return same string for local and qualified names for attributes when appropriate.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: 253f233e52a94283cf884004d11dc8c39b1a8d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=253f233e52a94283cf884004d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 17 16:46:13 2017 +0300 xmllite/reader: Return same string for local and qualified names for attributes when appropriate. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 67 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ca8602c..b28a4b1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -230,6 +230,12 @@ struct reader_position UINT line_position; }; +enum attribute_flags +{ + ATTRIBUTE_NS_DEFINITION = 0x1, + ATTRIBUTE_DEFAULT_NS_DEFINITION = 0x2, +}; + struct attribute { struct list entry; @@ -238,6 +244,7 @@ struct attribute strval qname; strval value; struct reader_position position; + unsigned int flags; }; struct element @@ -398,7 +405,7 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *qname, - strval *value, const struct reader_position *position) + strval *value, const struct reader_position *position, unsigned int flags) { struct attribute *attr; @@ -413,6 +420,7 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn attr->qname = qname ? *qname : *localname; attr->value = *value; attr->position = *position; + attr->flags = flags; list_add_tail(&reader->attrs, &attr->entry); reader->attr_count++; @@ -1179,7 +1187,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* ([A-Za-z0-9._] | '-') */ @@ -1257,7 +1265,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1301,7 +1309,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, NULL, &name, NULL, &val, &position); + return reader_add_attr(reader, NULL, &name, NULL, &val, &position, 0); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1774,7 +1782,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, NULL, &name, NULL, &pub, &position); + hr = reader_add_attr(reader, NULL, &name, NULL, &pub, &position, 0); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1785,7 +1793,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, NULL, &name, NULL, &sys, &position); + hr = reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); if (FAILED(hr)) return hr; return S_OK; @@ -1799,7 +1807,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, NULL, &name, NULL, &sys, &position); + return reader_add_attr(reader, NULL, &name, NULL, &sys, &position, 0); } return S_FALSE; @@ -2179,17 +2187,17 @@ static HRESULT reader_parse_attribute(xmlreader *reader) { struct reader_position position = reader->position; strval prefix, local, qname, value; - BOOL ns = FALSE, nsdef = FALSE; + enum attribute_flags flags = 0; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; if (strval_eq(reader, &prefix, &strval_xmlns)) - ns = TRUE; + flags |= ATTRIBUTE_NS_DEFINITION; if (strval_eq(reader, &qname, &strval_xmlns)) - ns = nsdef = TRUE; + flags |= ATTRIBUTE_DEFAULT_NS_DEFINITION; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2197,11 +2205,11 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; - if (ns) - reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + if (flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) + reader_push_ns(reader, &local, &value, !!(flags & ATTRIBUTE_DEFAULT_NS_DEFINITION)); TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &prefix, &local, &qname, &value, &position); + return reader_add_attr(reader, &prefix, &local, &qname, &value, &position, flags); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2982,6 +2990,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + struct attribute *attribute = This->attr; struct element *element; UINT length; @@ -3013,6 +3022,22 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = element->localname.len; } break; + case XmlNodeType_Attribute: + if (attribute->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) + { + *name = xmlnsW; + *len = 5; + } else if (attribute->prefix.len) + { + *name = This->strvalues[StringValue_QualifiedName].str; + *len = This->strvalues[StringValue_QualifiedName].len; + } + else + { + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + } + break; default: *name = This->strvalues[StringValue_QualifiedName].str; *len = This->strvalues[StringValue_QualifiedName].len; @@ -3156,6 +3181,18 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U *name = element->localname.str; *len = element->localname.len; break; + case XmlNodeType_Attribute: + if (This->attr->flags & ATTRIBUTE_DEFAULT_NS_DEFINITION) + { + *name = xmlnsW; + *len = 5; + } + else + { + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + } + break; default: *name = This->strvalues[StringValue_LocalName].str; *len = This->strvalues[StringValue_LocalName].len; @@ -3246,11 +3283,9 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, case XmlNodeType_Attribute: { const strval *local = &reader->strvalues[StringValue_LocalName]; - const strval *prefix = &reader->strvalues[StringValue_Prefix]; /* For namespace definition attributes return values from namespace list */ - if (((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || - strval_eq(reader, prefix, &strval_xmlns))) + if (reader->attr->flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) { struct ns *ns;

1 0

Fabian Maurer : comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: e2245bcd3ca6c9851a51be1ebdaaa49c1a1fdee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2245bcd3ca6c9851a51be1eb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Mar 17 17:38:05 2017 +0300 comctl32/taskdialog: Move TaskDialogIndirect and its tests into own source files. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/Makefile.in | 1 + dlls/comctl32/commctrl.c | 39 --------------------- dlls/comctl32/taskdialog.c | 76 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/Makefile.in | 1 + dlls/comctl32/tests/misc.c | 19 ---------- dlls/comctl32/tests/taskdialog.c | 58 ++++++++++++++++++++++++++++++ 6 files changed, 136 insertions(+), 58 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 27f9741..e1a6812 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -30,6 +30,7 @@ C_SRCS = \ string.c \ syslink.c \ tab.c \ + taskdialog.c \ theme_button.c \ theme_combo.c \ theme_dialog.c \ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 2a4cd42..d3ba314 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1622,45 +1622,6 @@ int WINAPI DrawShadowText(HDC hdc, LPCWSTR text, UINT length, RECT *rect, DWORD } /*********************************************************************** - * TaskDialogIndirect [COMCTL32.@] - */ -HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *pTaskConfig, int *pnButton, - int *pnRadioButton, BOOL *pfVerificationFlagChecked) -{ - UINT uType = 0; - INT ret; - FIXME("%p, %p, %p, %p\n", pTaskConfig, pnButton, pnRadioButton, pfVerificationFlagChecked); - - if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_YESNOCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_YES_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_NO_BUTTON) - uType |= MB_YESNO; - else - if (pTaskConfig->dwCommonButtons & TDCBF_RETRY_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_RETRYCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON && - pTaskConfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) - uType |= MB_OKCANCEL; - else - if (pTaskConfig->dwCommonButtons & TDCBF_OK_BUTTON) - uType |= MB_OK; - ret = MessageBoxW(pTaskConfig->hwndParent, pTaskConfig->pszMainInstruction, - pTaskConfig->pszWindowTitle, uType); - FIXME("dwCommonButtons=%x uType=%x ret=%x\n", pTaskConfig->dwCommonButtons, uType, ret); - - if (pnButton) *pnButton = ret; - if (pnRadioButton) *pnRadioButton = pTaskConfig->nDefaultButton; - if (pfVerificationFlagChecked) *pfVerificationFlagChecked = TRUE; - return S_OK; -} - -/*********************************************************************** * LoadIconWithScaleDown [COMCTL32.@] */ HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE hinst, const WCHAR *name, int cx, int cy, HICON *icon) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c new file mode 100644 index 0000000..15824d3 --- /dev/null +++ b/dlls/comctl32/taskdialog.c @@ -0,0 +1,76 @@ +/* + * Task dialog control + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "commctrl.h" +#include "winerror.h" +#include "comctl32.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(taskdialog); + +/*********************************************************************** + * TaskDialogIndirect [COMCTL32.@] + */ +HRESULT WINAPI TaskDialogIndirect(const TASKDIALOGCONFIG *taskconfig, int *button, + int *radio_button, BOOL *verification_flag_checked) +{ + UINT type = 0; + INT ret; + + TRACE("%p, %p, %p, %p\n", taskconfig, button, radio_button, verification_flag_checked); + + if (taskconfig->dwCommonButtons & TDCBF_YES_BUTTON && + taskconfig->dwCommonButtons & TDCBF_NO_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_YESNOCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_YES_BUTTON && + taskconfig->dwCommonButtons & TDCBF_NO_BUTTON) + type |= MB_YESNO; + else + if (taskconfig->dwCommonButtons & TDCBF_RETRY_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_RETRYCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_OK_BUTTON && + taskconfig->dwCommonButtons & TDCBF_CANCEL_BUTTON) + type |= MB_OKCANCEL; + else + if (taskconfig->dwCommonButtons & TDCBF_OK_BUTTON) + type |= MB_OK; + + ret = MessageBoxW(taskconfig->hwndParent, taskconfig->pszMainInstruction, + taskconfig->pszWindowTitle, type); + + FIXME("dwCommonButtons=%x type=%x ret=%x\n", taskconfig->dwCommonButtons, type, ret); + + if (button) *button = ret; + if (radio_button) *radio_button = taskconfig->nDefaultButton; + if (verification_flag_checked) *verification_flag_checked = TRUE; + + return S_OK; +} diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index cb2fdf3..5faf1f8 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -22,6 +22,7 @@ C_SRCS = \ subclass.c \ syslink.c \ tab.c \ + taskdialog.c \ toolbar.c \ tooltips.c \ trackbar.c \ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 5cc6c29..a6939bd 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -200,24 +200,6 @@ static void test_Alloc(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); } -static void test_TaskDialogIndirect(void) -{ - HINSTANCE hinst; - void *ptr, *ptr2; - - hinst = LoadLibraryA("comctl32.dll"); - - ptr = GetProcAddress(hinst, "TaskDialogIndirect"); - if (!ptr) - { - win_skip("TaskDialogIndirect not exported by name\n"); - return; - } - - ptr2 = GetProcAddress(hinst, (const CHAR*)345); - ok(ptr == ptr2, "got wrong pointer for ordinal 345, %p expected %p\n", ptr2, ptr); -} - static void test_LoadIconWithScaleDown(void) { static const WCHAR nonexisting_fileW[] = {'n','o','n','e','x','i','s','t','i','n','g','.','i','c','o',0}; @@ -402,7 +384,6 @@ START_TEST(misc) return; test_builtin_classes(); - test_TaskDialogIndirect(); test_LoadIconWithScaleDown(); unload_v6_module(ctx_cookie, hCtx); diff --git a/dlls/comctl32/tests/taskdialog.c b/dlls/comctl32/tests/taskdialog.c new file mode 100644 index 0000000..8a9d164 --- /dev/null +++ b/dlls/comctl32/tests/taskdialog.c @@ -0,0 +1,58 @@ +/* Unit tests for the task dialog control. + * + * Copyright 2017 Fabian Maurer for the Wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "commctrl.h" + +#include "wine/test.h" +#include "v6util.h" + +static HRESULT (WINAPI *pTaskDialogIndirect)(const TASKDIALOGCONFIG *, int *, int *, BOOL *); + +START_TEST(taskdialog) +{ + ULONG_PTR ctx_cookie; + void *ptr_ordinal; + HINSTANCE hinst; + HANDLE hCtx; + + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + /* Check if task dialogs are available */ + hinst = LoadLibraryA("comctl32.dll"); + + pTaskDialogIndirect = (void *)GetProcAddress(hinst, "TaskDialogIndirect"); + if (!pTaskDialogIndirect) + { + win_skip("TaskDialogIndirect not exported by name\n"); + unload_v6_module(ctx_cookie, hCtx); + return; + } + + ptr_ordinal = GetProcAddress(hinst, (const char *)345); + ok(pTaskDialogIndirect == ptr_ordinal, "got wrong pointer for ordinal 345, %p expected %p\n", + ptr_ordinal, pTaskDialogIndirect); + + unload_v6_module(ctx_cookie, hCtx); +}

1 0

Alexandre Julliard : Release 2.4.
by Alexandre Julliard March 17, 2017

March 17, 2017

Module: wine Branch: master Commit: 6a05069a43f1a8f0e69c4cedd134f8d7400b8a95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a05069a43f1a8f0e69c4cedd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 17 21:17:48 2017 +0100 Release 2.4. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 822 +++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 388 insertions(+), 454 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a05069a43f1a8f0e69c4…

1 0