November 2020 - Wine-Commits

Piotr Caban : msvcrt: Remove MSVCRT__locale_t type.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 5114c85a0365d29f49c63ca967dfd2e9159c6338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5114c85a0365d29f49c63ca9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:18 2020 +0100 msvcrt: Remove MSVCRT__locale_t type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 4 +- dlls/msvcrt/ctype.c | 32 +++++----- dlls/msvcrt/file.c | 26 ++++---- dlls/msvcrt/locale.c | 22 +++---- dlls/msvcrt/mbcs.c | 82 ++++++++++++------------ dlls/msvcrt/msvcrt.h | 67 +++++++++---------- dlls/msvcrt/printf.h | 22 +++---- dlls/msvcrt/scanf.c | 48 +++++++------- dlls/msvcrt/scanf.h | 32 +++++----- dlls/msvcrt/string.c | 56 ++++++++-------- dlls/msvcrt/time.c | 10 +-- dlls/msvcrt/wcs.c | 174 +++++++++++++++++++++++++------------------------- 12 files changed, 284 insertions(+), 291 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5114c85a0365d29f49c6…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_pthreadlocinfo type.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: d5c0458bd17e1759d25a94038414bf5d4f84a828 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c0458bd17e1759d25a9403… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:09 2020 +0100 msvcrt: Remove MSVCRT_pthreadlocinfo type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 6 ++--- dlls/msvcrt/locale.c | 56 +++++++++++++++++++++++----------------------- dlls/msvcrt/mbcs.c | 10 ++++----- dlls/msvcrt/msvcrt.h | 58 +++++++----------------------------------------- dlls/msvcrt/scanf.h | 4 ++-- dlls/msvcrt/string.c | 26 +++++++++++----------- dlls/msvcrt/time.c | 12 +++++----- dlls/msvcrt/wcs.c | 20 ++++++++--------- include/msvcrt/corecrt.h | 17 +++++++++++++- 9 files changed, 91 insertions(+), 118 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d5c0458bd17e1759d25a…

1 0

Piotr Caban : msvcrt: Move towctrans to wcs.c file.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 1f5930af51c2eb2b72c3cf30df76bbbc31b6f80d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5930af51c2eb2b72c3cf30… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:01 2020 +0100 msvcrt: Move towctrans to wcs.c file. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/locale.c | 10 ---------- dlls/msvcrt/wcs.c | 11 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 77021438cb9..4427eb8bd3b 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2414,7 +2414,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ cdecl towctrans(long long) MSVCR120_towctrans +@ cdecl towctrans(long long) @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 1bc540b717b..52fbd9cf9c7 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2148,14 +2148,4 @@ wctrans_t CDECL MSVCR120_wctrans(const char *property) return 1; return 0; } - -/********************************************************************* - * towctrans (MSVCR120.@) - */ -MSVCRT_wint_t CDECL MSVCR120_towctrans(MSVCRT_wint_t c, wctrans_t category) -{ - if(category == 1) - return MSVCRT__towupper_l(c, NULL); - return MSVCRT__towlower_l(c, NULL); -} #endif diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 956efcb71c1..c46c09bedfa 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <math.h> #include <assert.h> +#include <wctype.h> #include "msvcrt.h" #include "winnls.h" #include "wtypes.h" @@ -136,6 +137,16 @@ INT CDECL MSVCRT__wcsicmp_l(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *st return c1 - c2; } +/********************************************************************* + * towctrans (MSVCR120.@) + */ +wint_t CDECL towctrans(wint_t c, wctrans_t category) +{ + if(category == 1) + return MSVCRT__towupper_l(c, NULL); + return MSVCRT__towlower_l(c, NULL); +} + /********************************************************************* * _wcsicmp (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1f8fce6a016..4206b380897 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2543,7 +2543,7 @@ @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ cdecl towctrans(long long) MSVCR120_towctrans +@ cdecl towctrans(long long) @ cdecl towlower(long) MSVCRT_towlower @ cdecl towupper(long) MSVCRT_towupper @ cdecl trunc(double) MSVCR120_trunc

1 0

Paul Gofman : ntdll/tests: Test noname named pipe uniqueness.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 44e135a7bdb6fa9f881061529a5c825f68adabe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e135a7bdb6fa9f88106152… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 25 21:42:46 2020 +0300 ntdll/tests: Test noname named pipe uniqueness. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/pipe.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/pipe.c b/dlls/ntdll/tests/pipe.c index 42bd825dc3c..662dc1d55cb 100644 --- a/dlls/ntdll/tests/pipe.c +++ b/dlls/ntdll/tests/pipe.c @@ -2408,7 +2408,7 @@ static void test_security_info(void) static void test_empty_name(void) { - HANDLE hdirectory, hpipe, hwrite, handle; + HANDLE hdirectory, hpipe, hpipe2, hwrite, hwrite2, handle; OBJECT_TYPE_INFORMATION *type_info; OBJECT_NAME_INFORMATION *name_info; OBJECT_ATTRIBUTES attr; @@ -2486,6 +2486,11 @@ static void test_empty_name(void) 0, 0, 0, 1, 4096, 4096, &timeout); todo_wine ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "Got unexpected status %#x.\n", status); + status = pNtCreateNamedPipeFile(&hpipe2, GENERIC_READ | SYNCHRONIZE, &attr, + &io, FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_CREATE, FILE_SYNCHRONOUS_IO_NONALERT, + 0, 0, 0, 3, 4096, 4096, &timeout); + ok(!status, "Got unexpected status %#x.\n", status); + attr.RootDirectory = hpipe; pRtlInitUnicodeString(&name, L"a"); status = NtCreateFile(&hwrite, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0, @@ -2519,20 +2524,38 @@ static void test_empty_name(void) FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); ok(status == STATUS_PIPE_NOT_AVAILABLE, "Got unexpected status %#x.\n", status); + attr.RootDirectory = hpipe2; + status = NtCreateFile(&hwrite2, GENERIC_WRITE | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, &attr, &io, NULL, 0, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_OPEN, FILE_SYNCHRONOUS_IO_NONALERT, NULL, 0 ); + ok(!status, "Got unexpected status %#x.\n", status); + data = 0xdeadbeef; ret = WriteFile(hwrite, &data, sizeof(data), &length, NULL); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + data = 0xfeedcafe; + ret = WriteFile(hwrite2, &data, sizeof(data), &length, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + data = 0; ret = ReadFile(hpipe, &data, sizeof(data), &length, NULL); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); ok(length == sizeof(data), "Got unexpected length %#x.\n", length); ok(data == 0xdeadbeef, "Got unexpected data %#x.\n", data); + data = 0; + ret = ReadFile(hpipe2, &data, sizeof(data), &length, NULL); + ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); + ok(length == sizeof(data), "Got unexpected length %#x.\n", length); + ok(data == 0xfeedcafe, "Got unexpected data %#x.\n", data); + CloseHandle(hwrite); CloseHandle(hpipe); CloseHandle(hdirectory); + CloseHandle(hpipe2); + CloseHandle(hwrite2); } START_TEST(pipe)

1 0

Paul Gofman : server: Do not dereference symlinks specified as root directory.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: ae106feed2878a6eed144a4d08d082863569a669 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae106feed2878a6eed144a4d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 25 21:42:42 2020 +0300 server: Do not dereference symlinks specified as root directory. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++- server/console.c | 24 ++++++++++++------- server/directory.c | 4 ++-- server/file.c | 6 +++-- server/mailslot.c | 4 ++-- server/named_pipe.c | 4 ++-- server/object.c | 6 ++--- server/object.h | 5 ++-- server/sock.c | 6 +++-- server/symlink.c | 5 ++-- server/winstation.c | 4 ++-- 11 files changed, 104 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae106feed2878a6eed14…

1 0

Alexandre Julliard : winebuild: Initialize entry point to avoid a compiler warning.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: b3a38fef26915e0cdc77de14f059b0ee2b0751f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3a38fef26915e0cdc77de14… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 26 18:12:55 2020 +0100 winebuild: Initialize entry point to avoid a compiler warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 53d4fb2869b..fb5c26da07f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -215,8 +215,7 @@ static inline ORDDEF *find_export( const char *name, ORDDEF **table, int size ) { ORDDEF func, *odp, **res = NULL; - func.name = xstrdup(name); - func.ordinal = -1; + func.name = func.export_name = xstrdup(name); odp = &func; if (table) res = bsearch( &odp, table, size, sizeof(*table), func_cmp ); free( func.name );

1 0

Kevin Puetz : winegcc: Implement -Wl,--out-implib.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 9faa5eeddd24a057d9ff522259c9dbdc6203c098 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9faa5eeddd24a057d9ff5222… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Wed Nov 25 13:41:43 2020 -0600 winegcc: Implement -Wl,--out-implib. This allows a CMake toolchain (or other caller) to treat winegcc like MinGW, specifying that it produce a separate file for imports, e.g. set(CMAKE_IMPORT_LIBRARY_PREFIX lib) set(CMAKE_IMPORT_LIBRARY_SUFFIX .a) string(APPEND CMAKE_C_CREATE_SHARED_LIBRARY " -Wl,--out-implib,<TARGET_IMPLIB>") Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 39 ++++++++++++++++++++++++++++++++++++++- tools/winegcc/winegcc.man.in | 2 ++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 9268a5dfd1d..e9707a73774 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -141,6 +141,7 @@ static const char* app_loader_template = static const char *output_file_name; static const char *output_debug_file; +static const char *output_implib; static int keep_generated = 0; static strarray* tmp_files; #ifdef HAVE_SIGSET_T @@ -231,6 +232,7 @@ struct options const char* entry_point; const char* prelink; const char* debug_file; + const char* out_implib; strarray* prefix; strarray* lib_dirs; strarray* args; @@ -273,6 +275,7 @@ static void cleanup_output_files(void) { if (output_file_name) unlink( output_file_name ); if (output_debug_file) unlink( output_debug_file ); + if (output_implib) unlink( output_implib ); } static void clean_temp_files(void) @@ -522,6 +525,9 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) if (opts->debug_file && strendswith(opts->debug_file, ".pdb")) strarray_add(link_args, strmake("-Wl,-pdb,%s", opts->debug_file)); + if (opts->out_implib) + strarray_add(link_args, strmake("-Wl,--out-implib,%s", opts->out_implib)); + if (!try_link( opts->prefix, link_args, "-Wl,--file-alignment,0x1000" )) strarray_add( link_args, strmake( "-Wl,--file-alignment,%s", opts->file_align ? opts->file_align : "0x1000" )); @@ -554,6 +560,10 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add(link_args, "-Wl,-debug"); strarray_add(link_args, strmake("-Wl,-pdb:%s", opts->debug_file)); } + + if (opts->out_implib) + strarray_add(link_args, strmake("-Wl,-implib:%s", opts->out_implib)); + else if (!opts->strip) strarray_add(link_args, "-Wl,-debug:dwarf"); strarray_add( link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" )); @@ -1085,7 +1095,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil static void build(struct options* opts) { strarray *lib_dirs, *files; - strarray *spec_args, *link_args, *tool; + strarray *spec_args, *link_args, *implib_args, *tool; char *output_file, *output_path; const char *spec_o_name, *libgcc = NULL; const char *output_name, *spec_file, *lang; @@ -1430,6 +1440,7 @@ static void build(struct options* opts) output_file_name = output_path; output_debug_file = opts->debug_file; + output_implib = opts->out_implib; atexit( cleanup_output_files ); spawn(opts->prefix, link_args, 0); @@ -1460,6 +1471,26 @@ static void build(struct options* opts) strarray_free(tool); } + if (opts->out_implib && !is_pe) + { + if (!spec_file) + error("--out-implib requires a .spec or .def file\n"); + + implib_args = get_winebuild_args( opts ); + if ((tool = build_tool_name( opts, TOOL_CC ))) strarray_add( implib_args, strmake( "--cc-cmd=%s", strarray_tostring( tool, " " ))); + if ((tool = build_tool_name( opts, TOOL_LD ))) strarray_add( implib_args, strmake( "--ld-cmd=%s", strarray_tostring( tool, " " ))); + + strarray_add(implib_args, "--implib"); + strarray_add(implib_args, "-o"); + strarray_add(implib_args, opts->out_implib); + strarray_add(implib_args, "--export"); + strarray_add(implib_args, spec_file); + strarray_addall(implib_args, opts->winebuild_args); + + spawn(opts->prefix, implib_args, 0); + strarray_free (implib_args); + } + /* set the base address with prelink if linker support is not present */ if (opts->prelink && !opts->target) { @@ -1972,6 +2003,11 @@ int main(int argc, char **argv) strarray_add( opts.files, strmake( "-Wl,%s", Wl->base[j] )); continue; } + if (!strcmp(Wl->base[j], "--out-implib")) + { + opts.out_implib = strdup( Wl->base[++j] ); + continue; + } if (!strcmp(Wl->base[j], "-static")) linking = -1; strarray_add(opts.linker_args, strmake("-Wl,%s",Wl->base[j])); } @@ -2056,5 +2092,6 @@ int main(int argc, char **argv) output_file_name = NULL; output_debug_file = NULL; + output_implib = NULL; return 0; } diff --git a/tools/winegcc/winegcc.man.in b/tools/winegcc/winegcc.man.in index 8a14dd59fd1..831a98323cf 100644 --- a/tools/winegcc/winegcc.man.in +++ b/tools/winegcc/winegcc.man.in @@ -72,6 +72,8 @@ Do not add the winecrt0 library when linking. .IP \fB-Wb,\fIoption\fR Pass an option to winebuild. If \fIoption\fR contains commas, it is split into multiple options at the commas. +.IP \fB-Wl,--out-implib,\fIlib.a\fR +When linking a dll, also create its corresponding import library. .SH ENVIRONMENT .TP .B WINEBUILD

1 0

Gabriel Ivăncescu : msvcrt: Fix signature of _mbscmp.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 33af64c57c9515d9bd292617d618a463fedaf6d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33af64c57c9515d9bd292617… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 26 15:58:09 2020 +0200 msvcrt: Fix signature of _mbscmp. This function doesn't take a locale argument. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/mbcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 0d7a5c8f643..af5ab698f23 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -931,7 +931,7 @@ int CDECL _mbscmp_l(const unsigned char* str, const unsigned char* cmp, _locale_ /********************************************************************* * _mbscmp(MSVCRT.@) */ -int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp, _locale_t locale) +int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) { return _mbscmp_l(str, cmp, NULL); }

1 0

Piotr Caban : msvcrt: Remove MSVCRT prefix from locale functions.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: 17f3f548861dc2c7502690b7d3183e3b9b8a5510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17f3f548861dc2c7502690b7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:24 2020 +0100 msvcrt: Remove MSVCRT prefix from locale functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 14 +++++++------- dlls/msvcr110/msvcr110.spec | 14 +++++++------- dlls/msvcr120/msvcr120.spec | 14 +++++++------- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 14 +++++++------- dlls/msvcr90/msvcr90.spec | 14 +++++++------- dlls/msvcrt/locale.c | 20 ++++++++++---------- dlls/msvcrt/main.c | 3 ++- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +-- dlls/msvcrt/msvcrt.spec | 8 ++++---- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 14 +++++++------- 15 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17f3f548861dc2c75026…

1 0

Piotr Caban : msvcrt: Remove MSVCRT_pthreadmbcinfo type.
by Alexandre Julliard Nov. 26, 2020

Nov. 26, 2020

Module: wine Branch: master Commit: d496099c74ba7ce4d445a14dceb22b2de2ab0ec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d496099c74ba7ce4d445a14d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 26 19:19:13 2020 +0100 msvcrt: Remove MSVCRT_pthreadmbcinfo type. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 6 +++--- dlls/msvcrt/mbcs.c | 32 ++++++++++++++++---------------- dlls/msvcrt/msvcrt.h | 16 +++++++--------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 6ceaa3c0ef0..86d4a2dbe8f 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -656,7 +656,7 @@ pthreadlocinfo CDECL get_locinfo(void) { } /* INTERNAL: returns pthreadmbcinfo struct */ -MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) { +pthreadmbcinfo CDECL get_mbcinfo(void) { thread_data_t *data = msvcrt_get_thread_data(); update_thread_locale(data); return data->mbcinfo; @@ -1139,8 +1139,8 @@ void free_locinfo(pthreadlocinfo locinfo) MSVCRT_free(locinfo); } -/* INTERNAL: frees MSVCRT_pthreadmbcinfo struct */ -void free_mbcinfo(MSVCRT_pthreadmbcinfo mbcinfo) +/* INTERNAL: frees pthreadmbcinfo struct */ +void free_mbcinfo(pthreadmbcinfo mbcinfo) { if(!mbcinfo) return; diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 549c94ffd98..101d47dab6e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -88,7 +88,7 @@ static const unsigned char mbctombb_932_kana[] = { static MSVCRT_wchar_t msvcrt_mbc_to_wc_l(unsigned int ch, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; MSVCRT_wchar_t chW; char mbch[2]; int n_chars; @@ -210,9 +210,9 @@ int CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) } #endif -MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *old_mbcinfo) +threadmbcinfo* create_mbcinfo(int cp, LCID lcid, threadmbcinfo *old_mbcinfo) { - MSVCRT_threadmbcinfo *mbcinfo; + threadmbcinfo *mbcinfo; int newcp; CPINFO cpi; BYTE *bytes; @@ -229,7 +229,7 @@ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *ol return old_mbcinfo; } - mbcinfo = MSVCRT_malloc(sizeof(MSVCRT_threadmbcinfo)); + mbcinfo = MSVCRT_malloc(sizeof(threadmbcinfo)); if(!mbcinfo) return NULL; mbcinfo->refcount = 1; @@ -385,7 +385,7 @@ MSVCRT_threadmbcinfo* create_mbcinfo(int cp, LCID lcid, MSVCRT_threadmbcinfo *ol int CDECL _setmbcp(int cp) { thread_data_t *data = msvcrt_get_thread_data(); - MSVCRT_threadmbcinfo *mbcinfo; + threadmbcinfo *mbcinfo; mbcinfo = create_mbcinfo(cp, -1, get_mbcinfo()); if(!mbcinfo) @@ -619,7 +619,7 @@ unsigned char* CDECL _mbsninc(const unsigned char* str, MSVCRT_size_t num) MSVCRT_size_t CDECL _mbsnlen_l(const unsigned char *str, MSVCRT_size_t maxsize, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; MSVCRT_size_t i = 0, len = 0; if(!locale) @@ -903,7 +903,7 @@ unsigned char* CDECL _mbsnbcpy(unsigned char* dst, const unsigned char* src, MSV */ int CDECL _mbscmp_l(const unsigned char* str, const unsigned char* cmp, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if (!str || !cmp) return INT_MAX; @@ -941,7 +941,7 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp, MSVCRT__lo */ int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -987,7 +987,7 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) */ int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -1326,7 +1326,7 @@ unsigned char* CDECL _mbsrchr(const unsigned char* s, unsigned int x) unsigned char* CDECL _mbstok_s_l(unsigned char *str, const unsigned char *delim, unsigned char **ctx, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; unsigned int c; if(!MSVCRT_CHECK_PMT(delim != NULL)) return NULL; @@ -1426,7 +1426,7 @@ unsigned int CDECL _mbbtombc(unsigned int c) */ int CDECL _ismbbkana_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(locale) mbcinfo = locale->mbcinfo; @@ -1640,7 +1640,7 @@ int CDECL _ismbckata(unsigned int c) */ int CDECL _ismbblead_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -1663,7 +1663,7 @@ int CDECL _ismbblead(unsigned int c) */ int CDECL _ismbbtrail_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -2723,7 +2723,7 @@ unsigned int CDECL _mbctokata(unsigned int c) */ int CDECL _ismbcl0_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -2752,7 +2752,7 @@ int CDECL _ismbcl0(unsigned int c) */ int CDECL _ismbcl1_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); @@ -2781,7 +2781,7 @@ int CDECL _ismbcl1(unsigned int c) */ int CDECL _ismbcl2_l(unsigned int c, MSVCRT__locale_t locale) { - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; if(!locale) mbcinfo = get_mbcinfo(); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ca6ffe5f87e..5ecffc7f8ab 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -121,7 +121,7 @@ typedef struct __lc_time_data { char data[1]; } __lc_time_data; -typedef struct MSVCRT_threadmbcinfostruct { +typedef struct threadmbcinfostruct { int refcount; int mbcodepage; int ismbcodepage; @@ -129,14 +129,12 @@ typedef struct MSVCRT_threadmbcinfostruct { unsigned short mbulinfo[6]; unsigned char mbctype[257]; unsigned char mbcasemap[256]; -} MSVCRT_threadmbcinfo; - -typedef struct MSVCRT_threadmbcinfostruct *MSVCRT_pthreadmbcinfo; +} threadmbcinfo; typedef struct MSVCRT_localeinfo_struct { pthreadlocinfo locinfo; - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; } MSVCRT__locale_tstruct, *MSVCRT__locale_t; typedef struct MSVCRT__onexit_table_t @@ -194,7 +192,7 @@ struct __thread_data { void *unk4[3]; EXCEPTION_POINTERS *xcptinfo; int fpecode; - MSVCRT_pthreadmbcinfo mbcinfo; + pthreadmbcinfo mbcinfo; pthreadlocinfo locinfo; int locale_flags; int unk5[1]; @@ -934,11 +932,11 @@ extern MSVCRT__locale_t MSVCRT_locale; MSVCRT__locale_t CDECL get_current_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; void CDECL free_locale_noalloc(MSVCRT__locale_t locale) DECLSPEC_HIDDEN; pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; -MSVCRT_pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; +pthreadmbcinfo CDECL get_mbcinfo(void) DECLSPEC_HIDDEN; void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); -MSVCRT_threadmbcinfo* create_mbcinfo(int, LCID, MSVCRT_threadmbcinfo*) DECLSPEC_HIDDEN; +threadmbcinfo* create_mbcinfo(int, LCID, threadmbcinfo*) DECLSPEC_HIDDEN; void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN; -void free_mbcinfo(MSVCRT_pthreadmbcinfo) DECLSPEC_HIDDEN; +void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN; int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN; int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0