May 2024 - Wine-commits - list.winehq.org

Piotr Caban : msvcr80/tests: Fix errno access in tests.
by Alexandre Julliard 01 May '24

01 May '24

Module: wine Branch: master Commit: 3473dd5268873b304b6f3d64777822f2690b72b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/3473dd5268873b304b6f3d64777822… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 30 14:20:27 2024 +0200 msvcr80/tests: Fix errno access in tests. --- dlls/msvcr80/tests/msvcr80.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c index fa04b024031..6e48ecf2894 100644 --- a/dlls/msvcr80/tests/msvcr80.c +++ b/dlls/msvcr80/tests/msvcr80.c @@ -64,6 +64,11 @@ static int (__cdecl *p_strcmp)(const char *, const char *); static int (__cdecl *p_strncmp)(const char *, const char *, size_t); static int (__cdecl *p_dupenv_s)(char **, size_t *, const char *); static int (__cdecl *p_wdupenv_s)(wchar_t **, size_t *, const wchar_t *); +static int* (__cdecl *p_errno)(void); + +/* make sure we use the correct errno */ +#undef errno +#define errno (*p_errno()) #define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -87,6 +92,7 @@ static BOOL init(void) SET(p_strncmp, "strncmp"); SET(p_dupenv_s, "_dupenv_s"); SET(p_wdupenv_s, "_wdupenv_s"); + SET(p_errno, "_errno"); return TRUE; }

1 0

Paul Gofman : msvcrt: Implement _mbsncpy_s[_l]().
by Alexandre Julliard 01 May '24

01 May '24

Module: wine Branch: master Commit: aa122902a9e23c9a5512a9315f8ad02ef17c1d99 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa122902a9e23c9a5512a9315f8ad0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Apr 26 20:29:16 2024 -0600 msvcrt: Implement _mbsncpy_s[_l](). --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr80/tests/msvcr80.c | 220 ++++++++++++++++++++++++++++++++++++++++++- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/mbcs.c | 77 +++++++++++++++ dlls/ucrtbase/tests/string.c | 165 ++++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 8 +- include/msvcrt/mbstring.h | 2 + 10 files changed, 477 insertions(+), 15 deletions(-)

1 0

Dmitry Timoshkov : dssenh: Add CPSetKeyParam() stub implementation.
by Alexandre Julliard 01 May '24

01 May '24

Module: wine Branch: master Commit: 5f984f8ce3d697c40c02926b325db57748393732 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f984f8ce3d697c40c02926b325db5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 8 12:03:39 2024 +0300 dssenh: Add CPSetKeyParam() stub implementation. dlls/dssenh/tests depend on CryptSetKeyParam(KP_X, NULL) returning FALSE/ERROR_INVALID_PARAMETER. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/dssenh/dssenh.spec | 2 +- dlls/dssenh/main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/dssenh.spec b/dlls/dssenh/dssenh.spec index 9060614ce49..fb83aed8be6 100644 --- a/dlls/dssenh/dssenh.spec +++ b/dlls/dssenh/dssenh.spec @@ -19,7 +19,7 @@ @ stdcall CPImportKey(ptr ptr long ptr long ptr) @ stdcall CPReleaseContext(ptr long) @ stdcall CPSetHashParam(ptr ptr long ptr long) -@ stub CPSetKeyParam +@ stdcall CPSetKeyParam(ptr ptr long ptr long) @ stub CPSetProvParam @ stdcall CPSignHash(ptr ptr long wstr long ptr ptr) @ stdcall CPVerifySignature(ptr ptr ptr long ptr wstr long) diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index 365b365f53f..f6f01772d35 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -749,6 +749,17 @@ BOOL WINAPI CPGetUserKey( HCRYPTPROV hprov, DWORD keyspec, HCRYPTKEY *ret_key ) return ret; } +BOOL WINAPI CPSetKeyParam( HCRYPTPROV hprov, HCRYPTKEY hkey, DWORD param, BYTE *data, DWORD flags ) +{ + if (!data) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + return FALSE; +} + BOOL WINAPI CPGenRandom( HCRYPTPROV hprov, DWORD len, BYTE *buffer ) { struct container *container = (struct container *)hprov;

1 0

Dmitry Timoshkov : rsaenh: Validate pbData in CPSetKeyParam().
by Alexandre Julliard 01 May '24

01 May '24

Module: wine Branch: master Commit: 4ff40a670867f9a05037384b3802281b6dd9dbea URL: https://gitlab.winehq.org/wine/wine/-/commit/4ff40a670867f9a05037384b380228… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 25 11:25:13 2024 +0300 rsaenh: Validate pbData in CPSetKeyParam(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/rsaenh/rsaenh.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 3a2d7126ca4..f854e35dfdf 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -3797,7 +3797,7 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa * CRYPT_EXPORT, CRYPT_READ, CRYPT_WRITE, CRYPT_MAC * - KP_IV: Initialization vector */ -BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, +BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam, BYTE *pbData, DWORD dwFlags) { CRYPTKEY *pCryptKey; @@ -3815,13 +3815,19 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam SetLastError(NTE_BAD_FLAGS); return FALSE; } - + if (!lookup_handle(&handle_table, hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pCryptKey)) { SetLastError(NTE_BAD_KEY); return FALSE; } - + + if (!pbData) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + switch (dwParam) { case KP_PADDING: /* The MS providers only support PKCS5_PADDING */

1 0

Dmitry Timoshkov : advapi32: CryptSetKeyParam() should accept NULL pbData.
by Alexandre Julliard 01 May '24

01 May '24

Module: wine Branch: master Commit: 0274f353356da5bbdf45a491f1ec63e480a4742f URL: https://gitlab.winehq.org/wine/wine/-/commit/0274f353356da5bbdf45a491f1ec63… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 8 12:04:22 2024 +0300 advapi32: CryptSetKeyParam() should accept NULL pbData. At least CryptSetKeyParam(KP_X) should accept NULL pbData. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/advapi32/crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c index 73c9b1d219d..0c94999660a 100644 --- a/dlls/advapi32/crypt.c +++ b/dlls/advapi32/crypt.c @@ -1979,7 +1979,7 @@ BOOL WINAPI CryptSetKeyParam (HCRYPTKEY hKey, DWORD dwParam, const BYTE *pbData, if (!(key = key_from_handle(hKey))) return FALSE; - if (!pbData || !key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) + if (!key->pProvider || key->pProvider->dwMagic != MAGIC_CRYPTPROV) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE;

1 0