January 2020 - Wine-commits

Nikolay Sivov : include: Update shell link flags enum.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 7f80dc25cbf4e83a789ee301a52f850e6f37111f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f80dc25cbf4e83a789ee301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 13:11:02 2020 +0300 include: Update shell link flags enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlobj.h | 61 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index bc1150bf91..d30944662f 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -1375,36 +1375,39 @@ typedef struct _SHChangeNotifyEntry void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID dwItem2); -typedef enum { - SLDF_HAS_ID_LIST = 0x00000001, - SLDF_HAS_LINK_INFO = 0x00000002, - SLDF_HAS_NAME = 0x00000004, - SLDF_HAS_RELPATH = 0x00000008, - SLDF_HAS_WORKINGDIR = 0x00000010, - SLDF_HAS_ARGS = 0x00000020, - SLDF_HAS_ICONLOCATION = 0x00000040, - SLDF_UNICODE = 0x00000080, - SLDF_FORCE_NO_LINKINFO = 0x00000100, - SLDF_HAS_EXP_SZ = 0x00000200, - SLDF_RUN_IN_SEPARATE = 0x00000400, - SLDF_HAS_LOGO3ID = 0x00000800, - SLDF_HAS_DARWINID = 0x00001000, - SLDF_RUNAS_USER = 0x00002000, - SLDF_HAS_EXP_ICON_SZ = 0x00004000, - SLDF_NO_PIDL_ALIAS = 0x00008000, - SLDF_FORCE_UNCNAME = 0x00010000, - SLDF_RUN_WITH_SHIMLAYER = 0x00020000, - SLDF_FORCE_NO_LINKTRACK = 0x00040000, - SLDF_ENABLE_TARGET_METADATA = 0x00080000, +typedef enum +{ + SLDF_DEFAULT = 0x00000000, + SLDF_HAS_ID_LIST = 0x00000001, + SLDF_HAS_LINK_INFO = 0x00000002, + SLDF_HAS_NAME = 0x00000004, + SLDF_HAS_RELPATH = 0x00000008, + SLDF_HAS_WORKINGDIR = 0x00000010, + SLDF_HAS_ARGS = 0x00000020, + SLDF_HAS_ICONLOCATION = 0x00000040, + SLDF_UNICODE = 0x00000080, + SLDF_FORCE_NO_LINKINFO = 0x00000100, + SLDF_HAS_EXP_SZ = 0x00000200, + SLDF_RUN_IN_SEPARATE = 0x00000400, + SLDF_HAS_LOGO3ID = 0x00000800, + SLDF_HAS_DARWINID = 0x00001000, + SLDF_RUNAS_USER = 0x00002000, + SLDF_HAS_EXP_ICON_SZ = 0x00004000, + SLDF_NO_PIDL_ALIAS = 0x00008000, + SLDF_FORCE_UNCNAME = 0x00010000, + SLDF_RUN_WITH_SHIMLAYER = 0x00020000, + SLDF_FORCE_NO_LINKTRACK = 0x00040000, + SLDF_ENABLE_TARGET_METADATA = 0x00080000, + SLDF_DISABLE_LINK_PATH_TRACKING = 0x00100000, SLDF_DISABLE_KNOWNFOLDER_RELATIVE_TRACKING = 0x00200000, - SDLF_NO_KF_ALIAS = 0x00400000, - SDLF_ALLOW_LINK_TO_LINK = 0x00800000, - SDLF_UNALIAS_ON_SAVE = 0x01000000, - SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, - SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, - SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, - SLDF_VALID = 0x0ffff7ff, - SLDF_RESERVED = 0x80000000, + SDLF_NO_KF_ALIAS = 0x00400000, + SDLF_ALLOW_LINK_TO_LINK = 0x00800000, + SDLF_UNALIAS_ON_SAVE = 0x01000000, + SDLF_PREFER_ENVIRONMENT_PATH = 0x02000000, + SDLF_KEEP_LOCAL_IDLIST_FOR_UNC_TARGET = 0x04000000, + SDLF_PERSIST_VOLUME_ID_ACTIVE = 0x08000000, + SLDF_VALID = 0x0ffff7ff, + SLDF_RESERVED = 0x80000000, } SHELL_LINK_DATA_FLAGS; typedef struct tagDATABLOCKHEADER

1 0

Nikolay Sivov : shlwapi: Fix spec entry for QISearch().
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 91679db7c29164d3f031838d58a87f04c214d325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91679db7c29164d3f031838d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 12:23:49 2020 +0300 shlwapi: Fix spec entry for QISearch(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 2 +- .../api-ms-win-core-shlwapi-obsolete-l1-2-0.spec | 2 +- .../api-ms-win-downlevel-shlwapi-l1-1-0.spec | 2 +- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index a867dfd975..22ebae6d7c 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall StrCSpnA(str str) shlwapi.StrCSpnA @ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec index 50661b1376..8de25172ae 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec @@ -1,4 +1,4 @@ -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW @ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW diff --git a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec index c8d82ac556..acd4526dd9 100644 --- a/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-shlwapi-l1-1-0/api-ms-win-downlevel-shlwapi-l1-1-0.spec @@ -67,7 +67,7 @@ @ stdcall PathStripToRootW(wstr) shlwapi.PathStripToRootW @ stdcall PathUnquoteSpacesA(str) shlwapi.PathUnquoteSpacesA @ stdcall PathUnquoteSpacesW(wstr) shlwapi.PathUnquoteSpacesW -@ stdcall QISearch(long long long long) shlwapi.QISearch +@ stdcall QISearch(ptr ptr ptr ptr) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString @ stdcall SHRegCloseUSKey(ptr) shlwapi.SHRegCloseUSKey @ stdcall SHRegDeleteUSValueA(long str long) shlwapi.SHRegDeleteUSValueA diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a7f3eeb869..9b4b6357c6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -216,7 +216,7 @@ 216 stdcall -noname SHAnsiToUnicodeCP(long str ptr long) 217 stdcall -ordinal SHUnicodeToAnsi(wstr ptr ptr) 218 stdcall -noname SHUnicodeToAnsiCP(long wstr ptr long) -219 stdcall -import QISearch(long long long long) +219 stdcall -import QISearch(ptr ptr ptr ptr) 220 stdcall -noname SHSetDefaultDialogFont(ptr long) 221 stdcall -noname SHRemoveDefaultDialogFont(ptr) 222 stdcall -noname SHGlobalCounterCreate(long)

1 0

André Hentschel : advapi32/tests: Don't test function directly when reporting GetLastError().
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 2114a4dd9b4fa41a4df4c835531c81af028dfbcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2114a4dd9b4fa41a4df4c835… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jan 6 14:22:13 2020 +0100 advapi32/tests: Don't test function directly when reporting GetLastError(). Found with Coccinelle. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 8bcd16cb95..d52afb8c82 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -7346,7 +7346,8 @@ static void test_child_token_sd(void) ok(acl->AceCount, "Expected at least one ACE\n"); for (i = 0; i < acl->AceCount; i++) { - ok(pGetAce(acl, i, (void **)&acc_ace), "GetAce failed with error %u\n", GetLastError()); + ret = pGetAce(acl, i, (void **)&acc_ace); + ok(ret, "GetAce failed with error %u\n", GetLastError()); ok(acc_ace->Header.AceType != ACCESS_ALLOWED_ACE_TYPE || !EqualSid(&acc_ace->SidStart, psid), "ACE inherited from the parent\n"); }

1 0

Alexandre Julliard : kernelbase: Remove trailing dot in GetComputerNameExW() when domain name is empty.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: b276bda5a21df595973e3ad5552c66a1799f5d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b276bda5a21df595973e3ad5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 5 17:30:34 2020 +0100 kernelbase: Remove trailing dot in GetComputerNameExW() when domain name is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48293 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/registry.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 72b7711714..137c0efb88 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -3146,13 +3146,15 @@ BOOL WINAPI GetComputerNameExW( COMPUTER_NAME_FORMAT type, WCHAR *name, DWORD *l case ComputerNameDnsFullyQualified: case ComputerNamePhysicalDnsFullyQualified: { - WCHAR buffer[256]; - DWORD size = ARRAY_SIZE(buffer); + WCHAR *domain, buffer[256]; + DWORD size = ARRAY_SIZE(buffer) - 1; if (!GetComputerNameExW( ComputerNameDnsHostname, buffer, &size )) return FALSE; - lstrcatW( buffer, L"." ); - size = ARRAY_SIZE(buffer) - lstrlenW(buffer); - if (!GetComputerNameExW( ComputerNameDnsDomain, buffer + lstrlenW(buffer), &size )) return FALSE; + domain = buffer + lstrlenW(buffer); + *domain++ = '.'; + size = ARRAY_SIZE(buffer) - (domain - buffer); + if (!GetComputerNameExW( ComputerNameDnsDomain, domain, &size )) return FALSE; + if (!*domain) domain[-1] = 0; size = lstrlenW(buffer); if (name && size < *len) {

1 0

Alexandre Julliard : kernelbase: Set an explicit load address.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 8f7d88c707b84e9f414a66d4b4a67c0f22970099 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f7d88c707b84e9f414a66d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 5 17:31:58 2020 +0100 kernelbase: Set an explicit load address. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48417 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in index 9279ddbb57..b62fc825a6 100644 --- a/dlls/kernelbase/Makefile.in +++ b/dlls/kernelbase/Makefile.in @@ -1,7 +1,7 @@ MODULE = kernelbase.dll IMPORTLIB = kernelbase IMPORTS = uuid ntdll winecrt0 -EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin +EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -mno-cygwin -Wl,--image-base,0x7b000000 C_SRCS = \ collation.c \

1 0

Alistair Leslie-Hughes : dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 01d521e5afc39dfcfc1487f60102afe0e58337b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d521e5afc39dfcfc1487f6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Jan 4 16:44:16 2020 +0100 dmime: IDirectMusicSegment8 SetLoopPoints support zero start/end. Both end and start set to zero loop the whole segement. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=25728 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segment.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index b6357b6f5f..0455b6c5dd 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -445,17 +445,20 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_GetStartPoint(IDirectMusicSegment } static HRESULT WINAPI IDirectMusicSegment8Impl_SetLoopPoints(IDirectMusicSegment8 *iface, - MUSIC_TIME mtStart, MUSIC_TIME mtEnd) + MUSIC_TIME start, MUSIC_TIME end) { - IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); + IDirectMusicSegment8Impl *This = impl_from_IDirectMusicSegment8(iface); - TRACE("(%p, %d, %d)\n", This, mtStart, mtEnd); - if (mtStart >= This->header.mtLength || mtEnd > This->header.mtLength || mtStart > mtEnd) { - return DMUS_E_OUT_OF_RANGE; - } - This->header.mtLoopStart = mtStart; - This->header.mtLoopEnd = mtEnd; - return S_OK; + TRACE("(%p, %d, %d)\n", This, start, end); + + if ((end || start) && + (start >= This->header.mtLength || end > This->header.mtLength || start > end)) + return DMUS_E_OUT_OF_RANGE; + + This->header.mtLoopStart = start; + This->header.mtLoopEnd = end; + + return S_OK; } static HRESULT WINAPI IDirectMusicSegment8Impl_GetLoopPoints(IDirectMusicSegment8 *iface,

1 0

Zebediah Figura : shell32/tests: Avoid testing that only certain services are requested by IObjectWithSite::SetSite().
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 649119b30ead720bd1a5dd2ecc3c6e7abdcae6f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=649119b30ead720bd1a5dd2e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jan 3 21:25:43 2020 -0600 shell32/tests: Avoid testing that only certain services are requested by IObjectWithSite::SetSite(). There doesn't seem to be a lot of point in doing this, especially given that newer versions of Windows continually add more interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/ebrowser.c | 144 +++++------------------------------------- 1 file changed, 15 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=649119b30ead720bd1a5…

1 0

Zebediah Figura : ntdll: Fix a typo in get_current_directory().
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 230a09b707fe90b243d76fb8d24c4d5e71a71a2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=230a09b707fe90b243d76fb8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 4 11:35:05 2020 -0600 ntdll: Fix a typo in get_current_directory(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48415 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 116a57a8e7..de3ada01a0 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,7 +622,7 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + if (nt_name.Length > 6 * sizeof(WCHAR) && nt_name.Buffer[5] == ':') { dir->Length = nt_name.Length - 4 * sizeof(WCHAR); memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length );

1 0

Zebediah Figura : kernel32/tests: Fix some codepage test failures with Windows 10.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: f692d9e7bc4d5b03301e6fa2c680306d5ff128b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f692d9e7bc4d5b03301e6fa2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 4 10:32:54 2020 -0600 kernel32/tests: Fix some codepage test failures with Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 2c081586f2..42e49888e0 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1060,7 +1060,7 @@ static void test_threadcp(void) static const LCID JAPANESE = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); static const LCID CHINESE = MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT); - BOOL islead, islead_acp; + BOOL islead, islead_default; CPINFOEXA cpi; UINT cp, acp; int i, num; @@ -1155,8 +1155,8 @@ static void test_threadcp(void) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); else - ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", - cpi.CodePage, lcids[i].lcid, acp); + ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, + "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); /* WideCharToMultiByte - CP_THREAD_ACP */ num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); @@ -1172,11 +1172,12 @@ static void test_threadcp(void) { SetThreadLocale(isleads_nocp[i].lcid); - islead_acp = IsDBCSLeadByteEx(CP_ACP, isleads_nocp[i].testchar); - islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); + GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); + islead_default = IsDBCSLeadByteEx(cpi.CodePage, isleads_nocp[i].testchar); + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); - ok(islead == islead_acp, "wrong islead %i for test char %x in lcid %04x. should be %i\n", - islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_acp); + ok(islead == islead_default, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_default); } /* IsDBCSLeadByteEx - locales with codepage */

1 0

Alex Henrie : ntdll/tests: Fix expected RtlIpv6StringToAddress terminator output.
by Alexandre Julliard 05 Jan '20

05 Jan '20

Module: wine Branch: master Commit: 42525d8516ca1fbe5ec64670cd30145bcea8dc9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=42525d8516ca1fbe5ec64670… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Jan 4 15:24:03 2020 -0700 ntdll/tests: Fix expected RtlIpv6StringToAddress terminator output. The "broken" function was applied to the wrong condition in the "ok" statement (RtlIpv6StringToAddress is supposed to set the terminator to the first character after the address, not the second-to-last character of the address). However, since this test is already being skipped on XP and Vista and we really don't need a test for how exactly XP and Vista are broken, we can just delete it. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 3e1d92c3d2..e49888022f 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1487,7 +1487,7 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correctly + /* win_broken: XP and Vista do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; @@ -1501,7 +1501,7 @@ static const struct { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "0:0:0:0:0:0:0:1", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 13, + { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0 }, win_broken_6 }, { "0:0:0:0:0:0:13.1.68.3", STATUS_SUCCESS, 21, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, @@ -1517,7 +1517,7 @@ static const struct { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, { "1080:0:0:0:8:800:200c:417a", STATUS_SUCCESS, 26, { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, - { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 13, + { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 15, { 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 45, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1531,7 +1531,7 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333:4444:r5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 20, { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, - { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 34, + { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 36, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666::", STATUS_SUCCESS, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, @@ -2112,13 +2112,6 @@ static void test_RtlIpv6StringToAddress(void) "[%s] terminator = %p, expected it not to change\n", ipv6_tests[i].address, terminator); } - else if (ipv6_tests[i].flags & win_broken_6) - { - PCSTR expected = ipv6_tests[i].address + ipv6_tests[i].terminator_offset; - ok(terminator == expected || broken(terminator == expected + 2), - "[%s] terminator = %p, expected %p\n", - ipv6_tests[i].address, terminator, expected); - } else { ok(terminator == ipv6_tests[i].address + ipv6_tests[i].terminator_offset,

1 0