MSI: fixes for -Wmissing-declarations and -Wwrite-strings warnings
Mike McCormack
mike at codeweavers.com
Mon Jun 6 20:27:31 CDT 2005
ChangeLog:
* fixes for -Wmissing-declarations and -Wwrite-strings warnings
-------------- next part --------------
Index: dlls/msi/action.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/action.c,v
retrieving revision 1.135
diff -u -p -r1.135 action.c
--- dlls/msi/action.c 6 Jun 2005 15:39:59 -0000 1.135
+++ dlls/msi/action.c 7 Jun 2005 01:28:48 -0000
@@ -1400,7 +1400,7 @@ static BOOL ACTION_HandleStandardAction(
return ret;
}
-BOOL ACTION_HandleDialogBox(MSIPACKAGE *package, LPCWSTR dialog, UINT* rc)
+static BOOL ACTION_HandleDialogBox( MSIPACKAGE *package, LPCWSTR dialog, UINT* rc )
{
BOOL ret = FALSE;
@@ -1412,8 +1412,8 @@ BOOL ACTION_HandleDialogBox(MSIPACKAGE *
return ret;
}
-BOOL ACTION_HandleCustomAction(MSIPACKAGE* package, LPCWSTR action, UINT* rc,
- BOOL force )
+static BOOL ACTION_HandleCustomAction( MSIPACKAGE* package, LPCWSTR action,
+ UINT* rc, BOOL force )
{
BOOL ret=FALSE;
UINT arc;
@@ -1993,7 +1993,7 @@ UINT schedule_action(MSIPACKAGE *package
return ERROR_SUCCESS;
}
-UINT execute_script(MSIPACKAGE *package, UINT script )
+static UINT execute_script(MSIPACKAGE *package, UINT script )
{
int i;
UINT rc = ERROR_SUCCESS;
@@ -2259,7 +2259,7 @@ LPWSTR resolve_folder(MSIPACKAGE *packag
}
/* scan for and update current install states */
-void ACTION_UpdateInstallStates(MSIPACKAGE *package)
+static void ACTION_UpdateInstallStates(MSIPACKAGE *package)
{
int i;
LPWSTR productcode;
@@ -4243,7 +4243,7 @@ typedef struct {
ITypeLib *ptLib;
} typelib_struct;
-BOOL CALLBACK Typelib_EnumResNameProc( HMODULE hModule, LPCWSTR lpszType,
+static BOOL CALLBACK Typelib_EnumResNameProc( HMODULE hModule, LPCWSTR lpszType,
LPWSTR lpszName, LONG_PTR lParam)
{
TLIBATTR *attr;
@@ -7206,7 +7206,7 @@ static LPWSTR load_ttfname_from(LPCWSTR
{
int nPos;
LPSTR buf;
- static const LPSTR tt = " (TrueType)";
+ static LPCSTR tt = " (TrueType)";
ttRecord.uStringLength = SWAPWORD(ttRecord.uStringLength);
ttRecord.uStringOffset = SWAPWORD(ttRecord.uStringOffset);
Index: dlls/msi/action.h
===================================================================
RCS file: /home/wine/wine/dlls/msi/action.h,v
retrieving revision 1.14
diff -u -p -r1.14 action.h
--- dlls/msi/action.h 4 Jun 2005 09:48:47 -0000 1.14
+++ dlls/msi/action.h 7 Jun 2005 01:28:48 -0000
@@ -220,3 +220,5 @@ VOID ControlEvent_FireSubscribedEvent(MS
VOID ControlEvent_CleanupSubscriptions(MSIPACKAGE *package);
VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, LPCWSTR event,
LPCWSTR control, LPCWSTR attribute);
+VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event,
+ LPCWSTR control, LPCWSTR attribute );
Index: dlls/msi/msipriv.h
===================================================================
RCS file: /home/wine/wine/dlls/msi/msipriv.h,v
retrieving revision 1.64
diff -u -p -r1.64 msipriv.h
--- dlls/msi/msipriv.h 6 Jun 2005 15:40:15 -0000 1.64
+++ dlls/msi/msipriv.h 7 Jun 2005 01:28:48 -0000
@@ -365,8 +365,8 @@ extern UINT MSI_GetFeatureStateW( MSIPAC
extern UINT WINAPI MSI_SetFeatureStateW(MSIPACKAGE*, LPCWSTR, INSTALLSTATE );
/* for deformating */
-extern UINT MSI_FormatRecordW(MSIPACKAGE* package, MSIRECORD* record,
- LPWSTR buffer, DWORD *size);
+extern UINT MSI_FormatRecordW( MSIPACKAGE *, MSIRECORD *, LPWSTR, DWORD * );
+extern UINT MSI_FormatRecordA( MSIPACKAGE *, MSIRECORD *, LPSTR, DWORD * );
/* registry data encoding/decoding functions */
extern BOOL unsquash_guid(LPCWSTR in, LPWSTR out);
@@ -396,6 +396,22 @@ extern void msi_dialog_destroy( msi_dial
extern BOOL msi_dialog_register_class( void );
extern void msi_dialog_unregister_class( void );
extern void msi_dialog_handle_event( msi_dialog*, LPCWSTR, LPCWSTR, MSIRECORD * );
+
+/* preview */
+extern MSIPREVIEW *MSI_EnableUIPreview( MSIDATABASE * );
+extern UINT MSI_PreviewDialogW( MSIPREVIEW *, LPCWSTR );
+
+/* undocumented functions */
+UINT WINAPI MsiCreateAndVerifyInstallerDirectory( DWORD );
+UINT WINAPI MsiDecomposeDescriptorW( LPCWSTR, LPWSTR, LPWSTR, LPWSTR, DWORD * );
+UINT WINAPI MsiDecomposeDescriptorA( LPCSTR, LPSTR, LPSTR, LPSTR, DWORD * );
+LANGID WINAPI MsiLoadStringW( MSIHANDLE, UINT, LPWSTR, int, LANGID );
+LANGID WINAPI MsiLoadStringA( MSIHANDLE, UINT, LPSTR, int, LANGID );
+
+HRESULT WINAPI MSI_DllGetClassObject( REFCLSID, REFIID, LPVOID * );
+HRESULT WINAPI MSI_DllRegisterServer( void );
+HRESULT WINAPI MSI_DllUnregisterServer( void );
+BOOL WINAPI MSI_DllCanUnloadNow( void );
/* UI globals */
extern INSTALLUILEVEL gUILevel;
More information about the wine-patches
mailing list