February 2020 - Wine-Commits

Alexandre Julliard : libport: Move the codepage table functions back to libwine and make them obsolete.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 831f58caa56133f8522fad1ce2b7901e67c0d127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831f58caa56133f8522fad1c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:06:51 2020 +0100 libport: Move the codepage table functions back to libwine and make them obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 8 -------- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/cptable.c | 19 +++++++++++++++++-- libs/wine/port.c | 2 -- libs/wine/wine.map | 6 +++--- tools/make_unicode | 27 --------------------------- 7 files changed, 21 insertions(+), 43 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index d831f6282c..8d30e9f447 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -79,9 +79,6 @@ union cptable struct dbcs_table dbcs; }; -extern const union cptable *wine_cp_get_table( unsigned int codepage ); -extern const union cptable *wine_cp_enum_table( unsigned int index ); - extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); @@ -93,11 +90,6 @@ extern int snprintfW( WCHAR *str, size_t len, const WCHAR *format, ... ); extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) -{ - return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); -} - WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern const WCHAR wine_casemap_lower[]; diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 4fc81fbbcb..6cb082838f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -68,7 +68,6 @@ C_SRCS = \ c_950.c \ casemap.c \ compose.c \ - cptable.c \ decompose.c \ ffs.c \ fstatvfs.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 569fd0869a..25cefa1c60 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -4,6 +4,7 @@ C_SRCS = \ collation.c \ config.c \ cpsymbol.c \ + cptable.c \ debug.c \ digitmap.c \ fold.c \ diff --git a/libs/port/cptable.c b/libs/wine/cptable.c similarity index 91% rename from libs/port/cptable.c rename to libs/wine/cptable.c index 89975487ec..f1191f2570 100644 --- a/libs/port/cptable.c +++ b/libs/wine/cptable.c @@ -20,6 +20,10 @@ #include <stdlib.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" /* Everything below this line is generated automatically by make_unicode */ @@ -169,7 +173,7 @@ static int cmp_codepage( const void *codepage, const void *entry ) /* get the table of a given code page */ -const union cptable *wine_cp_get_table( unsigned int codepage ) +const union cptable *wine_cp_get_table_obsolete( unsigned int codepage ) { const union cptable **res; @@ -180,8 +184,19 @@ const union cptable *wine_cp_get_table( unsigned int codepage ) /* enum valid codepages */ -const union cptable *wine_cp_enum_table( unsigned int index ) +const union cptable *wine_cp_enum_table_obsolete( unsigned int index ) { if (index >= ARRAY_SIZE( cptables )) return NULL; return cptables[index]; } + +int wine_is_dbcs_leadbyte_obsolete( const union cptable *table, unsigned char ch ) +{ + return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); +} + +__ASM_OBSOLETE(wine_cp_get_table); +__ASM_OBSOLETE(wine_cp_enum_table); +__ASM_OBSOLETE(wine_is_dbcs_leadbyte); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/port.c b/libs/wine/port.c index 1c345b5cd3..fb749bb75e 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -38,8 +38,6 @@ const void *libwine_port_functions[] = { strtolW, vsnprintfW, - wine_cp_enum_table, - wine_cp_get_table, }; /* no longer used, for backwards compatibility only */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index aeb9e2963b..3f2c430fa8 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -9,8 +9,6 @@ WINE_1.0 wine_anon_mmap; wine_casemap_lower; wine_casemap_upper; - wine_cp_enum_table; - wine_cp_get_table; wine_dlclose; wine_dll_enum_load_path; wine_dll_set_callback; @@ -32,7 +30,6 @@ WINE_1.0 wine_get_version; wine_init; wine_init_argv0_path; - wine_is_dbcs_leadbyte; wine_ldt_alloc_entries; wine_ldt_alloc_fs; wine_ldt_copy; @@ -100,6 +97,8 @@ WINE_1.0 vsprintfW; wine_call_on_stack; wine_compare_string; + wine_cp_enum_table; + wine_cp_get_table; wine_cp_mbstowcs; wine_cp_wcstombs; wine_cpsymbol_mbstowcs; @@ -115,6 +114,7 @@ WINE_1.0 wine_dll_unload; wine_fold_string; wine_get_sortkey; + wine_is_dbcs_leadbyte; wine_pthread_get_functions; wine_pthread_set_functions; wine_switch_to_stack; diff --git a/tools/make_unicode b/tools/make_unicode index c55ec5f3d7..80bf6304c3 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2556,31 +2556,6 @@ sub save_file($) } -################################################################ -# output the list of codepage tables into the cptable.c file -sub output_cptable($) -{ - my $output = shift; - my @tables_decl = (); - - printf "Building %s\n", $output; - - foreach my $file (@allfiles) - { - my ($codepage,$filename) = @$file; - push @tables_decl, sprintf("extern union cptable cptable_%03d;\n",$codepage); - } - - push @tables_decl, sprintf("\nstatic const union cptable * const cptables[%d] =\n{\n",$#allfiles+1); - foreach my $file (@allfiles) - { - my ($codepage,$filename) = @$file; - push @tables_decl, sprintf(" &cptable_%03d,\n", $codepage); - } - push @tables_decl, "};"; - REPLACE_IN_FILE( $output, @tables_decl ); -} - ################################################################ # replace the contents of a file between ### cpmap ### marks @@ -2641,8 +2616,6 @@ dump_intl_nls("nls/l_intl.nls"); foreach my $file (@allfiles) { handle_codepage_file( @{$file} ); } -output_cptable("libs/port/cptable.c"); - exit 0; # Local Variables:

1 0

Alexandre Julliard : wmc: Use external NLS files for codepage conversions.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: c47910ec4730d9961ab9a2bbc7d40f336d394513 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c47910ec4730d9961ab9a2bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:05:04 2020 +0100 wmc: Use external NLS files for codepage conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/lang.c | 28 ------------ tools/wmc/lang.h | 2 - tools/wmc/mcl.c | 7 ++- tools/wmc/utils.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/wmc/utils.h | 2 + 5 files changed, 129 insertions(+), 34 deletions(-) diff --git a/tools/wmc/lang.c b/tools/wmc/lang.c index d7bceef8fd..b5ab3be722 100644 --- a/tools/wmc/lang.c +++ b/tools/wmc/lang.c @@ -185,31 +185,3 @@ const language_t *find_language(unsigned id) return (const language_t *)bsearch(&id, languages, ARRAY_SIZE(languages), sizeof(languages[0]), langcmp); } - -#ifdef _WIN32 - -int is_valid_codepage(int id) -{ - return IsValidCodePage( id ); -} - -int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) -{ - return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); -} - -#else /* _WIN32 */ - -#include "wine/unicode.h" - -int is_valid_codepage(int id) -{ - return id == CP_UTF8 || wine_cp_get_table(id); -} - -int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) -{ - return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); -} - -#endif /* _WIN32 */ diff --git a/tools/wmc/lang.h b/tools/wmc/lang.h index d655556e8d..365aacdd76 100644 --- a/tools/wmc/lang.h +++ b/tools/wmc/lang.h @@ -32,7 +32,5 @@ typedef struct language { void show_languages(void); const language_t *find_language(unsigned id); -int is_valid_codepage(int id); -int wmc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ); #endif diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index 1319113fff..829f955606 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -153,8 +153,6 @@ static int codepage; void set_codepage(int cp) { codepage = cp; - if (!is_valid_codepage( cp )) - xyyerror("Codepage %d not found; cannot process\n", codepage); } /* @@ -226,8 +224,9 @@ static int fill_inputbuffer(void) { case INPUT_ASCII: if (!fgets( buffer + len, sizeof(buffer) - len, yyin )) break; - ninputbuffer = wmc_mbstowcs( codepage, 0, buffer, strlen(buffer), inputbuffer, INPUTBUFFER_SIZE ); - if (ninputbuffer < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode\n"); + wbuf = codepage_to_unicode( codepage, buffer, strlen(buffer), &ninputbuffer ); + memcpy( inputbuffer, wbuf, ninputbuffer * sizeof(WCHAR) ); + free( wbuf ); return 1; case INPUT_UTF8: if (!fgets( buffer + len, sizeof(buffer) - len, yyin )) break; diff --git a/tools/wmc/utils.c b/tools/wmc/utils.c index 7261fe715a..bd01f6cfe7 100644 --- a/tools/wmc/utils.c +++ b/tools/wmc/utils.c @@ -29,6 +29,7 @@ #include <ctype.h> #include "wmctypes.h" +#include "winnls.h" #include "utils.h" #include "wmc.h" @@ -400,6 +401,129 @@ char *unicode_to_utf8( const WCHAR *src, int srclen, int *dstlen ) return ret; } +#ifdef _WIN32 + +int is_valid_codepage(int id) +{ + return IsValidCodePage( id ); +} + +WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstlen ) +{ + WCHAR *dst = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + DWORD ret = MultiByteToWideChar( codepage, MB_ERR_INVALID_CHARS, src, srclen, dst, srclen ); + if (!ret) return NULL; + dst[ret] = 0; + *dstlen = ret; + return dst; +} + +#else /* _WIN32 */ + +struct nls_info +{ + unsigned short codepage; + unsigned short unidef; + unsigned short trans_unidef; + unsigned short *cp2uni; + unsigned short *dbcs_offsets; +}; + +static struct nls_info nlsinfo[128]; + +static void init_nls_info( struct nls_info *info, unsigned short *ptr ) +{ + unsigned short hdr_size = ptr[0]; + + info->codepage = ptr[1]; + info->unidef = ptr[4]; + info->trans_unidef = ptr[6]; + ptr += hdr_size; + info->cp2uni = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->dbcs_offsets = *ptr ? ptr + 1 : NULL; +} + +static const struct nls_info *get_nls_info( unsigned int codepage ) +{ + struct stat st; + unsigned short *data; + char *path; + unsigned int i; + int fd; + + for (i = 0; i < ARRAY_SIZE(nlsinfo) && nlsinfo[i].codepage; i++) + if (nlsinfo[i].codepage == codepage) return &nlsinfo[i]; + + assert( i < ARRAY_SIZE(nlsinfo) ); + + for (i = 0; nlsdirs[i]; i++) + { + path = strmake( "%s/c_%03u.nls", nlsdirs[i], codepage ); + if ((fd = open( path, O_RDONLY )) != -1) break; + free( path ); + } + if (!nlsdirs[i]) return NULL; + + fstat( fd, &st ); + data = xmalloc( st.st_size ); + if (read( fd, data, st.st_size ) != st.st_size) error( "failed to load %s\n", path ); + close( fd ); + free( path ); + init_nls_info( &nlsinfo[i], data ); + return &nlsinfo[i]; +} + +int is_valid_codepage(int cp) +{ + return cp == CP_UTF8 || get_nls_info( cp ); +} + +WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstlen ) +{ + const struct nls_info *info = get_nls_info( codepage ); + unsigned int i; + WCHAR dbch, *dst = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + + if (!info) error( "codepage %u not supported\n", codepage ); + + if (info->dbcs_offsets) + { + for (i = 0; srclen; i++, srclen--, src++) + { + unsigned short off = info->dbcs_offsets[(unsigned char)*src]; + if (off) + { + if (srclen == 1) return NULL; + dbch = (src[0] << 8) | (unsigned char)src[1]; + src++; + srclen--; + dst[i] = info->dbcs_offsets[off + (unsigned char)*src]; + if (dst[i] == info->unidef && dbch != info->trans_unidef) return NULL; + } + else + { + dst[i] = info->cp2uni[(unsigned char)*src]; + if (dst[i] == info->unidef && *src != info->trans_unidef) return NULL; + } + } + } + else + { + for (i = 0; i < srclen; i++) + { + dst[i] = info->cp2uni[(unsigned char)src[i]]; + if (dst[i] == info->unidef && src[i] != info->trans_unidef) return NULL; + } + } + dst[i] = 0; + *dstlen = i; + return dst; +} + +#endif /* _WIN32 */ + /******************************************************************* * buffer management * diff --git a/tools/wmc/utils.h b/tools/wmc/utils.h index e4c546765d..726a36731a 100644 --- a/tools/wmc/utils.h +++ b/tools/wmc/utils.h @@ -52,6 +52,8 @@ int unistricmp(const WCHAR *s1, const WCHAR *s2); int unistrcmp(const WCHAR *s1, const WCHAR *s2); WCHAR *utf8_to_unicode( const char *src, int srclen, int *dstlen ); char *unicode_to_utf8( const WCHAR *src, int srclen, int *dstlen ); +int is_valid_codepage(int id); +WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstlen ); /* buffer management */

1 0

Alexandre Julliard : libport: Move wine_cp_mbstowcs implementation back to libwine and make it obsolete.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 23a50fb0bdbbba21ebf2654a0745060d5b262df9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23a50fb0bdbbba21ebf2654a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:06:19 2020 +0100 libport: Move wine_cp_mbstowcs implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 3 --- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 1 + libs/{port => wine}/mbtowc.c | 13 ++++++++++--- libs/wine/port.c | 1 - libs/wine/wine.map | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index f4bf717892..cfb8d9b28c 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -82,9 +82,6 @@ union cptable extern const union cptable *wine_cp_get_table( unsigned int codepage ); extern const union cptable *wine_cp_enum_table( unsigned int index ); -extern int wine_cp_mbstowcs( const union cptable *table, int flags, - const char *src, int srclen, - WCHAR *dst, int dstlen ); extern int wine_cp_wcstombs( const union cptable *table, int flags, const WCHAR *src, int srclen, char *dst, int dstlen, const char *defchar, int *used ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index b6720b0271..26674d285d 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -78,7 +78,6 @@ C_SRCS = \ isinf.c \ isnan.c \ lstat.c \ - mbtowc.c \ mkstemps.c \ poll.c \ pread.c \ diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index 5850f0299d..da9c3cdecc 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ fold.c \ ldt.c \ loader.c \ + mbtowc.c \ mmap.c \ port.c \ sortkey.c \ diff --git a/libs/port/mbtowc.c b/libs/wine/mbtowc.c similarity index 97% rename from libs/port/mbtowc.c rename to libs/wine/mbtowc.c index b6823d0ee8..5c76401c10 100644 --- a/libs/port/mbtowc.c +++ b/libs/wine/mbtowc.c @@ -20,6 +20,10 @@ #include <string.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" extern const unsigned short nfd_table[] DECLSPEC_HIDDEN; @@ -279,9 +283,8 @@ static int mbstowcs_dbcs_decompose( const struct dbcs_table *table, /* return -1 on dst buffer overflow, -2 on invalid input char */ -int wine_cp_mbstowcs( const union cptable *table, int flags, - const char *s, int srclen, - WCHAR *dst, int dstlen ) +int wine_cp_mbstowcs_obsolete( const union cptable *table, int flags, + const char *s, int srclen, WCHAR *dst, int dstlen ) { const unsigned char *src = (const unsigned char*) s; @@ -310,3 +313,7 @@ int wine_cp_mbstowcs( const union cptable *table, int flags, return mbstowcs_dbcs_decompose( &table->dbcs, src, srclen, dst, dstlen ); } } + +__ASM_OBSOLETE(wine_cp_mbstowcs); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/port.c b/libs/wine/port.c index 1ee754b6b9..b170d7293b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -40,7 +40,6 @@ const void *libwine_port_functions[] = vsnprintfW, wine_cp_enum_table, wine_cp_get_table, - wine_cp_mbstowcs, wine_cp_wcstombs, }; diff --git a/libs/wine/wine.map b/libs/wine/wine.map index f0c94a950f..2893ffbaf0 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -11,7 +11,6 @@ WINE_1.0 wine_casemap_upper; wine_cp_enum_table; wine_cp_get_table; - wine_cp_mbstowcs; wine_cp_wcstombs; wine_dlclose; wine_dll_enum_load_path; @@ -102,6 +101,7 @@ WINE_1.0 vsprintfW; wine_call_on_stack; wine_compare_string; + wine_cp_mbstowcs; wine_cpsymbol_mbstowcs; wine_cpsymbol_wcstombs; wine_dbg_log;

1 0

Alexandre Julliard : libport: Move wine_cp_wcstombs implementation back to libwine and make it obsolete.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: d81f96a8fc73c4abab3cf04f76e43e34d98512b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d81f96a8fc73c4abab3cf04f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:06:25 2020 +0100 libport: Move wine_cp_wcstombs implementation back to libwine and make it obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/unicode.h | 4 ---- libs/port/Makefile.in | 1 - libs/wine/Makefile.in | 3 ++- libs/wine/port.c | 1 - libs/{port => wine}/wctomb.c | 14 +++++++++++--- libs/wine/wine.map | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index cfb8d9b28c..d831f6282c 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -82,10 +82,6 @@ union cptable extern const union cptable *wine_cp_get_table( unsigned int codepage ); extern const union cptable *wine_cp_enum_table( unsigned int index ); -extern int wine_cp_wcstombs( const union cptable *table, int flags, - const WCHAR *src, int srclen, - char *dst, int dstlen, const char *defchar, int *used ); - extern int strcmpiW( const WCHAR *str1, const WCHAR *str2 ); extern int strncmpiW( const WCHAR *str1, const WCHAR *str2, int n ); extern int memicmpW( const WCHAR *str1, const WCHAR *str2, int n ); diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 26674d285d..4fc81fbbcb 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -91,5 +91,4 @@ C_SRCS = \ stubs.c \ symlink.c \ usleep.c \ - wctomb.c \ wctype.c diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index da9c3cdecc..569fd0869a 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -13,7 +13,8 @@ C_SRCS = \ mmap.c \ port.c \ sortkey.c \ - utf8.c + utf8.c \ + wctomb.c EXTRA_OBJS = version.o diff --git a/libs/wine/port.c b/libs/wine/port.c index b170d7293b..1c345b5cd3 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -40,7 +40,6 @@ const void *libwine_port_functions[] = vsnprintfW, wine_cp_enum_table, wine_cp_get_table, - wine_cp_wcstombs, }; /* no longer used, for backwards compatibility only */ diff --git a/libs/port/wctomb.c b/libs/wine/wctomb.c similarity index 97% rename from libs/port/wctomb.c rename to libs/wine/wctomb.c index 65e4aa04f7..bde4aa2746 100644 --- a/libs/port/wctomb.c +++ b/libs/wine/wctomb.c @@ -20,6 +20,10 @@ #include <string.h> +#include "wine/asm.h" + +#ifdef __ASM_OBSOLETE + #include "wine/unicode.h" extern WCHAR wine_compose( const WCHAR *str ) DECLSPEC_HIDDEN; @@ -408,9 +412,9 @@ static int wcstombs_dbcs_slow( const struct dbcs_table *table, int flags, /* wide char to multi byte string conversion */ /* return -1 on dst buffer overflow */ -int wine_cp_wcstombs( const union cptable *table, int flags, - const WCHAR *src, int srclen, - char *dst, int dstlen, const char *defchar, int *used ) +int wine_cp_wcstombs_obsolete( const union cptable *table, int flags, + const WCHAR *src, int srclen, + char *dst, int dstlen, const char *defchar, int *used ) { if (table->info.char_size == 1) { @@ -432,3 +436,7 @@ int wine_cp_wcstombs( const union cptable *table, int flags, return wcstombs_dbcs( &table->dbcs, src, srclen, dst, dstlen ); } } + +__ASM_OBSOLETE(wine_cp_wcstombs); + +#endif /* __ASM_OBSOLETE */ diff --git a/libs/wine/wine.map b/libs/wine/wine.map index 2893ffbaf0..aeb9e2963b 100644 --- a/libs/wine/wine.map +++ b/libs/wine/wine.map @@ -11,7 +11,6 @@ WINE_1.0 wine_casemap_upper; wine_cp_enum_table; wine_cp_get_table; - wine_cp_wcstombs; wine_dlclose; wine_dll_enum_load_path; wine_dll_set_callback; @@ -102,6 +101,7 @@ WINE_1.0 wine_call_on_stack; wine_compare_string; wine_cp_mbstowcs; + wine_cp_wcstombs; wine_cpsymbol_mbstowcs; wine_cpsymbol_wcstombs; wine_dbg_log;

1 0

Michael Stefaniuc : msscript.ocx/tests: Get rid of a2bstr().
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: bd0886f333ee93993140ab51abc97407e44abda5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0886f333ee93993140ab51… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 12 00:32:50 2020 +0100 msscript.ocx/tests: Get rid of a2bstr(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/tests/msscript.c | 90 +++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bd0886f333ee93993140…

1 0

Francois Gouget : tests: Restore the colon in the todo, skip and trace lines.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 98e50f9ead6fd0f9d3cddaed489074c375f49420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98e50f9ead6fd0f9d3cddaed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 12 03:16:48 2020 +0100 tests: Restore the colon in the todo, skip and trace lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 7a5606a1ec..3af3ffd2a9 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -346,7 +346,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) { if (winetest_debug > 0) { - printf( "%s:%d Test marked todo: ", + printf( "%s:%d: Test marked todo: ", data->current_file, data->current_line ); vprintf(msg, args); } @@ -396,7 +396,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d ", data->current_file, data->current_line ); + printf( "%s:%d: ", data->current_file, data->current_line ); __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); @@ -410,7 +410,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) if (winetest_add_line() < winetest_mute_threshold) { struct tls_data *data = get_tls_data(); - printf( "%s:%d Tests skipped: ", data->current_file, data->current_line ); + printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); InterlockedIncrement(&skipped); }

1 0

Alexandre Julliard : wrc: Use external NLS files for codepage conversions.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 721a2add2f11faecac901ca5bf039c65daab1d40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=721a2add2f11faecac901ca5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:04:59 2020 +0100 wrc: Use external NLS files for codepage conversions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/utils.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 104 insertions(+), 18 deletions(-) diff --git a/tools/wrc/utils.c b/tools/wrc/utils.c index 8c8a36faf5..78cc09c54b 100644 --- a/tools/wrc/utils.c +++ b/tools/wrc/utils.c @@ -303,23 +303,118 @@ int is_valid_codepage(int id) return IsValidCodePage( id ); } -static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstlen ) { - return MultiByteToWideChar( codepage, flags, src, srclen, dst, dstlen ); + WCHAR *dst = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + DWORD ret = MultiByteToWideChar( codepage, MB_ERR_INVALID_CHARS, src, srclen, dst, srclen ); + if (!ret) return NULL; + dst[ret] = 0; + *dstlen = ret; + return dst; } #else /* _WIN32 */ -#include "wine/unicode.h" +struct nls_info +{ + unsigned short codepage; + unsigned short unidef; + unsigned short trans_unidef; + unsigned short *cp2uni; + unsigned short *dbcs_offsets; +}; + +static struct nls_info nlsinfo[128]; + +static void init_nls_info( struct nls_info *info, unsigned short *ptr ) +{ + unsigned short hdr_size = ptr[0]; + + info->codepage = ptr[1]; + info->unidef = ptr[4]; + info->trans_unidef = ptr[6]; + ptr += hdr_size; + info->cp2uni = ++ptr; + ptr += 256; + if (*ptr++) ptr += 256; /* glyph table */ + info->dbcs_offsets = *ptr ? ptr + 1 : NULL; +} + +static const struct nls_info *get_nls_info( unsigned int codepage ) +{ + struct stat st; + unsigned short *data; + char *path; + unsigned int i; + int fd; + + for (i = 0; i < ARRAY_SIZE(nlsinfo) && nlsinfo[i].codepage; i++) + if (nlsinfo[i].codepage == codepage) return &nlsinfo[i]; + + assert( i < ARRAY_SIZE(nlsinfo) ); + + for (i = 0; nlsdirs[i]; i++) + { + path = strmake( "%s/c_%03u.nls", nlsdirs[i], codepage ); + if ((fd = open( path, O_RDONLY )) != -1) break; + free( path ); + } + if (!nlsdirs[i]) return NULL; + + fstat( fd, &st ); + data = xmalloc( st.st_size ); + if (read( fd, data, st.st_size ) != st.st_size) error( "failed to load %s\n", path ); + close( fd ); + free( path ); + init_nls_info( &nlsinfo[i], data ); + return &nlsinfo[i]; +} int is_valid_codepage(int cp) { - return cp == CP_UTF8 || wine_cp_get_table(cp); + return cp == CP_UTF8 || get_nls_info( cp ); } -static int wrc_mbstowcs( int codepage, int flags, const char *src, int srclen, WCHAR *dst, int dstlen ) +static WCHAR *codepage_to_unicode( int codepage, const char *src, int srclen, int *dstlen ) { - return wine_cp_mbstowcs( wine_cp_get_table( codepage ), flags, src, srclen, dst, dstlen ); + const struct nls_info *info = get_nls_info( codepage ); + unsigned int i; + WCHAR dbch, *dst = xmalloc( (srclen + 1) * sizeof(WCHAR) ); + + if (!info) error( "codepage %u not supported\n", codepage ); + + if (info->dbcs_offsets) + { + for (i = 0; srclen; i++, srclen--, src++) + { + unsigned short off = info->dbcs_offsets[(unsigned char)*src]; + if (off) + { + if (srclen == 1) return NULL; + dbch = (src[0] << 8) | (unsigned char)src[1]; + src++; + srclen--; + dst[i] = info->dbcs_offsets[off + (unsigned char)*src]; + if (dst[i] == info->unidef && dbch != info->trans_unidef) return NULL; + } + else + { + dst[i] = info->cp2uni[(unsigned char)*src]; + if (dst[i] == info->unidef && *src != info->trans_unidef) return NULL; + } + } + } + else + { + for (i = 0; i < srclen; i++) + { + dst[i] = info->cp2uni[(unsigned char)src[i]]; + if (dst[i] == info->unidef && src[i] != info->trans_unidef) return NULL; + } + } + dst[i] = 0; + *dstlen = i; + return dst; } #endif /* _WIN32 */ @@ -448,7 +543,6 @@ static char *unicode_to_utf8( const WCHAR *src, int srclen, int *dstlen ) string_t *convert_string_unicode( const string_t *str, int codepage ) { string_t *ret = xmalloc(sizeof(*ret)); - int res; ret->type = str_unicode; ret->loc = str->loc; @@ -460,16 +554,9 @@ string_t *convert_string_unicode( const string_t *str, int codepage ) if (codepage == CP_UTF8) ret->str.wstr = utf8_to_unicode( str->str.cstr, str->size, &ret->size ); else - { - ret->str.wstr = xmalloc( (str->size + 1) * sizeof(WCHAR) ); - res = wrc_mbstowcs( codepage, MB_ERR_INVALID_CHARS, str->str.cstr, str->size, - ret->str.wstr, str->size ); - if (res == -2) - parser_error( "Invalid character in string '%.*s' for codepage %u", - str->size, str->str.cstr, codepage ); - ret->size = res; - ret->str.wstr[ret->size] = 0; - } + ret->str.wstr = codepage_to_unicode( codepage, str->str.cstr, str->size, &ret->size ); + if (!ret->str.wstr) parser_error( "Invalid character in string '%.*s' for codepage %u", + str->size, str->str.cstr, codepage ); } else { @@ -698,6 +785,5 @@ int get_language_codepage( unsigned short lang, unsigned short sublang ) } if (cp == -1) cp = defcp; - assert( cp <= 0 || is_valid_codepage(cp) ); return cp; }

1 0

Nikolay Sivov : api-ms: Update EnumDisplayDevicesW() entries.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 107c616bc42d3cd3309ab3546adcb88c08fd0d1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=107c616bc42d3cd3309ab354… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 12 09:43:56 2020 +0300 api-ms: Update EnumDisplayDevicesW() entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-ntuser-sysparams-l1-1-0.spec | 2 +- .../ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec index 587a495563..3283708ec6 100644 --- a/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec +++ b/dlls/api-ms-win-ntuser-sysparams-l1-1-0/api-ms-win-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW diff --git a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec index ffb8f5b381..ff83143469 100644 --- a/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec +++ b/dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec @@ -1,7 +1,7 @@ @ stdcall ChangeDisplaySettingsExW(wstr ptr long long ptr) user32.ChangeDisplaySettingsExW @ stdcall DisplayConfigGetDeviceInfo(ptr) user32.DisplayConfigGetDeviceInfo @ stub DisplayConfigSetDeviceInfo -@ stdcall EnumDisplayDevicesW(ptr long ptr long) user32.EnumDisplayDevicesW +@ stdcall EnumDisplayDevicesW(wstr long ptr long) user32.EnumDisplayDevicesW @ stdcall EnumDisplayMonitors(long ptr ptr long) user32.EnumDisplayMonitors @ stdcall EnumDisplaySettingsExW(wstr long ptr long) user32.EnumDisplaySettingsExW @ stdcall EnumDisplaySettingsW(wstr long ptr ) user32.EnumDisplaySettingsW

1 0

Brendan Shanks : include: Fix size of RecordCreateOptionsEnum.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: 61d0cc78b24cf591746ab62d21259fe3b8e4d7e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d0cc78b24cf591746ab62d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Feb 11 15:57:02 2020 -0800 include: Fix size of RecordCreateOptionsEnum. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48577 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msado15_backcompat.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/msado15_backcompat.idl b/include/msado15_backcompat.idl index e4a847ab85..68fda6ab21 100644 --- a/include/msado15_backcompat.idl +++ b/include/msado15_backcompat.idl @@ -430,12 +430,12 @@ typedef [uuid(00000574-0000-0010-8000-00aa006d2ea4)] enum CopyRecordOptionsEnum typedef [uuid(00000570-0000-0010-8000-00aa006d2ea4)] enum RecordCreateOptionsEnum { - adCreateCollection = 0x00002000, - adCreateStructDoc = 0x80000000, - adCreateNonCollection = 0x00000000, - adOpenIfExists = 0x02000000, - adCreateOverwrite = 0x04000000, - adFailIfNotExists = -1 + adCreateCollection = (int) 0x00002000, + adCreateStructDoc = (int) 0x80000000, + adCreateNonCollection = (int) 0x00000000, + adOpenIfExists = (int) 0x02000000, + adCreateOverwrite = (int) 0x04000000, + adFailIfNotExists = (int) -1 } RecordCreateOptionsEnum; typedef [uuid(00000571-0000-0010-8000-00aa006d2ea4)] enum RecordOpenOptionsEnum

1 0

Jacek Caban : user32: Allow using null driver as a normal graphics driver.
by Alexandre Julliard Feb. 12, 2020

Feb. 12, 2020

Module: wine Branch: master Commit: beaef92010056d4048b3e98001779dc399a46571 URL: https://source.winehq.org/git/wine.git/?a=commit;h=beaef92010056d4048b3e980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 11 20:45:27 2020 +0100 user32: Allow using null driver as a normal graphics driver. When explicitly requested by config, Wine will use null driver in the same way as we allow using it for invisible winstations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 33 +++++++++++++++++---------------- programs/explorer/desktop.c | 10 +++++++++- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 66b26ca51a..07be6a9a4a 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -41,7 +41,7 @@ static char driver_load_error[80]; static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); -static HMODULE load_desktop_driver( HWND hwnd ) +static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) { static const WCHAR display_device_guid_propW[] = { '_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', @@ -53,7 +53,8 @@ static HMODULE load_desktop_driver( HWND hwnd ) 'V','i','d','e','o','\\','{',0}; static const WCHAR displayW[] = {'}','\\','0','0','0','0',0}; static const WCHAR driverW[] = {'G','r','a','p','h','i','c','s','D','r','i','v','e','r',0}; - HMODULE ret = 0; + static const WCHAR nullW[] = {'n','u','l','l',0}; + BOOL ret = FALSE; HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; @@ -76,8 +77,9 @@ static HMODULE load_desktop_driver( HWND hwnd ) size = sizeof(path); if (!RegQueryValueExW( hkey, driverW, NULL, NULL, (BYTE *)path, &size )) { - if (!(ret = LoadLibraryW( path ))) ERR( "failed to load %s\n", debugstr_w(path) ); - TRACE( "%s %p\n", debugstr_w(path), ret ); + ret = !strcmpW( path, nullW ) || (*module = LoadLibraryW( path )); + if (!ret) ERR( "failed to load %s\n", debugstr_w(path) ); + TRACE( "%s %p\n", debugstr_w(path), *module ); } else { @@ -98,8 +100,17 @@ static const USER_DRIVER *load_driver(void) driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) ); *driver = null_driver; - graphics_driver = load_desktop_driver( GetDesktopWindow() ); - if (graphics_driver) + if (!load_desktop_driver( GetDesktopWindow(), &graphics_driver )) + { + USEROBJECTFLAGS flags; + HWINSTA winstation; + + winstation = GetProcessWindowStation(); + if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) + || (flags.dwFlags & WSF_VISIBLE)) + driver->pCreateWindow = nodrv_CreateWindow; + } + else if (graphics_driver) { #define GET_USER_FUNC(name) \ do { if ((ptr = GetProcAddress( graphics_driver, #name ))) driver->p##name = ptr; } while(0) @@ -153,16 +164,6 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } - else - { - USEROBJECTFLAGS flags; - HWINSTA winstation; - - winstation = GetProcessWindowStation(); - if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) - || (flags.dwFlags & WSF_VISIBLE)) - driver->pCreateWindow = nodrv_CreateWindow; - } prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index d4925f7c5b..bac17dcc5f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -766,6 +766,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) WCHAR buffer[MAX_PATH], libname[32], *name, *next; WCHAR key[ARRAY_SIZE( device_keyW ) + 39]; + BOOL null_driver = FALSE; HMODULE module = 0; HKEY hkey; char error[80]; @@ -790,6 +791,13 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) next = wcschr( name, ',' ); if (next) *next++ = 0; + if (!wcscmp( name, L"null" )) + { + TRACE( "display %s using null driver\n", debugstr_guid(guid) ); + null_driver = TRUE; + break; + } + swprintf( libname, ARRAY_SIZE( libname ), drv_formatW, name ); if ((module = LoadLibraryW( libname )) != 0) break; switch (GetLastError()) @@ -820,7 +828,7 @@ static HMODULE load_graphics_driver( const WCHAR *driver, const GUID *guid ) if (!RegCreateKeyExW( HKEY_LOCAL_MACHINE, key, 0, NULL, REG_OPTION_VOLATILE, KEY_SET_VALUE, NULL, &hkey, NULL )) { - if (module) + if (module || null_driver) RegSetValueExW( hkey, graphics_driverW, 0, REG_SZ, (BYTE *)buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); else

1 0