October 2021 - Wine-Commits

Alexandre Julliard : Wine release 6.20
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: website Branch: master Commit: 60257f2656324c094efae9e3182da1460409a547 URL: https://source.winehq.org/git/website.git/?a=commit;h=60257f2656324c094efae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 21:46:28 2021 +0200 Wine release 6.20 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021102201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021102201.xml b/news/en/2021102201.xml new file mode 100644 index 00000000..8cc79012 --- /dev/null +++ b/news/en/2021102201.xml @@ -0,0 +1,17 @@ +<news> +<date>October 22, 2021</date> +<title>Wine 6.20 Released</title> +<body> + The Wine development release 6.20 is now available. + <a href="{$root}/announce/6.20">What's new</a> in this release: +<ul> + <li>MSXml, XAudio, DInput and a few other modules converted to PE.</li> + <li>A few system libraries are bundled with the source to support PE builds.</li> + <li>HID joystick is now the only supported joystick backend in DirectInput.</li> + <li>Better support for MSVCRT builds in Winelib.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.20.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>. +</body></news>

1 0

Gijs Vermeulen : windows.devices.enumeration: Add stub dll.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 01d869a09c3e4c5d326ad3e121c323feccc4cbe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d869a09c3e4c5d326ad3e1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Thu Oct 21 20:55:01 2021 +0200 windows.devices.enumeration: Add stub dll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51884 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/windows.devices.enumeration/Makefile.in | 7 + dlls/windows.devices.enumeration/classes.idl | 23 +++ dlls/windows.devices.enumeration/main.c | 157 +++++++++++++++++++++ .../windows.devices.enumeration.spec | 3 + include/Makefile.in | 1 + include/windows.devices.enumeration.idl | 55 ++++++++ 8 files changed, 249 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=01d869a09c3e4c5d326a…

1 0

Alexandre Julliard : Release 6.20.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: faf645d01632e4cf7ef056a86a675a12df39a80e URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf645d01632e4cf7ef056a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 21:44:24 2021 +0200 Release 6.20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1124 +++++++++++++++++++++++++++---------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 516 insertions(+), 631 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=faf645d01632e4cf7ef0…

1 0

Tag wine-6.20 : Alexandre Julliard : Release 6.20
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: refs/tags/wine-6.20 Tag: 3429a320dc0957fddfb578c37a2eccc7845a5293 URL: https://source.winehq.org/git/wine.git/?a=tag;h=3429a320dc0957fddfb578c37a2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 21:44:24 2021 +0200 Release 6.20

1 0

Daniel Lehman : msxml3: Update error for missing closing quote.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: fd3cf6f2ddf00e4e5e8df8dc4998016f38fa6c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd3cf6f2ddf00e4e5e8df8dc… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:29 2021 +0300 msxml3: Update error for missing closing quote. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/pi.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 80e6ad70755..1d96c9391ee 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -298,7 +298,7 @@ static HRESULT xml_get_value(xmlChar **p, xmlChar **value) v = *p; while (**p && **p != q) *p += 1; - if (!**p) return XML_E_EXPECTINGCLOSEQUOTE; + if (!**p) return XML_E_BADCHARINSTRING; len = *p - v; if (!len) return XML_E_MISSINGNAME; *p += 1; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e1f71bf5445..22fbe06abd7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8601,10 +8601,8 @@ todo_wine hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); -todo_wine ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); -todo_wine ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); pi = NULL; hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi);

1 0

Daniel Lehman : msxml3: Handle NULL XML declaration.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 35ae01023bbfe1963a099f6d717367ca6f156adf URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ae01023bbfe1963a099f6d… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:28 2021 +0300 msxml3: Handle NULL XML declaration. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/pi.c | 3 +++ dlls/msxml3/tests/domdoc.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1d96c9391ee..4c5c6b12c68 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -754,6 +754,9 @@ HRESULT dom_pi_put_xml_decl(IXMLDOMNode *node, BSTR data) HRESULT hr; BSTR name; + if (!data) + return XML_E_XMLDECLSYNTAX; + node_obj = get_node_obj(node); hr = node_set_content(node_obj, data); if (FAILED(hr)) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 22fbe06abd7..70e2da89a2f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8596,7 +8596,6 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); ok(hr == E_FAIL, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); -todo_wine ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr);

1 0

Daniel Lehman : msxml3: Handle single quotes in xml declaration.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 48f038fb9eb916e4ac2dd13c2d05cde1860a3215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48f038fb9eb916e4ac2dd13c… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:27 2021 +0300 msxml3: Handle single quotes in xml declaration. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/pi.c | 7 ++++--- dlls/msxml3/tests/domdoc.c | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index fb4ca798c68..80e6ad70755 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -284,7 +284,7 @@ static HRESULT WINAPI dom_pi_get_nextSibling( static HRESULT xml_get_value(xmlChar **p, xmlChar **value) { - xmlChar *v; + xmlChar *v, q; int len; while (isspace(**p)) *p += 1; @@ -292,11 +292,12 @@ static HRESULT xml_get_value(xmlChar **p, xmlChar **value) *p += 1; while (isspace(**p)) *p += 1; - if (**p != '"') return XML_E_MISSINGQUOTE; + if (**p != '"' && **p != '\'') return XML_E_MISSINGQUOTE; + q = **p; *p += 1; v = *p; - while (**p && **p != '"') *p += 1; + while (**p && **p != q) *p += 1; if (!**p) return XML_E_EXPECTINGCLOSEQUOTE; len = *p - v; if (!len) return XML_E_MISSINGNAME; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 81ee8dcb52d..e1f71bf5445 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8608,19 +8608,15 @@ todo_wine ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); pi = NULL; hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); -if (pi) -{ hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); node_map = NULL; ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_attributes(node, &node_map); ok(hr == S_OK, "got 0x%08x\n", hr); - if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); IXMLDOMProcessingInstruction_Release(pi); -} /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR));

1 0

Daniel Lehman : msxml3: Parse XML declaration when creating processing instruction.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 12d2417e4fe2067e20960bdd852de70b92429dcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=12d2417e4fe2067e20960bdd… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:26 2021 +0300 msxml3: Parse XML declaration when creating processing instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 9 +++------ dlls/msxml3/msxml_private.h | 2 ++ dlls/msxml3/pi.c | 41 ++++++++++++++++++++++++++--------------- dlls/msxml3/tests/domdoc.c | 8 +++++--- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index cbf16bcb1d4..4013f106cc6 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1884,13 +1884,10 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( hr = IXMLDOMDocument3_createNode(iface, type, target, NULL, &node); if (hr == S_OK) { - xmlnode *node_obj; - /* this is to bypass check in ::put_data() that blocks "<?xml" PIs */ - node_obj = get_node_obj(node); - hr = node_set_content(node_obj, data); - - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi); + hr = dom_pi_put_xml_decl(node, data); + if (SUCCEEDED(hr)) + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi); IXMLDOMNode_Release(node); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 07ed09fb480..8003c1a9650 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -261,6 +261,8 @@ extern BSTR EnsureCorrectEOL(BSTR) DECLSPEC_HIDDEN; extern xmlChar* tagName_to_XPath(const BSTR tagName) DECLSPEC_HIDDEN; +extern HRESULT dom_pi_put_xml_decl(IXMLDOMNode *node, BSTR data) DECLSPEC_HIDDEN; + #include <libxslt/documents.h> extern xmlDocPtr xslt_doc_default_loader(const xmlChar *uri, xmlDictPtr dict, int options, void *_ctxt, xsltLoadType type) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index f4da13e91ac..fb4ca798c68 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -433,25 +433,11 @@ static HRESULT WINAPI dom_pi_get_attributes( if (hr != S_OK) return hr; if (!wcscmp(name, xmlW)) - { - if (!This->node.node->properties) - { - hr = parse_xml_decl(This->node.node); - if (hr != S_OK) - { - SysFreeString(name); - return S_FALSE; - } - } - *map = create_nodemap(This->node.node, &dom_pi_attr_map); - SysFreeString(name); - return S_OK; - } SysFreeString(name); - return S_FALSE; + return *map ? S_OK : S_FALSE; } static HRESULT WINAPI dom_pi_insertBefore( @@ -760,6 +746,31 @@ static HRESULT WINAPI dom_pi_put_data( return node_set_content(&This->node, data); } +HRESULT dom_pi_put_xml_decl(IXMLDOMNode *node, BSTR data) +{ + static const WCHAR xmlW[] = {'x','m','l',0}; + xmlnode *node_obj; + HRESULT hr; + BSTR name; + + node_obj = get_node_obj(node); + hr = node_set_content(node_obj, data); + if (FAILED(hr)) + return hr; + + hr = node_get_nodeName(node_obj, &name); + if (FAILED(hr)) + return hr; + + if (!lstrcmpW(name, xmlW) && !node_obj->node->properties) + hr = parse_xml_decl(node_obj->node); + else + hr = S_OK; + + SysFreeString(name); + return hr; +} + static const struct IXMLDOMProcessingInstructionVtbl dom_pi_vtbl = { dom_pi_QueryInterface, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d98a87f6d9c..81ee8dcb52d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8592,7 +8592,6 @@ static void test_createProcessingInstruction(void) doc = create_document(&IID_IXMLDOMDocument); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); -todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); ok(hr == E_FAIL, "got 0x%08x\n", hr); @@ -8600,7 +8599,6 @@ todo_wine todo_wine ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); -todo_wine ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); todo_wine @@ -8608,17 +8606,21 @@ todo_wine hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); todo_wine ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + pi = NULL; hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); +todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); +if (pi) +{ hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); node_map = NULL; ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLDOMNode_get_attributes(node, &node_map); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); if (node_map) IXMLDOMNamedNodeMap_Release(node_map); IXMLDOMNode_Release(node); IXMLDOMProcessingInstruction_Release(pi); +} /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR));

1 0

Daniel Lehman : msxml3/tests: Add some processing instruction tests.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: 3186df70cc9730a18052d4264f3494ea336115a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3186df70cc9730a18052d426… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Oct 22 16:41:25 2021 +0300 msxml3/tests: Add some processing instruction tests. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9e9789ebd9a..d98a87f6d9c 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8594,6 +8594,31 @@ static void test_createProcessingInstruction(void) hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"windows-1252\" dummy=\"value\""), &pi); todo_wine ok(hr == XML_E_UNEXPECTED_ATTRIBUTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, NULL, _bstr_("version=\"1.0\" encoding=\"UTF-8\""), &pi); + ok(hr == E_FAIL, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), NULL, &pi); +todo_wine + ok(hr == XML_E_XMLDECLSYNTAX, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=UTF-8"), &pi); +todo_wine + ok(hr == XML_E_MISSINGQUOTE, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8\""), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding=\"UTF-8"), &pi); +todo_wine + ok(hr == XML_E_BADCHARINSTRING, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\" encoding='UTF-8'"), &pi); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMProcessingInstruction_QueryInterface(pi, &IID_IXMLDOMNode, (void **)&node); + node_map = NULL; + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMNode_get_attributes(node, &node_map); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (node_map) IXMLDOMNamedNodeMap_Release(node_map); + IXMLDOMNode_Release(node); + IXMLDOMProcessingInstruction_Release(pi); /* test for BSTR handling, pass broken BSTR */ memcpy(&buff[2], L"test", 5 * sizeof(WCHAR));

1 0

Alexandre Julliard : kernel32/tests: Use the standard va_list instead of __ms_va_list.
by Alexandre Julliard Oct. 22, 2021

Oct. 22, 2021

Module: wine Branch: master Commit: b1d5649b5c12ce8f9cacf74880122674a95f1d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1d5649b5c12ce8f9cacf748… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 22 11:11:48 2021 +0200 kernel32/tests: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 6 +++--- dlls/kernel32/tests/format_msg.c | 20 ++++++++++---------- dlls/kernel32/tests/process.c | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 1a258ad69a6..0955025a650 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -60,11 +60,11 @@ static HMODULE ntdll; static void WINAPIV __WINE_PRINTF_ATTR(2, 3) test_child_ok(int condition, const char *msg, ...) { - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, msg); + va_start(valist, msg); winetest_vok(condition, msg, valist); - __ms_va_end(valist); + va_end(valist); if (!condition) ++child_failures; } diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 794069e341d..0e09ba904d0 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -29,26 +29,26 @@ static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r; - __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageA(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; } static DWORD WINAPIV doitW(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPWSTR out, DWORD outsize, ... ) { - __ms_va_list list; + va_list list; DWORD r; - __ms_va_start(list, outsize); + va_start(list, outsize); r = FormatMessageW(flags, src, msg_id, lang_id, out, outsize, &list); - __ms_va_end(list); + va_end(list); return r; } @@ -297,11 +297,11 @@ static void test_message_from_string_wide(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%1!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 00003", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==13,"failed: r=%d\n",r); r = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, L"%1!*.*u!,%4!*.*u!", - 0, 0, out, ARRAY_SIZE(out), (__ms_va_list *)args ); + 0, 0, out, ARRAY_SIZE(out), (va_list *)args ); ok(!lstrcmpW(L" 0002, 001", out),"failed out=[%s]\n", wine_dbgstr_w(out)); ok(r==12,"failed: r=%d\n",r); } @@ -593,11 +593,11 @@ static void test_message_from_string(void) { ULONG_PTR args[] = { 6, 4, 2, 5, 3, 1 }; r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%1!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 00003", out),"failed out=[%s]\n",out); ok(r==13,"failed: r=%d\n",r); r = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, - "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (__ms_va_list *)args ); + "%1!*.*u!,%4!*.*u!", 0, 0, out, sizeof(out), (va_list *)args ); ok(!strcmp(" 0002, 001", out),"failed out=[%s]\n",out); ok(r==12,"failed: r=%d\n",r); } diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 87873d4a90d..0d1a2f1a31d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -307,13 +307,13 @@ static void get_file_name(char* buf) */ static void WINAPIV __WINE_PRINTF_ATTR(2,3) childPrintf(HANDLE h, const char* fmt, ...) { - __ms_va_list valist; + va_list valist; char buffer[1024+4*MAX_LISTED_ENV_VAR]; DWORD w; - __ms_va_start(valist, fmt); + va_start(valist, fmt); vsprintf(buffer, fmt, valist); - __ms_va_end(valist); + va_end(valist); WriteFile(h, buffer, strlen(buffer), &w, NULL); }

1 0