December 2021 - Wine-commits

Brendan Shanks : include: Add processthreadsapi.h file.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: d4cfb0c30c74cbb53291ef660ade50091a7901be URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4cfb0c30c74cbb53291ef66… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Dec 3 16:28:57 2021 -0800 include: Add processthreadsapi.h file. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/processthreadsapi.h | 33 +++++++++++++++++++++++++++++++++ include/winbase.h | 1 + 3 files changed, 35 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c99b0e1e1c1..de40421edcb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -592,6 +592,7 @@ SOURCES = \ poppack.h \ powrprof.h \ prntvpt.h \ + processthreadsapi.h \ profinfo.h \ proofofpossessioncookieinfo.idl \ propidl.idl \ diff --git a/include/processthreadsapi.h b/include/processthreadsapi.h new file mode 100644 index 00000000000..8cdaff4796a --- /dev/null +++ b/include/processthreadsapi.h @@ -0,0 +1,33 @@ +/* + * Copyright 2021 Brendan Shanks for CodeWeavers + * + * 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 + */ + +#ifndef _PROCESSTHREADSAPI_H +#define _PROCESSTHREADSAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI HRESULT WINAPI GetThreadDescription(HANDLE,PWSTR *); +WINBASEAPI HRESULT WINAPI SetThreadDescription(HANDLE,PCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _PROCESSTHREADSAPI_H */ diff --git a/include/winbase.h b/include/winbase.h index 8e8a185b4ff..2f7287f12b6 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -40,6 +40,7 @@ extern "C" { #endif #include <libloaderapi.h> +#include <processthreadsapi.h> #include <synchapi.h> #include <threadpoolapiset.h>

1 0

Piotr Caban : vcruntime140_1: Add support for exception separated code segments.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 9ccd84b945c4935e200becfe08a9a5bdb4799bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ccd84b945c4935e200becfe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Dec 4 18:15:06 2021 +0100 vcruntime140_1: Add support for exception separated code segments. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51396 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140_1/except_x86_64.c | 62 ++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/dlls/vcruntime140_1/except_x86_64.c b/dlls/vcruntime140_1/except_x86_64.c index f50847d886d..b29a2baa696 100644 --- a/dlls/vcruntime140_1/except_x86_64.c +++ b/dlls/vcruntime140_1/except_x86_64.c @@ -74,6 +74,7 @@ typedef struct #define CATCHBLOCK_FLAGS 0x01 #define CATCHBLOCK_TYPE_INFO 0x02 #define CATCHBLOCK_OFFSET 0x04 +#define CATCHBLOCK_SEPARATED 0x08 #define CATCHBLOCK_RET_ADDR_MASK 0x30 #define CATCHBLOCK_RET_ADDR 0x10 #define CATCHBLOCK_TWO_RET_ADDRS 0x20 @@ -219,13 +220,14 @@ static void read_tryblock_info(BYTE **b, tryblock_info *ti, ULONG64 image_base) } } -static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) +static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci, DWORD func_rva) { BYTE ret_addr_type; memset(ci, 0, sizeof(*ci)); ci->header = **b; (*b)++; - if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | CATCHBLOCK_RET_ADDR_MASK)) + if (ci->header & ~(CATCHBLOCK_FLAGS | CATCHBLOCK_TYPE_INFO | CATCHBLOCK_OFFSET | + CATCHBLOCK_SEPARATED | CATCHBLOCK_RET_ADDR_MASK)) { FIXME("unknown header: %x\n", ci->header); return FALSE; @@ -241,10 +243,20 @@ static BOOL read_catchblock_info(BYTE **b, catchblock_info *ci) if (ci->header & CATCHBLOCK_TYPE_INFO) ci->type_info = read_rva(b); if (ci->header & CATCHBLOCK_OFFSET) ci->offset = decode_uint(b); ci->handler = read_rva(b); - if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[0] = decode_uint(b); - if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) - ci->ret_addr[1] = decode_uint(b); + if (ci->header & CATCHBLOCK_SEPARATED) + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = read_rva(b); + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = read_rva(b); + } + else + { + if (ret_addr_type == CATCHBLOCK_RET_ADDR || ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[0] = decode_uint(b) + func_rva; + if (ret_addr_type == CATCHBLOCK_TWO_RET_ADDRS) + ci->ret_addr[1] = decode_uint(b) + func_rva; + } return TRUE; } @@ -320,7 +332,8 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT for (j = 0; j < ti.catchblock_count; j++) { catchblock_info ci; - if (!read_catchblock_info(&catchblock, &ci)) return FALSE; + if (!read_catchblock_info(&catchblock, &ci, + dispatch->FunctionEntry->BeginAddress)) return FALSE; TRACE(" %d: header 0x%x offset %d handler 0x%x(%p) " "ret addr[0] %#x ret_addr[1] %#x type %#x %s\n", j, ci.header, ci.offset, ci.handler, rva_to_ptr(ci.handler, image_base), @@ -614,7 +627,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, { catchblock_info ci; - read_catchblock_info(&catchblock, &ci); + read_catchblock_info(&catchblock, &ci, dispatch->FunctionEntry->BeginAddress); if (info) { @@ -652,11 +665,15 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, catch_record.ExceptionInformation[6] = (ULONG_PTR)untrans_rec; catch_record.ExceptionInformation[7] = (ULONG_PTR)context; if (ci.ret_addr[0]) + { catch_record.ExceptionInformation[8] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[0] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[0], dispatch->ImageBase); + } if (ci.ret_addr[1]) + { catch_record.ExceptionInformation[9] = (ULONG_PTR)rva_to_ptr( - ci.ret_addr[1] + dispatch->FunctionEntry->BeginAddress, dispatch->ImageBase); + ci.ret_addr[1], dispatch->ImageBase); + } RtlUnwindEx((void*)frame, (void*)dispatch->ControlPc, &catch_record, NULL, &ctx, NULL); } } @@ -808,8 +825,9 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, rec->ExceptionCode != STATUS_LONGJUMP) return ExceptionContinueSearch; /* handle only c++ exceptions */ - if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_UNWIND_MAP | - FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | FUNC_DESCR_NO_EXCEPT)) + if (descr.header & ~(FUNC_DESCR_IS_CATCH | FUNC_DESCR_IS_SEPARATED | + FUNC_DESCR_UNWIND_MAP | FUNC_DESCR_TRYBLOCK_MAP | FUNC_DESCR_EHS | + FUNC_DESCR_NO_EXCEPT)) { FIXME("unsupported flags: %x\n", descr.header); return ExceptionContinueSearch; @@ -831,6 +849,26 @@ EXCEPTION_DISPOSITION __cdecl __CxxFrameHandler4(EXCEPTION_RECORD *rec, descr.tryblock_map += count_end - count; } descr.ip_map = read_rva(&p); + if (descr.header & FUNC_DESCR_IS_SEPARATED) + { + UINT i, num, func; + BYTE *map; + + map = rva_to_ptr(descr.ip_map, dispatch->ImageBase); + num = decode_uint(&map); + for (i = 0; i < num; i++) + { + func = read_rva(&map); + descr.ip_map = read_rva(&map); + if (func == dispatch->FunctionEntry->BeginAddress) + break; + } + if (i == num) + { + FIXME("function ip_map not found\n"); + return ExceptionContinueSearch; + } + } count_end = count = rva_to_ptr(descr.ip_map, dispatch->ImageBase); descr.ip_count = decode_uint(&count_end); descr.ip_map += count_end - count;

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 5764980feac0da67cf69b4c172361e55122a3d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5764980feac0da67cf69b4c1… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sun Dec 5 23:14:42 2021 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 252 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 130 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5764980feac0da67cf69…

1 0

Konstantin Romanov : wineps: Return a POINT for DC_PAPERSIZE.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 62e0f51e6e22deaaea6283ce541dbc7111e01faa URL: https://source.winehq.org/git/wine.git/?a=commit;h=62e0f51e6e22deaaea6283ce… Author: Konstantin Romanov <incubusrk(a)gmail.com> Date: Mon Dec 6 09:58:10 2021 +0000 wineps: Return a POINT for DC_PAPERSIZE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52132 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 11de7bc3328..64ed5bbb402 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -25,15 +25,19 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT -#include <string.h> - -#include "wine/debug.h" -#include "psdrv.h" -#include "ddk/winddiui.h" +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "winnls.h" +#include "wingdi.h" #include "winuser.h" -#include "wine/wingdi16.h" #include "prsht.h" +#include "ddk/winddiui.h" + +#include "wine/debug.h" + +#include "psdrv.h" #include "psdlg.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); @@ -561,7 +565,7 @@ DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capa case DC_PAPERSIZE: { PAGESIZE *ps; - POINT16 *pt = output; + POINT *pt = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry)

1 0

Huw Davies : wineps: Build with nameless structs and unions.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 78bd41afb3021a348d9e53931aaf75d00db8b12a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78bd41afb3021a348d9e5393… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 6 09:58:11 2021 +0000 wineps: Build with nameless structs and unions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/driver.c | 84 +++++++++++++++++++++++------------------------- dlls/wineps.drv/init.c | 55 +++++++++++++------------------ dlls/wineps.drv/ps.c | 12 +++---- 3 files changed, 68 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78bd41afb3021a348d9e…

1 0

Derek Lesho : kernelbase: Fix parameter order of FindResourceExW call for non-localized path.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 472763c5237febcb8745835c96f8b49b000564de URL: https://source.winehq.org/git/wine.git/?a=commit;h=472763c5237febcb8745835c… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Dec 6 10:58:18 2021 +0100 kernelbase: Fix parameter order of FindResourceExW call for non-localized path. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d670df27690..7ca3ecdc712 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -781,8 +781,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), @@ -887,8 +887,8 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO),

1 0

Alexandre Julliard : secur32: Move the pull/push callbacks to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 37eab1f496b1e7540631760956a5ca97ef4d4b76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37eab1f496b1e75406317609… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 11:59:44 2021 +0100 secur32: Move the pull/push callbacks to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 80 ------------------------------------------ dlls/secur32/schannel_gnutls.c | 38 ++++++++++---------- dlls/secur32/secur32_priv.h | 2 -- 3 files changed, 20 insertions(+), 100 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 895364a3fc7..e3c5ab76088 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -745,84 +745,6 @@ static char * CDECL schan_get_buffer(const struct schan_transport *t, struct sch return (char *)buffer->pvBuffer + s->offset; } -/* schan_pull - * Read data from the transport input buffer. - * - * t - The session transport object. - * buff - The buffer into which to store the read data. Must be at least - * *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to read. On successful - * return, *buff_len is the number of bytes actually read. - * - * Returns: - * 0 on success, in which case: - * *buff_len == 0 indicates end of file. - * *buff_len > 0 indicates that some data was read. May be less than - * what was requested, in which case the caller should call again if/ - * when they want more. - * -1 when no data could be read without blocking - * another errno-style error value on failure - */ -static int CDECL schan_pull(struct schan_transport *t, void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Pull %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->in, &local_len); - if (!b) - return -1; - - memcpy(buff, b, local_len); - t->in.offset += local_len; - - TRACE("Read %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - -/* schan_push - * Write data to the transport output buffer. - * - * t - The session transport object. - * buff - The buffer of data to write. Must be at least *buff_len bytes in length. - * buff_len - On input, *buff_len is the desired length to write. On successful - * return, *buff_len is the number of bytes actually written. - * - * Returns: - * 0 on success - * *buff_len will be > 0 indicating how much data was written. May be less - * than what was requested, in which case the caller should call again - * if/when they want to write more. - * -1 when no data could be written without blocking - * another errno-style error value on failure - */ -static int CDECL schan_push(struct schan_transport *t, const void *buff, size_t *buff_len) -{ - char *b; - SIZE_T local_len = *buff_len; - - TRACE("Push %lu bytes\n", local_len); - - *buff_len = 0; - - b = schan_get_buffer(t, &t->out, &local_len); - if (!b) - return -1; - - memcpy(b, buff, local_len); - t->out.offset += local_len; - - TRACE("Wrote %lu bytes\n", local_len); - - *buff_len = local_len; - return 0; -} - static schan_session CDECL schan_get_session_for_transport(struct schan_transport* t) { return t->ctx->session; @@ -1654,8 +1576,6 @@ const struct schan_callbacks schan_callbacks = { schan_get_buffer, schan_get_session_for_transport, - schan_pull, - schan_push, }; void SECUR32_initSchannelSP(void) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index e02b1643e30..117a9da42d5 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -203,40 +203,42 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->pull(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->in, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from pull callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(buff, b, len); + t->in.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T len = buff_len; + char *b; - int ret = callbacks->push(transport, buff, &buff_len); - if (ret == -1) + TRACE("Push %lu bytes\n", len); + + b = callbacks->get_buffer(t, &t->out, &len); + if (!b) { pgnutls_transport_set_errno(s, EAGAIN); return -1; } - if (ret < 0) - { - FIXME("unhandled error from push callback %d\n", ret); - return -1; - } - - return buff_len; + memcpy(b, buff, len); + t->out.offset += len; + TRACE("Wrote %lu bytes\n", len); + return len; } static const struct { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 75c6cde2e42..eedb1f4bfb2 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -140,8 +140,6 @@ struct schan_callbacks { char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); schan_session (CDECL *get_session_for_transport)(struct schan_transport *); - int CDECL (CDECL *pull)(struct schan_transport *, void *, size_t *); - int CDECL (CDECL *push)(struct schan_transport *, const void *, size_t *); }; extern const struct schan_funcs *schan_funcs;

1 0

Alexandre Julliard : secur32: Store the GnuTLS session inside the transport.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 4e579d49a77c5a673589de0a2ce020c660be7124 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e579d49a77c5a673589de0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:07:36 2021 +0100 secur32: Store the GnuTLS session inside the transport. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 45 ++++++++++++++++++------------------------ dlls/secur32/schannel_gnutls.c | 6 +++--- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 23 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4e579d49a77c5a673589…

1 0

Alexandre Julliard : secur32: Move the get_buffer callback to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 97ea9ee41ce7281ce3cde56cb9d25db118b30b37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97ea9ee41ce7281ce3cde56c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 12:25:53 2021 +0100 secur32: Move the get_buffer callback to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 86 +------------------------------------ dlls/secur32/schannel_gnutls.c | 96 ++++++++++++++++++++++++++++++++++++++---- dlls/secur32/secur32_priv.h | 5 --- 3 files changed, 89 insertions(+), 98 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index d35372ed7fc..0dbffb485e6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -665,85 +665,6 @@ static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int sta return -1; } -static void schan_resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) -{ - SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; - SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; - void *new_data; - - if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; - - while (new_size < min_size) new_size *= 2; - - if (b->pvBuffer) /* freed with FreeContextBuffer */ - new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); - else - new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); - - if (!new_data) - { - TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); - return; - } - - b->cbBuffer = new_size; - b->pvBuffer = new_data; -} - -static char * CDECL schan_get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) -{ - SIZE_T max_count; - PSecBuffer buffer; - - if (!s->desc) - { - TRACE("No desc\n"); - return NULL; - } - - if (s->current_buffer_idx == -1) - { - /* Initial buffer */ - int buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - } - - buffer = &s->desc->pBuffers[s->current_buffer_idx]; - TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); - - schan_resize_current_buffer(s, s->offset + *count); - max_count = buffer->cbBuffer - s->offset; - if (s->limit != ~0UL && s->limit < max_count) - max_count = s->limit; - if (!max_count) - { - int buffer_idx; - - s->allow_buffer_resize = FALSE; - buffer_idx = s->get_next_buffer(t, s); - if (buffer_idx == -1) - { - TRACE("No next buffer\n"); - return NULL; - } - s->current_buffer_idx = buffer_idx; - s->offset = 0; - return schan_get_buffer(t, s, count); - } - - if (*count > max_count) - *count = max_count; - if (s->limit != ~0UL) - s->limit -= *count; - - return (char *)buffer->pvBuffer + s->offset; -} - static int schan_init_sec_ctx_get_next_input_buffer(const struct schan_transport *t, struct schan_buffers *s) { if (s->current_buffer_idx != -1) @@ -1566,11 +1487,6 @@ static const SecurityFunctionTableW schanTableW = { NULL, /* SetContextAttributesW */ }; -const struct schan_callbacks schan_callbacks = -{ - schan_get_buffer, -}; - void SECUR32_initSchannelSP(void) { /* This is what Windows reports. This shouldn't break any applications @@ -1596,7 +1512,7 @@ void SECUR32_initSchannelSP(void) }; SecureProvider *provider; - if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, &schan_callbacks, &schan_funcs)) + if (!schan_funcs && __wine_init_unix_lib(hsecur32, DLL_PROCESS_ATTACH, NULL, &schan_funcs)) { ERR( "no schannel support, expect problems\n" ); return; diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 9b0833efcf5..7eca22b2967 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); -static const struct schan_callbacks *callbacks; - /* Not present in gnutls version < 2.9.10. */ static int (*pgnutls_cipher_get_block_size)(gnutls_cipher_algorithm_t); @@ -199,6 +197,89 @@ static void compat_gnutls_dtls_set_mtu(gnutls_session_t session, unsigned int mt FIXME("\n"); } +static void resize_current_buffer(const struct schan_buffers *s, SIZE_T min_size) +{ + SecBuffer *b = &s->desc->pBuffers[s->current_buffer_idx]; + SIZE_T new_size = b->cbBuffer ? b->cbBuffer * 2 : 128; + void *new_data; + + if (b->cbBuffer >= min_size || !s->allow_buffer_resize || min_size > UINT_MAX / 2) return; + + while (new_size < min_size) new_size *= 2; + + if (b->pvBuffer) /* freed with FreeContextBuffer */ + new_data = RtlReAllocateHeap(GetProcessHeap(), 0, b->pvBuffer, new_size); + else + new_data = RtlAllocateHeap(GetProcessHeap(), 0, new_size); + + if (!new_data) + { + TRACE("Failed to resize %p from %d to %ld\n", b->pvBuffer, b->cbBuffer, new_size); + return; + } + + b->cbBuffer = new_size; + b->pvBuffer = new_data; +} + +static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s, SIZE_T *count) +{ + SIZE_T max_count; + PSecBuffer buffer; + + if (!s->desc) + { + TRACE("No desc\n"); + return NULL; + } + + if (s->current_buffer_idx == -1) + { + /* Initial buffer */ + int buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + } + + buffer = &s->desc->pBuffers[s->current_buffer_idx]; + TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); + + resize_current_buffer(s, s->offset + *count); + max_count = buffer->cbBuffer - s->offset; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + + while (!max_count) + { + int buffer_idx; + + s->allow_buffer_resize = FALSE; + buffer_idx = s->get_next_buffer(t, s); + if (buffer_idx == -1) + { + TRACE("No next buffer\n"); + return NULL; + } + s->current_buffer_idx = buffer_idx; + s->offset = 0; + buffer = &s->desc->pBuffers[buffer_idx]; + max_count = buffer->cbBuffer; + if (s->limit != ~0UL && s->limit < max_count) + max_count = s->limit; + } + + if (*count > max_count) + *count = max_count; + if (s->limit != ~0UL) + s->limit -= *count; + + return (char *)buffer->pvBuffer + s->offset; +} + static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { struct schan_transport *t = (struct schan_transport*)transport; @@ -208,7 +289,7 @@ static ssize_t pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->in, &len); + b = get_buffer(t, &t->in, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -229,7 +310,7 @@ static ssize_t push_adapter(gnutls_transport_ptr_t transport, const void *buff, TRACE("Push %lu bytes\n", len); - b = callbacks->get_buffer(t, &t->out, &len); + b = get_buffer(t, &t->out, &len); if (!b) { pgnutls_transport_set_errno(s, EAGAIN); @@ -300,7 +381,7 @@ static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) TRACE("\n"); - if (callbacks->get_buffer(t, &t->in, &count)) return 1; + if (get_buffer(t, &t->in, &count)) return 1; pgnutls_transport_set_errno(s, EAGAIN); return -1; } @@ -661,7 +742,7 @@ static SECURITY_STATUS CDECL schan_send(schan_session session, const void *buffe struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->out, &count)) continue; + if (get_buffer(t, &t->out, &count)) continue; return SEC_I_CONTINUE_NEEDED; } else @@ -687,7 +768,7 @@ again: struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SIZE_T count = 0; - if (callbacks->get_buffer(t, &t->in, &count)) + if (get_buffer(t, &t->in, &count)) goto again; return SEC_I_CONTINUE_NEEDED; @@ -1118,7 +1199,6 @@ NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *p { case DLL_PROCESS_ATTACH: if (!gnutls_initialize()) return STATUS_DLL_NOT_FOUND; - callbacks = ptr_in; *(const struct schan_funcs **)ptr_out = &funcs; break; case DLL_PROCESS_DETACH: diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 88effe07a81..e4c39e476bc 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -137,11 +137,6 @@ struct schan_funcs void (CDECL *set_session_transport)(schan_session, struct schan_transport *); }; -struct schan_callbacks -{ - char * (CDECL *get_buffer)(const struct schan_transport *, struct schan_buffers *, SIZE_T *); -}; - extern const struct schan_funcs *schan_funcs; #endif /* __SECUR32_PRIV_H__ */

1 0

Alexandre Julliard : secur32: Move the decrypt message receive loop to the Unix side.
by Alexandre Julliard 06 Dec '21

06 Dec '21

Module: wine Branch: master Commit: 9894e109ac5ee0a8f6962f36a09bb5928485661f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9894e109ac5ee0a8f6962f36… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 3 13:09:43 2021 +0100 secur32: Move the decrypt message receive loop to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel.c | 33 +++++++---------------------- dlls/secur32/schannel_gnutls.c | 48 +++++++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 0dbffb485e6..4217cc7334f 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1319,7 +1319,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SIZE_T data_size; char *data; unsigned expected_size; - SSIZE_T received = 0; + SIZE_T received = 0; int idx; unsigned char *buf_ptr; @@ -1360,31 +1360,14 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle init_schan_buffers(&ctx->transport.in, message, schan_decrypt_message_get_next_buffer); ctx->transport.in.limit = expected_size; - while (received < data_size) - { - SIZE_T length = data_size - received; - status = schan_funcs->recv(ctx->transport.session, data + received, &length); - - if (status == SEC_I_RENEGOTIATE) - break; - - if (status == SEC_I_CONTINUE_NEEDED) - { - status = SEC_E_OK; - break; - } + received = data_size; + status = schan_funcs->recv(ctx->transport.session, data, &received); - if (status != SEC_E_OK) - { - free(data); - ERR("Returning %x\n", status); - return status; - } - - if (!length) - break; - - received += length; + if (status != SEC_E_OK && status != SEC_I_RENEGOTIATE) + { + free(data); + ERR("Returning %x\n", status); + return status; } TRACE("Received %ld bytes\n", received); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 7eca22b2967..df137321011 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -756,35 +756,39 @@ static SECURITY_STATUS CDECL schan_send(schan_session session, const void *buffe static SECURITY_STATUS CDECL schan_recv(schan_session session, void *buffer, SIZE_T *length) { gnutls_session_t s = (gnutls_session_t)session; + size_t data_size = *length; + size_t received = 0; ssize_t ret; + SECURITY_STATUS status = SEC_E_OK; -again: - ret = pgnutls_record_recv(s, buffer, *length); - - if (ret >= 0) - *length = ret; - else if (ret == GNUTLS_E_AGAIN) + while (received < data_size) { - struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); - SIZE_T count = 0; + ret = pgnutls_record_recv(s, (char *)buffer + received, data_size - received); - if (get_buffer(t, &t->in, &count)) - goto again; + if (ret > 0) received += ret; + else if (!ret) break; + else if (ret == GNUTLS_E_AGAIN) + { + struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); + SIZE_T count = 0; - return SEC_I_CONTINUE_NEEDED; - } - else if (ret == GNUTLS_E_REHANDSHAKE) - { - TRACE("Rehandshake requested\n"); - return SEC_I_RENEGOTIATE; - } - else - { - pgnutls_perror(ret); - return SEC_E_INTERNAL_ERROR; + if (!get_buffer(t, &t->in, &count)) break; + } + else if (ret == GNUTLS_E_REHANDSHAKE) + { + TRACE("Rehandshake requested\n"); + status = SEC_I_RENEGOTIATE; + break; + } + else + { + pgnutls_perror(ret); + return SEC_E_INTERNAL_ERROR; + } } - return SEC_E_OK; + *length = received; + return status; } static unsigned int parse_alpn_protocol_list(unsigned char *buffer, unsigned int buflen, gnutls_datum_t *list)

1 0