February 2020 - Wine-commits

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

12 Feb '20

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

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

12 Feb '20

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

Derek Lesho : mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 37d977da22eaf8959d795ad8b1dcf84a18ba250d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d977da22eaf8959d795ad8… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Wed Feb 12 08:46:37 2020 +0300 mfplat: Implement IMFByteStream::SetCurrentPosition() for file streams. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 50 +++++++++++++++++++++------------------------- dlls/mfplat/tests/mfplat.c | 20 ++++++++++++++++++- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1ebd443131..ef0db5a276 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -3287,22 +3287,18 @@ static HRESULT WINAPI mfbytestream_SetLength(IMFByteStream *iface, QWORD length) return E_NOTIMPL; } -static HRESULT WINAPI mfbytestream_GetCurrentPosition(IMFByteStream *iface, QWORD *position) +static HRESULT WINAPI bytestream_file_GetCurrentPosition(IMFByteStream *iface, QWORD *position) { - mfbytestream *This = impl_from_IMFByteStream(iface); - - FIXME("%p, %p\n", This, position); + struct bytestream *stream = impl_from_IMFByteStream(iface); - return E_NOTIMPL; -} + TRACE("%p, %p.\n", iface, position); -static HRESULT WINAPI mfbytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - mfbytestream *This = impl_from_IMFByteStream(iface); + if (!position) + return E_INVALIDARG; - FIXME("%p, %s\n", This, wine_dbgstr_longlong(position)); + *position = stream->position; - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI bytestream_file_GetLength(IMFByteStream *iface, QWORD *length) @@ -3445,6 +3441,19 @@ static HRESULT WINAPI mfbytestream_Close(IMFByteStream *iface) return E_NOTIMPL; } +static HRESULT WINAPI bytestream_SetCurrentPosition(IMFByteStream *iface, QWORD position) +{ + struct bytestream *stream = impl_from_IMFByteStream(iface); + + TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); + + EnterCriticalSection(&stream->cs); + stream->position = position; + LeaveCriticalSection(&stream->cs); + + return S_OK; +} + static const IMFByteStreamVtbl bytestream_file_vtbl = { bytestream_QueryInterface, @@ -3453,8 +3462,8 @@ static const IMFByteStreamVtbl bytestream_file_vtbl = bytestream_GetCapabilities, bytestream_file_GetLength, mfbytestream_SetLength, - mfbytestream_GetCurrentPosition, - mfbytestream_SetCurrentPosition, + bytestream_file_GetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_file_IsEndOfStream, bytestream_file_Read, bytestream_BeginRead, @@ -3512,19 +3521,6 @@ static HRESULT WINAPI bytestream_stream_GetCurrentPosition(IMFByteStream *iface, return S_OK; } -static HRESULT WINAPI bytestream_stream_SetCurrentPosition(IMFByteStream *iface, QWORD position) -{ - struct bytestream *stream = impl_from_IMFByteStream(iface); - - TRACE("%p, %s.\n", iface, wine_dbgstr_longlong(position)); - - EnterCriticalSection(&stream->cs); - stream->position = position; - LeaveCriticalSection(&stream->cs); - - return S_OK; -} - static HRESULT WINAPI bytestream_stream_IsEndOfStream(IMFByteStream *iface, BOOL *ret) { struct bytestream *stream = impl_from_IMFByteStream(iface); @@ -3642,7 +3638,7 @@ static const IMFByteStreamVtbl bytestream_stream_vtbl = bytestream_stream_GetLength, bytestream_stream_SetLength, bytestream_stream_GetCurrentPosition, - bytestream_stream_SetCurrentPosition, + bytestream_SetCurrentPosition, bytestream_stream_IsEndOfStream, bytestream_stream_Read, bytestream_BeginRead, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7ec0b01982..67123d0b69 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1340,15 +1340,16 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { IMFByteStream *bytestream, *bytestream2; + QWORD bytestream_length, position; IMFAttributes *attributes = NULL; MF_ATTRIBUTE_TYPE item_type; - QWORD bytestream_length; WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; IUnknown *unk; HRESULT hr; WCHAR *str; + BOOL eos; static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; @@ -1415,6 +1416,23 @@ static void test_file_stream(void) ok(hr == S_OK, "Failed to get bytestream length, hr %#x.\n", hr); ok(bytestream_length > 0, "Unexpected bytestream length %s.\n", wine_dbgstr_longlong(bytestream_length)); + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + hr = IMFByteStream_SetCurrentPosition(bytestream, 2 * bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFByteStream_GetCurrentPosition(bytestream, &position); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Alexandre Julliard : wrc: Add --nls-dir option.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: 64ff68c8847adb230beca184195a66d424f3dfa0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64ff68c8847adb230beca184… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:03:51 2020 +0100 wrc: Add --nls-dir option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/Makefile.in | 2 ++ tools/wrc/wrc.c | 9 +++++++++ tools/wrc/wrc.h | 2 ++ tools/wrc/wrc.man.in | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index c81276ebc6..f68081847e 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -16,7 +16,9 @@ LEX_SRCS = parser.l BISON_SRCS = parser.y wrc_EXTRADEFS = \ + -DNLSDIR="\"${nlsdir}\"" \ -DINCLUDEDIR="\"${includedir}\"" \ + -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" \ -DBIN_TO_INCLUDEDIR=\"`$(MAKEDEP) -R ${bindir} ${includedir}`\" EXTRALIBS = $(GETTEXTPO_LIBS) -lwpp diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index f81fe7baa6..6c1887a788 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -66,6 +66,7 @@ static const char usage[] = " -J, --input-format=FORMAT The input format (either `rc' or `rc16')\n" " -l, --language=LANG Set default language to LANG (default is neutral {0, 0})\n" " -m16, -m32, -m64 Build for 16-bit, 32-bit resp. 64-bit platforms\n" + " --nls-dir=DIR Directory containing the NLS codepage mappings\n" " --no-use-temp-file Ignored for compatibility with windres\n" " --nostdinc Disables searching the standard include path\n" " -o, --output=FILE Output to file (default is infile.res)\n" @@ -157,6 +158,7 @@ char *input_name = NULL; /* The name given on the command-line */ static char *temp_name = NULL; /* Temporary file for preprocess pipe */ static const char *includedir; +const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -175,6 +177,7 @@ enum long_options_values LONG_OPT_NOSTDINC = 1, LONG_OPT_TMPFILE, LONG_OPT_NOTMPFILE, + LONG_OPT_NLS_DIR, LONG_OPT_PO_DIR, LONG_OPT_PREPROCESSOR, LONG_OPT_SYSROOT, @@ -196,6 +199,7 @@ static const struct option long_options[] = { { "input", 1, NULL, 'i' }, { "input-format", 1, NULL, 'J' }, { "language", 1, NULL, 'l' }, + { "nls-dir", 1, NULL, LONG_OPT_NLS_DIR }, { "no-use-temp-file", 0, NULL, LONG_OPT_NOTMPFILE }, { "nostdinc", 0, NULL, LONG_OPT_NOSTDINC }, { "output", 1, NULL, 'o' }, @@ -349,6 +353,8 @@ static void init_argv0_dir( const char *argv0 ) if (p == dir) p++; *p = 0; includedir = strmake( "%s/%s", dir, BIN_TO_INCLUDEDIR ); + if (strendswith( dir, "/tools/wrc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); + else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); free( dir ); #endif } @@ -408,6 +414,9 @@ int main(int argc,char *argv[]) case LONG_OPT_NOTMPFILE: if (debuglevel) warning("--no-use-temp-file option not yet supported, ignored.\n"); break; + case LONG_OPT_NLS_DIR: + nlsdirs[0] = xstrdup( optarg ); + break; case LONG_OPT_PO_DIR: po_dir = xstrdup( optarg ); break; diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 9664dd0392..24b0e28904 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -45,6 +45,8 @@ extern int check_utf8; extern char *input_name; extern char *cmdline; +extern const char *nlsdirs[]; + extern int line_number; extern int char_number; diff --git a/tools/wrc/wrc.man.in b/tools/wrc/wrc.man.in index 24dca04902..e3ad8fca4d 100644 --- a/tools/wrc/wrc.man.in +++ b/tools/wrc/wrc.man.in @@ -80,6 +80,10 @@ Generate resources for 16-bit, 32-bit or 64-bit platforms respectively. The only difference between 32-bit and 64-bit is whether the _WIN64 preprocessor symbol is defined. .TP +.I \fB\-\-nls-dir=\fIdir\fR +Specify the directory to search for the NLS files containing the +codepage mapping tables. +.TP .I \fB\-\-nostdinc\fR Do not search the standard include path, look for include files only in the directories explicitly specified with the \fB\-I\fR option.

1 0

Alexandre Julliard : wmc: Add --nls-dir option.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: a4fc84bd4d37ca2f1cd73f33cff1af71e065cc23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4fc84bd4d37ca2f1cd73f33… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 12 09:03:57 2020 +0100 wmc: Add --nls-dir option. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wmc/Makefile.in | 4 ++++ tools/wmc/wmc.c | 35 +++++++++++++++++++++++++++++++++++ tools/wmc/wmc.h | 2 ++ tools/wmc/wmc.man.in | 7 ++++--- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index a97da85ea3..660bc940f4 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -11,6 +11,10 @@ C_SRCS = \ BISON_SRCS = mcy.y +wmc_EXTRADEFS = \ + -DNLSDIR="\"${nlsdir}\"" \ + -DBIN_TO_NLSDIR=\"`$(MAKEDEP) -R ${bindir} ${nlsdir}`\" + EXTRALIBS = $(GETTEXTPO_LIBS) INSTALL_DEV = $(PROGRAMS) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 057b9eef03..3b93fed40e 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -50,6 +50,7 @@ static const char usage[] = " -h, --help Print this message\n" " -H FILE Write header file to FILE (default is inputfile.h)\n" " -i Inline messagetable(s)\n" + " --nls-dir=DIR Directory containing the NLS codepage mappings\n" " -o, --output=FILE Output to FILE (default is infile.rc)\n" " -O, --output-format=FORMAT The output format (`rc', `res', or `pot')\n" " -P, --po-dir=DIR Directory containing po files for translations\n" @@ -109,6 +110,8 @@ char *output_name = NULL; /* The name given by the -o option */ char *input_name = NULL; /* The name given on the command-line */ char *header_name = NULL; /* The name given by the -H option */ +const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; + int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ @@ -127,10 +130,16 @@ static enum FORMAT_POT } output_format; +enum long_options_values +{ + LONG_OPT_NLS_DIR = 1, +}; + static const char short_options[] = "B:cdDhH:io:O:P:uUvVW"; static const struct option long_options[] = { { "help", 0, NULL, 'h' }, + { "nls-dir", 1, NULL, LONG_OPT_NLS_DIR }, { "output", 1, NULL, 'o' }, { "output-format", 1, NULL, 'O' }, { "pedantic", 0, NULL, 'W' }, @@ -151,6 +160,28 @@ static void exit_on_signal( int sig ) exit(1); /* this will call the atexit functions */ } +static void init_argv0_dir( const char *argv0 ) +{ +#ifndef _WIN32 + char *p, *dir; + +#if defined(__linux__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) + dir = realpath( "/proc/self/exe", NULL ); +#elif defined (__FreeBSD__) || defined(__DragonFly__) + dir = realpath( "/proc/curproc/file", NULL ); +#else + dir = realpath( argv0, NULL ); +#endif + if (!dir) return; + if (!(p = strrchr( dir, '/' ))) return; + if (p == dir) p++; + *p = 0; + if (strendswith( dir, "/tools/wmc" )) nlsdirs[0] = strmake( "%s/../../nls", dir ); + else nlsdirs[0] = strmake( "%s/%s", dir, BIN_TO_NLSDIR ); + free( dir ); +#endif +} + int main(int argc,char *argv[]) { int optc; @@ -167,6 +198,7 @@ int main(int argc,char *argv[]) #ifdef SIGHUP signal( SIGHUP, exit_on_signal ); #endif + init_argv0_dir( argv[0] ); /* First rebuild the commandline to put in destination */ /* Could be done through env[], but not all OS-es support it */ @@ -257,6 +289,9 @@ int main(int argc,char *argv[]) case 'W': pedantic = 1; break; + case LONG_OPT_NLS_DIR: + nlsdirs[0] = xstrdup( optarg ); + break; default: lose++; break; diff --git a/tools/wmc/wmc.h b/tools/wmc/wmc.h index 441072b3f7..ae3a1dc1d3 100644 --- a/tools/wmc/wmc.h +++ b/tools/wmc/wmc.h @@ -49,6 +49,8 @@ extern char *input_name; extern char *header_name; extern char *cmdline; +extern const char *nlsdirs[]; + extern int line_number; extern int char_number; diff --git a/tools/wmc/wmc.man.in b/tools/wmc/wmc.man.in index 03f99acfee..123af446a5 100644 --- a/tools/wmc/wmc.man.in +++ b/tools/wmc/wmc.man.in @@ -45,6 +45,10 @@ Inline messagetable(s). This option skips the generation of all \fI.bin\fR files and writes all output into the \fI.rc\fR file. This encoding is parsable with wrc(1). .TP +.BI \-\-nls-dir= directory +Specify the directory to search for the NLS files containing the +codepage mapping tables. +.TP .BR \-o ,\ \-\-output =\fIfile Output to \fIfile\fR. Default is \fIinputfile.rc\fR. .TP @@ -94,9 +98,6 @@ The message compiler should be able to have multiple input files and combine them into one output file. This would enable the splitting of languages into separate files. .PP -Unicode detection of the input is suboptimal, to say the least. It should -recognize byte order marks (BOM) and decide what to do. -.PP Decimal output is completely lacking. Don't know whether it should be implemented because it is a, well, non-informative format change. It is recognized on the commandline for some form of compatibility.

1 0

Alexandre Julliard : wrc: Use external NLS files for codepage conversions.
by Alexandre Julliard 12 Feb '20

12 Feb '20

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

Alexandre Julliard : wmc: Use external NLS files for codepage conversions.
by Alexandre Julliard 12 Feb '20

12 Feb '20

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 12 Feb '20

12 Feb '20

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 12 Feb '20

12 Feb '20

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

Kevin Puetz : include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR.
by Alexandre Julliard 12 Feb '20

12 Feb '20

Module: wine Branch: master Commit: c2679945dd1ffddbc8e8a43dc7263be7738d4a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2679945dd1ffddbc8e8a43d… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Tue Feb 11 19:52:22 2020 +0100 include: Introduce WINE_UNICODE_CHAR16 that allows using char16_t as Windows WCHAR. This is useful for winelib applications that don't use -fshort-wchar. They may use u"" for string literals and u16string. However, C++ has builtin char16_t type, so we need WCHAR to be compatible with that. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/sqltypes.h | 4 +++- include/tchar.h | 4 +++- include/winnt.h | 9 ++++++--- include/winnt.rh | 6 ++++-- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/sqltypes.h b/include/sqltypes.h index 4f3f8fe9f1..0923f6b362 100644 --- a/include/sqltypes.h +++ b/include/sqltypes.h @@ -28,8 +28,10 @@ extern "C" { #endif typedef unsigned char SQLCHAR; -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t SQLWCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t SQLWCHAR; #else typedef unsigned short SQLWCHAR; #endif diff --git a/include/tchar.h b/include/tchar.h index 5234a70bd9..d5e4983756 100644 --- a/include/tchar.h +++ b/include/tchar.h @@ -244,8 +244,10 @@ typedef unsigned short wctype_t; #endif #ifndef __TCHAR_DEFINED -#ifdef WINE_UNICODE_NATIVE +#if defined(WINE_UNICODE_NATIVE) typedef wchar_t _TCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t _TCHAR; #else typedef unsigned short _TCHAR; #endif diff --git a/include/winnt.h b/include/winnt.h index adc5d3d686..adb7ef5669 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -463,11 +463,14 @@ typedef int LONG, *PLONG; #endif /* Some systems might have wchar_t, but we really need 16 bit characters */ -#ifdef WINE_UNICODE_NATIVE -typedef wchar_t WCHAR, *PWCHAR; +#if defined(WINE_UNICODE_NATIVE) +typedef wchar_t WCHAR; +#elif defined(WINE_UNICODE_CHAR16) +typedef char16_t WCHAR; #else -typedef unsigned short WCHAR, *PWCHAR; +typedef unsigned short WCHAR; #endif +typedef WCHAR *PWCHAR; typedef ULONG UCSCHAR; #define MIN_UCSCHAR (0) diff --git a/include/winnt.rh b/include/winnt.rh index 59791bc996..786a38f326 100644 --- a/include/winnt.rh +++ b/include/winnt.rh @@ -24,10 +24,12 @@ * macro which only exists in the user's code. */ #ifndef WINE_NO_UNICODE_MACROS -# ifdef UNICODE +# ifndef UNICODE +# define __TEXT(string) string +# elif defined(WINE_UNICODE_NATIVE) # define __TEXT(string) L##string # else -# define __TEXT(string) string +# define __TEXT(string) u##string # endif # define TEXT(string) __TEXT(string) #endif

1 0