February 2022 - Wine-Commits

Damjan Jovanovic : msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 2240ac5e27b42150f2e9dcb0e713684078f77415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2240ac5e27b42150f2e9dcb0… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 11 07:16:53 2021 +0200 msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}. S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. We should only use S{0,m} for our internal XSD schema used in XDR validation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 53f3cad7fbb19b489419afae4e1e73486384f98d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/datatypes.xsd | 4 ++-- dlls/msxml3/tests/schema.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/datatypes.xsd b/dlls/msxml3/datatypes.xsd index 9e0479d8ca2..ffbe0e2f858 100644 --- a/dlls/msxml3/datatypes.xsd +++ b/dlls/msxml3/datatypes.xsd @@ -200,7 +200,7 @@ </xsd:annotation> <xsd:restriction base="xsd:decimal"> - <xsd:pattern value="([0-9]{,14})([.][0-9]{,4})?"/> + <xsd:pattern value="([0-9]{0,14})([.][0-9]{0,4})?"/> </xsd:restriction> </xsd:simpleType> @@ -539,7 +539,7 @@ </xsd:annotation> <xsd:restriction base="xsd:string"> - <xsd:pattern value="([0-9A-Fa-f]{4})([-]{,1}[0-9A-Fa-f]{4})*"/> + <xsd:pattern value="([0-9A-Fa-f]{4})([-]{0,1}[0-9A-Fa-f]{4})*"/> </xsd:restriction> </xsd:simpleType> diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b66be76c159..8dc9dcd7e22 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1115,7 +1115,9 @@ static void test_regex(void) { L"\\~", L"~", TRUE }, { L"\\uCAFE", L"\xCAFE", TRUE }, /* non-BMP character in surrogate pairs: */ - { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE }, + /* "x{,2}" is non-standard and only works on libxml2 <= v2.9.10 */ + { L"x{0,2}", L"x", FALSE } }; int i;

1 0

Alex Henrie : rasapi32: Add RasSetCredentialsA/W stubs.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 60284543da6e4112d056da1fa3f2b2c2f8fb00d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60284543da6e4112d056da1f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 3 23:40:55 2021 -0600 rasapi32: Add RasSetCredentialsA/W stubs. Based on a patch by Oleg Dubinskiy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49726 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 84d85a3d72a12f9f845fa28544999788741cdb06) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/rasapi32/rasapi.c | 12 ++++++++++++ dlls/rasapi32/rasapi32.spec | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index 791b0dab133..f70f73caa2c 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -496,6 +496,18 @@ DWORD WINAPI RasRenameEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszOldEntry, LPCWST return 0; } +DWORD WINAPI RasSetCredentialsA(const char *phonebook, const char *entry, RASCREDENTIALSA *credentials, BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), credentials, clear); + return ERROR_UNKNOWN; +} + +DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASCREDENTIALSW *credentials, BOOL clear) +{ + FIXME("(%s,%s,%p,0x%x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), credentials, clear); + return ERROR_UNKNOWN; +} + DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec index e8a28a8814e..d917c335a7d 100644 --- a/dlls/rasapi32/rasapi32.spec +++ b/dlls/rasapi32/rasapi32.spec @@ -64,8 +64,8 @@ @ stdcall RasSetAutodialEnableW(long long) @ stdcall RasSetAutodialParamA(long ptr long) @ stdcall RasSetAutodialParamW(long ptr long) -@ stub RasSetCredentialsA -@ stub RasSetCredentialsW +@ stdcall RasSetCredentialsA(str str ptr long) +@ stdcall RasSetCredentialsW(wstr wstr ptr long) @ stdcall RasSetCustomAuthDataA(str str ptr long) @ stdcall RasSetCustomAuthDataW(wstr wstr ptr long) @ stdcall RasSetEntryDialParamsA(str ptr long)

1 0

Akihiro Sagawa : midimap: Introduce XP form and prefer it.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: c55a6b6407cd9b11217ca1b76d7af3e0e6271955 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c55a6b6407cd9b11217ca1b7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jul 24 21:45:24 2021 +0900 midimap: Introduce XP form and prefer it. Since XP form doesn't support channel mappings, old form is remained for compatiblity. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51505 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit dbf3b3b6bf88c8a003dc4ca9023e3182d64b34bf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 58 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 86e4289d897..2ac8aea2c90 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -36,7 +36,15 @@ /* * Here's how Windows stores the midiOut mapping information. * - * Full form (in HKU) is: + * Windows XP form (in HKU) is: + * + * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] + * "szPname"="TiMidity port 0" + * (incomplete) + * + * szPname: name of midiOut device to use. + * + * If szPname isn't defined, we use Windows 2000 form (also in HKU): * * [Software\\Microsoft\\Windows\\CurrentVersion\\Multimedia\\MIDIMap] 988836060 * "AutoScheme"=dword:00000000 @@ -214,33 +222,41 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) else { DWORD type, size, out; - WCHAR buffer[256]; + WCHAR buffer[256]; - ret = 2; - size = sizeof(out); - if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"szPname", 0, &type, (void*)buffer, &size)) { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) - { - if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); - } - else - { - ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); - } + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); } - if (ret == 2) + else { - size = sizeof(buffer); - if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + ret = 2; + size = sizeof(out); + if (!RegQueryValueExA(hKey, "UseScheme", 0, &type, (void*)&out, &size) && out) { - ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentScheme", 0, &type, (void*)buffer, &size)) + { + if (!(ret = MIDIMAP_LoadSettingsScheme(mom, buffer))) + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } + else + { + ERR("Wrong registry: UseScheme is active, but no CurrentScheme found\n"); + } } - else + if (ret == 2) { - ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + size = sizeof(buffer); + if (!RegQueryValueExW(hKey, L"CurrentInstrument", 0, &type, (void*)buffer, &size) && *buffer) + { + ret = MIDIMAP_LoadSettingsDefault(mom, buffer); + } + else + { + ret = MIDIMAP_LoadSettingsDefault(mom, NULL); + } } } }

1 0

Jacek Caban : advapi32: Link to msvcrt.dll.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 8cc412b90ca8fbfb70945eefee93ae36af502743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cc412b90ca8fbfb70945eef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 21 15:15:51 2021 +0200 advapi32: Link to msvcrt.dll. Some applications expect msvcrt.dll to be pulled by system DLLs. On Windows, loading advapi32 causes msvcrt.dll to be loaded. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51465 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b3a300cbfee15dd6771a0a984c13591a2b36358) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/Makefile.in b/dlls/advapi32/Makefile.in index 5175563cea1..11b3b5aaaf7 100644 --- a/dlls/advapi32/Makefile.in +++ b/dlls/advapi32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_ADVAPI32_ MODULE = advapi32.dll IMPORTLIB = advapi32 -IMPORTS = kernelbase sechost +IMPORTS = kernelbase sechost msvcrt DELAYIMPORTS = rpcrt4 EXTRADLLFLAGS = -mno-cygwin

1 0

Akihiro Sagawa : user32/listbox: Fix redraw after LB_SETCOUNT message.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 904ad1e120eb0e72f1af414848fbf365c43f68cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=904ad1e120eb0e72f1af4148… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Aug 12 21:17:42 2021 +0900 user32/listbox: Fix redraw after LB_SETCOUNT message. 3ef790b9680cbf38fc93b4902e3ca6c9f57c5422 accidentally dropped updating LBS_DISPLAYCHANGED flag that had been done in LISTBOX_InvalidateItems() if the count value was changed. In fact, the newly added test shows LB_SETCOUNT message always causes WM_DRAWITEM requests regardless of the count value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51591 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 247185ba78a22bd0f84eeb753b59e377cebfd7a9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/listbox.c | 2 ++ dlls/user32/tests/listbox.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 0122f928ba8..912adb716d0 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1839,6 +1839,8 @@ static LRESULT LISTBOX_SetCount( LB_DESCR *descr, UINT count ) if (!resize_storage(descr, count)) return LB_ERRSPACE; descr->nb_items = count; + if (descr->style & LBS_NOREDRAW) + descr->style |= LBS_DISPLAYCHANGED; if (count) { diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 7d0ae5a2157..7817d623134 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -447,7 +447,6 @@ static void test_ownerdraw(void) got_drawitem = 0; ret = RedrawWindow(hLB, NULL, 0, RDW_UPDATENOW); ok(ret, "RedrawWindow failed\n"); - todo_wine_if(testcase[i].message == LB_SETCOUNT) ok(got_drawitem == testcase[i].drawitem, "expected %u, got %u\n", testcase[i].drawitem, got_drawitem); DestroyWindow(hLB);

1 0

Zhiyi Zhang : uxtheme: Fall back to default class if the specified subclass is not found.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: c7436090e4c653b2bbd73f2e459c988faf64c26d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7436090e4c653b2bbd73f2e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 21 17:14:43 2021 +0800 uxtheme: Fall back to default class if the specified subclass is not found. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50113 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3e9fbda43c6d2f5fd10366f520fc93b0b9234dc0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/system.c | 4 ++++ dlls/uxtheme/tests/system.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index a37e532500a..aaef03f0205 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -634,6 +634,10 @@ HTHEME WINAPI OpenThemeDataEx(HWND hwnd, LPCWSTR pszClassList, DWORD flags) if (pszUseClassList) hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + + /* Fall back to default class if the specified subclass is not found */ + if (!hTheme) + hTheme = MSSTYLES_OpenThemeClass(NULL, pszUseClassList); } if(IsWindow(hwnd)) SetPropW(hwnd, (LPCWSTR)MAKEINTATOM(atWindowTheme), hTheme); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index ae4de902730..3f259d08f79 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -127,7 +127,7 @@ todo_wine ok(hRes == S_OK, "Expected S_OK, got 0x%08x.\n", hRes); hTheme = OpenThemeData(hWnd, L"Button"); - todo_wine ok(!!hTheme, "OpenThemeData failed.\n"); + ok(!!hTheme, "OpenThemeData failed.\n"); CloseThemeData(hTheme); } else

1 0

Andrey Gusev : msvcr120: Add version.rc file.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 7a6b76f28acbebbed5ae3c3859cc978273322f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a6b76f28acbebbed5ae3c38… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Jun 22 23:51:22 2021 +0300 msvcr120: Add version.rc file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51244 Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 772291539522189fa1712a8a5fa61659bccd883f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcr120/Makefile.in | 2 ++ dlls/msvcr120/version.rc | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index 953e9760ca0..585183108ce 100644 --- a/dlls/msvcr120/Makefile.in +++ b/dlls/msvcr120/Makefile.in @@ -41,3 +41,5 @@ C_SRCS = \ undname.c \ unixlib.c \ wcs.c + +RC_SRCS = version.rc diff --git a/dlls/msvcr120/version.rc b/dlls/msvcr120/version.rc new file mode 100644 index 00000000000..f29899e48cb --- /dev/null +++ b/dlls/msvcr120/version.rc @@ -0,0 +1,24 @@ +/* + * Copyright 2021 Andrey Gusev + * + * 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 + */ + +#define WINE_FILEDESCRIPTION_STR "Wine CRT library" +#define WINE_FILENAME_STR "msvcr120.dll" +#define WINE_FILEVERSION 12,0,40664,0 +#define WINE_FILEVERSION_STR "12.0.40664.0" + +#include "wine/wine_common_ver.rc"

1 0

Jactry Zeng : gdi32: Fix a typo in unix_face_create().
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 89926751ff94d7640a252887e1cf799f5d3c4b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89926751ff94d7640a252887… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jul 12 20:55:32 2021 +0800 gdi32: Fix a typo in unix_face_create(). This also fixes test failures in test_lang_names() when on Japanese system. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51382 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aee7d560ae1834cb1a66c9057a230c6d56d9a943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4f5d4725876..bbfe72cc769 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1243,7 +1243,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = decode_opentype_name( &style_name.face_name ); memset( &full_name, 0, sizeof(full_name) ); - style_name.primary_langid = primary_langid; + full_name.primary_langid = primary_langid; opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); This->full_name = decode_opentype_name( &full_name.face_name );

1 0

Damjan Jovanovic : msxml3: Return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are no attributes.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 66fe6841b8dc6ae998cdd5409f50975504dc3b98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66fe6841b8dc6ae998cdd540… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 20 18:08:02 2021 +0200 msxml3: Return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are no attributes. Currently Wine return S_FALSE when IXMLDOMNamedNodeMap::nextNode() has run out of attributes to return, but when an XML node has no attributes at all, it returns S_OK despite setting the nextNode output parameter to NULL, causing the caller to crash when it accesses this pointer. Return S_FALSE in this case instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50603 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 06cd8d3d2eb09ffb19f26e95360c3ddcc4caf46d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/element.c | 2 ++ dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 05255508d4e..de5d32c585b 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1888,6 +1888,8 @@ static HRESULT domelem_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode *nextNode = NULL; curr = node->properties; + if (curr == NULL) + return S_FALSE; for (i = 0; i < *iter; i++) { if (curr->next == NULL) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index e94a2c88a81..a64bc5bc2b0 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2203,6 +2203,8 @@ static void test_domnode( void ) if (element) { + IXMLDOMNamedNodeMap *attributes; + owner = NULL; r = IXMLDOMElement_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n"); @@ -2281,6 +2283,29 @@ static void test_domnode( void ) ok( map != NULL, "should be attributes\n"); EXPECT_CHILDREN(element); + + r = IXMLDOMElement_get_childNodes( element, &list ); + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <bs> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <pr> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <empty> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + r = IXMLDOMNode_get_attributes( node, &attributes ); + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + next = (IXMLDOMNode*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_nextNode( attributes, &next ); + ok( r == S_FALSE, "Expected S_FALSE, ret %08x\n", r ); + ok( next == NULL, "Expected NULL, ret %p\n", next ); + IXMLDOMNamedNodeMap_Release( attributes ); + IXMLDOMNode_Release( node ); + node = NULL; + next = NULL; + IXMLDOMNodeList_Release( list ); + list = NULL; } else ok( FALSE, "no element\n");

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard Feb. 25, 2022

Feb. 25, 2022

Module: wine Branch: oldstable Commit: 4b3ca9abee7fd52d418811bfe4f9fa792f675ac9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b3ca9abee7fd52d418811bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:46 2021 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 167c7a524fd0ebc8c3ef3afd1af463dbf2b374ce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index af52e0e2833..e452c48df33 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -133,7 +133,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) * is_valid_directory * * Helper for RtlDosPathNameToNtPathName_U_WithStatus. - * Test if the path is an exisiting directory. + * Test if the path is an existing directory. */ static BOOL is_valid_directory(LPCWSTR path) {

1 0