February 2020 - Wine-Commits

Gabriel Ivăncescu : jscript: Move the clear_script_queue up to SCRIPTSTATE_INITIALIZED.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 3c517f502b2d73590dd9585f74c7943e98f9a36f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c517f502b2d73590dd9585f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:41 2020 +0100 jscript: Move the clear_script_queue up to SCRIPTSTATE_INITIALIZED. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jscript.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 8fc39c292c..98fe759fc2 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -363,6 +363,8 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) return; /* FALLTHROUGH */ case SCRIPTSTATE_INITIALIZED: + clear_script_queue(This); + if(This->ctx->host_global) { IDispatch_Release(This->ctx->host_global); This->ctx->host_global = NULL; @@ -402,7 +404,6 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) /* FALLTHROUGH */ case SCRIPTSTATE_UNINITIALIZED: change_state(This, state); - clear_script_queue(This); break; default: assert(0);

1 0

Olivier F. R. Dierick : shell32: Add a function to create one specific symbolic link at a time for user dirs.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 9cb47e882123dfdbc0f93ef0d7fb0068edda80d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cb47e882123dfdbc0f93ef0… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:43 2020 +0100 shell32: Add a function to create one specific symbolic link at a time for user dirs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 2012ecbe35..d32529bae3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4326,6 +4326,39 @@ static void _SHCreateDesktopSymbolicLink(void) _SHFreeXDGUserDirs(num, xdg_results); } +/****************************************************************************** + * _SHCreateSymbolicLink [Internal] + * + * Sets up a symbolic link for one of the special shell folders to point into + * the users home directory. + * + * PARAMS + * nFolder [I] CSIDL identifying the folder. + */ +static void _SHCreateSymbolicLink(int nFolder) +{ + static const UINT aidsMyStuff[] = { + IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES + }; + DWORD folder = nFolder & CSIDL_FOLDER_MASK; + + switch (folder) { + case CSIDL_PERSONAL: + _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); + break; + case CSIDL_MYPICTURES: + case CSIDL_MYVIDEO: + case CSIDL_MYMUSIC: + case CSIDL_DOWNLOADS: + case CSIDL_TEMPLATES: + _SHCreateMyStuffSymbolicLink(folder); + break; + case CSIDL_DESKTOPDIRECTORY: + _SHCreateDesktopSymbolicLink(); + break; + } +} + /****************************************************************************** * _SHCreateSymbolicLinks [Internal] * @@ -4351,22 +4384,13 @@ static void _SHCreateDesktopSymbolicLink(void) */ static void _SHCreateSymbolicLinks(void) { - static const UINT aidsMyStuff[] = { - IDS_MYPICTURES, IDS_MYVIDEOS, IDS_MYMUSIC, IDS_DOWNLOADS, IDS_TEMPLATES - }; static const int acsidlMyStuff[] = { - CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES + CSIDL_MYPICTURES, CSIDL_MYVIDEO, CSIDL_MYMUSIC, CSIDL_DOWNLOADS, CSIDL_TEMPLATES, CSIDL_PERSONAL, CSIDL_DESKTOPDIRECTORY }; UINT i; - _SHCreateMyDocumentsSymbolicLink(aidsMyStuff, ARRAY_SIZE(aidsMyStuff)); - - /* Create symbolic links for 'My Pictures', 'My Videos', 'My Music' etc. */ for (i=0; i < ARRAY_SIZE(acsidlMyStuff); i++) - _SHCreateMyStuffSymbolicLink(acsidlMyStuff[i]); - - /* Last but not least, the Desktop folder */ - _SHCreateDesktopSymbolicLink(); + _SHCreateSymbolicLink(acsidlMyStuff[i]); } /******************************************************************************

1 0

Olivier F. R. Dierick : shell32: Add helper functions for XDG directories lookup and resource deallocation.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 8c7c6e9b79c0818a5c0da0a3af812d28053bbf40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c7c6e9b79c0818a5c0da0a3… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:37 2020 +0100 shell32: Add helper functions for XDG directories lookup and resource deallocation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 9bec7091ae..8caf68dc55 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3948,6 +3948,43 @@ end: return hr; } +/************************************************************************* + * _SHGetXDGUserDirs [Internal] + * + * Get XDG directories paths from XDG configuration. + * + * PARAMS + * xdg_dirs [I] Array of XDG directories to look for. + * num_dirs [I] Number of elements in xdg_dirs. + * xdg_results [O] An array of the XDG directories paths. + */ +static inline void _SHGetXDGUserDirs(const char * const *xdg_dirs, const unsigned int num_dirs, char *** xdg_results) { + HRESULT hr; + + hr = XDG_UserDirLookup(xdg_dirs, num_dirs, xdg_results); + if (FAILED(hr)) *xdg_results = NULL; +} + +/************************************************************************* + * _SHFreeXDGUserDirs [Internal] + * + * Free resources allocated by XDG_UserDirLookup(). + * + * PARAMS + * num_dirs [I] Number of elements in xdg_results. + * xdg_results [I] An array of the XDG directories paths. + */ +static inline void _SHFreeXDGUserDirs(const unsigned int num_dirs, char ** xdg_results) { + UINT i; + + if (xdg_results) + { + for (i = 0; i < num_dirs; i++) + heap_free(xdg_results[i]); + heap_free(xdg_results); + } +} + /************************************************************************* * _SHAppendToUnixPath [Internal] * @@ -4069,8 +4106,7 @@ static void _SHCreateSymbolicLinks(void) pszPersonal = wine_get_unix_file_name(wszTempPath); if (!pszPersonal) return; - hr = XDG_UserDirLookup(xdg_dirs, num, &xdg_results); - if (FAILED(hr)) xdg_results = NULL; + _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); pszHome = getenv("HOME"); if (pszHome && !stat(pszHome, &statFolder) && S_ISDIR(statFolder.st_mode)) @@ -4204,13 +4240,7 @@ static void _SHCreateSymbolicLinks(void) } } - /* Free resources allocated by XDG_UserDirLookup() */ - if (xdg_results) - { - for (i = 0; i < num; i++) - heap_free(xdg_results[i]); - heap_free(xdg_results); - } + _SHFreeXDGUserDirs(num, xdg_results); } /******************************************************************************

1 0

Olivier F. R. Dierick : shell32: Create user folder symlinks on lookup and only if it's missing.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 2aad95254c19df21fc0f7c4413ca3874c8d87997 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aad95254c19df21fc0f7c44… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Wed Feb 19 00:16:44 2020 +0100 shell32: Create user folder symlinks on lookup and only if it's missing. Change the logic so that when a user folder already exists in the prefix, as a real directory or symbolic link, it's left as-is. Also create a symbolic link, instead of a real directory, when looking up a user folder that is currently missing. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22974 Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index d32529bae3..71267ecf58 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4116,8 +4116,8 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN const char *pszHome; char ** xdg_results; - /* Create all necessary profile sub-dirs up to 'My Documents' and get the unix path. */ - pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_CREATE); + /* Get the unix path of 'My Documents'. */ + pszPersonal = _SHGetFolderUnixPath(CSIDL_PERSONAL|CSIDL_FLAG_DONT_VERIFY); if (!pszPersonal) return; _SHGetXDGUserDirs(xdg_dirs, num, &xdg_results); @@ -4161,8 +4161,8 @@ static void _SHCreateMyDocumentsSymbolicLink(const UINT * aidsMyStuff, const UIN break; } - /* Replace 'My Documents' directory with a symlink or fail silently if not empty. */ - remove(pszPersonal); + /* Create symbolic link to 'My Documents' or fail silently if a directory + * or symlink exists. */ symlink(szPersonalTarget, pszPersonal); } else @@ -4233,8 +4233,8 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) while (1) { - /* Create the current 'My Whatever' folder and get its unix path. */ - pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_CREATE); + /* Get the current 'My Whatever' folder unix path. */ + pszMyStuff = _SHGetFolderUnixPath(acsidlMyStuff[i]|CSIDL_FLAG_DONT_VERIFY); if (!pszMyStuff) break; while (1) @@ -4266,7 +4266,6 @@ static void _SHCreateMyStuffSymbolicLink(int nFolder) strcpy(szMyStuffTarget, szPersonalTarget); break; } - remove(pszMyStuff); symlink(szMyStuffTarget, pszMyStuff); heap_free(pszMyStuff); break; @@ -4311,10 +4310,9 @@ static void _SHCreateDesktopSymbolicLink(void) (_SHAppendToUnixPath(szDesktopTarget, DesktopW) && !stat(szDesktopTarget, &statFolder) && S_ISDIR(statFolder.st_mode))) { - pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE); + pszDesktop = _SHGetFolderUnixPath(CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_DONT_VERIFY); if (pszDesktop) { - remove(pszDesktop); if (xdg_desktop_dir) symlink(xdg_desktop_dir, pszDesktop); else @@ -4599,6 +4597,10 @@ HRESULT WINAPI SHGetFolderPathAndSubDirW( goto end; } + /* create symbolic links rather than directories for specific + * user shell folders */ + _SHCreateSymbolicLink(folder); + /* create directory/directories */ ret = SHCreateDirectoryExW(hwndOwner, szBuildPath, NULL); if (ret && ret != ERROR_ALREADY_EXISTS) @@ -5232,6 +5234,10 @@ HRESULT WINAPI SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, DWORD flags, HANDLE t goto failed; } + /* create symbolic links rather than directories for specific + * user shell folders */ + _SHCreateSymbolicLink(folder); + /* create directory/directories */ ret = SHCreateDirectoryExW(NULL, pathW, NULL); if (ret && ret != ERROR_ALREADY_EXISTS)

1 0

Zebediah Figura : quartz/filtergraph: Iterate over all filters in state change methods.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 05a8d45e8a0c401f7b6b008ae62212115bce4bb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a8d45e8a0c401f7b6b008a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:58 2020 -0600 quartz/filtergraph: Iterate over all filters in state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/dmowrapper.c | 12 +- dlls/quartz/filtergraph.c | 310 ++++++++++++++------------------------ dlls/quartz/tests/avisplit.c | 8 +- dlls/quartz/tests/filtergraph.c | 42 +++--- dlls/quartz/tests/videorenderer.c | 32 ++-- dlls/quartz/tests/vmr7.c | 20 +-- dlls/quartz/tests/vmr9.c | 20 +-- 7 files changed, 178 insertions(+), 266 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05a8d45e8a0c401f7b6b…

1 0

Jacek Caban : stdio.h: Add ucrt _vscprintf declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: b8681acd46bf4e8757b78c28f4a89291ae61ba81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8681acd46bf4e8757b78c28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:21:48 2020 +0100 stdio.h: Add ucrt _vscprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9a7e4b69eb..8eef90bbf6 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -88,7 +88,6 @@ int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); int WINAPIV _scprintf(const char*,...); -int __cdecl _vscprintf(const char*,__ms_va_list); int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); @@ -190,8 +189,16 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } +static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) +{ + int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + return ret < 0 ? -1 : ret; +} + #else /* _UCRT */ +_ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list);

1 0

Jacek Caban : include: Include sys/stat.h from wchar.h.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 6187ee134607568a02f95c8dd34cdba658b419a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6187ee134607568a02f95c8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:50:01 2020 +0100 include: Include sys/stat.h from wchar.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/sys/stat.h | 4 -- include/msvcrt/wchar.h | 136 +--------------------------------------------- 2 files changed, 1 insertion(+), 139 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index f305984798..15cf823739 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -167,14 +167,10 @@ int __cdecl _stati64(const char*,struct _stati64*); int __cdecl _fstat64(int,struct _stat64*); int __cdecl _stat64(const char*,struct _stat64*); int __cdecl _umask(int); - -#ifndef _WSTAT_DEFINED -#define _WSTAT_DEFINED int __cdecl _wstat(const wchar_t*,struct _stat*); int __cdecl _wstat32(const wchar_t*, struct _stat32*); int __cdecl _wstati64(const wchar_t*,struct _stati64*); int __cdecl _wstat64(const wchar_t*,struct _stat64*); -#endif /* _WSTAT_DEFINED */ #ifdef __cplusplus } diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index b93fec9de7..0b7be92174 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -12,6 +12,7 @@ #include <corecrt_wio.h> #include <corecrt_wtime.h> #include <string.h> +#include <sys/stat.h> #include <pshpack8.h> @@ -24,135 +25,8 @@ extern "C" { #define WCHAR_MAX 0xffffU #endif -#ifndef DECLSPEC_ALIGN -# if defined(_MSC_VER) && (_MSC_VER >= 1300) && !defined(MIDL_PASS) -# define DECLSPEC_ALIGN(x) __declspec(align(x)) -# elif defined(__GNUC__) -# define DECLSPEC_ALIGN(x) __attribute__((aligned(x))) -# else -# define DECLSPEC_ALIGN(x) -# endif -#endif - typedef int mbstate_t; -#ifndef _DEV_T_DEFINED -typedef unsigned int _dev_t; -#define _DEV_T_DEFINED -#endif - -#ifndef _INO_T_DEFINED -typedef unsigned short _ino_t; -#define _INO_T_DEFINED -#endif - -#ifndef _OFF_T_DEFINED -typedef int _off_t; -#define _OFF_T_DEFINED -#endif - -#ifndef _STAT_DEFINED -#define _STAT_DEFINED - -struct _stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time32_t st_atime; - __time32_t st_mtime; - __time32_t st_ctime; -}; - -struct _stat32i64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat64i32 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - _off_t st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; - -struct _stati64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; -}; - -struct _stat64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 DECLSPEC_ALIGN(8) st_size; - __time64_t st_atime; - __time64_t st_mtime; - __time64_t st_ctime; -}; -#endif /* _STAT_DEFINED */ - /* ASCII char classification table - binary compatible */ #define _UPPER 0x0001 /* C1_UPPER */ #define _LOWER 0x0002 /* C1_LOWER */ @@ -221,14 +95,6 @@ int __cdecl _wspawnvpe(int,const wchar_t*,const wchar_t* const *,const wcha int __cdecl _wsystem(const wchar_t*); #endif /* _WPROCESS_DEFINED */ -#ifndef _WSTAT_DEFINED -#define _WSTAT_DEFINED -int __cdecl _wstat(const wchar_t*,struct _stat*); -int __cdecl _wstat32(const wchar_t*, struct _stat32*); -int __cdecl _wstati64(const wchar_t*,struct _stati64*); -int __cdecl _wstat64(const wchar_t*,struct _stat64*); -#endif /* _WSTAT_DEFINED */ - #ifndef _WSTDLIB_DEFINED #define _WSTDLIB_DEFINED wchar_t* __cdecl _itow(int,wchar_t*,int);

1 0

Jacek Caban : stdio.h: Add ucrt vfprintf_s declaration.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 62d43ed4180bca17035c06a9b0efd9b8a52278d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62d43ed4180bca17035c06a9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:22:35 2020 +0100 stdio.h: Add ucrt vfprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index a31eada276..33d33aa7b4 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -154,7 +154,6 @@ int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); -int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); int __cdecl vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); @@ -163,6 +162,7 @@ unsigned int __cdecl _set_output_format(void); #ifdef _UCRT _ACRTIMP int __cdecl __stdio_common_vfprintf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vfprintf_s(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); @@ -219,12 +219,18 @@ static inline int __cdecl vfprintf(FILE *file, const char *format, __ms_va_list return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); } +static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + #else /* _UCRT */ _ACRTIMP int __cdecl _vscprintf(const char*,__ms_va_list); _ACRTIMP int __cdecl _vsnprintf_s(char*,size_t,size_t,const char*,__ms_va_list); _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf(char*,const char*,__ms_va_list); _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list);

1 0

Zebediah Figura : winegstreamer: Decommit the source allocator when cleaning up the stream.
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 540f2983a97e033acc8ba3c72ca38a1ca0ed67ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=540f2983a97e033acc8ba3c7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 19 20:44:52 2020 -0600 winegstreamer: Decommit the source allocator when cleaning up the stream. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 1337cd0a81..488c9bd8a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1455,6 +1455,7 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) { struct gstdemux *filter = impl_from_strmbase_filter(iface); GstStateChangeReturn ret; + unsigned int i; if (!filter->container) return S_OK; @@ -1468,6 +1469,12 @@ static HRESULT gstdemux_cleanup_stream(struct strmbase_filter *iface) gst_element_get_state(filter->container, NULL, NULL, GST_CLOCK_TIME_NONE); filter->ignore_flush = FALSE; + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IMemAllocator_Decommit(filter->sources[i]->pin.pAllocator); + } + return S_OK; }

1 0

Zebediah Figura : quartz/filtergraph: Use IFilterGraph2::ConnectDirect() instead of calling IPin::Connect().
by Alexandre Julliard Feb. 20, 2020

Feb. 20, 2020

Module: wine Branch: master Commit: 7a392c55d64e55363acb94d9da0be780193b4add URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a392c55d64e55363acb94d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:55 2020 -0600 quartz/filtergraph: Use IFilterGraph2::ConnectDirect() instead of calling IPin::Connect(). It will need to do some bookkeeping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 60bea5542f..46ae113a4b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1123,7 +1123,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto out; /* Try direct connection first */ - hr = IPin_Connect(ppinOut, ppinIn, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinIn, NULL); /* If direct connection succeeded, we should propagate that return value. * If it returned VFW_E_NOT_CONNECTED or VFW_E_NO_AUDIO_HARDWARE, then don't @@ -1279,7 +1279,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IPin_Connect(ppinOut, ppinfilter, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); if (FAILED(hr)) { TRACE("Cannot connect to filter (%x), trying next one\n", hr); goto error; @@ -1591,7 +1591,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) } /* Connect the pin to the "Renderer" */ - hr = IPin_Connect(ppinOut, ppinfilter, NULL); + hr = IFilterGraph2_ConnectDirect(iface, ppinOut, ppinfilter, NULL); IPin_Release(ppinfilter); if (FAILED(hr)) {

1 0