February 2020 - Wine-commits

Gabriel Ivăncescu : jscript: Move the named_item_t definition.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f6a4dda977f0f1285889bd2191d02199765ceb94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a4dda977f0f1285889bd21… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:45 2020 +0100 jscript: Move the named_item_t definition. 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.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 8db76bb50d..113ec99c0d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -204,6 +204,14 @@ typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t) DECLSPEC_HIDDEN; +typedef struct named_item_t { + IDispatch *disp; + DWORD flags; + LPWSTR name; + + struct named_item_t *next; +} named_item_t; + typedef struct { const WCHAR *name; builtin_invoke_t invoke; @@ -356,14 +364,6 @@ static inline BOOL is_digit(WCHAR c) return '0' <= c && c <= '9'; } -typedef struct named_item_t { - IDispatch *disp; - DWORD flags; - LPWSTR name; - - struct named_item_t *next; -} named_item_t; - typedef struct _cc_var_t cc_var_t; typedef struct {

1 0

Gabriel Ivăncescu : jscript: Lookup the named item using a helper function.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 0242ae52e66712cb1b899a41affb419071ca976a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0242ae52e66712cb1b899a41… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:49 2020 +0100 jscript: Lookup the named item using a helper function. 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/engine.c | 34 ++++++---------------------------- dlls/jscript/jscript.c | 35 +++++++++++++++++++++++++++++++++++ dlls/jscript/jscript.h | 2 ++ 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index f94cfd1e80..4e28b6332d 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -662,34 +662,12 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } - for(item = ctx->named_items; item; item = item->next) { - if((item->flags & SCRIPTITEM_ISVISIBLE) && !wcscmp(item->name, identifier)) { - if(!item->disp) { - IUnknown *unk; - - if(!ctx->site) - break; - - hres = IActiveScriptSite_GetItemInfo(ctx->site, identifier, - SCRIPTINFO_IUNKNOWN, &unk, NULL); - if(FAILED(hres)) { - WARN("GetItemInfo failed: %08x\n", hres); - break; - } - - hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); - IUnknown_Release(unk); - if(FAILED(hres)) { - WARN("object does not implement IDispatch\n"); - break; - } - } - - IDispatch_AddRef(item->disp); - ret->type = EXPRVAL_JSVAL; - ret->u.val = jsval_disp(item->disp); - return S_OK; - } + item = lookup_named_item(ctx, identifier, SCRIPTITEM_ISVISIBLE); + if(item) { + IDispatch_AddRef(item->disp); + ret->type = EXPRVAL_JSVAL; + ret->u.val = jsval_disp(item->disp); + return S_OK; } if(lookup_global_members(ctx, identifier, ret)) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 98fe759fc2..197043745d 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -108,6 +108,41 @@ static inline BOOL is_started(script_ctx_t *ctx) || ctx->state == SCRIPTSTATE_DISCONNECTED; } +named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsigned flags) +{ + named_item_t *item; + HRESULT hr; + + for(item = ctx->named_items; item; item = item->next) { + if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { + if(!item->disp) { + IUnknown *unk; + + if(!ctx->site) + return NULL; + + hr = IActiveScriptSite_GetItemInfo(ctx->site, item_name, + SCRIPTINFO_IUNKNOWN, &unk, NULL); + if(FAILED(hr)) { + WARN("GetItemInfo failed: %08x\n", hr); + continue; + } + + hr = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&item->disp); + IUnknown_Release(unk); + if(FAILED(hr)) { + WARN("object does not implement IDispatch\n"); + continue; + } + } + + return item; + } + } + + return NULL; +} + static inline JScriptError *impl_from_IActiveScriptError(IActiveScriptError *iface) { return CONTAINING_RECORD(iface, JScriptError, IActiveScriptError_iface); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 113ec99c0d..8297838ab3 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -212,6 +212,8 @@ typedef struct named_item_t { struct named_item_t *next; } named_item_t; +named_item_t *lookup_named_item(script_ctx_t*,const WCHAR*,unsigned) DECLSPEC_HIDDEN; + typedef struct { const WCHAR *name; builtin_invoke_t invoke;

1 0

Gabriel Ivăncescu : jscript: Implement the SCRIPTITEM_CODEONLY flag.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f32a729032bd25f4a61956c3689dacf59958b098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f32a729032bd25f4a61956c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:26:54 2020 +0100 jscript: Implement the SCRIPTITEM_CODEONLY flag. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 197043745d..f97c36f5be 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -115,7 +115,7 @@ named_item_t *lookup_named_item(script_ctx_t *ctx, const WCHAR *item_name, unsig for(item = ctx->named_items; item; item = item->next) { if((item->flags & flags) == flags && !wcscmp(item->name, item_name)) { - if(!item->disp) { + if(!item->disp && (flags || !(item->flags & SCRIPTITEM_CODEONLY))) { IUnknown *unk; if(!ctx->site)

1 0

Gabriel Ivăncescu : jscript: Preserve the 'enter_notified' field when an error occurs.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 9576ff70482eff2a4359534a84059ac398f9175f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9576ff70482eff2a4359534a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Feb 20 21:28:01 2020 +0100 jscript: Preserve the 'enter_notified' field when an error occurs. 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 f97c36f5be..5e02d4f614 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -306,6 +306,7 @@ void enter_script(script_ctx_t *ctx, jsexcept_t *ei) HRESULT leave_script(script_ctx_t *ctx, HRESULT result) { jsexcept_t *ei = ctx->ei; + BOOL enter_notified = ei->enter_notified; JScriptError *error; TRACE("ctx %p ei %p prev %p\n", ctx, ei, ei->prev); @@ -333,7 +334,7 @@ HRESULT leave_script(script_ctx_t *ctx, HRESULT result) result = SCRIPT_E_REPORTED; } } - if(ei->enter_notified && ctx->site) + if(enter_notified && ctx->site) IActiveScriptSite_OnLeaveScript(ctx->site); reset_ei(ei); return result;

1 0

Jacek Caban : stdio.h: Add ucrt vfprintf_s declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

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

Jacek Caban : include: Add corecrt_wtime.h file.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: f0779722c33779d937b22773003b4bf7d64735ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0779722c33779d937b22773… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 20 15:49:42 2020 +0100 include: Add corecrt_wtime.h file. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/corecrt_wtime.h | 48 ++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/time.h | 39 +--------------------------------- include/msvcrt/wchar.h | 38 +-------------------------------- 4 files changed, 51 insertions(+), 75 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 506e5fc96a..fbfbf72be0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -427,6 +427,7 @@ SOURCES = \ msvcrt/corecrt_stdio_config.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ + msvcrt/corecrt_wtime.h \ msvcrt/crtdbg.h \ msvcrt/crtdefs.h \ msvcrt/ctype.h \ diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h new file mode 100644 index 0000000000..3422b2d349 --- /dev/null +++ b/include/msvcrt/corecrt_wtime.h @@ -0,0 +1,48 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WTIME_DEFINED +#define _WTIME_DEFINED + +#include <corecrt.h> + +struct tm { + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; +}; + +#ifdef _USE_32BIT_TIME_T +#define _wctime32 _wctime +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +wchar_t* __cdecl _wasctime(const struct tm*); +size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); +wchar_t* __cdecl _wctime32(const __time32_t*); +wchar_t* __cdecl _wctime64(const __time64_t*); +wchar_t* __cdecl _wstrdate(wchar_t*); +errno_t __cdecl _wstrdate_s(wchar_t*,size_t); +wchar_t* __cdecl _wstrtime(wchar_t*); +errno_t __cdecl _wstrtime_s(wchar_t*,size_t); + +#ifndef _USE_32BIT_TIME_T +static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* _WTIME_DEFINED */ diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 9ed27f5f9e..61df364d21 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -20,7 +20,7 @@ #ifndef __WINE_TIME_H #define __WINE_TIME_H -#include <corecrt.h> +#include <corecrt_wtime.h> #include <pshpack8.h> @@ -33,21 +33,6 @@ typedef __msvcrt_long clock_t; #define CLOCKS_PER_SEC 1000 #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifdef __cplusplus extern "C" { #endif @@ -113,28 +98,6 @@ static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } #endif -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index d5ae3561d0..b93fec9de7 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -10,6 +10,7 @@ #include <corecrt_wstdio.h> #include <corecrt_wio.h> +#include <corecrt_wtime.h> #include <string.h> #include <pshpack8.h> @@ -50,21 +51,6 @@ typedef int _off_t; #define _OFF_T_DEFINED #endif -#ifndef _TM_DEFINED -#define _TM_DEFINED -struct tm { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; -}; -#endif /* _TM_DEFINED */ - #ifndef _STAT_DEFINED #define _STAT_DEFINED @@ -326,28 +312,6 @@ wchar_t* __cdecl wcstok(wchar_t*,const wchar_t*); size_t __cdecl wcsxfrm(wchar_t*,const wchar_t*,size_t); #endif /* _WSTRING_DEFINED */ -#ifndef _WTIME_DEFINED -#define _WTIME_DEFINED - -#ifdef _USE_32BIT_TIME_T -#define _wctime32 _wctime -#endif - -wchar_t* __cdecl _wasctime(const struct tm*); -size_t __cdecl wcsftime(wchar_t*,size_t,const wchar_t*,const struct tm*); -wchar_t* __cdecl _wctime32(const __time32_t*); -wchar_t* __cdecl _wctime64(const __time64_t*); -wchar_t* __cdecl _wstrdate(wchar_t*); -errno_t __cdecl _wstrdate_s(wchar_t*,size_t); -wchar_t* __cdecl _wstrtime(wchar_t*); -errno_t __cdecl _wstrtime_s(wchar_t*,size_t); - -#ifndef _USE_32BIT_TIME_T -static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } -#endif - -#endif /* _WTIME_DEFINED */ - wchar_t __cdecl btowc(int); size_t __cdecl mbrlen(const char *,size_t,mbstate_t*); size_t __cdecl mbrtowc(wchar_t*,const char*,size_t,mbstate_t*);

1 0

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

21 Feb '20

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

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

21 Feb '20

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 : strmbase/renderer: Return S_FALSE when pausing the stream if approprate.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: fb45f9a8061271acad445af3037496156643569e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb45f9a8061271acad445af3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 19 20:44:53 2020 -0600 strmbase/renderer: Return S_FALSE when pausing the stream if approprate. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f2154393d..6b5a5e80e3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -88,7 +88,7 @@ static HRESULT renderer_init_stream(struct strmbase_filter *iface) if (filter->pFuncsTable->renderer_init_stream) filter->pFuncsTable->renderer_init_stream(filter); - return S_OK; + return filter->sink.pin.peer ? S_FALSE : S_OK; } static HRESULT renderer_start_stream(struct strmbase_filter *iface, REFERENCE_TIME start)

1 0

Zebediah Figura : quartz/tests: Add a test for cyclic connections.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 436dbfd939d44e053a0bea6f289eaa9609b49cf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=436dbfd939d44e053a0bea6f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 19 20:44:54 2020 -0600 quartz/tests: Add a test for cyclic connections. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 62 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index b36605f396..fd73a9ad83 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -2286,6 +2286,7 @@ todo_wine IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + parser1_pins[1].QueryInternalConnections_hr = E_NOTIMPL; /* A pin whose name (not ID) begins with a tilde is not connected. */ @@ -2316,6 +2317,14 @@ todo_wine IFilterGraph2_Disconnect(graph, sink_pin.peer); IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface); + hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface); + todo_wine ok(hr == VFW_E_CANNOT_CONNECT, "Got hr %#x.\n", hr); + + parser1_pins[0].QueryInternalConnections_hr = S_OK; + hr = IFilterGraph2_Connect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + parser1_pins[0].QueryInternalConnections_hr = E_NOTIMPL; + ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref); @@ -2763,25 +2772,28 @@ static const IPinVtbl test_connect_direct_vtbl = static void test_connect_direct_init(struct testpin *pin, PIN_DIRECTION dir) { - memset(pin, 0, sizeof(*pin)); - pin->IPin_iface.lpVtbl = &test_connect_direct_vtbl; - pin->ref = 1; - pin->dir = dir; + testpin_init(pin, &test_connect_direct_vtbl, dir); } static void test_connect_direct(void) { - struct testpin source_pin, sink_pin; - struct testfilter source, sink; + struct testpin source_pin, sink_pin, parser1_pins[2], parser2_pins[2]; + struct testfilter source, sink, parser1, parser2; IFilterGraph2 *graph = create_graph(); AM_MEDIA_TYPE mt; HRESULT hr; test_connect_direct_init(&source_pin, PINDIR_OUTPUT); - test_connect_direct_init(&sink_pin, PINDIR_INPUT); testfilter_init(&source, &source_pin, 1); + test_connect_direct_init(&sink_pin, PINDIR_INPUT); testfilter_init(&sink, &sink_pin, 1); + test_connect_direct_init(&parser1_pins[0], PINDIR_INPUT); + test_connect_direct_init(&parser1_pins[1], PINDIR_OUTPUT); + testfilter_init(&parser1, parser1_pins, 2); + test_connect_direct_init(&parser2_pins[0], PINDIR_INPUT); + test_connect_direct_init(&parser2_pins[1], PINDIR_OUTPUT); + testfilter_init(&parser2, parser2_pins, 2); hr = IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -2935,6 +2947,42 @@ todo_wine hr = IFilterGraph2_Disconnect(graph, &source_pin.IPin_iface); ok(hr == S_OK, "Got hr %#x.\n", hr); + /* ConnectDirect() protects against cyclical connections. */ + hr = IFilterGraph2_AddFilter(graph, &parser1.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_AddFilter(graph, &parser2.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + ok(hr == VFW_E_CIRCULAR_GRAPH, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser2_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &parser2_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + todo_wine ok(hr == VFW_E_CIRCULAR_GRAPH, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser2_pins[0].IPin_iface); + + parser1_pins[0].QueryInternalConnections_hr = S_OK; + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!parser1_pins[0].peer, "Got peer %p.\n", parser1_pins[0].peer); + todo_wine ok(parser1_pins[1].peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", parser1_pins[1].peer); + IFilterGraph2_Disconnect(graph, &parser1_pins[0].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + + hr = IFilterGraph2_ConnectDirect(graph, &parser1_pins[1].IPin_iface, &parser2_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_ConnectDirect(graph, &parser2_pins[1].IPin_iface, &parser1_pins[0].IPin_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IFilterGraph2_Disconnect(graph, &parser1_pins[1].IPin_iface); + IFilterGraph2_Disconnect(graph, &parser2_pins[0].IPin_iface); + + hr = IFilterGraph2_RemoveFilter(graph, &parser1.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_RemoveFilter(graph, &parser2.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + /* Both pins are disconnected when a filter is removed. */ hr = IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, &mt); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0