September 2020 - Wine-Commits

Piotr Caban : server: Don't overflow if timeout doesn't fit into int range in get_next_timeout.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 3541deb0c3a64d3474a96728d259907180fd7cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3541deb0c3a64d3474a96728… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 20 15:59:52 2020 +0200 server: Don't overflow if timeout doesn't fit into int range in get_next_timeout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/fd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server/fd.c b/server/fd.c index a88ba39ef0..59db13bae5 100644 --- a/server/fd.c +++ b/server/fd.c @@ -953,16 +953,18 @@ static int get_next_timeout(void) if ((ptr = list_head( &abs_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - int diff = (timeout->when - current_time + 9999) / 10000; - if (diff < 0) diff = 0; + timeout_t diff = (timeout->when - current_time + 9999) / 10000; + if (diff > INT_MAX) diff = INT_MAX; + else if (diff < 0) diff = 0; if (ret == -1 || diff < ret) ret = diff; } if ((ptr = list_head( &rel_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - int diff = (-timeout->when - monotonic_time + 9999) / 10000; - if (diff < 0) diff = 0; + timeout_t diff = (-timeout->when - monotonic_time + 9999) / 10000; + if (diff > INT_MAX) diff = INT_MAX; + else if (diff < 0) diff = 0; if (ret == -1 || diff < ret) ret = diff; } }

1 0

Rémi Bernon : gdi32: Look for another secondary font family name.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: d560182624fbe9ba901aaf7f91ab4b393c14a935 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d560182624fbe9ba901aaf7f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 17 19:30:43 2020 +0200 gdi32: Look for another secondary font family name. If English is the current locale, or if the primary langid does not have a name in the font (in which case the English name is used), look for another non-English name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 60 ++++++++++++++++++++++++++++--------------------- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index cf53f148ad..8658588234 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -301,7 +301,7 @@ typedef struct tagFamily { struct list entry; unsigned int refcount; WCHAR family_name[LF_FACESIZE]; - WCHAR english_name[LF_FACESIZE]; + WCHAR second_name[LF_FACESIZE]; struct list faces; struct list *replacement; } Family; @@ -574,7 +574,7 @@ typedef struct tagFontSubst { static const WCHAR wine_fonts_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s',0}; static const WCHAR wine_fonts_cache_key[] = {'C','a','c','h','e',0}; -static const WCHAR english_name_value[] = {'E','n','g','l','i','s','h',' ','N','a','m','e',0}; +static const WCHAR second_name_value[] = {'S','e','c','o','n','d',' ','N','a','m','e',0}; static const WCHAR face_index_value[] = {'I','n','d','e','x',0}; static const WCHAR face_ntmflags_value[] = {'N','t','m','f','l','a','g','s',0}; static const WCHAR face_version_value[] = {'V','e','r','s','i','o','n',0}; @@ -1076,7 +1076,7 @@ static Family *find_family_from_any_name(const WCHAR *name) LIST_FOR_EACH_ENTRY(family, &font_list, Family, entry) { if (!strncmpiW( family->family_name, name, LF_FACESIZE - 1 )) return family; - if (!strncmpiW( family->english_name, name, LF_FACESIZE - 1 )) return family; + if (!strncmpiW( family->second_name, name, LF_FACESIZE - 1 )) return family; } return NULL; @@ -1415,6 +1415,7 @@ static int match_name_table_language( const FT_SfntName *name, LANGID lang ) if (name_lang == lang) res += 30; else if (PRIMARYLANGID( name_lang ) == PRIMARYLANGID( lang )) res += 20; else if (name_lang == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )) res += 10; + else if (lang == MAKELANGID( LANG_NEUTRAL, SUBLANG_NEUTRAL )) res += 5 * (0x100000 - name_lang); return res; } @@ -1623,13 +1624,13 @@ static BOOL insert_face_in_family_list( Face *face, Family *family ) * NB This function stores the ptrs to the strings to save copying. * Don't free them after calling. */ -static Family *create_family( WCHAR *family_name, WCHAR *english_name ) +static Family *create_family( WCHAR *family_name, WCHAR *second_name ) { Family * const family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); family->refcount = 1; lstrcpynW( family->family_name, family_name, LF_FACESIZE ); - if (english_name) lstrcpynW( family->english_name, english_name, LF_FACESIZE ); - else family->english_name[0] = 0; + if (second_name) lstrcpynW( family->second_name, second_name, LF_FACESIZE ); + else family->second_name[0] = 0; list_init( &family->faces ); family->replacement = &family->faces; list_add_tail( &font_list, &family->entry ); @@ -1794,22 +1795,22 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) size = sizeof(buffer); while (!RegEnumKeyExW(hkey_font_cache, family_index++, buffer, &size, NULL, NULL, NULL, NULL)) { - WCHAR *english_name = NULL; + WCHAR *second_name = NULL; WCHAR *family_name = strdupW( buffer ); DWORD face_index = 0; RegOpenKeyExW(hkey_font_cache, family_name, 0, KEY_ALL_ACCESS, &hkey_family); TRACE("opened family key %s\n", debugstr_w(family_name)); size = sizeof(buffer); - if (!RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE *)buffer, &size)) - english_name = strdupW( buffer ); + if (!RegQueryValueExW( hkey_family, second_name_value, NULL, NULL, (BYTE *)buffer, &size )) + second_name = strdupW( buffer ); - family = create_family( family_name, english_name ); + family = create_family( family_name, second_name ); - if (english_name) + if (second_name) { FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); - subst->from.name = strdupW( english_name ); + subst->from.name = strdupW( second_name ); subst->from.charset = -1; subst->to.name = strdupW(family_name); subst->to.charset = -1; @@ -1832,7 +1833,7 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) } HeapFree( GetProcessHeap(), 0, family_name ); - HeapFree( GetProcessHeap(), 0, english_name ); + HeapFree( GetProcessHeap(), 0, second_name ); RegCloseKey(hkey_family); release_family( family ); @@ -1869,9 +1870,9 @@ static void add_face_to_cache(Face *face) RegCreateKeyExW( hkey_font_cache, face->family->family_name, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey_family, NULL ); - if (face->family->english_name[0]) - RegSetValueExW( hkey_family, english_name_value, 0, REG_SZ, (BYTE *)face->family->english_name, - (strlenW( face->family->english_name ) + 1) * sizeof(WCHAR) ); + if (face->family->second_name[0]) + RegSetValueExW( hkey_family, second_name_value, 0, REG_SZ, (BYTE *)face->family->second_name, + (strlenW( face->family->second_name ) + 1) * sizeof(WCHAR) ); if (face->scalable) face_key_name = face->style_name; else @@ -1947,28 +1948,35 @@ static WCHAR *get_vertical_name( WCHAR *name ) static Family *get_family( FT_Face ft_face, BOOL vertical ) { Family *family; - WCHAR *family_name, *english_name; + WCHAR *family_name, *second_name; family_name = ft_face_get_family_name( ft_face, GetSystemDefaultLCID() ); - english_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT) ); - if (!strcmpiW( family_name, english_name )) + /* try to find another secondary name, preferring the lowest langids */ + if (!strcmpiW( family_name, second_name )) { - HeapFree( GetProcessHeap(), 0, english_name ); - english_name = NULL; + HeapFree( GetProcessHeap(), 0, second_name ); + second_name = ft_face_get_family_name( ft_face, MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL) ); + } + + if (!strcmpiW( family_name, second_name )) + { + HeapFree( GetProcessHeap(), 0, second_name ); + second_name = NULL; } if (vertical) { family_name = get_vertical_name( family_name ); - english_name = get_vertical_name( english_name ); + second_name = get_vertical_name( second_name ); } if ((family = find_family_from_name( family_name ))) family->refcount++; - else if ((family = create_family( family_name, english_name )) && english_name) + else if ((family = create_family( family_name, second_name )) && second_name) { FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); - subst->from.name = strdupW( english_name ); + subst->from.name = strdupW( second_name ); subst->from.charset = -1; subst->to.name = strdupW( family_name ); subst->to.charset = -1; @@ -1976,7 +1984,7 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) } HeapFree( GetProcessHeap(), 0, family_name ); - HeapFree( GetProcessHeap(), 0, english_name ); + HeapFree( GetProcessHeap(), 0, second_name ); return family; } @@ -2411,7 +2419,7 @@ static BOOL map_font_family(const WCHAR *orig, const WCHAR *repl) { TRACE("mapping %s to %s\n", debugstr_w(repl), debugstr_w(orig)); lstrcpynW( new_family->family_name, orig, LF_FACESIZE ); - new_family->english_name[0] = 0; + new_family->second_name[0] = 0; list_init(&new_family->faces); new_family->replacement = &family->faces; list_add_tail(&font_list, &new_family->entry); diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 33dcc3b31a..0ada22d95d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -7208,7 +7208,7 @@ static void test_lang_names(void) memset( &efnd, 0, sizeof(efnd) ); EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); if (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH) - todo_wine ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + ok( efnd.total == min( 2, i + 1 ), "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); else /* (zh-tw) doesn't match here probably because there's an (en) name too */ ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); @@ -7222,7 +7222,7 @@ static void test_lang_names(void) memset( &efnd, 0, sizeof(efnd) ); EnumFontFamiliesExA( dc, &font, enum_fullname_data_proc, (LPARAM)&efnd, 0 ); /* as wine_langnames3.sfd does not specify (en) name, (fr) is preferred */ - if (i == 2) todo_wine ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); + if (i == 2) ok( efnd.total == 1, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); else ok( efnd.total == 0, "%d: EnumFontFamiliesExA unexpected count %u.\n", i, efnd.total ); strcpy( font.lfFaceName, "Wine Lang Cond (ko)" );

1 0

Alexandre Julliard : user32: Build with msvcrt.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 9cc92365560f19c2fd2b9796f79aa75e02381bb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cc92365560f19c2fd2b9796… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:53:21 2020 +0200 user32: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 +- dlls/user32/Makefile.in | 2 ++ dlls/user32/caret.c | 3 --- dlls/user32/class.c | 31 ++++++++++++------------- dlls/user32/clipboard.c | 8 +------ dlls/user32/combo.c | 1 - dlls/user32/cursoricon.c | 8 ++----- dlls/user32/dde_misc.c | 6 +---- dlls/user32/dde_server.c | 4 ++-- dlls/user32/defwnd.c | 14 ++++-------- dlls/user32/desktop.c | 8 +------ dlls/user32/dialog.c | 38 ++++++++++++++----------------- dlls/user32/driver.c | 12 ++++++---- dlls/user32/edit.c | 33 ++++++++++++--------------- dlls/user32/exticon.c | 5 ---- dlls/user32/focus.c | 3 --- dlls/user32/hook.c | 9 +++----- dlls/user32/icontitle.c | 10 ++------ dlls/user32/input.c | 4 ---- dlls/user32/listbox.c | 40 ++++++++++++++++---------------- dlls/user32/lstr.c | 3 --- dlls/user32/mdi.c | 14 ++++++------ dlls/user32/menu.c | 26 +++++++++------------ dlls/user32/message.c | 16 +++++-------- dlls/user32/misc.c | 3 --- dlls/user32/nonclient.c | 7 +++--- dlls/user32/painting.c | 3 --- dlls/user32/property.c | 11 ++++----- dlls/user32/rawinput.c | 5 ++-- dlls/user32/resource.c | 2 -- dlls/user32/scroll.c | 2 -- dlls/user32/spy.c | 7 +++--- dlls/user32/sysparams.c | 54 +++++++++++++++++++++----------------------- dlls/user32/text.c | 16 +++++-------- dlls/user32/uitools.c | 3 +-- dlls/user32/user_main.c | 35 ++++++++++++++-------------- dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 29 +++++++++++------------- dlls/user32/winhelp.c | 8 ++----- dlls/user32/winpos.c | 3 --- dlls/user32/winproc.c | 17 ++++++-------- dlls/user32/winstation.c | 26 ++++++++++----------- 42 files changed, 216 insertions(+), 318 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9cc92365560f19c2fd2b…

1 0

Alexandre Julliard : user32: Move PNG support to a new Unix library.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 148d3aa461126ab6e77e36e33493f87d539cd6ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=148d3aa461126ab6e77e36e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:42:34 2020 +0200 user32: Move PNG support to a new Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 + dlls/user32/cursoricon.c | 310 +--------------------------------------- dlls/user32/png.c | 342 +++++++++++++++++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 6 + 4 files changed, 356 insertions(+), 303 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=148d3aa461126ab6e77e…

1 0

Nikolay Sivov : winedbg: Double dll name buffer size for unimplemented function exception.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 51fbcc0c23e3217b79a27391eafc911773ca060a URL: https://source.winehq.org/git/wine.git/?a=commit;h=51fbcc0c23e3217b79a27391… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 20 21:47:17 2020 +0300 winedbg: Double dll name buffer size for unimplemented function exception. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 123cbc934e..4e8580db0d 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -914,7 +914,7 @@ void info_win32_exception(void) break; case EXCEPTION_WINE_STUB: { - char dll[32], name[256]; + char dll[64], name[256]; memory_get_string(dbg_curr_process, (void*)rec->ExceptionInformation[0], TRUE, FALSE, dll, sizeof(dll));

1 0

Kevin Puetz : widl: Remove duplicate '\n\n' in midl_info_guid.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 7955b2e5265742dcfb32d0032be5e0fd1696a209 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7955b2e5265742dcfb32d003… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 18 16:10:30 2020 -0500 widl: Remove duplicate '\n\n' in midl_info_guid. Per standard, ctime already ends with '\n\0', so this doubled it. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 23d1dd8652..aa05dcfe56 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2750,7 +2750,7 @@ int create_msft_typelib(typelib_t *typelib) and midl's version number */ time_override = getenv( "WIDL_TIME_OVERRIDE"); cur_time = time_override ? atol( time_override) : time(NULL); - sprintf(info_string, "Created by WIDL version %s at %s\n", PACKAGE_VERSION, ctime(&cur_time)); + sprintf(info_string, "Created by WIDL version %s at %s", PACKAGE_VERSION, ctime(&cur_time)); set_custdata(msft, &midl_info_guid, VT_BSTR, info_string, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_time_guid, VT_UI4, &cur_time, &msft->typelib_header.CustomDataOffset); set_custdata(msft, &midl_version_guid, VT_UI4, &version, &msft->typelib_header.CustomDataOffset);

1 0

Francois Gouget : ntdll/tests: Fix the spelling of a couple of ok_() messages.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: cdfec11e42e59c497e9b1760f73b68283d568225 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfec11e42e59c497e9b1760… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:37:11 2020 +0200 ntdll/tests: Fix the spelling of a couple of ok_() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index c26cfb4a11..66dbe8089c 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -7437,12 +7437,12 @@ static void check_changes_in_range_(const char *file, unsigned int line, const B if (flag & flags && p[i] != 0xcc) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } else if (!(flag & flags) && p[i] != 0xdd) { - ok_(file, line)(0, "Got unexected byte %#x at %#x, flags %#x.\n", p[i], i, flags); + ok_(file, line)(0, "Got unexpected byte %#x at %#x, flags %#x.\n", p[i], i, flags); return; } }

1 0

Francois Gouget : vbscript: Fix the spelling of the delimiter* variables.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 38c91043f626bd6755185bc62ae85251c9e88207 URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c91043f626bd6755185bc6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 21 18:36:11 2020 +0200 vbscript: Fix the spelling of the delimiter* variables. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 92288fcd88..1231beee8e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2316,8 +2316,8 @@ static HRESULT Global_Join(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, V static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, VARIANT *res) { - BSTR str, string, delimeter = NULL; - int count, max, mode, len, start, end, ret, delimeterlen = 1; + BSTR str, string, delimiter = NULL; + int count, max, mode, len, start, end, ret, delimiterlen = 1; int i,*indices = NULL, indices_max = 8; SAFEARRAYBOUND bounds; SAFEARRAY *sa = NULL; @@ -2342,13 +2342,13 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, if(args_cnt > 1) { if(V_VT(args+1) != VT_BSTR) { - hres = to_string(args+1, &delimeter); + hres = to_string(args+1, &delimiter); if(FAILED(hres)) goto error; }else { - delimeter = V_BSTR(args+1); + delimiter = V_BSTR(args+1); } - delimeterlen = SysStringLen(delimeter); + delimiterlen = SysStringLen(delimiter); } if(args_cnt > 2) { @@ -2388,9 +2388,9 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, while(1) { ret = -1; - if (delimeterlen) { + if (delimiterlen) { ret = FindStringOrdinal(FIND_FROMSTART, string + start, len - start, - delimeter ? delimeter : L" ", delimeterlen, mode); + delimiter ? delimiter : L" ", delimiterlen, mode); } if (ret == -1) { @@ -2410,7 +2410,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, indices[count++] = end; if (ret == -1 || count == max) break; - start = start + ret + delimeterlen; + start = start + ret + delimiterlen; if (start > len) break; } @@ -2443,7 +2443,7 @@ static HRESULT Global_Split(BuiltinDisp *This, VARIANT *args, unsigned args_cnt, SafeArrayDestroy(sa); goto error; } - start = indices[i]+delimeterlen; + start = indices[i]+delimiterlen; } SafeArrayUnaccessData(sa); @@ -2459,7 +2459,7 @@ error: if(V_VT(args) != VT_BSTR) SysFreeString(string); if(V_VT(args+1) != VT_BSTR) - SysFreeString(delimeter); + SysFreeString(delimiter); return hres; }

1 0

Alexandre Julliard : user32: Use wide character string literals.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: 5ad25c293b6a7b5cd5dea43f29f6fa94d8302722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ad25c293b6a7b5cd5dea43f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 16:31:11 2020 +0200 user32: Use wide character string literals. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 +- dlls/user32/class.c | 55 ++++++------ dlls/user32/combo.c | 25 ++---- dlls/user32/dde_client.c | 2 +- dlls/user32/dde_misc.c | 5 +- dlls/user32/dde_server.c | 10 +-- dlls/user32/defwnd.c | 3 +- dlls/user32/desktop.c | 12 +-- dlls/user32/dialog.c | 18 ++-- dlls/user32/driver.c | 26 ++---- dlls/user32/edit.c | 9 +- dlls/user32/icontitle.c | 3 +- dlls/user32/listbox.c | 19 ++-- dlls/user32/mdi.c | 10 +-- dlls/user32/menu.c | 8 +- dlls/user32/message.c | 4 +- dlls/user32/misc.c | 6 +- dlls/user32/msgbox.c | 6 +- dlls/user32/painting.c | 4 +- dlls/user32/rawinput.c | 10 +-- dlls/user32/scroll.c | 3 +- dlls/user32/spy.c | 5 +- dlls/user32/static.c | 3 +- dlls/user32/sysparams.c | 221 ++++++++++++++--------------------------------- dlls/user32/text.c | 2 +- dlls/user32/uitools.c | 3 +- dlls/user32/user_main.c | 83 ++++++------------ dlls/user32/win.c | 24 ++--- dlls/user32/winstation.c | 14 +-- dlls/user32/wsprintf.c | 7 +- 30 files changed, 198 insertions(+), 405 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ad25c293b6a7b5cd5de…

1 0

Alexandre Julliard : ntdll: Add support for loading a Unix helper library from builtin dlls.
by Alexandre Julliard Sept. 21, 2020

Sept. 21, 2020

Module: wine Branch: master Commit: a014f413d6719cce883cafe9f40ec0b6468de097 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a014f413d6719cce883cafe9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:41:28 2020 +0200 ntdll: Add support for loading a Unix helper library from builtin dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 31 ++++++++++- dlls/ntdll/ntdll.spec | 3 + dlls/ntdll/unix/loader.c | 136 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/ntdll/unixlib.h | 4 +- dlls/winecrt0/Makefile.in | 3 +- dlls/winecrt0/unix_lib.c | 55 +++++++++++++++++++ include/winternl.h | 3 + 7 files changed, 224 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a014f413d6719cce883c…

1 0