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

Brendan McGrath : winegstreamer: Log query after setting the URI.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: 130b97a2b0737ff07e51d678d5ee23482de44bf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/130b97a2b0737ff07e51d678d5ee23… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 1 13:34:06 2024 +1000 winegstreamer: Log query after setting the URI. --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index d19102ac2ae..c017edf3f86 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1247,8 +1247,8 @@ static gboolean src_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_URI: if (parser->uri) { - GST_LOG_OBJECT(pad, "Responding with %" GST_PTR_FORMAT, query); gst_query_set_uri(query, parser->uri); + GST_LOG_OBJECT(pad, "Responding with %" GST_PTR_FORMAT, query); return TRUE; } return FALSE;

1 0

Brendan McGrath : winegstreamer: Fix wow64 support for wg_parser_connect.
by Alexandre Julliard May 1, 2024

May 1, 2024

Module: wine Branch: master Commit: 87eaf899551077817106bce62f5a8b980a47635f URL: https://gitlab.winehq.org/wine/wine/-/commit/87eaf899551077817106bce62f5a8b… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed May 1 13:32:39 2024 +1000 winegstreamer: Fix wow64 support for wg_parser_connect. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56595 --- dlls/winegstreamer/wg_parser.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 679500b617e..d19102ac2ae 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1900,6 +1900,24 @@ C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == unix_wg_funcs_count); typedef ULONG PTR32; +static NTSTATUS wow64_wg_parser_connect(void *args) +{ + struct + { + wg_parser_t parser; + PTR32 uri; + UINT64 file_size; + } *params32 = args; + struct wg_parser_connect_params params = + { + .parser = params32->parser, + .uri = ULongToPtr(params32->uri), + .file_size = params32->file_size, + }; + + return wg_parser_connect(&params); +} + static NTSTATUS wow64_wg_parser_push_data(void *args) { struct { @@ -2184,7 +2202,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = X(wg_parser_create), X(wg_parser_destroy), - X(wg_parser_connect), + X64(wg_parser_connect), X(wg_parser_disconnect), X(wg_parser_get_next_read_offset),

1 0

Dmitry Timoshkov : advapi32: CryptSetKeyParam() should accept NULL pbData.
by Alexandre Julliard May 1, 2024

May 1, 2024

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

Dmitry Timoshkov : rsaenh: Validate pbData in CPSetKeyParam().
by Alexandre Julliard May 1, 2024

May 1, 2024

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 : dssenh: Add CPSetKeyParam() stub implementation.
by Alexandre Julliard May 1, 2024

May 1, 2024

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