November 2020 - Wine-commits

Rémi Bernon : msvcrt: Make locale and thread helper functions CDECL.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: a24ad51e3f2515c1970b56f8dfe2206e2b282dc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a24ad51e3f2515c1970b56f8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:37 2020 +0100 msvcrt: Make locale and thread helper functions CDECL. This prevent callers from having to save SSE registers to the stack. It is for instance the case in MSVCRT__towlower_l, which is called on every character by MSVCRT__wcsicmp_l. 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> --- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/msvcrt.h | 6 +++--- dlls/msvcrt/thread.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 7562f70eb0b..f25c1228d2f 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -452,7 +452,7 @@ static inline void swap_pointers(void **p1, void **p2) { } /* INTERNAL: returns pthreadlocinfo struct */ -MSVCRT_pthreadlocinfo get_locinfo(void) { +MSVCRT_pthreadlocinfo CDECL get_locinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) @@ -462,7 +462,7 @@ MSVCRT_pthreadlocinfo get_locinfo(void) { } /* INTERNAL: returns pthreadlocinfo struct */ -MSVCRT_pthreadmbcinfo get_mbcinfo(void) { +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); if(!data || !data->have_locale) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4f79778f7cc..f73117ae5e2 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -308,7 +308,7 @@ struct __thread_data { typedef struct __thread_data thread_data_t; -extern thread_data_t *msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; +extern thread_data_t *CDECL msvcrt_get_thread_data(void) DECLSPEC_HIDDEN; LCID MSVCRT_locale_to_LCID(const char*, unsigned short*, BOOL*) DECLSPEC_HIDDEN; extern MSVCRT__locale_t MSVCRT_locale DECLSPEC_HIDDEN; @@ -1128,8 +1128,8 @@ int __cdecl MSVCRT__set_printf_count_output(int); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; -MSVCRT_pthreadlocinfo get_locinfo(void) DECLSPEC_HIDDEN; -MSVCRT_pthreadmbcinfo get_mbcinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; +MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo) DECLSPEC_HIDDEN; void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index af31534adbd..11573892e95 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -35,7 +35,7 @@ typedef struct { * * Return the thread local storage structure. */ -thread_data_t *msvcrt_get_thread_data(void) +thread_data_t *CDECL msvcrt_get_thread_data(void) { thread_data_t *ptr; DWORD err = GetLastError(); /* need to preserve last error */

1 0

Rémi Bernon : msvcrt: Introduce noalloc current locale lookup helpers.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: faf92fdedb16a6e35c556e389bf5ac7241058f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=faf92fdedb16a6e35c556e38… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:49 2020 +0100 msvcrt: Introduce noalloc current locale lookup helpers. 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> --- dlls/msvcrt/locale.c | 34 +++++++++++++++++++++++++++------- dlls/msvcrt/msvcrt.h | 2 ++ 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f25c1228d2f..c49439951a9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -953,6 +953,31 @@ void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) MSVCRT_free(mbcinfo); } +MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + if(!data || !data->have_locale) + { + *locale = *MSVCRT_locale; + } + else + { + locale->locinfo = data->locinfo; + locale->mbcinfo = data->mbcinfo; + } + + InterlockedIncrement(&locale->locinfo->refcount); + InterlockedIncrement(&locale->mbcinfo->refcount); + return locale; +} + +void CDECL free_locale_noalloc(MSVCRT__locale_t locale) +{ + free_locinfo(locale->locinfo); + free_mbcinfo(locale->mbcinfo); +} + /********************************************************************* * _get_current_locale (MSVCRT.@) */ @@ -962,11 +987,7 @@ MSVCRT__locale_t CDECL MSVCRT__get_current_locale(void) if(!loc) return NULL; - loc->locinfo = get_locinfo(); - loc->mbcinfo = get_mbcinfo(); - InterlockedIncrement(&loc->locinfo->refcount); - InterlockedIncrement(&loc->mbcinfo->refcount); - return loc; + return get_current_locale_noalloc(loc); } /********************************************************************* @@ -977,8 +998,7 @@ void CDECL MSVCRT__free_locale(MSVCRT__locale_t locale) if (!locale) return; - free_locinfo(locale->locinfo); - free_mbcinfo(locale->mbcinfo); + free_locale_noalloc(locale); MSVCRT_free(locale); } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index f73117ae5e2..07a2f3d33e8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1128,6 +1128,8 @@ int __cdecl MSVCRT__set_printf_count_output(int); #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 extern MSVCRT__locale_t MSVCRT_locale; +MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; +void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; MSVCRT_pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t);

1 0

Rémi Bernon : msvcrt: Pass temporary locale to MSVCRT__towlower_l.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 0a2635611ac46081b2049b62ba62e3691e1c039f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a2635611ac46081b2049b62… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:44 2020 +0100 msvcrt: Pass temporary locale to MSVCRT__towlower_l. When not provided, instead of calling get_locinfo on every character. 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> --- dlls/msvcrt/wcs.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 858ecbd7ed0..63f9fd472d7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -119,16 +119,22 @@ int CDECL MSVCRT_towlower(MSVCRT_wint_t c) INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT__locale_t locale) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t c1, c2; if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; + if(!locale) + locale = get_current_locale_noalloc(&tmp); + do { c1 = MSVCRT__towlower_l(*str1++, locale); c2 = MSVCRT__towlower_l(*str2++, locale); } while(c1 && (c1 == c2)); + + free_locale_noalloc(&tmp); return c1 - c2; } @@ -146,19 +152,25 @@ INT CDECL MSVCRT__wcsicmp( const MSVCRT_wchar_t* str1, const MSVCRT_wchar_t* str INT CDECL MSVCRT__wcsnicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2, MSVCRT_size_t n, MSVCRT__locale_t locale) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t c1, c2; if (!n) - return 0; + return 0; if(!MSVCRT_CHECK_PMT(str1 != NULL) || !MSVCRT_CHECK_PMT(str2 != NULL)) return MSVCRT__NLSCMPERROR; + if(!locale) + locale = get_current_locale_noalloc(&tmp); + do { c1 = MSVCRT__towlower_l(*str1++, locale); c2 = MSVCRT__towlower_l(*str2++, locale); } while(--n && c1 && (c1 == c2)); + + free_locale_noalloc(&tmp); return c1 - c2; } @@ -397,6 +409,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsupr( MSVCRT_wchar_t *str ) */ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t* ptr = str; if (!str || !n) @@ -406,13 +419,22 @@ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__loca return MSVCRT_EINVAL; } + if(!locale) + locale = get_current_locale_noalloc(&tmp); + while (n--) { - if (!*ptr) return 0; + if (!*ptr) + { + free_locale_noalloc(&tmp); + return 0; + } *ptr = MSVCRT__towlower_l(*ptr, locale); ptr++; } + free_locale_noalloc(&tmp); + /* MSDN claims that the function should return and set errno to * ERANGE, which doesn't seem to be true based on the tests. */ *str = '\0';

1 0

Rémi Bernon : msvcrt: Pass temporary locale to MSVCRT__towupper_l.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 35886486d4aa88f49369d1196ac891e56b43c026 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35886486d4aa88f49369d119… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 10 16:58:57 2020 +0100 msvcrt: Pass temporary locale to MSVCRT__towupper_l. When not provided, instead of calling get_locinfo on every character. 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> --- dlls/msvcrt/wcs.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 63f9fd472d7..fcadad77832 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -355,6 +355,7 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsset( MSVCRT_wchar_t* str, MSVCRT_wchar_t c ) int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) { + MSVCRT__locale_tstruct tmp = {0}; MSVCRT_wchar_t* ptr = str; if (!str || !n) @@ -364,13 +365,22 @@ int CDECL MSVCRT__wcsupr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, return MSVCRT_EINVAL; } + if(!locale) + locale = get_current_locale_noalloc(&tmp); + while (n--) { - if (!*ptr) return 0; + if (!*ptr) + { + free_locale_noalloc(&tmp); + return 0; + } *ptr = MSVCRT__towupper_l(*ptr, locale); ptr++; } + free_locale_noalloc(&tmp); + /* MSDN claims that the function should return and set errno to * ERANGE, which doesn't seem to be true based on the tests. */ *str = '\0';

1 0

Dmitry Timoshkov : crypt32/tests: Fix test failures under newer Windows versions.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 0c8ce3aab57d0f81889438f0e9d1a9cb5adee342 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8ce3aab57d0f81889438f0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 10:22:13 2020 +0300 crypt32/tests: Fix test failures under newer Windows versions. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 7d6d07fe025..d9f839c72d2 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -3886,17 +3886,19 @@ static void testAcquireCertPrivateKey(void) /* Missing private key */ ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, NULL, NULL); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY, + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0, &keyProvInfo); ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec, &callerFree); - ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */), + ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || + GetLastError() == NTE_BAD_KEYSET /* win8 */ || + GetLastError() == NTE_BAD_PROV_TYPE /* win10 */), "Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError()); pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,

1 0

Dmitry Timoshkov : advapi32/tests: Fix compilation with PSDK compiler.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 65cab573abe748974f20195083d7bd3d64f63e7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=65cab573abe748974f201950… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 20:53:05 2020 +0300 advapi32/tests: Fix compilation with PSDK compiler. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f2e10671a47..54a8528bc21 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -336,7 +336,7 @@ static void test_LsaLookupSids(void) { WCHAR langW[32]; char user_buffer[64]; - LSA_OBJECT_ATTRIBUTES attrs = {.Length = sizeof(attrs)}; + LSA_OBJECT_ATTRIBUTES attrs = {sizeof(attrs)}; TOKEN_USER *user = (TOKEN_USER *)user_buffer; WCHAR computer_name[64], user_name[64]; LSA_REFERENCED_DOMAIN_LIST *list;

1 0

Dmitry Timoshkov : advapi32: Implement LsaGetUserName.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: b940c5e7c91bff963336dd7d2c4defc3a82c75a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b940c5e7c91bff963336dd7d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 10 20:53:08 2020 +0300 advapi32: Implement LsaGetUserName. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/lsa.c | 58 +++++++++++++++++++++++++++++++++++++++++++++ dlls/advapi32/tests/lsa.c | 50 +++++++++++++++++++++++++++++++++++++- 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index fcef859a7c1..d5235c6adb9 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -463,7 +463,7 @@ # @ stub LsaGetQuotasForAccount # @ stub LsaGetRemoteUserName @ stub LsaGetSystemAccessAccount -# @ stub LsaGetUserName +@ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames # @ stub LsaICLookupNamesWithCreds @ stub LsaICLookupSids diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index bd3585f8d06..55e42400c6d 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -104,6 +104,64 @@ static void* ADVAPI_GetDomainName(unsigned sz, unsigned ofs) return ptr; } +/****************************************************************************** + * LsaGetUserName [ADVAPI32.@] + * + */ +NTSTATUS WINAPI LsaGetUserName(PUNICODE_STRING *user_name, PUNICODE_STRING *domain_name) +{ + UNICODE_STRING *user; + DWORD user_size; + + user_size = 0; + if (GetUserNameW(NULL, &user_size) || GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return STATUS_UNSUCCESSFUL; + + user = heap_alloc(sizeof(*user) + user_size * sizeof(WCHAR)); + if (!user) return STATUS_NO_MEMORY; + + user->Buffer = (WCHAR *)(user + 1); + user->MaximumLength = user_size * sizeof(WCHAR); + user->Length = user->MaximumLength - sizeof(WCHAR); + if (!GetUserNameW(user->Buffer, &user_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + if (domain_name) + { + UNICODE_STRING *domain; + WCHAR computer[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD domain_size; + + domain_size = ARRAY_SIZE(computer); + if (!GetComputerNameW(computer, &domain_size)) + { + heap_free(user); + return STATUS_UNSUCCESSFUL; + } + + domain = heap_alloc(sizeof(*domain) + (domain_size + 1) * sizeof(WCHAR)); + if (!domain) + { + heap_free(user); + return STATUS_NO_MEMORY; + } + + domain->Buffer = (WCHAR *)(domain + 1); + domain->Length = domain_size * sizeof(WCHAR); + domain->MaximumLength = domain->Length + sizeof(WCHAR); + wcscpy(domain->Buffer, computer); + + *domain_name = domain; + } + + *user_name = user; + + return STATUS_SUCCESS; +} + /****************************************************************************** * LsaAddAccountRights [ADVAPI32.@] * diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 54a8528bc21..f8c822a7de2 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -2,6 +2,7 @@ * Unit tests for lsa functions * * Copyright (c) 2006 Robert Reif + * Copyright (c) 2020 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -38,6 +39,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); static BOOL (WINAPI *pGetSystemPreferredUILanguages)(DWORD, ULONG*, WCHAR*, ULONG*); +static NTSTATUS (WINAPI *pLsaGetUserName)(PUNICODE_STRING *user, PUNICODE_STRING *domain); static void test_lsa(void) { @@ -463,13 +465,59 @@ static void test_LsaLookupPrivilegeName(void) LsaFreeMemory(name); } +static void test_LsaGetUserName(void) +{ + NTSTATUS status; + BOOL ret; + UNICODE_STRING *lsa_user, *lsa_domain; + WCHAR user[256], computer[256]; + DWORD size; + + if (!pLsaGetUserName) + { + skip("LsaGetUserName is not available on this platform\n"); + return; + } + + size = ARRAY_SIZE(user); + ret = GetUserNameW(user, &size); + ok(ret, "GetUserName error %u\n", GetLastError()); + + size = ARRAY_SIZE(computer); + ret = GetComputerNameW(computer, &size); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, NULL); + + if (0) /* crashes under Windows */ + status = pLsaGetUserName(NULL, &lsa_domain); + + status = pLsaGetUserName(&lsa_user, NULL); + ok(!status, "got %#x\n", status); + check_unicode_string(lsa_user, user); + LsaFreeMemory(lsa_user); + + status = pLsaGetUserName(&lsa_user, &lsa_domain); + ok(!status, "got %#x\n", status); + ok(!lstrcmpW(user, lsa_user->Buffer), "%s != %s\n", wine_dbgstr_w(user), wine_dbgstr_wn(lsa_user->Buffer, lsa_user->Length/sizeof(WCHAR))); + check_unicode_string(lsa_user, user); + check_unicode_string(lsa_domain, computer); + LsaFreeMemory(lsa_user); + LsaFreeMemory(lsa_domain); +} + START_TEST(lsa) { - HMODULE hkernel32 = GetModuleHandleA("kernel32"); + HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); + HMODULE hadvapi32 = GetModuleHandleA("advapi32.dll"); + pGetSystemPreferredUILanguages = (void*)GetProcAddress(hkernel32, "GetSystemPreferredUILanguages"); + pLsaGetUserName = (void *)GetProcAddress(hadvapi32, "LsaGetUserName"); test_lsa(); test_LsaLookupNames2(); test_LsaLookupSids(); test_LsaLookupPrivilegeName(); + test_LsaGetUserName(); }

1 0

Alistair Leslie-Hughes : include: Add IConvertType interface.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 34155d099835d49941793e3364be975a4a41a486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34155d099835d49941793e33… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 10 20:29:58 2020 +1100 include: Add IConvertType interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdaps/usrmarshal.c | 13 +++++++++++++ include/Makefile.in | 1 + include/cvttyp.idl | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ include/oledb.idl | 1 + 4 files changed, 65 insertions(+) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 9eb14147690..fa086290061 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1616,3 +1616,16 @@ HRESULT __RPC_STUB ICommandProperties_SetProperties_Stub(ICommandProperties* Thi FIXME("(%p)->(%d %p %d %p %p): stub\n", This, count, propertyset, total, propstatus, error); return E_NOTIMPL; } + +HRESULT CALLBACK IConvertType_CanConvert_Proxy(IConvertType* This, DBTYPE from, DBTYPE to, DBCONVERTFLAGS flags) +{ + FIXME("(%p)->(%d %d 0x%08x): stub\n", This, from, to, flags); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IConvertType_CanConvert_Stub(IConvertType* This, DBTYPE from, DBTYPE to, + DBCONVERTFLAGS flags, IErrorInfo **error) +{ + FIXME("(%p)->(%d %d 0x%08x %p): stub\n", This, from, to, flags, error); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index c9c8ebe8bb5..3ccacdaeecf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -91,6 +91,7 @@ SOURCES = \ ctxtcall.idl \ custcntl.h \ cvconst.h \ + cvttyp.idl \ d2d1.idl \ d2d1_1.idl \ d2d1_2.idl \ diff --git a/include/cvttyp.idl b/include/cvttyp.idl new file mode 100644 index 00000000000..87bc385a5ba --- /dev/null +++ b/include/cvttyp.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2020 Alistair Leslie-Hughes + * + * 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 + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a88-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IConvertType : IUnknown +{ + typedef DWORD DBCONVERTFLAGS; + + enum DBCONVERTFLAGSENUM + { + DBCONVERTFLAGS_COLUMN = 0x000, + DBCONVERTFLAGS_PARAMETER = 0x001, + }; + + enum DBCONVERTFLAGSENUM20 + { + DBCONVERTFLAGS_ISLONG = 0x002, + DBCONVERTFLAGS_ISFIXEDLENGTH = 0x004, + DBCONVERTFLAGS_FROMVARIANT = 0x008, + }; + + [local] + HRESULT CanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags); + + [call_as(CanConvert)] + HRESULT RemoteCanConvert([in] DBTYPE from, [in] DBTYPE to, [in] DBCONVERTFLAGS flags, [out] IErrorInfo **error); +} diff --git a/include/oledb.idl b/include/oledb.idl index 4370c7f6bcc..c56460262f5 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -72,6 +72,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "getdts.idl" #include "cmdstrm.idl" #include "cmdprp.idl" +#include "cvttyp.idl" cpp_quote("#include <accctrl.h>")

1 0

Francois Gouget : gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: dd51cd8d00b3b2cebca1353a85a3c7d3f332ade9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd51cd8d00b3b2cebca1353a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 9 17:59:45 2020 +0100 gdi32/tests: Avoid a D3DKMTOpenAdapterFromHdc() crash on Windows 10 >= 2004. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/driver.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 8276c1c4bee..2110765835f 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -105,18 +105,23 @@ static void test_D3DKMTOpenAdapterFromHdc(void) HDC hdc; DWORD i; - if (!pD3DKMTOpenAdapterFromHdc || pD3DKMTOpenAdapterFromHdc(NULL) == STATUS_PROCEDURE_NOT_FOUND) + if (!pD3DKMTOpenAdapterFromHdc) { - win_skip("D3DKMTOpenAdapterFromHdc() is unavailable.\n"); + win_skip("D3DKMTOpenAdapterFromHdc() is missing.\n"); return; } /* Invalid parameters */ - status = pD3DKMTOpenAdapterFromHdc(NULL); - todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); + /* Passing a NULL pointer crashes on Windows 10 >= 2004 */ + if (0) status = pD3DKMTOpenAdapterFromHdc(NULL); memset(&open_adapter_hdc_desc, 0, sizeof(open_adapter_hdc_desc)); status = pD3DKMTOpenAdapterFromHdc(&open_adapter_hdc_desc); + if (status == STATUS_PROCEDURE_NOT_FOUND) + { + win_skip("D3DKMTOpenAdapterFromHdc() is not supported.\n"); + return; + } todo_wine ok(status == STATUS_INVALID_PARAMETER, "Got unexpected return code %#x.\n", status); /* Open adapter */

1 0

Alexandre Julliard : mscms: Implement profile tag functions without relying on liblcms2.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: master Commit: 881dad65035b5453184c9421dbb9685179a8366e URL: https://source.winehq.org/git/wine.git/?a=commit;h=881dad65035b5453184c9421… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 12:40:09 2020 +0100 mscms: Implement profile tag functions without relying on liblcms2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/icc.c | 75 ++++++++++++++++++++++++++++++++++++++++--------- dlls/mscms/mscms_priv.h | 12 +++++++- dlls/mscms/profile.c | 33 ++++------------------ 3 files changed, 79 insertions(+), 41 deletions(-) diff --git a/dlls/mscms/icc.c b/dlls/mscms/icc.c index 3b1c718b174..0476d805547 100644 --- a/dlls/mscms/icc.c +++ b/dlls/mscms/icc.c @@ -40,6 +40,11 @@ static inline void adjust_endianness32( ULONG *ptr ) #endif } +static const struct tag_entry *first_tag( const struct profile *profile ) +{ + return (const struct tag_entry *)(profile->data + sizeof(PROFILEHEADER) + sizeof(DWORD)); +} + void get_profile_header( const struct profile *profile, PROFILEHEADER *header ) { unsigned int i; @@ -62,34 +67,77 @@ void set_profile_header( const struct profile *profile, const PROFILEHEADER *hea adjust_endianness32( (ULONG *)profile->data + i ); } -static BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, cmsTagEntry *tag ) +DWORD get_tag_count( const struct profile *profile ) { - DWORD i, num_tags = *(DWORD *)(profile->data + sizeof(cmsICCHeader)); - cmsTagEntry *entry; - ULONG sig; - + DWORD num_tags = *(DWORD *)(profile->data + sizeof(PROFILEHEADER)); adjust_endianness32( &num_tags ); - for (i = 0; i < num_tags; i++) + if ((const BYTE *)(first_tag( profile ) + num_tags) > (const BYTE *)profile->data + profile->size) + return 0; + return num_tags; +} + +BOOL get_tag_entry( const struct profile *profile, DWORD index, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + + if (index < 1 || index > get_tag_count( profile )) return FALSE; + *tag = entry[index - 1]; + adjust_endianness32( &tag->sig ); + adjust_endianness32( &tag->offset ); + adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; +} + +BOOL get_adjusted_tag( const struct profile *profile, TAGTYPE type, struct tag_entry *tag ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) { - entry = (cmsTagEntry *)(profile->data + sizeof(cmsICCHeader) + sizeof(DWORD) + i * sizeof(*tag)); sig = entry->sig; adjust_endianness32( &sig ); if (sig == type) { - tag->sig = sig; - tag->offset = entry->offset; - tag->size = entry->size; + *tag = *entry; + adjust_endianness32( &tag->sig ); adjust_endianness32( &tag->offset ); adjust_endianness32( &tag->size ); + if (tag->offset > profile->size || tag->size > profile->size - tag->offset) return FALSE; + return TRUE; + } + } + return FALSE; +} + +static BOOL get_linked_tag( const struct profile *profile, struct tag_entry *ret ) +{ + const struct tag_entry *entry = first_tag( profile ); + DWORD sig, offset, size, i; + + for (i = get_tag_count(profile); i > 0; i--, entry++) + { + sig = entry->sig; + adjust_endianness32( &sig ); + if (sig == ret->sig) continue; + offset = entry->offset; + size = entry->size; + adjust_endianness32( &offset ); + adjust_endianness32( &size ); + if (size == ret->size && offset == ret->offset) + { + ret->sig = sig; return TRUE; } } return FALSE; } -BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, DWORD *len ) +BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, void *buffer, + DWORD *len, BOOL *linked ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; @@ -102,12 +150,13 @@ BOOL get_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, vo } memcpy( buffer, profile->data + tag.offset + offset, tag.size - offset ); *len = tag.size - offset; + if (linked) *linked = get_linked_tag( profile, &tag ); return TRUE; } BOOL set_tag_data( const struct profile *profile, TAGTYPE type, DWORD offset, const void *buffer, DWORD *len ) { - cmsTagEntry tag; + struct tag_entry tag; if (!get_adjusted_tag( profile, type, &tag )) return FALSE; diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index ffa2cb4b4c9..f085c5bfbd6 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -56,7 +56,17 @@ void release_transform( struct transform * ) DECLSPEC_HIDDEN; extern void free_handle_tables( void ) DECLSPEC_HIDDEN; -extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD * ) DECLSPEC_HIDDEN; +struct tag_entry +{ + DWORD sig; + DWORD offset; + DWORD size; +}; + +extern DWORD get_tag_count( const struct profile * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_entry( const struct profile *, DWORD, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_adjusted_tag( const struct profile *, TAGTYPE, struct tag_entry * ) DECLSPEC_HIDDEN; +extern BOOL get_tag_data( const struct profile *, TAGTYPE, DWORD, void *, DWORD *, BOOL * ) DECLSPEC_HIDDEN; extern BOOL set_tag_data( const struct profile *, TAGTYPE, DWORD, const void *, DWORD * ) DECLSPEC_HIDDEN; extern void get_profile_header( const struct profile *, PROFILEHEADER * ) DECLSPEC_HIDDEN; extern void set_profile_header( const struct profile *, const PROFILEHEADER * ) DECLSPEC_HIDDEN; diff --git a/dlls/mscms/profile.c b/dlls/mscms/profile.c index ed0ed53158a..0f31ae91155 100644 --- a/dlls/mscms/profile.c +++ b/dlls/mscms/profile.c @@ -347,13 +347,7 @@ BOOL WINAPI GetColorProfileElement( HPROFILE handle, TAGTYPE type, DWORD offset, release_profile( profile ); return FALSE; } - if (!get_tag_data( profile, type, offset, buffer, size )) - { - release_profile( profile ); - return FALSE; - } - ret = get_tag_data( profile, type, offset, buffer, size ); - *ref = cmsTagLinkedTo( profile->cmsprofile, type ) != 0; + ret = get_tag_data( profile, type, offset, buffer, size, ref ); release_profile( profile ); #endif /* HAVE_LCMS2 */ return ret; @@ -382,8 +376,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; - cmsTagSignature sig; + struct tag_entry tag; TRACE( "( %p, %d, %p )\n", handle, index, type ); @@ -394,17 +387,7 @@ BOOL WINAPI GetColorProfileElementTag( HPROFILE handle, DWORD index, PTAGTYPE ty release_profile( profile ); return FALSE; } - num_tags = cmsGetTagCount( profile->cmsprofile ); - if (num_tags < 0 || index > num_tags || index < 1) - { - release_profile( profile ); - return FALSE; - } - if ((sig = cmsGetTagSignature( profile->cmsprofile, index - 1 ))) - { - *type = sig; - ret = TRUE; - } + if ((ret = get_tag_entry( profile, index, &tag ))) *type = tag.sig; release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -523,7 +506,6 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); - cmsInt32Number num_tags; TRACE( "( %p, %p )\n", handle, count ); @@ -534,11 +516,7 @@ BOOL WINAPI GetCountColorProfileElements( HPROFILE handle, PDWORD count ) release_profile( profile ); return FALSE; } - if ((num_tags = cmsGetTagCount( profile->cmsprofile )) >= 0) - { - *count = num_tags; - ret = TRUE; - } + *count = get_tag_count( profile ); release_profile( profile ); #endif /* HAVE_LCMS2 */ @@ -1151,6 +1129,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese BOOL ret = FALSE; #ifdef HAVE_LCMS2 struct profile *profile = grab_profile( handle ); + struct tag_entry tag; TRACE( "( %p, 0x%08x, %p )\n", handle, type, present ); @@ -1161,7 +1140,7 @@ BOOL WINAPI IsColorProfileTagPresent( HPROFILE handle, TAGTYPE type, PBOOL prese release_profile( profile ); return FALSE; } - *present = (cmsIsTag( profile->cmsprofile, type ) != 0); + *present = get_adjusted_tag( profile, type, &tag ); release_profile( profile ); ret = TRUE;

1 0