October 2021 - Wine-Commits

Alexandre Julliard : ctapi32: Move libctapi.so interface to a separate Unix library.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 6677ba78348041d8b1bbd3fe8534a631558056ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=6677ba78348041d8b1bbd3fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:37:35 2021 +0200 ctapi32: Move libctapi.so interface to a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ctapi32/Makefile.in | 6 +-- dlls/ctapi32/ctapi.h | 107 ---------------------------------------------- dlls/ctapi32/ctapi32.c | 89 +++++++++++++++----------------------- dlls/ctapi32/ctapi32.spec | 6 +-- dlls/ctapi32/unixlib.c | 90 ++++++++++++++++++++++++++++++++++++++ dlls/ctapi32/unixlib.h | 68 +++++++++++++++++++++++++++++ 6 files changed, 199 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6677ba78348041d8b1bb…

1 0

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

Oct. 29, 2021

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 Oct. 29, 2021

Oct. 29, 2021

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

Rémi Bernon : dinput: Rewrite and simplify user data format object matching.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 4e56801abda2d3160880be45010eb3f2970a814d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e56801abda2d3160880be45… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 29 09:40:40 2021 +0200 dinput: Rewrite and simplify user data format object matching. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 280 +++++++++---------------------------------- dlls/dinput/device_private.h | 8 -- dlls/dinput8/tests/hid.c | 5 - 3 files changed, 55 insertions(+), 238 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e56801abda2d3160880…

1 0

Hans Leidekker : secur32/tests: Add DTLS tests.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

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 : gphoto2.ds: Move libgphoto2 handling to a separate Unix library.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

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 : twain_32: Fix loading of TWAIN source modules.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

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

Alexandre Julliard : capi2032: Link directly to libcapi20.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: eab0f52e9bc406bb17628086ea04c37ea2ed8a80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eab0f52e9bc406bb17628086… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:36:16 2021 +0200 capi2032: Link directly to libcapi20. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 ++++++---------- configure.ac | 7 +-- dlls/capi2032/Makefile.in | 1 + dlls/capi2032/cap20wxx.c | 134 ++++------------------------------------------ dlls/capi2032/cap20wxx.h | 55 ------------------- include/config.h.in | 3 -- 6 files changed, 31 insertions(+), 214 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eab0f52e9bc406bb1762…

1 0

Alexandre Julliard : capi2032: Move libcapi20.so interface to a separate Unix library.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: wine Branch: master Commit: 85b063af4cfb48ae270260317a0e3451b0fce74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=85b063af4cfb48ae27026031… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 29 09:37:11 2021 +0200 capi2032: Move libcapi20.so interface to a separate Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/capi2032/Makefile.in | 6 +- dlls/capi2032/cap20wxx.c | 94 ++++++++++++++++--------------- dlls/capi2032/capi2032.spec | 22 ++++---- dlls/capi2032/unixlib.c | 132 ++++++++++++++++++++++++++++++++++++++++++++ dlls/capi2032/unixlib.h | 96 ++++++++++++++++++++++++++++++++ 5 files changed, 293 insertions(+), 57 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85b063af4cfb48ae2702…

1 0

Francois Gouget : winetest: Increase the maximum report size to 2 MB.
by Alexandre Julliard Oct. 29, 2021

Oct. 29, 2021

Module: tools Branch: master Commit: bd5f69eaf2116b8e13478b97af662b86427282c0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=bd5f69eaf2116b8e13478b9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 28 12:46:08 2021 +0200 winetest: Increase the maximum report size to 2 MB. Also the maximum report size is no longer duplicated in WineTest. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 3db146a..0b8fd63 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -23,8 +23,7 @@ $acceptprediluvianwin = 0; $maxunitsize = 32 * 1024; # Maximum size of the report file -# This should be in line with programs\winetest\send.c -$maxfilesize = 1.5 * 1024 * 1024; +$maxfilesize = 2 * 1024 * 1024; # The number of builds after which a failure is considered old / new $patternbuilds = 10;

1 0