winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2020
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
703 discussions
Start a n
N
ew thread
Alexandre Julliard : user32: Move PNG support to a new Unix library.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
Alexandre Julliard : ntdll: Add support for loading a Unix helper library from builtin dlls.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
Alexandre Julliard : crypt32: Move GnuTLS-specific helpers into the #ifdef.
by Alexandre Julliard
21 Sep '20
21 Sep '20
Module: wine Branch: master Commit: 6d7037c9ff1219ae959e365d8a95a3fceb57ca87 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=6d7037c9ff1219ae959e365d…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 21 13:21:07 2020 +0200 crypt32: Move GnuTLS-specific helpers into the #ifdef. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/pfx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/pfx.c b/dlls/crypt32/pfx.c index 475ec0369e..3f38ae5056 100644 --- a/dlls/crypt32/pfx.c +++ b/dlls/crypt32/pfx.c @@ -254,8 +254,6 @@ static char *password_to_ascii( const WCHAR *str ) return ret; } -#endif - static BOOL set_key_context( const void *ctx, HCRYPTPROV prov ) { CERT_KEY_CONTEXT key_ctx; @@ -327,6 +325,8 @@ static BOOL set_key_prov_info( const void *ctx, HCRYPTPROV prov ) return ret; } +#endif + HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *pfx, const WCHAR *password, DWORD flags ) { #ifdef SONAME_LIBGNUTLS
1
0
0
0
Piotr Caban : server: Don't overflow if timeout doesn't fit into int range in get_next_timeout.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
Piotr Caban : server: Don't create wait object if infinite timeout is passed to NtSetTimer.
by Alexandre Julliard
21 Sep '20
21 Sep '20
Module: wine Branch: master Commit: b67bbb732be82dedee93c88cf92c92c0540f3514 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=b67bbb732be82dedee93c88c…
Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Sep 20 15:58:54 2020 +0200 server: Don't create wait object if infinite timeout is passed to NtSetTimer. Wine-Bug:
https://bugs.winehq.org/show_bug.cgi?id=49847
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/timer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/timer.c b/server/timer.c index 6460acbf51..469f9d5a90 100644 --- a/server/timer.c +++ b/server/timer.c @@ -177,7 +177,8 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period timer->callback = callback; timer->arg = arg; if (callback) timer->thread = (struct thread *)grab_object( current ); - timer->timeout = add_timeout_user( expire, timer_callback, timer ); + if (expire != TIMEOUT_INFINITE) + timer->timeout = add_timeout_user( expire, timer_callback, timer ); return signaled; }
1
0
0
0
Sven Baars : ntdll: Fix some memory leaks (Valgrind).
by Alexandre Julliard
21 Sep '20
21 Sep '20
Module: wine Branch: master Commit: 123a4a884f343f76d40b843740c3c4290d5eca71 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=123a4a884f343f76d40b8437…
Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Sep 20 18:25:27 2020 +0200 ntdll: Fix some memory leaks (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/security.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/security.c b/dlls/ntdll/unix/security.c index daecc5e059..09a1d787c0 100644 --- a/dlls/ntdll/unix/security.c +++ b/dlls/ntdll/unix/security.c @@ -779,8 +779,16 @@ NTSTATUS WINAPI NtSetSecurityObject( HANDLE handle, SECURITY_INFORMATION info, P InitializeObjectAttributes( &attr, NULL, 0, 0, descr ); if ((status = alloc_object_attributes( &attr, &objattr, &len ))) return status; sd = (struct security_descriptor *)(objattr + 1); - if (info & OWNER_SECURITY_INFORMATION && !sd->owner_len) return STATUS_INVALID_SECURITY_DESCR; - if (info & GROUP_SECURITY_INFORMATION && !sd->group_len) return STATUS_INVALID_SECURITY_DESCR; + if (info & OWNER_SECURITY_INFORMATION && !sd->owner_len) + { + free( objattr ); + return STATUS_INVALID_SECURITY_DESCR; + } + if (info & GROUP_SECURITY_INFORMATION && !sd->group_len) + { + free( objattr ); + return STATUS_INVALID_SECURITY_DESCR; + } if (info & (SACL_SECURITY_INFORMATION | LABEL_SECURITY_INFORMATION)) sd->control |= SE_SACL_PRESENT; if (info & DACL_SECURITY_INFORMATION) sd->control |= SE_DACL_PRESENT;
1
0
0
0
Nikolay Sivov : winedbg: Double dll name buffer size for unimplemented function exception.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
Rémi Bernon : gdi32: Look for another secondary font family name.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
Rémi Bernon : gdi32/tests: Add test fonts with names in several languages.
by Alexandre Julliard
21 Sep '20
21 Sep '20
Module: wine Branch: master Commit: d3ba3ca2d088660ec4f1fb592448d3b27f5d386e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d3ba3ca2d088660ec4f1fb59…
Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 17 19:30:42 2020 +0200 gdi32/tests: Add test fonts with names in several languages. 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/tests/Makefile.in | 3 + dlls/gdi32/tests/font.c | 265 +++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/resource.rc | 9 ++ dlls/gdi32/tests/wine_langnames.sfd | 138 ++++++++++++++++++ dlls/gdi32/tests/wine_langnames.ttf | Bin 0 -> 2792 bytes dlls/gdi32/tests/wine_langnames2.sfd | 80 +++++++++++ dlls/gdi32/tests/wine_langnames2.ttf | Bin 0 -> 2016 bytes dlls/gdi32/tests/wine_langnames3.sfd | 78 +++++++++++ dlls/gdi32/tests/wine_langnames3.ttf | Bin 0 -> 2048 bytes 9 files changed, 573 insertions(+) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=d3ba3ca2d088660ec4f1…
1
0
0
0
Kevin Puetz : widl: Remove duplicate '\n\n' in midl_info_guid.
by Alexandre Julliard
21 Sep '20
21 Sep '20
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
0
0
← Newer
1
...
26
27
28
29
30
31
32
...
71
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
Results per page:
10
25
50
100
200