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
December 2011
----- 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
2 participants
810 discussions
Start a n
N
ew thread
Alexandre Julliard : widl: Zero-initialize [out] structures and unions that contain pointers.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: bf0c37d56a263194b229c5fd7e44ddd302b41de4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bf0c37d56a263194b229c5fd7…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 13 16:29:49 2011 +0100 widl: Zero-initialize [out] structures and unions that contain pointers. --- tools/widl/typegen.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c1b5302..516d8e7 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4588,6 +4588,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char int in_attr, out_attr; int i = 0, sep = 0; const var_t *var; + type_t *ref; if (!type_get_function_args(func->type)) return; @@ -4646,7 +4647,8 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char break; case TGT_POINTER: fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); - switch (typegen_detect_type(type_pointer_get_ref(var->type), var->attrs, TDT_IGNORE_STRINGS)) + ref = type_pointer_get_ref(var->type); + switch (typegen_detect_type(ref, var->attrs, TDT_IGNORE_STRINGS)) { case TGT_BASIC: case TGT_ENUM: @@ -4659,9 +4661,20 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", local_var_prefix, i, local_var_prefix, i); break; + case TGT_ARRAY: + if (type_array_is_decl_as_ptr(ref)) + { + print_file(file, indent, "%s_W%u = 0;\n", local_var_prefix, i); + break; + } + ref = type_array_get_element(ref); + /* fall through */ case TGT_STRUCT: case TGT_UNION: - case TGT_ARRAY: + if (type_has_pointers(ref)) + print_file(file, indent, "memset(&%s_W%u, 0, sizeof(%s_W%u));\n", + local_var_prefix, i, local_var_prefix, i); + break; case TGT_CTXT_HANDLE: case TGT_CTXT_HANDLE_POINTER: case TGT_INVALID:
1
0
0
0
Hans Leidekker : msi: Don't run the rollback script in reinstall mode.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 8cc5561fbf9f3250fbd2d986390e4013e8c9f31b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8cc5561fbf9f3250fbd2d9863…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:20:10 2011 +0100 msi: Don't run the rollback script in reinstall mode. --- dlls/msi/action.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d4170f5..77749d8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7408,11 +7408,12 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq) UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, LPCWSTR szCommandLine ) { - UINT rc; - BOOL ui_exists; static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; + WCHAR *reinstall = NULL; + BOOL ui_exists; + UINT rc; msi_set_property( package->db, szAction, szInstall ); @@ -7515,11 +7516,12 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, /* finish up running custom actions */ ACTION_FinishCustomActions(package); - if (package->need_rollback) + if (package->need_rollback && !(reinstall = msi_dup_property( package->db, szReinstall ))) { WARN("installation failed, running rollback script\n"); execute_script( package, ROLLBACK_SCRIPT ); } + msi_free( reinstall ); if (rc == ERROR_SUCCESS && package->need_reboot) return ERROR_SUCCESS_REBOOT_REQUIRED;
1
0
0
0
Hans Leidekker : msi: Pass REINSTALL and REINSTALLMODE properties on the command line in MsiReinstallFeatureW .
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 8a5c700d786ee0490187d92c7b54eb7047ce2920 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=8a5c700d786ee0490187d92c7…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:49 2011 +0100 msi: Pass REINSTALL and REINSTALLMODE properties on the command line in MsiReinstallFeatureW. --- dlls/msi/msi.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 09b2d36..bdcb17a 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3770,14 +3770,14 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, return ERROR_FUNCTION_FAILED; } -UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, - DWORD dwReinstallMode ) +UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { + static const WCHAR fmtW[] = {'%','s','=','%','s',' ','%','s','=','%','s',0}; MSIPACKAGE *package; MSIINSTALLCONTEXT context; UINT r; WCHAR sourcepath[MAX_PATH], filename[MAX_PATH], reinstallmode[11]; - LPWSTR ptr; + WCHAR *ptr, *cmdline; DWORD sz; TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); @@ -3813,12 +3813,10 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, sz = sizeof(sourcepath); MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz ); - sz = sizeof(filename); MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz ); - - lstrcatW( sourcepath, filename ); + strcatW( sourcepath, filename ); if (dwReinstallMode & REINSTALLMODE_PACKAGE) r = MSI_OpenPackageW( sourcepath, &package ); @@ -3828,12 +3826,18 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, if (r != ERROR_SUCCESS) return r; - msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szReinstall, szFeature ); - - r = MSI_InstallPackage( package, sourcepath, NULL ); + sz = (strlenW( fmtW ) + strlenW( szReinstallMode ) + strlenW( reinstallmode )) * sizeof(WCHAR); + sz += (strlenW( szReinstall ) + strlenW( szFeature )) * sizeof(WCHAR); + if (!(cmdline = msi_alloc( sz ))) + { + msiobj_release( &package->hdr ); + return ERROR_OUTOFMEMORY; + } + sprintfW( cmdline, fmtW, szReinstallMode, reinstallmode, szReinstall, szFeature ); + r = MSI_InstallPackage( package, sourcepath, cmdline ); msiobj_release( &package->hdr ); + msi_free( cmdline ); return r; }
1
0
0
0
Hans Leidekker : msi: Don' t set the LOGVERBOSE property in MsiReinstallFeatureW.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 12e106613a0024ba2561fa60311a10f09fa93857 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=12e106613a0024ba2561fa603…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:32 2011 +0100 msi: Don't set the LOGVERBOSE property in MsiReinstallFeatureW. --- dlls/msi/msi.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index d062ad0..09b2d36 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3773,8 +3773,6 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { - static const WCHAR szLogVerbose[] = - {' ','L','O','G','V','E','R','B','O','S','E',0}; MSIPACKAGE *package; MSIINSTALLCONTEXT context; UINT r; @@ -3831,7 +3829,6 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, return r; msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szLogVerbose, szOne ); msi_set_property( package->db, szReinstall, szFeature ); r = MSI_InstallPackage( package, sourcepath, NULL );
1
0
0
0
Hans Leidekker : msi: Don' t set the Installed property in MsiReinstallFeatureW.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 1f56b60cc41cfa87ecf57bccb88fc0b130bfbb52 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=1f56b60cc41cfa87ecf57bccb…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:14 2011 +0100 msi: Don't set the Installed property in MsiReinstallFeatureW. This property will be set later. --- dlls/msi/msi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 21ffb39..d062ad0 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3831,7 +3831,6 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, return r; msi_set_property( package->db, szReinstallMode, reinstallmode ); - msi_set_property( package->db, szInstalled, szOne ); msi_set_property( package->db, szLogVerbose, szOne ); msi_set_property( package->db, szReinstall, szFeature );
1
0
0
0
Hans Leidekker : msi: Support all install contexts in MsiReinstallFeatureW.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 00477d601eb1604e0854a447ffd5a7c56cf8e5b2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=00477d601eb1604e0854a447f…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:19:01 2011 +0100 msi: Support all install contexts in MsiReinstallFeatureW. --- dlls/msi/msi.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3727560..21ffb39 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -3773,18 +3773,20 @@ UINT WINAPI MsiGetShortcutTargetW( LPCWSTR szShortcutTarget, UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, DWORD dwReinstallMode ) { - MSIPACKAGE* package = NULL; + static const WCHAR szLogVerbose[] = + {' ','L','O','G','V','E','R','B','O','S','E',0}; + MSIPACKAGE *package; + MSIINSTALLCONTEXT context; UINT r; - WCHAR sourcepath[MAX_PATH]; - WCHAR filename[MAX_PATH]; - static const WCHAR szLogVerbose[] = { - ' ','L','O','G','V','E','R','B','O','S','E',0 }; - WCHAR reinstallmode[11]; + WCHAR sourcepath[MAX_PATH], filename[MAX_PATH], reinstallmode[11]; LPWSTR ptr; DWORD sz; - FIXME("%s %s 0x%08x\n", - debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); + TRACE("%s, %s, 0x%08x\n", debugstr_w(szProduct), debugstr_w(szFeature), dwReinstallMode); + + r = msi_locate_product( szProduct, &context ); + if (r != ERROR_SUCCESS) + return r; ptr = reinstallmode; @@ -3811,12 +3813,12 @@ UINT WINAPI MsiReinstallFeatureW( LPCWSTR szProduct, LPCWSTR szFeature, *ptr = 0; sz = sizeof(sourcepath); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz); + MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_LASTUSEDSOURCEW, sourcepath, &sz ); sz = sizeof(filename); - MsiSourceListGetInfoW(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, - MSICODE_PRODUCT, INSTALLPROPERTY_PACKAGENAMEW, filename, &sz); + MsiSourceListGetInfoW( szProduct, NULL, context, MSICODE_PRODUCT, + INSTALLPROPERTY_PACKAGENAMEW, filename, &sz ); lstrcatW( sourcepath, filename );
1
0
0
0
Hans Leidekker : msi: Move some traces from implementations to entry points .
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: 973e86b844aa8d3e5533b26f59cb21d835d8b2e8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=973e86b844aa8d3e5533b26f5…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 13 13:18:42 2011 +0100 msi: Move some traces from implementations to entry points. --- dlls/msi/msi.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index ce08940..3727560 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -2685,6 +2685,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR szPackage ) static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, awstring* lpPathBuf, LPDWORD pcchBuf) { + static const WCHAR wininstaller[] = + {'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; WCHAR squished_pc[GUID_SIZE]; WCHAR squished_comp[GUID_SIZE]; HKEY hkey; @@ -2692,12 +2694,6 @@ static INSTALLSTATE MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, INSTALLSTATE state; DWORD version; - static const WCHAR wininstaller[] = { - 'W','i','n','d','o','w','s','I','n','s','t','a','l','l','e','r',0}; - - TRACE("%s %s %p %p\n", debugstr_w(szProduct), - debugstr_w(szComponent), lpPathBuf->str.w, pcchBuf); - if (!szProduct || !szComponent) return INSTALLSTATE_INVALIDARG; @@ -2772,6 +2768,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathW(LPCWSTR szProduct, LPCWSTR szComponent, { awstring path; + TRACE("%s %s %p %p\n", debugstr_w(szProduct), debugstr_w(szComponent), lpPathBuf, pcchBuf); + path.unicode = TRUE; path.str.w = lpPathBuf; @@ -2788,6 +2786,8 @@ INSTALLSTATE WINAPI MsiGetComponentPathA(LPCSTR szProduct, LPCSTR szComponent, INSTALLSTATE r = INSTALLSTATE_UNKNOWN; awstring path; + TRACE("%s %s %p %p\n", debugstr_a(szProduct), debugstr_a(szComponent), lpPathBuf, pcchBuf); + szwProduct = strdupAtoW( szProduct ); if( szProduct && !szwProduct) goto end; @@ -3243,10 +3243,6 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, DWORD sz; UINT rc; - TRACE("%s %s %i %s %i %i %p %p\n", debugstr_w(szComponent), - debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), - Unused1, Unused2, lpPathBuf, pcchPathBuf); - rc = MSIREG_OpenUserComponentsKey(szComponent, &hkey, FALSE); if (rc != ERROR_SUCCESS) return ERROR_INDEX_ABSENT; @@ -3282,6 +3278,10 @@ UINT WINAPI MsiProvideQualifiedComponentExW(LPCWSTR szComponent, { awstring path; + TRACE("%s %s %u %s %u %u %p %p\n", debugstr_w(szComponent), + debugstr_w(szQualifier), dwInstallMode, debugstr_w(szProduct), + Unused1, Unused2, lpPathBuf, pcchPathBuf); + path.unicode = TRUE; path.str.w = lpPathBuf;
1
0
0
0
Kusanagi Kouichi : gdi32: Don't remove leading '@' from face name.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: b5446ddb45d13b965e385ff76bbd5be69f4e7207 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b5446ddb45d13b965e385ff76…
Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:26 2011 +0900 gdi32: Don't remove leading '@' from face name. --- dlls/gdi32/freetype.c | 8 -------- dlls/gdi32/tests/font.c | 1 - 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 615a01a..9762230 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3940,14 +3940,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont ) CHILD_FONT *font_link_entry; LPWSTR FaceName = lf.lfFaceName; - /* - * Check for a leading '@' this signals that the font is being - * requested in tategaki mode (vertical writing substitution) but - * does not affect the fontface that is to be selected. - */ - if (lf.lfFaceName[0]=='@') - FaceName = &lf.lfFaceName[1]; - psub = get_font_subst(&font_subst_list, FaceName, lf.lfCharSet); if(psub) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ed629ce..98c61a0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4126,7 +4126,6 @@ static void test_vertical_font(void) check_vertical_font("@WineTestVertical", &installed, &selected, &gm); ok(installed, "@WineTestVertical is not installed\n"); - todo_wine ok(selected, "@WineTestVertical is not selected\n"); todo_wine ok(gm.gmBlackBoxX > gm.gmBlackBoxY,
1
0
0
0
Kusanagi Kouichi : gdi32: Don't use preferred family name.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: bf8a10063924a826766af2e478e248bb6ea061e0 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bf8a10063924a826766af2e47…
Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:16 2011 +0900 gdi32: Don't use preferred family name. --- dlls/gdi32/freetype.c | 24 ++++++++++++++++-------- dlls/gdi32/tests/font.c | 2 -- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 959f4aa..615a01a 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1487,8 +1487,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ #endif /* HAVE_CARBON_CARBON_H */ do { - char *family_name = fake_family; - if (file) { TRACE("Loading font file %s index %ld\n", debugstr_a(file), face_index); @@ -1571,9 +1569,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ HeapFree(GetProcessHeap(), 0, localised_family); } - if(!family_name) - family_name = ft_face->family_name; - bitmap_num = 0; do { My_FT_Bitmap_Size *size = NULL; @@ -1582,9 +1577,22 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - len = MultiByteToWideChar(CP_ACP, 0, family_name, -1, NULL, 0); - english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - MultiByteToWideChar(CP_ACP, 0, family_name, -1, english_family, len); + if(fake_family) + { + len = MultiByteToWideChar(CP_ACP, 0, fake_family, -1, NULL, 0); + english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, fake_family, -1, english_family, len); + } + else + { + english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); + if(!english_family) + { + len = MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, NULL, 0); + english_family = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, ft_face->family_name, -1, english_family, len); + } + } localised_family = NULL; if(!fake_family) { diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0a202dd..ed629ce 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4125,8 +4125,6 @@ static void test_vertical_font(void) ok(num == 2, "AddFontResourceExA should add 2 fonts from vertical.ttf\n"); check_vertical_font("@WineTestVertical", &installed, &selected, &gm); - /* This test fails on wine if locale is not en-US. Disable for now. */ - if (0) ok(installed, "@WineTestVertical is not installed\n"); todo_wine ok(selected, "@WineTestVertical is not selected\n");
1
0
0
0
Kusanagi Kouichi : gdi32/tests: Add tests for vertical font.
by Alexandre Julliard
13 Dec '11
13 Dec '11
Module: wine Branch: master Commit: ad58ca235c8c23e22521553ad549e57117b3a9bb URL:
http://source.winehq.org/git/wine.git/?a=commit;h=ad58ca235c8c23e22521553ad…
Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Tue Dec 13 19:44:00 2011 +0900 gdi32/tests: Add tests for vertical font. --- dlls/gdi32/tests/font.c | 104 +++++++++++++++++++++- dlls/gdi32/tests/resource.rc | 4 + dlls/gdi32/tests/vertical.sfd | 199 +++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/vertical.ttf | Bin 0 -> 2372 bytes 4 files changed, 304 insertions(+), 3 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad58ca235c8c23e225215…
1
0
0
0
← Newer
1
...
42
43
44
45
46
47
48
...
81
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
72
73
74
75
76
77
78
79
80
81
Results per page:
10
25
50
100
200