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

Alexandre Julliard : kernelbase: Don't use wcsicmp/wcsnicmp() on the full Unicode character range.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: ef95e4a8b9a4e772937514fb2538c145a07aa6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef95e4a8b9a4e772937514fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 20:03:14 2020 +0100 kernelbase: Don't use wcsicmp/wcsnicmp() on the full Unicode character range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 5 ++++- dlls/kernelbase/path.c | 3 ++- dlls/kernelbase/registry.c | 2 +- dlls/kernelbase/string.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 6591a11073..79e62716be 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "winioctl.h" #include "wincon.h" @@ -183,7 +184,9 @@ static NTSTATUS find_actctx_dllpath( const WCHAR *name, WCHAR **path ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (!dirlen || wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, L".manifest" )) + if (!dirlen || + CompareStringOrdinal( p, dirlen, info->lpAssemblyDirectoryName, dirlen, TRUE ) != CSTR_EQUAL || + wcsicmp( p + dirlen, L".manifest" )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0e0c3f3dbd..57102755c6 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2713,7 +2713,8 @@ BOOL WINAPI PathUnExpandEnvStringsW(const WCHAR *path, WCHAR *buffer, UINT buf_l while (cur->var) { /* path can't contain expanded value or value wasn't retrieved */ - if (cur->len == 0 || cur->len > pathlen || wcsnicmp(cur->path, path, cur->len)) + if (cur->len == 0 || cur->len > pathlen || + CompareStringOrdinal( cur->path, cur->len, path, cur->len, TRUE ) != CSTR_EQUAL) { cur++; continue; diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 4f2234b1ef..e6f3722f70 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2551,7 +2551,7 @@ static int reg_mui_cache_get(const WCHAR *file_name, UINT index, WCHAR **buffer) LIST_FOR_EACH_ENTRY(ent, &reg_mui_cache, struct mui_cache_entry, entry) { if (ent->index == index && ent->locale == GetThreadLocale() && - !wcsicmp(ent->file_name, file_name)) + !lstrcmpiW(ent->file_name, file_name)) goto found; } return 0; diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 75ee5b0512..bd6ff03643 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -416,7 +416,7 @@ WCHAR * WINAPI StrStrNIW(const WCHAR *str, const WCHAR *search, UINT max_len) for (i = max_len; *str && (i > 0); i--, str++) { - if (!wcsnicmp(str, search, len)) + if (!StrCmpNIW(str, search, len)) return (WCHAR *)str; }

1 0

Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in StrToInt* functions.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 0eec0eb7e094eb3a50d20b230f732625a704483e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eec0eb7e094eb3a50d20b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 12:22:14 2020 +0100 kernelbase: Don't allow the full Unicode character range in StrToInt* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/string.c | 30 +++++++--------- dlls/shlwapi/tests/string.c | 84 +++++++++++++++++++++++++++++++++------------ 2 files changed, 76 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eec0eb7e094eb3a50d2…

1 0

Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in path functions.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 5933c2a6901218bc6ef7b6e808b0571fa96b542e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5933c2a6901218bc6ef7b6e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 12:45:06 2020 +0100 kernelbase: Don't allow the full Unicode character range in path functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/kernelbase/path.c | 134 ++++++++++++++++++++++--------------------------- 2 files changed, 62 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5933c2a6901218bc6ef7…

1 0

Jeff Smith : msvcrt: Stop forwarding iswctype functions to ntdll.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 89ca556ac54606879b788880e522f9da65196f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ca556ac54606879b788880… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 10 20:59:24 2020 +0100 msvcrt: Stop forwarding iswctype functions to ntdll. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 12 files changed, 41 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89ca556ac54606879b78…

1 0

Alexandre Julliard : ntdll/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: a1659db87f1892322b640591e9305011d22e542c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1659db87f1892322b640591… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:27:03 2020 +0100 ntdll/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 296 +++++++++++++++++++++------------------------- 1 file changed, 135 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a1659db87f1892322b64…

1 0

Alexandre Julliard : ntdll: Use the NLS case mapping table for towlower/towupper.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 0d6802dcc5332faf4e6883cfd50d258a1741169d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6802dcc5332faf4e6883cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:30:42 2020 +0100 ntdll: Use the NLS case mapping table for towlower/towupper. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 19 +++++++++++++++++++ dlls/ntdll/tests/string.c | 15 +++++++++++++++ dlls/ntdll/wcstring.c | 18 ------------------ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 8833cfa712..8334de172d 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1572,6 +1572,25 @@ NTSTATUS WINAPI RtlUpcaseUnicodeToOemN( char *dst, DWORD dstlen, DWORD *reslen, } +/********************************************************************* + * towlower (NTDLL.@) + */ +WCHAR __cdecl NTDLL_towlower( WCHAR ch ) +{ + if (ch >= 0x100) return ch; + return casemap( nls_info.LowerCaseTable, ch ); +} + + +/********************************************************************* + * towupper (NTDLL.@) + */ +WCHAR __cdecl NTDLL_towupper( WCHAR ch ) +{ + return casemap( nls_info.UpperCaseTable, ch ); +} + + /****************************************************************** * RtlLocaleNameToLcid (NTDLL.@) */ diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 548c84fb1d..b9dfda7c19 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -33,6 +33,7 @@ static NTSTATUS (WINAPI *pRtlUnicodeStringToAnsiString)(STRING *, const UNICODE_ static VOID (WINAPI *pRtlFreeAnsiString)(PSTRING); static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING,LPCSTR); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); +static WCHAR (WINAPI *pRtlUpcaseUnicodeChar)(WCHAR); static int (__cdecl *patoi)(const char *); static LONG (__cdecl *patol)(const char *); @@ -54,6 +55,8 @@ static LPWSTR (__cdecl *p_ui64tow)(ULONGLONG, LPWSTR, INT); static LPWSTR (__cdecl *p_wcslwr)(LPWSTR); static LPWSTR (__cdecl *p_wcsupr)(LPWSTR); +static WCHAR (__cdecl *ptowlower)(WCHAR); +static WCHAR (__cdecl *ptowupper)(WCHAR); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); @@ -78,6 +81,7 @@ static void InitFunctionPtrs(void) X(RtlFreeAnsiString); X(RtlCreateUnicodeStringFromAsciiz); X(RtlFreeUnicodeString); + X(RtlUpcaseUnicodeChar); X(atoi); X(atol); X(_atoi64); @@ -96,6 +100,8 @@ static void InitFunctionPtrs(void) X(_ui64tow); X(_wcslwr); X(_wcsupr); + X(towlower); + X(towupper); X(wcschr); X(wcsrchr); X(qsort); @@ -1151,6 +1157,7 @@ static void test_wcslwrupr(void) static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; static WCHAR emptyW[] = {0}; static const WCHAR constemptyW[] = {0}; + int i; if (0) /* crashes on native */ { @@ -1166,6 +1173,14 @@ static void test_wcslwrupr(void) ok(p_wcsupr(emptyW) == emptyW, "p_wcsupr returned different string\n"); ok(p_wcslwr((LPWSTR)constemptyW) == constemptyW, "p_wcslwr returned different string\n"); ok(p_wcsupr((LPWSTR)constemptyW) == constemptyW, "p_wcsupr returned different string\n"); + + for (i = 0; i < 65536; i++) + { + WCHAR lwr = ((i >= 'A' && i <= 'Z') || (i >= 0xc0 && i <= 0xd6) || (i >= 0xd8 && i <= 0xde)) ? i + 32 : i; + WCHAR upr = pRtlUpcaseUnicodeChar( i ); + ok( ptowlower( i ) == lwr, "%04x: towlower got %04x expected %04x\n", i, ptowlower( i ), lwr ); + ok( ptowupper( i ) == upr, "%04x: towupper got %04x expected %04x\n", i, ptowupper( i ), upr ); + } } static int __cdecl intcomparefunc(const void *a, const void *b) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index acdb33ac24..fe18af7170 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -69,24 +69,6 @@ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) } -/********************************************************************* - * towlower (NTDLL.@) - */ -WCHAR __cdecl NTDLL_towlower( WCHAR ch ) -{ - return tolowerW(ch); -} - - -/********************************************************************* - * towupper (NTDLL.@) - */ -WCHAR __cdecl NTDLL_towupper( WCHAR ch ) -{ - return toupperW(ch); -} - - /*********************************************************************** * wcscat (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: 5a4cc97a3bcbae46e5645deb2231f464fd553ed7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a4cc97a3bcbae46e5645deb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 14:32:37 2020 +0100 ntdll: Don't handle the full Unicode character range in wcslwr/wcsupr. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/string.c | 13 +++++++++++++ dlls/ntdll/wcstring.c | 20 ++++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b9dfda7c19..1ec5f3a278 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1157,6 +1157,7 @@ static void test_wcslwrupr(void) static WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; static WCHAR emptyW[] = {0}; static const WCHAR constemptyW[] = {0}; + WCHAR buffer[65536]; int i; if (0) /* crashes on native */ @@ -1181,6 +1182,18 @@ static void test_wcslwrupr(void) ok( ptowlower( i ) == lwr, "%04x: towlower got %04x expected %04x\n", i, ptowlower( i ), lwr ); ok( ptowupper( i ) == upr, "%04x: towupper got %04x expected %04x\n", i, ptowupper( i ), upr ); } + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcslwr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'A' && i <= 'Z' ? i + 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); + + for (i = 1; i < 65536; i++) buffer[i - 1] = i; + buffer[65535] = 0; + p_wcsupr( buffer ); + for (i = 1; i < 65536; i++) + ok( buffer[i - 1] == (i >= 'a' && i <= 'z' ? i - 32 : i), "%04x: got %04x\n", i, buffer[i-1] ); } static int __cdecl intcomparefunc(const void *a, const void *b) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index fe18af7170..15a6a15531 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -47,7 +47,15 @@ INT __cdecl NTDLL__wcsicmp( LPCWSTR str1, LPCWSTR str2 ) */ LPWSTR __cdecl NTDLL__wcslwr( LPWSTR str ) { - return strlwrW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'A' && ch <= 'Z') ch += 32; + *str++ = ch; + } + return ret; } @@ -65,7 +73,15 @@ INT __cdecl NTDLL__wcsnicmp( LPCWSTR str1, LPCWSTR str2, INT n ) */ LPWSTR __cdecl NTDLL__wcsupr( LPWSTR str ) { - return struprW( str ); + WCHAR *ret = str; + + while (*str) + { + WCHAR ch = *str; + if (ch >= 'a' && ch <= 'z') ch -= 32; + *str++ = ch; + } + return ret; }

1 0

Alexandre Julliard : msvcrt/tests: Add tests for Unicode spaces in wcstol().
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: wine Branch: master Commit: bf48e86add972345d958b4949eeaaf77715bf4a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf48e86add972345d958b494… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 09:28:59 2020 +0100 msvcrt/tests: Add tests for Unicode spaces in wcstol(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/string.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 29a8958b81..05aa747f84 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -3307,6 +3307,8 @@ static void test__wcstoi64(void) { L"9", 9, 9, 10 }, { L" ", 0, 0 }, { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0\x2002\x2003\x2028\x3000 +44", 44, 44 }, { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */ @@ -3373,6 +3375,8 @@ static void test__wcstol(void) { L"9", 9, 9, 10 }, { L" ", 0, 0 }, { L"-1234", -1234, -1234 }, + { L"\x09\x0a\x0b\x0c\x0d -123", -123, -123 }, + { L"\xa0\x2002\x2003\x2028\x3000 +44", 44, 44 }, { { 0x3231 }, 0, 0 }, /* PARENTHESIZED IDEOGRAPH STOCK */ { { 0x4e00 }, 0, 0 }, /* CJK Ideograph, First */ { { 0x0bef }, 0, 0 }, /* TAMIL DIGIT NINE */

1 0

Francois Gouget : testbot/UpdateTaskLogs: Fix the detection of Wine test reports.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: tools Branch: master Commit: 4711c9d740b2e06e96d91c729f0d9cfc8e4551dc URL: https://source.winehq.org/git/tools.git/?a=commit;h=4711c9d740b2e06e96d91c7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:32 2020 +0100 testbot/UpdateTaskLogs: Fix the detection of Wine test reports. We know a report come from a Wine test if the job was created for a patch. But the step that references the patch is not necessarily the task's parent step: it could also be the build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/UpdateTaskLogs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/testbot/bin/UpdateTaskLogs b/testbot/bin/UpdateTaskLogs index 94adf42..e50e449 100755 --- a/testbot/bin/UpdateTaskLogs +++ b/testbot/bin/UpdateTaskLogs @@ -286,9 +286,9 @@ sub MoveRefReport($$;$) return 0; } -sub ProcessTaskLogs($$$) +sub ProcessTaskLogs($$$$) { - my ($Step, $Task, $CollectOnly) = @_; + my ($Step, $Task, $IsWineTest, $CollectOnly) = @_; my $Rc = 0; my $ReportNames; @@ -418,12 +418,11 @@ sub ProcessTaskLogs($$$) { # And (re)build the .errors files, even if Status != 'completed' for # task.log and testbot.log. - my ($IsWineTest, $TaskTimedOut); + my $TaskTimedOut; if ($Task->Started and $Task->Ended) { my $Duration = $Task->Ended - $Task->Started; $TaskTimedOut = $Duration > $Task->Timeout; - $IsWineTest = ($Step->Type eq "patch" or $Step->Type eq "suite"); } foreach my $LogName (@{GetLogFileNames($TaskDir, "+old")}) { @@ -564,11 +563,14 @@ my $Jobs = CreateJobs(); foreach my $Task (sort { ($a->Ended || 0) <=> ($b->Ended || 0) } @AllTasks) { my ($JobId, $StepNo, $TaskNo) = @{$Task->GetMasterKey()}; - my $Step = $Jobs->GetItem($JobId)->Steps->GetItem($StepNo); + my $Steps = $Jobs->GetItem($JobId)->Steps; + my $Step = $Steps->GetItem($StepNo); + my $IsWineTest = $Step->FileType eq "patch" || + $Steps->GetItem(1)->FileType eq "patch"; my $CollectOnly = ((defined $OptJobId and $OptJobId ne $JobId) or (defined $OptStepNo and $OptStepNo ne $StepNo) or (defined $OptTaskNo and $OptTaskNo ne $TaskNo)); - $Rc += ProcessTaskLogs($Step, $Task, $CollectOnly); + $Rc += ProcessTaskLogs($Step, $Task, $IsWineTest, $CollectOnly); } exit $Rc ? 1 : 0;

1 0

Francois Gouget : testbot/Janitor: Fix reporting the version of deleted pending patchsets.
by Alexandre Julliard March 11, 2020

March 11, 2020

Module: tools Branch: master Commit: 55ada8150ab9b2d3212a09628d37be00faf5ed6d URL: https://source.winehq.org/git/tools.git/?a=commit;h=55ada8150ab9b2d3212a096… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:56:23 2020 +0100 testbot/Janitor: Fix reporting the version of deleted pending patchsets. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 9481d51..8fa1782 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -162,7 +162,7 @@ foreach my $Set (@{$Sets->GetItems()}) if (! defined($MostRecentPatch) || $MostRecentPatch->Received < $DeleteBefore) { - my $Version = $Version eq "" ? "" : " v$Version"; + my $Version = $Set->Version ? " v". $Set->Version : ""; Trace "Deleting pending series$Version for ", $Set->EMail, " (got ", join(" ", sort @Parts), " / ", $Set->TotalParts, ")\n"; next if ($DryRun);

1 0