November 2021 - Wine-Commits

Nikolay Sivov : evr/mixer: Pass valid background color parameter to VideoProcessBlt().
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: aad6c57211fd8910c8214898f9adca900b9dde29 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aad6c57211fd8910c8214898… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 4 17:58:44 2021 +0300 evr/mixer: Pass valid background color parameter to VideoProcessBlt(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 3a2b6830782..2e03535fda3 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -95,7 +95,11 @@ struct video_mixer IMFAttributes *internal_attributes; unsigned int mixing_flags; unsigned int is_streaming; - COLORREF bkgnd_color; + struct + { + COLORREF rgba; + DXVA2_AYUVSample16 ayuv; + } bkgnd_color; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -1277,7 +1281,6 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); for (i = 0; i < mixer->input_count; ++i) @@ -1329,6 +1332,9 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) if (SUCCEEDED(hr)) { + SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + params.BackgroundColor = mixer->bkgnd_color.ayuv; + if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, sample_count, NULL))) { @@ -1983,12 +1989,28 @@ static HRESULT WINAPI video_mixer_processor_GetBackgroundColor(IMFVideoProcessor return E_POINTER; EnterCriticalSection(&mixer->cs); - *color = mixer->bkgnd_color; + *color = mixer->bkgnd_color.rgba; LeaveCriticalSection(&mixer->cs); return S_OK; } +static void video_mixer_rgb_to_ycbcr(COLORREF rgb, DXVA2_AYUVSample16 *ayuv) +{ + int y, cb, cr, r, g, b; + + r = GetRValue(rgb); g = GetGValue(rgb); b = GetBValue(rgb); + /* Coefficients according to SDTV ITU-R BT.601 */ + y = (77 * r + 150 * g + 29 * b + 128) / 256 + 16; + cb = (-44 * r - 87 * g + 131 * b + 128) / 256 + 128; + cr = (131 * r - 110 * g - 21 * b + 128) / 256 + 128; + + ayuv->Y = y * 0x100; + ayuv->Cb = cb * 0x100; + ayuv->Cr = cr * 0x100; + ayuv->Alpha = 0xffff; +} + static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor *iface, COLORREF color) { struct video_mixer *mixer = impl_from_IMFVideoProcessor(iface); @@ -1996,7 +2018,11 @@ static HRESULT WINAPI video_mixer_processor_SetBackgroundColor(IMFVideoProcessor TRACE("%p, %#x.\n", iface, color); EnterCriticalSection(&mixer->cs); - mixer->bkgnd_color = color; + if (mixer->bkgnd_color.rgba != color) + { + video_mixer_rgb_to_ycbcr(color, &mixer->bkgnd_color.ayuv); + mixer->bkgnd_color.rgba = color; + } LeaveCriticalSection(&mixer->cs); return S_OK; @@ -2528,6 +2554,7 @@ HRESULT evr_mixer_create(IUnknown *outer, void **out) object->upper_bound = MFT_OUTPUT_BOUND_UPPER_UNBOUNDED; video_mixer_init_input(&object->inputs[0]); video_mixer_update_zorder_map(object); + video_mixer_rgb_to_ycbcr(object->bkgnd_color.rgba, &object->bkgnd_color.ayuv); InitializeCriticalSection(&object->cs); if (FAILED(hr = MFCreateAttributes(&object->attributes, 0))) {

1 0

Paul Gofman : ntdll: Don't constraint TEB address to 2GB for native x64 process.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 1722615b06cba2f04fcd0ca69bbc33d963fb143f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1722615b06cba2f04fcd0ca6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 4 14:55:42 2021 +0300 ntdll: Don't constraint TEB address to 2GB for native x64 process. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 756a7388a22..f62ca1f5f01 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3021,6 +3021,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) void *ptr = NULL; NTSTATUS status = STATUS_SUCCESS; SIZE_T block_size = signal_stack_mask + 1; + BOOL is_wow = !!NtCurrentTeb()->WowTebOffset; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); if (next_free_teb) @@ -3035,7 +3036,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset ); @@ -3048,7 +3049,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size, MEM_COMMIT, PAGE_READWRITE ); } - *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset ); + *ret_teb = teb = init_teb( ptr, is_wow ); server_leave_uninterrupted_section( &virtual_mutex, &sigset ); if ((status = signal_alloc_thread( teb )))

1 0

Alexandre Julliard : kerberos: Move timestamp conversion to the PE side.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: b1c58098ebfc3133789680aba2afa3b069f2565b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1c58098ebfc3133789680ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 4 17:54:56 2021 +0100 kerberos: Move timestamp conversion to the PE side. Restore expiry time dropped in 6e9a9d670185f5a18d860602eb23e5a4c0fc1c2e, spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 34 +++++++++++++++++++++++++++++----- dlls/kerberos/unixlib.c | 22 ++++++---------------- dlls/kerberos/unixlib.h | 6 +++--- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 92436ca2bf4..9105e3d2c5d 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -83,6 +83,17 @@ static const char *debugstr_us( const UNICODE_STRING *us ) return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); } +static void expiry_to_timestamp( ULONG expiry, TimeStamp *timestamp ) +{ + LARGE_INTEGER time; + + NtQuerySystemTime( &time ); + RtlSystemTimeToLocalTime( &time, &time ); + time.QuadPart += expiry * (ULONGLONG)10000000; + timestamp->LowPart = time.QuadPart; + timestamp->HighPart = time.QuadPart >> 32; +} + static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { @@ -267,6 +278,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; + ULONG exptime; TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, expiry ); @@ -285,7 +297,9 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( } status = krb5_funcs->acquire_credentials_handle( principal, credential_use, username, password, credential, - expiry ); + &exptime ); + expiry_to_timestamp( exptime, expiry ); + done: free( principal ); free( username ); @@ -310,6 +324,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, ISC_REQ_IDENTIFY | ISC_REQ_CONNECTION; char *target = NULL; NTSTATUS status; + ULONG exptime; TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), context_req, target_data_rep, input, new_context, output, context_attr, expiry, @@ -320,8 +335,12 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, if (target_name && !(target = get_str_unixcp( target_name ))) return SEC_E_INSUFFICIENT_MEMORY; status = krb5_funcs->initialize_context( credential, context, target, context_req, input, new_context, output, - context_attr, expiry ); - if (!status) *mapped_context = TRUE; + context_attr, &exptime ); + if (!status) + { + *mapped_context = TRUE; + expiry_to_timestamp( exptime, expiry ); + } /* FIXME: initialize context_data */ free( target ); return status; @@ -332,6 +351,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) { NTSTATUS status; + ULONG exptime; TRACE( "(%lx %lx 0x%08x %u %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 ); @@ -339,8 +359,12 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; - status = krb5_funcs->accept_context( credential, context, input, new_context, output, context_attr, expiry ); - if (!status) *mapped_context = TRUE; + status = krb5_funcs->accept_context( credential, context, input, new_context, output, context_attr, &exptime ); + if (!status) + { + *mapped_context = TRUE; + expiry_to_timestamp( exptime, expiry ); + } /* FIXME: initialize context_data */ return status; } diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 1a47b0a39ff..4024cc4bec1 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -505,16 +505,6 @@ static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred = (LSA_SEC_HANDLE)handle; } -static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) -{ - LARGE_INTEGER time; - - NtQuerySystemTime( &time ); - RtlSystemTimeToLocalTime( &time, &time ); - timestamp->LowPart = time.QuadPart; - timestamp->HighPart = time.QuadPart >> 32; -} - static ULONG flags_gss_to_asc_ret( ULONG flags ) { ULONG ret = 0; @@ -532,7 +522,7 @@ static ULONG flags_gss_to_asc_ret( ULONG flags ) static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, - TimeStamp *expiry ) + ULONG *expiry ) { OM_uint32 ret, minor_status, ret_flags = 0, expiry_time; gss_cred_id_t cred_handle = credhandle_sspi_to_gss( credential ); @@ -571,7 +561,7 @@ static NTSTATUS CDECL accept_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE ctxhandle_gss_to_sspi( ctx_handle, new_context ); if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } return status_gss_to_sspi( ret ); @@ -621,7 +611,7 @@ static NTSTATUS import_name( const char *src, gss_name_t *dst ) } static NTSTATUS CDECL acquire_credentials_handle( const char *principal, ULONG credential_use, const char *username, - const char *password, LSA_SEC_HANDLE *credential, TimeStamp *expiry ) + const char *password, LSA_SEC_HANDLE *credential, ULONG *expiry ) { OM_uint32 ret, minor_status, expiry_time; gss_name_t name = GSS_C_NO_NAME; @@ -654,7 +644,7 @@ static NTSTATUS CDECL acquire_credentials_handle( const char *principal, ULONG c if (ret == GSS_S_COMPLETE) { credhandle_gss_to_sspi( cred_handle, credential ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } if (name != GSS_C_NO_NAME) pgss_release_name( &minor_status, &name ); @@ -715,7 +705,7 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, const char *target_name, ULONG context_req, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, - SecBufferDesc *output, ULONG *context_attr, TimeStamp *expiry ) + SecBufferDesc *output, ULONG *context_attr, ULONG *expiry ) { OM_uint32 ret, minor_status, ret_flags = 0, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); gss_cred_id_t cred_handle = credhandle_sspi_to_gss( credential ); @@ -758,7 +748,7 @@ static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HAN ctxhandle_gss_to_sspi( ctx_handle, new_context ); if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); - expirytime_gss_to_sspi( expiry_time, expiry ); + *expiry = expiry_time; } if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 5648f344431..2d0cb45f979 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -24,13 +24,13 @@ struct krb5_funcs { NTSTATUS (CDECL *accept_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, SecBufferDesc *, LSA_SEC_HANDLE *, - SecBufferDesc *, ULONG *, TimeStamp *); + SecBufferDesc *, ULONG *, ULONG *); NTSTATUS (CDECL *acquire_credentials_handle)(const char *, ULONG, const char *, const char *, LSA_SEC_HANDLE *, - TimeStamp *); + ULONG *); NTSTATUS (CDECL *delete_context)(LSA_SEC_HANDLE); NTSTATUS (CDECL *free_credentials_handle)(LSA_SEC_HANDLE); NTSTATUS (CDECL *initialize_context)(LSA_SEC_HANDLE, LSA_SEC_HANDLE, const char *, ULONG, SecBufferDesc *, - LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, TimeStamp *); + LSA_SEC_HANDLE *, SecBufferDesc *, ULONG *, ULONG *); NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); NTSTATUS (CDECL *query_context_attributes)(LSA_SEC_HANDLE, ULONG, void *); NTSTATUS (CDECL *query_ticket_cache)( KERB_QUERY_TKT_CACHE_RESPONSE *resp, ULONG *out_size );

1 0

Alexandre Julliard : wldap32: Don't use varargs functions in the Unix library interface.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: cefd34fbdae8774227118cd3749479cc211df1fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=cefd34fbdae8774227118cd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 14:47:38 2021 +0100 wldap32: Don't use varargs functions in the Unix library interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/ber.c | 28 +++++------ dlls/wldap32/libldap.c | 130 ++----------------------------------------------- dlls/wldap32/libldap.h | 4 +- 3 files changed, 20 insertions(+), 142 deletions(-) diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c index 7d37471c5c4..482de464234 100644 --- a/dlls/wldap32/ber.c +++ b/dlls/wldap32/ber.c @@ -334,26 +334,26 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) case 'i': { int i = va_arg( list, int ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, i ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, i, 0 ); break; } case 'o': case 's': { char *str = va_arg( list, char * ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, str ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)str, 0 ); break; } case 't': { unsigned int tag = va_arg( list, unsigned int ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, tag ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, tag, 0 ); break; } case 'v': { char **array = va_arg( list, char ** ); - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, array ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)array, 0 ); break; } case 'V': @@ -365,7 +365,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) ret = -1; break; } - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, arrayU ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)arrayU, 0 ); bvarrayfreeU( arrayU ); break; } @@ -374,7 +374,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) char *str = va_arg( list, char * ); int len = va_arg( list, int ); new_fmt[0] = 'B'; /* 'X' is deprecated */ - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, str, len ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, (ULONG_PTR)str, len ); break; } case 'n': @@ -382,7 +382,7 @@ int WINAPIV ber_printf( BerElement *ber, char *fmt, ... ) case '}': case '[': case ']': - ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt ); + ret = ldap_funcs->fn_ber_printf( BER(ber), new_fmt, 0, 0 ); break; default: @@ -431,7 +431,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case 'a': { char *str, **ptr = va_arg( list, char ** ); - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &str )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &str, NULL )) == -1) break; *ptr = strdupU( str ); ldap_funcs->fn_ldap_memfree( str ); break; @@ -441,19 +441,19 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case 'i': { int *i = va_arg( list, int * ); - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, i ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, i, NULL ); break; } case 't': { unsigned int *tag = va_arg( list, unsigned int * ); - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, tag ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, tag, NULL ); break; } case 'v': { char *str, **arrayU, **ptr, ***array = va_arg( list, char *** ); - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU, NULL )) == -1) break; *array = strarrayUtoU( arrayU ); ptr = arrayU; while ((str = *ptr)) @@ -478,7 +478,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) { struct berval **berval = va_arg( list, struct berval ** ); struct bervalU *bervalU; - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &bervalU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &bervalU, NULL )) == -1) break; *berval = bervalUtoW( bervalU ); ldap_funcs->fn_ber_bvfree( bervalU ); break; @@ -487,7 +487,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) { struct berval ***array = va_arg( list, struct berval *** ); struct bervalU **arrayU; - if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU )) == -1) break; + if ((ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, &arrayU, NULL )) == -1) break; *array = bvarrayUtoW( arrayU ); ldap_funcs->fn_ber_bvecfree( arrayU ); break; @@ -498,7 +498,7 @@ ULONG WINAPIV ber_scanf( BerElement *ber, char *fmt, ... ) case '}': case '[': case ']': - ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt ); + ret = ldap_funcs->fn_ber_scanf( BER(ber), new_fmt, NULL, NULL ); break; default: diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index d568c2daaae..02ba0e01675 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -163,140 +163,18 @@ static unsigned int CDECL wrap_ber_skip_tag( void *ber, unsigned int *ret_len ) return ret; } -static int WINAPIV wrap_ber_printf( void *ber, char *fmt, ... ) +static int CDECL wrap_ber_printf( void *ber, char *fmt, ULONG_PTR arg1, ULONG_PTR arg2 ) { - int ret; - __ms_va_list args; - assert( strlen(fmt) == 1 ); - __ms_va_start( args, fmt ); - switch (fmt[0]) - { - case 'b': - case 'e': - case 'i': - { - int i = va_arg( args, int ); - ret = ber_printf( ber, fmt, i ); - break; - } - case 'o': - case 's': - { - char *str = va_arg( args, char * ); - ret = ber_printf( ber, fmt, str ); - break; - } - case 't': - { - unsigned int tag = va_arg( args, unsigned int ); - ret = ber_printf( ber, fmt, tag ); - break; - } - case 'v': - { - char **array = va_arg( args, char ** ); - ret = ber_printf( ber, fmt, array ); - break; - } - case 'V': - { - struct berval **array = va_arg( args, struct berval ** ); - ret = ber_printf( ber, fmt, array ); - break; - } - case 'B': - { - char *str = va_arg( args, char * ); - int len = va_arg( args, int ); - ret = ber_printf( ber, fmt, str, len ); - break; - } - case 'n': - case '{': - case '}': - case '[': - case ']': - ret = ber_printf( ber, fmt ); - break; - - default: - assert( 0 ); - } - __ms_va_end( args ); - return ret; + return ber_printf( ber, fmt, arg1, arg2 ); } -static int WINAPIV wrap_ber_scanf( void *ber, char *fmt, ... ) +static int CDECL wrap_ber_scanf( void *ber, char *fmt, void *arg1, void *arg2 ) { - int ret; - __ms_va_list args; - assert( strlen(fmt) == 1 ); - __ms_va_start( args, fmt ); - switch (fmt[0]) - { - case 'a': - { - char **str = va_arg( args, char ** ); - ret = ber_scanf( ber, fmt, str ); - break; - } - case 'b': - case 'e': - case 'i': - { - int *i = va_arg( args, int * ); - ret = ber_scanf( ber, fmt, i ); - break; - } - case 't': - { - unsigned int *tag = va_arg( args, unsigned int * ); - ret = ber_scanf( ber, fmt, tag ); - break; - } - case 'v': - { - char ***array = va_arg( args, char *** ); - ret = ber_scanf( ber, fmt, array ); - break; - } - case 'B': - { - char **str = va_arg( args, char ** ); - int *len = va_arg( args, int * ); - ret = ber_scanf( ber, fmt, str, len ); - break; - } - case 'O': - { - struct berval **berval = va_arg( args, struct berval ** ); - ret = ber_scanf( ber, fmt, berval ); - break; - } - case 'V': - { - struct berval ***array = va_arg( args, struct berval *** ); - ret = ber_scanf( ber, fmt, array ); - break; - } - case 'n': - case 'x': - case '{': - case '}': - case '[': - case ']': - ret = ber_scanf( ber, fmt ); - break; - - default: - assert( 0 ); - } - __ms_va_end( args ); - return ret; + return ber_scanf( ber, fmt, arg1, arg2 ); } static int CDECL wrap_ldap_abandon_ext( void *ld, int msgid, LDAPControlU **serverctrls, LDAPControlU **clientctrls ) diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index e9736fc757f..aec1f13a754 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -105,8 +105,8 @@ struct ldap_funcs unsigned int (CDECL *fn_ber_next_element)(void *, unsigned int *, char *); unsigned int (CDECL *fn_ber_peek_tag)(void *, unsigned int *); unsigned int (CDECL *fn_ber_skip_tag)(void *, unsigned int *); - int (WINAPIV *fn_ber_printf)(void *, char *, ...); - int (WINAPIV *fn_ber_scanf)(void *, char *, ...); + int (CDECL *fn_ber_printf)(void *, char *, ULONG_PTR arg1, ULONG_PTR arg2 ); + int (CDECL *fn_ber_scanf)(void *, char *, void *arg1, void *arg2 ); int (CDECL *fn_ldap_abandon_ext)(void *, int, LDAPControlU **, LDAPControlU **); int (CDECL *fn_ldap_add_ext)(void *, const char *, LDAPModU **, LDAPControlU **, LDAPControlU **, ULONG *);

1 0

Alexandre Julliard : wldap32: Move the SASL callback to the Unix side.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 449fae545c915f04c20cd3b6830e077ada8df3f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=449fae545c915f04c20cd3b6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 3 12:10:00 2021 +0100 wldap32: Move the SASL callback to the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/bind.c | 32 -------------------------------- dlls/wldap32/libldap.c | 33 ++++++++++++++++++++++++++++----- dlls/wldap32/libldap.h | 30 ++++++++---------------------- dlls/wldap32/main.c | 6 +----- 4 files changed, 37 insertions(+), 64 deletions(-) diff --git a/dlls/wldap32/bind.c b/dlls/wldap32/bind.c index d45ed5d60e0..837612bf75f 100644 --- a/dlls/wldap32/bind.c +++ b/dlls/wldap32/bind.c @@ -138,38 +138,6 @@ exit: return ret; } -int CDECL sasl_interact_cb( void *ld, unsigned flags, void *defaults, void *interact ) -{ - SEC_WINNT_AUTH_IDENTITY_A *id = defaults; - struct sasl_interactU *sasl = interact; - - TRACE( "(%p, 0x%08x, %p, %p)\n", ld, flags, defaults, interact ); - - while (sasl->id != SASL_CB_LIST_END) - { - TRACE( "sasl->id = %04lx\n", sasl->id ); - - if (sasl->id == SASL_CB_GETREALM) - { - sasl->result = id->Domain; - sasl->len = id->DomainLength; - } - else if (sasl->id == SASL_CB_USER) - { - sasl->result = id->User; - sasl->len = id->UserLength; - } - else if (sasl->id == SASL_CB_PASS) - { - sasl->result = id->Password; - sasl->len = id->PasswordLength; - } - sasl++; - } - - return LDAP_SUCCESS; -} - /*********************************************************************** * ldap_bind_sW (WLDAP32.@) * diff --git a/dlls/wldap32/libldap.c b/dlls/wldap32/libldap.c index 495ea609059..d568c2daaae 100644 --- a/dlls/wldap32/libldap.c +++ b/dlls/wldap32/libldap.c @@ -59,8 +59,6 @@ C_ASSERT( sizeof(struct timevalU) == sizeof(struct timeval) ); static LDAPMod *nullmods[] = { NULL }; -static const struct ldap_callbacks *callbacks; - static void * CDECL wrap_ber_alloc_t( int options ) { return ber_alloc_t( options ); @@ -553,8 +551,34 @@ static int CDECL wrap_ldap_sasl_bind_s( void *ld, const char *dn, const char *me static int wrap_sasl_interact( LDAP *ld, unsigned int flags, void *defaults, void *interact ) { #ifdef HAVE_SASL_SASL_H - C_ASSERT( sizeof(struct sasl_interactU) == sizeof(struct sasl_interact) ); - return callbacks->sasl_interact( ld, flags, defaults, interact ); + struct sasl_interactive_bind_id *id = defaults; + struct sasl_interact *sasl = interact; + + TRACE( "(%p, 0x%08x, %p, %p)\n", ld, flags, defaults, interact ); + + while (sasl->id != SASL_CB_LIST_END) + { + TRACE( "sasl->id = %04lx\n", sasl->id ); + + if (sasl->id == SASL_CB_GETREALM) + { + sasl->result = id->domain; + sasl->len = id->domain_len; + } + else if (sasl->id == SASL_CB_USER) + { + sasl->result = id->user; + sasl->len = id->user_len; + } + else if (sasl->id == SASL_CB_PASS) + { + sasl->result = id->password; + sasl->len = id->password_len; + } + sasl++; + } + + return LDAP_SUCCESS; #endif return -1; } @@ -678,7 +702,6 @@ static const struct ldap_funcs funcs = NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) { if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS; - callbacks = ptr_in; *(const struct ldap_funcs **)ptr_out = &funcs; return STATUS_SUCCESS; } diff --git a/dlls/wldap32/libldap.h b/dlls/wldap32/libldap.h index d0c37ab498d..e9736fc757f 100644 --- a/dlls/wldap32/libldap.h +++ b/dlls/wldap32/libldap.h @@ -83,22 +83,15 @@ typedef struct timevalU LONG_PTR tv_usec; } LDAP_TIMEVALU; -#ifndef SASL_CB_LIST_END -#define SASL_CB_LIST_END 0 -#define SASL_CB_USER 0x4001 -#define SASL_CB_PASS 0x4004 -#define SASL_CB_GETREALM 0x4008 -#endif - -typedef struct sasl_interactU +struct sasl_interactive_bind_id { - ULONG_PTR id; - const char *challenge; - const char *prompt; - const char *defresult; - const void *result; - unsigned int len; -} sasl_interact_tU; + unsigned char* user; + ULONG user_len; + unsigned char* domain; + ULONG domain_len; + unsigned char* password; + ULONG password_len; +}; struct ldap_funcs { @@ -179,11 +172,4 @@ struct ldap_funcs void (CDECL *fn_ldap_value_free_len)(struct bervalU **); }; -extern int CDECL sasl_interact_cb(void *, unsigned int, void *, void *) DECLSPEC_HIDDEN; - -struct ldap_callbacks -{ - int (CDECL *sasl_interact)(void *, unsigned int, void *, void *); -}; - extern const struct ldap_funcs *ldap_funcs; diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c index c2fdf30f820..55a08c9bad5 100644 --- a/dlls/wldap32/main.c +++ b/dlls/wldap32/main.c @@ -31,10 +31,6 @@ HINSTANCE hwldap32; WINE_DEFAULT_DEBUG_CHANNEL(wldap32); const struct ldap_funcs *ldap_funcs = NULL; -const struct ldap_callbacks ldap_callbacks = -{ - sasl_interact_cb -}; BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { @@ -45,7 +41,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: hwldap32 = hinst; DisableThreadLibraryCalls( hinst ); - if (__wine_init_unix_lib( hinst, reason, &ldap_callbacks, &ldap_funcs )) + if (__wine_init_unix_lib( hinst, reason, NULL, &ldap_funcs )) ERR( "No libldap support, expect problems\n" ); break; }

1 0

Zhiyi Zhang : comctl32/button: Add a get_box_rect() helper to calculation box rectangle.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: a161fa7789ba5b89db35102c0e6e977d4e38ec69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a161fa7789ba5b89db35102c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:52:10 2021 +0800 comctl32/button: Add a get_box_rect() helper to calculation box rectangle. get_box_rect() is introduced so that we don't need to duplicate the check box rectangle calculation when painting themed check boxes. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 130 +++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 63 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 2738a4caee5..6a463cb3460 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -1881,11 +1881,65 @@ static void PB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) * Check Box & Radio Button Functions */ +/* Get adjusted check box or radio box rectangle */ +static RECT get_box_rect(LONG style, LONG ex_style, const RECT *content_rect, + const RECT *label_rect, BOOL has_label, SIZE box_size) +{ + RECT rect; + int delta; + + rect = *content_rect; + + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) + rect.left = rect.right - box_size.cx; + else + rect.right = rect.left + box_size.cx; + + /* Adjust box when label is valid */ + if (has_label) + { + rect.top = label_rect->top; + rect.bottom = label_rect->bottom; + } + + /* Box must have the correct height */ + delta = rect.bottom - rect.top - box_size.cy; + if ((style & BS_VCENTER) == BS_TOP) + { + if (delta <= 0) + rect.top -= -delta / 2 + 1; + + rect.bottom = rect.top + box_size.cy; + } + else if ((style & BS_VCENTER) == BS_BOTTOM) + { + if (delta <= 0) + rect.bottom += -delta / 2 + 1; + + rect.top = rect.bottom - box_size.cy; + } + else + { + if (delta > 0) + { + rect.bottom -= delta / 2 + 1; + rect.top = rect.bottom - box_size.cy; + } + else if (delta < 0) + { + rect.top -= -delta / 2 + 1; + rect.bottom = rect.top + box_size.cy; + } + } + + return rect; +} + static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { - RECT rbox, labelRect, imageRect, textRect, client; + RECT rbox, labelRect, oldLabelRect, imageRect, textRect, client; HBRUSH hBrush; - int delta, text_offset, checkBoxWidth, checkBoxHeight; + int text_offset; UINT dtFlags; LRESULT cdrf; HFONT hFont; @@ -1893,6 +1947,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) LONG state = infoPtr->state; LONG style = GetWindowLongW( infoPtr->hwnd, GWL_STYLE ); LONG ex_style = GetWindowLongW( infoPtr->hwnd, GWL_EXSTYLE ); + SIZE box_size; HWND parent; HRGN hrgn; @@ -1903,10 +1958,10 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } GetClientRect(infoPtr->hwnd, &client); - rbox = labelRect = client; + labelRect = client; - checkBoxWidth = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; - checkBoxHeight = 12 * GetDpiForWindow( infoPtr->hwnd ) / 96 + 1; + box_size.cx = 12 * GetDpiForWindow(infoPtr->hwnd) / 96 + 1; + box_size.cy = box_size.cx; if ((hFont = infoPtr->font)) SelectObject( hDC, hFont ); GetCharWidthW( hDC, '0', '0', &text_offset ); @@ -1920,15 +1975,13 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) hrgn = set_control_clipping( hDC, &client ); if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) - { - labelRect.right -= checkBoxWidth + text_offset; - rbox.left = rbox.right - checkBoxWidth; - } + labelRect.right -= box_size.cx + text_offset; else - { - labelRect.left += checkBoxWidth + text_offset; - rbox.right = checkBoxWidth; - } + labelRect.left += box_size.cx + text_offset; + + oldLabelRect = labelRect; + dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); + rbox = get_box_rect(style, ex_style, &client, &labelRect, dtFlags != (UINT)-1L, box_size); init_custom_draw(&nmcd, infoPtr, hDC, &client); @@ -1946,16 +1999,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) } /* Draw label */ - client = labelRect; - dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &labelRect, &imageRect, &textRect); - - /* Only adjust rbox when rtext is valid */ - if (dtFlags != (UINT)-1L) - { - rbox.top = labelRect.top; - rbox.bottom = labelRect.bottom; - } - /* Send paint notifications */ nmcd.dwDrawStage = CDDS_PREPAINT; cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); @@ -1977,45 +2020,6 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) if (state & BST_PUSHED) flags |= DFCS_PUSHED; if (style & WS_DISABLED) flags |= DFCS_INACTIVE; - /* rbox must have the correct height */ - delta = rbox.bottom - rbox.top - checkBoxHeight; - - if ((style & BS_VCENTER) == BS_TOP) - { - if (delta > 0) - rbox.bottom = rbox.top + checkBoxHeight; - else - { - rbox.top -= -delta / 2 + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - else if ((style & BS_VCENTER) == BS_BOTTOM) - { - if (delta > 0) - rbox.top = rbox.bottom - checkBoxHeight; - else - { - rbox.bottom += -delta / 2 + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - } - else /* Default */ - { - if (delta > 0) - { - int ofs = delta / 2; - rbox.bottom -= ofs + 1; - rbox.top = rbox.bottom - checkBoxHeight; - } - else if (delta < 0) - { - int ofs = -delta / 2; - rbox.top -= ofs + 1; - rbox.bottom = rbox.top + checkBoxHeight; - } - } - DrawFrameControl(hDC, &rbox, DFC_BUTTON, flags); } @@ -2035,7 +2039,7 @@ static void CB_Paint( const BUTTON_INFO *infoPtr, HDC hDC, UINT action ) { labelRect.left--; labelRect.right++; - IntersectRect(&labelRect, &labelRect, &client); + IntersectRect(&labelRect, &labelRect, &oldLabelRect); DrawFocusRect(hDC, &labelRect); }

1 0

Zhiyi Zhang : comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 3d3914bca0eb9d3646a6f9beb9fe20ec876dd230 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d3914bca0eb9d3646a6f9be… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:51:57 2021 +0800 comctl32/button: Simplify focus rectangle calculation for drawing themed push buttons. The focus rectangle is the same as the result from GetThemeBackgroundContentRect(). So there is no need to retrieve content margins and calculate it again. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index fbe060513d2..00f42322399 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2651,7 +2651,7 @@ cleanup: */ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) { - RECT bgRect, textRect; + RECT bgRect, textRect, focusRect; NMCUSTOMDRAW nmcd; LRESULT cdrf; HWND parent; @@ -2661,6 +2661,8 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in GetClientRect(infoPtr->hwnd, &bgRect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &bgRect, &textRect); + focusRect = textRect; + init_custom_draw(&nmcd, infoPtr, hDC, &bgRect); parent = GetParent(infoPtr->hwnd); @@ -2698,20 +2700,7 @@ static void PB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in } if (cdrf & CDRF_SKIPPOSTPAINT) return; - if (focused) - { - MARGINS margins; - RECT focusRect = bgRect; - - GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins); - - focusRect.left += margins.cxLeftWidth; - focusRect.top += margins.cyTopHeight; - focusRect.right -= margins.cxRightWidth; - focusRect.bottom -= margins.cyBottomHeight; - - DrawFocusRect( hDC, &focusRect ); - } + if (focused) DrawFocusRect(hDC, &focusRect); } static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)

1 0

Zhiyi Zhang : comctl32/tests: Test WM_CTLCOLORSTATIC for static controls in a themed dialog.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: e17aedb2849278bb15dd2f67cd5610f83dc36212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17aedb2849278bb15dd2f67… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Nov 4 14:39:38 2021 +0800 comctl32/tests: Test WM_CTLCOLORSTATIC for static controls in a themed dialog. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/static.c | 92 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 40a337b97b0..269dfbb49eb 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -27,6 +27,7 @@ #include "winuser.h" #include "commctrl.h" #include "resources.h" +#include "uxtheme.h" #include "wine/test.h" @@ -377,6 +378,96 @@ static void test_STM_SETIMAGE(void) DeleteEnhMetaFile(emf); } +static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + static HWND child; + + switch (msg) + { + case WM_INITDIALOG: + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + (HMENU)100, 0, NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + return FALSE; + + case WM_CLOSE: + DestroyWindow(child); + return TRUE; + + default: + return FALSE; + } +} + +static void test_WM_CTLCOLORSTATIC(void) +{ + HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; + HWND parent, dialog, child; + COLORREF color, old_color; + HDC child_hdc, dialog_hdc; + int mode, old_mode; + BOOL todo = FALSE; + HMODULE uxtheme; + HBRUSH brush; + + struct + { + DLGTEMPLATE tmplate; + WORD menu; + WORD class; + WORD title; + } temp = {{0}}; + + parent = CreateWindowA(WC_STATICA, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, + NULL); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + + temp.tmplate.style = WS_CHILD | WS_VISIBLE; + temp.tmplate.cx = 80; + temp.tmplate.cy = 80; + dialog = CreateDialogIndirectParamA(NULL, &temp.tmplate, parent, test_WM_CTLCOLORSTATIC_proc, 0); + ok(dialog != NULL, "CreateDialogIndirectParamA failed, error %d.\n", GetLastError()); + child = GetDlgItem(dialog, 100); + ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); + + uxtheme = LoadLibraryA("uxtheme.dll"); + if (uxtheme) + { + pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); + if (pGetWindowTheme) + todo = !!pGetWindowTheme(dialog); + } + + dialog_hdc = GetDC(dialog); + child_hdc = GetDC(child); + PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); + + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(todo) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(todo) + ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); + color = GetPixel(dialog_hdc, 40, 40); + todo_wine_if(todo) + ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + + ReleaseDC(child, child_hdc); + ReleaseDC(dialog, dialog_hdc); + EndDialog(dialog, 0); + DestroyWindow(parent); + FreeLibrary(uxtheme); +} + START_TEST(static) { static const char classname[] = "testclass"; @@ -417,6 +508,7 @@ START_TEST(static) test_set_text(); test_set_image(); test_STM_SETIMAGE(); + test_WM_CTLCOLORSTATIC(); DestroyWindow(hMainWnd);

1 0

Alistair Leslie-Hughes : dmime: Parse Wave track stream.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: 854895f70afeeb3c098ff32318353ec4fe7b9bc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=854895f70afeeb3c098ff323… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 1 17:30:54 2021 +1100 dmime: Parse Wave track stream. For Tron 2.0. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 6 ++ dlls/dmime/wavetrack.c | 148 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 152 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index c2221a15fd2..6ab47292b39 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,6 +86,12 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; +struct wave_item { + struct list entry; + DMUS_IO_WAVE_TRACK_HEADER header; + IDirectMusicObject *object; +}; + typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 1c6b08b5235..da7ef37d2c8 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -20,6 +20,8 @@ #include "dmime_private.h" #include "dmobject.h" +#include "wine/heap.h" + WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** @@ -32,6 +34,8 @@ typedef struct IDirectMusicWaveTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj; /* IPersistStream only */ LONG ref; + + struct list items; } IDirectMusicWaveTrack; /* IDirectMusicWaveTrack IDirectMusicTrack8 part: */ @@ -40,6 +44,11 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicWaveTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -81,6 +90,19 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) { + struct list *cursor, *cursor2; + struct wave_item *item; + + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->items) { + item = LIST_ENTRY(cursor, struct wave_item, entry); + list_remove(cursor); + + if (item->object) + IDirectMusicObject_Release(item->object); + + heap_free(item); + } + HeapFree(GetProcessHeap(), 0, This); DMIME_UnlockModule(); } @@ -280,10 +302,131 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { wave_track_Join }; +static HRESULT parse_wave_item(IDirectMusicWaveTrack *This, IStream *stream, + struct chunk_entry *wave, struct wave_item *item) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = wave}; + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if(chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVE_LIST) + { + struct chunk_entry child = {.parent = &chunk}; + DMUS_IO_WAVE_ITEM_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != DMUS_FOURCC_WAVEITEM_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_ITEM_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - rtTime %s\n", wine_dbgstr_longlong(header.rtTime)); + TRACE(" - rtStartOffset %s\n", wine_dbgstr_longlong(header.rtStartOffset)); + TRACE(" - rtReserved %s\n", wine_dbgstr_longlong(header.rtReserved)); + TRACE(" - rtDuration %s\n", wine_dbgstr_longlong(header.rtDuration)); + TRACE(" - dwLoopStart %d\n", header.dwLoopStart); + TRACE(" - dwLoopEnd %d\n", header.dwLoopEnd); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - wVolumeRange %d\n", header.wVolumeRange); + TRACE(" - wPitchRange %d\n", header.wPitchRange); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) + return hr; + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicWaveTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_WAVETRACK_LIST) + { + struct chunk_entry chunklist = {.parent = &chunk}; + struct wave_item *item = NULL; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(&chunklist)); + + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) + return hr; + + if (chunklist.id != DMUS_FOURCC_WAVETRACK_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + item = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct wave_item)); + if (!item) + return E_OUTOFMEMORY; + + list_add_tail (&This->items, &item->entry); + + if (FAILED(hr = stream_next_chunk(stream, &chunklist))) + return hr; + + if (chunklist.id == FOURCC_LIST && chunklist.type == DMUS_FOURCC_WAVEPART_LIST) + { + struct chunk_entry child = {.parent = &chunklist}; + DMUS_IO_WAVE_PART_HEADER header; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_WAVEPART_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, sizeof(header)))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_WAVE_PART_HEADER\n"); + TRACE(" - lVolume %d\n", header.lVolume); + TRACE(" - dwVariations %d\n", header.dwVariations); + TRACE(" - dwPChannel %d\n", header.dwPChannel); + TRACE(" - dwLockToPart %d\n", header.dwLockToPart); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwIndex %d\n", header.dwIndex); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if(child.id != FOURCC_LIST || child.type != DMUS_FOURCC_WAVEITEM_LIST) + return DMUS_E_UNSUPPORTED_STREAM; + + hr = parse_wave_item(This, stream, &child, item); + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + } + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = { @@ -313,6 +456,7 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj) dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack, (IUnknown *)&track->IDirectMusicTrack8_iface); track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; + list_init(&track->items); DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);

1 0

Zebediah Figura : wined3d: Protect access to the Vulkan wined3d_allocator with a mutex.
by Alexandre Julliard Nov. 4, 2021

Nov. 4, 2021

Module: wine Branch: master Commit: ce0f12acc9b97437c4c11d0d8e98302088b5b39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce0f12acc9b97437c4c11d0d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 3 23:46:55 2021 -0500 wined3d: Protect access to the Vulkan wined3d_allocator with a mutex. So that it can be accessed from the client thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 9 ++++++++ dlls/wined3d/context_vk.c | 50 ++++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 11 ++++++++++ 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 02a359c4f07..cbf7c94fd3a 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -521,6 +521,10 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi goto fail; } + InitializeCriticalSection(&device_vk->allocator_cs); + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": wined3d_device_vk.allocator_cs"); + *device = &device_vk->d; return WINED3D_OK; @@ -538,6 +542,11 @@ static void adapter_vk_destroy_device(struct wined3d_device *device) wined3d_device_cleanup(&device_vk->d); wined3d_allocator_cleanup(&device_vk->allocator); + + if (device_vk->allocator_cs.DebugInfo != (RTL_CRITICAL_SECTION_DEBUG *)-1) + device_vk->allocator_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&device_vk->allocator_cs); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index ad7b0a8ba86..54c5eb6bc24 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -313,27 +313,43 @@ static struct wined3d_allocator_block *wined3d_context_vk_allocate_memory(struct struct wined3d_allocator *allocator = &device_vk->allocator; struct wined3d_allocator_block *block; + wined3d_device_vk_allocator_lock(device_vk); + if (size > WINED3D_ALLOCATOR_CHUNK_SIZE / 2) { *vk_memory = wined3d_context_vk_allocate_vram_chunk_memory(context_vk, memory_type, size); + wined3d_device_vk_allocator_unlock(device_vk); return NULL; } if (!(block = wined3d_allocator_allocate(allocator, &context_vk->c, memory_type, size))) { + wined3d_device_vk_allocator_unlock(device_vk); *vk_memory = VK_NULL_HANDLE; return NULL; } *vk_memory = wined3d_allocator_chunk_vk(block->chunk)->vk_memory; + wined3d_device_vk_allocator_unlock(device_vk); return block; } +static void wined3d_context_vk_free_memory(struct wined3d_context_vk *context_vk, struct wined3d_allocator_block *block) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + + assert(block->chunk->allocator == &device_vk->allocator); + wined3d_device_vk_allocator_lock(device_vk); + wined3d_allocator_block_free(block); + wined3d_device_vk_allocator_unlock(device_vk); +} + static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context_vk, VkDeviceSize size, VkBufferUsageFlags usage, VkMemoryPropertyFlags memory_type, struct wined3d_bo_vk *bo) { const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(context_vk->c.device->adapter); + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const VkPhysicalDeviceLimits *limits = &adapter_vk->device_limits; struct wined3d_bo_slab_vk_key key; struct wined3d_bo_slab_vk *slab; @@ -360,6 +376,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context key.usage = usage; key.size = 32 * object_size; + wined3d_device_vk_allocator_lock(device_vk); + if ((entry = wine_rb_get(&context_vk->bo_slab_available, &key))) { slab = WINE_RB_ENTRY_VALUE(entry, struct wined3d_bo_slab_vk, entry); @@ -369,26 +387,29 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context { if (!(slab = heap_alloc_zero(sizeof(*slab)))) { + wined3d_device_vk_allocator_unlock(device_vk); ERR("Failed to allocate bo slab.\n"); return false; } - slab->requested_memory_type = memory_type; - if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) + if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) { - ERR("Failed to create slab bo.\n"); + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to add slab to available tree.\n"); heap_free(slab); return false; } - slab->map = ~0u; - if (wine_rb_put(&context_vk->bo_slab_available, &key, &slab->entry) < 0) + slab->requested_memory_type = memory_type; + if (!wined3d_context_vk_create_bo(context_vk, key.size, usage, memory_type, &slab->bo)) { - ERR("Failed to add slab to available tree.\n"); - wined3d_context_vk_destroy_bo(context_vk, &slab->bo); + wined3d_device_vk_allocator_unlock(device_vk); + ERR("Failed to create slab bo.\n"); + wine_rb_remove(&context_vk->bo_slab_available, &slab->entry); heap_free(slab); return false; } + slab->map = ~0u; TRACE("Created new bo slab %p.\n", slab); } @@ -407,6 +428,8 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context } } + wined3d_device_vk_allocator_unlock(device_vk); + *bo = slab->bo; bo->memory = NULL; bo->slab = slab; @@ -480,7 +503,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic { ERR("Failed to bind buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); if (bo->memory) - wined3d_allocator_block_free(bo->memory); + wined3d_context_vk_free_memory(context_vk, bo->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, bo->vk_memory, NULL)); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); @@ -574,7 +597,7 @@ BOOL wined3d_context_vk_create_image(struct wined3d_context_vk *context_vk, VkIm { VK_CALL(vkDestroyImage(device_vk->vk_device, image->vk_image, NULL)); if (image->memory) - wined3d_allocator_block_free(image->memory); + wined3d_context_vk_free_memory(context_vk, image->memory); else VK_CALL(vkFreeMemory(device_vk->vk_device, image->vk_memory, NULL)); ERR("Failed to bind image memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -688,7 +711,7 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte if (context_vk->completed_command_buffer_id > command_buffer_id) { - wined3d_allocator_block_free(block); + wined3d_context_vk_free_memory(context_vk, block); TRACE("Freed block %p.\n", block); return; } @@ -707,11 +730,14 @@ void wined3d_context_vk_destroy_allocator_block(struct wined3d_context_vk *conte static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, SIZE_T idx, struct wined3d_context_vk *context_vk) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + wined3d_device_vk_allocator_lock(device_vk); + if (!slab->map) { key.memory_type = slab->requested_memory_type; @@ -729,6 +755,8 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, } } slab->map |= 1u << idx; + + wined3d_device_vk_allocator_unlock(device_vk); } static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk *context_vk, @@ -1000,7 +1028,7 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont case WINED3D_RETIRED_ALLOCATOR_BLOCK_VK: TRACE("Destroying block %p.\n", o->u.block); - wined3d_allocator_block_free(o->u.block); + wined3d_context_vk_free_memory(context_vk, o->u.block); break; case WINED3D_RETIRED_BO_SLAB_SLICE_VK: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index aa8974366a6..62b92ce7c34 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4084,6 +4084,7 @@ struct wined3d_device_vk struct wined3d_null_resources_vk null_resources_vk; struct wined3d_null_views_vk null_views_vk; + CRITICAL_SECTION allocator_cs; struct wined3d_allocator allocator; struct wined3d_uav_clear_state_vk uav_clear_state; @@ -4094,6 +4095,16 @@ static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device return CONTAINING_RECORD(device, struct wined3d_device_vk, d); } +static inline void wined3d_device_vk_allocator_lock(struct wined3d_device_vk *device_vk) +{ + EnterCriticalSection(&device_vk->allocator_cs); +} + +static inline void wined3d_device_vk_allocator_unlock(struct wined3d_device_vk *device_vk) +{ + LeaveCriticalSection(&device_vk->allocator_cs); +} + bool wined3d_device_vk_create_null_resources(struct wined3d_device_vk *device_vk, struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; bool wined3d_device_vk_create_null_views(struct wined3d_device_vk *device_vk,

1 0