wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Jacek Caban : corecrt_wstdio.h: Add ucrt fwprintf and vfwprintf declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 5fe1c9aac456ff2349d976df35fde0f56d968fb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fe1c9aac456ff2349d976df… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:34:07 2020 +0100 corecrt_wstdio.h: Add ucrt fwprintf and vfwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index a04e571f02..05f1d7f63f 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -71,7 +71,6 @@ wint_t __cdecl fgetwc(FILE*); wchar_t* __cdecl fgetws(wchar_t*,int,FILE*); wint_t __cdecl fputwc(wint_t,FILE*); int __cdecl fputws(const wchar_t*,FILE*); -int WINAPIV fwprintf(FILE*,const wchar_t*,...); int WINAPIV fwprintf_s(FILE*,const wchar_t*,...); int __cdecl fputws(const wchar_t*,FILE*); int WINAPIV fwscanf(FILE*,const wchar_t*,...); @@ -86,7 +85,6 @@ int WINAPIV swprintf_s(wchar_t*,size_t,const wchar_t*,...); int WINAPIV swscanf(const wchar_t*,const wchar_t*,...); int WINAPIV swscanf_s(const wchar_t*,const wchar_t*,...); wint_t __cdecl ungetwc(wint_t,FILE*); -int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); int __cdecl vfwprintf_s(FILE*,const wchar_t*,__ms_va_list); int __cdecl vswprintf_s(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl vwprintf(const wchar_t*,__ms_va_list); @@ -98,6 +96,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vfwprintf(unsigned __int64,FILE*,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); @@ -202,6 +201,22 @@ static inline int WINAPIV _scwprintf(const wchar_t *format, ...) return ret; } +static inline int __cdecl vfwprintf(FILE *file, const wchar_t *format, __ms_va_list args) +{ + return __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); +} + +static inline int WINAPIV fwprintf(FILE *file, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfwprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); @@ -212,6 +227,8 @@ _ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int WINAPIV fwprintf(FILE*,const wchar_t*,...); +_ACRTIMP int __cdecl vfwprintf(FILE*,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: e5771a94e756f6b9a137fb20759e18d69cb51e7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5771a94e756f6b9a137fb20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:58 2020 +0100 corecrt_wstdio.h: Add ucrt _vscwprintf_p_l and _vswprintf_p_l declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index a371d54cff..a04e571f02 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -56,8 +56,6 @@ wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); errno_t __cdecl _wfopen_s(FILE**,const wchar_t*,const wchar_t*); @@ -102,6 +100,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); _ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vswprintf_p(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { @@ -178,6 +177,19 @@ static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int __cdecl _vswprintf_p_l(wchar_t *buffer, size_t size, const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _vscwprintf_p_l(const wchar_t *format, _locale_t locale, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, locale, args); + return ret < 0 ? -1 : ret; +} + static inline int WINAPIV _scwprintf(const wchar_t *format, ...) { int ret; @@ -196,8 +208,10 @@ _ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); _ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 449959f4118b9d536dff2d5a64b70f640aee699f URL: https://source.winehq.org/git/wine.git/?a=commit;h=449959f4118b9d536dff2d5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:48 2020 +0100 corecrt_wstdio.h: Add ucrt _scwprintf and _vscwprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 65334ca0f9..a371d54cff 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,9 +55,7 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); -int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); @@ -173,10 +171,31 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) return ret < 0 ? -1 : ret; } +static inline int __cdecl _vscwprintf(const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV _scwprintf(const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ +_ACRTIMP int WINAPIV _scwprintf(const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); _ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); _ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _snwprintf_s and _vsnwprintf_s declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: ee02f93cc90d4ffeff6aab1ad63e40024fe01276 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee02f93cc90d4ffeff6aab1a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:35 2020 +0100 corecrt_wstdio.h: Add ucrt _snwprintf_s and _vsnwprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 31702129cd..65334ca0f9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,12 +55,10 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); FILE* __cdecl _wfopen(const wchar_t*,const wchar_t*); @@ -104,6 +102,7 @@ int WINAPIV wscanf_s(const wchar_t*,...); #ifdef _UCRT +_ACRTIMP int __cdecl __stdio_common_vsnwprintf_s(unsigned __int64,wchar_t*,size_t,size_t,const wchar_t*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) @@ -123,6 +122,23 @@ static inline int WINAPIV _snwprintf(wchar_t *buffer, size_t size, const wchar_t return ret; } +static inline int __cdecl _vsnwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int __cdecl _snwprintf_s(wchar_t *buffer, size_t size, size_t count, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsnwprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) { int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); @@ -160,7 +176,9 @@ static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) #else /* _UCRT */ _ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); +_ACRTIMP int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); _ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); +_ACRTIMP int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...);

1 0

Jacek Caban : corecrt_wstdio.h: Add ucrt _snwprintf, swprintf and _swprintf declarations.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: eec622931f5818adcffdee44ccb3bd0bdfa8e297 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eec622931f5818adcffdee44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 24 15:33:26 2020 +0100 corecrt_wstdio.h: Add ucrt _snwprintf, swprintf and _swprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wstdio.h | 64 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 87f74916c5..31702129cd 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -55,13 +55,11 @@ wint_t __cdecl _getwc_nolock(FILE*); wchar_t* __cdecl _getws(wchar_t*); wint_t __cdecl _putwc_nolock(wint_t,FILE*); int __cdecl _putws(const wchar_t*); -int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); int WINAPIV _snwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,...); int WINAPIV _scwprintf(const wchar_t*,...); wint_t __cdecl _ungetwc_nolock(wint_t,FILE*); int __cdecl _vscwprintf(const wchar_t*,__ms_va_list); int __cdecl _vscwprintf_p_l(const wchar_t*,_locale_t,__ms_va_list); -int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); int __cdecl _vsnwprintf_s(wchar_t*,size_t,size_t,const wchar_t*,__ms_va_list); int __cdecl _vswprintf_p_l(wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); FILE* __cdecl _wfdopen(int,const wchar_t*); @@ -104,6 +102,66 @@ int WINAPIV wprintf_s(const wchar_t*,...); int WINAPIV wscanf(const wchar_t*,...); int WINAPIV wscanf_s(const wchar_t*,...); +#ifdef _UCRT + +_ACRTIMP int __cdecl __stdio_common_vswprintf(unsigned __int64,wchar_t*,size_t,const wchar_t*,_locale_t,__ms_va_list); + +static inline int __cdecl _vsnwprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV _snwprintf(wchar_t *buffer, size_t size, const wchar_t* format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV vswprintf(wchar_t *buffer, size_t size, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV _vswprintf(wchar_t *buffer, const wchar_t *format, __ms_va_list args) +{ + int ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + return ret < 0 ? -1 : ret; +} + +static inline int WINAPIV _swprintf(wchar_t *buffer, const wchar_t *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vswprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret < 0 ? -1 : ret; +} + +#else /* _UCRT */ + +_ACRTIMP int WINAPIV _snwprintf(wchar_t*,size_t,const wchar_t*,...); +_ACRTIMP int __cdecl _vsnwprintf(wchar_t*,size_t,const wchar_t*,__ms_va_list); + #ifdef _CRT_NON_CONFORMING_SWPRINTFS int WINAPIV swprintf(wchar_t*,const wchar_t*,...); int __cdecl vswprintf(wchar_t*,const wchar_t*,__ms_va_list); @@ -121,6 +179,8 @@ static inline int WINAPIV swprintf(wchar_t *buffer, size_t size, const wchar_t * } #endif /* _CRT_NON_CONFORMING_SWPRINTFS */ +#endif /* _UCRT */ + #ifdef __cplusplus } #endif

1 0

Zhiyi Zhang : gdiplus: Fix a possible NULL pointer reference in GdipGetNearestColor().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 83e95a609c8ee598ddd8f1054974689e47e5168b URL: https://source.winehq.org/git/wine.git/?a=commit;h=83e95a609c8ee598ddd8f105… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Feb 24 11:06:16 2020 +0800 gdiplus: Fix a possible NULL pointer reference in GdipGetNearestColor(). Fix a regression from 5ca9da2c0197ac1260975c1b7b643dbd11185715. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48657 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e8606f6b60..af95c7aeea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4783,7 +4783,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics *graphics, ARGB* argb) if(graphics->busy) return ObjectBusy; - if (graphics->image->type == ImageTypeBitmap) + if (graphics->image && graphics->image->type == ImageTypeBitmap) { static int once; GpBitmap *bitmap = (GpBitmap *)graphics->image;

1 0

Francois Gouget : kernel32/tests: Check if CreateProcess() resets STARTUPINFO/PROCESS_INFORMATION.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 8adca32727ff40b845f4a517c43ed40da0143e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8adca32727ff40b845f4a517… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 05:04:00 2020 +0100 kernel32/tests: Check if CreateProcess() resets STARTUPINFO/PROCESS_INFORMATION. Our test framework depends on CreateProcess() initializing the hProcess field in case of a failure. The process tests depend on it not modifying the STARTUPINFO fields. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 46d7245777..b32560358d 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -895,10 +895,31 @@ static void test_CommandLine(void) startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; + /* failure case */ + strcpy(buffer, "\"t:\\NotADir\\NotAFile.exe\""); + memset(&info, 0xa, sizeof(info)); + ok(!CreateProcessA(buffer, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess unexpectedly succeeded\n"); + /* Check that the effective STARTUPINFOA parameters are not modified */ + ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); + ok(startup.lpDesktop == NULL, "lpDesktop is not NULL\n"); + ok(startup.lpTitle == NULL, "lpTitle is not NULL\n"); + ok(startup.dwFlags == STARTF_USESHOWWINDOW, "unexpected dwFlags %04x\n", startup.dwFlags); + ok(startup.wShowWindow == SW_SHOWNORMAL, "unexpected wShowWindow %d\n", startup.wShowWindow); + ok(!info.hProcess, "unexpected hProcess %p\n", info.hProcess); + ok(!info.hThread, "unexpected hThread %p\n", info.hThread); + ok(!info.dwProcessId, "unexpected dwProcessId %04x\n", info.dwProcessId); + ok(!info.dwThreadId, "unexpected dwThreadId %04x\n", info.dwThreadId); + /* the basics */ get_file_name(resfile); sprintf(buffer, "\"%s\" process dump \"%s\" \"C:\\Program Files\\my nice app.exe\" \"\"\"\"", selfname, resfile); ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); + /* Check that the effective STARTUPINFOA parameters are not modified */ + ok(startup.cb == sizeof(startup), "unexpected cb %d\n", startup.cb); + ok(startup.lpDesktop == NULL, "lpDesktop is not NULL\n"); + ok(startup.lpTitle == NULL, "lpTitle is not NULL\n"); + ok(startup.dwFlags == STARTF_USESHOWWINDOW, "unexpected dwFlags %04x\n", startup.dwFlags); + ok(startup.wShowWindow == SW_SHOWNORMAL, "unexpected wShowWindow %d\n", startup.wShowWindow); /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */ @@ -914,11 +935,6 @@ static void test_CommandLine(void) release_memory(); DeleteFileA(resfile); - memset(&startup, 0, sizeof(startup)); - startup.cb = sizeof(startup); - startup.dwFlags = STARTF_USESHOWWINDOW; - startup.wShowWindow = SW_SHOWNORMAL; - /* test main()'s quotes handling */ get_file_name(resfile); sprintf(buffer, "\"%s\" process dump \"%s\" \"a\\\"b\\\\\" c\\\" d", selfname, resfile);

1 0

Francois Gouget : kernel32/test: Simplify a couple of calls to 'process exit'.
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 1d8ee100642ef99bf5b3fa3ef50d405bbb8316b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d8ee100642ef99bf5b3fa3e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 05:03:52 2020 +0100 kernel32/test: Simplify a couple of calls to 'process exit'. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c4db9483fe..46d7245777 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2831,9 +2831,7 @@ static HANDLE test_AddSelfToJob(void) static void test_jobInheritance(HANDLE job) { - char buffer[MAX_PATH + 23]; PROCESS_INFORMATION pi; - STARTUPINFOA si = {0}; DWORD dwret; BOOL ret, out; @@ -2843,10 +2841,7 @@ static void test_jobInheritance(HANDLE job) return; } - sprintf(buffer, "\"%s\" process %s", selfname, "exit"); - - ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); - ok(ret, "CreateProcessA error %u\n", GetLastError()); + create_process("exit", &pi); out = FALSE; ret = pIsProcessInJob(pi.hProcess, job, &out); @@ -2875,8 +2870,7 @@ static void test_BreakawayOk(HANDLE job) return; } - sprintf(buffer, "\"%s\" process %s", selfname, "exit"); - + sprintf(buffer, "\"%s\" process exit", selfname); ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_BREAKAWAY_FROM_JOB, NULL, NULL, &si, &pi); ok(!ret, "CreateProcessA expected failure\n"); expect_eq_d(ERROR_ACCESS_DENIED, GetLastError());

1 0

Francois Gouget : kernel32/tests: Avoid a race in test_WaitForJobObject().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 995b44fe6118a5bfb05549addbc33ba9b7767b88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=995b44fe6118a5bfb05549ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 24 05:03:29 2020 +0100 kernel32/tests: Avoid a race in test_WaitForJobObject(). Waiting for and closing the job object does not kill the child process which then may print its 'tests executed' line at the same time as the parent traces, sometimes mangling failure messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 8e80bdba3a..c4db9483fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2809,6 +2809,7 @@ static void test_WaitForJobObject(void) dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); + WaitForSingleObject(pi.hProcess, 1000); CloseHandle(pi.hProcess); CloseHandle(pi.hThread); CloseHandle(job);

1 0

Nikolay Sivov : mf: Add MFCreateSimpleTypeHandler().
by Alexandre Julliard 24 Feb '20

24 Feb '20

Module: wine Branch: master Commit: 1e55b2c25283b28ddef34c83e7a1bf53adee22c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e55b2c25283b28ddef34c83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 24 16:37:11 2020 +0300 mf: Add MFCreateSimpleTypeHandler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mf/mf.spec | 2 +- dlls/mf/tests/mf.c | 66 ++++++++++++++++++++ include/mfidl.idl | 1 + 4 files changed, 248 insertions(+), 1 deletion(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index 251d59e1c0..5d645db200 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -1168,3 +1168,183 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) return create_activation_object(hwnd, &evr_activate_funcs, activate); } + +struct simple_type_handler +{ + IMFMediaTypeHandler IMFMediaTypeHandler_iface; + LONG refcount; + IMFMediaType *media_type; + CRITICAL_SECTION cs; +}; + +static struct simple_type_handler *impl_from_IMFMediaTypeHandler(IMFMediaTypeHandler *iface) +{ + return CONTAINING_RECORD(iface, struct simple_type_handler, IMFMediaTypeHandler_iface); +} + +static HRESULT WINAPI simple_type_handler_QueryInterface(IMFMediaTypeHandler *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaTypeHandler) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaTypeHandler_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI simple_type_handler_AddRef(IMFMediaTypeHandler *iface) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + ULONG refcount = InterlockedIncrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI simple_type_handler_Release(IMFMediaTypeHandler *iface) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + ULONG refcount = InterlockedDecrement(&handler->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + { + if (handler->media_type) + IMFMediaType_Release(handler->media_type); + DeleteCriticalSection(&handler->cs); + heap_free(handler); + } + + return refcount; +} + +static HRESULT WINAPI simple_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, IMFMediaType *in_type, + IMFMediaType **out_type) +{ + FIXME("%p, %p, %p.\n", iface, in_type, out_type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI simple_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) +{ + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_POINTER; + + *count = 1; + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, + IMFMediaType **type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %u, %p.\n", iface, index, type); + + if (index > 0) + return MF_E_NO_MORE_TYPES; + + EnterCriticalSection(&handler->cs); + *type = handler->media_type; + if (*type) + IMFMediaType_AddRef(*type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, media_type); + + EnterCriticalSection(&handler->cs); + if (handler->media_type) + IMFMediaType_Release(handler->media_type); + handler->media_type = media_type; + if (handler->media_type) + IMFMediaType_AddRef(handler->media_type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **media_type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p.\n", iface, media_type); + + if (!media_type) + return E_POINTER; + + EnterCriticalSection(&handler->cs); + *media_type = handler->media_type; + if (*media_type) + IMFMediaType_AddRef(*media_type); + LeaveCriticalSection(&handler->cs); + + return S_OK; +} + +static HRESULT WINAPI simple_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) +{ + struct simple_type_handler *handler = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; + + TRACE("%p, %p.\n", iface, type); + + EnterCriticalSection(&handler->cs); + if (handler->media_type) + hr = IMFMediaType_GetGUID(handler->media_type, &MF_MT_MAJOR_TYPE, type); + else + hr = MF_E_NOT_INITIALIZED; + LeaveCriticalSection(&handler->cs); + + return hr; +} + +static const IMFMediaTypeHandlerVtbl simple_type_handler_vtbl = +{ + simple_type_handler_QueryInterface, + simple_type_handler_AddRef, + simple_type_handler_Release, + simple_type_handler_IsMediaTypeSupported, + simple_type_handler_GetMediaTypeCount, + simple_type_handler_GetMediaTypeByIndex, + simple_type_handler_SetCurrentMediaType, + simple_type_handler_GetCurrentMediaType, + simple_type_handler_GetMajorType, +}; + +HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler) +{ + struct simple_type_handler *object; + + TRACE("%p.\n", handler); + + object = heap_alloc_zero(sizeof(*object)); + if (!object) + return E_OUTOFMEMORY; + + object->IMFMediaTypeHandler_iface.lpVtbl = &simple_type_handler_vtbl; + object->refcount = 1; + InitializeCriticalSection(&object->cs); + + *handler = &object->IMFMediaTypeHandler_iface; + + return S_OK; +} diff --git a/dlls/mf/mf.spec b/dlls/mf/mf.spec index a8dd314aa3..e396d01519 100644 --- a/dlls/mf/mf.spec +++ b/dlls/mf/mf.spec @@ -56,7 +56,7 @@ @ stub MFCreateSequencerSegmentOffset @ stdcall MFCreateSequencerSource(ptr ptr) @ stub MFCreateSequencerSourceRemoteStream -@ stub MFCreateSimpleTypeHandler +@ stdcall MFCreateSimpleTypeHandler(ptr) @ stdcall MFCreateSourceResolver(ptr) mfplat.MFCreateSourceResolver @ stdcall MFCreateStandardQualityManager(ptr) @ stdcall MFCreateTopoLoader(ptr) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index b353df780b..a1a7d2b05a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2595,6 +2595,71 @@ static void test_evr(void) IMFActivate_Release(activate); } +static void test_MFCreateSimpleTypeHandler(void) +{ + IMFMediaType *media_type, *media_type2; + IMFMediaTypeHandler *handler; + DWORD count; + HRESULT hr; + GUID guid; + + hr = MFCreateSimpleTypeHandler(&handler); + ok(hr == S_OK, "Failed to create object, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); + ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + media_type = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type, "Unexpected pointer.\n"); + + hr = MFCreateMediaType(&media_type); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type2 == media_type, "Unexpected type.\n"); + IMFMediaType_Release(media_type2); + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 1, &media_type2); + ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(media_type == media_type2, "Unexpected pointer.\n"); + IMFMediaType_Release(media_type2); + + IMFMediaType_Release(media_type); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == S_OK, "Failed to set current type, hr %#x.\n", hr); + + media_type = (void *)0xdeadbeef; + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &media_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!media_type, "Unexpected pointer.\n"); + + hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFMediaTypeHandler_Release(handler); +} + START_TEST(mf) { test_topology(); @@ -2609,4 +2674,5 @@ START_TEST(mf) test_quality_manager(); test_sar(); test_evr(); + test_MFCreateSimpleTypeHandler(); } diff --git a/include/mfidl.idl b/include/mfidl.idl index b301edbbdd..b1568b9b56 100644 --- a/include/mfidl.idl +++ b/include/mfidl.idl @@ -580,6 +580,7 @@ cpp_quote("HRESULT WINAPI MFCreateMFByteStreamOnStreamEx(IUnknown *stream, IMFBy cpp_quote("HRESULT WINAPI MFCreatePresentationClock(IMFPresentationClock **clock);") cpp_quote("HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor **descriptors,") cpp_quote(" IMFPresentationDescriptor **presentation_desc);") +cpp_quote("HRESULT WINAPI MFCreateSimpleTypeHandler(IMFMediaTypeHandler **handler);") cpp_quote("HRESULT WINAPI MFCreateSampleGrabberSinkActivate(IMFMediaType *media_type,") cpp_quote(" IMFSampleGrabberSinkCallback *callback, IMFActivate **activate);") cpp_quote("HRESULT WINAPI MFCreateSequencerSource(IUnknown *reserved, IMFSequencerSource **seq_source);" )

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
88
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 February 2020