Module: wine Branch: master Commit: 563a50ab357049b15a84951397699f783e907711 URL: http://source.winehq.org/git/wine.git/?a=commit;h=563a50ab357049b15a84951397...
Author: James Hawkins truiken@gmail.com Date: Mon Oct 9 00:05:04 2006 -0700
msi: Make internal functions static.
---
dlls/msi/action.c | 2 +- dlls/msi/action.h | 1 + dlls/msi/custom.c | 2 +- dlls/msi/files.c | 2 -- dlls/msi/helpers.c | 2 +- dlls/msi/install.c | 4 ++-- dlls/msi/msi.c | 12 ++++++------ dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 -- dlls/msi/registry.c | 2 +- dlls/msi/select.c | 2 +- 11 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c index be92b6f..b7e55ed 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3850,7 +3850,7 @@ static UINT ACTION_ForceReboot(MSIPACKAG return ERROR_INSTALL_SUSPEND; }
-UINT ACTION_ResolveSource(MSIPACKAGE* package) +static UINT ACTION_ResolveSource(MSIPACKAGE* package) { DWORD attrib; UINT rc; diff --git a/dlls/msi/action.h b/dlls/msi/action.h index d58bc52..9dc19ac 100644 --- a/dlls/msi/action.h +++ b/dlls/msi/action.h @@ -289,6 +289,7 @@ extern UINT register_unique_action(MSIPA extern BOOL check_unique_action(MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); +extern void msi_ui_error( DWORD msg_id, DWORD type );
/* control event stuff */ diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index b93e68e..dfebfce 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -120,7 +120,7 @@ static BOOL check_execution_scheduling_o /* stores the CustomActionData before the action: * [CustomActionData]Action */ -LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) +static LPWSTR msi_get_deferred_action(LPCWSTR action, LPWSTR actiondata) { LPWSTR deferred; DWORD len; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 5f9f4d8..4e33da7 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -58,8 +58,6 @@ extern const WCHAR szRemoveFiles[];
static const WCHAR cszTempFolder[]= {'T','e','m','p','F','o','l','d','e','r',0};
-extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename ); - /* * This is a helper function for handling embedded cabinet media */ diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 868d737..5ba6b8a 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -426,7 +426,7 @@ static void free_feature( MSIFEATURE *fe msi_free( feature ); }
-void free_extension( MSIEXTENSION *ext ) +static void free_extension( MSIEXTENSION *ext ) { struct list *item, *cursor;
diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 39db1f6..66b6f3c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -150,8 +150,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str /*********************************************************************** * MsiGetTargetPath (internal) */ -UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, - awstring *szPathBuf, DWORD* pcchPathBuf ) +static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, + awstring *szPathBuf, DWORD* pcchPathBuf ) { MSIPACKAGE *package; LPWSTR path; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 662f9ea..79615ff 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -431,8 +431,8 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR s return ERROR_SUCCESS; }
-UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, - awstring *szValue, DWORD *pcchValueBuf) +static UINT WINAPI MSI_GetProductInfo(LPCWSTR szProduct, LPCWSTR szAttribute, + awstring *szValue, DWORD *pcchValueBuf) { UINT r; HKEY hkey; @@ -960,8 +960,8 @@ UINT WINAPI MsiVerifyPackageW( LPCWSTR s return r; }
-INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, - awstring* lpPathBuf, DWORD* pcchBuf) +static INSTALLSTATE WINAPI MSI_GetComponentPath(LPCWSTR szProduct, LPCWSTR szComponent, + awstring* lpPathBuf, DWORD* pcchBuf) { WCHAR squished_pc[GUID_SIZE], squished_comp[GUID_SIZE]; UINT rc; @@ -1409,7 +1409,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCS /*********************************************************************** * MSI_ProvideQualifiedComponentEx [internal] */ -UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, +static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, DWORD* pcchPathBuf) @@ -1534,7 +1534,7 @@ UINT WINAPI MsiProvideQualifiedComponent /*********************************************************************** * MSI_GetUserInfo [internal] */ -USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, +static USERINFOSTATE WINAPI MSI_GetUserInfo(LPCWSTR szProduct, awstring *lpUserNameBuf, DWORD* pcchUserNameBuf, awstring *lpOrgNameBuf, DWORD* pcchOrgNameBuf, awstring *lpSerialBuf, DWORD* pcchSerialBuf) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 8b9eabb..8ea81e5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -416,6 +416,7 @@ extern MSICONDITION MSI_EvaluateConditio extern UINT MSI_GetComponentStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT MSI_GetFeatureStateW( MSIPACKAGE *, LPCWSTR, INSTALLSTATE *, INSTALLSTATE * ); extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE ); +extern LPCWSTR msi_download_file( LPCWSTR szUrl, LPWSTR filename );
/* for deformating */ extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b9f4bb5..5959128 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -47,8 +47,6 @@ #include "action.h"
WINE_DEFAULT_DEBUG_CHANNEL(msi);
-extern void msi_ui_error( DWORD msg_id, DWORD type ); - static void msi_free_properties( MSIPACKAGE *package );
static void MSI_FreePackage( MSIOBJECTHDR *arg) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index b246f5f..5ad5059 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -855,7 +855,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szCo return r; }
-UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, +static UINT WINAPI MSI_EnumComponentQualifiers( LPCWSTR szComponent, DWORD iIndex, awstring *lpQualBuf, DWORD* pcchQual, awstring *lpAppBuf, DWORD* pcchAppBuf ) { diff --git a/dlls/msi/select.c b/dlls/msi/select.c index d47792b..c961130 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -285,7 +285,7 @@ static UINT SELECT_AddColumn( MSISELECTV return ERROR_SUCCESS; }
-int select_count_columns( column_info *col ) +static int select_count_columns( column_info *col ) { int n; for (n = 0; col; col = col->next)