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
March 2010
----- 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
3 participants
919 discussions
Start a n
N
ew thread
Hans Leidekker : msi: Update the UI in the MoveFiles action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: a358c7f6d4c33589681c9b2d9302c925ca75d560 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a358c7f6d4c33589681c9b2d9…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:27:07 2010 +0100 msi: Update the UI in the MoveFiles action. --- dlls/msi/action.c | 2 -- dlls/msi/files.c | 14 ++++++++++---- dlls/msi/msipriv.h | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index cabd153..276250f 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -112,8 +112,6 @@ static const WCHAR szIsolateComponents[] = {'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szMigrateFeatureStates[] = {'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0}; -static const WCHAR szMoveFiles[] = - {'M','o','v','e','F','i','l','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szMsiUnpublishAssemblies[] = diff --git a/dlls/msi/files.c b/dlls/msi/files.c index bf6f1fa..7ccb2c7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -531,11 +531,10 @@ done: static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; + MSIRECORD *uirow; MSICOMPONENT *comp; LPCWSTR sourcename, component; - LPWSTR destname = NULL; - LPWSTR sourcedir = NULL, destdir = NULL; - LPWSTR source = NULL, dest = NULL; + LPWSTR sourcedir, destname = NULL, destdir = NULL, source = NULL, dest = NULL; int options; DWORD size; BOOL ret, wildcards; @@ -626,7 +625,7 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) if (!ret) { WARN("CreateDirectory failed: %d\n", GetLastError()); - return ERROR_SUCCESS; + goto done; } } @@ -636,6 +635,13 @@ static UINT ITERATE_MoveFiles( MSIRECORD *rec, LPVOID param ) move_files_wildcard(source, dest, options); done: + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString(rec, 1) ); + MSI_RecordSetInteger( uirow, 6, 1 ); /* FIXME */ + MSI_RecordSetStringW( uirow, 9, destdir ); + ui_actiondata( package, szMoveFiles, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(sourcedir); msi_free(destdir); msi_free(destname); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 07ee1a8..0516dd1 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1083,6 +1083,7 @@ static const WCHAR szHLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; +static const WCHAR szMoveFiles[] = {'M','o','v','e','F','i','l','e','s',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
1
0
0
0
Hans Leidekker : msi: Move the implementation of the MoveFiles action to files.c.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: aba6afc85eea0bad16c7478ce2a1f5cd88bda587 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=aba6afc85eea0bad16c7478ce…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:26:41 2010 +0100 msi: Move the implementation of the MoveFiles action to files.c. --- dlls/msi/action.c | 336 ---------------------------------------------------- dlls/msi/files.c | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msipriv.h | 1 + 3 files changed, 337 insertions(+), 336 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=aba6afc85eea0bad16c74…
1
0
0
0
Hans Leidekker : msi: Update the UI in the RemoveODBC action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: a5549305deafdbe7ebf4b1578ec76f86ace0467a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a5549305deafdbe7ebf4b1578…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:26:21 2010 +0100 msi: Update the UI in the RemoveODBC action. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 59b756a..897e9c9 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5723,6 +5723,8 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; DWORD usage; LPCWSTR desc; @@ -5736,11 +5738,19 @@ static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) FIXME("Usage count reached 0\n"); } + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; } static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; DWORD usage; LPCWSTR desc; @@ -5754,11 +5764,19 @@ static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) FIXME("Usage count reached 0\n"); } + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; } static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; + MSIRECORD *uirow; LPWSTR attrs; LPCWSTR desc, driver; WORD request = ODBC_REMOVE_SYS_DSN; @@ -5791,6 +5809,13 @@ static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) } msi_free( attrs ); + uirow = MSI_CreateRecord( 3 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetInteger( uirow, 3, request ); + ui_actiondata( package, szRemoveODBC, uirow ); + msiobj_release( &uirow->hdr ); + return ERROR_SUCCESS; }
1
0
0
0
Hans Leidekker : msi: Update the UI in the InstallODBC action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: eff0503f644ddccb5b27328f04e4607bc4c1c497 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eff0503f644ddccb5b27328f0…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:55 2010 +0100 msi: Update the UI in the InstallODBC action. --- dlls/msi/action.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7a666f5..59b756a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5487,6 +5487,7 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) LPWSTR driver, driver_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *driver_file, *setup_file; + MSIRECORD *uirow; LPCWSTR desc; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5546,6 +5547,13 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetStringW( uirow, 3, driver_path ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(driver); msi_free(driver_path); @@ -5558,6 +5566,7 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) LPWSTR translator, translator_path, ptr; WCHAR outpath[MAX_PATH]; MSIFILE *translator_file, *setup_file; + MSIRECORD *uirow; LPCWSTR desc; DWORD len, usage; UINT r = ERROR_SUCCESS; @@ -5611,6 +5620,13 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetStringW( uirow, 3, translator_path ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(translator); msi_free(translator_path); @@ -5619,12 +5635,14 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) { + MSIPACKAGE *package = param; LPWSTR attrs; LPCWSTR desc, driver; WORD request = ODBC_ADD_SYS_DSN; INT registration; DWORD len; UINT r = ERROR_SUCCESS; + MSIRECORD *uirow; static const WCHAR attrs_fmt[] = { 'D','S','N','=','%','s',0 }; @@ -5650,6 +5668,13 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) r = ERROR_FUNCTION_FAILED; } + uirow = MSI_CreateRecord( 5 ); + MSI_RecordSetStringW( uirow, 1, desc ); + MSI_RecordSetStringW( uirow, 2, MSI_RecordGetString(rec, 2) ); + MSI_RecordSetInteger( uirow, 3, request ); + ui_actiondata( package, szInstallODBC, uirow ); + msiobj_release( &uirow->hdr ); + msi_free(attrs); return r;
1
0
0
0
Hans Leidekker : msi: Display the product code in the FindRelatedProducts action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: bb9451adaef98108ec13b2fae116ee8357554ad1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bb9451adaef98108ec13b2fae…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:31 2010 +0100 msi: Display the product code in the FindRelatedProducts action. --- dlls/msi/upgrade.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index 21b677d..a440070 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -182,9 +182,10 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) continue; } - action_property = MSI_RecordGetString(rec,7); - append_productcode(package,action_property,productid); - ui_actiondata(package,szFindRelatedProducts,uirow); + action_property = MSI_RecordGetString(rec, 7); + append_productcode(package, action_property, productid); + MSI_RecordSetStringW(uirow, 1, productid); + ui_actiondata(package, szFindRelatedProducts, uirow); } index ++; }
1
0
0
0
Hans Leidekker : msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions .
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: 2666294f649f2e79fdf4e0f5ef64ccbe4c5d1160 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2666294f649f2e79fdf4e0f5e…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:25:07 2010 +0100 msi: Properly update the UI in the DuplicateFiles and RemoveDuplicateFiles actions. --- dlls/msi/files.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index aaaa7c1..c55bbfa 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -386,6 +386,7 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString(row,2); @@ -432,7 +433,12 @@ static UINT ITERATE_DuplicateFiles(MSIRECORD *row, LPVOID param) FIXME("We should track these duplicate files as well\n"); - msi_file_update_ui(package, file, szDuplicateFiles); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetInteger( uirow, 6, file->FileSize ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS; @@ -462,6 +468,7 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) LPWSTR dest; LPCWSTR file_key, component; MSICOMPONENT *comp; + MSIRECORD *uirow; MSIFILE *file; component = MSI_RecordGetString( row, 2 ); @@ -505,7 +512,11 @@ static UINT ITERATE_RemoveDuplicateFiles( MSIRECORD *row, LPVOID param ) WARN("Failed to delete duplicate file %s (%u)\n", debugstr_w(dest), GetLastError()); } - msi_file_update_ui( package, file, szRemoveDuplicateFiles ); + uirow = MSI_CreateRecord( 9 ); + MSI_RecordSetStringW( uirow, 1, MSI_RecordGetString( row, 1 ) ); + MSI_RecordSetStringW( uirow, 9, MSI_RecordGetString( row, 5 ) ); + ui_actiondata( package, szRemoveDuplicateFiles, uirow ); + msiobj_release( &uirow->hdr ); msi_free(dest); return ERROR_SUCCESS;
1
0
0
0
Hans Leidekker : msi: Update the UI in the DeleteServices action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: 3c36d9d1f956e51f7b8764f63232ae7c45c3f68a URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3c36d9d1f956e51f7b8764f63…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:24:41 2010 +0100 msi: Update the UI in the DeleteServices action. --- dlls/msi/action.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e321099..7a666f5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5383,9 +5383,10 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) { MSIPACKAGE *package = param; MSICOMPONENT *comp; + MSIRECORD *uirow; LPCWSTR component; - LPWSTR name = NULL; - DWORD event; + LPWSTR name = NULL, display_name = NULL; + DWORD event, len; SC_HANDLE scm = NULL, service = NULL; event = MSI_RecordGetInteger( rec, 3 ); @@ -5415,6 +5416,14 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) goto done; } + len = 0; + if (!GetServiceDisplayNameW( scm, name, NULL, &len ) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) + { + if ((display_name = msi_alloc( ++len * sizeof(WCHAR )))) + GetServiceDisplayNameW( scm, name, display_name, &len ); + } + service = OpenServiceW( scm, name, DELETE ); if (!service) { @@ -5426,9 +5435,16 @@ static UINT ITERATE_DeleteService( MSIRECORD *rec, LPVOID param ) WARN("Failed to delete service (%s): %u\n", debugstr_w(name), GetLastError()); done: + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, display_name ); + MSI_RecordSetStringW( uirow, 2, name ); + ui_actiondata( package, szDeleteServices, uirow ); + msiobj_release( &uirow->hdr ); + CloseServiceHandle( service ); CloseServiceHandle( scm ); msi_free( name ); + msi_free( display_name ); return ERROR_SUCCESS; }
1
0
0
0
Hans Leidekker : msi: Display directory identifier instead of the full path in the CreateFolders action .
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: a70d86d3c9079a6fd93b66e0f3c54eb2ff2d68b3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a70d86d3c9079a6fd93b66e0f…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:24:18 2010 +0100 msi: Display directory identifier instead of the full path in the CreateFolders action. --- dlls/msi/action.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a39ddad..e321099 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -92,8 +92,6 @@ static const WCHAR szForceReboot[] = {'F','o','r','c','e','R','e','b','o','o','t',0}; static const WCHAR szResolveSource[] = {'R','e','s','o','l','v','e','S','o','u','r','c','e',0}; -static const WCHAR szAppSearch[] = - {'A','p','p','S','e','a','r','c','h',0}; static const WCHAR szAllocateRegistrySpace[] = {'A','l','l','o','c','a','t','e','R','e','g','i','s','t','r','y','S','p','a','c','e',0}; static const WCHAR szBindImage[] = @@ -910,6 +908,11 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; } + uirow = MSI_CreateRecord(1); + MSI_RecordSetStringW(uirow, 1, dir); + ui_actiondata(package, szCreateFolders, uirow); + msiobj_release(&uirow->hdr); + full_path = resolve_folder(package,dir,FALSE,FALSE,TRUE,&folder); if (!full_path) { @@ -919,12 +922,6 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) TRACE("Folder is %s\n",debugstr_w(full_path)); - /* UI stuff */ - uirow = MSI_CreateRecord(1); - MSI_RecordSetStringW(uirow,1,full_path); - ui_actiondata(package,szCreateFolders,uirow); - msiobj_release( &uirow->hdr ); - if (folder->State == 0) create_full_pathW(full_path);
1
0
0
0
Hans Leidekker : msi: Update the UI in the AppSearch action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: 868e6f2bc8d44b0712003ce2c67d67acd8ea999e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=868e6f2bc8d44b0712003ce2c…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:23:53 2010 +0100 msi: Update the UI in the AppSearch action. --- dlls/msi/appsearch.c | 16 +++++++++++----- dlls/msi/msipriv.h | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index c4e4e58..12c7411 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -1026,13 +1026,15 @@ static UINT ACTION_AppSearchSigName(MSIPACKAGE *package, LPCWSTR sigName, static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) { MSIPACKAGE *package = param; - LPWSTR propName, sigName, value = NULL; + LPCWSTR propName, sigName; + LPWSTR value = NULL; MSISIGNATURE sig; + MSIRECORD *uirow; UINT r; /* get property and signature */ - propName = msi_dup_record_field(row,1); - sigName = msi_dup_record_field(row,2); + propName = MSI_RecordGetString(row, 1); + sigName = MSI_RecordGetString(row, 2); TRACE("%s %s\n", debugstr_w(propName), debugstr_w(sigName)); @@ -1043,8 +1045,12 @@ static UINT iterate_appsearch(MSIRECORD *row, LPVOID param) msi_free(value); } ACTION_FreeSignature(&sig); - msi_free(propName); - msi_free(sigName); + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, propName ); + MSI_RecordSetStringW( uirow, 2, sigName ); + ui_actiondata( package, szAppSearch, uirow ); + msiobj_release( &uirow->hdr ); return r; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9e2ffe2..97d79c4 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1081,6 +1081,7 @@ static const WCHAR szHCU[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_ static const WCHAR szHLM[] = {'H','K','E','Y','_','L','O','C','A','L','_','M','A','C','H','I','N','E','\\',0}; static const WCHAR szHU[] = {'H','K','E','Y','_','U','S','E','R','S','\\',0}; static const WCHAR szWindowsFolder[] = {'W','i','n','d','o','w','s','F','o','l','d','e','r',0}; +static const WCHAR szAppSearch[] = {'A','p','p','S','e','a','r','c','h',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1);
1
0
0
0
Hans Leidekker : msi: Update the UI in the AllocateRegistrySpace action.
by Alexandre Julliard
05 Mar '10
05 Mar '10
Module: wine Branch: master Commit: 31d0664ebd7b78c72fb4f96fc37e189b00e90635 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=31d0664ebd7b78c72fb4f96fc…
Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 5 12:23:22 2010 +0100 msi: Update the UI in the AllocateRegistrySpace action. --- dlls/msi/action.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9b44de0..a39ddad 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -7035,8 +7035,16 @@ static UINT ACTION_AllocateRegistrySpace( MSIPACKAGE *package ) { static const WCHAR szAvailableFreeReg[] = {'A','V','A','I','L','A','B','L','E','F','R','E','E','R','E','G',0}; + MSIRECORD *uirow; + int space = msi_get_property_int( package, szAvailableFreeReg, 0 ); + + TRACE("%p %d kilobytes\n", package, space); + + uirow = MSI_CreateRecord( 1 ); + MSI_RecordSetInteger( uirow, 1, space ); + ui_actiondata( package, szAllocateRegistrySpace, uirow ); + msiobj_release( &uirow->hdr ); - TRACE("%p %d kilobytes\n", package, msi_get_property_int( package, szAvailableFreeReg, 0 )); return ERROR_SUCCESS; }
1
0
0
0
← Newer
1
...
72
73
74
75
76
77
78
...
92
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
82
83
84
85
86
87
88
89
90
91
92
Results per page:
10
25
50
100
200