February 2020 - Wine-Commits

Jacek Caban : winegcc: Clean up output file on error.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: b253bd65658fe7dde8e50d7f7e6930cd215282df URL: https://source.winehq.org/git/wine.git/?a=commit;h=b253bd65658fe7dde8e50d7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 13:52:31 2020 +0100 winegcc: Clean up output file on error. Based on winebuild. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index d735941a53..c3eafdfc21 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -139,6 +139,7 @@ static const char* app_loader_template = "exec \"$WINELOADER\" \"$apppath\" \"$@\"\n" ; +static const char *output_file_name; static int keep_generated = 0; static strarray* tmp_files; #ifdef HAVE_SIGSET_T @@ -262,6 +263,11 @@ static enum target_platform build_platform = PLATFORM_WINDOWS; static enum target_platform build_platform = PLATFORM_UNSPECIFIED; #endif +static void cleanup_output_files(void) +{ + if (output_file_name) unlink( output_file_name ); +} + static void clean_temp_files(void) { unsigned int i; @@ -1305,6 +1311,9 @@ static void build(struct options* opts) if (libgcc) strarray_add(link_args, libgcc); + output_file_name = output_path; + atexit( cleanup_output_files ); + spawn(opts->prefix, link_args, 0); strarray_free (link_args); @@ -1836,5 +1845,6 @@ int main(int argc, char **argv) else if (linking) build(&opts); else compile(&opts, lang); + output_file_name = NULL; return 0; }

1 0

Jacek Caban : stdio.h: Add ucrt printf and vprintf declarations.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

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 : include: Add new corecrt_wctype file.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 0f932c9d457cc3f077b1fd27a9b4c924e528b38b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f932c9d457cc3f077b1fd27… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 17:18:22 2020 +0100 include: Add new corecrt_wctype 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_wctype.h | 49 +++++++++++++++++++++++++++++++++++++++++ include/msvcrt/ctype.h | 35 +---------------------------- include/msvcrt/wchar.h | 38 +------------------------------- 4 files changed, 52 insertions(+), 71 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index fbfbf72be0..694828ab71 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -425,6 +425,7 @@ SOURCES = \ msvcrt/conio.h \ msvcrt/corecrt.h \ msvcrt/corecrt_stdio_config.h \ + msvcrt/corecrt_wctype.h \ msvcrt/corecrt_wio.h \ msvcrt/corecrt_wstdio.h \ msvcrt/corecrt_wtime.h \ diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h new file mode 100644 index 0000000000..d090538fae --- /dev/null +++ b/include/msvcrt/corecrt_wctype.h @@ -0,0 +1,49 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the Wine project. + */ + +#ifndef _WCTYPE_DEFINED +#define _WCTYPE_DEFINED + +#include <corecrt.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* ASCII char classification table - binary compatible */ +#define _UPPER 0x0001 /* C1_UPPER */ +#define _LOWER 0x0002 /* C1_LOWER */ +#define _DIGIT 0x0004 /* C1_DIGIT */ +#define _SPACE 0x0008 /* C1_SPACE */ +#define _PUNCT 0x0010 /* C1_PUNCT */ +#define _CONTROL 0x0020 /* C1_CNTRL */ +#define _BLANK 0x0040 /* C1_BLANK */ +#define _HEX 0x0080 /* C1_XDIGIT */ +#define _LEADBYTE 0x8000 +#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ + +int __cdecl is_wctype(wint_t,wctype_t); +int __cdecl isleadbyte(int); +int __cdecl iswalnum(wint_t); +int __cdecl iswalpha(wint_t); +int __cdecl iswascii(wint_t); +int __cdecl iswcntrl(wint_t); +int __cdecl iswctype(wint_t,wctype_t); +int __cdecl iswdigit(wint_t); +int __cdecl iswgraph(wint_t); +int __cdecl iswlower(wint_t); +int __cdecl iswprint(wint_t); +int __cdecl iswpunct(wint_t); +int __cdecl iswspace(wint_t); +int __cdecl iswupper(wint_t); +int __cdecl iswxdigit(wint_t); +wchar_t __cdecl towlower(wchar_t); +wchar_t __cdecl towupper(wchar_t); + +#ifdef __cplusplus +} +#endif + +#endif /* _WCTYPE_DEFINED */ diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h index 85b85ddeb4..00e77c959b 100644 --- a/include/msvcrt/ctype.h +++ b/include/msvcrt/ctype.h @@ -8,7 +8,7 @@ #ifndef __WINE_CTYPE_H #define __WINE_CTYPE_H -#include <corecrt.h> +#include <corecrt_wctype.h> #ifdef __cplusplus extern "C" { @@ -18,18 +18,6 @@ extern "C" { #define WEOF (wint_t)(0xFFFF) #endif -/* ASCII char classification table - binary compatible */ -#define _UPPER 0x0001 /* C1_UPPER */ -#define _LOWER 0x0002 /* C1_LOWER */ -#define _DIGIT 0x0004 /* C1_DIGIT */ -#define _SPACE 0x0008 /* C1_SPACE */ -#define _PUNCT 0x0010 /* C1_PUNCT */ -#define _CONTROL 0x0020 /* C1_CNTRL */ -#define _BLANK 0x0040 /* C1_BLANK */ -#define _HEX 0x0080 /* C1_XDIGIT */ -#define _LEADBYTE 0x8000 -#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ - int __cdecl __isascii(int); int __cdecl __iscsym(int); int __cdecl __iscsymf(int); @@ -51,27 +39,6 @@ int __cdecl isxdigit(int); int __cdecl tolower(int); int __cdecl toupper(int); -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED -int __cdecl is_wctype(wint_t,wctype_t); -int __cdecl isleadbyte(int); -int __cdecl iswalnum(wint_t); -int __cdecl iswalpha(wint_t); -int __cdecl iswascii(wint_t); -int __cdecl iswcntrl(wint_t); -int __cdecl iswctype(wint_t,wctype_t); -int __cdecl iswdigit(wint_t); -int __cdecl iswgraph(wint_t); -int __cdecl iswlower(wint_t); -int __cdecl iswprint(wint_t); -int __cdecl iswpunct(wint_t); -int __cdecl iswspace(wint_t); -int __cdecl iswupper(wint_t); -int __cdecl iswxdigit(wint_t); -wchar_t __cdecl towlower(wchar_t); -wchar_t __cdecl towupper(wchar_t); -#endif /* _WCTYPE_DEFINED */ - #ifdef __cplusplus } #endif diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index 0b7be92174..ade970b6f3 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -9,13 +9,12 @@ #define __WINE_WCHAR_H #include <corecrt_wstdio.h> +#include <corecrt_wctype.h> #include <corecrt_wio.h> #include <corecrt_wtime.h> #include <string.h> #include <sys/stat.h> -#include <pshpack8.h> - #ifdef __cplusplus extern "C" { #endif @@ -27,39 +26,6 @@ extern "C" { typedef int mbstate_t; -/* ASCII char classification table - binary compatible */ -#define _UPPER 0x0001 /* C1_UPPER */ -#define _LOWER 0x0002 /* C1_LOWER */ -#define _DIGIT 0x0004 /* C1_DIGIT */ -#define _SPACE 0x0008 /* C1_SPACE */ -#define _PUNCT 0x0010 /* C1_PUNCT */ -#define _CONTROL 0x0020 /* C1_CNTRL */ -#define _BLANK 0x0040 /* C1_BLANK */ -#define _HEX 0x0080 /* C1_XDIGIT */ -#define _LEADBYTE 0x8000 -#define _ALPHA (0x0100|_UPPER|_LOWER) /* (C1_ALPHA|_UPPER|_LOWER) */ - -#ifndef _WCTYPE_DEFINED -#define _WCTYPE_DEFINED -int __cdecl is_wctype(wint_t,wctype_t); -int __cdecl isleadbyte(int); -int __cdecl iswalnum(wint_t); -int __cdecl iswalpha(wint_t); -int __cdecl iswascii(wint_t); -int __cdecl iswcntrl(wint_t); -int __cdecl iswctype(wint_t,wctype_t); -int __cdecl iswdigit(wint_t); -int __cdecl iswgraph(wint_t); -int __cdecl iswlower(wint_t); -int __cdecl iswprint(wint_t); -int __cdecl iswpunct(wint_t); -int __cdecl iswspace(wint_t); -int __cdecl iswupper(wint_t); -int __cdecl iswxdigit(wint_t); -wchar_t __cdecl towlower(wchar_t); -wchar_t __cdecl towupper(wchar_t); -#endif /* _WCTYPE_DEFINED */ - #ifndef _WDIRECT_DEFINED #define _WDIRECT_DEFINED int __cdecl _wchdir(const wchar_t*); @@ -228,6 +194,4 @@ static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n) } #endif -#include <poppack.h> - #endif /* __WINE_WCHAR_H */

1 0

Jacek Caban : stdio.h: Add ucrt sscanf and sscanf_s declarations.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 6e5ef798befa87f760d37f47239283f6f1bef1ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e5ef798befa87f760d37f47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:43 2020 +0100 stdio.h: Add ucrt sscanf and sscanf_s declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/stdio.h | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index 8c162d6f7d..f95bc253f2 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -136,8 +136,6 @@ int __cdecl rename(const char*,const char*); void __cdecl rewind(FILE*); void __cdecl setbuf(FILE*,char*); int __cdecl setvbuf(FILE*,char*,int,size_t); -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,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); @@ -155,6 +153,7 @@ _ACRTIMP int __cdecl __stdio_common_vsprintf_s(unsigned __int64,char*,size_t,con _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); +_ACRTIMP int __cdecl __stdio_common_vsscanf(unsigned __int64,char const*,size_t,const char*,_locale_t,__ms_va_list); static inline int __cdecl vsnprintf(char *buffer, size_t size, const char *format, __ms_va_list args) { @@ -300,6 +299,28 @@ static inline int WINAPIV printf_s(const char *format, ...) return ret; } +static inline int WINAPIV sscanf(const char *buffer, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS | _CRT_INTERNAL_SCANF_SECURECRT, buffer, -1, format, NULL, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV fscanf(FILE *file, const char *format, ...) { int ret; @@ -370,6 +391,8 @@ _ACRTIMP int WINAPIV fscanf(FILE*,const char*,...); _ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV scanf(const char*,...); _ACRTIMP int WINAPIV scanf_s(const char*,...); +_ACRTIMP int WINAPIV sscanf(const char*,const char*,...); +_ACRTIMP int WINAPIV sscanf_s(const char*,const char*,...); #endif /* _UCRT */

1 0

Jacek Caban : stdio.h: Add ucrt scanf and scanf_s declarations.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 1e1b5d58f701f624c68d9bf266c5bcf6947d07e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e1b5d58f701f624c68d9bf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:35 2020 +0100 stdio.h: Add ucrt scanf and scanf_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 6e4a58e41e..8c162d6f7d 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -134,8 +134,6 @@ int __cdecl puts(const char*); int __cdecl remove(const char*); int __cdecl rename(const char*,const char*); void __cdecl rewind(FILE*); -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 sscanf(const char*,const char*,...); @@ -324,6 +322,28 @@ static inline int WINAPIV fscanf_s(FILE *file, const char *format, ...) return ret; } +static inline int WINAPIV scanf(const char *format, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, format); + ret = __stdio_common_vfscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + +static inline int WINAPIV scanf_s(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, stdin, format, NULL, args); + __ms_va_end(args); + return ret; +} + #else /* _UCRT */ _ACRTIMP int WINAPIV _scprintf(const char *,...); @@ -348,6 +368,8 @@ static inline int vsnprintf(char *buffer, size_t size, const char *format, __ms_ _ACRTIMP int WINAPIV fscanf(FILE*,const char*,...); _ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...); +_ACRTIMP int WINAPIV scanf(const char*,...); +_ACRTIMP int WINAPIV scanf_s(const char*,...); #endif /* _UCRT */

1 0

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

Feb. 21, 2020

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 : winegcc: Recognize -rtlib as linker argument.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 8cf418314c5183f5d04b4d16e9907b67a961fc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cf418314c5183f5d04b4d16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 13:57:52 2020 +0100 winegcc: Recognize -rtlib as linker argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index bee81edcc3..f05f777a55 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1373,6 +1373,9 @@ static int is_linker_arg(const char* arg) case 'f': if (strncmp("-fuse-ld=", arg, 9) == 0) return 1; break; + case 'r': + if (strncmp("-rtlib=", arg, 7) == 0) return 1; + break; } for (j = 0; j < ARRAY_SIZE(link_switches); j++)

1 0

Zebediah Figura : d3d8: Retrieve vertex shader constants from the primary stateblock.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: ffb8cc3623bde69ac80bfbcd5347581c0779a726 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffb8cc3623bde69ac80bfbcd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 20 20:21:30 2020 -0600 d3d8: Retrieve vertex shader constants 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/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 26451255c0..0fcc8bd7a0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -131,6 +131,8 @@ struct d3d8_device DWORD in_destruction : 1; DWORD padding : 14; + unsigned int vs_uniform_count; + /* The d3d8 API supports only one implicit swapchain (no D3DCREATE_ADAPTERGROUP_DEVICE, * no GetSwapchain, GetBackBuffer doesn't accept a swapchain number). */ struct wined3d_swapchain *implicit_swapchain; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ef1b3afde9..90dec4aaa7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2991,26 +2991,29 @@ static HRESULT WINAPI d3d8_device_SetVertexShaderConstant(IDirect3DDevice8 *ifac } static HRESULT WINAPI d3d8_device_GetVertexShaderConstant(IDirect3DDevice8 *iface, - DWORD start_register, void *data, DWORD count) + DWORD start_idx, void *constants, DWORD count) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; + const struct wined3d_vec4 *src; - TRACE("iface %p, start_register %u, data %p, count %u.\n", - iface, start_register, data, count); + TRACE("iface %p, start_idx %u, constants %p, count %u.\n", iface, start_idx, constants, count); - if (start_register + count > D3D8_MAX_VERTEX_SHADER_CONSTANTF) + if (!constants) + return D3DERR_INVALIDCALL; + + if (start_idx >= device->vs_uniform_count || count > device->vs_uniform_count - start_idx) { - WARN("Trying to access %u constants, but d3d8 only supports %u\n", - start_register + count, D3D8_MAX_VERTEX_SHADER_CONSTANTF); + WARN("Trying to access %u constants, but d3d8 only supports %u.\n", + start_idx + count, device->vs_uniform_count); return D3DERR_INVALIDCALL; } wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_f(device->wined3d_device, start_register, count, data); + src = wined3d_stateblock_get_state(device->state)->vs_consts_f; + memcpy(constants, &src[start_idx], count * sizeof(*src)); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_GetVertexShaderDeclaration(IDirect3DDevice8 *iface, @@ -3668,6 +3671,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine struct wined3d_swapchain_desc swapchain_desc; struct wined3d_swapchain *wined3d_swapchain; struct d3d8_swapchain *d3d_swapchain; + struct wined3d_caps caps; HRESULT hr; static const enum wined3d_feature_level feature_levels[] = @@ -3702,6 +3706,9 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } + wined3d_get_device_caps(wined3d, adapter, device_type, &caps); + device->vs_uniform_count = caps.MaxVertexShaderConst; + if (FAILED(hr = wined3d_stateblock_create(device->wined3d_device, NULL, WINED3D_SBT_PRIMARY, &device->state))) { ERR("Failed to create primary stateblock, hr %#x.\n", hr);

1 0

Matteo Bruni : wined3d: Use a bitmask for the {v, p}s_const_f fields in struct wined3d_saved_states.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 316d675f88cae506fc29e1a5b4ebc8370f74b2ab URL: https://source.winehq.org/git/wine.git/?a=commit;h=316d675f88cae506fc29e1a5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 20 22:40:13 2020 +0100 wined3d: Use a bitmask for the {v, p}s_const_f fields in struct wined3d_saved_states. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 5 ++- dlls/wined3d/stateblock.c | 69 ++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 54 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 17d71b3b1a..3cf621ff46 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -27,7 +27,6 @@ #include "config.h" #include "wine/port.h" -#include <stdio.h> #ifdef HAVE_FLOAT_H # include <float.h> #endif @@ -3854,7 +3853,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) { - if (changed->vs_consts_f[i]) + if (wined3d_bitmap_is_set(changed->vs_consts_f, i)) ++count; else if (count) { @@ -3896,7 +3895,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, count = 0; for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) { - if (changed->ps_consts_f[i]) + if (wined3d_bitmap_is_set(changed->ps_consts_f, i)) ++count; else if (count) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d787eef0d9..0f5e2d70ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -189,7 +189,7 @@ static const DWORD vertex_states_sampler[] = WINED3D_SAMP_DMAP_OFFSET, }; -static inline void stateblock_set_bits(DWORD *map, UINT map_size) +static inline void stateblock_set_all_bits(DWORD *map, UINT map_size) { DWORD mask = (1u << (map_size & 0x1f)) - 1; memset(map, 0xff, (map_size >> 5) * sizeof(*map)); @@ -201,7 +201,6 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, { unsigned int i; - /* Single values */ states->indices = 1; states->material = 1; states->viewport = 1; @@ -211,12 +210,11 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->scissorRect = 1; states->blend_state = 1; - /* Fixed size arrays */ states->streamSource = 0xffff; states->streamFreq = 0xffff; states->textures = 0xfffff; - stateblock_set_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); - stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); + stateblock_set_all_bits(states->transform, WINED3D_HIGHEST_TRANSFORM_STATE + 1); + stateblock_set_all_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; states->clipplane = (1u << WINED3D_MAX_CLIP_DISTANCES) - 1; @@ -225,9 +223,8 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, states->vertexShaderConstantsB = 0xffff; states->vertexShaderConstantsI = 0xffff; - /* Dynamically sized arrays */ - memset(states->ps_consts_f, TRUE, sizeof(BOOL) * ps_consts); - memset(states->vs_consts_f, TRUE, sizeof(BOOL) * vs_consts); + memset(states->ps_consts_f, 0xffu, sizeof(states->ps_consts_f)); + memset(states->vs_consts_f, 0xffu, sizeof(states->vs_consts_f)); } static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states, const DWORD num_constants) @@ -253,7 +250,7 @@ static void stateblock_savedstates_set_pixel(struct wined3d_saved_states *states states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; - memset(states->ps_consts_f, TRUE, sizeof(BOOL) * num_constants); + memset(states->ps_consts_f, 0xffu, sizeof(states->ps_consts_f)); } static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *states, const DWORD num_constants) @@ -281,12 +278,12 @@ static void stateblock_savedstates_set_vertex(struct wined3d_saved_states *state states->vertexShaderConstantsB = 0xffff; states->vertexShaderConstantsI = 0xffff; - memset(states->vs_consts_f, TRUE, sizeof(BOOL) * num_constants); + memset(states->vs_consts_f, 0xffu, sizeof(states->vs_consts_f)); } void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *stateblock) { - const struct wined3d_d3d_info *d3d_info = &stateblock->device->adapter->d3d_info; + const unsigned int word_bit_count = sizeof(*stateblock->changed.vs_consts_f) * CHAR_BIT; unsigned int i, j; for (i = 0; i <= WINEHIGHEST_RENDER_STATE >> 5; ++i) @@ -313,11 +310,14 @@ void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *s } } - for (i = 0; i < d3d_info->limits.vs_uniform_count; ++i) + for (i = 0; i < ARRAY_SIZE(stateblock->changed.vs_consts_f); ++i) { - if (stateblock->changed.vs_consts_f[i]) + DWORD bitmask = stateblock->changed.vs_consts_f[i]; + + while (bitmask) { - stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i; + j = wined3d_bit_scan(&bitmask); + stateblock->contained_vs_consts_f[stateblock->num_contained_vs_consts_f] = i * word_bit_count + j; ++stateblock->num_contained_vs_consts_f; } } @@ -340,11 +340,14 @@ void CDECL wined3d_stateblock_init_contained_states(struct wined3d_stateblock *s } } - for (i = 0; i < d3d_info->limits.ps_uniform_count; ++i) + for (i = 0; i < ARRAY_SIZE(stateblock->changed.ps_consts_f); ++i) { - if (stateblock->changed.ps_consts_f[i]) + DWORD bitmask = stateblock->changed.ps_consts_f[i]; + + while (bitmask) { - stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i; + j = wined3d_bit_scan(&bitmask); + stateblock->contained_ps_consts_f[stateblock->num_contained_ps_consts_f] = i * word_bit_count + j; ++stateblock->num_contained_ps_consts_f; } } @@ -1333,6 +1336,34 @@ void CDECL wined3d_stateblock_set_vertex_shader(struct wined3d_stateblock *state stateblock->changed.vertexShader = TRUE; } +static void wined3d_bitmap_set_bits(uint32_t *bitmap, unsigned int start, unsigned int count) +{ + const unsigned int word_bit_count = sizeof(*bitmap) * CHAR_BIT; + const unsigned int shift = start % word_bit_count; + uint32_t mask, last_mask; + unsigned int mask_size; + + bitmap += start / word_bit_count; + mask = ~0u << shift; + mask_size = word_bit_count - shift; + last_mask = (1u << (start + count) % word_bit_count) - 1; + if (mask_size <= count) + { + *bitmap |= mask; + ++bitmap; + count -= mask_size; + mask = ~0u; + } + if (count >= word_bit_count) + { + memset(bitmap, 0xffu, count / word_bit_count * sizeof(*bitmap)); + bitmap += count / word_bit_count; + count = count % word_bit_count; + } + if (count) + *bitmap |= mask & last_mask; +} + HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stateblock, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants) { @@ -1343,7 +1374,7 @@ HRESULT CDECL wined3d_stateblock_set_vs_consts_f(struct wined3d_stateblock *stat return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.vs_consts_f[start_idx], constants, count * sizeof(*constants)); - memset(&stateblock->changed.vs_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.vs_consts_f)); + wined3d_bitmap_set_bits(stateblock->changed.vs_consts_f, start_idx, count); return WINED3D_OK; } @@ -1409,7 +1440,7 @@ HRESULT CDECL wined3d_stateblock_set_ps_consts_f(struct wined3d_stateblock *stat return WINED3DERR_INVALIDCALL; memcpy(&stateblock->stateblock_state.ps_consts_f[start_idx], constants, count * sizeof(*constants)); - memset(&stateblock->changed.ps_consts_f[start_idx], 1, count * sizeof(*stateblock->changed.ps_consts_f)); + wined3d_bitmap_set_bits(stateblock->changed.ps_consts_f, start_idx, count); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 444e8fdf63..e4fca3d883 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3923,10 +3923,10 @@ struct wined3d_saved_states DWORD clipplane; /* WINED3D_MAX_USER_CLIP_PLANES, 32 */ WORD pixelShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ WORD pixelShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - BOOL ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; + DWORD ps_consts_f[WINED3D_MAX_PS_CONSTS_F >> 5]; WORD vertexShaderConstantsB; /* WINED3D_MAX_CONSTS_B, 16 */ WORD vertexShaderConstantsI; /* WINED3D_MAX_CONSTS_I, 16 */ - BOOL vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; + DWORD vs_consts_f[WINED3D_MAX_VS_CONSTS_F >> 5]; DWORD textures : 20; /* WINED3D_MAX_COMBINED_SAMPLERS, 20 */ DWORD indices : 1; DWORD material : 1;

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 21, 2020

Feb. 21, 2020

Module: wine Branch: master Commit: 776072ebc9c4ce808b7fe1f99c4277900af7b8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=776072ebc9c4ce808b7fe1f9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 21 10:37:53 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 415f54e2a9..0e9dfc5ebb 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-20 08:38+0200\n" +"PO-Revision-Date: 2020-02-21 09:23+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -6846,10 +6846,8 @@ msgid "Sink has not been finalized.\n" msgstr "Rinktuvas nebuvo užbaigtas.\n" #: mferror.mc:732 -#, fuzzy -#| msgid "Sink was already stopped.\n" msgid "Clock was stopped\n" -msgstr "Rinktuvas jau sustabdytas.\n" +msgstr "Laikrodis buvo sustabdytas\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7228,10 +7226,8 @@ msgid "Clock state was already set.\n" msgstr "Laikrodžio būsena jau nustatyta.\n" #: mferror.mc:725 -#, fuzzy -#| msgid "Clock is not available.\n" msgid "Clock is not simple\n" -msgstr "Laikrodis neprieinamas.\n" +msgstr "Laikrodis nėra paprastas\n" #: mpr.rc:35 wininet.rc:37 msgid "Enter Network Password"

1 0