- Wine-Commits - list.winehq.org

Hans Leidekker : winscard: Implement SCardIsValidContext().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 9d40ac4635989f76b16384f15f01220fdec4d51a URL: https://gitlab.winehq.org/wine/wine/-/commit/9d40ac4635989f76b16384f15f0122… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 10:27:22 2023 +0100 winscard: Implement SCardIsValidContext(). --- dlls/winscard/unixlib.c | 8 ++++++++ dlls/winscard/unixlib.h | 6 ++++++ dlls/winscard/winscard.c | 17 +++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 76f2d5cd60b..032b148af8f 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -33,6 +33,7 @@ LONG SCardEstablishContext( UINT64, const void *, const void *, UINT64 * ); LONG SCardReleaseContext( UINT64 ); +LONG SCardIsValidContext( UINT64 ); static NTSTATUS scard_establish_context( void *args ) { @@ -46,8 +47,15 @@ static NTSTATUS scard_release_context( void *args ) return SCardReleaseContext( params->handle ); } +static NTSTATUS scard_is_valid_context( void *args ) +{ + struct scard_is_valid_context_params *params = args; + return SCardIsValidContext( params->handle ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, scard_release_context, + scard_is_valid_context, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 08b907f76fe..b8ba940f5b2 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -30,8 +30,14 @@ struct scard_release_context_params UINT64 handle; }; +struct scard_is_valid_context_params +{ + UINT64 handle; +}; + enum winscard_funcs { unix_scard_establish_context, unix_scard_release_context, + unix_scard_is_valid_context, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 0f7edb56c91..4f4cbcfed2f 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -94,11 +94,20 @@ LONG WINAPI SCardEstablishContext( DWORD scope, const void *reserved1, const voi return ret; } -LONG WINAPI SCardIsValidContext(SCARDCONTEXT context) +LONG WINAPI SCardIsValidContext( SCARDCONTEXT context ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)context; + struct scard_is_valid_context_params params; + LONG ret; + + TRACE( "%Ix\n", context ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + ret = UNIX_CALL( scard_is_valid_context, &params ); + TRACE( "returning %#lx\n", ret ); + return ret; } LONG WINAPI SCardListCardsA(SCARDCONTEXT hContext, LPCBYTE pbAtr, LPCGUID rgguidInterfaces, DWORD cguidInterfaceCount, LPSTR mszCards, LPDWORD pcchCards)

1 0

Hans Leidekker : winscard: Implement SCardEstablish/ReleaseContext() on top of libpcsclite.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 8490c43f38e306fef7b5fed3ffcb256efd73af58 URL: https://gitlab.winehq.org/wine/wine/-/commit/8490c43f38e306fef7b5fed3ffcb25… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 09:56:12 2023 +0100 winscard: Implement SCardEstablish/ReleaseContext() on top of libpcsclite. --- configure | 74 +++++++++++++++++++++++++++++++-- configure.ac | 10 +++++ dlls/winscard/Makefile.in | 3 ++ dlls/winscard/unixlib.c | 53 ++++++++++++++++++++++++ dlls/winscard/unixlib.h | 37 +++++++++++++++++ dlls/winscard/winscard.c | 103 ++++++++++++++++++++++++++++++++-------------- 6 files changed, 244 insertions(+), 36 deletions(-)

1 0

Hans Leidekker : winscard: Implement SCardCancel().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 4295b90ce15560823205e3f4e53e1d83ab4d8536 URL: https://gitlab.winehq.org/wine/wine/-/commit/4295b90ce15560823205e3f4e53e1d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 11:47:45 2023 +0100 winscard: Implement SCardCancel(). --- dlls/winscard/unixlib.c | 8 ++++++++ dlls/winscard/unixlib.h | 6 ++++++ dlls/winscard/winscard.c | 17 +++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 98de78a6d2b..6aca020cd4e 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -35,6 +35,7 @@ LONG SCardEstablishContext( UINT64, const void *, const void *, UINT64 * ); LONG SCardReleaseContext( UINT64 ); LONG SCardIsValidContext( UINT64 ); LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); +LONG SCardCancel( UINT64 ); static NTSTATUS scard_establish_context( void *args ) { @@ -60,10 +61,17 @@ static NTSTATUS scard_get_status_change( void *args ) return SCardGetStatusChange( params->handle, params->timeout, params->states, params->count ); } +static NTSTATUS scard_cancel( void *args ) +{ + struct scard_cancel_params *params = args; + return SCardCancel( params->handle ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, scard_release_context, scard_is_valid_context, scard_get_status_change, + scard_cancel, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index 0607596bf2c..c2151a7573e 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -54,10 +54,16 @@ struct scard_get_status_change_params UINT64 count; }; +struct scard_cancel_params +{ + UINT64 handle; +}; + enum winscard_funcs { unix_scard_establish_context, unix_scard_release_context, unix_scard_is_valid_context, unix_scard_get_status_change, + unix_scard_cancel, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index 3fefff5f755..af822b8aef2 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -201,11 +201,20 @@ LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR * return SCARD_E_NO_READERS_AVAILABLE; } -LONG WINAPI SCardCancel(SCARDCONTEXT context) +LONG WINAPI SCardCancel( SCARDCONTEXT context ) { - FIXME("(%Ix) stub\n", context); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return SCARD_F_INTERNAL_ERROR; + struct handle *handle = (struct handle *)context; + struct scard_cancel_params params; + LONG ret; + + TRACE( "%Ix\n", context ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + + params.handle = handle->unix_handle; + ret = UNIX_CALL( scard_cancel, &params ); + TRACE( "returning %#lx\n", ret ); + return ret; } static LONG map_states_inA( const SCARD_READERSTATEA *src, struct reader_state *dst, DWORD count )

1 0

Hans Leidekker : winscard: Implement SCardListReadersA/W().
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: f7c66e642ea83d40fb6306e010ba57257b8d344c URL: https://gitlab.winehq.org/wine/wine/-/commit/f7c66e642ea83d40fb6306e010ba57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 16 12:01:43 2023 +0100 winscard: Implement SCardListReadersA/W(). --- dlls/winscard/unixlib.c | 8 +++ dlls/winscard/unixlib.h | 9 +++ dlls/winscard/winscard.c | 164 +++++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 175 insertions(+), 6 deletions(-) diff --git a/dlls/winscard/unixlib.c b/dlls/winscard/unixlib.c index 6aca020cd4e..61f179b2eb9 100644 --- a/dlls/winscard/unixlib.c +++ b/dlls/winscard/unixlib.c @@ -36,6 +36,7 @@ LONG SCardReleaseContext( UINT64 ); LONG SCardIsValidContext( UINT64 ); LONG SCardGetStatusChange( UINT64, UINT64, struct reader_state *, UINT64 ); LONG SCardCancel( UINT64 ); +LONG SCardListReaders( UINT64, const char *, char *, UINT64 * ); static NTSTATUS scard_establish_context( void *args ) { @@ -67,6 +68,12 @@ static NTSTATUS scard_cancel( void *args ) return SCardCancel( params->handle ); } +static NTSTATUS scard_list_readers( void *args ) +{ + struct scard_list_readers_params *params = args; + return SCardListReaders( params->handle, params->groups, params->readers, params->readers_len ); +} + const unixlib_entry_t __wine_unix_call_funcs[] = { scard_establish_context, @@ -74,4 +81,5 @@ const unixlib_entry_t __wine_unix_call_funcs[] = scard_is_valid_context, scard_get_status_change, scard_cancel, + scard_list_readers, }; diff --git a/dlls/winscard/unixlib.h b/dlls/winscard/unixlib.h index c2151a7573e..1be9fe7cf77 100644 --- a/dlls/winscard/unixlib.h +++ b/dlls/winscard/unixlib.h @@ -59,6 +59,14 @@ struct scard_cancel_params UINT64 handle; }; +struct scard_list_readers_params +{ + UINT64 handle; + const char *groups; + char *readers; + UINT64 *readers_len; +}; + enum winscard_funcs { unix_scard_establish_context, @@ -66,4 +74,5 @@ enum winscard_funcs unix_scard_is_valid_context, unix_scard_get_status_change, unix_scard_cancel, + unix_scard_list_readers, }; diff --git a/dlls/winscard/winscard.c b/dlls/winscard/winscard.c index af822b8aef2..a242de9ccce 100644 --- a/dlls/winscard/winscard.c +++ b/dlls/winscard/winscard.c @@ -71,6 +71,45 @@ static inline char *ansi_to_utf8( const char *src ) return dst; } +static inline WCHAR *utf8_to_utf16( const char *src ) +{ + WCHAR *dst = NULL; + if (src) + { + int len = MultiByteToWideChar( CP_UTF8, 0, src, -1, NULL, 0 ); + if ((dst = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_UTF8, 0, src, -1, dst, len ); + } + return dst; +} + +static inline char *utf16_to_ansi( const WCHAR *src ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, src, -1, NULL, 0, NULL, NULL ); + if (*src && !len) + { + FIXME( "can't convert %s to ANSI codepage\n", debugstr_w(src) ); + return NULL; + } + if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, WC_NO_BEST_FIT_CHARS, src, -1, dst, len, NULL, NULL ); + } + return dst; +} + +static inline char *utf8_to_ansi( const char *src ) +{ + char *dst = NULL; + if (src) + { + WCHAR *tmp; + if ((tmp = utf8_to_utf16( src ))) dst = utf16_to_ansi( tmp ); + free( tmp ); + } + return dst; +} + HANDLE WINAPI SCardAccessStartedEvent(void) { return g_startedEvent; @@ -170,6 +209,27 @@ LONG WINAPI SCardReleaseContext( SCARDCONTEXT context ) return ret; } +static LONG copy_multiszA( const char *src, char *dst, DWORD *dst_len ) +{ + DWORD len, total_len = 0; + const char *ptr = src; + + while (*ptr) + { + char *str; + if (!(str = utf8_to_ansi( ptr ))) return SCARD_E_NO_MEMORY; + len = strlen( str ) + 1; + if (dst && dst_len && *dst_len > total_len + len) strcpy( dst + total_len, str ); + total_len += len; + ptr += strlen( ptr ) + 1; + free( str ); + } + + if (dst && dst_len && *dst_len > total_len + 1) dst[total_len] = 0; + if (dst_len) *dst_len = total_len + 1; + return SCARD_S_SUCCESS; +} + LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState, LPDWORD pdwProtocol, LPBYTE pbAtr, LPDWORD pcbAtrLen) { FIXME("(%Ix) stub\n", context); @@ -177,6 +237,27 @@ LONG WINAPI SCardStatusA(SCARDHANDLE context, LPSTR szReaderName, LPDWORD pcchRe return SCARD_F_INTERNAL_ERROR; } +static LONG copy_multiszW( const char *src, WCHAR *dst, DWORD *dst_len ) +{ + DWORD len, total_len = 0; + const char *ptr = src; + + while (*ptr) + { + WCHAR *str; + if (!(str = utf8_to_utf16( ptr ))) return SCARD_E_NO_MEMORY; + len = wcslen( str ) + 1; + if (dst && dst_len && *dst_len > total_len + len) wcscpy( dst + total_len, str ); + total_len += len; + ptr += strlen( ptr ) + 1; + free( str ); + } + + if (dst && dst_len && *dst_len > total_len + 1) dst[total_len] = 0; + if (dst_len) *dst_len = total_len + 1; + return SCARD_S_SUCCESS; +} + LONG WINAPI SCardStatusW(SCARDHANDLE context, LPWSTR szReaderName, LPDWORD pcchReaderLen, LPDWORD pdwState,LPDWORD pdwProtocol,LPBYTE pbAtr,LPDWORD pcbArtLen) { FIXME("(%Ix) stub\n", context); @@ -189,16 +270,87 @@ void WINAPI SCardReleaseStartedEvent(void) FIXME("stub\n"); } -LONG WINAPI SCardListReadersA(SCARDCONTEXT context, const CHAR *groups, CHAR *readers, DWORD *buflen) +LONG WINAPI SCardListReadersA( SCARDCONTEXT context, const char *groups, char *readers, DWORD *readers_len ) { - FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_a(groups), readers, buflen); - return SCARD_E_NO_READERS_AVAILABLE; + struct handle *handle = (struct handle *)context; + struct scard_list_readers_params params; + UINT64 readers_len_utf8; + LONG ret; + + TRACE( "%Ix, %s, %p, %p\n", context, debugstr_a(groups), readers, readers_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!readers_len) return SCARD_E_INVALID_PARAMETER; + if (*readers_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + if (!groups) params.groups = NULL; + else if (!(params.groups = ansi_to_utf8( groups ))) return SCARD_E_NO_MEMORY; + params.readers = NULL; + params.readers_len = &readers_len_utf8; + if ((ret = UNIX_CALL( scard_list_readers, &params ))) goto done; + + if (!(params.readers = malloc( readers_len_utf8 ))) + { + free( (void *)params.groups ); + return SCARD_E_NO_MEMORY; + } + if (!(ret = UNIX_CALL( scard_list_readers, &params ))) + { + ret = copy_multiszA( params.readers, readers, readers_len ); + } + +done: + free( (void *)params.groups ); + free( params.readers ); + TRACE( "returning %#lx\n", ret ); + return ret; } -LONG WINAPI SCardListReadersW(SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *buflen) +LONG WINAPI SCardListReadersW( SCARDCONTEXT context, const WCHAR *groups, WCHAR *readers, DWORD *readers_len ) { - FIXME("(%Ix, %s, %p, %p) stub\n", context, debugstr_w(groups), readers, buflen); - return SCARD_E_NO_READERS_AVAILABLE; + struct handle *handle = (struct handle *)context; + struct scard_list_readers_params params; + UINT64 readers_len_utf8; + LONG ret; + + TRACE( "%Ix, %s, %p, %p\n", context, debugstr_w(groups), readers, readers_len ); + + if (!handle || handle->magic != CONTEXT_MAGIC) return ERROR_INVALID_HANDLE; + if (!readers_len) return SCARD_E_INVALID_PARAMETER; + if (*readers_len == SCARD_AUTOALLOCATE) + { + FIXME( "SCARD_AUTOALLOCATE not supported\n" ); + return SCARD_F_INTERNAL_ERROR; + } + + params.handle = handle->unix_handle; + if (!groups) params.groups = NULL; + else if (!(params.groups = utf16_to_utf8( groups ))) return SCARD_E_NO_MEMORY; + params.readers = NULL; + params.readers_len = &readers_len_utf8; + if ((ret = UNIX_CALL( scard_list_readers, &params ))) goto done; + + params.handle = handle->unix_handle; + if (!(params.readers = malloc( readers_len_utf8 ))) + { + free( (void *)params.groups ); + return SCARD_E_NO_MEMORY; + } + if (!(ret = UNIX_CALL( scard_list_readers, &params ))) + { + ret = copy_multiszW( params.readers, readers, readers_len ); + } + +done: + free( (void *)params.groups ); + free( params.readers ); + TRACE( "returning %#lx\n", ret ); + return ret; } LONG WINAPI SCardCancel( SCARDCONTEXT context )

1 0

Alexandre Julliard : makedep: Don't add dependencies for tests of disabled dlls.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 8670876db9b7b918cb7893a16d7edde6b40a607a URL: https://gitlab.winehq.org/wine/wine/-/commit/8670876db9b7b918cb7893a16d7edd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 22 21:04:35 2023 +0100 makedep: Don't add dependencies for tests of disabled dlls. --- tools/makedep.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 532145de292..b94a221854d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3558,6 +3558,11 @@ static void output_test_module( struct makefile *make, unsigned int arch ) output( "\t%secho \"%s_test.exe TESTRES \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), basemodule, obj_dir_path( make, stripped ), tools_path( make, "wrc" )); + if (make->disabled[arch] || (parent && parent->disabled[arch])) + { + make->ok_files = empty_strarray; + return; + } output_filenames_obj_dir( make, make->ok_files ); output( ": %s", obj_dir_path( make, testmodule )); if (parent) @@ -3568,8 +3573,7 @@ static void output_test_module( struct makefile *make, unsigned int arch ) } output( "\n" ); output( "%s %s:", obj_dir_path( make, "check" ), obj_dir_path( make, "test" )); - if (!make->disabled[arch] && parent && !parent->disabled[arch]) - output_filenames_obj_dir( make, make->ok_files ); + output_filenames_obj_dir( make, make->ok_files ); output( "\n" ); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "check" )); strarray_add_uniq( &make->phony_targets, obj_dir_path( make, "test" ));

1 0

Ziqing Hui : mf/tests: Test output data for WMV decoder DMO.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 13a65b849e07a7f66cc122efa6a8c9aed4a56dc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/13a65b849e07a7f66cc122efa6a8c9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Feb 2 11:13:46 2023 +0800 mf/tests: Test output data for WMV decoder DMO. --- dlls/mf/tests/transform.c | 66 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 72440051192..7d217dfe8c0 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1617,6 +1617,50 @@ static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *su } } +#define check_dmo_output_data_buffer(a, b, c) check_dmo_output_data_buffer_(__LINE__, a, b, c) +static DWORD check_dmo_output_data_buffer_(int line, DMO_OUTPUT_DATA_BUFFER *output_data_buffer, + const struct sample_desc *sample_desc, const WCHAR *expect_data_filename) +{ + const struct buffer_desc *buffer_desc = &sample_desc->buffers[0]; + DWORD diff, data_length, buffer_length, expect_length; + BYTE *data, *buffer; + HRESULT hr; + + if (output_data_buffer->dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME) + ok_(__FILE__, line)(output_data_buffer->rtTimestamp == sample_desc->sample_time, + "Unexpected time %I64d, expected %I64d.\n", + output_data_buffer->rtTimestamp, sample_desc->sample_time); + if (output_data_buffer->dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH) + ok_(__FILE__, line)(output_data_buffer->rtTimelength == sample_desc->sample_duration, + "Unexpected duration %I64d, expected %I64d.\n", + output_data_buffer->rtTimelength, sample_desc->sample_duration); + + load_resource(expect_data_filename, (const BYTE **)&data, &data_length); + + expect_length = buffer_desc->length; + if (expect_length == -1) + { + expect_length = *(DWORD *)data; + data += sizeof(DWORD); + data_length = data_length - sizeof(DWORD); + } + + hr = IMediaBuffer_GetBufferAndLength(output_data_buffer->pBuffer, &buffer, &buffer_length); + ok(hr == S_OK, "GetBufferAndLength returned %#lx.\n", hr); + ok_(__FILE__, line)(buffer_length == expect_length, "Unexpected length %#lx, expected %#lx\n", buffer_length, expect_length); + + diff = 0; + if (data_length < buffer_length) + ok_(__FILE__, line)(0, "Missing %#lx bytes\n", buffer_length - data_length); + else if (!buffer_desc->compare) + diff = compare_bytes(buffer, &buffer_length, NULL, data); + else + diff = buffer_desc->compare(buffer, &buffer_length, &buffer_desc->rect, data); + + return diff; +} + + static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -5170,7 +5214,17 @@ static void test_wmv_decoder_media_object(void) }; const DWORD data_width = 96, data_height = 96; const POINT test_size[] = {{16, 16}, {96, 96}, {320, 240}}; - DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status; + const struct buffer_desc output_buffer_desc_nv12 = + { + .length = data_width * data_height * 3 / 2, + .compare = compare_nv12, .dump = dump_nv12, .rect = {.right = 82, .bottom = 84}, + }; + const struct sample_desc output_sample_desc_nv12 = + { + .sample_time = 0, .sample_duration = 333333, + .buffer_count = 1, .buffers = &output_buffer_desc_nv12, + }; + DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status, expected_status, diff; struct media_buffer *input_media_buffer = NULL, *output_media_buffer = NULL; DMO_OUTPUT_DATA_BUFFER output_data_buffer; DMO_MEDIA_TYPE media_type, *type; @@ -5315,7 +5369,7 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_SetOutputType(media_object, 0, type, 0); ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); - hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 333333); todo_wine ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); @@ -5331,6 +5385,14 @@ static void test_wmv_decoder_media_object(void) hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); todo_wine ok(hr == S_OK, "ProcessOutput returned %#lx.\n", hr); + expected_status = DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT | DMO_OUTPUT_DATA_BUFFERF_TIME | DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH; + todo_wine + ok(output_data_buffer.dwStatus == expected_status, "Got unexpected dwStatus %#lx.\n", output_data_buffer.dwStatus); + if (hr == S_OK) + { + diff = check_dmo_output_data_buffer(&output_data_buffer, &output_sample_desc_nv12, L"nv12frame.bmp"); + ok(diff == 0, "Got %lu%% diff.\n", diff); + } ret = IMediaBuffer_Release(&output_media_buffer->IMediaBuffer_iface); ok(ret == 0, "Release returned %lu\n", ret);

1 0

Paul Gofman : win32u: Expose and use ProcessEvents from drivers instead of MsgWaitForMultipleObjectsEx.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: a97fd9f29e7dbeee2dc06415a34a9f7669ea2e0d URL: https://gitlab.winehq.org/wine/wine/-/commit/a97fd9f29e7dbeee2dc06415a34a9f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Feb 21 14:43:39 2023 -0600 win32u: Expose and use ProcessEvents from drivers instead of MsgWaitForMultipleObjectsEx. --- dlls/win32u/dce.c | 3 +-- dlls/win32u/driver.c | 12 ++++-------- dlls/win32u/input.c | 3 +-- dlls/win32u/message.c | 20 +++++++++++++------- dlls/wineandroid.drv/android.h | 4 +--- dlls/wineandroid.drv/init.c | 2 +- dlls/wineandroid.drv/window.c | 11 ++++------- dlls/winemac.drv/event.c | 27 +++++---------------------- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 4 +--- dlls/winex11.drv/event.c | 25 ++++--------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 4 +--- include/wine/gdi_driver.h | 2 +- 14 files changed, 39 insertions(+), 82 deletions(-)

1 0

Ziqing Hui : mf/tests: Test ProcessInput and ProcessOutput for WMV decoder DMO.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 9d1b927924062a8485928d0d53709b6af292d637 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1b927924062a8485928d0d53709b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jan 30 09:46:07 2023 +0800 mf/tests: Test ProcessInput and ProcessOutput for WMV decoder DMO. --- dlls/mf/tests/transform.c | 136 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 134 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 7ce68728574..72440051192 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -55,6 +55,97 @@ DEFINE_GUID(MFVideoFormat_WMV_Unknown,0x7ce12ca9,0xbfbf,0x43d9,0x9d,0x00,0x82,0x DEFINE_GUID(mft_output_sample_incomplete,0xffffff,0xffff,0xffff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff); +struct media_buffer +{ + IMediaBuffer IMediaBuffer_iface; + LONG refcount; + DWORD length; + DWORD max_length; + BYTE data[]; +}; + +static inline struct media_buffer *impl_from_IMediaBuffer(IMediaBuffer *iface) +{ + return CONTAINING_RECORD(iface, struct media_buffer, IMediaBuffer_iface); +} + +static HRESULT WINAPI media_buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, void **obj) +{ + if (IsEqualIID(iid, &IID_IMediaBuffer) + || IsEqualIID(iid, &IID_IUnknown)) + { + *obj = iface; + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI media_buffer_AddRef(IMediaBuffer *iface) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); +} + +static ULONG WINAPI media_buffer_Release(IMediaBuffer *iface) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + ULONG ref = InterlockedDecrement(&buffer->refcount); + if (!ref) + free(buffer); + return ref; +} + +static HRESULT WINAPI media_buffer_SetLength(IMediaBuffer *iface, DWORD length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (length > buffer->max_length) + return E_INVALIDARG; + buffer->length = length; + return S_OK; +} + +static HRESULT WINAPI media_buffer_GetMaxLength(IMediaBuffer *iface, DWORD *max_length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (!max_length) + return E_POINTER; + *max_length = buffer->max_length; + return S_OK; +} + +static HRESULT WINAPI media_buffer_GetBufferAndLength(IMediaBuffer *iface, BYTE **data, DWORD *length) +{ + struct media_buffer *buffer = impl_from_IMediaBuffer(iface); + if (!data || ! length) + return E_POINTER; + *data = buffer->data; + *length = buffer->length; + return S_OK; +} + +static IMediaBufferVtbl media_buffer_vtbl = { + media_buffer_QueryInterface, + media_buffer_AddRef, + media_buffer_Release, + media_buffer_SetLength, + media_buffer_GetMaxLength, + media_buffer_GetBufferAndLength, +}; + +HRESULT media_buffer_create(DWORD max_length, struct media_buffer **ret) +{ + struct media_buffer *buffer; + + if (!(buffer = calloc(1, offsetof(struct media_buffer, data[max_length])))) + return E_OUTOFMEMORY; + buffer->IMediaBuffer_iface.lpVtbl = &media_buffer_vtbl; + buffer->refcount = 1; + buffer->length = 0; + buffer->max_length = max_length; + *ret = buffer; + return S_OK; +} + static BOOL is_compressed_subtype(const GUID *subtype) { if (IsEqualGUID(subtype, &MEDIASUBTYPE_WMV1) @@ -1526,7 +1617,6 @@ static void check_dmo_set_output_type(IMediaObject *media_object, const GUID *su } } - static HRESULT WINAPI test_unk_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -5078,10 +5168,14 @@ static void test_wmv_decoder_media_object(void) {MFMediaType_Video, MEDIASUBTYPE_RGB555, TRUE, FALSE, 512, FORMAT_VideoInfo, NULL, 88, (BYTE *)&expected_output_info[11]}, {MFMediaType_Video, MEDIASUBTYPE_RGB8, TRUE, FALSE, 256, FORMAT_VideoInfo, NULL, 1112, (BYTE *)&expected_output_info[12]}, }; + const DWORD data_width = 96, data_height = 96; const POINT test_size[] = {{16, 16}, {96, 96}, {320, 240}}; - DWORD in_count, out_count, size, expected_size, alignment; + DWORD in_count, out_count, size, expected_size, alignment, wmv_data_length, status; + struct media_buffer *input_media_buffer = NULL, *output_media_buffer = NULL; + DMO_OUTPUT_DATA_BUFFER output_data_buffer; DMO_MEDIA_TYPE media_type, *type; IMediaObject *media_object; + const BYTE *wmv_data; char buffer[1024]; ULONG ret, i, j; HRESULT hr; @@ -5205,6 +5299,44 @@ static void test_wmv_decoder_media_object(void) winetest_pop_context(); } + /* Test ProcessInput. */ + load_resource(L"wmvencdata.bin", &wmv_data, &wmv_data_length); + wmv_data_length = *((DWORD *)wmv_data); + wmv_data += sizeof(DWORD); + hr = media_buffer_create(wmv_data_length, &input_media_buffer); + ok(hr == S_OK, "Failed to create input media buffer.\n"); + memcpy(input_media_buffer->data, wmv_data, wmv_data_length); + input_media_buffer->length = wmv_data_length; + + init_dmo_media_type_video(type, &MEDIASUBTYPE_WMV1, data_width, data_height); + hr = IMediaObject_SetInputType(media_object, 0, type, 0); + ok(hr == S_OK, "SetInputType returned %#lx.\n", hr); + init_dmo_media_type_video(type, &MEDIASUBTYPE_NV12, data_width, data_height); + hr = IMediaObject_SetOutputType(media_object, 0, type, 0); + ok(hr == S_OK, "SetOutputType returned %#lx.\n", hr); + + hr = IMediaObject_ProcessInput(media_object, 0, &input_media_buffer->IMediaBuffer_iface, 0, 0, 0); + todo_wine + ok(hr == S_OK, "ProcessInput returned %#lx.\n", hr); + + /* Test ProcessOutput. */ + hr = IMediaObject_GetOutputSizeInfo(media_object, 0, &size, &alignment); + ok(hr == S_OK, "GetOutputSizeInfo returned %#lx.\n", hr); + hr = media_buffer_create(size, &output_media_buffer); + ok(hr == S_OK, "Failed to create output media buffer.\n"); + output_data_buffer.pBuffer = &output_media_buffer->IMediaBuffer_iface; + output_data_buffer.dwStatus = 0xdeadbeef; + output_data_buffer.rtTimestamp = 0xdeadbeef; + output_data_buffer.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(media_object, 0, 1, &output_data_buffer, &status); + todo_wine + ok(hr == S_OK, "ProcessOutput returned %#lx.\n", hr); + + ret = IMediaBuffer_Release(&output_media_buffer->IMediaBuffer_iface); + ok(ret == 0, "Release returned %lu\n", ret); + ret = IMediaBuffer_Release(&input_media_buffer->IMediaBuffer_iface); + ok(ret == 0, "Release returned %lu\n", ret); + ret = IMediaObject_Release(media_object); ok(ret == 0, "Release returned %lu\n", ret); CoUninitialize();

1 0

Ziqing Hui : mf/tests: Add missing \n.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: a5b5cef355568a59dd8633fc6a608d9f68598df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5b5cef355568a59dd8633fc6a608d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Feb 9 17:40:25 2023 +0800 mf/tests: Add missing \n. --- dlls/mf/tests/transform.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index f806485df78..0c9f7548d42 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -1323,11 +1323,11 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = flags[i]; hr = IMediaObject_SetInputType(media_object, 1, NULL, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); hr = IMediaObject_SetInputType(media_object, 1, &bad_media_type, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); hr = IMediaObject_SetInputType(media_object, 1, good_media_type, flag); - ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_INVALIDSTREAMINDEX, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test unaccepted type. */ @@ -1337,10 +1337,10 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub if (!(flag & DMO_SET_TYPEF_CLEAR)) { hr = IMediaObject_SetInputType(media_object, 0, NULL, flag); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } hr = IMediaObject_SetInputType(media_object, 0, &bad_media_type, flag); - ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == DMO_E_TYPE_NOT_ACCEPTED, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test clearing the type. */ @@ -1348,7 +1348,7 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = DMO_SET_TYPEF_CLEAR | flags[i]; hr = IMediaObject_SetInputType(media_object, 0, NULL, flag); - ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test accepted type. */ @@ -1356,7 +1356,7 @@ static void check_dmo_set_input_type(IMediaObject *media_object, const GUID *sub { flag = flags[i]; hr = IMediaObject_SetInputType(media_object, 0, good_media_type, flag); - ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.", hr, flag); + ok(hr == S_OK, "SetInputType returned %#lx for flag %#lx.\n", hr, flag); } /* Test unconsidered header member.*/

1 0

Ziqing Hui : mf/tests: Correctly initialize DMO media type.
by Alexandre Julliard Feb. 22, 2023

Feb. 22, 2023

Module: wine Branch: master Commit: 41288d0d701f7933538c3e20055f0e6b23935a59 URL: https://gitlab.winehq.org/wine/wine/-/commit/41288d0d701f7933538c3e20055f0e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Feb 22 11:13:29 2023 +0800 mf/tests: Correctly initialize DMO media type. --- dlls/mf/tests/transform.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 0c9f7548d42..7ce68728574 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -327,11 +327,14 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, { VIDEOINFOHEADER *header = (VIDEOINFOHEADER *)(media_type + 1); BOOL compressed = is_compressed_subtype(subtype); + ULONG codec_data_size = compressed ? 4 : 0; + + memset(media_type, 0, sizeof(*media_type) + sizeof(*header) + codec_data_size); - memset(header, 0, sizeof(*header)); header->bmiHeader.biSize = sizeof(header->bmiHeader); header->bmiHeader.biWidth = width; header->bmiHeader.biHeight = height; + header->bmiHeader.biPlanes = 1; header->bmiHeader.biBitCount = subtype_to_bpp(subtype); header->bmiHeader.biCompression = subtype_to_compression(subtype); @@ -342,7 +345,7 @@ static void init_dmo_media_type_video(DMO_MEDIA_TYPE *media_type, media_type->lSampleSize = 0; media_type->formattype = FORMAT_VideoInfo; media_type->pUnk = NULL; - media_type->cbFormat = sizeof(*header) + 4; /* 4 bytes codec data. */ + media_type->cbFormat = sizeof(*header) + codec_data_size; media_type->pbFormat = (BYTE *)header; }

1 0