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

Nikolay Sivov : kerberos: Add wow64 support to the unixlib.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 5692c077d0dd415ee85e680c367f792b57ef2ef3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5692c077d0dd415ee85e680c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 20:42:22 2022 +0300 kerberos: Add wow64 support to the unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/unixlib.c | 325 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 325 insertions(+) diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 95e832e81d3..a918959dbe5 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -1012,4 +1012,329 @@ unixlib_entry_t __wine_unix_call_funcs[] = verify_signature, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +static NTSTATUS wow64_accept_context( void *args ) +{ + struct + { + UINT64 credential; + UINT64 context; + PTR32 input_token; + ULONG input_token_length; + PTR32 new_context; + PTR32 output_token; + PTR32 output_token_length; + PTR32 context_attr; + PTR32 expiry; + } const *params32 = args; + struct accept_context_params params = + { + params32->credential, + params32->context, + ULongToPtr(params32->input_token), + params32->input_token_length, + ULongToPtr(params32->new_context), + ULongToPtr(params32->output_token), + ULongToPtr(params32->output_token_length), + ULongToPtr(params32->context_attr), + ULongToPtr(params32->expiry), + }; + return accept_context( &params ); +} + +static NTSTATUS wow64_acquire_credentials_handle( void *args ) +{ + struct + { + PTR32 principal; + ULONG credential_use; + PTR32 username; + PTR32 password; + PTR32 credential; + PTR32 expiry; + } const *params32 = args; + struct acquire_credentials_handle_params params = + { + ULongToPtr(params32->principal), + params32->credential_use, + ULongToPtr(params32->username), + ULongToPtr(params32->password), + ULongToPtr(params32->credential), + ULongToPtr(params32->expiry), + }; + return acquire_credentials_handle( &params ); +} + +static NTSTATUS wow64_delete_context( void *args ) +{ + struct + { + UINT64 context; + } const *params32 = args; + struct delete_context_params params = + { + params32->context, + }; + return delete_context( &params ); +} + +static NTSTATUS wow64_free_credentials_handle( void *args ) +{ + struct + { + UINT64 credential; + } const *params32 = args; + struct free_credentials_handle_params params = + { + params32->credential, + }; + return free_credentials_handle( &params ); +} + +static NTSTATUS wow64_initialize_context( void *args ) +{ + struct + { + UINT64 credential; + UINT64 context; + PTR32 target_name; + ULONG context_req; + PTR32 input_token; + ULONG input_token_length; + PTR32 output_token; + PTR32 output_token_length; + PTR32 new_context; + PTR32 context_attr; + PTR32 expiry; + } const *params32 = args; + struct initialize_context_params params = + { + params32->credential, + params32->context, + ULongToPtr(params32->target_name), + params32->context_req, + ULongToPtr(params32->input_token), + params32->input_token_length, + ULongToPtr(params32->output_token), + ULongToPtr(params32->output_token_length), + ULongToPtr(params32->new_context), + ULongToPtr(params32->context_attr), + ULongToPtr(params32->expiry), + }; + return initialize_context( &params ); +} + +static NTSTATUS wow64_make_signature( void *args ) +{ + struct + { + UINT64 context; + PTR32 data; + ULONG data_length; + PTR32 token; + PTR32 token_length; + } const *params32 = args; + struct make_signature_params params = + { + params32->context, + ULongToPtr(params32->data), + params32->data_length, + ULongToPtr(params32->token), + ULongToPtr(params32->token_length), + }; + return make_signature( &params ); +} + +static NTSTATUS wow64_query_context_attributes( void *args ) +{ + struct + { + UINT64 context; + ULONG attr; + PTR32 buf; + } const *params32 = args; + struct query_context_attributes_params params = + { + params32->context, + params32->attr, + ULongToPtr(params32->buf), + }; + return query_context_attributes( &params ); +} + +struct KERB_TICKET_CACHE_INFO32 +{ + UNICODE_STRING32 ServerName; + UNICODE_STRING32 RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +}; + +struct KERB_QUERY_TKT_CACHE_RESPONSE32 +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + struct KERB_TICKET_CACHE_INFO32 Tickets[ANYSIZE_ARRAY]; +}; + +static void copy_ticket_ustr_64to32( const UNICODE_STRING *str, UNICODE_STRING32 *str32, ULONG *client_str ) +{ + str32->Length = str->Length; + str32->MaximumLength = str->MaximumLength; + str32->Buffer = *client_str; + memcpy( ULongToPtr(str32->Buffer), str->Buffer, str->MaximumLength ); + *client_str += str->MaximumLength; +} + +static NTSTATUS copy_tickets_to_client32( struct ticket_list *list, struct KERB_QUERY_TKT_CACHE_RESPONSE32 *resp, + ULONG *out_size ) +{ + ULONG i, size, size_fixed; + ULONG client_str; + + size = size_fixed = offsetof( struct KERB_QUERY_TKT_CACHE_RESPONSE32, Tickets[list->count] ); + for (i = 0; i < list->count; i++) + { + size += list->tickets[i].RealmName.MaximumLength; + size += list->tickets[i].ServerName.MaximumLength; + } + if (!resp || size > *out_size) + { + *out_size = size; + return STATUS_BUFFER_TOO_SMALL; + } + *out_size = size; + + resp->MessageType = KerbQueryTicketCacheMessage; + resp->CountOfTickets = list->count; + client_str = PtrToUlong(resp) + size_fixed; + + for (i = 0; i < list->count; i++) + { + copy_ticket_ustr_64to32( &list->tickets[i].ServerName, &resp->Tickets[i].ServerName, &client_str ); + copy_ticket_ustr_64to32( &list->tickets[i].RealmName, &resp->Tickets[i].RealmName, &client_str ); + resp->Tickets[i].StartTime = list->tickets[i].StartTime; + resp->Tickets[i].EndTime = list->tickets[i].EndTime; + resp->Tickets[i].RenewTime = list->tickets[i].RenewTime; + resp->Tickets[i].EncryptionType = list->tickets[i].EncryptionType; + resp->Tickets[i].TicketFlags = list->tickets[i].TicketFlags; + } + return STATUS_SUCCESS; +} + +static NTSTATUS wow64_query_ticket_cache( void *args ) +{ + struct + { + PTR32 resp; + PTR32 out_size; + } const *params32 = args; + struct ticket_list list = { 0 }; + NTSTATUS status; + ULONG i; + + status = kerberos_fill_ticket_list( &list ); + if (status == STATUS_SUCCESS) + status = copy_tickets_to_client32( &list, ULongToPtr(params32->resp), ULongToPtr(params32->out_size) ); + + for (i = 0; i < list.count; i++) + { + free( list.tickets[i].RealmName.Buffer ); + free( list.tickets[i].ServerName.Buffer ); + } + return status; + +} + +static NTSTATUS wow64_seal_message( void *args ) +{ + struct + { + UINT64 context; + PTR32 data; + ULONG data_length; + PTR32 token; + PTR32 token_length; + } const *params32 = args; + struct seal_message_params params = + { + params32->context, + ULongToPtr(params32->data), + params32->data_length, + ULongToPtr(params32->token), + ULongToPtr(params32->token_length), + }; + return seal_message( &params ); +} + +static NTSTATUS wow64_unseal_message( void *args ) +{ + struct + { + UINT64 context; + PTR32 data; + ULONG data_length; + PTR32 token; + ULONG token_length; + PTR32 qop; + } const *params32 = args; + struct unseal_message_params params = + { + params32->context, + ULongToPtr(params32->data), + params32->data_length, + ULongToPtr(params32->token), + params32->token_length, + ULongToPtr(params32->qop), + }; + return unseal_message( &params ); +} + +static NTSTATUS wow64_verify_signature( void *args ) +{ + struct + { + UINT64 context; + PTR32 data; + ULONG data_length; + PTR32 token; + ULONG token_length; + PTR32 qop; + } const *params32 = args; + struct verify_signature_params params = + { + params32->context, + ULongToPtr(params32->data), + params32->data_length, + ULongToPtr(params32->token), + params32->token_length, + ULongToPtr(params32->qop), + }; + return verify_signature( &params ); +} + +unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + wow64_accept_context, + wow64_acquire_credentials_handle, + wow64_delete_context, + wow64_free_credentials_handle, + wow64_initialize_context, + wow64_make_signature, + wow64_query_context_attributes, + wow64_query_ticket_cache, + wow64_seal_message, + wow64_unseal_message, + wow64_verify_signature, +}; + +#endif /* _WIN64 */ + #endif /* defined(SONAME_LIBKRB5) && defined(SONAME_LIBGSSAPI_KRB5) */

1 0

Nikolay Sivov : kerberos: Pass input/output buffers directly for initialize_context() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 6c1cea2aba958a35a7b2c929d8375ebe5edb8609 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1cea2aba958a35a7b2c929… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 21:23:22 2022 +0300 kerberos: Pass input/output buffers directly for initialize_context() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 16 +++++++++++++--- dlls/kerberos/unixlib.c | 31 ++++++------------------------- dlls/kerberos/unixlib.h | 6 ++++-- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 93f9e97e8ef..b600ff06052 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -400,19 +400,29 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, { struct cred_handle *cred_handle = (struct cred_handle *)credential; struct context_handle *context_handle = (struct context_handle *)context; - struct initialize_context_params params; + struct initialize_context_params params = { 0 }; UINT64 new_context_handle = 0; + int idx; params.credential = cred_handle ? cred_handle->handle : 0; params.context = context_handle ? context_handle->handle : 0; params.target_name = target; params.context_req = context_req; - params.input = input; params.new_context = &new_context_handle; - params.output = output; params.context_attr = context_attr; params.expiry = &exptime; + idx = get_buffer_index( input, SECBUFFER_TOKEN ); + if (idx != -1) + { + params.input_token = input->pBuffers[idx].pvBuffer; + params.input_token_length = input->pBuffers[idx].cbBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + params.output_token = output->pBuffers[idx].pvBuffer; + params.output_token_length = &output->pBuffers[idx].cbBuffer; + status = KRB5_CALL( initialize_context, &params ); if (!status) { diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 119d2d1dcf9..38b1cf50895 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -419,17 +419,6 @@ static BOOL is_dce_style_context( gss_ctx_id_t ctx ) return (ret == GSS_S_COMPLETE && (flags & GSS_C_DCE_STYLE)); } -static int get_buffer_index( SecBufferDesc *desc, DWORD type ) -{ - UINT i; - if (!desc) return -1; - for (i = 0; i < desc->cBuffers; i++) - { - if (desc->pBuffers[i].BufferType == type) return i; - } - return -1; -} - static NTSTATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) @@ -707,16 +696,9 @@ static NTSTATUS initialize_context( void *args ) gss_buffer_desc input_token, output_token; gss_name_t target = GSS_C_NO_NAME; NTSTATUS status; - int idx; - if ((idx = get_buffer_index( params->input, SECBUFFER_TOKEN )) == -1) input_token.length = 0; - else - { - input_token.length = params->input->pBuffers[idx].cbBuffer; - input_token.value = params->input->pBuffers[idx].pvBuffer; - } - - if ((idx = get_buffer_index( params->output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = params->input_token_length; + input_token.value = params->input_token; output_token.length = 0; output_token.value = NULL; @@ -729,16 +711,15 @@ static NTSTATUS initialize_context( void *args ) if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { - if (output_token.length > params->output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + if (output_token.length > *params->output_token_length) /* FIXME: check if larger buffer exists */ { - TRACE( "buffer too small %lu > %u\n", - (SIZE_T)output_token.length, (unsigned int)params->output->pBuffers[idx].cbBuffer ); + TRACE( "buffer too small %lu > %u\n", (SIZE_T)output_token.length, (unsigned int)*params->output_token_length); pgss_release_buffer( &minor_status, &output_token ); pgss_delete_sec_context( &minor_status, &ctx_handle, GSS_C_NO_BUFFER ); return SEC_E_INCOMPLETE_MESSAGE; } - params->output->pBuffers[idx].cbBuffer = output_token.length; - memcpy( params->output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + *params->output_token_length = output_token.length; + memcpy( params->output_token, output_token.value, output_token.length ); pgss_release_buffer( &minor_status, &output_token ); ctxhandle_gss_to_sspi( ctx_handle, params->new_context ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 0bdb8a3ec74..f811f583bb2 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -62,9 +62,11 @@ struct initialize_context_params UINT64 context; const char *target_name; ULONG context_req; - SecBufferDesc *input; + BYTE *input_token; + ULONG input_token_length; + BYTE *output_token; + ULONG *output_token_length; UINT64 *new_context; - SecBufferDesc *output; ULONG *context_attr; ULONG *expiry; };

1 0

Nikolay Sivov : kerberos: Pass input/output buffers directly for unseal_message() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: a9ba0b334f99d2d0286f40f47e708f1969f66ce1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ba0b334f99d2d0286f40f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 15:04:28 2022 +0300 kerberos: Pass input/output buffers directly for unseal_message() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 14 +++++++++++++- dlls/kerberos/unixlib.c | 42 ++++++++++++++++++------------------------ dlls/kerberos/unixlib.h | 5 ++++- 3 files changed, 35 insertions(+), 26 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0d266a8ccf0..93f9e97e8ef 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -723,7 +723,19 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe if (context) { struct context_handle *context_handle = (void *)context; - struct unseal_message_params params = { context_handle->handle, message, quality_of_protection }; + struct unseal_message_params params; + int data_idx, token_idx; + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + params.context = context_handle->handle; + params.data_length = message->pBuffers[data_idx].cbBuffer; + params.data = message->pBuffers[data_idx].pvBuffer; + params.token_length = message->pBuffers[token_idx].cbBuffer; + params.token = message->pBuffers[token_idx].pvBuffer; + params.qop = quality_of_protection; + return KRB5_CALL( unseal_message, &params ); } else return SEC_E_INVALID_HANDLE; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 21a536f83fc..119d2d1dcf9 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -909,58 +909,52 @@ static NTSTATUS seal_message( void *args ) return seal_message_no_vector( ctx, params ); } -static NTSTATUS unseal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG *qop ) +static NTSTATUS unseal_message_vector( gss_ctx_id_t ctx, const struct unseal_message_params *params ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; - - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + int conf_state; iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; iov[0].buffer.length = 0; iov[0].buffer.value = NULL; iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[1].buffer.length = msg->pBuffers[data_idx].cbBuffer; - iov[1].buffer.value = msg->pBuffers[data_idx].pvBuffer; + iov[1].buffer.length = params->data_length; + iov[1].buffer.value = params->data; iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; iov[2].buffer.length = 0; iov[2].buffer.value = NULL; iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; - iov[3].buffer.length = msg->pBuffers[token_idx].cbBuffer; - iov[3].buffer.value = msg->pBuffers[token_idx].pvBuffer; + iov[3].buffer.length = params->token_length; + iov[3].buffer.value = params->token; ret = pgss_unwrap_iov( &minor_status, ctx, &conf_state, NULL, iov, 4 ); TRACE( "gss_unwrap_iov returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE && qop) + if (ret == GSS_S_COMPLETE && params->qop) { - *qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + *params->qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); } return status_gss_to_sspi( ret ); } -static NTSTATUS unseal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG *qop ) +static NTSTATUS unseal_message_no_vector( gss_ctx_id_t ctx, const struct unseal_message_params *params ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_state; DWORD len_data, len_token; + int conf_state; - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - len_data = msg->pBuffers[data_idx].cbBuffer; - len_token = msg->pBuffers[token_idx].cbBuffer; + len_data = params->data_length; + len_token = params->token_length; input.length = len_data + len_token; if (!(input.value = malloc( input.length ))) return SEC_E_INSUFFICIENT_MEMORY; - memcpy( input.value, msg->pBuffers[data_idx].pvBuffer, len_data ); - memcpy( (char *)input.value + len_data, msg->pBuffers[token_idx].pvBuffer, len_token ); + memcpy( input.value, params->data, len_data ); + memcpy( (char *)input.value + len_data, params->token, len_token ); ret = pgss_unwrap( &minor_status, ctx, &input, &output, &conf_state, NULL ); free( input.value ); @@ -968,8 +962,8 @@ static NTSTATUS unseal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - if (qop) *qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); - memcpy( msg->pBuffers[data_idx].pvBuffer, output.value, len_data ); + if (params->qop) *params->qop = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + memcpy( params->data, output.value, len_data ); pgss_release_buffer( &minor_status, &output ); } @@ -981,8 +975,8 @@ static NTSTATUS unseal_message( void *args ) struct unseal_message_params *params = args; gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( params->context ); - if (is_dce_style_context( ctx )) return unseal_message_vector( ctx, params->msg, params->qop ); - return unseal_message_no_vector( ctx, params->msg, params->qop ); + if (is_dce_style_context( ctx )) return unseal_message_vector( ctx, params ); + return unseal_message_no_vector( ctx, params ); } static NTSTATUS verify_signature( void *args ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 5753ae1a2da..0bdb8a3ec74 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -104,7 +104,10 @@ struct seal_message_params struct unseal_message_params { UINT64 context; - SecBufferDesc *msg; + BYTE *data; + ULONG data_length; + BYTE *token; + ULONG token_length; ULONG *qop; };

1 0

Nikolay Sivov : kerberos: Pass input/output buffers directly for seal_message() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 05585c6c36531cf2a51b751528de7881be36dd67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05585c6c36531cf2a51b7515… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 14:54:22 2022 +0300 kerberos: Pass input/output buffers directly for seal_message() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 15 +++++++++++++- dlls/kerberos/unixlib.c | 52 +++++++++++++++++++++---------------------------- dlls/kerberos/unixlib.h | 5 ++++- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index f2bcfc3f7f4..0d266a8ccf0 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -695,7 +695,20 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual if (context) { struct context_handle *context_handle = (void *)context; - struct seal_message_params params = { context_handle->handle, message, quality_of_protection }; + struct seal_message_params params; + int data_idx, token_idx; + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + params.context = context_handle->handle; + params.data_length = message->pBuffers[data_idx].cbBuffer; + params.data = message->pBuffers[data_idx].pvBuffer; + params.token_length = &message->pBuffers[token_idx].cbBuffer; + params.token = message->pBuffers[token_idx].pvBuffer; + params.qop = quality_of_protection; + return KRB5_CALL( seal_message, &params ); } else return SEC_E_INVALID_HANDLE; diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 6404b6ab190..21a536f83fc 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -815,33 +815,29 @@ static NTSTATUS query_context_attributes( void *args ) return SEC_E_UNSUPPORTED_FUNCTION; } -static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) +static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, const struct seal_message_params *params ) { gss_iov_buffer_desc iov[4]; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_flag, conf_state; + int conf_flag, conf_state; - if (!qop) + if (!params->qop) conf_flag = 1; /* confidentiality + integrity */ - else if (qop == SECQOP_WRAP_NO_ENCRYPT) + else if (params->qop == SECQOP_WRAP_NO_ENCRYPT) conf_flag = 0; /* only integrity */ else { - FIXME( "QOP %#x not supported\n", qop ); + FIXME( "QOP %#x not supported\n", params->qop ); return SEC_E_UNSUPPORTED_FUNCTION; } - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; iov[0].buffer.length = 0; iov[0].buffer.value = NULL; iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; - iov[1].buffer.length = msg->pBuffers[data_idx].cbBuffer; - iov[1].buffer.value = msg->pBuffers[data_idx].pvBuffer; + iov[1].buffer.length = params->data_length; + iov[1].buffer.value = params->data; iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; iov[2].buffer.length = 0; @@ -856,52 +852,48 @@ static NTSTATUS seal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsig if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - memcpy( msg->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); - msg->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + memcpy( params->token, iov[3].buffer.value, iov[3].buffer.length ); + *params->token_length = iov[3].buffer.length; pgss_release_iov_buffer( &minor_status, iov, 4 ); } return status_gss_to_sspi( ret ); } -static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, unsigned qop ) +static NTSTATUS seal_message_no_vector( gss_ctx_id_t ctx, const struct seal_message_params *params ) { gss_buffer_desc input, output; OM_uint32 ret, minor_status; - int token_idx, data_idx, conf_flag, conf_state; + int conf_flag, conf_state; - if (!qop) + if (!params->qop) conf_flag = 1; /* confidentiality + integrity */ - else if (qop == SECQOP_WRAP_NO_ENCRYPT) + else if (params->qop == SECQOP_WRAP_NO_ENCRYPT) conf_flag = 0; /* only integrity */ else { - FIXME( "QOP %#x not supported\n", qop ); + FIXME( "QOP %#x not supported\n", params->qop ); return SEC_E_UNSUPPORTED_FUNCTION; } - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - - input.length = msg->pBuffers[data_idx].cbBuffer; - input.value = msg->pBuffers[data_idx].pvBuffer; + input.length = params->data_length; + input.value = params->data; ret = pgss_wrap( &minor_status, ctx, conf_flag, GSS_C_QOP_DEFAULT, &input, &conf_state, &output ); TRACE( "gss_wrap returned %#x minor status %#x\n", ret, minor_status ); if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { - unsigned len_data = msg->pBuffers[data_idx].cbBuffer, len_token = msg->pBuffers[token_idx].cbBuffer; + unsigned len_data = params->data_length, len_token = *params->token_length; if (len_token < output.length - len_data) { TRACE( "buffer too small %lu > %u\n", (SIZE_T)output.length - len_data, len_token ); pgss_release_buffer( &minor_status, &output ); return SEC_E_BUFFER_TOO_SMALL; } - memcpy( msg->pBuffers[data_idx].pvBuffer, output.value, len_data ); - memcpy( msg->pBuffers[token_idx].pvBuffer, (char *)output.value + len_data, output.length - len_data ); - msg->pBuffers[token_idx].cbBuffer = output.length - len_data; + memcpy( params->data, output.value, len_data ); + memcpy( params->token, (char *)output.value + len_data, output.length - len_data ); + *params->token_length = output.length - len_data; pgss_release_buffer( &minor_status, &output ); } @@ -913,8 +905,8 @@ static NTSTATUS seal_message( void *args ) struct seal_message_params *params = args; gss_ctx_id_t ctx = ctxhandle_sspi_to_gss( params->context ); - if (is_dce_style_context( ctx )) return seal_message_vector( ctx, params->msg, params->qop ); - return seal_message_no_vector( ctx, params->msg, params->qop ); + if (is_dce_style_context( ctx )) return seal_message_vector( ctx, params ); + return seal_message_no_vector( ctx, params ); } static NTSTATUS unseal_message_vector( gss_ctx_id_t ctx, SecBufferDesc *msg, ULONG *qop ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index e7ce7e0b4f3..5753ae1a2da 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -94,7 +94,10 @@ struct query_ticket_cache_params struct seal_message_params { UINT64 context; - SecBufferDesc *msg; + BYTE *data; + ULONG data_length; + BYTE *token; + ULONG *token_length; unsigned qop; };

1 0

Nikolay Sivov : kerberos: Pass input/output tokens directly for accept_context() call.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 17b283d823156636370d6c5cef7c5faf8a67c164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17b283d823156636370d6c5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 21:15:10 2022 +0300 kerberos: Pass input/output tokens directly for accept_context() call. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 27 ++++++++++++++++++++++++--- dlls/kerberos/unixlib.c | 20 ++++++-------------- dlls/kerberos/unixlib.h | 6 ++++-- 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index cc6df975d25..5cc2623c4ad 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -100,6 +100,17 @@ static LSA_SEC_HANDLE create_context_handle( struct context_handle *ctx, UINT64 return (LSA_SEC_HANDLE)ctx; } +static int get_buffer_index( const SecBufferDesc *desc, DWORD type ) +{ + UINT i; + if (!desc) return -1; + for (i = 0; i < desc->cBuffers; i++) + { + if (desc->pBuffers[i].BufferType == type) return i; + } + return -1; +} + static const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -421,6 +432,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential { NTSTATUS status = SEC_E_INVALID_HANDLE; ULONG exptime; + int idx; TRACE( "%Ix, %Ix, %#lx, %lu, %p, %p, %p, %p, %p, %p, %p\n", credential, context, context_req, target_data_rep, input, new_context, output, context_attr, expiry, mapped_context, context_data ); @@ -430,17 +442,26 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential { struct cred_handle *cred_handle = (struct cred_handle *)credential; struct context_handle *context_handle = (struct context_handle *)context; - struct accept_context_params params; + struct accept_context_params params = { 0 }; UINT64 new_context_handle = 0; params.credential = cred_handle ? cred_handle->handle : 0; params.context = context_handle ? context_handle->handle : 0; - params.input = input; params.new_context = &new_context_handle; - params.output = output; params.context_attr = context_attr; params.expiry = &exptime; + if (input) + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + params.input_token = input->pBuffers[idx].pvBuffer; + params.input_token_length = input->pBuffers[idx].cbBuffer; + } + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + params.output_token = output->pBuffers[idx].pvBuffer; + params.output_token_length = &output->pBuffers[idx].cbBuffer; + + /* FIXME: check if larger output buffer exists */ status = KRB5_CALL( accept_context, &params ); if (!status) { diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 4d74dd7eb1f..45d8f0b02da 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -528,17 +528,9 @@ static NTSTATUS accept_context( void *args ) gss_cred_id_t cred_handle = credhandle_sspi_to_gss( params->credential ); gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( params->context ); gss_buffer_desc input_token, output_token; - int idx; - - if (!params->input) input_token.length = 0; - else - { - if ((idx = get_buffer_index( params->input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - input_token.length = params->input->pBuffers[idx].cbBuffer; - input_token.value = params->input->pBuffers[idx].pvBuffer; - } - if ((idx = get_buffer_index( params->output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = params->input_token_length; + input_token.value = params->input_token; output_token.length = 0; output_token.value = NULL; @@ -548,16 +540,16 @@ static NTSTATUS accept_context( void *args ) if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { - if (output_token.length > params->output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + if (output_token.length > *params->output_token_length) /* FIXME: check if larger buffer exists */ { TRACE( "buffer too small %lu > %u\n", - (SIZE_T)output_token.length, (unsigned int)params->output->pBuffers[idx].cbBuffer ); + (SIZE_T)output_token.length, (unsigned int)*params->output_token_length ); pgss_release_buffer( &minor_status, &output_token ); pgss_delete_sec_context( &minor_status, &ctx_handle, GSS_C_NO_BUFFER ); return SEC_E_BUFFER_TOO_SMALL; } - params->output->pBuffers[idx].cbBuffer = output_token.length; - memcpy( params->output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + *params->output_token_length = output_token.length; + memcpy( params->output_token, output_token.value, output_token.length ); pgss_release_buffer( &minor_status, &output_token ); ctxhandle_gss_to_sspi( ctx_handle, params->new_context ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 2634182ef51..4fada1e1618 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -27,9 +27,11 @@ struct accept_context_params { UINT64 credential; UINT64 context; - SecBufferDesc *input; + BYTE *input_token; + ULONG input_token_length; UINT64 *new_context; - SecBufferDesc *output; + BYTE *output_token; + ULONG *output_token_length; ULONG *context_attr; ULONG *expiry; };

1 0

Nikolay Sivov : kerberos: Use 64-bit integer for context handles.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 0e6b727511e610019a8fc1d84948f2045bb10e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6b727511e610019a8fc1d8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 10:43:12 2022 +0300 kerberos: Use 64-bit integer for context handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 59 ++++++++++++++++++++++++++++++++++++++++--------- dlls/kerberos/unixlib.c | 11 ++++----- dlls/kerberos/unixlib.h | 23 +++++++++++-------- 3 files changed, 69 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0e6b727511e610019a8f…

1 0

Nikolay Sivov : kerberos: Use 64-bit integer for credential handles.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 5c56d719197bcc80e158f2a4c5fd23c746152a97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c56d719197bcc80e158f2a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 28 00:51:48 2022 +0300 kerberos: Use 64-bit integer for credential handles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kerberos/krb5_ap.c | 59 +++++++++++++++++++++++++++++++++++++++++++------ dlls/kerberos/unixlib.c | 11 ++++----- dlls/kerberos/unixlib.h | 11 ++++++--- 3 files changed, 66 insertions(+), 15 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index efd425dc0ee..9fea8c85d89 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -77,6 +77,11 @@ static const SecPkgInfoW infoW = static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; +struct cred_handle +{ + UINT64 handle; +}; + static const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -285,6 +290,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( char *principal = NULL, *username = NULL, *password = NULL; SEC_WINNT_AUTH_IDENTITY_W *id = auth_data; NTSTATUS status = SEC_E_INSUFFICIENT_MEMORY; + struct cred_handle *cred_handle; ULONG exptime; TRACE( "%s, %#lx, %p, %p, %p, %p, %p, %p\n", debugstr_us(principal_us), credential_use, @@ -303,10 +309,19 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( if (!(password = get_password_unixcp( id->Password, id->PasswordLength ))) goto done; } + if (!(cred_handle = calloc( 1, sizeof(*cred_handle) ))) + { + status = SEC_E_INSUFFICIENT_MEMORY; + goto done; + } + { struct acquire_credentials_handle_params params = { principal, credential_use, username, password, - credential, &exptime }; - status = KRB5_CALL( acquire_credentials_handle, &params ); + &cred_handle->handle, &exptime }; + if (!(status = KRB5_CALL( acquire_credentials_handle, &params ))) + *credential = (LSA_SEC_HANDLE)cred_handle; + else + free( cred_handle ); expiry_to_timestamp( exptime, expiry ); } @@ -319,9 +334,18 @@ done: static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) { + struct cred_handle *cred_handle = (void *)credential; + struct free_credentials_handle_params params; + NTSTATUS status; + TRACE( "%Ix\n", credential ); - if (!credential) return SEC_E_INVALID_HANDLE; - return KRB5_CALL( free_credentials_handle, (void *)credential ); + + if (!cred_handle) return SEC_E_INVALID_HANDLE; + + params.credential = cred_handle->handle; + status = KRB5_CALL( free_credentials_handle, &params ); + free(cred_handle); + return status; } static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, @@ -345,8 +369,19 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (target_name && !(target = get_str_unixcp( target_name ))) return SEC_E_INSUFFICIENT_MEMORY; else { - struct initialize_context_params params = { credential, context, target, context_req, input, - new_context, output, context_attr, &exptime }; + struct cred_handle *cred_handle = (struct cred_handle *)credential; + struct initialize_context_params params; + + params.credential = cred_handle ? cred_handle->handle : 0; + params.context = context; + params.target_name = target; + params.context_req = context_req; + params.input = input; + params.new_context = new_context; + params.output = output; + params.context_attr = context_attr; + params.expiry = &exptime; + status = KRB5_CALL( initialize_context, &params ); if (!status) { @@ -372,7 +407,17 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential if (context || input || credential) { - struct accept_context_params params = { credential, context, input, new_context, output, context_attr, &exptime }; + struct cred_handle *cred_handle = (struct cred_handle *)credential; + struct accept_context_params params; + + params.credential = cred_handle ? cred_handle->handle : 0; + params.context = context; + params.input = input; + params.new_context = new_context; + params.output = output; + params.context_attr = context_attr; + params.expiry = &exptime; + status = KRB5_CALL( accept_context, &params ); if (!status) { diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 10d2628b794..66d151488b3 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -491,9 +491,9 @@ static inline gss_ctx_id_t ctxhandle_sspi_to_gss( LSA_SEC_HANDLE handle ) return (gss_ctx_id_t)handle; } -static inline gss_cred_id_t credhandle_sspi_to_gss( LSA_SEC_HANDLE handle ) +static inline gss_cred_id_t credhandle_sspi_to_gss( UINT64 handle ) { - return (gss_cred_id_t)handle; + return (gss_cred_id_t)(ULONG_PTR)handle; } static inline void ctxhandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *ctx ) @@ -501,9 +501,9 @@ static inline void ctxhandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *c *ctx = (LSA_SEC_HANDLE)handle; } -static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) +static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, UINT64 *cred ) { - *cred = (LSA_SEC_HANDLE)handle; + *cred = (ULONG_PTR)handle; } static ULONG flags_gss_to_asc_ret( ULONG flags ) @@ -665,8 +665,9 @@ static NTSTATUS delete_context( void *args ) static NTSTATUS free_credentials_handle( void *args ) { + const struct free_credentials_handle_params *params = args; OM_uint32 ret, minor_status; - gss_cred_id_t cred = credhandle_sspi_to_gss( (LSA_SEC_HANDLE)args ); + gss_cred_id_t cred = credhandle_sspi_to_gss( params->credential ); ret = pgss_release_cred( &minor_status, &cred ); TRACE( "gss_release_cred returned %#x minor status %#x\n", ret, minor_status ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 4a31712bfe8..7c3f97f436d 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -25,7 +25,7 @@ struct accept_context_params { - LSA_SEC_HANDLE credential; + UINT64 credential; LSA_SEC_HANDLE context; SecBufferDesc *input; LSA_SEC_HANDLE *new_context; @@ -40,13 +40,18 @@ struct acquire_credentials_handle_params ULONG credential_use; const char *username; const char *password; - LSA_SEC_HANDLE *credential; + UINT64 *credential; ULONG *expiry; }; +struct free_credentials_handle_params +{ + UINT64 credential; +}; + struct initialize_context_params { - LSA_SEC_HANDLE credential; + UINT64 credential; LSA_SEC_HANDLE context; const char *target_name; ULONG context_req;

1 0

Hans Leidekker : mscms/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 58afdcfec4413b72e863f085ac650563419458a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58afdcfec4413b72e863f085… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 15:55:43 2022 +0200 mscms/tests: Get rid of workarounds for old Windows versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/Makefile.in | 2 +- dlls/mscms/tests/profile.c | 546 +++++++++++++++---------------------------- 2 files changed, 195 insertions(+), 353 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58afdcfec4413b72e863…

1 0

Hans Leidekker : mscms/tests: Add TranslateBitmapBits tests.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: bb6e2ee6b11d1374e47403626ab401842ba93d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb6e2ee6b11d1374e4740362… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 30 15:55:41 2022 +0200 mscms/tests: Add TranslateBitmapBits tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscms/tests/profile.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index e0bfbd70e10..025b1531796 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -58,6 +58,7 @@ static BOOL (WINAPI *pSetColorProfileElement)(HPROFILE,TAGTYPE,DWORD,PDWORD, static BOOL (WINAPI *pSetColorProfileHeader)(HPROFILE,PPROFILEHEADER); static BOOL (WINAPI *pSetStandardColorSpaceProfileA)(PCSTR,DWORD,PSTR); static BOOL (WINAPI *pSetStandardColorSpaceProfileW)(PCWSTR,DWORD,PWSTR); +static BOOL (WINAPI *pTranslateBitmapBits)(HTRANSFORM,PVOID,BMFORMAT,DWORD,DWORD,DWORD,PVOID,BMFORMAT,DWORD,PBMCALLBACKFN,ULONG); static BOOL (WINAPI *pUninstallColorProfileA)(PCSTR,PCSTR,BOOL); static BOOL (WINAPI *pUninstallColorProfileW)(PCWSTR,PCWSTR,BOOL); @@ -95,6 +96,7 @@ static BOOL init_function_ptrs( void ) GETFUNCPTR( SetStandardColorSpaceProfileW ) GETFUNCPTR( UninstallColorProfileA ) GETFUNCPTR( UninstallColorProfileW ) + GETFUNCPTR( TranslateBitmapBits ) pEnumDisplayDevicesA = (void *)GetProcAddress( huser32, "EnumDisplayDevicesA" ); @@ -1359,6 +1361,63 @@ static void test_CreateMultiProfileTransform( char *standardprofile, char *testp } } +static void test_TranslateBitmapBits( char *standardprofile, char *testprofile ) +{ + PROFILE profile; + HPROFILE handle[2]; + HTRANSFORM transform; + DWORD intent = INTENT_PERCEPTUAL; + BYTE srcbits[] = {0x00, 0x00, 0xff}, srcbits2[] = {0xcc, 0x00, 0x00, 0xff}, destbits[4]; + const BYTE expect_destbits[] = {0xff, 0x00, 0x00, 0x00}; + const BYTE expect_destbits2[] = {0x00, 0x00, 0xff, 0x00}; + const BYTE expect_destbits3[] = {0xcc, 0x00, 0x00}; + const BYTE expect_destbits4[] = {0x00, 0x00, 0xcc}; + BOOL ret; + + if (!standardprofile) return; + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = standardprofile; + profile.cbDataSize = strlen(standardprofile); + + handle[0] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[0] != NULL, "got %lu\n", GetLastError() ); + + profile.dwType = PROFILE_FILENAME; + profile.pProfileData = testprofile; + profile.cbDataSize = strlen(testprofile); + + handle[1] = pOpenColorProfileA( &profile, PROFILE_READ, 1, OPEN_EXISTING ); + ok( handle[1] != NULL, "got %lu\n", GetLastError() ); + + transform = pCreateMultiProfileTransform( handle, 2, &intent, 1, 0, 0 ); + ok( transform != NULL, "got %lu\n", GetLastError() ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xBGRQUADS, 4, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits, destbits, sizeof(expect_destbits)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits, BM_RGBTRIPLETS, 1, 1, 3, destbits, BM_xRGBQUADS, 4, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits2, destbits, sizeof(expect_destbits2)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_RGBTRIPLETS, 3, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits3, destbits, sizeof(expect_destbits3)), "unexpected destbits\n" ); + + memset( destbits, 0, sizeof(destbits) ); + ret = pTranslateBitmapBits( transform, srcbits2, BM_xRGBQUADS, 1, 1, 4, destbits, BM_BGRTRIPLETS, 3, NULL, 0 ); + ok( ret, "got %lu\n", GetLastError() ); + todo_wine ok( !memcmp(expect_destbits4, destbits, sizeof(expect_destbits4)), "unexpected destbits\n" ); + + pDeleteColorTransform( transform ); + pCloseColorProfile( handle[0] ); + pCloseColorProfile( handle[1] ); +} + START_TEST(profile) { UINT len; @@ -1469,6 +1528,7 @@ START_TEST(profile) test_AssociateColorProfileWithDeviceA( testprofile ); test_CreateMultiProfileTransform( standardprofile, testprofile ); + test_TranslateBitmapBits( standardprofile, testprofile ); if (testprofile) DeleteFileA( testprofile ); FreeLibrary( huser32 );

1 0

Nikolay Sivov : d2d1: Implement bitmap mapping.
by Alexandre Julliard May 30, 2022

May 30, 2022

Module: wine Branch: master Commit: 5e25a4546c812eb174d142a41c28cf83ef2b567e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e25a4546c812eb174d142a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 29 15:18:53 2022 +0300 d2d1: Implement bitmap mapping. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 72 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/tests/d2d1.c | 21 +------------- 3 files changed, 70 insertions(+), 24 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index 904d44cc075..6a02279b91b 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -26,6 +26,25 @@ static inline struct d2d_bitmap *impl_from_ID2D1Bitmap1(ID2D1Bitmap1 *iface) return CONTAINING_RECORD(iface, struct d2d_bitmap, ID2D1Bitmap1_iface); } +static HRESULT d2d_bitmap_unmap(struct d2d_bitmap *bitmap) +{ + ID3D11DeviceContext *context; + ID3D11Device *device; + + if (!bitmap->mapped_resource.pData) + return D2DERR_WRONG_STATE; + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + ID3D11DeviceContext_Unmap(context, bitmap->resource, 0); + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + memset(&bitmap->mapped_resource, 0, sizeof(bitmap->mapped_resource)); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d2d_bitmap_QueryInterface(ID2D1Bitmap1 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); @@ -229,16 +248,61 @@ static HRESULT STDMETHODCALLTYPE d2d_bitmap_GetSurface(ID2D1Bitmap1 *iface, IDXG static HRESULT STDMETHODCALLTYPE d2d_bitmap_Map(ID2D1Bitmap1 *iface, D2D1_MAP_OPTIONS options, D2D1_MAPPED_RECT *mapped_rect) { - FIXME("iface %p, options %#x, mapped_rect %p stub!\n", iface, options, mapped_rect); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); + D3D11_MAPPED_SUBRESOURCE mapped_resource; + ID3D11DeviceContext *context; + ID3D11Device *device; + D3D11_MAP map_type; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, options %#x, mapped_rect %p.\n", iface, options, mapped_rect); + + if (bitmap->mapped_resource.pData) + return D2DERR_WRONG_STATE; + + if (options == D2D1_MAP_OPTIONS_READ) + map_type = D3D11_MAP_READ; + else if (options == D2D1_MAP_OPTIONS_WRITE) + map_type = D3D11_MAP_WRITE; + else if (options == (D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_WRITE)) + map_type = D3D11_MAP_READ_WRITE; + else if (options == (D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_DISCARD)) + map_type = D3D11_MAP_WRITE_DISCARD; + else + { + WARN("Invalid mapping options %#x.\n", options); + return E_INVALIDARG; + } + + ID3D11Resource_GetDevice(bitmap->resource, &device); + ID3D11Device_GetImmediateContext(device, &context); + if (SUCCEEDED(hr = ID3D11DeviceContext_Map(context, bitmap->resource, 0, map_type, + 0, &mapped_resource))) + { + bitmap->mapped_resource = mapped_resource; + } + ID3D11DeviceContext_Release(context); + ID3D11Device_Release(device); + + if (FAILED(hr)) + { + WARN("Failed to map resource, hr %#lx.\n", hr); + return E_INVALIDARG; + } + + mapped_rect->pitch = bitmap->mapped_resource.RowPitch; + mapped_rect->bits = bitmap->mapped_resource.pData; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_bitmap_Unmap(ID2D1Bitmap1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap1(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + return d2d_bitmap_unmap(bitmap); } static const struct ID2D1Bitmap1Vtbl d2d_bitmap_vtbl = diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 8edfa030ee1..48649f6a916 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -395,6 +395,7 @@ struct d2d_bitmap ID3D11RenderTargetView *rtv; IDXGISurface *surface; ID3D11Resource *resource; + D3D11_MAPPED_SUBRESOURCE mapped_resource; D2D1_SIZE_U pixel_size; D2D1_PIXEL_FORMAT format; float dpi_x; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index ac96c1a0d50..807a7be5ae6 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11634,13 +11634,10 @@ static void test_bitmap_map(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); @@ -11672,37 +11669,28 @@ static void test_bitmap_map(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_NONE, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); - todo_wine ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Unmap(bitmap); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Unmap(bitmap); - todo_wine ok(hr == D2DERR_WRONG_STATE, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_WRITE, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_GetSurface(bitmap, &surface); @@ -11748,34 +11736,27 @@ static void test_bitmap_map(BOOL d3d11) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_READ, &mapped_rect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Unmap(bitmap); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE, &mapped_rect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Unmap(bitmap); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_READ, &mapped_rect); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Unmap(bitmap); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) ID2D1Bitmap1_Unmap(bitmap); hr = ID2D1Bitmap1_Map(bitmap, D2D1_MAP_OPTIONS_WRITE | D2D1_MAP_OPTIONS_READ | D2D1_MAP_OPTIONS_DISCARD, &mapped_rect); - todo_wine ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); ID2D1Bitmap1_Release(bitmap);

1 0