Mike McCormack : msi: Move msi_get_property_int() to helpers.c

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jul 17 08:14:46 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 2ec80faabe929fe75e1f38952ad16e604652ea36
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=2ec80faabe929fe75e1f38952ad16e604652ea36

Author: Mike McCormack <mike at codeweavers.com>
Date:   Sat Jul 15 13:55:44 2006 +0900

msi: Move msi_get_property_int() to helpers.c

---

 dlls/msi/action.c  |    8 --------
 dlls/msi/action.h  |    1 +
 dlls/msi/helpers.c |    8 ++++++++
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 51a5872..6723f9f 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -292,14 +292,6 @@ static void ui_actioninfo(MSIPACKAGE *pa
     msiobj_release(&row->hdr);
 }
 
-static int msi_get_property_int( MSIPACKAGE *package, LPCWSTR prop, int def )
-{
-    LPWSTR str = msi_dup_property( package, prop );
-    int val = str ? atoiW( str ) : def;
-    msi_free( str );
-    return val;
-}
-
 static UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine )
 {
     LPCWSTR ptr,ptr2;
diff --git a/dlls/msi/action.h b/dlls/msi/action.h
index 31ac28e..8edfbb0 100644
--- a/dlls/msi/action.h
+++ b/dlls/msi/action.h
@@ -257,6 +257,7 @@ extern UINT ACTION_RegisterMIMEInfo(MSIP
 extern DWORD deformat_string(MSIPACKAGE *package, LPCWSTR ptr, WCHAR** data );
 extern LPWSTR msi_dup_record_field(MSIRECORD *row, INT index);
 extern LPWSTR msi_dup_property(MSIPACKAGE *package, LPCWSTR prop);
+extern int msi_get_property_int( MSIPACKAGE *package, LPCWSTR prop, int def );
 extern LPWSTR resolve_folder(MSIPACKAGE *package, LPCWSTR name, BOOL source, 
                       BOOL set_prop, MSIFOLDER **folder);
 extern MSICOMPONENT *get_loaded_component( MSIPACKAGE* package, LPCWSTR Component );
diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c
index c40a851..51184d5 100644
--- a/dlls/msi/helpers.c
+++ b/dlls/msi/helpers.c
@@ -92,6 +92,14 @@ LPWSTR msi_dup_property(MSIPACKAGE *pack
     return str;
 }
 
+int msi_get_property_int( MSIPACKAGE *package, LPCWSTR prop, int def )
+{
+    LPWSTR str = msi_dup_property( package, prop );
+    int val = str ? atoiW( str ) : def;
+    msi_free( str );
+    return val;
+}
+
 MSICOMPONENT* get_loaded_component( MSIPACKAGE* package, LPCWSTR Component )
 {
     MSICOMPONENT *comp;




More information about the wine-cvs mailing list