Hans Leidekker : msi: Remove redundant function msi_find_file.
Alexandre Julliard
julliard at winehq.org
Thu Nov 11 12:05:48 CST 2010
Module: wine
Branch: master
Commit: 8fd47bbef754089ae12c4d803948dc00271b1944
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fd47bbef754089ae12c4d803948dc00271b1944
Author: Hans Leidekker <hans at codeweavers.com>
Date: Thu Nov 11 10:44:52 2010 +0100
msi: Remove redundant function msi_find_file.
---
dlls/msi/action.c | 23 +++++------------------
1 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 2b41b25..06bbc45 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -5896,19 +5896,6 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package )
return rc;
}
-static MSIFILE *msi_find_file( MSIPACKAGE *package, LPCWSTR filename )
-{
- MSIFILE *file;
-
- LIST_FOR_EACH_ENTRY(file, &package->files, MSIFILE, entry)
- {
- if (!strcmpW( file->File, filename ))
- return file;
- }
-
- return NULL;
-}
-
static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param )
{
MSIPACKAGE *package = param;
@@ -5930,10 +5917,10 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param )
desc = MSI_RecordGetString(rec, 3);
file_key = MSI_RecordGetString( rec, 4 );
- if (file_key) driver_file = msi_find_file( package, file_key );
+ if (file_key) driver_file = get_loaded_file( package, file_key );
file_key = MSI_RecordGetString( rec, 5 );
- if (file_key) setup_file = msi_find_file( package, file_key );
+ if (file_key) setup_file = get_loaded_file( package, file_key );
if (!driver_file)
{
@@ -6010,10 +5997,10 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param )
desc = MSI_RecordGetString(rec, 3);
file_key = MSI_RecordGetString( rec, 4 );
- if (file_key) translator_file = msi_find_file( package, file_key );
+ if (file_key) translator_file = get_loaded_file( package, file_key );
file_key = MSI_RecordGetString( rec, 5 );
- if (file_key) setup_file = msi_find_file( package, file_key );
+ if (file_key) setup_file = get_loaded_file( package, file_key );
if (!translator_file)
{
@@ -6980,7 +6967,7 @@ static UINT load_assembly(MSIRECORD *rec, LPVOID param)
assembly->component->Action = assembly->component->ActionRequest;
assembly->feature = find_feature_by_name(list->package, MSI_RecordGetString(rec, 2));
- assembly->file = msi_find_file(list->package, assembly->component->KeyPath);
+ assembly->file = get_loaded_file(list->package, assembly->component->KeyPath);
if (!assembly->file)
{
More information about the wine-cvs
mailing list