winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
996 discussions
Start a n
N
ew thread
Alexandre Julliard : ntdll: Use the NLS case mapping table for towlower/towupper.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Alexandre Julliard : ntdll/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Alexandre Julliard : msvcrt/tests: Add tests for Unicode spaces in wcstol().
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Jeff Smith : msvcrt: Stop forwarding iswctype functions to ntdll.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in path functions.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in StrToInt* functions.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Alexandre Julliard : kernelbase: Don't use wcsicmp/wcsnicmp() on the full Unicode character range.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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, ®_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
0
0
Alexandre Julliard : kernelbase: Don't use towlower() on the full Unicode character range.
by Alexandre Julliard
11 Mar '20
11 Mar '20
Module: wine Branch: master Commit: 1a9ddc37590664b8710c19d487f92f86ded34dfe URL:
https://source.winehq.org/git/wine.git/?a=commit;h=1a9ddc37590664b8710c19d4…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 15:14:44 2020 +0100 kernelbase: Don't use towlower() on the full Unicode character range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 17 +++++++---------- dlls/kernelbase/string.c | 8 +++++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 93446815f2..0e0c3f3dbd 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1652,7 +1652,7 @@ int WINAPI PathCommonPrefixW(const WCHAR *file1, const WCHAR *file2, WCHAR *path if ((!*iter1 || *iter1 == '\\') && (!*iter2 || *iter2 == '\\')) len = iter1 - file1; /* Common to this point */ - if (!*iter1 || (towlower(*iter1) != towlower(*iter2))) + if (!*iter1 || (towupper(*iter1) != towupper(*iter2))) break; /* Strings differ at this point */ iter1++; @@ -1813,8 +1813,6 @@ int WINAPI PathGetDriveNumberA(const char *path) int WINAPI PathGetDriveNumberW(const WCHAR *path) { - WCHAR drive; - TRACE("%s\n", wine_dbgstr_w(path)); if (!path) @@ -1822,11 +1820,10 @@ int WINAPI PathGetDriveNumberW(const WCHAR *path) if (!wcsncmp(path, L"\\\\?\\", 4)) path += 4; - drive = towlower(path[0]); - if (drive < 'a' || drive > 'z' || path[1] != ':') - return -1; - - return drive - 'a'; + if (!path[0] || path[1] != ':') return -1; + if (path[0] >= 'A' && path[0] <= 'Z') return path[0] - 'A'; + if (path[0] >= 'a' && path[0] <= 'z') return path[0] - 'a'; + return -1; } BOOL WINAPI PathIsFileSpecA(const char *path) @@ -4733,7 +4730,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co work = (LPWSTR)base.pszProtocol; for (i = 0; i < base.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); /* mk is a special case */ if (base.nScheme == URL_SCHEME_MK) @@ -4871,7 +4868,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co { work = (LPWSTR)relative.pszProtocol; for (i = 0; i < relative.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); } /* Handle cases where relative has scheme. */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7c484e2858..75ee5b0512 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -924,7 +924,7 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) else if (*str == '+') str++; - if (flags & STIF_SUPPORT_HEX && *str == '0' && towlower(str[1]) == 'x') + if (flags & STIF_SUPPORT_HEX && *str == '0' && (str[1] == 'x' || str[1] == 'X')) { /* Read hex number */ str += 2; @@ -935,10 +935,12 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) while (iswxdigit(*str)) { value *= 16; - if (iswdigit(*str)) + if (*str >= '0' && *str <= '9') value += (*str - '0'); + else if (*str >= 'A' && *str <= 'Z') + value += 10 + (*str - 'A'); else - value += 10 + (towlower(*str) - 'a'); + value += 10 + (*str - 'a'); str++; }
1
0
0
0
Francois Gouget : testbot/Janitor: Fix reporting the version of deleted pending patchsets.
by Alexandre Julliard
11 Mar '20
11 Mar '20
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
0
0
Francois Gouget : testbot/PatchUtils: Detect when make_errors needs to be run.
by Alexandre Julliard
11 Mar '20
11 Mar '20
Module: tools Branch: master Commit: 74397efc8963baed242aad9c9cc59fb5539d8945 URL:
https://source.winehq.org/git/tools.git/?a=commit;h=74397efc8963baed242aad9…
Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 09:53:56 2020 +0100 testbot/PatchUtils: Detect when make_errors needs to be run. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 10 ++++++++++ testbot/lib/WineTestBot/PatchUtils.pm | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 13f9699..cc61e31 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -137,6 +137,16 @@ sub ApplyPatch($$) return undef; } } + if ($Impacts->{MakeErrors}) + { + InfoMsg "\nRunning make_errors\n"; + system("cd '$DataDir/$Dir/' && set -x && ./dlls/ntdll/make_errors"); + if ($? != 0) + { + LogMsg "make_errors failed\n"; + return undef; + } + } if ($Impacts->{MakeOpenGL}) { InfoMsg "\nRunning make_opengl\n"; diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 49bf101..f55dc4b 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -326,6 +326,11 @@ sub GetPatchImpacts($) $Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1; $Impacts->{IsWinePatch} = 1; } + elsif ($Line =~ m=^--- \w+/(?:dlls/ntdll/make_errors|dlls/ntdll/error\.c|include/ntstatus\.h|include/winerror\.h)$=) + { + $Impacts->{MakeErrors} = 1; + $Impacts->{IsWinePatch} = 1; + } elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=) { $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;
1
0
0
0
← Newer
1
...
70
71
72
73
74
75
76
...
100
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
Results per page:
10
25
50
100
200