November 2020 - Wine-commits

Alexandre Julliard : msvcrt: Remove obsolete USE_MSVCRT_PREFIX defines.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 66618e6293dc10e9069ed832bfe6c567343eaa6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=66618e6293dc10e9069ed832… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 11:33:22 2020 +0100 msvcrt: Remove obsolete USE_MSVCRT_PREFIX defines. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt20/Makefile.in | 1 - dlls/msvcrt40/Makefile.in | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/msvcrt20/Makefile.in b/dlls/msvcrt20/Makefile.in index 0696bfccea7..162062e985e 100644 --- a/dlls/msvcrt20/Makefile.in +++ b/dlls/msvcrt20/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt20.dll IMPORTS = msvcrt diff --git a/dlls/msvcrt40/Makefile.in b/dlls/msvcrt40/Makefile.in index aab9e2148bb..576d651c702 100644 --- a/dlls/msvcrt40/Makefile.in +++ b/dlls/msvcrt40/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DUSE_MSVCRT_PREFIX MODULE = msvcrt40.dll EXTRADLLFLAGS = -mno-cygwin

1 0

Alexandre Julliard : msvcrt: Enable multi-thread locking by default.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 6482ce7666a5f8beb92879af5ae3fde3782627d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6482ce7666a5f8beb92879af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 11:33:51 2020 +0100 msvcrt: Enable multi-thread locking by default. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 2 +- dlls/msvcr100/Makefile.in | 2 +- dlls/msvcr110/Makefile.in | 2 +- dlls/msvcr120/Makefile.in | 2 +- dlls/msvcr70/Makefile.in | 2 +- dlls/msvcr71/Makefile.in | 2 +- dlls/msvcr80/Makefile.in | 2 +- dlls/msvcr90/Makefile.in | 2 +- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/exit.c | 4 ++-- dlls/msvcrt/heap.c | 4 ++-- dlls/msvcrt/locale.c | 4 ++-- dlls/msvcrt/mtdll.h | 13 ------------- dlls/msvcrt/onexit.c | 14 +++++++------- dlls/msvcrt/process.c | 12 ++++++------ dlls/msvcrt/time.c | 8 ++++---- dlls/msvcrtd/Makefile.in | 2 +- dlls/ucrtbase/Makefile.in | 2 +- 19 files changed, 36 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6482ce7666a5f8beb928…

1 0

Alexandre Julliard : include: Use gcc builtin for HUGE_VAL.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 32eae49275be2c9ffa8e92ce48ce77ca1f703d16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32eae49275be2c9ffa8e92ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 13:29:01 2020 +0100 include: Use gcc builtin for HUGE_VAL. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/math.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index a6bcbf9ada6..615f9a6bf24 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -201,21 +201,10 @@ float __cdecl _hypotf(float, float); int __cdecl _matherr(struct _exception*); double __cdecl _cabs(struct _complex); -#ifndef HUGE_VAL -# if defined(__GNUC__) && (__GNUC__ >= 3) -# define HUGE_VAL (__extension__ 0x1.0p2047) -# else -static const union { - unsigned char __c[8]; - double __d; -} __huge_val = { { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f } }; -# define HUGE_VAL (__huge_val.__d) -# endif -#endif - #if (defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))) || defined(__clang__) # define INFINITY __builtin_inff() # define NAN __builtin_nanf("") +# define HUGE_VAL __builtin_huge_val() #else static const union { unsigned int __i; @@ -223,6 +212,7 @@ static const union { } __inff = { 0x7f800000 }, __nanf = { 0x7fc00000 }; # define INFINITY (__inff.__f) # define NAN (__nanf.__f) +# define HUGE_VAL ((double)INFINITY) #endif #define FP_INFINITE 1

1 0

Alexandre Julliard : makefiles: Don't add a default crt lib for msvcrt dlls.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 27b20c1db55f896c2901332ffb5d99f89dcd371c URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b20c1db55f896c2901332f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 11:35:22 2020 +0100 makefiles: Don't add a default crt lib for msvcrt dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 42 ++++++++++++++++++++++++------------------ tools/winegcc/winegcc.c | 8 +++++++- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8812be4e40c..f179f3afa5e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2276,7 +2276,7 @@ static struct strarray get_default_imports( const struct makefile *make ) /******************************************************************* * add_crt_import */ -static const char *add_crt_import( const struct makefile *make, struct strarray *imports ) +static void add_crt_import( const struct makefile *make, struct strarray *imports, struct strarray *defs ) { unsigned int i; const char *crt_dll = NULL; @@ -2289,10 +2289,28 @@ static const char *add_crt_import( const struct makefile *make, struct strarray } if (!crt_dll && !strarray_exists( &make->extradllflags, "-nodefaultlibs" )) { - crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; - strarray_add( imports, crt_dll ); + if (make->module && + (!strncmp( make->module, "msvcr", 5 ) || + !strncmp( make->module, "ucrt", 4 ) || + !strcmp( make->module, "crtdll.dll" ))) + { + crt_dll = make->module; + } + else + { + crt_dll = !make->testdll && !make->staticlib ? "ucrtbase" : "msvcrt"; + strarray_add( imports, crt_dll ); + } + } + + if (!defs) return; + if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( defs, "-D_UCRT" ); + else + { + unsigned int version = 0; + if (crt_dll) sscanf( crt_dll, "msvcr%u", &version ); + strarray_add( defs, strmake( "-D_MSVCR_VER=%u", version )); } - return crt_dll; } @@ -3034,7 +3052,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, const char *debug_file; if (!imports.count) imports = make->imports; - else if (make->use_msvcrt) add_crt_import( make, &imports ); + else if (make->use_msvcrt) add_crt_import( make, &imports, NULL ); if (!dll_flags.count) dll_flags = make->extradllflags; all_libs = add_import_libs( make, &dep_libs, imports, 0, 0 ); @@ -4200,19 +4218,7 @@ static void load_sources( struct makefile *make ) make->use_msvcrt = 1; } - if (make->use_msvcrt) - { - const char *crt_dll = add_crt_import( make, &make->imports ); - - if (crt_dll && !strncmp( crt_dll, "ucrt", 4 )) strarray_add( &make->define_args, "-D_UCRT" ); - else - { - unsigned int msvcrt_version = 0; - - if (crt_dll) sscanf( crt_dll, "msvcr%u", &msvcrt_version ); - strarray_add( &make->define_args, strmake( "-D_MSVCR_VER=%u", msvcrt_version )); - } - } + if (make->use_msvcrt) add_crt_import( make, &make->imports, &make->define_args ); LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) parse_file( make, file, 0 ); LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index ca45f9bdad0..9268a5dfd1d 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1224,7 +1224,13 @@ static void build(struct options* opts) add_library(opts, lib_dirs, files, "winecrt0"); if (opts->use_msvcrt) { - if (!crt_lib) add_library(opts, lib_dirs, files, "ucrtbase"); + if (!crt_lib) + { + if (strncmp( output_name, "msvcr", 5 ) && + strncmp( output_name, "ucrt", 4 ) && + strcmp( output_name, "crtdll.dll" )) + add_library(opts, lib_dirs, files, "ucrtbase"); + } else strarray_add(files, strmake("-a%s", crt_lib)); } if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel");

1 0

Alexandre Julliard : makefiles: Allow modules to link to their own import library.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: be8a81b54c7adf1e77d9411d337b9227e0eb119f URL: https://source.winehq.org/git/wine.git/?a=commit;h=be8a81b54c7adf1e77d9411d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 11:40:26 2020 +0100 makefiles: Allow modules to link to their own import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index f179f3afa5e..c30c21ff27d 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2218,9 +2218,6 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra const char *name = get_base_name( imports.str[i] ); const char *lib = NULL; - /* skip module's own importlib, its object files will be linked directly */ - if (make->importlib && !strcmp( make->importlib, imports.str[i] )) continue; - for (j = 0; j < subdirs.count; j++) { if (submakes[j]->importlib && !strcmp( submakes[j]->importlib, name )) @@ -3117,7 +3114,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour { if ((source->file->flags & FLAG_C_UNIX) && *dll_ext) strarray_add( &make->unixobj_files, strmake( "%s.o", obj )); - else if (!is_dll_src && (!(source->file->flags & FLAG_C_IMPLIB) || (make->importlib && strarray_exists( &make->imports, make->importlib )))) + else if (!is_dll_src && !(source->file->flags & FLAG_C_IMPLIB)) strarray_add( &make->object_files, strmake( "%s.o", obj )); else strarray_add( &make->clean_files, strmake( "%s.o", obj )); @@ -3136,7 +3133,10 @@ static void output_source_default( struct makefile *make, struct incl_file *sour } if (need_cross) { - strarray_add( is_dll_src ? &make->clean_files : &make->crossobj_files, strmake( "%s.cross.o", obj )); + if (!is_dll_src && !(source->file->flags & FLAG_C_IMPLIB)) + strarray_add( &make->crossobj_files, strmake( "%s.cross.o", obj )); + else + strarray_add( &make->clean_files, strmake( "%s.cross.o", obj )); output( "%s.cross.o: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t$(CROSSCC) -c -o $@ %s", source->filename ); output_filenames( defines );

1 0

Alexandre Julliard : msvcrt: Build with msvcrt headers.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 191bdeaff3676f192148e17c6369865ec94c2ba2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191bdeaff3676f192148e17c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 19 13:28:52 2020 +0100 msvcrt: Build with msvcrt headers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 6 ++++-- dlls/crtdll/crtdll.spec | 22 +++++++++++----------- dlls/msvcr100/Makefile.in | 4 +++- dlls/msvcr100/msvcr100.spec | 22 +++++++++++----------- dlls/msvcr110/Makefile.in | 4 +++- dlls/msvcr110/msvcr110.spec | 22 +++++++++++----------- dlls/msvcr120/Makefile.in | 4 +++- dlls/msvcr120/msvcr120.spec | 22 +++++++++++----------- dlls/msvcr70/Makefile.in | 4 +++- dlls/msvcr70/msvcr70.spec | 22 +++++++++++----------- dlls/msvcr71/Makefile.in | 4 +++- dlls/msvcr71/msvcr71.spec | 22 +++++++++++----------- dlls/msvcr80/Makefile.in | 4 +++- dlls/msvcr80/msvcr80.spec | 22 +++++++++++----------- dlls/msvcr90/Makefile.in | 4 +++- dlls/msvcr90/msvcr90.spec | 22 +++++++++++----------- dlls/msvcrt/Makefile.in | 4 +++- dlls/msvcrt/cpp.c | 5 +---- dlls/msvcrt/crt_main.c | 4 ---- dlls/msvcrt/crt_wmain.c | 4 ---- dlls/msvcrt/data.c | 3 --- dlls/msvcrt/dir.c | 3 --- dlls/msvcrt/except.c | 3 --- dlls/msvcrt/except_arm.c | 3 --- dlls/msvcrt/except_arm64.c | 3 --- dlls/msvcrt/except_i386.c | 3 --- dlls/msvcrt/except_x86_64.c | 3 --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 5 ----- dlls/msvcrt/heap.c | 1 - dlls/msvcrt/locale.c | 4 +--- dlls/msvcrt/lock.c | 3 --- dlls/msvcrt/math.c | 9 +-------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/misc.c | 4 +--- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ dlls/msvcrt/onexit.c | 1 - dlls/msvcrt/process.c | 1 - dlls/msvcrt/scheduler.c | 2 -- dlls/msvcrt/string.c | 28 ++++++++++++---------------- dlls/msvcrt/time.c | 2 -- dlls/msvcrt/undname.c | 3 --- dlls/msvcrt/wcs.c | 27 +++++++++++++-------------- dlls/msvcrtd/Makefile.in | 4 +++- dlls/msvcrtd/msvcrtd.spec | 22 +++++++++++----------- dlls/ucrtbase/Makefile.in | 4 +++- dlls/ucrtbase/ucrtbase.spec | 26 +++++++++++++------------- 48 files changed, 189 insertions(+), 234 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=191bdeaff3676f192148…

1 0

Michael Stefaniuc : riched20: Use wide-char string literals.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 60b216790193f1b6741676b55e63e71bcde8516c URL: https://source.winehq.org/git/wine.git/?a=commit;h=60b216790193f1b6741676b5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:14 2020 +0100 riched20: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 18 ++++++------------ dlls/riched20/paint.c | 6 ++---- dlls/riched20/para.c | 15 +++++---------- dlls/riched20/richole.c | 3 +-- dlls/riched20/run.c | 3 +-- dlls/riched20/table.c | 6 ++---- 6 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 2f7383e59a1..985bcc3d573 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -244,9 +244,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static BOOL ME_RegisterEditorClass(HINSTANCE); static BOOL ME_UpdateLinkAttribute(ME_TextEditor *editor, ME_Cursor *start, int nChars); - -static const WCHAR REListBox20W[] = {'R','E','L','i','s','t','B','o','x','2','0','W', 0}; -static const WCHAR REComboBox20W[] = {'R','E','C','o','m','b','o','B','o','x','2','0','W', 0}; static HCURSOR hLeft; BOOL me_debug = FALSE; @@ -2222,8 +2219,6 @@ static DWORD CALLBACK ME_ReadFromHGLOBALRTF(DWORD_PTR dwCookie, LPBYTE lpBuff, L return 0; } -static const WCHAR rtfW[] = {'R','i','c','h',' ','T','e','x','t',' ','F','o','r','m','a','t',0}; - static HRESULT paste_rtf(ME_TextEditor *editor, FORMATETC *fmt, STGMEDIUM *med) { EDITSTREAM es; @@ -2278,7 +2273,7 @@ static struct paste_format const WCHAR *name; } paste_formats[] = { - {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, rtfW }, + {{ -1, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_rtf, L"Rich Text Format" }, {{ CF_UNICODETEXT, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, paste_text }, {{ CF_ENHMETAFILE, NULL, DVASPECT_CONTENT, -1, TYMED_ENHMF }, paste_emf }, {{ 0 }} @@ -3273,9 +3268,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) UnregisterClassA(RICHEDIT_CLASS20A, 0); UnregisterClassA("RichEdit50A", 0); if (ME_ListBoxRegistered) - UnregisterClassW(REListBox20W, 0); + UnregisterClassW(L"REListBox20W", 0); if (ME_ComboBoxRegistered) - UnregisterClassW(REComboBox20W, 0); + UnregisterClassW(L"REComboBox20W", 0); LookupCleanup(); HeapDestroy (me_heap); release_typelib(); @@ -5149,7 +5144,6 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, { ME_Run *run, *next_run; const WCHAR *pStart = buffer; - const WCHAR cr_lf[] = {'\r', '\n', 0}; const WCHAR *str; int nLen; @@ -5172,7 +5166,7 @@ int ME_GetTextW(ME_TextEditor *editor, WCHAR *buffer, int buflen, * also uses this function. */ srcChars -= min(nLen, srcChars); nLen = 2; - str = cr_lf; + str = L"\r\n"; } else { @@ -5290,7 +5284,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS; wcW.lpfnWndProc = REListWndProc; - wcW.lpszClassName = REListBox20W; + wcW.lpszClassName = L"REListBox20W"; if (RegisterClassW(&wcW)) ME_ListBoxRegistered = TRUE; } @@ -5298,7 +5292,7 @@ LRESULT WINAPI REExtendedRegisterClass(void) { wcW.style = CS_PARENTDC | CS_DBLCLKS | CS_GLOBALCLASS | CS_VREDRAW | CS_HREDRAW; wcW.lpfnWndProc = REComboWndProc; - wcW.lpszClassName = REComboBox20W; + wcW.lpszClassName = L"REComboBox20W"; if (RegisterClassW(&wcW)) ME_ComboBoxRegistered = TRUE; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index ffb50d5ceff..2db3a4ea2c1 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -972,10 +972,9 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRowDebug[] = {'r','o','w','[','%','d',']',0}; WCHAR buf[128]; POINT pt = c->pt; - wsprintfW(buf, wszRowDebug, no); + wsprintfW( buf, L"row[%d]", no ); pt.y = 12+y; ME_DebugWrite(c->hDC, &pt, buf); } @@ -1006,12 +1005,11 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) } if (me_debug) { - static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0}; WCHAR buf[2560]; POINT pt; pt.x = c->pt.x + run->pt.x; pt.y = c->pt.y + para->pt.y + run->pt.y; - wsprintfW(buf, wszRunDebug, no, p->member.run.nFlags, get_text( &p->member.run, 0 )); + wsprintfW( buf, L"[%d:%x] %ls", no, p->member.run.nFlags, get_text( &p->member.run, 0 )); ME_DebugWrite(c->hDC, &pt, buf); } break; diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index cb98218aeab..29624e6c1df 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -150,7 +150,6 @@ ME_Row *para_end_row( ME_Paragraph *para ) void ME_MakeFirstParagraph(ME_TextEditor *editor) { - static const WCHAR cr_lf[] = {'\r','\n',0}; ME_Context c; CHARFORMAT2W cf; const CHARFORMATW *host_cf; @@ -202,7 +201,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) } eol_len = editor->bEmulateVersion10 ? 2 : 1; - para->text = ME_MakeStringN( cr_lf, eol_len ); + para->text = ME_MakeStringN( L"\r\n", eol_len ); run = run_create( style, MERF_ENDPARA ); run->nCharOfs = 0; @@ -280,7 +279,6 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) /* max 4 Roman letters (representing '8') / decade + '(' + ')' */ ME_String *str = ME_MakeStringEmpty( 20 + 2 ); WCHAR *p; - static const WCHAR fmtW[] = {'%', 'd', 0}; static const WORD letter_base[] = { 1, 26, 26 * 26, 26 * 26 * 26 }; /* roman_base should start on a '5' not a '1', otherwise the 'total' code will need adjusting. 'N' and 'O' are what MS uses for 5000 and 10000, their version doesn't work well above 30000, @@ -309,7 +307,7 @@ static ME_String *para_num_get_str( ME_Paragraph *para, WORD num ) { case PFN_ARABIC: default: - p += swprintf( p, 20, fmtW, num ); + p += swprintf( p, 20, L"%d", num ); break; case PFN_LCLETTER: @@ -393,9 +391,6 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { ME_Style *style; CHARFORMAT2W cf; - static const WCHAR bullet_font[] = {'S','y','m','b','o','l',0}; - static const WCHAR bullet_str[] = {0xb7, 0}; - static const WCHAR spaceW[] = {' ', 0}; SIZE sz; if (!para->fmt.wNumbering) return; @@ -409,7 +404,7 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) { cf.cbSize = sizeof(cf); cf.dwMask = CFM_FACE | CFM_CHARSET; - memcpy( cf.szFaceName, bullet_font, sizeof(bullet_font) ); + lstrcpyW( cf.szFaceName, L"Symbol" ); cf.bCharSet = SYMBOL_CHARSET; style = ME_ApplyStyle( c->editor, style, &cf ); } @@ -426,13 +421,13 @@ void para_num_init( ME_Context *c, ME_Paragraph *para ) if (para->fmt.wNumbering != PFN_BULLET) para->para_num.text = para_num_get_str( para, para_num_get_num( para ) ); else - para->para_num.text = ME_MakeStringConst( bullet_str, 1 ); + para->para_num.text = ME_MakeStringConst( L"\x00b7", 1 ); } select_style( c, para->para_num.style ); GetTextExtentPointW( c->hDC, para->para_num.text->szData, para->para_num.text->nLen, &sz ); para->para_num.width = sz.cx; - GetTextExtentPointW( c->hDC, spaceW, 1, &sz ); + GetTextExtentPointW( c->hDC, L" ", 1, &sz ); para->para_num.width += sz.cx; } diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 5d73731dedb..bedeefe9a63 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -3004,9 +3004,8 @@ static void textfont_reset_to_default(ITextFontImpl *font) font->props[id].l = GetSystemDefaultLCID(); break; case FONT_NAME: { - static const WCHAR sysW[] = {'S','y','s','t','e','m',0}; SysFreeString(font->props[id].str); - font->props[id].str = SysAllocString(sysW); + font->props[id].str = SysAllocString(L"System"); break; } case FONT_WEIGHT: diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index fdda43ba51a..e099c0be6dc 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -665,7 +665,6 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, int nLen, int startx, int *pAscent, int *pDescent) { - static const WCHAR spaceW[] = {' ',0}; SIZE size; nLen = min( nLen, run->len ); @@ -673,7 +672,7 @@ SIZE ME_GetRunSizeCommon(ME_Context *c, const ME_Paragraph *para, ME_Run *run, i if (run->nFlags & MERF_ENDPARA) { nLen = min( nLen, 1 ); - ME_GetTextExtent(c, spaceW, nLen, run->style, &size); + ME_GetTextExtent( c, L" ", nLen, run->style, &size ); } else if (para->nFlags & MEPF_COMPLEX) { diff --git a/dlls/riched20/table.c b/dlls/riched20/table.c index 0ce5a2c32c0..c3823e3b493 100644 --- a/dlls/riched20/table.c +++ b/dlls/riched20/table.c @@ -54,8 +54,6 @@ #include "editor.h" #include "rtf.h" -static const WCHAR cr_lf[] = {'\r', '\n', 0}; - static ME_Paragraph* table_insert_end_para( ME_TextEditor *editor, ME_Cursor *cursor, const WCHAR *eol_str, int eol_len, int para_flags ) { @@ -75,7 +73,7 @@ ME_Paragraph* table_insert_row_start( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWSTART ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWSTART ); return para_prev( para ); } @@ -122,7 +120,7 @@ ME_Paragraph* table_insert_row_end( ME_TextEditor *editor, ME_Cursor *cursor ) { ME_Paragraph *para; - para = table_insert_end_para( editor, cursor, cr_lf, 2, MEPF_ROWEND ); + para = table_insert_end_para( editor, cursor, L"\r\n", 2, MEPF_ROWEND ); return para_prev( para ); }

1 0

Michael Stefaniuc : riched20: Use wide-char string literals in a struct initialization.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: d08852d835702f8d61b598d4274e6e4bb5421120 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d08852d835702f8d61b598d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:15 2020 +0100 riched20: Use wide-char string literals in a struct initialization. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 985bcc3d573..ee392f6fa6a 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5433,23 +5433,25 @@ done: static BOOL ME_IsCandidateAnURL(ME_TextEditor *editor, const ME_Cursor *start, int nChars) { #define MAX_PREFIX_LEN 9 +#define X(str) str, ARRAY_SIZE(str) - 1 struct prefix_s { const WCHAR text[MAX_PREFIX_LEN]; int length; }prefixes[] = { - {{'p','r','o','s','p','e','r','o',':'}, 9}, - {{'t','e','l','n','e','t',':'}, 7}, - {{'g','o','p','h','e','r',':'}, 7}, - {{'m','a','i','l','t','o',':'}, 7}, - {{'h','t','t','p','s',':'}, 6}, - {{'f','i','l','e',':'}, 5}, - {{'n','e','w','s',':'}, 5}, - {{'w','a','i','s',':'}, 5}, - {{'n','n','t','p',':'}, 5}, - {{'h','t','t','p',':'}, 5}, - {{'w','w','w','.'}, 4}, - {{'f','t','p',':'}, 4}, + {X(L"prospero:")}, + {X(L"telnet:")}, + {X(L"gopher:")}, + {X(L"mailto:")}, + {X(L"https:")}, + {X(L"file:")}, + {X(L"news:")}, + {X(L"wais:")}, + {X(L"nntp:")}, + {X(L"http:")}, + {X(L"www.")}, + {X(L"ftp:")}, }; +#undef X WCHAR bufferW[MAX_PREFIX_LEN + 1]; unsigned int i;

1 0

Michael Stefaniuc : riched20: Use zero terminated wchar strings.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 80620171ecd6d948499aeda4c6ecf968534cd431 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80620171ecd6d948499aeda4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:16 2020 +0100 riched20: Use zero terminated wchar strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 17 ++++++----------- dlls/riched20/writer.c | 4 +--- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ee392f6fa6a..d89735acc82 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -627,10 +627,9 @@ void ME_RTFParAttrHook(RTF_Info *info) else { ME_Cursor cursor; - WCHAR endl = '\r'; cursor = info->editor->pCursors[0]; if (cursor.nOffset || cursor.run->nCharOfs) - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); + ME_InsertTextFromCursor(info->editor, 0, L"\r", 1, info->style); tableDef->row_start = table_insert_row_start( info->editor, info->editor->pCursors ); } @@ -1079,8 +1078,6 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } else /* v1.0 - v3.0 */ { - WCHAR endl = '\r'; - para = info->editor->pCursors[0].para; para->fmt.dxOffset = info->tableDef->gapH; para->fmt.dxStartIndent = info->tableDef->leftEdge; @@ -1094,7 +1091,7 @@ void ME_RTFSpecialCharHook(RTF_Info *info) } para->fmt.cTabCount = min(tableDef->numCellsDefined, MAX_TAB_STOPS); if (!tableDef->numCellsDefined) para->fmt.wEffects &= ~PFE_TABLE; - ME_InsertTextFromCursor(info->editor, 0, &endl, 1, info->style); + ME_InsertTextFromCursor(info->editor, 0, L"\r", 1, info->style); tableDef->numCellsInserted = 0; } break; @@ -2488,8 +2485,6 @@ static BOOL handle_enter(ME_TextEditor *editor) if (editor->styleFlags & ES_MULTILINE) { - static const WCHAR endl = '\r'; - static const WCHAR endlv10[] = {'\r','\n'}; ME_Cursor cursor = editor->pCursors[0]; ME_Paragraph *para = cursor.para; int from, to; @@ -2530,7 +2525,7 @@ static BOOL handle_enter(ME_TextEditor *editor) editor->pCursors[0].para = para; editor->pCursors[0].run = para_first_run( para ); editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor( editor, 0, &endl, 1, editor->pCursors[0].run->style ); + ME_InsertTextFromCursor( editor, 0, L"\r", 1, editor->pCursors[0].run->style ); para = editor_first_para( editor ); editor_set_default_para_fmt( editor, &para->fmt ); para->nFlags = 0; @@ -2579,7 +2574,7 @@ static BOOL handle_enter(ME_TextEditor *editor) } editor->pCursors[0].nOffset = 0; editor->pCursors[1] = editor->pCursors[0]; - ME_InsertTextFromCursor( editor, 0, &endl, 1, editor->pCursors[0].run->style ); + ME_InsertTextFromCursor( editor, 0, L"\r", 1, editor->pCursors[0].run->style ); } else { @@ -2611,9 +2606,9 @@ static BOOL handle_enter(ME_TextEditor *editor) ME_InsertEndRowFromCursor(editor, 0); else if (!editor->bEmulateVersion10) - ME_InsertTextFromCursor(editor, 0, &endl, 1, eop_style); + ME_InsertTextFromCursor(editor, 0, L"\r", 1, eop_style); else - ME_InsertTextFromCursor(editor, 0, endlv10, 2, eop_style); + ME_InsertTextFromCursor(editor, 0, L"\r\n", 2, eop_style); ME_CommitCoalescingUndo(editor); SetCursor(NULL); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 49cbb0e021f..50eccfa714b 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -1139,11 +1139,9 @@ static BOOL ME_StreamOutText(ME_TextEditor *editor, ME_OutStream *pStream, if (!editor->bEmulateVersion10 && cursor.run->nFlags & MERF_ENDPARA) { - static const WCHAR szEOL[] = { '\r', '\n' }; - /* richedit 2.0 - all line breaks are \r\n */ if (dwFormat & SF_UNICODE) - success = ME_StreamOutMove(pStream, (const char *)szEOL, sizeof(szEOL)); + success = ME_StreamOutMove(pStream, (const char *)L"\r\n", 2 * sizeof(WCHAR)); else success = ME_StreamOutMove(pStream, "\r\n", 2); } else {

1 0

Michael Stefaniuc : riched20: Use a wchar string literal for the array of neutral chars.
by Alexandre Julliard 19 Nov '20

19 Nov '20

Module: wine Branch: master Commit: 12821cbb75189401d09c0ef6076737f3c6eef59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=12821cbb75189401d09c0ef6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Nov 15 23:11:17 2020 +0100 riched20: Use a wchar string literal for the array of neutral chars. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index d89735acc82..f0662682044 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -5310,13 +5310,13 @@ static int __cdecl wchar_comp( const void *key, const void *elem ) static BOOL isurlneutral( WCHAR c ) { /* NB this list is sorted */ - static const WCHAR neutral_chars[] = {'!','\"','\'','(',')',',','-','.',':',';','<','>','?','[',']','{','}'}; + static const WCHAR neutral_chars[] = L"!\"'(),-.:;<>?[]{}"; /* Some shortcuts */ if (isalnum( c )) return FALSE; - if (c > neutral_chars[ARRAY_SIZE( neutral_chars ) - 1]) return FALSE; + if (c > L'}') return FALSE; - return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ), sizeof(c), wchar_comp ); + return !!bsearch( &c, neutral_chars, ARRAY_SIZE( neutral_chars ) - 1, sizeof(c), wchar_comp ); } /**

1 0