wine-commits April 2021

wine-commits@winehq.org

2 participants
865 discussions

Alexandre Julliard : ntdll: Don't close handles in APC requests sent to self.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 16d70584db6c6e7a084f8d176b52959d7246138d URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d70584db6c6e7a084f8d17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 17:57:21 2021 +0200 ntdll: Don't close handles in APC requests sent to self. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50904 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index a108ce00482..52e390e75ce 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -372,7 +372,7 @@ static void invoke_apc( CONTEXT *context, const user_apc_t *apc ) * Invoke a single APC. * */ -static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) +static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOOL self ) { SIZE_T size, bits; void *addr; @@ -531,7 +531,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) result->map_view.size = size; } else result->map_view.status = STATUS_INVALID_PARAMETER; - NtClose( wine_server_ptr_handle(call->map_view.handle) ); + if (!self) NtClose( wine_server_ptr_handle(call->map_view.handle) ); break; case APC_UNMAP_VIEW: result->type = call->type; @@ -590,7 +590,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result ) &dst_handle, call->dup_handle.access, call->dup_handle.attributes, call->dup_handle.options ); result->dup_handle.handle = wine_server_obj_handle( dst_handle ); - NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); + if (!self) NtClose( wine_server_ptr_handle(call->dup_handle.dst_process) ); break; } case APC_BREAK_PROCESS: @@ -674,7 +674,7 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT SERVER_END_REQ; if (ret != STATUS_KERNEL_APC) break; - invoke_system_apc( &call, &result ); + invoke_system_apc( &call, &result, FALSE ); /* don't signal multiple times */ if (size >= sizeof(select_op->signal_and_wait) && select_op->op == SELECT_SIGNAL_AND_WAIT) @@ -772,7 +772,7 @@ unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, a if (self) { - invoke_system_apc( call, result ); + invoke_system_apc( call, result, TRUE ); } else {

1 0

Alexandre Julliard : ntdll: Don't try to open the file in the prefix for 16-bit builtins.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 277a5728da6cdce0247521dc63b324e120b542d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=277a5728da6cdce0247521dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 18:16:15 2021 +0200 ntdll: Don't try to open the file in the prefix for 16-bit builtins. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e919d7e2671..160a16daff8 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2730,6 +2730,12 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, con status = STATUS_SUCCESS; goto done; } + /* 16-bit files can't be loaded from the prefix */ + if (libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" )) + { + status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); + goto done; + } } }

1 0

Alexandre Julliard : services: Propagate the WINEBOOTSTRAPMODE variable to spawned services.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 7cea94349a48b5e4ff5a015175d7e27922323b13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cea94349a48b5e4ff5a0151… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 12:23:09 2021 +0200 services: Propagate the WINEBOOTSTRAPMODE variable to spawned services. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/services/services.c b/programs/services/services.c index d9c4e484e42..39cd9ee4ffa 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -25,6 +25,7 @@ #include <assert.h> #include <windows.h> #include <winsvc.h> +#include <winternl.h> #include <rpc.h> #include <userenv.h> #include <setupapi.h> @@ -1069,7 +1070,16 @@ found: if (!environment && OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY | TOKEN_DUPLICATE, &token)) { + WCHAR val[16]; CreateEnvironmentBlock(&environment, token, FALSE); + if (GetEnvironmentVariableW( L"WINEBOOTSTRAPMODE", val, ARRAY_SIZE(val) )) + { + UNICODE_STRING name, value; + + RtlInitUnicodeString( &name, L"WINEBOOTSTRAPMODE" ); + RtlInitUnicodeString( &value, val ); + RtlSetEnvironmentVariable( (WCHAR **)&environment, &name, &value ); + } CloseHandle(token); }

1 0

Alexandre Julliard : ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 446f7e3aa8a906c9213d92f1572e8373286c543a URL: https://source.winehq.org/git/wine.git/?a=commit;h=446f7e3aa8a906c9213d92f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 12:22:25 2021 +0200 ntdll: Add a WINEBOOTSTRAPMODE environment variable to allow loading non-existent builtins. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50905 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 12 ++++++------ dlls/ntdll/unix/env.c | 31 +++++++++++++++++++++++++------ dlls/ntdll/unix/loader.c | 16 ++++------------ dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e1810bc5ab9..e919d7e2671 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1926,14 +1926,10 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name, static void build_ntdll_module(void) { MEMORY_BASIC_INFORMATION meminfo; - FILE_BASIC_INFORMATION basic_info; UNICODE_STRING nt_name; - OBJECT_ATTRIBUTES attr; WINE_MODREF *wm; RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\ntdll.dll" ); - InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, NULL ); - is_prefix_bootstrap = NtQueryAttributesFile( &attr, &basic_info) != STATUS_SUCCESS; NtQueryVirtualMemory( GetCurrentProcess(), build_ntdll_module, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); wm = alloc_module( meminfo.AllocationBase, &nt_name, TRUE ); @@ -2672,7 +2668,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - else if (is_prefix_bootstrap && !wcspbrk( search, L":/\\" )) + else if (is_prefix_bootstrap && !contains_path( search )) status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); done: @@ -3498,10 +3494,14 @@ static void process_breakpoint(void) static void load_global_options(void) { OBJECT_ATTRIBUTES attr; - UNICODE_STRING name_str; + UNICODE_STRING name_str, val_str; HANDLE hkey; ULONG value; + RtlInitUnicodeString( &name_str, L"WINEBOOTSTRAPMODE" ); + val_str.MaximumLength = 0; + is_prefix_bootstrap = RtlQueryEnvironmentVariable_U( NULL, &name_str, &val_str ) != STATUS_VARIABLE_NOT_FOUND; + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.ObjectName = &name_str; diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 10089a740c2..01d4f3ea418 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -64,6 +64,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(environ); USHORT *uctable = NULL, *lctable = NULL; SIZE_T startup_info_size = 0; +BOOL is_prefix_bootstrap = FALSE; + +static const WCHAR bootstrapW[] = {'W','I','N','E','B','O','O','T','S','T','R','A','P','M','O','D','E'}; int main_argc = 0; char **main_argv = NULL; @@ -1211,6 +1214,18 @@ static WCHAR *find_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T n return NULL; } +static WCHAR *get_env_var( WCHAR *env, SIZE_T size, const WCHAR *name, SIZE_T namelen ) +{ + WCHAR *ret = NULL, *var = find_env_var( env, size, name, namelen ); + + if (var) + { + var += namelen + 1; /* skip name */ + if ((ret = malloc( (wcslen(var) + 1) * sizeof(WCHAR) ))) wcscpy( ret, var ); + } + return ret; +} + /* set an environment variable, replacing it if it exists */ static void set_env_var( WCHAR **env, SIZE_T *pos, SIZE_T *size, const WCHAR *name, SIZE_T namelen, const WCHAR *value ) @@ -1889,29 +1904,32 @@ static inline WCHAR *get_dos_path( WCHAR *nt_path ) */ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) { + static const WCHAR valueW[] = {'1',0}; static const WCHAR pathW[] = {'P','A','T','H'}; RTL_USER_PROCESS_PARAMETERS *params = NULL; SIZE_T size, env_pos, env_size; - WCHAR *dst, *image, *cmdline, *p, *path = NULL; + WCHAR *dst, *image, *cmdline, *path, *bootstrap; WCHAR *env = get_initial_environment( &env_pos, &env_size ); WCHAR *curdir = get_initial_directory(); void *module = NULL; NTSTATUS status; /* store the initial PATH value */ - if ((p = find_env_var( env, env_pos, pathW, 4 ))) - { - path = malloc( (wcslen(p + 5) + 1) * sizeof(WCHAR) ); - wcscpy( path, p + 5 ); - } + path = get_env_var( env, env_pos, pathW, 4 ); add_dynamic_environment( &env, &env_pos, &env_size ); add_registry_environment( &env, &env_pos, &env_size ); + bootstrap = get_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), valueW ); + is_prefix_bootstrap = TRUE; env[env_pos] = 0; run_wineboot( env, env_pos ); /* reload environment now that wineboot has run */ set_env_var( &env, &env_pos, &env_size, pathW, 4, path ); /* reset PATH */ free( path ); + set_env_var( &env, &env_pos, &env_size, bootstrapW, ARRAY_SIZE(bootstrapW), bootstrap ); + is_prefix_bootstrap = !!bootstrap; + free( bootstrap ); add_registry_environment( &env, &env_pos, &env_size ); env[env_pos++] = 0; @@ -2012,6 +2030,7 @@ void init_startup_info(void) memcpy( env, (char *)info + info_size, env_size * sizeof(WCHAR) ); env_pos = env_size - 1; add_dynamic_environment( &env, &env_pos, &env_size ); + is_prefix_bootstrap = !!find_env_var( env, env_pos, bootstrapW, ARRAY_SIZE(bootstrapW) ); env[env_pos++] = 0; size = (sizeof(*params) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e362f5eb4db..cbafa0d8882 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1387,10 +1387,10 @@ BOOL is_builtin_path( const UNICODE_STRING *path, WORD *machine ) { static const WCHAR wow64W[] = {'\\','?','?','\\','c',':','\\','w','i','n','d','o','w','s','\\', 's','y','s','w','o','w','6','4'}; - BOOL is_prefix_bootstrap; unsigned int len; - struct stat st; - char *ntdll; + + /* only fake builtin existence during prefix bootstrap */ + if (!is_prefix_bootstrap) return FALSE; *machine = current_machine; if (path->Length > wcslen(system_dir) * sizeof(WCHAR) && @@ -1413,15 +1413,7 @@ found: len = wcslen(system_dir); while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] == '\\') len++; while (len < path->Length / sizeof(WCHAR) && path->Buffer[len] != '\\') len++; - if (len != path->Length / sizeof(WCHAR)) return FALSE; - - /* if the corresponding ntdll exists, don't fake the existence of the builtin */ - ntdll = build_path( config_dir, *machine == IMAGE_FILE_MACHINE_I386 ? - "dosdevices/c:/windows/syswow64/ntdll.dll" : - "dosdevices/c:/windows/system32/ntdll.dll" ); - is_prefix_bootstrap = stat( ntdll, &st ) == -1; - free( ntdll ); - return is_prefix_bootstrap; + return (len == path->Length / sizeof(WCHAR)); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index d0fa7a54f49..0f14e69f2be 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -120,6 +120,7 @@ extern const char **dll_paths DECLSPEC_HIDDEN; extern USHORT *uctable DECLSPEC_HIDDEN; extern USHORT *lctable DECLSPEC_HIDDEN; extern SIZE_T startup_info_size DECLSPEC_HIDDEN; +extern BOOL is_prefix_bootstrap DECLSPEC_HIDDEN; extern SECTION_IMAGE_INFORMATION main_image_info DECLSPEC_HIDDEN; extern int main_argc DECLSPEC_HIDDEN; extern char **main_argv DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : makefiles: Only allow includes and defines in pkg-config flags.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 4f04994ef47b5077e13c1b770ed0f818f59adcd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f04994ef47b5077e13c1b77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:43:13 2021 +0200 makefiles: Only allow includes and defines in pkg-config flags. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50811 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 11 +---------- configure.ac | 11 +---------- tools/makedep.c | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/configure b/configure index 7d0cd5580fe..6b183eb4898 100755 --- a/configure +++ b/configure @@ -14620,16 +14620,7 @@ $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstream $as_echo "$as_me:${as_lineno-$LINENO}: gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 libs: $GSTREAMER_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS" -ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" +ac_fn_c_check_header_mongrel "$LINENO" "gst/gst.h" "ac_cv_header_gst_gst_h" "$ac_includes_default" if test "x$ac_cv_header_gst_gst_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/gst.h is indeed 64-bit" >&5 $as_echo_n "checking whether gint64 defined by gst/gst.h is indeed 64-bit... " >&6; } diff --git a/configure.ac b/configure.ac index cc63766a398..5c364bef0d9 100644 --- a/configure.ac +++ b/configure.ac @@ -1608,16 +1608,7 @@ dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then WINE_PACKAGE_FLAGS(GSTREAMER,[gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0],,,, - [ac_gst_incl="" - for i in $GSTREAMER_CFLAGS - do - case "$i" in - -I*) ac_gst_incl="$ac_gst_incl $i";; - esac - done - GSTREAMER_CFLAGS=$ac_gst_incl - CPPFLAGS="$ac_save_CPPFLAGS $GSTREAMER_CFLAGS" - AC_CHECK_HEADER([gst/gst.h], + [AC_CHECK_HEADER([gst/gst.h], [AC_MSG_CHECKING([whether gint64 defined by gst/gst.h is indeed 64-bit]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/gst.h>]], [[static int a[sizeof(gint64) > 4 ? 1 : -1]; if (a[0]) return 0;]])], diff --git a/tools/makedep.c b/tools/makedep.c index 8245a324279..0eef646479b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -4263,7 +4263,7 @@ static void load_sources( struct makefile *make ) for (i = 0; i < value.count; i++) if (!strncmp( value.str[i], "-I", 2 )) strarray_add_uniq( &make->include_paths, value.str[i] + 2 ); - else + else if (!strncmp( value.str[i], "-D", 2 ) || !strncmp( value.str[i], "-U", 2 )) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" ));

1 0

Alexandre Julliard : configure: Fix package name for FAudio.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: f126809ec017570325b98abd797356ceba17e15e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f126809ec017570325b98abd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 8 11:45:18 2021 +0200 configure: Fix package name for FAudio. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50436 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 12 ++++++------ configure.ac | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index ccbbd943cfe..7d0cd5580fe 100755 --- a/configure +++ b/configure @@ -2728,8 +2728,8 @@ Some influential environment variables: SDL2_CFLAGS C compiler flags for sdl2, overriding pkg-config SDL2_LIBS Linker flags for sdl2, overriding pkg-config FAUDIO_CFLAGS - C compiler flags for faudio, overriding pkg-config - FAUDIO_LIBS Linker flags for faudio, overriding pkg-config + C compiler flags for FAudio, overriding pkg-config + FAUDIO_LIBS Linker flags for FAudio, overriding pkg-config CAPI20_CFLAGS C compiler flags for capi20, overriding pkg-config CAPI20_LIBS Linker flags for capi20, overriding pkg-config @@ -15145,19 +15145,19 @@ if test "x$with_faudio" != "xno" then if ${FAUDIO_CFLAGS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_CFLAGS=`$PKG_CONFIG --cflags faudio 2>/dev/null` + FAUDIO_CFLAGS=`$PKG_CONFIG --cflags FAudio 2>/dev/null` fi fi if ${FAUDIO_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : - FAUDIO_LIBS=`$PKG_CONFIG --libs faudio 2>/dev/null` + FAUDIO_LIBS=`$PKG_CONFIG --libs FAudio 2>/dev/null` fi fi FAUDIO_LIBS=${FAUDIO_LIBS:-"-lFAudio"} -$as_echo "$as_me:${as_lineno-$LINENO}: faudio cflags: $FAUDIO_CFLAGS" >&5 -$as_echo "$as_me:${as_lineno-$LINENO}: faudio libs: $FAUDIO_LIBS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio cflags: $FAUDIO_CFLAGS" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: FAudio libs: $FAUDIO_LIBS" >&5 ac_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS $FAUDIO_CFLAGS" for ac_header in FAudio.h diff --git a/configure.ac b/configure.ac index 59e20dfb029..cc63766a398 100644 --- a/configure.ac +++ b/configure.ac @@ -1724,7 +1724,7 @@ WINE_NOTICE_WITH(sdl,[test "x$ac_cv_lib_soname_SDL2" = "x"], dnl **** Check for FAudio **** if test "x$with_faudio" != "xno" then - WINE_PACKAGE_FLAGS(FAUDIO,[faudio],[-lFAudio],,, + WINE_PACKAGE_FLAGS(FAUDIO,[FAudio],[-lFAudio],,, [AC_CHECK_HEADERS([FAudio.h], [WINE_CHECK_SONAME(FAudio,FAudioCreate,,,[$FAUDIO_LIBS],[[libFAudio*]])]) WINE_CHECK_LIB_FUNCS([FAudio_CommitOperationSet \

1 0

Nikolay Sivov : mfplat/tests: Add some more tests for IsCompressedFormat().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 8511670b37214f95b37bb811118c673a7d84ea9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8511670b37214f95b37bb811… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:31:20 2021 +0300 mfplat/tests: Add some more tests for IsCompressedFormat(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c21a57be27f..c33d540ba4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -993,14 +993,28 @@ if(0) ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 0); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + compressed = FALSE; + hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); + ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); + ok(compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_COMPRESSED, 1); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + compressed = TRUE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(!compressed, "Unexpected value %d.\n", compressed); + hr = IMFMediaType_DeleteItem(mediatype, &MF_MT_COMPRESSED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); ok(hr == S_OK, "Failed to set GUID value, hr %#x.\n", hr);

1 0

Nikolay Sivov : winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for video types.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 800103d127c2c544e91ca3a82b45d5dda5768b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=800103d127c2c544e91ca3a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:20:29 2021 +0300 winegstreamer: Set MF_MT_ALL_SAMPLES_INDEPENDENT for video types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 821657f8dd8..bb632c2cc2c 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -595,6 +595,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * IMFMediaType_SetUINT64(type, &MF_MT_FRAME_RATE, make_uint64(format->u.video.fps_n, format->u.video.fps_d)); IMFMediaType_SetUINT32(type, &MF_MT_COMPRESSED, FALSE); + IMFMediaType_SetUINT32(type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); return type; }

1 0

Nikolay Sivov : dxva2: Check content formats for software device in GetVideoProcessorRenderTargets().
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 0cd91a522ee39a92b6250e8342f02d9d1e7af0fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd91a522ee39a92b6250e83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:19:38 2021 +0300 dxva2: Check content formats for software device in GetVideoProcessorRenderTargets(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxva2/main.c | 8 ++++++- dlls/dxva2/tests/dxva2.c | 60 ++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/dxva2/main.c b/dlls/dxva2/main.c index 069f03d8077..8952de17b1e 100644 --- a/dlls/dxva2/main.c +++ b/dlls/dxva2/main.c @@ -399,7 +399,13 @@ static HRESULT WINAPI device_manager_processor_service_GetVideoProcessorRenderTa if (IsEqualGUID(deviceguid, &DXVA2_VideoProcSoftwareDevice)) { - /* FIXME: filter some input formats */ + if (!(video_desc->Format == D3DFMT_A8R8G8B8 || + video_desc->Format == D3DFMT_X8R8G8B8 || + video_desc->Format == D3DFMT_YUY2)) + { + WARN("Unsupported content format %#x.\n", video_desc->Format); + return E_FAIL; + } if (!(*formats = CoTaskMemAlloc(2 * sizeof(**formats)))) return E_OUTOFMEMORY; diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index a49635e7596..1de1712d163 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -78,6 +78,14 @@ static void test_surface_desc(IDirect3DSurface9 *surface) ok(desc.Height == 64, "Unexpected height %u.\n", desc.Height); } +static void init_video_desc(DXVA2_VideoDesc *video_desc, D3DFORMAT format) +{ + memset(video_desc, 0, sizeof(*video_desc)); + video_desc->SampleWidth = 64; + video_desc->SampleHeight = 64; + video_desc->Format = format; +} + static void test_device_manager(void) { IDirectXVideoProcessorService *processor_service; @@ -92,11 +100,29 @@ static void test_device_manager(void) D3DFORMAT *formats; UINT token, count; IDirect3D9 *d3d; + unsigned int i; HWND window; GUID *guids; HRESULT hr; RECT rect; + static const D3DFORMAT rt_formats[] = + { + D3DFMT_A8R8G8B8, + D3DFMT_X8R8G8B8, + D3DFMT_YUY2, + }; + static const D3DFORMAT rt_unsupported_formats[] = + { + D3DFMT_A1R5G5B5, + D3DFMT_X1R5G5B5, + D3DFMT_A2R10G10B10, + D3DFMT_A8B8G8R8, + D3DFMT_X8B8G8R8, + D3DFMT_R5G6B5, + D3DFMT_UYVY, + }; + window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); @@ -316,22 +342,36 @@ static void test_device_manager(void) hr = DXVA2CreateVideoService(device, &IID_IDirectXVideoProcessorService, (void **)&proc_service); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - memset(&video_desc, 0, sizeof(video_desc)); - video_desc.SampleWidth = 64; - video_desc.SampleHeight = 64; - video_desc.Format = D3DFMT_A8R8G8B8; + init_video_desc(&video_desc, D3DFMT_A8R8G8B8); hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(count, "Unexpected format count %u.\n", count); CoTaskMemFree(guids); - count = 0; - hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, - &video_desc, &count, &formats); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(count, "Unexpected format count %u.\n", count); - CoTaskMemFree(formats); + for (i = 0; i < ARRAY_SIZE(rt_formats); ++i) + { + init_video_desc(&video_desc, rt_formats[i]); + + count = 0; + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == S_OK, "Unexpected hr %#x, format %d.\n", hr, rt_formats[i]); + ok(count == 2, "Unexpected format count %u.\n", count); + if (count == 2) + ok(formats[0] == D3DFMT_X8R8G8B8 && formats[1] == D3DFMT_A8R8G8B8, "Unexpected formats %d,%d.\n", + formats[0], formats[1]); + CoTaskMemFree(formats); + } + + for (i = 0; i < ARRAY_SIZE(rt_unsupported_formats); ++i) + { + init_video_desc(&video_desc, rt_unsupported_formats[i]); + + hr = IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(proc_service, &DXVA2_VideoProcSoftwareDevice, + &video_desc, &count, &formats); + ok(hr == E_FAIL, "Unexpected hr %#x, format %d.\n", hr, rt_unsupported_formats[i]); + } IDirectXVideoProcessorService_Release(proc_service);

1 0

Nikolay Sivov : evr: Use CRT functions for heap allocations.
by Alexandre Julliard 08 Apr '21

08 Apr '21

Module: wine Branch: master Commit: 195f735cbeedc8a2a7621f32145f4d07bac8edda URL: https://source.winehq.org/git/wine.git/?a=commit;h=195f735cbeedc8a2a7621f32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 8 12:18:11 2021 +0300 evr: Use CRT functions for heap allocations. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 9 ++++----- dlls/evr/presenter.c | 7 +++---- dlls/evr/sample.c | 25 ++++++++++++------------- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index c59ec002340..03e2d166155 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -31,7 +31,6 @@ #include "evcode.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -200,7 +199,7 @@ static void video_mixer_clear_types(struct video_mixer *mixer) { IMFMediaType_Release(mixer->output.rt_formats[i].media_type); } - heap_free(mixer->output.rt_formats); + free(mixer->output.rt_formats); if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = NULL; @@ -668,7 +667,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (SUCCEEDED(IDirectXVideoProcessorService_GetVideoProcessorRenderTargets(service, &devices[i], video_desc, &format_count, &formats))) { - if (!(ptr = heap_realloc(rt_formats, (count + format_count) * sizeof(*rt_formats)))) + if (!(ptr = realloc(rt_formats, (count + format_count) * sizeof(*rt_formats)))) { hr = E_OUTOFMEMORY; count = 0; @@ -703,7 +702,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const count = j + 1; memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); - if ((mixer->output.rt_formats = heap_calloc(count, sizeof(*mixer->output.rt_formats)))) + if ((mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { for (i = 0; i < count; ++i) { @@ -727,7 +726,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const } } - heap_free(rt_formats); + free(rt_formats); return count ? S_OK : hr; } diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 9b7fb5f6f67..8d633124db2 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -28,7 +28,6 @@ #include "evr_private.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -369,7 +368,7 @@ static void video_presenter_sample_queue_init(struct video_presenter *presenter) return; memset(queue, 0, sizeof(*queue)); - queue->samples = heap_calloc(presenter->allocator_capacity, sizeof(*queue->samples)); + queue->samples = calloc(presenter->allocator_capacity, sizeof(*queue->samples)); queue->size = presenter->allocator_capacity; queue->back = queue->size - 1; } @@ -836,7 +835,7 @@ static ULONG WINAPI video_presenter_inner_Release(IUnknown *iface) } if (presenter->allocator) IMFVideoSampleAllocator_Release(presenter->allocator); - heap_free(presenter); + free(presenter); } return refcount; @@ -1929,7 +1928,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out) *out = NULL; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 9c76011f153..cbba384e181 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -25,7 +25,6 @@ #include "dxva2api.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(evr); @@ -168,7 +167,7 @@ static ULONG WINAPI tracked_async_result_Release(IMFAsyncResult *iface) IUnknown_Release(result->object); if (result->state) IUnknown_Release(result->state); - heap_free(result); + free(result); } return refcount; @@ -250,7 +249,7 @@ static HRESULT create_async_result(IUnknown *object, IMFAsyncCallback *callback, { struct tracked_async_result *result; - result = heap_alloc_zero(sizeof(*result)); + result = calloc(1, sizeof(*result)); if (!result) return E_OUTOFMEMORY; @@ -464,13 +463,13 @@ static void sample_allocator_release_samples(struct sample_allocator *allocator) { list_remove(&iter->entry); IMFSample_Release(iter->sample); - heap_free(iter); + free(iter); } LIST_FOR_EACH_ENTRY_SAFE(iter, iter2, &allocator->used_samples, struct queued_sample, entry) { list_remove(&iter->entry); - heap_free(iter); + free(iter); } } @@ -489,7 +488,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocator *iface) IDirect3DDeviceManager9_Release(allocator->device_manager); sample_allocator_release_samples(allocator); DeleteCriticalSection(&allocator->cs); - heap_free(allocator); + free(allocator); } return refcount; @@ -618,7 +617,7 @@ static HRESULT sample_allocator_create_samples(struct sample_allocator *allocato break; } - queued_sample = heap_alloc(sizeof(*queued_sample)); + queued_sample = malloc(sizeof(*queued_sample)); queued_sample->sample = sample; list_add_tail(&allocator->free_samples, &queued_sample->entry); allocator->free_sample_count++; @@ -860,7 +859,7 @@ HRESULT WINAPI MFCreateVideoSampleAllocator(REFIID riid, void **obj) TRACE("%s, %p.\n", debugstr_guid(riid), obj); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFVideoSampleAllocator_iface.lpVtbl = &sample_allocator_vtbl; @@ -943,7 +942,7 @@ static ULONG WINAPI video_sample_Release(IMFSample *iface) if (sample->sample) IMFSample_Release(sample->sample); DeleteCriticalSection(&sample->cs); - heap_free(sample); + free(sample); } return refcount; @@ -1601,7 +1600,7 @@ static ULONG WINAPI surface_buffer_Release(IMFMediaBuffer *iface) if (!refcount) { IUnknown_Release(buffer->surface); - heap_free(buffer); + free(buffer); } return refcount; @@ -1704,7 +1703,7 @@ static HRESULT create_surface_buffer(IUnknown *surface, IMFMediaBuffer **buffer) { struct surface_buffer *object; - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFMediaBuffer_iface.lpVtbl = &surface_buffer_vtbl; @@ -1726,7 +1725,7 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam TRACE("%p, %p.\n", surface, sample); - if (!(object = heap_alloc_zero(sizeof(*object)))) + if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; object->IMFSample_iface.lpVtbl = &video_sample_vtbl; @@ -1737,7 +1736,7 @@ HRESULT WINAPI MFCreateVideoSampleFromSurface(IUnknown *surface, IMFSample **sam if (FAILED(hr = MFCreateSample(&object->sample))) { - heap_free(object); + free(object); return hr; }

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
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