November 2020 - Wine-Commits

Nikolay Sivov : combase: Update thread flags when entering/leaving apartments.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 7cae17c134ed7fd7c8b6bd41f4a41cb095d6d859 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7cae17c134ed7fd7c8b6bd41… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 19 13:40:32 2020 +0000 combase: Update thread flags when entering/leaving apartments. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/combase/apartment.c | 10 +++++++++- dlls/combase/combase_private.h | 3 +++ dlls/ole32/tests/compobj.c | 3 --- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/combase/apartment.c b/dlls/combase/apartment.c index 1181e393ada..108d6a71c5c 100644 --- a/dlls/combase/apartment.c +++ b/dlls/combase/apartment.c @@ -556,6 +556,8 @@ static struct apartment *apartment_get_or_create(DWORD model) if (!apt) { + com_get_tlsdata(&data); + if (model & COINIT_APARTMENTTHREADED) { EnterCriticalSection(&apt_cs); @@ -568,6 +570,10 @@ static struct apartment *apartment_get_or_create(DWORD model) TRACE("Created main-threaded apartment with OXID %s\n", wine_dbgstr_longlong(apt->oxid)); } + data->flags |= OLETLS_APARTMENTTHREADED; + if (model & COINIT_DISABLE_OLE1DDE) + data->flags |= OLETLS_DISABLE_OLE1DDE; + LeaveCriticalSection(&apt_cs); if (apt->main) @@ -588,11 +594,12 @@ static struct apartment *apartment_get_or_create(DWORD model) else mta = apartment_construct(model); + data->flags |= OLETLS_MULTITHREADED | OLETLS_DISABLE_OLE1DDE; + apt = mta; LeaveCriticalSection(&apt_cs); } - com_get_tlsdata(&data); data->apt = apt; } @@ -1146,6 +1153,7 @@ void leave_apartment(struct tlsdata *data) WARN( "Uninitializing apartment while Ole is still initialized\n" ); apartment_release(data->apt); data->apt = NULL; + data->flags &= ~(OLETLS_DISABLE_OLE1DDE | OLETLS_APARTMENTTHREADED | OLETLS_MULTITHREADED); } } diff --git a/dlls/combase/combase_private.h b/dlls/combase/combase_private.h index 46a7c7f655d..9247af4ebb6 100644 --- a/dlls/combase/combase_private.h +++ b/dlls/combase/combase_private.h @@ -66,6 +66,9 @@ HRESULT open_appidkey_from_clsid(REFCLSID clsid, REGSAM access, HKEY *subkey) DE enum tlsdata_flags { OLETLS_UUIDINITIALIZED = 0x2, + OLETLS_DISABLE_OLE1DDE = 0x40, + OLETLS_APARTMENTTHREADED = 0x80, + OLETLS_MULTITHREADED = 0x100, }; /* this is what is stored in TEB->ReservedForOle */ diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index c79e379f92a..5d44cd5a0ba 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -4296,7 +4296,6 @@ static void test_oletlsdata(void) hr = CoInitialize(NULL); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_APARTMENTTHREADED && !(flags & OLETLS_DISABLE_OLE1DDE), "Unexpected flags %#x.\n", flags); CoUninitialize(); flags = get_oletlsflags(); @@ -4305,7 +4304,6 @@ todo_wine hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_APARTMENTTHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); CoUninitialize(); flags = get_oletlsflags(); @@ -4315,7 +4313,6 @@ todo_wine hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); flags = get_oletlsflags(); -todo_wine ok(flags & OLETLS_MULTITHREADED && flags & OLETLS_DISABLE_OLE1DDE, "Unexpected flags %#x.\n", flags); /* Implicit case. */

1 0

Zebediah Figura : strmbase: Forbid disconnecting the sink if the filter is not stopped.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 9c2cf1317099b464e0984c7925c1a7f667b3513e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c2cf1317099b464e0984c79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 19 11:19:31 2020 -0600 strmbase: Forbid disconnecting the sink if the filter is not stopped. Addendum to 2a6037e263ff3fae8ca82d90b0b141bea1cd473d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index c08f04730e7..d7788cda493 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -887,6 +887,13 @@ static HRESULT WINAPI sink_Disconnect(IPin *iface) EnterCriticalSection(&pin->pin.filter->csFilter); + if (pin->pin.filter->state != State_Stopped) + { + LeaveCriticalSection(&pin->pin.filter->csFilter); + WARN("Filter is not stopped; returning VFW_E_NOT_STOPPED.\n"); + return VFW_E_NOT_STOPPED; + } + if (pin->pin.peer) { if (pin->pFuncsTable->sink_disconnect)

1 0

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

Nov. 19, 2020

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

Michael Stefaniuc : riched20: Use zero terminated wchar strings.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

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 Nov. 19, 2020

Nov. 19, 2020

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

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

Nov. 19, 2020

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

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

Nov. 19, 2020

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 : msvcrt: Remove obsolete USE_MSVCRT_PREFIX defines.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

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

Michael Stefaniuc : comctl32: Use wide-char string literals.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: f67ef3213c51570d063b51d4a425f5d5b4821eeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f67ef3213c51570d063b51d4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Nov 18 22:15:07 2020 +0100 comctl32: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/button.c | 2 +- dlls/comctl32/commctrl.c | 12 ++++++------ dlls/comctl32/listbox.c | 4 ++-- dlls/comctl32/listview.c | 2 +- dlls/comctl32/status.c | 4 ++-- dlls/comctl32/trackbar.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 4f7a3052b10..67bf5ceae48 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -2427,7 +2427,7 @@ static void draw_split_button_dropdown_glyph(const BUTTON_INFO *infoPtr, HDC hdc /* infoPtr->glyph is a character code from Marlett */ HFONT font, old_font; LOGFONTW logfont = { 0, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET, 0, 0, 0, 0, - { 'M','a','r','l','e','t','t',0 } }; + L"Marlett" }; if (infoPtr->glyph_size.cy) { /* BCSS_STRETCH preserves aspect ratio, uses minimum as size */ diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 6056c0e6cf9..cb9c22a3a88 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -124,12 +124,12 @@ BOOL WINAPI RegisterClassNameW(const WCHAR *class) } classes[] = { - { {'B','u','t','t','o','n',0}, BUTTON_Register }, - { {'C','o','m','b','o','B','o','x',0}, COMBO_Register }, - { {'C','o','m','b','o','L','B','o','x',0}, COMBOLBOX_Register }, - { {'E','d','i','t',0}, EDIT_Register }, - { {'L','i','s','t','B','o','x',0}, LISTBOX_Register }, - { {'S','t','a','t','i','c',0}, STATIC_Register }, + { L"Button", BUTTON_Register }, + { L"ComboBox", COMBO_Register }, + { L"ComboLBox", COMBOLBOX_Register }, + { L"Edit", EDIT_Register }, + { L"ListBox", LISTBOX_Register }, + { L"Static", STATIC_Register }, }; int min = 0, max = ARRAY_SIZE(classes) - 1; diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index e6c4b2d6d24..b905beee325 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -1919,8 +1919,8 @@ static LRESULT LISTBOX_Directory( LB_DESCR *descr, UINT attrib, /* scan drives */ if (attrib & DDL_DRIVES) { - WCHAR buffer[] = {'[','-','a','-',']',0}; - WCHAR root[] = {'A',':','\\',0}; + WCHAR buffer[] = L"[-a-]"; + WCHAR root[] = L"A:\\"; int drive; for (drive = 0; drive < 26; drive++, buffer[2]++, root[0]++) { diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8e5d6ed4d56..0c80b6164a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4731,7 +4731,7 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERATOR *subitems, POINT pos, DWORD cdmode) { WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - static WCHAR callbackW[] = { '(', 'c', 'a', 'l', 'l', 'b', 'a', 'c', 'k', ')', 0 }; + static WCHAR callbackW[] = L"(callback)"; DWORD cdsubitemmode = CDRF_DODEFAULT; RECT *focus, rcBox; NMLVCUSTOMDRAW nmlvcd; diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index b0cc3377986..0c3a90887c8 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -657,12 +657,12 @@ STATUSBAR_SetParts (STATUS_INFO *infoPtr, INT count, LPINT parts) if (infoPtr->hwndToolTip) { INT nTipCount; TTTOOLINFOW ti; - WCHAR wEmpty = 0; + WCHAR wEmpty[] = L""; ZeroMemory (&ti, sizeof(TTTOOLINFOW)); ti.cbSize = sizeof(TTTOOLINFOW); ti.hwnd = infoPtr->Self; - ti.lpszText = &wEmpty; + ti.lpszText = wEmpty; nTipCount = SendMessageW (infoPtr->hwndToolTip, TTM_GETTOOLCOUNT, 0, 0); if (nTipCount < infoPtr->numParts) { diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index e71edc3b882..353e359111f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1539,12 +1539,12 @@ TRACKBAR_Create (HWND hwnd, const CREATESTRUCTW *lpcs) if (infoPtr->hwndToolTip) { TTTOOLINFOW ti; - WCHAR wEmpty = 0; + WCHAR wEmpty[] = L""; ZeroMemory (&ti, sizeof(ti)); ti.cbSize = sizeof(ti); ti.uFlags = TTF_IDISHWND | TTF_TRACK | TTF_ABSOLUTE; ti.hwnd = hwnd; - ti.lpszText = &wEmpty; + ti.lpszText = wEmpty; SendMessageW (infoPtr->hwndToolTip, TTM_ADDTOOLW, 0, (LPARAM)&ti); }

1 0

Alistair Leslie-Hughes : msado15/tests: Add ADORecordsetConstruction tests.
by Alexandre Julliard Nov. 19, 2020

Nov. 19, 2020

Module: wine Branch: master Commit: 36d8147c138f50f256d8ca78788f5b16da7684e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d8147c138f50f256d8ca78… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Nov 18 20:42:20 2020 +1100 msado15/tests: Add ADORecordsetConstruction tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/tests/msado15.c | 346 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 346 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36d8147c138f50f256d8…

1 0