November 2023 - Wine-Commits

Daniel Lehman : msmxl4/tests: Add tests for get_xml.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: aef7bf3e735af0eaf1b56846d4ab37cc340b09de URL: https://gitlab.winehq.org/wine/wine/-/commit/aef7bf3e735af0eaf1b56846d4ab37… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msmxl4/tests: Add tests for get_xml. --- dlls/msxml4/tests/domdoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 2eaf133f3ee..1784804c0c6 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -66,6 +66,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *basenames[3]; const WCHAR *uris[3]; const WCHAR *texts[3]; + const WCHAR *xmls[3]; }; static const struct test tests[] = { @@ -76,6 +77,7 @@ static void test_namespaces_as_attributes(void) { L"b", L"d", L"ns" }, /* baseName */ { L"nshref", NULL, L"" }, /* namespaceURI */ { L"b attr", L"d attr", L"nshref" }, /* text */ + { L"ns:b=\"b attr\"", L"d=\"d attr\"", L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* property only */ { @@ -85,6 +87,7 @@ static void test_namespaces_as_attributes(void) { L"d" }, /* baseName */ { NULL }, /* namespaceURI */ { L"d attr" }, /* text */ + { L"d=\"d attr\"" }, /* xml */ }, /* namespace only */ { @@ -94,6 +97,7 @@ static void test_namespaces_as_attributes(void) { L"ns" }, /* baseName */ { L"" }, /* namespaceURI */ { L"nshref" }, /* text */ + { L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* no properties or namespaces */ { @@ -186,6 +190,12 @@ static void test_namespaces_as_attributes(void) ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = NULL; + hr = IXMLDOMNode_get_xml(item, &str); + ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->xmls[i]), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(item); }

1 0

Alexandre Julliard : include: Use proper dllimports for uxtheme functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: bc5ae2faa84e6cf09d00cb9df8e7788ded4d8773 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc5ae2faa84e6cf09d00cb9df8e778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:25:19 2023 +0100 include: Use proper dllimports for uxtheme functions. --- dlls/uxtheme/Makefile.in | 1 + include/uxtheme.h | 161 +++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 81 deletions(-)

1 0

Daniel Lehman : msxml4/tests: Use wide string literals.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: e1b2b4e0e65b533ae8b97c78de82c9867953223b URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b2b4e0e65b533ae8b97c78de82c9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msxml4/tests: Use wide string literals. --- dlls/msxml4/tests/domdoc.c | 76 +++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 39fe8c5a995..2eaf133f3ee 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -39,18 +39,10 @@ static BSTR alloced_bstrs[256]; static int alloced_bstrs_count; -static BSTR alloc_str_from_narrow(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static BSTR _bstr_(const char *str) +static BSTR _bstr_(const WCHAR *str) { assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); - alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + alloced_bstrs[alloced_bstrs_count] = SysAllocString(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -67,45 +59,45 @@ static void test_namespaces_as_attributes(void) { struct test { - const char *xml; + const WCHAR *xml; int explen; - const char *names[3]; - const char *prefixes[3]; - const char *basenames[3]; - const char *uris[3]; - const char *texts[3]; + const WCHAR *names[3]; + const WCHAR *prefixes[3]; + const WCHAR *basenames[3]; + const WCHAR *uris[3]; + const WCHAR *texts[3]; }; static const struct test tests[] = { { - "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, - { "ns:b", "d", "xmlns:ns" }, /* nodeName */ - { "ns", NULL, "xmlns" }, /* prefix */ - { "b", "d", "ns" }, /* baseName */ - { "nshref", NULL, "" }, /* namespaceURI */ - { "b attr", "d attr", "nshref" }, /* text */ + L"<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, + { L"ns:b", L"d", L"xmlns:ns" }, /* nodeName */ + { L"ns", NULL, L"xmlns" }, /* prefix */ + { L"b", L"d", L"ns" }, /* baseName */ + { L"nshref", NULL, L"" }, /* namespaceURI */ + { L"b attr", L"d attr", L"nshref" }, /* text */ }, /* property only */ { - "<a d=\"d attr\" />", 1, - { "d" }, /* nodeName */ - { NULL }, /* prefix */ - { "d" }, /* baseName */ - { NULL }, /* namespaceURI */ - { "d attr" }, /* text */ + L"<a d=\"d attr\" />", 1, + { L"d" }, /* nodeName */ + { NULL }, /* prefix */ + { L"d" }, /* baseName */ + { NULL }, /* namespaceURI */ + { L"d attr" }, /* text */ }, /* namespace only */ { - "<a xmlns:ns=\"nshref\" />", 1, - { "xmlns:ns" }, /* nodeName */ - { "xmlns" }, /* prefix */ - { "ns" }, /* baseName */ - { "" }, /* namespaceURI */ - { "nshref" }, /* text */ + L"<a xmlns:ns=\"nshref\" />", 1, + { L"xmlns:ns" }, /* nodeName */ + { L"xmlns" }, /* prefix */ + { L"ns" }, /* baseName */ + { L"" }, /* namespaceURI */ + { L"nshref" }, /* text */ }, /* no properties or namespaces */ { - "<a />", 0, + L"<a />", 0, }, { NULL } @@ -129,7 +121,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node); + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -154,7 +146,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -162,7 +154,7 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -171,7 +163,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -179,10 +171,10 @@ static void test_namespaces_as_attributes(void) if (test->uris[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) + if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); else - ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -191,7 +183,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_text(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(item);

1 0

Alexandre Julliard : include: Use proper dllimports for setupapi functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 897098c9945cf95947dc55b97bfcc3e47cdcbebf URL: https://gitlab.winehq.org/wine/wine/-/commit/897098c9945cf95947dc55b97bfcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:23:55 2023 +0100 include: Use proper dllimports for setupapi functions. --- dlls/setupapi/Makefile.in | 1 + include/setupapi.h | 883 +++++++++++++++++++++++----------------------- 2 files changed, 443 insertions(+), 441 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for iphlpapi functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 6a863965562dda37c1ec2b9f2cbf511f3f44b9ab URL: https://gitlab.winehq.org/wine/wine/-/commit/6a863965562dda37c1ec2b9f2cbf51… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:16:29 2023 +0100 include: Use proper dllimports for iphlpapi functions. --- dlls/iphlpapi/iphlpapi_main.c | 1 + include/iphlpapi.h | 200 +++++++++++++++--------------------------- include/netioapi.h | 56 ++++++------ 3 files changed, 100 insertions(+), 157 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for dbghelp functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f6d808477bdc34063667e56b7a97ac3e1e649167 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d808477bdc34063667e56b7a97ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:05:26 2023 +0100 include: Use proper dllimports for dbghelp functions. --- include/dbghelp.h | 368 +++++++++++++-------------- include/imagehlp.h | 731 +++++++++++++---------------------------------------- 2 files changed, 359 insertions(+), 740 deletions(-)

1 0

Alexandre Julliard : include: Use proper dllimports for win32u functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7999f40b38d26837fcb4098035f742621f22389b URL: https://gitlab.winehq.org/wine/wine/-/commit/7999f40b38d26837fcb4098035f742… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:33:59 2023 +0100 include: Use proper dllimports for win32u functions. --- dlls/opengl32/make_opengl | 2 - dlls/opengl32/unix_private.h | 1 + dlls/win32u/Makefile.in | 2 +- dlls/win32u/font.c | 2 +- dlls/winevulkan/make_vulkan | 2 - dlls/winevulkan/vulkan.c | 1 + include/ntgdi.h | 496 ++++++++++++++++++++------------------- include/ntuser.h | 546 ++++++++++++++++++++++--------------------- include/wine/gdi_driver.h | 6 +- include/wine/vulkan_driver.h | 2 - include/wine/wgl_driver.h | 2 - 11 files changed, 537 insertions(+), 525 deletions(-)

1 0

Alexandre Julliard : include: Use NTSYSAPI for all ntdll exports.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1f769067a3f45e2f51ab597b46bd041120d1f413 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f769067a3f45e2f51ab597b46bd04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:15:18 2023 +0100 include: Use NTSYSAPI for all ntdll exports. --- include/ddk/wdm.h | 2 +- include/ip2string.h | 35 ++++++++++++++++------------------- include/wine/debug.h | 2 +- include/wine/server.h | 6 +++--- include/wine/unixlib.h | 26 +++++++++++++------------- include/winnt.h | 4 ++-- include/winternl.h | 2 +- 7 files changed, 37 insertions(+), 40 deletions(-)

1 0

Alexandre Julliard : include: Make sure that Unix function tables are always const.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1771716528d2a863e1146e5e98efefa4b5cf14e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1771716528d2a863e1146e5e98efef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 15:34:00 2023 +0100 include: Make sure that Unix function tables are always const. --- dlls/win32u/syscall.c | 2 +- include/wine/unixlib.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 5a20409437e..13a15f8c6dc 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -465,7 +465,7 @@ static NTSTATUS init( void *dispatcher ) return ntdll_init_syscalls( &syscall_table, dispatcher ); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { init, }; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 8a9522ec532..935baa0d5ba 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -29,6 +29,9 @@ typedef UINT64 unixlib_handle_t; typedef NTSTATUS (*unixlib_entry_t)( void *args ); +extern const unixlib_entry_t __wine_unix_call_funcs[]; +extern const unixlib_entry_t __wine_unix_call_wow64_funcs[]; + /* some useful helpers from ntdll */ extern const char *ntdll_get_build_dir(void); extern const char *ntdll_get_data_dir(void);

1 0

Alexandre Julliard : odbc32: Make the Unix function table const.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 30dc5d28d199a9232a7d14943d0b59f7ee25d4c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/30dc5d28d199a9232a7d14943d0b59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 13:45:17 2023 +0100 odbc32: Make the Unix function table const. --- dlls/odbc32/unixlib.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 236 insertions(+), 7 deletions(-)

1 0