December 2020 - Wine-Commits

Michael Stefaniuc : xmllite: Drop superfluous casts to self.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: b0c4d51588f935e4352f13666b7137cd9e12cda4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c4d51588f935e4352f1366… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:48 2020 +0100 xmllite: Drop superfluous casts to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4793b128bae..13d841eb94d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -213,9 +213,9 @@ typedef struct static WCHAR emptyW[] = L""; static WCHAR xmlW[] = L"xml"; static WCHAR xmlnsW[] = L"xmlns"; -static const strval strval_empty = { (WCHAR *)emptyW, 0 }; -static const strval strval_xml = { (WCHAR *)xmlW, 3 }; -static const strval strval_xmlns = { (WCHAR *)xmlnsW, 5 }; +static const strval strval_empty = { emptyW, 0 }; +static const strval strval_xml = { xmlW, 3 }; +static const strval strval_xmlns = { xmlnsW, 5 }; struct reader_position {

1 0

Piotr Caban : msvcrt: Use _invalid_parameter_handler from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 264ba46bcdcd2119c2f9712ba52bb74c35bd369b URL: https://source.winehq.org/git/wine.git/?a=commit;h=264ba46bcdcd2119c2f9712b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:49:53 2020 +0100 msvcrt: Use _invalid_parameter_handler from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 18 +++++++++--------- dlls/msvcrt/msvcrt.h | 3 +-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 592d37ced8a..85752e52df7 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -126,7 +126,7 @@ char *MSVCRT__sys_errlist[] = unsigned int MSVCRT__sys_nerr = ARRAY_SIZE(MSVCRT__sys_errlist) - 1; -static MSVCRT_invalid_parameter_handler invalid_parameter_handler = NULL; +static _invalid_parameter_handler invalid_parameter_handler = NULL; /* INTERNAL: Set the crt and dos errno's from the OS error given. */ void msvcrt_set_errno(int err) @@ -503,7 +503,7 @@ void CDECL _invalid_parameter_noinfo_noreturn(void) /********************************************************************* * _get_invalid_parameter_handler (MSVCR80.@) */ -MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) +_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) { TRACE("\n"); return invalid_parameter_handler; @@ -512,10 +512,10 @@ MSVCRT_invalid_parameter_handler CDECL _get_invalid_parameter_handler(void) /********************************************************************* * _set_invalid_parameter_handler (MSVCR80.@) */ -MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( - MSVCRT_invalid_parameter_handler handler) +_invalid_parameter_handler CDECL _set_invalid_parameter_handler( + _invalid_parameter_handler handler) { - MSVCRT_invalid_parameter_handler old = invalid_parameter_handler; + _invalid_parameter_handler old = invalid_parameter_handler; TRACE("(%p)\n", handler); @@ -530,7 +530,7 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( /********************************************************************* * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) */ -MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) +_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) { TRACE("\n"); return msvcrt_get_thread_data()->invalid_parameter_handler; @@ -539,11 +539,11 @@ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handl /********************************************************************* * _set_thread_local_invalid_parameter_handler (UCRTBASE.@) */ -MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( - MSVCRT_invalid_parameter_handler handler) +_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( + _invalid_parameter_handler handler) { thread_data_t *data = msvcrt_get_thread_data(); - MSVCRT_invalid_parameter_handler old = data->invalid_parameter_handler; + _invalid_parameter_handler old = data->invalid_parameter_handler; TRACE("(%p)\n", handler); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 257497b72a2..a8bb25132e5 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -40,7 +40,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); typedef void (__cdecl *MSVCRT_security_error_handler)(int, void *); @@ -164,7 +163,7 @@ struct __thread_data { char cached_locale[131]; void *unk10[100]; #if _MSVCR_VER >= 140 - MSVCRT_invalid_parameter_handler invalid_parameter_handler; + _invalid_parameter_handler invalid_parameter_handler; #endif };

1 0

Alexandre Julliard : makefiles: Get rid of the libwine.so symlink.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 497c902857241ec340e562ec3490a344704440dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=497c902857241ec340e562ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 11:09:17 2020 +0100 makefiles: Get rid of the libwine.so symlink. We no longer need to link to libwine. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- tools/makedep.c | 3 --- 3 files changed, 7 deletions(-) diff --git a/configure b/configure index d8759253727..ea6a82086bf 100755 --- a/configure +++ b/configure @@ -9120,7 +9120,6 @@ fi WINELOADER_DEPENDS="wine_info.plist" TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.dylib" ;; linux-android*) @@ -9599,7 +9598,6 @@ $as_echo "$ac_cv_c_dll_unixware" >&6; } LIBWINE_DEPENDS="wine.map" TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.so" ;; esac diff --git a/configure.ac b/configure.ac index 168df52f791..020fd19256f 100644 --- a/configure.ac +++ b/configure.ac @@ -887,7 +887,6 @@ case $host_os in AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"]) AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist") TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.$libwine_version.dylib libs/wine/libwine.$libwine_soversion.dylib" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.dylib" ;; linux-android*) @@ -980,7 +979,6 @@ case $host_os in AC_SUBST(LIBWINE_SHAREDLIB,"libwine.so.$libwine_version") AC_SUBST(LIBWINE_DEPENDS,"wine.map") TOP_INSTALL_LIB="$TOP_INSTALL_LIB libs/wine/libwine.so.$libwine_version libs/wine/libwine.so.$libwine_soversion" - TOP_INSTALL_DEV="$TOP_INSTALL_DEV libs/wine/libwine.so" ;; esac diff --git a/tools/makedep.c b/tools/makedep.c index d892b7e9541..b21362c6c9e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2388,9 +2388,6 @@ static struct strarray get_shared_lib_names( const char *libname ) strcpy( second, ext ); strarray_add( &ret, xstrdup( name )); } - /* now remove all digits */ - strcpy( first, ext ); - strarray_add( &ret, name ); return ret; }

1 0

Alexandre Julliard : Revert "winecrt0: Make the main() and wmain() entry points cdecl."
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 2e115ab4420e9595c956c082e76b603fa684be20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e115ab4420e9595c956c082… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 10:31:11 2020 +0100 Revert "winecrt0: Make the main() and wmain() entry points cdecl." This reverts commit f2a7405a09c66e4b9adc15d4e9b7379ed4c78f54. We now have separate entry points for msvcrt builds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/exe_entry.c | 2 +- dlls/winecrt0/exe_main.c | 2 +- dlls/winecrt0/exe_wentry.c | 2 +- dlls/winecrt0/exe_wmain.c | 2 +- programs/winebrowser/main.c | 2 +- programs/winedbg/winedbg.c | 2 +- programs/winevdm/winevdm.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 93a323f42a6..d4d1d7d6757 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -27,7 +27,7 @@ #include "winbase.h" #include "winternl.h" -extern int __cdecl main( int argc, char *argv[] ); +extern int main( int argc, char *argv[] ); static char **build_argv( const char *src, int *ret_argc ) { diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index d966fafc9e6..8861cbf1449 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -27,7 +27,7 @@ #include "winbase.h" #include "winuser.h" -int __cdecl main( int argc, char *argv[] ) +int main( int argc, char *argv[] ) { STARTUPINFOA info; char *cmdline = GetCommandLineA(); diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 0524dce99a7..a4c1a0897fb 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -27,7 +27,7 @@ #include "winbase.h" #include "winternl.h" -extern int __cdecl wmain( int argc, WCHAR *argv[] ); +extern int wmain( int argc, WCHAR *argv[] ); static WCHAR **build_argv( const WCHAR *src, int *ret_argc ) { diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index 7ada198a12f..e576a8baceb 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -29,7 +29,7 @@ int WINAPI wWinMain(HINSTANCE,HINSTANCE,LPWSTR,int); -int __cdecl wmain( int argc, WCHAR *argv[] ) +int wmain( int argc, WCHAR *argv[] ) { STARTUPINFOW info; WCHAR *cmdline = GetCommandLineW(); diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index c70457e50b3..7c82d674f66 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -448,7 +448,7 @@ static WCHAR *convert_file_uri(IUri *uri) * Main entry point. This is a console application so we have a wmain() not a * winmain(). */ -int __cdecl wmain(int argc, WCHAR *argv[]) +int wmain(int argc, WCHAR *argv[]) { static const WCHAR nohomeW[] = {'-','n','o','h','o','m','e',0}; diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 538367926e8..838089e8628 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -664,7 +664,7 @@ static void restart_if_wow64(void) } } -int __cdecl main(int argc, char** argv) +int main(int argc, char** argv) { int retv = 0; HANDLE hFile = INVALID_HANDLE_VALUE; diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index e550232c9af..0a43e579793 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -493,7 +493,7 @@ static void usage(void) /*********************************************************************** * main */ -int __cdecl main( int argc, char *argv[] ) +int main( int argc, char *argv[] ) { DWORD count; HINSTANCE16 instance;

1 0

Piotr Caban : include: Add corecrt_io.h header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 713364f35c3ba97a8b121a00c7f3287c2c2816bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=713364f35c3ba97a8b121a00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:07 2020 +0100 include: Add corecrt_io.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_io.h | 109 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 9b6858b78f9..74a1d8e0c89 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -446,6 +446,7 @@ SOURCES = \ msvcrt/complex.h \ msvcrt/conio.h \ msvcrt/corecrt.h \ + msvcrt/corecrt_io.h \ msvcrt/corecrt_startup.h \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wctype.h \ diff --git a/include/msvcrt/corecrt_io.h b/include/msvcrt/corecrt_io.h new file mode 100644 index 00000000000..d7554c3b1c6 --- /dev/null +++ b/include/msvcrt/corecrt_io.h @@ -0,0 +1,109 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _IO_DEFINED +#define _IO_DEFINED + +#include <corecrt_wio.h> + +#include <pshpack8.h> + +#if defined(_USE_32BIT_TIME_T) +# define _finddata_t _finddata32_t +# define _finddatai64_t _finddata32i64_t +#else +# define _finddata_t _finddata64i32_t +# define _finddatai64_t _finddata64_t +#endif + +struct _finddata32_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + _fsize_t size; + char name[260]; +}; + +struct _finddata32i64_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; + +struct _finddata64i32_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + _fsize_t size; + char name[260]; +}; + +struct _finddata64_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + char name[260]; +}; + +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _findfirst _findfirst32 +# define _findfirsti64 _findfirst32i64 +# define _findnext _findnext32 +# define _findnexti64 _findnext32i64 +# else +# define _findfirst _findfirst64i32 +# define _findfirsti64 _findfirst64 +# define _findnext _findnext64i32 +# define _findnexti64 _findnext64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _findfirst32 _findfirst +# define _findfirst32i64 _findfirsti64 +# define _findnext32 _findnext +# define _findnext32i64 _findnexti64 +# else +# define _findfirst64i32 _findfirst +# define _findfirst64 _findfirsti64 +# define _findnext64i32 _findnext +# define _findnext64 _findnexti64 +# endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +_ACRTIMP int __cdecl _access(const char*,int); +_ACRTIMP int __cdecl _chmod(const char*,int); +_ACRTIMP int __cdecl _creat(const char*,int); +_ACRTIMP intptr_t __cdecl _findfirst32(const char*,struct _finddata32_t*); +_ACRTIMP intptr_t __cdecl _findfirst32i64(const char*, struct _finddata32i64_t*); +_ACRTIMP intptr_t __cdecl _findfirst64(const char*,struct _finddata64_t*); +_ACRTIMP intptr_t __cdecl _findfirst64i32(const char*, struct _finddata64i32_t*); +_ACRTIMP int __cdecl _findnext32(intptr_t,struct _finddata32_t*); +_ACRTIMP int __cdecl _findnext32i64(intptr_t,struct _finddata32i64_t*); +_ACRTIMP int __cdecl _findnext64(intptr_t,struct _finddata64_t*); +_ACRTIMP int __cdecl _findnext64i32(intptr_t,struct _finddata64i32_t*); +_ACRTIMP char* __cdecl _mktemp(char*); +_ACRTIMP int WINAPIV _open(const char*,int,...); +_ACRTIMP int WINAPIV _sopen(const char*,int,int,...); +_ACRTIMP int __cdecl _unlink(const char*); + +#ifdef __cplusplus +} +#endif + +#include <poppack.h> + +#endif /* _IO_DEFINED */

1 0

Michael Stefaniuc : xmllite: Use a string literal for an empty string.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: c3aa9defbb4223a0115ec1315e42628bb5c613f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3aa9defbb4223a0115ec131… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Dec 3 00:32:47 2020 +0100 xmllite: Use a string literal for an empty string. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a463934202a..4793b128bae 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -210,7 +210,7 @@ typedef struct UINT start; /* input position where value starts */ } strval; -static WCHAR emptyW[] = {0}; +static WCHAR emptyW[] = L""; static WCHAR xmlW[] = L"xml"; static WCHAR xmlnsW[] = L"xmlns"; static const strval strval_empty = { (WCHAR *)emptyW, 0 };

1 0

Michael Stefaniuc : ntdll: Use wide-char string literals in version.c.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 4da4e98a7a1478c7871c105a81608ed78383b7d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da4e98a7a1478c7871c105a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:31 2020 +0100 ntdll: Use wide-char string literals in version.c. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/version.c | 177 +++++++++++++++++++-------------------------------- 1 file changed, 64 insertions(+), 113 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4da4e98a7a1478c7871c…

1 0

Michael Stefaniuc : ntdll: Use wide-char string literals.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 636d398c7d60bc29f7eb0ff46dc66849fb5665e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=636d398c7d60bc29f7eb0ff4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:32 2020 +0100 ntdll: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/atom.c | 3 +- dlls/ntdll/directory.c | 6 +-- dlls/ntdll/env.c | 138 +++++++++++++++---------------------------------- dlls/ntdll/loader.c | 107 +++++++++++++------------------------- dlls/ntdll/loadorder.c | 24 +++------ dlls/ntdll/locale.c | 8 ++- dlls/ntdll/path.c | 15 ++---- dlls/ntdll/reg.c | 31 +++-------- dlls/ntdll/relay.c | 32 ++++-------- dlls/ntdll/rtl.c | 6 +-- dlls/ntdll/rtlstr.c | 20 +++---- dlls/ntdll/sec.c | 7 ++- 12 files changed, 123 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=636d398c7d60bc29f7eb…

1 0

Michael Stefaniuc : ntdll: Print the correct debug string and not a random global variable.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: cdf1b61a47a2fee8befb2ccbcce4e891f60a24f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf1b61a47a2fee8befb2ccb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Dec 4 00:36:29 2020 +0100 ntdll: Print the correct debug string and not a random global variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index b99d1655d22..faccd21d4b1 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -3533,7 +3533,7 @@ static struct string_index *find_string_index(const struct strsection_header *se break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; } @@ -3794,7 +3794,7 @@ static NTSTATUS find_window_class(ACTIVATION_CONTEXT* actctx, const UNICODE_STRI break; } else - WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_w(nameW)); + WARN("hash collision 0x%08x, %s, %s\n", hash, debugstr_us(name), debugstr_us(&str)); } iter++; }

1 0

Zebediah Figura : mfplat: Zero-initialize the device manager object.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 1452e47f0a91b85afa0057c25dd14cbc65cecdff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1452e47f0a91b85afa0057c2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 3 20:55:39 2020 -0600 mfplat: Zero-initialize the device manager object. This fixes a crash for me when reallocating "handles", triggered by the mfplat tests. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index e4cd1c397ad..54bd70a2fff 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -8911,14 +8911,12 @@ HRESULT WINAPI MFCreateDXGIDeviceManager(UINT *token, IMFDXGIDeviceManager **man if (!token || !manager) return E_POINTER; - object = heap_alloc(sizeof(*object)); - if (!object) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->IMFDXGIDeviceManager_iface.lpVtbl = &dxgi_device_manager_vtbl; object->refcount = 1; object->token = GetTickCount(); - object->device = NULL; InitializeCriticalSection(&object->cs); InitializeConditionVariable(&object->lock);

1 0