February 2020 - Wine-commits

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

21 Feb '20

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 _snscanf_l declaration.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: c317c1c47c18852c44791ae3b6642eb91f47afb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c317c1c47c18852c44791ae3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 16:41:50 2020 +0100 stdio.h: Add ucrt _snscanf_l 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 f95bc253f2..e184704eb9 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -136,7 +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 _snscanf_l(const char*,size_t,const char*,_locale_t,...); FILE* __cdecl tmpfile(void); char* __cdecl tmpnam(char*); int __cdecl ungetc(int,FILE*); @@ -321,6 +320,17 @@ static inline int WINAPIV sscanf_s(const char *buffer, const char *format, ...) return ret; } +static inline int WINAPIV _snscanf_l(const char *buffer, size_t size, const char *format, _locale_t locale, ...) +{ + int ret; + __ms_va_list args; + + __ms_va_start(args, locale); + ret = __stdio_common_vsscanf(_CRT_INTERNAL_LOCAL_SCANF_OPTIONS, buffer, size, format, locale, args); + __ms_va_end(args); + return ret; +} + static inline int WINAPIV fscanf(FILE *file, const char *format, ...) { int ret; @@ -387,6 +397,7 @@ _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 _snscanf_l(const char*,size_t,const char*,_locale_t,...); _ACRTIMP int WINAPIV fscanf(FILE*,const char*,...); _ACRTIMP int WINAPIV fscanf_s(FILE*,const char*,...); _ACRTIMP int WINAPIV scanf(const char*,...);

1 0

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

21 Feb '20

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

21 Feb '20

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

21 Feb '20

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

Jacek Caban : winegcc: Treat -target argument as an alias to --target for clang compatibility.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: b0ea67ed4621eed1efb243a5916b9b43f5ff64df URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0ea67ed4621eed1efb243a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 21 13:52:20 2020 +0100 winegcc: Treat -target argument as an alias to --target for clang compatibility. clang uses -target for the same thing as we do. 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 f05f777a55..d735941a53 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1533,6 +1533,9 @@ int main(int argc, char **argv) if (strcmp("-framework", argv[i]) == 0) next_is_arg = 1; break; + case 't': + next_is_arg = strcmp("-target", argv[i]) == 0; + break; case '-': next_is_arg = (strcmp("--param", argv[i]) == 0 || strcmp("--sysroot", argv[i]) == 0 || @@ -1699,6 +1702,13 @@ int main(int argc, char **argv) raw_linker_arg = 0; } break; + case 't': + if (is_option( argv, i, "-target", &option_arg )) + { + parse_target_option( &opts, option_arg ); + raw_compiler_arg = raw_linker_arg = 0; + } + break; case 'v': if (argv[i][2] == 0) verbose++; break;

1 0

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

21 Feb '20

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

Alexandre Julliard : ntdll: Implement RtlIsNormalizedString().
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: 3e6b15c7b5234002b0af2720df58cdf084cba40c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6b15c7b5234002b0af2720… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 13:05:55 2020 +0100 ntdll: Implement RtlIsNormalizedString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 7 +++-- dlls/ntdll/locale.c | 64 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 7684002992..4d16600251 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -6105,16 +6105,15 @@ static void test_NormalizeString(void) wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], ptest->str, -1, &ret ); - todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); if (!wcscmp( ptest->str, dst )) - todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); else ok( !ret, "%s:%d: normalized (dst %s)\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst) ); ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); - todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); - todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); + ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); + ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); } } ptest++; diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 5d53d91ddd..7ec8a16074 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -1896,8 +1896,68 @@ NTSTATUS WINAPI RtlUnicodeToUTF8N( char *dst, DWORD dstlen, DWORD *reslen, const */ NTSTATUS WINAPI RtlIsNormalizedString( ULONG form, const WCHAR *str, INT len, BOOLEAN *res ) { - FIXME( "%x %p %d\n", form, str, len ); - return STATUS_NOT_IMPLEMENTED; + const struct norm_table *info; + NTSTATUS status; + BYTE props, class, last_class = 0; + unsigned int ch; + int i, r, result = 1; + + if ((status = load_norm_table( form, &info ))) return status; + + if (len == -1) len = strlenW( str ); + + for (i = 0; i < len && result; i += r) + { + if (!(r = get_utf16( str + i, len - i, &ch ))) return STATUS_NO_UNICODE_TRANSLATION; + if (info->comp_size) + { + if ((ch >= HANGUL_VBASE && ch < HANGUL_VBASE + HANGUL_VCOUNT) || + (ch >= HANGUL_TBASE && ch < HANGUL_TBASE + HANGUL_TCOUNT)) + { + result = -1; /* QC=Maybe */ + continue; + } + } + else if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + HANGUL_SCOUNT) + { + result = 0; /* QC=No */ + break; + } + props = get_char_props( info, ch ); + class = props & 0x3f; + if (class == 0x3f) + { + last_class = 0; + if (props == 0xbf) result = 0; /* QC=No */ + else if (props == 0xff) + { + /* ignore other chars in Hangul range */ + if (ch >= HANGUL_LBASE && ch < HANGUL_LBASE + 0x100) continue; + if (ch >= HANGUL_SBASE && ch < HANGUL_SBASE + 0x2c00) continue; + return STATUS_NO_UNICODE_TRANSLATION; + } + } + else if (props & 0x80) + { + if ((props & 0xc0) == 0xc0) result = -1; /* QC=Maybe */ + if (class && class < last_class) result = 0; /* QC=No */ + last_class = class; + } + else last_class = 0; + } + + if (result == -1) + { + int dstlen = len * 4; + NTSTATUS status; + WCHAR *buffer = RtlAllocateHeap( GetProcessHeap(), 0, dstlen * sizeof(WCHAR) ); + if (!buffer) return STATUS_NO_MEMORY; + status = RtlNormalizeString( form, str, len, buffer, &dstlen ); + result = !status && (dstlen == len) && !strncmpW( buffer, str, len ); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } + *res = result; + return STATUS_SUCCESS; }

1 0

Alexandre Julliard : unicode: Remove no longer used normalization tables.
by Alexandre Julliard 21 Feb '20

21 Feb '20

Module: wine Branch: master Commit: e7eaa1a857ac89a759ebb998691dca0e8983bd09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7eaa1a857ac89a759ebb998… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 20 09:57:19 2020 +0100 unicode: Remove no longer used normalization tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/Makefile.in | 2 - dlls/kernelbase/compose.c | 373 ---- dlls/kernelbase/decompose.c | 1727 --------------- dlls/ntdll/Makefile.in | 3 - dlls/ntdll/combclass.c | 344 --- dlls/ntdll/compose.c | 373 ---- dlls/ntdll/decompose.c | 5037 ------------------------------------------- tools/make_unicode | 219 -- 8 files changed, 8078 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e7eaa1a857ac89a759eb…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 21 Feb '20

21 Feb '20

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