Module: wine Branch: master Commit: ec5ae81c8d1bc6c7440d5206efe6b903e9519e60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5ae81c8d1bc6c7440d5206ef...
Author: Hans Leidekker hans@codeweavers.com Date: Mon Feb 22 12:24:45 2010 +0100
msi: Make msi_reset_folders static.
---
dlls/msi/helpers.c | 19 ------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 19 +++++++++++++++++++ 3 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index e763a11..2c472dd 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -156,25 +156,6 @@ MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ) return NULL; }
-void msi_reset_folders( MSIPACKAGE *package, BOOL source ) -{ - MSIFOLDER *folder; - - LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) - { - if ( source ) - { - msi_free( folder->ResolvedSource ); - folder->ResolvedSource = NULL; - } - else - { - msi_free( folder->ResolvedTarget ); - folder->ResolvedTarget = NULL; - } - } -} - static LPWSTR get_source_root( MSIPACKAGE *package ) { LPWSTR path, p; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2278ff7..e18f02d 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -975,7 +975,6 @@ extern MSICOMPONENT *get_loaded_component( MSIPACKAGE* package, LPCWSTR Componen extern MSIFEATURE *get_loaded_feature( MSIPACKAGE* package, LPCWSTR Feature ); extern MSIFILE *get_loaded_file( MSIPACKAGE* package, LPCWSTR file ); extern MSIFOLDER *get_loaded_folder( MSIPACKAGE *package, LPCWSTR dir ); -extern void msi_reset_folders( MSIPACKAGE *package, BOOL source ); extern int track_tempfile(MSIPACKAGE *package, LPCWSTR path); extern UINT schedule_action(MSIPACKAGE *package, UINT script, LPCWSTR action); extern void msi_free_action_script(MSIPACKAGE *package, UINT script); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index ad6d4c6..b1741ae 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1621,6 +1621,25 @@ end: return r; }
+static void msi_reset_folders( MSIPACKAGE *package, BOOL source ) +{ + MSIFOLDER *folder; + + LIST_FOR_EACH_ENTRY( folder, &package->folders, MSIFOLDER, entry ) + { + if ( source ) + { + msi_free( folder->ResolvedSource ); + folder->ResolvedSource = NULL; + } + else + { + msi_free( folder->ResolvedTarget ); + folder->ResolvedTarget = NULL; + } + } +} + UINT MSI_SetPropertyW( MSIPACKAGE *package, LPCWSTR szName, LPCWSTR szValue) { MSIQUERY *view;