msi: Make internal functions static.

This commit is contained in:
James Hawkins 2006-10-09 00:05:04 -07:00 committed by Alexandre Julliard
parent f721a24a13
commit 563a50ab35
11 changed files with 15 additions and 17 deletions

View File

@ -3850,7 +3850,7 @@ static UINT ACTION_ForceReboot(MSIPACKAGE *package)
return ERROR_INSTALL_SUSPEND;
}
UINT ACTION_ResolveSource(MSIPACKAGE* package)
static UINT ACTION_ResolveSource(MSIPACKAGE* package)
{
DWORD attrib;
UINT rc;

View File

@ -289,6 +289,7 @@ extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR);
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 */

View File

@ -120,7 +120,7 @@ static BOOL check_execution_scheduling_options(MSIPACKAGE *package, LPCWSTR acti
/* 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;

View File

@ -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
*/

View File

@ -426,7 +426,7 @@ static void free_feature( MSIFEATURE *feature )
msi_free( feature );
}
void free_extension( MSIEXTENSION *ext )
static void free_extension( MSIEXTENSION *ext )
{
struct list *item, *cursor;

View File

@ -150,8 +150,8 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz )
/***********************************************************************
* 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;

View File

@ -431,8 +431,8 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer)
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 szPackage )
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( LPCSTR szProduct, LPCSTR szFeature )
/***********************************************************************
* 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 MsiProvideQualifiedComponentA( LPCSTR szComponent,
/***********************************************************************
* 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)

View File

@ -416,6 +416,7 @@ extern MSICONDITION MSI_EvaluateConditionW( MSIPACKAGE *, LPCWSTR );
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 * );

View File

@ -47,8 +47,6 @@
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)

View File

@ -855,7 +855,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
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 )
{

View File

@ -285,7 +285,7 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name )
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)