February 2022 - Wine-commits

Francois Gouget : oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 76d30e2d5125bcd926f43045fc2277664a00e8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76d30e2d5125bcd926f43045… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:06 2021 +0200 oleaut32/tests: Allow testing VarParseNumFromStr() using Unicode strings. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 627988565b0d77d88d5c2ba0b1419569274afa2e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 8492a720855..1fec6c33134 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1262,21 +1262,27 @@ static void test_VariantCopyInd(void) "CopyInd(ref->ref): expected E_INVALIDARG, got 0x%08x\n", hres); } -static HRESULT (WINAPI *pVarParseNumFromStr)(OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); +static HRESULT (WINAPI *pVarParseNumFromStr)(const OLECHAR*,LCID,ULONG,NUMPARSE*,BYTE*); /* Macros for converting and testing the result of VarParseNumFromStr */ #define FAILDIG 255 -static HRESULT convert_str( const char *str, INT dig, ULONG flags, +static HRESULT wconvert_str( const OLECHAR *str, INT dig, ULONG flags, NUMPARSE *np, BYTE rgb[128], LCID lcid ) { - OLECHAR buff[128]; - MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); memset( rgb, FAILDIG, 128 ); memset( np, 255, sizeof(*np) ); np->cDig = dig; np->dwInFlags = flags; - return pVarParseNumFromStr( buff, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); + return pVarParseNumFromStr( str, lcid, LOCALE_NOUSEROVERRIDE, np, rgb); +} + +static HRESULT convert_str( const char *str, INT dig, ULONG flags, + NUMPARSE *np, BYTE rgb[128], LCID lcid ) +{ + OLECHAR buff[128]; + MultiByteToWideChar( CP_ACP,0, str, -1, buff, ARRAY_SIZE( buff )); + return wconvert_str(buff, dig, flags, np, rgb, lcid); } static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULONG b, ULONG c, @@ -1293,6 +1299,8 @@ static void expect_NumFromStr( int line, HRESULT hres, NUMPARSE *np, INT a, ULON } } +#define WCONVERTN(str,dig,flags) hres = wconvert_str( str, dig, flags, &np, rgb, lcid ) +#define WCONVERT(str,flags) WCONVERTN(str,sizeof(rgb),flags) #define CONVERTN(str,dig,flags) hres = convert_str( str, dig, flags, &np, rgb, lcid ) #define CONVERT(str,flags) CONVERTN(str,sizeof(rgb),flags) #define EXPECT(a,b,c,d,e,f) expect_NumFromStr( __LINE__, hres, &np, a, b, c, d, e, f ) @@ -1307,7 +1315,6 @@ static void test_VarParseNumFromStr(void) LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); NUMPARSE np; BYTE rgb[128]; - WCHAR str[128]; /** No flags **/ @@ -1731,10 +1738,9 @@ static void test_VarParseNumFromStr(void) EXPECT(1,NUMPRS_STD,NUMPRS_DECIMAL,4,0,-1); EXPECT2(1,0); - str[0] = 0x0660; - str[1] = 0; - hres = pVarParseNumFromStr(str, lcid, LOCALE_NOUSEROVERRIDE, &np, rgb); - ok(hres == DISP_E_TYPEMISMATCH, "VarParseNumFromStr returned %08x\n", hres); + /* Arabic numerals are not allowed "0" */ + WCONVERT(L"\x660", NUMPRS_STD); + EXPECTFAIL; } static HRESULT (WINAPI *pVarNumFromParseNum)(NUMPARSE*,BYTE*,ULONG,VARIANT*);

1 0

Francois Gouget : oleaut32/tests: Add more VarParseNumFromStr() tests.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: dffceba79976db0fe42481b38d66ae6783a53b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dffceba79976db0fe42481b3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Jul 16 17:16:08 2021 +0200 oleaut32/tests: Add more VarParseNumFromStr() tests. Check how it handles currency signs and spaces before and after the digits. Check the combination of thousands separators, spaces and commas. Check handling of regular vs. non-breaking spaces since the latter are often used in some locales. And check what happens in the French locale where spaces and thousands separators are identical and the currency sign comes after the digits and, quite often, a space. Check handling of multi-character currency symbols. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 54ee0e9bfd70072f00ac2c330ddf853b3439cde8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 480 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 460 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dffceba79976db0fe424…

1 0

Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: e4ea517b6cd318b98028a1d7afb9a3711d1c8ca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4ea517b6cd318b98028a1d7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 20 14:02:23 2021 +0200 oleaut32: Fix VarParseNumFromStr()'s support for two-character currencies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51452 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 4e34e7513d3fdd590c8d5edff4003efc7ba4b135) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 7 +++---- dlls/oleaut32/variant.c | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index ee21590706c..c2cf93caf6e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -2153,14 +2153,13 @@ static void test_VarParseNumFromStrMisc(void) /* 2 Polish zloty */ lcid = MAKELCID(MAKELANGID(LANG_POLISH,SUBLANG_POLISH_POLAND),SORT_DEFAULT); WCONVERT(L"z\x142\x32", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0); - todo_wine EXPECT2(2,FAILDIG); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,3,0,0); + EXPECT2(2,FAILDIG); /* Multi-character currencies can be repeated too "zl2zlzl" */ WCONVERT(L"z\x142\x32z\x142z\x142", NUMPRS_CURRENCY|NUMPRS_USE_ALL); todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); - todo_wine EXPECTRGB(0,2); - EXPECTRGB(1,FAILDIG); + EXPECT2(2,FAILDIG); lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); WCONVERT(L"3CHF", NUMPRS_CURRENCY|NUMPRS_USE_ALL); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 36191b6b424..143895bde2f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1668,8 +1668,8 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) { pNumprs->dwOutFlags |= NUMPRS_CURRENCY; - cchUsed++; - lpszStr++; + cchUsed += chars.cCurrencyLocal2 ? 2 : 1; + lpszStr += chars.cCurrencyLocal2 ? 2 : 1; /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator;

1 0

Francois Gouget : oleaut32: VarParseNumFromStr() accepts trailing currency symbols.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: bf217a1a47f4aa34e41c92b5c4f279abf077de63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf217a1a47f4aa34e41c92b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 20 14:02:12 2021 +0200 oleaut32: VarParseNumFromStr() accepts trailing currency symbols. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e02a7e579cc48079d70f2ef00957255d28d119d6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 16 ++++++++-------- dlls/oleaut32/variant.c | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index c2cf93caf6e..bf6152554ad 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1641,7 +1641,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, but is allowed after the amount and can even be repeated! */ CONVERT("$11$$", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); EXPECT2(1,1); EXPECTRGB(2,FAILDIG); @@ -1687,7 +1687,7 @@ static void test_VarParseNumFromStrEn(void) /* With flag, unless explicitly allowed */ WCONVERT(wstr, NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); EXPECT2(1,1); EXPECTRGB(2,FAILDIG); @@ -2005,7 +2005,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag, consumes all currency signs! "E12EE" */ WCONVERT(L"\x20ac\x31\x32\x20ac\x20ac", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,5,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); @@ -2024,12 +2024,12 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - EXPECTFAIL; + todo_wine EXPECTFAIL; } else { /* The others behave normally */ - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_TRAILING_WHITE,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2038,7 +2038,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2059,7 +2059,7 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal flag, consumes decimal point and following digits */ WCONVERT(L"12,1\x20ac", NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); + EXPECT(3,NUMPRS_CURRENCY|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_DECIMAL,5,0,-1); EXPECT2(1,2); EXPECTRGB(2,1); EXPECTRGB(3,FAILDIG); @@ -2158,7 +2158,7 @@ static void test_VarParseNumFromStrMisc(void) /* Multi-character currencies can be repeated too "zl2zlzl" */ WCONVERT(L"z\x142\x32z\x142z\x142", NUMPRS_CURRENCY|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); + EXPECT(1,NUMPRS_CURRENCY|NUMPRS_USE_ALL,NUMPRS_CURRENCY,7,0,0); EXPECT2(2,FAILDIG); lcid = MAKELCID(MAKELANGID(LANG_FRENCH,SUBLANG_FRENCH_SWISS),SORT_DEFAULT); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 143895bde2f..b80a8537380 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1940,6 +1940,14 @@ HRESULT WINAPI VarParseNumFromStr(OLECHAR *lpszStr, LCID lcid, ULONG dwFlags, lpszStr++; pNumprs->dwOutFlags |= NUMPRS_NEG; } + else if (pNumprs->dwInFlags & NUMPRS_CURRENCY && + *lpszStr == chars.cCurrencyLocal && + (!chars.cCurrencyLocal2 || lpszStr[1] == chars.cCurrencyLocal2)) + { + pNumprs->dwOutFlags |= NUMPRS_CURRENCY; + cchUsed += chars.cCurrencyLocal2 ? 2 : 1; + lpszStr += chars.cCurrencyLocal2 ? 2 : 1; + } else break; }

1 0

Hans Leidekker : wldap32: Rename ldap_connect() to avoid a name conflict.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 7f1d6a8ee2c72409f4f840df23401c9702adee5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1d6a8ee2c72409f4f840df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 27 19:23:14 2021 +0200 wldap32: Rename ldap_connect() to avoid a name conflict. Fixes the build against OpenLDAP 2.5. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51129 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/init.c | 2 +- dlls/wldap32/winldap_private.h | 2 +- dlls/wldap32/wldap32.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index afaef3b52f2..d3409d1465b 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -322,7 +322,7 @@ exit: * The timeout parameter may be NULL in which case a default timeout * value will be used. */ -ULONG CDECL ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) +ULONG CDECL WLDAP32_ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) { TRACE( "(%p, %p)\n", ld, timeout ); diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69035050961..a6cddabf559 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -320,7 +320,7 @@ ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_b ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); +ULONG CDECL WLDAP32_ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); ULONG CDECL ldap_control_freeA(LDAPControlA*); ULONG CDECL ldap_control_freeW(LDAPControlW*); diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 8a8e29fc198..33e630dea87 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -75,7 +75,7 @@ 85 cdecl ldap_compare_ext_sW(ptr wstr wstr wstr ptr ptr ptr) 86 cdecl ldap_compare_sA(ptr str str str) 87 cdecl ldap_compare_sW(ptr wstr wstr wstr) - 88 cdecl ldap_connect(ptr ptr) + 88 cdecl ldap_connect(ptr ptr) WLDAP32_ldap_connect 89 cdecl ldap_control_free(ptr) ldap_control_freeA 90 cdecl ldap_control_freeA(ptr) 91 cdecl ldap_control_freeW(ptr)

1 0

Rémi Bernon : msvcrt: Set next_token when str is empty in wcstok_s.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 9ef3ca8b2decc5467345465c1bc98a2ab2c65d66 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ef3ca8b2decc5467345465c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 15:59:46 2021 +0200 msvcrt: Set next_token when str is empty in wcstok_s. Otherwise, when str is empty, an invalid parameter exception is raised. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 32bbef5d3e6a5b174bdc1343d2d43b161f45fa1b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/wcs.c | 11 +++++++---- dlls/ucrtbase/tests/string.c | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 343dec70477..615b4f36a33 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1910,10 +1910,13 @@ wchar_t * CDECL wcstok_s( wchar_t *str, const wchar_t *delim, if (!str) str = *next_token; while (*str && wcschr( delim, *str )) str++; - if (!*str) return NULL; - ret = str++; - while (*str && !wcschr( delim, *str )) str++; - if (*str) *str++ = 0; + if (!*str) ret = NULL; + else + { + ret = str++; + while (*str && !wcschr( delim, *str )) str++; + if (*str) *str++ = 0; + } *next_token = str; return ret; } diff --git a/dlls/ucrtbase/tests/string.c b/dlls/ucrtbase/tests/string.c index 1a4fbbd76f0..9b1d21b801c 100644 --- a/dlls/ucrtbase/tests/string.c +++ b/dlls/ucrtbase/tests/string.c @@ -418,6 +418,24 @@ static void test_wcstok(void) ok(!wcscmp(L"words", token), "expected \"words\", got \"%ls\"\n", token); token = wcstok(NULL, L" ", NULL); ok(!token, "expected NULL, got %p\n", token); + + next = NULL; + wcscpy(buffer, input); + token = wcstok(buffer, L"=", &next); + ok(!wcscmp(token, input), "expected \"%ls\", got \"%ls\"\n", input, token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer + wcslen(input), "expected %p, got %p\n", buffer + wcslen(input), next); + + next = NULL; + wcscpy(buffer, L""); + token = wcstok(buffer, L"=", &next); + ok(token == NULL, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); + token = wcstok(NULL, L"=", &next); + ok(!token, "expected NULL, got \"%ls\"\n", token); + ok(next == buffer, "expected %p, got %p\n", buffer, next); } static void test__strnicmp(void)

1 0

Rémi Bernon : dssenh/tests: Add CryptAcquireContextA last error check.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 239bb6cc55c6bdfd15e2aaa7294caee0405b3ace URL: https://source.winehq.org/git/wine.git/?a=commit;h=239bb6cc55c6bdfd15e2aaa7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:10 2021 +0200 dssenh/tests: Add CryptAcquireContextA last error check. When container key doesn't exist yet. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c5bdc2408fc0278bf893039a5010bcf8e22b9652) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/tests/dssenh.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 4d33fc86cd8..b72b1e3a614 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -71,6 +71,19 @@ static void test_acquire_context(void) /* test base DSS provider (PROV_DSS) */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); + if (!result) + { + todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); + } + ok(result, "CryptAcquireContextA succeeded\n"); + + result = CryptReleaseContext(hProv, 0); + ok(result, "CryptReleaseContext failed.\n"); + result = CryptAcquireContextA( &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); if(!result)

1 0

Rémi Bernon : dssenh: Return NTE_BAD_KEYSET when key cannot be opened.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: e83cd0e70fa015cfdb3f5cc71b6a1539ec1bc7b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e83cd0e70fa015cfdb3f5cc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:11 2021 +0200 dssenh: Return NTE_BAD_KEYSET when key cannot be opened. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit cf770571bf538f2794f56220f649b232688d1736) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/main.c | 3 ++- dlls/dssenh/tests/dssenh.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 82822e4daec..6286b4604fb 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -286,7 +286,8 @@ BOOL WINAPI CPAcquireContext( HCRYPTPROV *ret_prov, LPSTR container, DWORD flags { case 0: case 0 | CRYPT_MACHINE_KEYSET: - ret = read_key_container( name, flags ); + if (!(ret = read_key_container( name, flags ))) + SetLastError( NTE_BAD_KEYSET ); break; case CRYPT_NEWKEYSET: diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index b72b1e3a614..f0fe4a02f97 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -75,7 +75,7 @@ static void test_acquire_context(void) result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, 0); if (!result) { - todo_wine ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); + ok(GetLastError() == NTE_BAD_KEYSET, "Expected NTE_BAD_KEYSET, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); result = CryptAcquireContextA(&hProv, NULL, NULL, PROV_DSS, CRYPT_NEWKEYSET); }

1 0

Rémi Bernon : dssenh: Only fill hash buffer when it's provided.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: f9bca7ed42235ca72587b6886f2bb02e992a79a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9bca7ed42235ca72587b688… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 25 17:37:12 2021 +0200 dssenh: Only fill hash buffer when it's provided. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30244 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b19a110ea6adb289cc1afa8e33d8b259164801e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dssenh/main.c | 2 +- dlls/dssenh/tests/dssenh.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 6286b4604fb..2f100d3473e 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -942,7 +942,7 @@ BOOL WINAPI CPGetHashParam( HCRYPTPROV hprov, HCRYPTHASH hhash, DWORD param, BYT SetLastError( ERROR_MORE_DATA ); return FALSE; } - memcpy( data, hash->value, hash->len ); + if (data) memcpy( data, hash->value, hash->len ); *len = hash->len; return TRUE; diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index f0fe4a02f97..f399f67d210 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -472,9 +472,16 @@ static void test_hash(const struct hash_test *tests, int testLen) ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", tests[i].hashLen, hashLen, GetLastError()); + dataLen = 0xdeadbeef; + result = CryptGetHashParam(hHash, HP_HASHVAL, 0, &dataLen, 0); + ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); + + hashLen = 0xdeadbeef; result = CryptGetHashParam(hHash, HP_HASHVAL, hashValue, &hashLen, 0); ok(result, "Expected hash value return.\n"); + ok(dataLen == hashLen, "Expected hash length to match.\n"); ok(!memcmp(hashValue, tests[i].hash, tests[i].hashLen), "Incorrect hash output.\n"); result = CryptHashData(hHash, data, dataLen, 0);

1 0

Kalen Alwardt : ntdll: Export ZwFilterToken().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 3e134c2b5cd1b135d311c394ac0bf269511ae634 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e134c2b5cd1b135d311c394… Author: Kalen Alwardt <kalenalwardt(a)gmail.com> Date: Fri Jun 11 15:56:02 2021 -0500 ntdll: Export ZwFilterToken(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39142 Signed-off-by: Kalen Alwardt <kalenalwardt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 29e1494c72041f3d2ee89e89eff17877df7cabd2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index cb6b7b12dad..c1f59027168 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1214,7 +1214,7 @@ # @ stub ZwEnumerateSystemEnvironmentValuesEx @ stdcall -private -syscall ZwEnumerateValueKey(long long long ptr long ptr) NtEnumerateValueKey @ stub ZwExtendSection -# @ stub ZwFilterToken +@ stdcall -private -syscall ZwFilterToken(long long ptr ptr ptr ptr) NtFilterToken @ stdcall -private -syscall ZwFindAtom(ptr long ptr) NtFindAtom @ stdcall -private -syscall ZwFlushBuffersFile(long ptr) NtFlushBuffersFile @ stdcall -private -syscall ZwFlushInstructionCache(long ptr long) NtFlushInstructionCache

1 0