wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Jacek Caban : stdio.h: Add ucrt fscanf and fscanf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 8a5983197a6ae0d3312f8af6afda875a987298fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a5983197a6ae0d3312f8af6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:26 2020 +0100 stdio.h: Add ucrt fscanf and fscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 42799223d9..6e4a58e41e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -118,8 +118,6 @@ int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); size_t __cdecl fread_s(void*,size_t,size_t,size_t,FILE*); FILE* __cdecl freopen(const char*,const char*,FILE*); -int WINAPIV fscanf(FILE*,const char*,...); -int WINAPIV fscanf_s(FILE*,const char*,...); int __cdecl fseek(FILE*,__msvcrt_long,int); int __cdecl _fseeki64(FILE*,__int64,int); int __cdecl fsetpos(FILE*,fpos_t*); @@ -158,6 +156,8 @@ _ACRTIMP int __cdecl __stdio_common_vsprintf_p(unsigned __int64,char*,size_t,con _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,const char*,_locale_t,__ms_va_list); _ACRTIMP int __cdecl __stdio_common_vsnprintf_s(unsigned __int64,char*,size_t,size_t,const char*,_locale_t,__ms_va_list); +_ACRTIMP int __cdecl __stdio_common_vfscanf(unsigned __int64,FILE*,const char*,_locale_t,__ms_va_list); + static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, @@ -302,6 +302,28 @@ static inline int WINAPIV printf_s(const char *format, ...) return ret; } +static inline int WINAPIV fscanf(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -324,6 +346,9 @@ _ACRTIMP int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); int __cdecl _vsnprintf(char*,size_t,const char*,__ms_va_list); static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { return _vsnprintf(buffer,size,format,args); } +_ACRTIMP int WINAPIV fscanf(FILE*,const char*,...); +_ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...); + #endif /* _UCRT */ #endif /* _STDIO_DEFINED */

1 0

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

21 Feb '20

Module: wine Branch: master Commit: 6805ae0f05e274208635e0394326b5101847cb7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6805ae0f05e274208635e039… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:15 2020 +0100 stdio.h: Add ucrt sprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 76bf70d81b..42799223d9 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -140,7 +140,6 @@ int WINAPIV scanf(const char*,...); int WINAPIV scanf_s(const char*,...); void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); -int WINAPIV sprintf_s(char*,size_t,const char*,...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); @@ -222,6 +221,17 @@ static inline int __cdecl vsprintf_s(char *buffer, const char *format, __ms_va_l return ret < 0 ? -1 : ret; } +static inline int WINAPIV sprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl _vsprintf_p_l(char *buffer, size_t size, const char *format, _locale_t locale, __ms_va_list args) { int ret = __stdio_common_vsprintf_p(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, format, locale, args); @@ -303,6 +313,7 @@ _ACRTIMP int WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV printf(const char*,...); _ACRTIMP int WINAPIV printf_s(const char*,...); +_ACRTIMP int WINAPIV sprintf_s(char*,size_t,const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vprintf(const char*,__ms_va_list);

1 0

Jacek Caban : stdio.h: Add ucrt printf_s and vprintf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 95be8e4928ac6cd4361ca34f27213fd24ad6fe2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=95be8e4928ac6cd4361ca34f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:07 2020 +0100 stdio.h: Add ucrt printf_s and vprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index ebdcd616cb..76bf70d81b 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,7 +130,6 @@ int __cdecl getc(FILE*); int __cdecl getchar(void); char* __cdecl gets(char*); void __cdecl perror(const char*); -int WINAPIV printf_s(const char*,...); int __cdecl putc(int,FILE*); int __cdecl putchar(int); int __cdecl puts(const char*); @@ -148,7 +147,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 vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -278,6 +276,22 @@ static inline int WINAPIV printf(const char *format, ...) return ret; } +static inline int vprintf_s(const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV printf_s(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -288,9 +302,11 @@ _ACRTIMP int __cdecl _vsprintf_p_l(char*,size_t,const char*,_locale_t,__ms_va_li _ACRTIMP int WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV printf(const char*,...); +_ACRTIMP int WINAPIV printf_s(const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vprintf(const char*,__ms_va_list); +_ACRTIMP int __cdecl vprintf_s(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 : stdio.h: Add ucrt printf and vprintf declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 04ad51b3e50cd92dc8e0dd529b57b6423c3eced5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04ad51b3e50cd92dc8e0dd52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:57 2020 +0100 stdio.h: Add ucrt printf and vprintf declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 9aebcb64c5..ebdcd616cb 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -130,7 +130,6 @@ int __cdecl getc(FILE*); int __cdecl getchar(void); char* __cdecl gets(char*); void __cdecl perror(const char*); -int WINAPIV printf(const char*,...); int WINAPIV printf_s(const char*,...); int __cdecl putc(int,FILE*); int __cdecl putchar(int); @@ -149,7 +148,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 vprintf(const char*,__ms_va_list); int __cdecl vprintf_s(const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); unsigned int __cdecl _set_output_format(void); @@ -264,6 +262,22 @@ static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) return ret; } +static inline int vprintf(const char *format, __ms_va_list args) +{ + return __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); +} + +static inline int WINAPIV printf(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, stdout, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -273,8 +287,10 @@ _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 WINAPIV fprintf(FILE*,const char*,...); _ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); +_ACRTIMP int WINAPIV printf(const char*,...); _ACRTIMP int __cdecl vfprintf(FILE*,const char*,__ms_va_list); _ACRTIMP int __cdecl vfprintf_s(FILE*,const char*,__ms_va_list); +_ACRTIMP int __cdecl vprintf(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 : stdio.h: Add ucrt fprintf and fprintf_s declarations.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 39b1d610d8605bc672e11ba4182d2938f61cf9bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=39b1d610d8605bc672e11ba4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:51 2020 +0100 stdio.h: Add ucrt fprintf and fprintf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index b246182e8c..9aebcb64c5 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -113,8 +113,6 @@ int __cdecl fgetpos(FILE*,fpos_t*); char* __cdecl fgets(char*,int,FILE*); FILE* __cdecl fopen(const char*,const char*); errno_t __cdecl fopen_s(FILE**,const char*,const char*); -int WINAPIV fprintf(FILE*,const char*,...); -int WINAPIV fprintf_s(FILE*,const char*,...); int __cdecl fputc(int,FILE*); int __cdecl fputs(const char*,FILE*); size_t __cdecl fread(void*,size_t,size_t,FILE*); @@ -239,11 +237,33 @@ 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 WINAPIV fprintf(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + 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); } +static inline int WINAPIV fprintf_s(FILE *file, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, file, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -251,6 +271,8 @@ _ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); _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 WINAPIV fprintf(FILE*,const char*,...); +_ACRTIMP int WINAPIV fprintf_s(FILE*,const char*,...); _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);

1 0

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

21 Feb '20

Module: wine Branch: master Commit: 6bc15730457b780c47374d3e922287cafd36b233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc15730457b780c47374d3e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:45 2020 +0100 stdio.h: Add ucrt _snprintf_s declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 0fc374b06e..b246182e8c 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -84,7 +84,6 @@ int __cdecl _putw(int,FILE*); int __cdecl _rmtmp(void); int __cdecl _set_printf_count_output(int); int __cdecl _setmaxstdio(int); -int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); char* __cdecl _tempnam(const char*,const char*); int __cdecl _unlink(const char*); @@ -186,6 +185,17 @@ static inline int __cdecl _vsnprintf_s(char *buffer, size_t size, size_t count, return ret < 0 ? -1 : ret; } +static inline int __cdecl _snprintf_s(char *buffer, size_t size, size_t count, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsnprintf_s(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS, buffer, size, count, format, NULL, args); + __ms_va_end(args); + return 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, @@ -237,6 +247,7 @@ static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_lis #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); +_ACRTIMP int WINAPIV _snprintf_s(char*,size_t,size_t,const char*,...); _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);

1 0

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

21 Feb '20

Module: wine Branch: master Commit: 9bfd4652368fd72613533eda58af891e04fa34bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfd4652368fd72613533eda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:40:38 2020 +0100 stdio.h: Add ucrt _scprintf declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 10 ---------- include/msvcrt/stdio.h | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index b6375f71dc..82bbf84c25 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -114,16 +114,6 @@ void __cdecl _invalid_parameter(const wchar_t *expr, const wchar_t *func, const { _invalid_parameter_noinfo(); } - -int WINAPIV _scprintf(const char* fmt, ...) -{ - int ret; - __ms_va_list valist; - __ms_va_start(valist, fmt); - ret = _vsnprintf(NULL, 0, fmt, valist); - __ms_va_end(valist); - return ret; -} #endif static void init_cxx_funcs(void) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index be8c1e485f..0fc374b06e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -87,7 +87,6 @@ int __cdecl _setmaxstdio(int); 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*,...); size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*); size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*); @@ -147,7 +146,6 @@ int WINAPIV scanf_s(const char*,...); void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); int WINAPIV sprintf_s(char*,size_t,const char*,...); -int WINAPIV _scprintf(const char *, ...); int WINAPIV sscanf(const char*,const char*,...); int WINAPIV sscanf_s(const char*,const char*,...); int WINAPIV _snscanf_l(const char*,size_t,const char*,_locale_t,...); @@ -195,6 +193,18 @@ static inline int __cdecl _vscprintf(const char *format, __ms_va_list args) return ret < 0 ? -1 : ret; } +static inline int WINAPIV _scprintf(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_STANDARD_SNPRINTF_BEHAVIOR, + NULL, 0, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int __cdecl vsprintf(char *buffer, const char *format, __ms_va_list args) { int ret = __stdio_common_vsprintf(_CRT_INTERNAL_LOCAL_PRINTF_OPTIONS | _CRT_INTERNAL_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION, @@ -226,6 +236,7 @@ static inline int __cdecl vfprintf_s(FILE *file, const char *format, __ms_va_lis #else /* _UCRT */ +_ACRTIMP int WINAPIV _scprintf(const char *,...); _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);

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetPixelShader().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 2f25af095d9e68ad736ee4875ff7f2abfdeaaedc URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f25af095d9e68ad736ee487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:33 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetPixelShader(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index cf44fa2baa..957f663174 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3207,8 +3207,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD if (!shader) { wined3d_stateblock_set_pixel_shader(device->update_state, NULL); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, NULL); wined3d_mutex_unlock(); return D3D_OK; } @@ -3222,8 +3220,6 @@ static HRESULT WINAPI d3d8_device_SetPixelShader(IDirect3DDevice8 *iface, DWORD TRACE("Setting shader %p.\n", shader_impl); wined3d_stateblock_set_pixel_shader(device->update_state, shader_impl->wined3d_shader); - if (!device->recording) - wined3d_device_set_pixel_shader(device->wined3d_device, shader_impl->wined3d_shader); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Retrieve the pixel shader from the primary stateblock.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 7cffddc9934fe361781f084aae364bf12f5acabe URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cffddc9934fe361781f084a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:32 2020 -0600 d3d8: Retrieve the pixel shader from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c2112445d8..cf44fa2baa 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3240,7 +3240,7 @@ static HRESULT WINAPI d3d8_device_GetPixelShader(IDirect3DDevice8 *iface, DWORD return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - if ((object = wined3d_device_get_pixel_shader(device->wined3d_device))) + if ((object = wined3d_stateblock_get_state(device->state)->ps)) { struct d3d8_pixel_shader *d3d8_shader; d3d8_shader = wined3d_shader_get_parent(object); @@ -3273,7 +3273,7 @@ static HRESULT WINAPI d3d8_device_DeletePixelShader(IDirect3DDevice8 *iface, DWO return D3DERR_INVALIDCALL; } - if (wined3d_device_get_pixel_shader(device->wined3d_device) == shader_impl->wined3d_shader) + if (wined3d_stateblock_get_state(device->state)->ps == shader_impl->wined3d_shader) IDirect3DDevice8_SetPixelShader(iface, 0); wined3d_mutex_unlock();

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetVertexShaderConstant().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: b58a5a55ba2e901e3b06d2ba37b6b50e6895e42d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58a5a55ba2e901e3b06d2ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:31 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetVertexShaderConstant(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 90dec4aaa7..c2112445d8 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2983,8 +2983,6 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac wined3d_mutex_lock(); hr = wined3d_stateblock_set_vs_consts_f(device->update_state, start_register, count, data); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_vs_consts_f(device->wined3d_device, start_register, count, data); wined3d_mutex_unlock(); return hr;

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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