wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Alexandre Julliard : makefiles: Install PE import libraries in the architecture-specific directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: ee81814f2baa78975ff4ecb1522b0fb74620442b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee81814f2baa78975ff4ecb1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 16:40:00 2021 +0200 makefiles: Install PE import libraries in the architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 56 +++++++++++++------------------------------------------- 1 file changed, 13 insertions(+), 43 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index c54eda772db..a6d525a92e8 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -148,7 +148,6 @@ static struct strarray enable_tests; static struct strarray cmdline_vars; static struct strarray subdirs; static struct strarray disabled_dirs; -static struct strarray cross_import_libs; static struct strarray delay_import_libs; static struct strarray top_install_lib; static struct strarray top_install_dev; @@ -2128,26 +2127,6 @@ static struct makefile *get_parent_makefile( struct makefile *make ) } -/******************************************************************* - * needs_cross_lib - */ -static int needs_cross_lib( const struct makefile *make ) -{ - const char *name; - if (!crosstarget) return 0; - if (make->importlib) name = make->importlib; - else if (make->staticlib) - { - name = replace_extension( make->staticlib, ".a", "" ); - if (!strncmp( name, "lib", 3 )) name += 3; - } - else return 0; - if (strarray_exists( &cross_import_libs, name )) return 1; - if (delay_load_flag && strarray_exists( &delay_import_libs, name )) return 1; - return 0; -} - - /******************************************************************* * needs_delay_lib */ @@ -2683,8 +2662,8 @@ static struct strarray output_importlib_symlinks( const struct makefile *make ) int i, count = 0; ext[count++] = (*dll_ext && !make->implib_objs.count) ? "def" : "a"; + if (crosstarget) ext[count++] = "cross.a"; if (needs_delay_lib( make )) ext[count++] = "delay.a"; - if (needs_cross_lib( make )) ext[count++] = "cross.a"; for (i = 0; i < count; i++) { @@ -3125,10 +3104,8 @@ static void output_source_default( struct makefile *make, struct incl_file *sour find_src_file( make, replace_extension( source->name, ".c", ".spec" ))); int need_cross = (crosstarget && !(source->file->flags & FLAG_C_UNIX) && - (make->is_cross || - ((source->file->flags & FLAG_C_IMPLIB) && - (needs_cross_lib( make ) || needs_delay_lib( make ))) || - (make->staticlib && needs_cross_lib( make )))); + (make->is_cross || (make->module && make->staticlib) || + (source->file->flags & FLAG_C_IMPLIB))); int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || @@ -3449,14 +3426,12 @@ static void output_module( struct makefile *make ) strmake( "lib%s.a", make->importlib ), strmake( "d$(dlldir)/lib%s.a", make->importlib )); } - if (crosstarget && (needs_cross_lib( make ) || needs_delay_lib( make ))) + if (crosstarget) { struct strarray cross_files = strarray_replace_extension( &make->implib_objs, ".o", ".cross.o" ); - if (needs_cross_lib( make )) - { - strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); - output_filename( strmake( "%s.cross.a", importlib_path )); - } + + strarray_add( &make->clean_files, strmake( "lib%s.cross.a", make->importlib )); + output_filename( strmake( "%s.cross.a", importlib_path )); if (needs_delay_lib( make )) { strarray_add( &make->clean_files, strmake( "lib%s.delay.a", make->importlib )); @@ -3472,6 +3447,9 @@ static void output_module( struct makefile *make ) output_filename( spec_file ); output_filenames_obj_dir( make, cross_files ); output( "\n" ); + add_install_rule( make, make->importlib, + strmake( "lib%s.cross.a", make->importlib ), + strmake( "d%s/lib%s.a", pe_dir, make->importlib )); } if (needs_implib_symlink( make )) strarray_addall( &top_makefile->clean_files, output_importlib_symlinks( make )); @@ -3502,7 +3480,7 @@ static void output_static_lib( struct makefile *make ) output( " && %s $@\n", ranlib ); add_install_rule( make, make->staticlib, make->staticlib, strmake( "d$(dlldir)/%s", make->staticlib )); - if (needs_cross_lib( make )) + if (crosstarget && make->module) { char *name = replace_extension( make->staticlib, ".a", ".cross.a" ); @@ -3514,6 +3492,8 @@ static void output_static_lib( struct makefile *make ) tools_path( make, "winebuild" ), crosstarget ); output_filenames_obj_dir( make, make->crossobj_files ); output( "\n" ); + add_install_rule( make, make->staticlib, name, + strmake( "d%s/%s", pe_dir, make->staticlib )); } } @@ -4301,16 +4281,6 @@ static void load_sources( struct makefile *make ) make->is_cross = crosstarget && make->use_msvcrt; - if (make->is_cross) - { - strarray_addall_uniq( &cross_import_libs, make->imports ); - strarray_addall_uniq( &cross_import_libs, make->extra_imports ); - if (make->is_win16) strarray_add_uniq( &cross_import_libs, "kernel" ); - strarray_add_uniq( &cross_import_libs, "winecrt0" ); - strarray_add_uniq( &cross_import_libs, "kernel32" ); - strarray_add_uniq( &cross_import_libs, "ntdll" ); - } - if (!*dll_ext || make->is_cross) for (i = 0; i < make->delayimports.count; i++) strarray_add_uniq( &delay_import_libs, get_base_name( make->delayimports.str[i] ));

1 0

Alexandre Julliard : makefiles: Install PE files in an architecture-specific directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: c59126d403de0f749207a1d5e741274cb92fa64d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c59126d403de0f749207a1d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:45:32 2021 +0200 makefiles: Install PE files in an architecture-specific directory. Based on a patch by Jacek Caban. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.in | 1 + configure | 14 ++++++++++++++ configure.ac | 9 +++++++++ tools/makedep.c | 9 ++++++++- 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index b52495f741f..d9e01a277c0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -32,6 +32,7 @@ nlsdir = ${datadir}/wine/nls dlldir = ${libdir}/wine srcdir = @srcdir@ SHELL = /bin/sh +ARCH = @ARCH@ CC = @CC@ CXX = @CXX@ CPPBIN = @CPPBIN@ diff --git a/configure b/configure index dba0950b490..d22c0cf89cc 100755 --- a/configure +++ b/configure @@ -775,6 +775,7 @@ AR BISON FLEX TOOLSDIR +ARCH TARGETFLAGS LD CPPBIN @@ -5870,6 +5871,19 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +case $host_cpu in + *i[3456789]86*) ARCH="i386" + ;; + *x86_64*) ARCH="x86_64" + ;; + *aarch64*) ARCH="aarch64" + ;; + *arm*) ARCH="arm" + ;; + *) ARCH="" + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the directory containing the Wine tools" >&5 $as_echo_n "checking for the directory containing the Wine tools... " >&6; } if ${wine_cv_toolsdir+:} false; then : diff --git a/configure.ac b/configure.ac index 68366339ea2..c90e78d8bb7 100644 --- a/configure.ac +++ b/configure.ac @@ -238,6 +238,15 @@ then test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib64" fi +dnl Normalize CPU architecture +case $host_cpu in + *i[[3456789]]86*) AC_SUBST(ARCH,"i386") ;; + *x86_64*) AC_SUBST(ARCH,"x86_64") ;; + *aarch64*) AC_SUBST(ARCH,"aarch64") ;; + *arm*) AC_SUBST(ARCH,"arm") ;; + *) AC_SUBST(ARCH,"") ;; +esac + AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, [wine_cv_toolsdir="$with_wine_tools" if test -z "$with_wine_tools"; then diff --git a/tools/makedep.c b/tools/makedep.c index 0eef646479b..c54eda772db 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -158,6 +158,8 @@ static const char *tools_ext; static const char *exe_ext; static const char *dll_ext; static const char *man_ext; +static const char *arch; +static const char *pe_dir; static const char *crosstarget; static const char *crossdebug; static const char *fontforge; @@ -3321,7 +3323,7 @@ static void output_module( struct makefile *make ) } strarray_add( &make->all_targets, strmake( "%s", make->module )); add_install_rule( make, make->module, strmake( "%s", make->module ), - strmake( "c$(dlldir)/%s", make->module )); + strmake( "c%s/%s", pe_dir, make->module )); debug_file = get_debug_file( make, make->module ); output( "%s:", module_path ); } @@ -4434,6 +4436,7 @@ int main( int argc, char *argv[] ) exe_ext = get_expanded_make_variable( top_makefile, "EXEEXT" ); man_ext = get_expanded_make_variable( top_makefile, "api_manext" ); dll_ext = (exe_ext && !strcmp( exe_ext, ".exe" )) ? "" : ".so"; + arch = get_expanded_make_variable( top_makefile, "ARCH" ); crosstarget = get_expanded_make_variable( top_makefile, "CROSSTARGET" ); crossdebug = get_expanded_make_variable( top_makefile, "CROSSDEBUG" ); fontforge = get_expanded_make_variable( top_makefile, "FONTFORGE" ); @@ -4454,6 +4457,10 @@ int main( int argc, char *argv[] ) if (!exe_ext) exe_ext = ""; if (!tools_ext) tools_ext = ""; if (!man_ext) man_ext = "3w"; + if (arch) + pe_dir = strmake( "$(dlldir)/%s-windows", arch ); + else + pe_dir = "$(dlldir)"; top_makefile->src_dir = root_src_dir; subdirs = get_expanded_make_var_array( top_makefile, "SUBDIRS" );

1 0

Alexandre Julliard : dbghelp: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: f14632f345b478e875bf327964eaeca6dbf4cc54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14632f345b478e875bf3279… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 14:33:48 2021 +0200 dbghelp: Support loading builtins from the architecture-specific PE directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/path.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index a2057947a42..b281c19de88 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -31,6 +31,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); +#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 + static inline BOOL is_sepA(char ch) {return ch == '/' || ch == '\\';} static inline BOOL is_sep(WCHAR ch) {return ch == '/' || ch == '\\';} @@ -694,6 +706,7 @@ WCHAR *get_dos_file_name(const WCHAR *filename) BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*match)(void*, HANDLE, const WCHAR*), void *param) { const WCHAR *env; + WCHAR *p, *end; size_t len, i; HANDLE file; WCHAR *buf; @@ -703,7 +716,6 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - WCHAR *p, *end; const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; const WCHAR dot_dllW[] = {'.','d','l','l',0}; @@ -755,8 +767,19 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma WCHAR env_name[64]; swprintf(env_name, ARRAY_SIZE(env_name), L"WINEDLLDIR%u", i); if (!(env = process_getenv(process, env_name))) return FALSE; - len = wcslen(env) + wcslen(name) + 2; + len = wcslen(env) + wcslen(pe_dir) + wcslen(name) + 2; if (!(buf = heap_alloc(len * sizeof(WCHAR)))) return FALSE; + if (!(p = wcsrchr(name, '.')) || lstrcmpW(p, L".so")) + { + swprintf(buf, len, L"%s%s\\%s", env, pe_dir, name); + file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (file != INVALID_HANDLE_VALUE) + { + ret = match(param, file, buf); + CloseHandle(file); + if (ret) goto found; + } + } swprintf(buf, len, L"%s\\%s", env, name); file = CreateFileW(buf, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (file != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : winecfg: Get the builtins list from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

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 26 Apr '21

26 Apr '21

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 : setupapi: Support installing both types of builtins from the same directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 95118c482995c285f4f0e96d343aa89c4dc6f844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95118c482995c285f4f0e96d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 26 12:39:46 2021 +0200 setupapi: Support installing both types of builtins from the same directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 47 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index 852cef3d54f..7fcc4a6fe89 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -190,14 +190,13 @@ static void extract_16bit_image( IMAGE_NT_HEADERS *nt, void **data, SIZE_T *size /* read in the contents of a file into the global file buffer */ /* return 1 on success, 0 on nonexistent file, -1 on other error */ -static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_builtin ) +static int read_file( const WCHAR *name, void **data, SIZE_T *size ) { struct stat st; int fd, ret = -1; size_t header_size; IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - const char *signature = expect_builtin ? builtin_signature : fakedll_signature; const size_t min_size = sizeof(*dos) + 32 + FIELD_OFFSET( IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion ); @@ -220,8 +219,9 @@ static int read_file( const WCHAR *name, void **data, SIZE_T *size, BOOL expect_ if (read( fd, file_buffer, header_size ) != header_size) goto done; dos = file_buffer; if (dos->e_magic != IMAGE_DOS_SIGNATURE) goto done; - if (dos->e_lfanew < strlen(signature) + 1) goto done; - if (memcmp( dos + 1, signature, strlen(signature) + 1 )) goto done; + if (dos->e_lfanew < sizeof(*dos) + 32) goto done; + if (memcmp( dos + 1, builtin_signature, strlen(builtin_signature) + 1 ) && + memcmp( dos + 1, fakedll_signature, strlen(fakedll_signature) + 1 )) goto done; if (dos->e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS,OptionalHeader.MajorLinkerVersion) > header_size) goto done; nt = (IMAGE_NT_HEADERS *)((char *)file_buffer + dos->e_lfanew); @@ -432,9 +432,9 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\dlls", 5 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; /* now as a program */ ptr = file + pos; @@ -444,19 +444,19 @@ static void *load_fake_dll( const WCHAR *name, SIZE_T *size ) ptr = prepend( ptr, ptr, namelen ); ptr = prepend( ptr, L"\\programs", 9 ); ptr = prepend( ptr, build_dir, lstrlenW(build_dir) ); - if ((res = read_file( ptr, &data, size, TRUE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; lstrcpyW( file + pos + len + 1, L".fake" ); - if ((res = read_file( ptr, &data, size, FALSE ))) goto done; + if ((res = read_file( ptr, &data, size ))) goto done; } file[pos + len + 1] = 0; for (i = 0; (path = enum_load_path( i )); i++) { ptr = prepend( file + pos, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, TRUE ))) break; + if ((res = read_file( ptr, &data, size ))) break; ptr = prepend( file + pos, L"\\fakedlls", 9 ); ptr = prepend( ptr, path, lstrlenW(path) ); - if ((res = read_file( ptr, &data, size, FALSE ))) break; + if ((res = read_file( ptr, &data, size ))) break; } done: @@ -881,7 +881,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, } /* copy a fake dll file to the dest directory */ -static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, BOOL expect_builtin, struct list *delay_copy ) +static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL delete, struct list *delay_copy ) { int ret; SIZE_T size; @@ -893,7 +893,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL de SIZE_T len = end - name; if (ext) lstrcpyW( end, ext ); - if (!(ret = read_file( file, &data, &size, expect_builtin ))) + if (!(ret = read_file( file, &data, &size ))) { *end = 0; return 0; @@ -936,8 +936,7 @@ static void delay_copy_files( struct list *delay_copy ) LIST_FOR_EACH_ENTRY_SAFE( copy, next, delay_copy, struct delay_copy, entry ) { list_remove( &copy->entry ); - ret = read_file( copy->src, &data, &size, TRUE ); - if (ret == -1) ret = read_file( copy->src, &data, &size, FALSE ); + ret = read_file( copy->src, &data, &size ); if (ret != 1) { HeapFree( GetProcessHeap(), 0, copy ); @@ -958,7 +957,7 @@ static void delay_copy_files( struct list *delay_copy ) /* find and install all fake dlls in a given lib directory */ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, - const WCHAR *default_ext, BOOL delete, BOOL expect_builtin ) + const WCHAR *default_ext, BOOL delete ) { WCHAR *name; intptr_t handle; @@ -983,14 +982,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *wildcard, lstrcatW( name, data.name ); if (wcschr( data.name, '.' )) /* module possibly already has an extension */ { - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } lstrcatW( name, default_ext ); - if (install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy )) continue; - if (install_fake_dll( dest, file, L".fake", delete, FALSE, &delay_copy )) continue; + if (install_fake_dll( dest, file, NULL, delete, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", delete, &delay_copy )) continue; } - else install_fake_dll( dest, file, NULL, delete, expect_builtin, &delay_copy ); + else install_fake_dll( dest, file, NULL, delete, &delay_copy ); } while (!_wfindnext( handle, &data )); _findclose( handle ); @@ -1023,18 +1022,18 @@ static BOOL create_wildcard_dlls( const WCHAR *dirname, const WCHAR *wildcard, B { lstrcpyW( file, build_dir ); lstrcatW( file, L"\\dlls" ); - install_lib_dir( dest, file, wildcard, L".dll", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".dll", delete ); lstrcpyW( file, build_dir ); lstrcatW( file, L"\\programs" ); - install_lib_dir( dest, file, wildcard, L".exe", delete, TRUE ); + install_lib_dir( dest, file, wildcard, L".exe", delete ); } for (i = 0; (path = enum_load_path( i )); i++) { lstrcpyW( file, path ); - install_lib_dir( dest, file, wildcard, NULL, delete, TRUE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); lstrcpyW( file, path ); lstrcatW( file, L"\\fakedlls" ); - install_lib_dir( dest, file, wildcard, NULL, delete, FALSE ); + install_lib_dir( dest, file, wildcard, NULL, delete ); } HeapFree( GetProcessHeap(), 0, file ); HeapFree( GetProcessHeap(), 0, dest );

1 0

Alexandre Julliard : ntdll: Support loading builtins from the architecture-specific PE directory.
by Alexandre Julliard 26 Apr '21

26 Apr '21

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 slowest/fastest rate support methods.
by Alexandre Julliard 26 Apr '21

26 Apr '21

Module: wine Branch: master Commit: 51a0cdf52d6f9796ba5e3ca8bb8abb205703f54b URL: https://source.winehq.org/git/wine.git/?a=commit;h=51a0cdf52d6f9796ba5e3ca8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 26 11:23:35 2021 +0300 mf/evr: Add slowest/fastest rate support methods. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/evr.c | 17 +++++++++++++---- dlls/mf/tests/mf.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 2a529895237..292e84ddd6b 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -2677,17 +2677,26 @@ static ULONG WINAPI video_renderer_rate_support_Release(IMFRateSupport *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); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + if (renderer->flags & EVR_SHUT_DOWN) + return MF_E_SHUTDOWN; + + *rate = 0.0f; + + return S_OK; } 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); + struct video_renderer *renderer = impl_from_IMFRateSupport(iface); - return E_NOTIMPL; + TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); + + return renderer->flags & EVR_SHUT_DOWN ? MF_E_SHUTDOWN : MF_E_INVALIDREQUEST; } static HRESULT WINAPI video_renderer_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 89da5d0ab64..c8c7e0569cc 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4224,10 +4224,12 @@ static void test_evr(void) DWORD flags, count, value; IMFActivate *activate; HWND window, window2; + IMFRateSupport *rs; LONG sample_count; IMFSample *sample; IUnknown *unk; UINT64 window3; + float rate; HRESULT hr; GUID guid; @@ -4510,6 +4512,50 @@ todo_wine hr = IMFMediaSink_SetPresentationClock(sink, clock); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_QueryInterface(sink, &IID_IMFRateSupport, (void **)&rs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + rate = 1.0f; + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, FALSE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_REVERSE, TRUE, &rate); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetSlowestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rs, MFRATE_FORWARD, FALSE, &rate); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFPresentationClock_Release(clock); IMFActivate_Release(activate);

1 0

Nikolay Sivov : mf/evr: Add IMFRateSupport stub.
by Alexandre Julliard 26 Apr '21

26 Apr '21

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 26 Apr '21

26 Apr '21

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

← Newer
1
...
15
16
17
18
19
20
21
...
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