wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Hans Leidekker : kerberos: Move support for SpMakeSignature to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 712dfa4660c2599e9f57d7d3b791739ae8ddb900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712dfa4660c2599e9f57d7d3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:51 2021 +0200 kerberos: Move support for SpMakeSignature to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 35 +---------------------------------- dlls/kerberos/unixlib.c | 30 ++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 1 + 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 9915cca283d..7394f05bd2b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1036,57 +1036,24 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, *package_version = SECPKG_INTERFACE_VERSION; *table = &kerberos_table; *table_count = 1; - return STATUS_SUCCESS; } static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); - return STATUS_SUCCESS; } static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, SecBufferDesc *message, ULONG message_seq_no ) { -#ifdef SONAME_LIBGSSAPI_KRB5 - OM_uint32 ret, minor_status; - gss_buffer_desc data_buffer, token_buffer; - gss_ctx_id_t ctxt_handle; - int data_idx, token_idx; - TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; - ctxt_handle = ctxthandle_sspi_to_gss( context ); - - /* FIXME: multiple data buffers, read-only buffers */ - if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; - data_buffer.length = message->pBuffers[data_idx].cbBuffer; - data_buffer.value = message->pBuffers[data_idx].pvBuffer; - - if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; - token_buffer.length = 0; - token_buffer.value = NULL; - - ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); - TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); - if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); - if (ret == GSS_S_COMPLETE) - { - memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); - message->pBuffers[token_idx].cbBuffer = token_buffer.length; - pgss_release_buffer( &minor_status, &token_buffer ); - } - - return status_gss_to_sspi( ret ); -#else - FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); - return SEC_E_UNSUPPORTED_FUNCTION; -#endif + return krb5_funcs->make_signature( context, message ); } static NTSTATUS NTAPI kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, diff --git a/dlls/kerberos/unixlib.c b/dlls/kerberos/unixlib.c index 04bff0b032e..f67f22ad8d8 100644 --- a/dlls/kerberos/unixlib.c +++ b/dlls/kerberos/unixlib.c @@ -558,6 +558,35 @@ static NTSTATUS CDECL initialize_context( LSA_SEC_HANDLE credential, LSA_SEC_HAN return status_gss_to_sspi( ret ); } +static NTSTATUS CDECL make_signature( LSA_SEC_HANDLE context, SecBufferDesc *msg ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctx_handle = ctxhandle_sspi_to_gss( context ); + int data_idx, token_idx; + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( msg, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = msg->pBuffers[data_idx].cbBuffer; + data_buffer.value = msg->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( msg, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctx_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR( ret )) trace_gss_status( ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( msg->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + msg->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +} + static const struct krb5_funcs funcs = { accept_context, @@ -565,6 +594,7 @@ static const struct krb5_funcs funcs = delete_context, free_credentials_handle, initialize_context, + make_signature, }; NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out ) diff --git a/dlls/kerberos/unixlib.h b/dlls/kerberos/unixlib.h index 88d13ce8aab..da487bb781e 100644 --- a/dlls/kerberos/unixlib.h +++ b/dlls/kerberos/unixlib.h @@ -29,6 +29,7 @@ struct krb5_funcs 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 *); + NTSTATUS (CDECL *make_signature)(LSA_SEC_HANDLE, SecBufferDesc *); }; extern const struct krb5_funcs *krb5_funcs;

1 0

Hans Leidekker : kerberos: Move support for SpAcceptLsaModeContext to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: e6aa95c08a73a70dad378a1b040f430cbead9b1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6aa95c08a73a70dad378a1b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:50 2021 +0200 kerberos: Move support for SpAcceptLsaModeContext to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 102 ++++-------------------------------------------- dlls/kerberos/unixlib.c | 63 ++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 2 + 3 files changed, 72 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e6aa95c08a73a70dad37…

1 0

Hans Leidekker : kerberos: Move support for SpInitLsaModeContext/SpDeleteContext to the Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f9292ec8b672c6325b6561ad71e35d19011dbda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9292ec8b672c6325b6561ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:49 2021 +0200 kerberos: Move support for SpInitLsaModeContext/SpDeleteContext to the Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 135 ++++-------------------------------------------- dlls/kerberos/unixlib.c | 116 +++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 3 ++ 3 files changed, 130 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f9292ec8b672c6325b65…

1 0

Hans Leidekker : kerberos: Move support for SpAcquireCredentialsHandle/SpFreeCredentialsHandle to a new Unix library.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 6e9a9d670185f5a18d860602eb23e5a4c0fc1c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9a9d670185f5a18d860602… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 15:56:48 2021 +0200 kerberos: Move support for SpAcquireCredentialsHandle/SpFreeCredentialsHandle to a new Unix library. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/Makefile.in | 3 +- dlls/kerberos/krb5_ap.c | 194 +++++++--------------- dlls/kerberos/unixlib.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/kerberos/unixlib.h | 29 ++++ 4 files changed, 494 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e9a9d670185f5a18d86…

1 0

Hans Leidekker : wldap32: Avoid a crash with tracing on.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 885c480d2e63895693b51a858f0745d2fd2468b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=885c480d2e63895693b51a85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 11:42:20 2021 +0200 wldap32: Avoid a crash with tracing on. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/option.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wldap32/option.c b/dlls/wldap32/option.c index 1037b73174b..0f3d10e1204 100644 --- a/dlls/wldap32/option.c +++ b/dlls/wldap32/option.c @@ -368,9 +368,10 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) { char *attrs[] = { (char *)"supportedControl", NULL }; void *res, *entry; + struct bervalU **ctrls = SERVER_CTRLS(ld); ULONG ret; - if (SERVER_CTRLS(ld)) return TRUE; + if (ctrls) return TRUE; ret = map_error( ldap_funcs->fn_ldap_search_ext_s( CTX(ld), (char *)"", LDAP_SCOPE_BASE, (char *)"(objectClass=*)", attrs, FALSE, NULL, NULL, NULL, 0, &res ) ); @@ -380,17 +381,14 @@ static BOOL query_supported_server_ctrls( LDAP *ld ) if (entry) { ULONG count, i; - struct bervalU **ctrls = SERVER_CTRLS(ld); - - *(struct bervalU ***)&SERVER_CTRLS(ld) = ldap_funcs->fn_ldap_get_values_len( CTX(ld), entry, attrs[0] ); - count = ldap_funcs->fn_ldap_count_values_len( SERVER_CTRLS(ld) ); - for (i = 0; i < count; i++) - TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + ctrls = ldap_funcs->fn_ldap_get_values_len( CTX(ld), entry, attrs[0] ); + count = ldap_funcs->fn_ldap_count_values_len( ctrls ); + for (i = 0; i < count; i++) TRACE("%u: %s\n", i, debugstr_an( ctrls[i]->bv_val, ctrls[i]->bv_len )); + *(struct bervalU ***)&SERVER_CTRLS(ld) = ctrls; } ldap_funcs->fn_ldap_msgfree( res ); - - return SERVER_CTRLS(ld) != NULL; + return ctrls != NULL; } static BOOL is_supported_server_ctrls( LDAP *ld, LDAPControlU **ctrls )

1 0

Hans Leidekker : wldap32: Fix parsing page controls.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: fb4426780390d2a6bd1fced47f867ba46afa3ead URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb4426780390d2a6bd1fced4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 20 11:42:19 2021 +0200 wldap32: Fix parsing page controls. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 471108c636e..8b0ded40e35 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <limits.h> #include "windef.h" #include "winbase.h" #include "winnls.h" @@ -31,8 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wldap32); -#define LDAP_MAXINT (2^31) - static struct berval null_cookieW = { 0, NULL }; /*********************************************************************** @@ -48,7 +47,7 @@ ULONG CDECL ldap_create_page_controlA( LDAP *ld, ULONG pagesize, struct berval * TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); - if (!ld || !control || pagesize > LDAP_MAXINT) return LDAP_PARAM_ERROR; + if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; ret = ldap_create_page_controlW( ld, pagesize, cookie, critical, &controlW ); if (ret == LDAP_SUCCESS) @@ -131,7 +130,7 @@ ULONG CDECL ldap_create_page_controlW( LDAP *ld, ULONG pagesize, struct berval * { TRACE( "(%p, 0x%08x, %p, 0x%02x, %p)\n", ld, pagesize, cookie, critical, control ); - if (!ld || !control || pagesize > LDAP_MAXINT) return LDAP_PARAM_ERROR; + if (!ld || !control || pagesize > INT_MAX) return LDAP_PARAM_ERROR; return create_page_control( pagesize, cookie, critical, control ); } @@ -230,18 +229,18 @@ ULONG CDECL ldap_parse_page_controlA( LDAP *ld, LDAPControlA **ctrls, ULONG *cou /*********************************************************************** * ldap_parse_page_controlW (WLDAP32.@) */ -ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *count, struct berval **cookie ) +ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *ret_count, struct berval **ret_cookie ) { - ULONG ret; + ULONG ret, count; LDAPControlW *control = NULL; BerElement *ber; - struct berval *vec[2]; + struct berval *cookie = NULL; int tag; ULONG i; - TRACE( "(%p, %p, %p, %p)\n", ld, ctrls, count, cookie ); + TRACE( "(%p, %p, %p, %p)\n", ld, ctrls, ret_count, ret_cookie ); - if (!ld || !ctrls || !count || !cookie) return LDAP_PARAM_ERROR; + if (!ld || !ctrls || !ret_count || !ret_cookie) return LDAP_PARAM_ERROR; for (i = 0; ctrls[i]; i++) { @@ -252,13 +251,14 @@ ULONG CDECL ldap_parse_page_controlW( LDAP *ld, LDAPControlW **ctrls, ULONG *cou if (!(ber = ber_init( &control->ldctl_value ))) return LDAP_NO_MEMORY; - vec[0] = *cookie; - vec[1] = 0; - tag = ber_scanf( ber, (char *)"{iV}", count, vec ); - if (tag == LBER_ERROR) - ret = LDAP_DECODING_ERROR; + tag = ber_scanf( ber, (char *)"{iO}", &count, &cookie ); + if (tag == LBER_ERROR) ret = LDAP_DECODING_ERROR; else + { + *ret_count = count; + *ret_cookie = cookie; ret = LDAP_SUCCESS; + } ber_free( ber, 1 ); return ret;

1 0

Nikolay Sivov : mfplay: Implement SetStreamSink().
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 7394483c6267a8dd0826402cfc674c18d3c1b7e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7394483c6267a8dd0826402c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:06:01 2021 +0300 mfplay: Implement SetStreamSink(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index be51ef2d2e1..51f3f67f5b1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); DEFINE_GUID(_MF_TOPO_MEDIA_ITEM, 0x6c1bb4df, 0x59ba, 0x4020, 0x85, 0x0c, 0x35, 0x79, 0xa2, 0x7a, 0xe2, 0x51); +DEFINE_GUID(_MF_CUSTOM_SINK, 0x7c1bb4df, 0x59ba, 0x4020, 0x85, 0x0c, 0x35, 0x79, 0xa2, 0x7a, 0xe2, 0x51); static const WCHAR eventclassW[] = L"MediaPlayerEventCallbackClass"; @@ -550,9 +551,34 @@ static HRESULT WINAPI media_item_GetCharacteristics(IMFPMediaItem *iface, MFP_ME static HRESULT WINAPI media_item_SetStreamSink(IMFPMediaItem *iface, DWORD index, IUnknown *sink) { - FIXME("%p, %u, %p.\n", iface, index, sink); + struct media_item *item = impl_from_IMFPMediaItem(iface); + IMFStreamDescriptor *sd; + IUnknown *sink_object; + BOOL selected; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, sink); + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, index, &selected, &sd))) + return hr; + + if (sink) + { + if (FAILED(hr = IUnknown_QueryInterface(sink, &IID_IMFStreamSink, (void **)&sink_object))) + hr = IUnknown_QueryInterface(sink, &IID_IMFActivate, (void **)&sink_object); + + if (sink_object) + { + hr = IMFStreamDescriptor_SetUnknown(sd, &_MF_CUSTOM_SINK, sink_object); + IUnknown_Release(sink_object); + } + } + else + IMFStreamDescriptor_DeleteItem(sd, &_MF_CUSTOM_SINK); + + IMFStreamDescriptor_Release(sd); + + return hr; } static HRESULT WINAPI media_item_GetMetadata(IMFPMediaItem *iface, IPropertyStore **metadata)

1 0

Nikolay Sivov : mfplay: Implement MFP_EVENT_TYPE_PLAYBACK_ENDED event.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 2cd0d1ec7cfec15d7f68f99b886e26b96787147b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cd0d1ec7cfec15d7f68f99b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:06:00 2021 +0300 mfplay: Implement MFP_EVENT_TYPE_PLAYBACK_ENDED event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplay/player.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c index d6ed6ef5c39..be51ef2d2e1 100644 --- a/dlls/mfplay/player.c +++ b/dlls/mfplay/player.c @@ -1605,6 +1605,21 @@ static void media_player_create_forward_event(struct media_player *player, HRESU LeaveCriticalSection(&player->cs); } +static void media_player_create_playback_ended_event(struct media_player *player, HRESULT event_status, + struct media_event **event) +{ + EnterCriticalSection(&player->cs); + + if (SUCCEEDED(media_event_create(player, MFP_EVENT_TYPE_PLAYBACK_ENDED, event_status, player->item, event))) + { + if (player->item) + IMFPMediaItem_Release(player->item); + player->item = NULL; + } + + LeaveCriticalSection(&player->cs); +} + static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { @@ -1616,6 +1631,7 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba HRESULT hr, event_status; IMFPMediaItem *item = NULL; IMFTopology *topology; + unsigned int status; PROPVARIANT value; if (FAILED(hr = IMFMediaSession_EndGetEvent(player->session, result, &session_event))) @@ -1661,6 +1677,16 @@ static HRESULT WINAPI media_player_session_events_callback_Invoke(IMFAsyncCallba break; + case MESessionTopologyStatus: + + if (SUCCEEDED(IMFMediaEvent_GetUINT32(session_event, &MF_EVENT_TOPOLOGY_STATUS, &status)) && + status == MF_TOPOSTATUS_ENDED) + { + media_player_create_playback_ended_event(player, event_status, &event); + } + + break; + case MEBufferingStarted: case MEBufferingStopped: case MEExtendedType:

1 0

Nikolay Sivov : include: Add mfplay event macros.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: 11d3f6976d0c4e8c937891bc9c6c4c86e455e01e URL: https://source.winehq.org/git/wine.git/?a=commit;h=11d3f6976d0c4e8c937891bc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:05:59 2021 +0300 include: Add mfplay event macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfplay.idl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/mfplay.idl b/include/mfplay.idl index f130ce12287..7d4345e69e7 100644 --- a/include/mfplay.idl +++ b/include/mfplay.idl @@ -22,13 +22,15 @@ import "evr.idl"; interface IMFNetCredential; +typedef UINT32 MFP_CREATION_OPTIONS; + typedef [v1_enum] enum _MFP_CREATION_OPTIONS { MFP_OPTION_NONE = 0, MFP_OPTION_FREE_THREADED_CALLBACK = 0x1, MFP_OPTION_NO_MMCSS = 0x2, MFP_OPTION_NO_REMOTE_DESKTOP_OPTIMIZATION = 0x4, -} MFP_CREATION_OPTIONS; +} _MFP_CREATION_OPTIONS; typedef [v1_enum] enum MFP_MEDIAPLAYER_STATE { @@ -180,6 +182,21 @@ typedef struct MFP_ACQUIRE_USER_CREDENTIAL_EVENT IMFNetCredential *pCredential; } MFP_ACQUIRE_USER_CREDENTIAL_EVENT; +cpp_quote("#define __MFP_CAST_EVENT(hdr, tag) (((hdr)->eEventType == MFP_EVENT_TYPE_##tag) ? (MFP_##Tag##_EVENT *)(hdr) : NULL)") +cpp_quote("#define MFP_GET_PLAY_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAY)") +cpp_quote("#define MFP_GET_PAUSE_EVENT(hdr) __MFP_CAST_EVENT(hdr, PAUSE)") +cpp_quote("#define MFP_GET_STOP_EVENT(hdr) __MFP_CAST_EVENT(hdr, STOP)") +cpp_quote("#define MFP_GET_POSITION_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, POSITION_SET)") +cpp_quote("#define MFP_GET_RATE_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, RATE_SET)") +cpp_quote("#define MFP_GET_MEDIAITEM_CREATED_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_CREATED)") +cpp_quote("#define MFP_GET_MEDIAITEM_SET_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_SET)") +cpp_quote("#define MFP_GET_FRAME_STEP_EVENT(hdr) __MFP_CAST_EVENT(hdr, FRAME_STEP)") +cpp_quote("#define MFP_GET_MEDIAITEM_CLEARED_EVENT(hdr) __MFP_CAST_EVENT(hdr, MEDIAITEM_CLEARED)") +cpp_quote("#define MFP_GET_MF_EVENT(hdr) __MFP_CAST_EVENT(hdr, MF)") +cpp_quote("#define MFP_GET_ERROR_EVENT(hdr) __MFP_CAST_EVENT(hdr, ERROR)") +cpp_quote("#define MFP_GET_PLAYBACK_ENDED_EVENT(hdr) __MFP_CAST_EVENT(hdr, PLAYBACK_ENDED)") +cpp_quote("#define MFP_GET_ACQUIRE_USER_CREDENTIAL_EVENT(hdr) __MFP_CAST_EVENT(hdr, ACQUIRE_USER_CREDENTIAL)") + [ object, uuid(766c8ffb-5fdb-4fea-a28d-b912996f51bd),

1 0

Nikolay Sivov : mf/tests: Add some tests for EVR sink services.
by Alexandre Julliard 20 Apr '21

20 Apr '21

Module: wine Branch: master Commit: f1fd0b46f99204e4912f6b58d39678d43cfcf52d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1fd0b46f99204e4912f6b58… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 20 12:05:26 2021 +0300 mf/tests: Add some tests for EVR sink services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index bf482ae4c71..b990b4614da 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -44,6 +44,8 @@ DEFINE_GUID(MFVideoFormat_ABGR32, 0x00000020, 0x0000, 0x0010, 0x80, 0x00, 0x00, #include "mmdeviceapi.h" #include "audioclient.h" #include "evr.h" +#include "d3d9.h" +#include "evr9.h" #include "wine/test.h" @@ -4223,7 +4225,6 @@ static void test_evr(void) IMFActivate *activate; HWND window, window2; LONG sample_count; - IMFGetService *gs; IMFSample *sample; IUnknown *unk; UINT64 window3; @@ -4262,6 +4263,12 @@ static void test_evr(void) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); check_interface(sink, &IID_IMFQualityAdvise, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerBitmap, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); + check_service_interface(sink, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, TRUE); + check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); + check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); @@ -4444,15 +4451,6 @@ static void test_evr(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(flags == (MEDIASINK_CAN_PREROLL | MEDIASINK_CLOCK_REQUIRED), "Unexpected flags %#x.\n", flags); - hr = IMFMediaSink_QueryInterface(sink, &IID_IMFGetService, (void **)&gs); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - - hr = IMFGetService_GetService(gs, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, (void **)&unk); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - IUnknown_Release(unk); - - IMFGetService_Release(gs); - hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2021