June 2022 - Wine-commits - list.winehq.org

Jacek Caban : winemac: Use unixlib interface for macdrv_app_quit_request.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: c701734c364844ba4d081214802d46a27b81f9f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c701734c364844ba4d081214… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 2 00:00:31 2022 +0200 winemac: Use unixlib interface for macdrv_app_quit_request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 174 +++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/macdrv_main.c | 9 +++ dlls/winemac.drv/unixlib.h | 16 +++- dlls/winemac.drv/window.c | 168 +-------------------------------------- 4 files changed, 202 insertions(+), 165 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c701734c364844ba4d08…

1 0

Jacek Caban : winemac: Use unixlib interface for macdrv_app_icon.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: dd818662b24777f1da1411da0dc476d350659746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd818662b24777f1da1411da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:04:57 2022 +0200 winemac: Use unixlib interface for macdrv_app_icon. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/dllmain.c | 168 ++++++++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/image.c | 178 +++++++-------------------------------------- dlls/winemac.drv/unixlib.h | 25 ++++++- 3 files changed, 219 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dd818662b24777f1da14…

1 0

Jacek Caban : winemac: Don't use sprintfW in copy_system_cursor_name.
by Alexandre Julliard 03 Jun '22

03 Jun '22

Module: wine Branch: master Commit: 22342300d915cd3516307f13d2207e77025f1cbe URL: https://source.winehq.org/git/wine.git/?a=commit;h=22342300d915cd3516307f13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jun 3 00:25:09 2022 +0200 winemac: Don't use sprintfW in copy_system_cursor_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/mouse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index 00ec9a36c38..18a98296a76 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -166,7 +166,6 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, */ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) { - static const WCHAR idW[] = {'%','h','u',0}; const struct system_cursors *cursors; unsigned int i; CFStringRef cursor_name = NULL; @@ -184,7 +183,12 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) p = name + strlenW(name); *p++ = ','; if (info->szResName[0]) strcpyW(p, info->szResName); - else sprintfW(p, idW, info->wResID); + else + { + char buf[16]; + sprintf(buf, "%hu", info->wResID); + asciiz_to_unicode(p, buf); + } /* @@ Wine registry key: HKCU\Software\Wine\Mac Driver\Cursors */ if (!(key = open_hkcu_key("Software\\Wine\\Mac Driver\\Cursors")))

1 0

Nikolay Sivov : secur32: Update output buffer offset on return from schan_send() call.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 0a62c7bd40b42108fe85f325c70e8d1b2ab668a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a62c7bd40b42108fe85f325… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:20:07 2022 +0300 secur32: Update output buffer offset on return from schan_send() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 8 +++++++- dlls/secur32/schannel_gnutls.c | 3 ++- dlls/secur32/secur32_priv.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 1f4a1005550..289802c5b32 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1299,7 +1299,8 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SIZE_T data_size; SIZE_T length; char *data; - int idx; + int idx, output_buffer_idx = -1; + ULONG output_offset = 0; TRACE("context_handle %p, quality %ld, message %p, message_seq_no %ld\n", context_handle, quality, message, message_seq_no); @@ -1326,8 +1327,13 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle params.output = message; params.buffer = data; params.length = &length; + params.output_buffer_idx = &output_buffer_idx; + params.output_offset = &output_offset; status = GNUTLS_CALL( send, &params ); + if (!status && output_buffer_idx != -1) + message->pBuffers[output_buffer_idx].cbBuffer = output_offset; + TRACE("Sent %Id bytes.\n", length); if (length != data_size) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 82437207982..ebce6bacde0 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -878,7 +878,8 @@ static NTSTATUS schan_send( void *args ) } } - t->out.desc->pBuffers[t->out.current_buffer_idx].cbBuffer = t->out.offset; + *params->output_buffer_idx = t->out.current_buffer_idx; + *params->output_offset = t->out.offset; return SEC_E_OK; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 574d3d51cb5..8a494309710 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -167,6 +167,8 @@ struct send_params SecBufferDesc *output; const void *buffer; SIZE_T *length; + int *output_buffer_idx; + ULONG *output_offset; }; struct set_application_protocols_params

1 0

Nikolay Sivov : secur32: Prepare schan_send() buffers on PE side.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 088c288214bb2c853e4f87462b83488cf45f0ba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=088c288214bb2c853e4f8746… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:38:26 2022 +0300 secur32: Prepare schan_send() buffers on PE side. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 45 ++++++++++++++++++---- dlls/secur32/schannel_gnutls.c | 84 ++++-------------------------------------- 2 files changed, 46 insertions(+), 83 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 289802c5b32..4508bc2f4b6 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1299,8 +1299,12 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SIZE_T data_size; SIZE_T length; char *data; - int idx, output_buffer_idx = -1; + int output_buffer_idx = -1; ULONG output_offset = 0; + SecBufferDesc output_desc = { 0 }; + SecBuffer output_buffers[3]; + int header_idx, data_idx, trailer_idx = -1; + int buffer_index[3]; TRACE("context_handle %p, quality %ld, message %p, message_seq_no %ld\n", context_handle, quality, message, message_seq_no); @@ -1310,29 +1314,56 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle dump_buffer_desc(message); - idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); - if (idx == -1) + data_idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_DATA); + if (data_idx == -1) { WARN("No data buffer passed\n"); return SEC_E_INTERNAL_ERROR; } - buffer = &message->pBuffers[idx]; + buffer = &message->pBuffers[data_idx]; data_size = buffer->cbBuffer; data = malloc(data_size); memcpy(data, buffer->pvBuffer, data_size); + /* Use { STREAM_HEADER, DATA, STREAM_TRAILER } or { TOKEN, DATA, TOKEN } buffers. */ + + output_desc.pBuffers = output_buffers; + if ((header_idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_STREAM_HEADER)) == -1) + { + if ((header_idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_TOKEN)) != -1) + { + output_buffers[output_desc.cBuffers++] = message->pBuffers[header_idx]; + output_buffers[output_desc.cBuffers++] = message->pBuffers[data_idx]; + trailer_idx = schan_find_sec_buffer_idx(message, header_idx + 1, SECBUFFER_TOKEN); + if (trailer_idx != -1) + output_buffers[output_desc.cBuffers++] = message->pBuffers[trailer_idx]; + } + } + else + { + output_buffers[output_desc.cBuffers++] = message->pBuffers[header_idx]; + output_buffers[output_desc.cBuffers++] = message->pBuffers[data_idx]; + trailer_idx = schan_find_sec_buffer_idx(message, 0, SECBUFFER_STREAM_TRAILER); + if (trailer_idx != -1) + output_buffers[output_desc.cBuffers++] = message->pBuffers[trailer_idx]; + } + + buffer_index[0] = header_idx; + buffer_index[1] = data_idx; + buffer_index[2] = trailer_idx; + length = data_size; params.session = ctx->session; - params.output = message; + params.output = &output_desc; params.buffer = data; params.length = &length; params.output_buffer_idx = &output_buffer_idx; params.output_offset = &output_offset; status = GNUTLS_CALL( send, &params ); - if (!status && output_buffer_idx != -1) - message->pBuffers[output_buffer_idx].cbBuffer = output_offset; + if (!status) + message->pBuffers[buffer_index[output_buffer_idx]].cbBuffer = output_offset; TRACE("Sent %Id bytes.\n", length); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index ebce6bacde0..44ad7c2c1da 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -236,78 +236,13 @@ static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc des s->get_next_buffer = get_next_buffer; } -static int schan_find_sec_buffer_idx(const SecBufferDesc *desc, unsigned int start_idx, ULONG buffer_type) +static int common_get_next_buffer(struct schan_buffers *s) { - unsigned int i; - PSecBuffer buffer; - - for (i = start_idx; i < desc->cBuffers; ++i) - { - buffer = &desc->pBuffers[i]; - if ((buffer->BufferType | SECBUFFER_ATTRMASK) == (buffer_type | SECBUFFER_ATTRMASK)) - return i; - } - - return -1; -} - -static int handshake_get_next_buffer(struct schan_buffers *s) -{ - if (s->current_buffer_idx != -1) - return -1; - return s->desc->cBuffers ? 0 : -1; -} - -static int send_message_get_next_buffer(struct schan_buffers *s) -{ - SecBuffer *b; - - if (s->current_buffer_idx == -1) - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_STREAM_HEADER); - - b = &s->desc->pBuffers[s->current_buffer_idx]; - - if (b->BufferType == SECBUFFER_STREAM_HEADER) - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); - - if (b->BufferType == SECBUFFER_DATA) - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_STREAM_TRAILER); - - return -1; -} - -static int send_message_get_next_buffer_token(struct schan_buffers *s) -{ - SecBuffer *b; - if (s->current_buffer_idx == -1) - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); - - b = &s->desc->pBuffers[s->current_buffer_idx]; - - if (b->BufferType == SECBUFFER_TOKEN) - { - int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); - if (idx != s->current_buffer_idx) return -1; - return schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_DATA); - } - - if (b->BufferType == SECBUFFER_DATA) - { - int idx = schan_find_sec_buffer_idx(s->desc, 0, SECBUFFER_TOKEN); - if (idx != -1) - idx = schan_find_sec_buffer_idx(s->desc, idx + 1, SECBUFFER_TOKEN); - return idx; - } - - return -1; -} - -static int recv_message_get_next_buffer(struct schan_buffers *s) -{ - if (s->current_buffer_idx != -1) + return s->desc->cBuffers ? 0 : -1; + if (s->current_buffer_idx == s->desc->cBuffers - 1) return -1; - return s->desc->cBuffers ? 0 : -1; + return s->current_buffer_idx + 1; } static char *get_buffer(struct schan_buffers *s, SIZE_T *count) @@ -583,9 +518,9 @@ static NTSTATUS schan_handshake( void *args ) NTSTATUS status; int err; - init_schan_buffers(&t->in, params->input, handshake_get_next_buffer); + init_schan_buffers(&t->in, params->input, common_get_next_buffer); t->in.limit = params->input_size; - init_schan_buffers(&t->out, params->output, handshake_get_next_buffer); + init_schan_buffers(&t->out, params->output, common_get_next_buffer); while (1) { @@ -850,10 +785,7 @@ static NTSTATUS schan_send( void *args ) struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SSIZE_T ret, total = 0; - if (schan_find_sec_buffer_idx(params->output, 0, SECBUFFER_STREAM_HEADER) != -1) - init_schan_buffers(&t->out, params->output, send_message_get_next_buffer); - else - init_schan_buffers(&t->out, params->output, send_message_get_next_buffer_token); + init_schan_buffers(&t->out, params->output, common_get_next_buffer); for (;;) { @@ -893,7 +825,7 @@ static NTSTATUS schan_recv( void *args ) ssize_t ret; SECURITY_STATUS status = SEC_E_OK; - init_schan_buffers(&t->in, params->input, recv_message_get_next_buffer); + init_schan_buffers(&t->in, params->input, common_get_next_buffer); t->in.limit = params->input_size; while (received < data_size)

1 0

Nikolay Sivov : secur32: Get rid of buffer iteration callback in unixlib.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: abf8ba51b6b8b5a83cfc0c490436c8bbff0a8ce3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abf8ba51b6b8b5a83cfc0c49… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 09:41:21 2022 +0300 secur32: Get rid of buffer iteration callback in unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 44ad7c2c1da..0657f9ab064 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -147,7 +147,6 @@ struct schan_buffers SIZE_T limit; const SecBufferDesc *desc; int current_buffer_idx; - int (*get_next_buffer)(struct schan_buffers *); }; struct schan_transport @@ -226,17 +225,15 @@ static void compat_gnutls_dtls_set_timeouts(gnutls_session_t session, unsigned i FIXME("\n"); } -static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc, - int (*get_next_buffer)(struct schan_buffers *)) +static void init_schan_buffers(struct schan_buffers *s, const PSecBufferDesc desc) { s->offset = 0; s->limit = ~0UL; s->desc = desc; s->current_buffer_idx = -1; - s->get_next_buffer = get_next_buffer; } -static int common_get_next_buffer(struct schan_buffers *s) +static int get_next_buffer(struct schan_buffers *s) { if (s->current_buffer_idx == -1) return s->desc->cBuffers ? 0 : -1; @@ -259,7 +256,7 @@ static char *get_buffer(struct schan_buffers *s, SIZE_T *count) if (s->current_buffer_idx == -1) { /* Initial buffer */ - int buffer_idx = s->get_next_buffer(s); + int buffer_idx = get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -280,7 +277,7 @@ static char *get_buffer(struct schan_buffers *s, SIZE_T *count) { int buffer_idx; - buffer_idx = s->get_next_buffer(s); + buffer_idx = get_next_buffer(s); if (buffer_idx == -1) { TRACE("No next buffer\n"); @@ -518,9 +515,9 @@ static NTSTATUS schan_handshake( void *args ) NTSTATUS status; int err; - init_schan_buffers(&t->in, params->input, common_get_next_buffer); + init_schan_buffers(&t->in, params->input); t->in.limit = params->input_size; - init_schan_buffers(&t->out, params->output, common_get_next_buffer); + init_schan_buffers(&t->out, params->output); while (1) { @@ -785,7 +782,7 @@ static NTSTATUS schan_send( void *args ) struct schan_transport *t = (struct schan_transport *)pgnutls_transport_get_ptr(s); SSIZE_T ret, total = 0; - init_schan_buffers(&t->out, params->output, common_get_next_buffer); + init_schan_buffers(&t->out, params->output); for (;;) { @@ -825,7 +822,7 @@ static NTSTATUS schan_recv( void *args ) ssize_t ret; SECURITY_STATUS status = SEC_E_OK; - init_schan_buffers(&t->in, params->input, common_get_next_buffer); + init_schan_buffers(&t->in, params->input); t->in.limit = params->input_size; while (received < data_size)

1 0

Nikolay Sivov : secur32: Remove duplicate check.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 8920ad75e376adfdb104c2bdd7c967b461a0a18c URL: https://source.winehq.org/git/wine.git/?a=commit;h=8920ad75e376adfdb104c2bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 10:33:09 2022 +0300 secur32: Remove duplicate check. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- 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 4508bc2f4b6..050a0a6da4c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -961,7 +961,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( alloc_buffer.pvBuffer = NULL; } } - else if (pOutput && pOutput->cBuffers) + else { pOutput->pBuffers[0].cbBuffer = 0; }

1 0

Nikolay Sivov : secur32: Remove unused pointer parameter from send request.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 086e950a2b3738bda0ab1080977f1a2915f0e8e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=086e950a2b3738bda0ab1080… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 11:29:41 2022 +0300 secur32: Remove unused pointer parameter from send request. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 9 +-------- dlls/secur32/schannel_gnutls.c | 6 +++--- dlls/secur32/secur32_priv.h | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 050a0a6da4c..794ceff1ecf 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1297,7 +1297,6 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle SECURITY_STATUS status; SecBuffer *buffer; SIZE_T data_size; - SIZE_T length; char *data; int output_buffer_idx = -1; ULONG output_offset = 0; @@ -1353,11 +1352,10 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle buffer_index[1] = data_idx; buffer_index[2] = trailer_idx; - length = data_size; params.session = ctx->session; params.output = &output_desc; params.buffer = data; - params.length = &length; + params.length = data_size; params.output_buffer_idx = &output_buffer_idx; params.output_offset = &output_offset; status = GNUTLS_CALL( send, &params ); @@ -1365,11 +1363,6 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle if (!status) message->pBuffers[buffer_index[output_buffer_idx]].cbBuffer = output_offset; - TRACE("Sent %Id bytes.\n", length); - - if (length != data_size) - status = SEC_E_INTERNAL_ERROR; - free(data); TRACE("Returning %#lx.\n", status); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 0657f9ab064..4d7711f32a2 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -786,12 +786,12 @@ static NTSTATUS schan_send( void *args ) for (;;) { - ret = pgnutls_record_send(s, (const char *)params->buffer + total, *params->length - total); + ret = pgnutls_record_send(s, (const char *)params->buffer + total, params->length - total); if (ret >= 0) { total += ret; - TRACE( "sent %ld now %ld/%ld\n", ret, total, *params->length ); - if (total == *params->length) break; + TRACE( "sent %ld now %ld/%u\n", ret, total, (unsigned)params->length ); + if (total == params->length) break; } else if (ret == GNUTLS_E_AGAIN) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 8a494309710..edbe1ccc36e 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -166,7 +166,7 @@ struct send_params schan_session session; SecBufferDesc *output; const void *buffer; - SIZE_T *length; + ULONG length; int *output_buffer_idx; ULONG *output_offset; };

1 0

Nikolay Sivov : secur32: Use 32-bit sizes in parameters structures.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 8a6e15138df03d001353c4e386bfa4d9e36bb9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a6e15138df03d001353c4e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 11:59:44 2022 +0300 secur32: Use 32-bit sizes in parameters structures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel.c | 4 ++-- dlls/secur32/secur32_priv.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 794ceff1ecf..bc0867ca94b 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1436,7 +1436,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle SIZE_T data_size; char *data; unsigned expected_size; - SIZE_T received = 0; + ULONG received = 0; int idx; unsigned char *buf_ptr; SecBufferDesc input_desc = { 0 }; @@ -1494,7 +1494,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle return status; } - TRACE("Received %Id bytes\n", received); + TRACE("Received %lu bytes\n", received); memcpy(buf_ptr + ctx->header_size, data, received); free(data); diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index edbe1ccc36e..bbb2c527b18 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -145,7 +145,7 @@ struct handshake_params { schan_session session; SecBufferDesc *input; - SIZE_T input_size; + ULONG input_size; SecBufferDesc *output; ULONG *input_offset; int *output_buffer_idx; @@ -156,9 +156,9 @@ struct recv_params { schan_session session; SecBufferDesc *input; - SIZE_T input_size; + ULONG input_size; void *buffer; - SIZE_T *length; + ULONG *length; }; struct send_params

1 0

Nikolay Sivov : secur32: Store certificate credentials object pointer as 64-bit.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 39a01a9f5283d9def67c6763f7f02f240b7c516e URL: https://source.winehq.org/git/wine.git/?a=commit;h=39a01a9f5283d9def67c6763… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 12:10:22 2022 +0300 secur32: Store certificate credentials object pointer as 64-bit. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 14 +++++++++----- dlls/secur32/secur32_priv.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 4d7711f32a2..08801cef509 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -141,6 +141,11 @@ static inline gnutls_session_t session_from_handle(UINT64 handle) return (gnutls_session_t)(ULONG_PTR)handle; } +static inline gnutls_certificate_credentials_t certificate_creds_from_handle(UINT64 handle) +{ + return (gnutls_certificate_credentials_t)(ULONG_PTR)handle; +} + struct schan_buffers { SIZE_T offset; @@ -469,8 +474,7 @@ static NTSTATUS schan_create_session( void *args ) return STATUS_INTERNAL_ERROR; } - err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, - (gnutls_certificate_credentials_t)cred->credentials); + err = pgnutls_credentials_set(s, GNUTLS_CRD_CERTIFICATE, certificate_creds_from_handle(cred->credentials)); if (err != GNUTLS_E_SUCCESS) { pgnutls_perror(err); @@ -1074,7 +1078,7 @@ static NTSTATUS schan_allocate_certificate_credentials( void *args ) if (!params->cert_blob) { - params->c->credentials = creds; + params->c->credentials = (ULONG_PTR)creds; return STATUS_SUCCESS; } @@ -1101,14 +1105,14 @@ static NTSTATUS schan_allocate_certificate_credentials( void *args ) return STATUS_INTERNAL_ERROR; } - params->c->credentials = creds; + params->c->credentials = (ULONG_PTR)creds; return STATUS_SUCCESS; } static NTSTATUS schan_free_certificate_credentials( void *args ) { const struct free_certificate_credentials_params *params = args; - pgnutls_certificate_free_credentials(params->c->credentials); + pgnutls_certificate_free_credentials(certificate_creds_from_handle(params->c->credentials)); return STATUS_SUCCESS; } diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index bbb2c527b18..5753ed47ffa 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -84,8 +84,8 @@ typedef UINT64 schan_session; typedef struct schan_credentials { ULONG credential_use; - void *credentials; DWORD enabled_protocols; + UINT64 credentials; } schan_credentials; struct session_params

1 0