April 2021 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Correct the wined3d_device_set_depth_stencil_state() .spec entry.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 0184f1d2422a14eafa015e8c2b6984f897811894 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0184f1d2422a14eafa015e8c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 13:41:34 2021 +0200 wined3d: Correct the wined3d_device_set_depth_stencil_state() .spec entry. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3d10509c389..1ea837cc59a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -104,7 +104,7 @@ @ cdecl wined3d_device_set_cs_uav(ptr long ptr long) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) -@ cdecl wined3d_device_set_depth_stencil_state(ptr ptr) +@ cdecl wined3d_device_set_depth_stencil_state(ptr ptr long) @ cdecl wined3d_device_set_depth_stencil_view(ptr ptr) @ cdecl wined3d_device_set_dialog_box_mode(ptr long) @ cdecl wined3d_device_set_domain_shader(ptr ptr)

1 0

Henri Verbeet : ntdll: Clear ret->Buffer on failure in get_env_var() (Valgrind).
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: b9070e115369118a8655f6e6c306ff51af31a242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9070e115369118a8655f6e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 26 13:41:35 2021 +0200 ntdll: Clear ret->Buffer on failure in get_env_var() (Valgrind). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b76a8137a1b..ee453700e51 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2616,7 +2616,11 @@ static NTSTATUS get_env_var( const WCHAR *name, SIZE_T extra, UNICODE_STRING *re return status; } RtlFreeHeap( GetProcessHeap(), 0, ret->Buffer ); - if (status != STATUS_BUFFER_TOO_SMALL) return status; + if (status != STATUS_BUFFER_TOO_SMALL) + { + ret->Buffer = NULL; + return status; + } size = len + 1 + extra; } }

1 0

David Koolhoven : advapi32: Stub QueryTraceA().
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 7d7b8e2a88c58e05fb80d3600a52c473ddee4c5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d7b8e2a88c58e05fb80d360… Author: David Koolhoven <david(a)koolhoven-home.net> Date: Mon Apr 26 14:38:08 2021 -0400 advapi32: Stub QueryTraceA(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50992 Signed-off-by: David Koolhoven <david(a)koolhoven-home.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/eventlog.c | 9 +++++++++ .../api-ms-win-eventing-legacy-l1-1-0.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index d5235c6adb9..1b7a83d347a 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -603,7 +603,7 @@ @ stdcall -import QueryServiceObjectSecurity(long long ptr long ptr) @ stdcall -import QueryServiceStatus(long ptr) @ stdcall -import QueryServiceStatusEx (long long ptr long ptr) -# @ stub QueryTraceA +@ stdcall QueryTraceA(int64 str ptr) @ stdcall QueryTraceW(int64 wstr ptr) # @ stub QueryUserServiceName # @ stub QueryUsersOnEncryptedFile diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c index c01955e22d5..22e5a3f9d59 100644 --- a/dlls/advapi32/eventlog.c +++ b/dlls/advapi32/eventlog.c @@ -673,6 +673,15 @@ ULONG WINAPI StopTraceA( TRACEHANDLE session, LPCSTR session_name, PEVENT_TRACE_ return ERROR_SUCCESS; } +/****************************************************************************** + * QueryTraceA [ADVAPI32.@] + */ +ULONG WINAPI QueryTraceA( TRACEHANDLE handle, LPCSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) +{ + FIXME("%s %s %p: stub\n", wine_dbgstr_longlong(handle), debugstr_a(sessionname), properties); + return ERROR_WMI_INSTANCE_NOT_FOUND; +} + /****************************************************************************** * QueryTraceW [ADVAPI32.@] */ diff --git a/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec b/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec index 8e1aa7fc8e7..cd12ac02ca8 100644 --- a/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec +++ b/dlls/api-ms-win-eventing-legacy-l1-1-0/api-ms-win-eventing-legacy-l1-1-0.spec @@ -6,7 +6,7 @@ @ stdcall FlushTraceW(int64 wstr ptr) advapi32.FlushTraceW @ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA -@ stub QueryTraceA +@ stdcall QueryTraceA(int64 str ptr) advapi32.QueryTraceA @ stdcall QueryTraceW(int64 wstr ptr) advapi32.QueryTraceW @ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA @ stdcall StopTraceA(int64 str ptr) advapi32.StopTraceA

1 0

Alexandre Julliard : winecfg: Get the builtins list from the architecture-specific PE directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: b51aab9199221d0b4c2c58c7f4a483180f749721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51aab9199221d0b4c2c58c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:14:20 2021 +0200 winecfg: Get the builtins list from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/libraries.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index ae66509c9d0..0c5fcc65ced 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -43,6 +43,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(winecfg); +#ifdef __i386__ +static const char pe_dir[] = "\\i386-windows"; +#elif defined __x86_64__ +static const char pe_dir[] = "\\x86_64-windows"; +#elif defined __arm__ +static const char pe_dir[] = "\\arm-windows"; +#elif defined __aarch64__ +static const char pe_dir[] = "\\aarch64-windows"; +#else +static const char pe_dir[] = ""; +#endif + /* dlls that shouldn't be configured anything other than builtin; list must be sorted*/ static const char * const builtin_only[] = { @@ -332,6 +344,8 @@ static void load_library_list( HWND dialog ) sprintf( var, "WINEDLLDIR%u", i++ ); if (!GetEnvironmentVariableA( var, path, MAX_PATH )) break; load_library_list_from_dir( dialog, path, FALSE ); + strcat( path, pe_dir ); + load_library_list_from_dir( dialog, path, FALSE ); } /* get rid of duplicate entries */

1 0

Alexandre Julliard : setupapi: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 717e394af31407e04459c25f589c5105dd126566 URL: https://source.winehq.org/git/wine.git/?a=commit;h=717e394af31407e04459c25f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:41:32 2021 +0200 setupapi: Support loading builtins from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 7fcc4a6fe89..68d0bd0bc69 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -40,6 +40,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi); +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +static const char current_arch[] = "x86"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +static const char current_arch[] = "amd64"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +static const char current_arch[] = "arm"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +static const char current_arch[] = "arm64"; +#else +static const WCHAR pe_dir[] = L""; +static const char current_arch[] = "none"; +#endif + static const char builtin_signature[] = "Wine builtin DLL"; static const char fakedll_signature[] = "Wine placeholder DLL"; @@ -414,7 +431,7 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) len = lstrlenW( name ); if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + len + 1; while ((path = enum_load_path( i++ ))) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += ARRAY_SIZE(L"\\fakedlls") + len + ARRAY_SIZE(L".fake"); + maxlen += ARRAY_SIZE(pe_dir) + len + ARRAY_SIZE(L".fake"); if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return NULL; @@ -452,6 +469,9 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) file[pos + len + 1] = 0; for (i = 0; (path = enum_load_path( i )); i++) { + ptr = prepend( file + pos, pe_dir, lstrlenW(pe_dir) ); + ptr = prepend( ptr, path, lstrlenW(path) ); + if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, path, lstrlenW(path) ); if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, L"\\fakedlls", 9 ); @@ -709,17 +729,6 @@ struct dll_data static BOOL CALLBACK register_manifest( HMODULE module, const WCHAR *type, WCHAR *res_name, LONG_PTR arg ) { -#ifdef __i386__ - static const char current_arch[] = "x86"; -#elif defined __x86_64__ - static const char current_arch[] = "amd64"; -#elif defined __arm__ - static const char current_arch[] = "arm"; -#elif defined __aarch64__ - static const char current_arch[] = "arm64"; -#else - static const char current_arch[] = "none"; -#endif const struct dll_data *dll_data = (const struct dll_data*)arg; WCHAR *dest = NULL; DWORD dest_len = 0; @@ -1007,7 +1016,7 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B if (build_dir) maxlen = lstrlenW(build_dir) + ARRAY_SIZE(L"\\programs") + 1; for (i = 0; (path = enum_load_path(i)); i++) maxlen = max( maxlen, lstrlenW(path) ); - maxlen += 2 * max_dll_name_len + 2 + 10; /* ".dll.fake" */ + maxlen += 2 * max_dll_name_len + 2 + ARRAY_SIZE(pe_dir) + 10; /* ".dll.fake" */ if (!(file = HeapAlloc( GetProcessHeap(), 0, maxlen * sizeof(WCHAR) ))) return FALSE; if (!(dest = HeapAlloc( GetProcessHeap(), 0, (lstrlenW(dirname) + max_dll_name_len) * sizeof(WCHAR) ))) @@ -1029,6 +1038,8 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B } for (i = 0; (path = enum_load_path( i )); i++) { + swprintf( file, maxlen, L"%s%s", path, pe_dir ); + install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path );

1 0

Alexandre Julliard : ntdll: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: f93713b157411efabfa6ceabf137364b249106f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f93713b157411efabfa6ceab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:43:10 2021 +0200 ntdll: Support loading builtins from the architecture-specific PE directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 ++++++++++++++++++++- dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 38dd276608b..85ae6aac15f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -51,6 +51,18 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); #define DEFAULT_SECURITY_COOKIE_32 0xbb40e64e #define DEFAULT_SECURITY_COOKIE_16 (DEFAULT_SECURITY_COOKIE_32 >> 16) +#ifdef __i386__ +static const WCHAR pe_dir[] = L"\\i386-windows"; +#elif defined __x86_64__ +static const WCHAR pe_dir[] = L"\\x86_64-windows"; +#elif defined __arm__ +static const WCHAR pe_dir[] = L"\\arm-windows"; +#elif defined __aarch64__ +static const WCHAR pe_dir[] = L"\\aarch64-windows"; +#else +static const WCHAR pe_dir[] = L""; +#endif + /* we don't want to include winuser.h */ #define RT_MANIFEST ((ULONG_PTR)24) #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) @@ -2640,11 +2652,18 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne if (status != STATUS_DLL_NOT_FOUND) goto done; RtlFreeUnicodeString( new_name ); } + for (i = 0; ; i++) { swprintf( dllpath, ARRAY_SIZE(dllpath), L"WINEDLLDIR%u", i ); - if (get_env_var( dllpath, 20 + wcslen(name), new_name )) break; + if (get_env_var( dllpath, wcslen(pe_dir) + wcslen(name) + 1, new_name )) break; len = new_name->Length; + RtlAppendUnicodeToString( new_name, pe_dir ); + RtlAppendUnicodeToString( new_name, L"\\" ); + RtlAppendUnicodeToString( new_name, name ); + status = open_dll_file( new_name, pwm, mapping, image_info, id ); + if (status != STATUS_DLL_NOT_FOUND) goto done; + new_name->Length = len; RtlAppendUnicodeToString( new_name, L"\\" ); RtlAppendUnicodeToString( new_name, name ); status = open_dll_file( new_name, pwm, mapping, image_info, id ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9947ff2f447..30e1f972ae1 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -237,10 +237,27 @@ static char *build_path( const char *dir, const char *name ) memcpy( ret, dir, len ); if (len && ret[len - 1] != '/') ret[len++] = '/'; + if (name[0] == '/') name++; strcpy( ret + len, name ); return ret; } + +static const char *get_pe_dir( WORD machine ) +{ + if (!machine) machine = current_machine; + + switch(machine) + { + case IMAGE_FILE_MACHINE_I386: return "/i386-windows"; + case IMAGE_FILE_MACHINE_AMD64: return "/x86_64-windows"; + case IMAGE_FILE_MACHINE_ARMNT: return "/arm-windows"; + case IMAGE_FILE_MACHINE_ARM64: return "/aarch64-windows"; + default: return ""; + } +} + + static void set_dll_path(void) { char *p, *path = getenv( "WINEDLLPATH" ); @@ -1257,6 +1274,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T unsigned int i, pos, namepos, namelen, maxlen = 0; unsigned int len = nt_name->Length / sizeof(WCHAR); char *ptr = NULL, *file, *ext = NULL; + const char *pe_dir = get_pe_dir( machine ); OBJECT_ATTRIBUTES attr; NTSTATUS status = STATUS_DLL_NOT_FOUND; BOOL found_image = FALSE; @@ -1268,7 +1286,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T InitializeObjectAttributes( &attr, nt_name, 0, 0, NULL ); if (build_dir) maxlen = strlen(build_dir) + sizeof("/programs/") + len; - maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof(".so"); + maxlen = max( maxlen, dll_path_maxlen + 1 ) + len + sizeof("/aarch64-windows") + sizeof(".so"); if (!(file = malloc( maxlen ))) return STATUS_NO_MEMORY; @@ -1310,8 +1328,16 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T for (i = 0; dll_paths[i]; i++) { + ptr = file + pos; + file[pos + len + 1] = 0; + ptr = prepend( ptr, pe_dir, strlen(pe_dir) ); + ptr = prepend( ptr, dll_paths[i], strlen(dll_paths[i]) ); + status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); + /* use so dir for unix lib */ + ptr = file + pos; file[pos + len + 1] = 0; ptr = prepend( file + pos, dll_paths[i], strlen(dll_paths[i]) ); + if (status != STATUS_DLL_NOT_FOUND) goto done; status = open_builtin_file( ptr, &attr, module, size_ptr, image_info, machine, prefer_native ); if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) found_image = TRUE; else if (status != STATUS_DLL_NOT_FOUND) goto done; @@ -1652,13 +1678,26 @@ static void load_ntdll(void) UNICODE_STRING str; void *module; SIZE_T size = 0; - char *name = build_path( dll_dir, "ntdll.dll.so" ); + char *name; + + if (!build_dir) + { + char *dir = build_path( dll_dir, get_pe_dir(current_machine) ); + name = build_path( dir, "ntdll.dll.so" ); + free( dir ); + } + else name = build_path( build_dir, "dlls/ntdll/ntdll.dll.so" ); init_unicode_string( &str, path ); InitializeObjectAttributes( &attr, &str, 0, 0, NULL ); name[strlen(name) - 3] = 0; /* remove .so */ status = open_builtin_file( name, &attr, &module, &size, &info, current_machine, FALSE ); if (status == STATUS_IMAGE_NOT_AT_BASE) relocate_ntdll( module ); + else if (status == STATUS_DLL_NOT_FOUND) + { + free( name ); + name = build_path( dll_dir, "ntdll.dll.so" ); + } else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module );

1 0

Nikolay Sivov : mf/evr: Add IMFRateSupport stub.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 71f8e0d3284c791cbc1b3e828f43c70693ff6dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=71f8e0d3284c791cbc1b3e82… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:34 2021 +0300 mf/evr: Add IMFRateSupport stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/tests/mf.c | 3 +++ 2 files changed, 70 insertions(+) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index baa6665853e..2a529895237 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -80,6 +80,7 @@ struct video_renderer IMediaEventSink IMediaEventSink_iface; IMFAttributes IMFAttributes_iface; IMFQualityAdvise IMFQualityAdvise_iface; + IMFRateSupport IMFRateSupport_iface; LONG refcount; IMFMediaEventQueue *event_queue; @@ -150,6 +151,11 @@ static struct video_renderer *impl_from_IMFQualityAdvise(IMFQualityAdvise *iface return CONTAINING_RECORD(iface, struct video_renderer, IMFQualityAdvise_iface); } +static struct video_renderer *impl_from_IMFRateSupport(IMFRateSupport *iface) +{ + return CONTAINING_RECORD(iface, struct video_renderer, IMFRateSupport_iface); +} + static struct video_stream *impl_from_IMFStreamSink(IMFStreamSink *iface) { return CONTAINING_RECORD(iface, struct video_stream, IMFStreamSink_iface); @@ -1087,6 +1093,10 @@ static HRESULT WINAPI video_renderer_sink_QueryInterface(IMFMediaSink *iface, RE { *obj = &renderer->IMFQualityAdvise_iface; } + else if (IsEqualIID(riid, &IID_IMFRateSupport)) + { + *obj = &renderer->IMFRateSupport_iface; + } else { WARN("Unsupported interface %s.\n", debugstr_guid(riid)); @@ -2028,6 +2038,10 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface if (renderer->device_manager) hr = IUnknown_QueryInterface(renderer->device_manager, riid, obj); } + else if (IsEqualGUID(service, &MF_RATE_CONTROL_SERVICE) && IsEqualIID(riid, &IID_IMFRateSupport)) + { + hr = IMFVideoRenderer_QueryInterface(&renderer->IMFVideoRenderer_iface, riid, obj); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service)); @@ -2642,6 +2656,58 @@ static const IMFQualityAdviseVtbl video_renderer_quality_advise_vtbl = video_renderer_quality_advise_DropTime, }; +static HRESULT WINAPI video_renderer_rate_support_QueryInterface(IMFRateSupport *iface, REFIID riid, void **out) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_QueryInterface(&renderer->IMFMediaSink_iface, riid, out); +} + +static ULONG WINAPI video_renderer_rate_support_AddRef(IMFRateSupport *iface) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_AddRef(&renderer->IMFMediaSink_iface); +} + +static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *iface) +{ + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); + return IMFMediaSink_Release(&renderer->IMFMediaSink_iface); +} + +static HRESULT WINAPI video_renderer_rate_support_GetSlowestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_rate_support_GetFastestRate(IMFRateSupport *iface, MFRATE_DIRECTION direction, + BOOL thin, float *rate) +{ + FIXME("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_supported_rate) +{ + FIXME("%p, %d, %f, %p.\n", iface, thin, rate, nearest_supported_rate); + + return E_NOTIMPL; +} + +static const IMFRateSupportVtbl video_renderer_rate_support_vtbl = +{ + video_renderer_rate_support_QueryInterface, + video_renderer_rate_support_AddRef, + video_renderer_rate_support_Release, + video_renderer_rate_support_GetSlowestRate, + video_renderer_rate_support_GetFastestRate, + video_renderer_rate_support_IsRateSupported, +}; + static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) { struct video_renderer *object; @@ -2664,6 +2730,7 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, object->IMediaEventSink_iface.lpVtbl = &media_event_sink_vtbl; object->IMFAttributes_iface.lpVtbl = &video_renderer_attributes_vtbl; object->IMFQualityAdvise_iface.lpVtbl = &video_renderer_quality_advise_vtbl; + object->IMFRateSupport_iface.lpVtbl = &video_renderer_rate_support_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 39b9d64e729..89da5d0ab64 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4263,6 +4263,8 @@ static void test_evr(void) check_interface(sink, &IID_IMFClockStateSink, TRUE); check_interface(sink, &IID_IMFGetService, TRUE); check_interface(sink, &IID_IMFQualityAdvise, TRUE); + check_interface(sink, &IID_IMFRateSupport, TRUE); + check_interface(sink, &IID_IMFRateControl, FALSE); 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); @@ -4270,6 +4272,7 @@ static void test_evr(void) check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE); check_service_interface(sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + check_service_interface(sink, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control);

1 0

Nikolay Sivov : mf/evr: Handle mixer sample requests during sink state transitions.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 2a6f0a4093a5465f87615bdbf313e9d82c627d53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6f0a4093a5465f87615bdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:33 2021 +0300 mf/evr: Handle mixer sample requests during sink state transitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 8b4a9c03b5f..baa6665853e 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -47,6 +47,7 @@ enum video_stream_flags { EVR_STREAM_PREROLLING = 0x1, EVR_STREAM_PREROLLED = 0x2, + EVR_STREAM_SAMPLE_NEEDED = 0x4, }; struct video_renderer; @@ -1825,13 +1826,19 @@ static ULONG WINAPI video_renderer_clock_sink_Release(IMFClockStateSink *iface) static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink *iface, MFTIME systime, LONGLONG offset) { struct video_renderer *renderer = impl_from_IMFClockStateSink(iface); + unsigned int state, request_sample; size_t i; TRACE("%p, %s, %s.\n", iface, debugstr_time(systime), debugstr_time(offset)); EnterCriticalSection(&renderer->cs); - if (renderer->state == EVR_STATE_STOPPED) + state = renderer->state; + + /* Update sink state before sending sample requests, to avoid potentially receiving new sample in stopped state */ + renderer->state = EVR_STATE_RUNNING; + + if (state == EVR_STATE_STOPPED) { IMFTransform_ProcessMessage(renderer->mixer, MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0); IMFVideoPresenter_ProcessMessage(renderer->presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); @@ -1840,19 +1847,19 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStart(IMFClockStateSink * { struct video_stream *stream = renderer->streams[i]; - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); - EnterCriticalSection(&stream->cs); - if (!(stream->flags & EVR_STREAM_PREROLLED)) - IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, - &GUID_NULL, S_OK, NULL); + request_sample = !(stream->flags & EVR_STREAM_PREROLLED) || (stream->flags & EVR_STREAM_SAMPLE_NEEDED); stream->flags |= EVR_STREAM_PREROLLED; + stream->flags &= ~EVR_STREAM_SAMPLE_NEEDED; LeaveCriticalSection(&stream->cs); + + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStarted, &GUID_NULL, S_OK, NULL); + if (request_sample) + IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); } } - renderer->state = EVR_STATE_RUNNING; - IMFVideoPresenter_OnClockStart(renderer->presenter, systime, offset); LeaveCriticalSection(&renderer->cs); @@ -1886,7 +1893,7 @@ static HRESULT WINAPI video_renderer_clock_sink_OnClockStop(IMFClockStateSink *i IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, MEStreamSinkStopped, &GUID_NULL, S_OK, NULL); EnterCriticalSection(&stream->cs); - stream->flags &= ~EVR_STREAM_PREROLLED; + stream->flags &= ~(EVR_STREAM_PREROLLED | EVR_STREAM_SAMPLE_NEEDED); LeaveCriticalSection(&stream->cs); } renderer->state = EVR_STATE_STOPPED; @@ -2184,11 +2191,17 @@ static HRESULT WINAPI video_renderer_event_sink_Notify(IMediaEventSink *iface, L idx = param1; if (idx >= renderer->stream_count) hr = MF_E_INVALIDSTREAMNUMBER; - else + else if (renderer->state == EVR_STATE_RUNNING) { hr = IMFMediaEventQueue_QueueEventParamVar(renderer->streams[idx]->event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); } + else + { + /* Mixer asks for more input right after preroll too, before renderer finished running state transition. + Mark such streams here, and issue requests later in OnClockStart(). */ + renderer->streams[idx]->flags |= EVR_STREAM_SAMPLE_NEEDED; + } } else if (event == EC_DISPLAY_CHANGED) {

1 0

Nikolay Sivov : mf/evr: Return current device manager as a service.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: b0118c7c7dfcc7cff87b418199f4fd1c75fa5d2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0118c7c7dfcc7cff87b4181… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:32 2021 +0300 mf/evr: Return current device manager as a service. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 39 +++++++++++++++++++++++++++++++-------- dlls/mf/tests/mf.c | 4 ++++ 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 79e2f57f9c5..8b4a9c03b5f 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -591,19 +591,14 @@ static ULONG WINAPI video_stream_get_service_Release(IMFGetService *iface) return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +static HRESULT WINAPI video_stream_get_service(struct video_stream *stream, REFGUID service, REFIID riid, void **obj) { - struct video_stream *stream = impl_from_stream_IMFGetService(iface); HRESULT hr = S_OK; - TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); - if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE)) { if (IsEqualIID(riid, &IID_IMFVideoSampleAllocator)) { - EnterCriticalSection(&stream->cs); - if (!stream->allocator) { hr = MFCreateVideoSampleAllocator(&IID_IMFVideoSampleAllocator, (void **)&stream->allocator); @@ -613,10 +608,12 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, if (SUCCEEDED(hr)) hr = IMFVideoSampleAllocator_QueryInterface(stream->allocator, riid, obj); - LeaveCriticalSection(&stream->cs); - return hr; } + else if (IsEqualIID(riid, &IID_IDirect3DDeviceManager9) && stream->parent->device_manager) + { + return IUnknown_QueryInterface(stream->parent->device_manager, riid, obj); + } return E_NOINTERFACE; } @@ -626,6 +623,23 @@ static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, return E_NOTIMPL; } +static HRESULT WINAPI video_stream_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + struct video_stream *stream = impl_from_stream_IMFGetService(iface); + HRESULT hr; + + TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + EnterCriticalSection(&stream->cs); + if (!stream->parent) + hr = MF_E_STREAMSINK_REMOVED; + else + hr = video_stream_get_service(stream, service, riid, obj); + LeaveCriticalSection(&stream->cs); + + return hr; +} + static const IMFGetServiceVtbl video_stream_get_service_vtbl = { video_stream_get_service_QueryInterface, @@ -1992,6 +2006,8 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface TRACE("%p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + EnterCriticalSection(&renderer->cs); + if (IsEqualGUID(service, &MR_VIDEO_MIXER_SERVICE)) { hr = IMFTransform_QueryInterface(renderer->mixer, &IID_IMFGetService, (void **)&gs); @@ -2000,11 +2016,18 @@ static HRESULT WINAPI video_renderer_get_service_GetService(IMFGetService *iface { hr = IMFVideoPresenter_QueryInterface(renderer->presenter, &IID_IMFGetService, (void **)&gs); } + else if (IsEqualGUID(service, &MR_VIDEO_ACCELERATION_SERVICE) && IsEqualIID(riid, &IID_IDirect3DDeviceManager9)) + { + if (renderer->device_manager) + hr = IUnknown_QueryInterface(renderer->device_manager, riid, obj); + } else { FIXME("Unsupported service %s.\n", debugstr_guid(service)); } + LeaveCriticalSection(&renderer->cs); + if (gs) { hr = IMFGetService_GetService(gs, service, riid, obj); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b990b4614da..39b9d64e729 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4269,6 +4269,7 @@ static void test_evr(void) 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); + check_service_interface(sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); hr = MFGetService((IUnknown *)sink, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, (void **)&display_control); @@ -4415,6 +4416,9 @@ static void test_evr(void) IMFMediaTypeHandler_Release(type_handler); /* Stream uses an allocator. */ + check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, TRUE); + check_service_interface(stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE); + hr = MFGetService((IUnknown *)stream_sink, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IMFVideoSampleAllocator, (void **)&allocator); ok(hr == S_OK, "Unexpected hr %#x.\n", hr);

1 0

Esme Povirk : kernelbase: Always remove trailing spaces in PathRemoveBlanks.
by Alexandre Julliard April 26, 2021

April 26, 2021

Module: wine Branch: master Commit: 404cd8a92bd99332a7ef8ec96edbf5aeea8cab76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=404cd8a92bd99332a7ef8ec9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Apr 24 14:12:59 2021 -0500 kernelbase: Always remove trailing spaces in PathRemoveBlanks. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 12 +++++++----- dlls/shlwapi/tests/path.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index f0c79bcc94c..14e892bcc42 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1902,14 +1902,14 @@ BOOL WINAPI PathIsUNCServerW(const WCHAR *path) void WINAPI PathRemoveBlanksA(char *path) { - char *start; + char *start, *first; TRACE("%s\n", wine_dbgstr_a(path)); if (!path || !*path) return; - start = path; + start = first = path; while (*path == ' ') path = CharNextA(path); @@ -1917,7 +1917,7 @@ void WINAPI PathRemoveBlanksA(char *path) while (*path) *start++ = *path++; - if (start != path) + if (start != first) while (start[-1] == ' ') start--; @@ -1926,20 +1926,22 @@ void WINAPI PathRemoveBlanksA(char *path) void WINAPI PathRemoveBlanksW(WCHAR *path) { - WCHAR *start = path; + WCHAR *start, *first; TRACE("%s\n", wine_dbgstr_w(path)); if (!path || !*path) return; + start = first = path; + while (*path == ' ') path++; while (*path) *start++ = *path++; - if (start != path) + if (start != first) while (start[-1] == ' ') start--; diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index c5142b992aa..e9f08a902b0 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -1712,6 +1712,50 @@ static void test_PathUndecorate(void) PathUndecorateW(NULL); } +static void test_PathRemoveBlanks(void) +{ + struct remove_blanks_test { + const char* input; + const char* expected; + }; + struct remove_blanks_test tests[] = { + {"", ""}, + {" ", ""}, + {"test", "test"}, + {" test", "test"}, + {" test", "test"}, + {"test ", "test"}, + {"test ", "test"}, + {" test ", "test"}, + {" test ", "test"}}; + char pathA[MAX_PATH]; + WCHAR pathW[MAX_PATH]; + int i, ret; + const UINT CP_ASCII = 20127; + + PathRemoveBlanksW(NULL); + PathRemoveBlanksA(NULL); + + for (i=0; i < ARRAY_SIZE(tests); i++) + { + strcpy(pathA, tests[i].input); + PathRemoveBlanksA(pathA); + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + + ret = MultiByteToWideChar(CP_ASCII, MB_ERR_INVALID_CHARS, tests[i].input, -1, pathW, MAX_PATH); + ok(ret != 0, "MultiByteToWideChar failed for '%s'\n", tests[i].input); + + PathRemoveBlanksW(pathW); + + ret = WideCharToMultiByte(CP_ASCII, 0, pathW, -1, pathA, MAX_PATH, NULL, NULL); + ok(ret != 0, "WideCharToMultiByte failed for %s from test string '%s'\n", wine_dbgstr_w(pathW), tests[i].input); + + ok(strcmp(pathA, tests[i].expected) == 0, "input string '%s', expected '%s', got '%s'\n", + tests[i].input, tests[i].expected, pathA); + } +} + START_TEST(path) { HMODULE hShlwapi = GetModuleHandleA("shlwapi.dll"); @@ -1759,4 +1803,5 @@ START_TEST(path) test_PathIsRelativeW(); test_PathStripPathA(); test_PathUndecorate(); + test_PathRemoveBlanks(); }

1 0