October 2021 - Wine-commits

Hans Leidekker : secur32: Fix expected buffer size in trace message.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: a2d8fe55977d458782727b60accb5510264e3f75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2d8fe55977d458782727b60… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:24 2021 +0200 secur32: Fix expected buffer size in trace message. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index eb8106e88c7..885fabfac13 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1003,7 +1003,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(6, record_size), buffer->cbBuffer); + max(ctx->header_size + 1, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } }

1 0

Hans Leidekker : secur32/tests: Check supported DTLS protocols.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 5e8acd7a044d09539aa978ff9401575a13a3ebda URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e8acd7a044d09539aa978ff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:25 2021 +0200 secur32/tests: Check supported DTLS protocols. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index aeb38096f0c..b7f9d409d41 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -203,6 +203,8 @@ static void test_supported_protocols(CredHandle *handle, unsigned exprots) X(SP_PROT_TLS1_1_CLIENT, "TLS 1.1 client"); X(SP_PROT_TLS1_2_CLIENT, "TLS 1.2 client"); X(SP_PROT_TLS1_3_CLIENT, "TLS 1.3 client"); + X(SP_PROT_DTLS1_0_CLIENT, "DTLS 1.0 client"); + X(SP_PROT_DTLS1_2_CLIENT, "DTLS 1.2 client"); #undef X if(protocols.grbitProtocol)

1 0

Hans Leidekker : secur32: Clear expiry timestamp in schan_InitializeSecurityContextW().
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 96185c7e39b225e624cbc6a1866dfef9a79dffff URL: https://source.winehq.org/git/wine.git/?a=commit;h=96185c7e39b225e624cbc6a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:26 2021 +0200 secur32: Clear expiry timestamp in schan_InitializeSecurityContextW(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 885fabfac13..fdf8e990f62 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -904,6 +904,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( dump_buffer_desc(pInput); dump_buffer_desc(pOutput); + if (ptsExpiry) + { + ptsExpiry->LowPart = 0; + ptsExpiry->HighPart = 0; + } + if (!phContext) { ULONG_PTR handle;

1 0

Hans Leidekker : secur32: Validate the context handle in schan_InitializeSecurityContextW().
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: c1993458ac3b4be9af4f8c47f5de2cbd739f902b URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1993458ac3b4be9af4f8c47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:27 2021 +0200 secur32: Validate the context handle in schan_InitializeSecurityContextW(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index fdf8e990f62..5b1a910a361 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -984,7 +984,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( SIZE_T record_size = 0; unsigned char *ptr; - ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); + if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; if (pInput) { idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN);

1 0

Hans Leidekker : secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW().
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 60474096693b6f0ad0e31c09e57a393c3538f3e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=60474096693b6f0ad0e31c09… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:28 2021 +0200 secur32: Fix error return for DTLS contexts in schan_InitializeSecurityContextW(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5b1a910a361..895364a3fc7 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -880,6 +880,11 @@ static inline SIZE_T read_record_size(const BYTE *buf, SIZE_T header_size) return (buf[header_size - 2] << 8) | buf[header_size - 1]; } +static inline BOOL is_dtls_context(const struct schan_context *ctx) +{ + return ctx->header_size == HEADER_SIZE_DTLS; +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -985,35 +990,28 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( unsigned char *ptr; if (!(ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX))) return SEC_E_INVALID_HANDLE; - if (pInput) - { - idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); - if (idx == -1) - return SEC_E_INCOMPLETE_MESSAGE; - - buffer = &pInput->pBuffers[idx]; - ptr = buffer->pvBuffer; - expected_size = 0; + if (!pInput) return is_dtls_context(ctx) ? SEC_E_INSUFFICIENT_MEMORY : SEC_E_INCOMPLETE_MESSAGE; + if ((idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN)) == -1) return SEC_E_INCOMPLETE_MESSAGE; - while (buffer->cbBuffer > expected_size + ctx->header_size) - { - record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); + buffer = &pInput->pBuffers[idx]; + ptr = buffer->pvBuffer; + expected_size = 0; - if (buffer->cbBuffer < expected_size + record_size) - break; + while (buffer->cbBuffer > expected_size + ctx->header_size) + { + record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); - expected_size += record_size; - ptr += record_size; - } + if (buffer->cbBuffer < expected_size + record_size) break; + expected_size += record_size; + ptr += record_size; + } - if (!expected_size) - { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); - return SEC_E_INCOMPLETE_MESSAGE; - } + if (!expected_size) + { + TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + max(ctx->header_size + 1, record_size), buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; } - else return SEC_E_INCOMPLETE_MESSAGE; TRACE("Using expected_size %lu.\n", expected_size); }

1 0

Hans Leidekker : secur32/tests: Add DTLS tests.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 84a968abceb23713625378d1d215d0437032e8ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=84a968abceb23713625378d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Oct 28 20:19:29 2021 +0200 secur32/tests: Add DTLS tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b7f9d409d41..7cb3871193c 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1517,6 +1517,76 @@ static void test_application_protocol_negotiation(void) closesocket(sock); } +static void test_dtls(void) +{ + SECURITY_STATUS status; + TimeStamp exp; + SCHANNEL_CRED cred; + CredHandle cred_handle; + CtxtHandle ctx_handle; + SecBufferDesc buffers[3]; + ULONG flags_req, flags_ret, attr; + + init_cred( &cred ); + cred.grbitEnabledProtocols = SP_PROT_DTLS_CLIENT | SP_PROT_DTLS1_2_CLIENT; + cred.dwFlags = SCH_CRED_NO_DEFAULT_CREDS; + + status = AcquireCredentialsHandleA( NULL, unisp_name_a, SECPKG_CRED_OUTBOUND, NULL, &cred, NULL, NULL, + &cred_handle, &exp ); + if (status == SEC_E_ALGORITHM_MISMATCH) + { + win_skip( "no DTLS support\n" ); + return; + } + ok( status == SEC_E_OK, "got %08x\n", status ); + + flags_req = ISC_REQ_MANUAL_CRED_VALIDATION | ISC_REQ_EXTENDED_ERROR | ISC_REQ_DATAGRAM | ISC_REQ_USE_SUPPLIED_CREDS | + ISC_REQ_CONFIDENTIALITY | ISC_REQ_SEQUENCE_DETECT | ISC_REQ_REPLAY_DETECT; + + init_buffers( &buffers[0], 1, 128 ); + buffers[0].pBuffers[0].BufferType = SECBUFFER_DTLS_MTU; + *(WORD *)(buffers[0].pBuffers[0].pvBuffer) = 1024; + buffers[0].pBuffers[0].cbBuffer = 2; + + init_buffers( &buffers[1], 2, 2048 ); + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + buffers[1].pBuffers[1].BufferType = SECBUFFER_ALERT; + buffers[1].pBuffers[1].cbBuffer = 1024; + buffers[1].pBuffers[1].pvBuffer = HeapAlloc( GetProcessHeap(), 0, 1024 ); + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, NULL, (SEC_CHAR *)"winetest", flags_req, 0, 16, &buffers[0], 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_I_CONTINUE_NEEDED, "got %08x\n", status ); + + flags_ret = ISC_RET_MANUAL_CRED_VALIDATION | ISC_RET_STREAM | ISC_RET_EXTENDED_ERROR | ISC_RET_DATAGRAM | + ISC_RET_USED_SUPPLIED_CREDS | ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; + buffers[1].pBuffers[0].cbBuffer = 1420; + + attr = 0; + exp.LowPart = exp.HighPart = 0xdeadbeef; + status = InitializeSecurityContextA( &cred_handle, &ctx_handle, (SEC_CHAR *)"winetest", flags_req, 0, 16, NULL, 0, + &ctx_handle, &buffers[1], &attr, &exp ); + ok( status == SEC_E_INSUFFICIENT_MEMORY, "got %08x\n", status ); + + flags_ret = ISC_RET_CONFIDENTIALITY | ISC_RET_SEQUENCE_DETECT | ISC_RET_REPLAY_DETECT; + todo_wine ok( attr == flags_ret, "got %08x\n", attr ); + ok( !exp.LowPart, "got %08x\n", exp.LowPart ); + ok( !exp.HighPart, "got %08x\n", exp.HighPart ); + + free_buffers( &buffers[0] ); + free_buffers( &buffers[1] ); + DeleteSecurityContext( &ctx_handle ); + FreeCredentialsHandle( &cred_handle ); +} + START_TEST(schannel) { WSADATA wsa_data; @@ -1529,4 +1599,5 @@ START_TEST(schannel) test_InitializeSecurityContext(); test_communication(); test_application_protocol_negotiation(); + test_dtls(); }

1 0

Alexandre Julliard : configure: Disable gphoto2.ds if the needed Unix libraries are missing.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 929e2a54e3435a13d72b733f0ef20b7dcedd91e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=929e2a54e3435a13d72b733f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:33:30 2021 +0200 configure: Disable gphoto2.ds if the needed Unix libraries are missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 16 +++++----------- configure.ac | 12 +++++------- dlls/gphoto2.ds/ds_image.c | 18 ------------------ dlls/gphoto2.ds/gphoto2_i.h | 14 +------------- dlls/gphoto2.ds/gphoto2_main.c | 16 +++++----------- dlls/gphoto2.ds/ui.c | 4 ---- include/config.h.in | 3 --- 7 files changed, 16 insertions(+), 67 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929e2a54e3435a13d72b…

1 0

Alexandre Julliard : gphoto2.ds: Move libgphoto2 handling to a separate Unix library.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: bbfbfd0869902507264857628aac1e316d4a331d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfbfd086990250726485762… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:34:35 2021 +0200 gphoto2.ds: Move libgphoto2 handling to a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/Makefile.in | 4 +- dlls/gphoto2.ds/ds_image.c | 137 ++++++++------ dlls/gphoto2.ds/gphoto2_i.h | 29 +-- dlls/gphoto2.ds/gphoto2_main.c | 362 ++++++----------------------------- dlls/gphoto2.ds/ui.c | 122 +++++------- dlls/gphoto2.ds/unixlib.c | 421 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/unixlib.h | 87 +++++++++ 7 files changed, 701 insertions(+), 461 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bbfbfd08699025072648…

1 0

Alexandre Julliard : gphoto2.ds: Use the bundled libjpeg and build with msvcrt.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 8f70855f88064173bd30ff8be2505d79d6398db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f70855f88064173bd30ff8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:35:12 2021 +0200 gphoto2.ds: Use the bundled libjpeg and build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 120 ----------------------------------------- configure.ac | 17 ------ dlls/gphoto2.ds/Makefile.in | 6 +-- dlls/gphoto2.ds/capability.c | 2 - dlls/gphoto2.ds/ds_image.c | 80 +++++---------------------- dlls/gphoto2.ds/gphoto2_i.h | 26 ++------- dlls/gphoto2.ds/gphoto2_main.c | 7 +-- dlls/gphoto2.ds/ui.c | 2 - include/config.h.in | 6 --- 9 files changed, 22 insertions(+), 244 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f70855f88064173bd30…

1 0

Alexandre Julliard : twain_32: Fix loading of TWAIN source modules.
by Alexandre Julliard 29 Oct '21

29 Oct '21

Module: wine Branch: master Commit: 1dd462b62cc02f0e2a04e01720f8ea198d287296 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd462b62cc02f0e2a04e017… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:58:38 2021 +0200 twain_32: Fix loading of TWAIN source modules. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 45f227e180b..f8ec539ba85 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -40,7 +40,7 @@ static HWND DSM_parent; static UINT event_message; struct all_devices { - char *modname; + WCHAR *modname; TW_IDENTITY identity; }; @@ -48,21 +48,23 @@ static int nrdevices = 0; static struct all_devices *devices = NULL; static void -twain_add_onedriver(const char *dsname) { +twain_add_onedriver(const WCHAR *dsname) { HMODULE hmod; DSENTRYPROC dsEntry; TW_IDENTITY fakeOrigin; TW_IDENTITY sourceId; TW_UINT16 ret; + WCHAR path[MAX_PATH]; - hmod = LoadLibraryA(dsname); + swprintf( path, MAX_PATH, L"c:\\windows\\twain_%u\\%s", sizeof(void *) * 8, dsname ); + hmod = LoadLibraryW(path); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", debugstr_a(dsname)); + ERR("Failed to load TWAIN Source %s\n", debugstr_w(path)); return; } dsEntry = (DSENTRYPROC)GetProcAddress(hmod, "DS_Entry"); if (!dsEntry) { - ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_a(dsname)); + ERR("Failed to find DS_Entry() in TWAIN DS %s\n", debugstr_w(path)); return; } /* Loop to do multiple detects, mostly for sane.ds and gphoto2.ds */ @@ -87,12 +89,8 @@ twain_add_onedriver(const char *dsname) { } if (i < nrdevices) break; - if (nrdevices) - devices = HeapReAlloc(GetProcessHeap(), 0, devices, sizeof(devices[0])*(nrdevices+1)); - else - devices = HeapAlloc(GetProcessHeap(), 0, sizeof(devices[0])); - if ((devices[nrdevices].modname = HeapAlloc(GetProcessHeap(), 0, strlen(dsname) + 1))) - lstrcpyA(devices[nrdevices].modname, dsname); + devices = realloc( devices, sizeof(devices[0])*(nrdevices+1) ); + devices[nrdevices].modname = wcsdup( path ); devices[nrdevices].identity = sourceId; nrdevices++; DSM_sourceId++; @@ -107,12 +105,12 @@ twain_autodetect(void) { if (detectionrun) return; detectionrun = TRUE; - twain_add_onedriver("sane.ds"); - twain_add_onedriver("gphoto2.ds"); + twain_add_onedriver(L"sane.ds"); + twain_add_onedriver(L"gphoto2.ds"); #if 0 - twain_add_onedriver("c:\\windows\\Twain_32\\Largan\\sp503a.ds"); - twain_add_onedriver("c:\\windows\\Twain_32\\vivicam10\\vivicam10.ds"); - twain_add_onedriver("c:\\windows\\Twain_32\\ws30slim\\sp500a.ds"); + twain_add_onedriver(L"Largan\\sp503a.ds"); + twain_add_onedriver(L"vivicam10\\vivicam10.ds"); + twain_add_onedriver(L"ws30slim\\sp500a.ds"); #endif } @@ -282,7 +280,6 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) TW_UINT16 i = 0; pTW_IDENTITY pIdentity = (pTW_IDENTITY) pData; activeDS *newSource; - const char *modname = NULL; HMODULE hmod; TRACE("DG_CONTROL/DAT_IDENTITY/MSG_OPENDS\n"); @@ -315,9 +312,9 @@ TW_UINT16 TWAIN_OpenDS (pTW_IDENTITY pOrigin, TW_MEMREF pData) FIXME("Out of memory.\n"); return TWRC_FAILURE; } - hmod = LoadLibraryA(devices[i].modname); + hmod = LoadLibraryW(devices[i].modname); if (!hmod) { - ERR("Failed to load TWAIN Source %s\n", debugstr_a(modname)); + ERR("Failed to load TWAIN Source %s\n", debugstr_w(devices[i].modname)); DSM_twCC = TWCC_OPERATIONERROR; HeapFree(GetProcessHeap(), 0, newSource); return TWRC_FAILURE;

1 0