mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 17:33:37 +00:00
Add and correct some function declarations.
This commit is contained in:
parent
2b7438224f
commit
cac6387ca3
|
@ -817,7 +817,7 @@ INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR szComponent, LPSTR lpPathBuf,
|
|||
return INSTALLSTATE_UNKNOWN;
|
||||
}
|
||||
|
||||
INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPSTR lpPathBuf,
|
||||
INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR szComponent, LPWSTR lpPathBuf,
|
||||
DWORD *pcchBuf)
|
||||
{
|
||||
FIXME("%s %p %08lx\n", debugstr_w(szComponent), lpPathBuf, *pcchBuf);
|
||||
|
|
|
@ -89,6 +89,14 @@ typedef struct {
|
|||
} str;
|
||||
} awstring;
|
||||
|
||||
typedef struct {
|
||||
BOOL unicode;
|
||||
union {
|
||||
LPCSTR a;
|
||||
LPCWSTR w;
|
||||
} str;
|
||||
} awcstring;
|
||||
|
||||
typedef struct tagMSISUMMARYINFO
|
||||
{
|
||||
MSIOBJECTHDR hdr;
|
||||
|
@ -625,7 +633,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyW(
|
|||
}
|
||||
|
||||
static UINT set_prop( MSIHANDLE handle, UINT uiProperty, UINT uiDataType,
|
||||
INT iValue, FILETIME* pftValue, awstring *str )
|
||||
INT iValue, FILETIME* pftValue, awcstring *str )
|
||||
{
|
||||
MSISUMMARYINFO *si;
|
||||
PROPVARIANT *prop;
|
||||
|
@ -699,9 +707,9 @@ end:
|
|||
}
|
||||
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty,
|
||||
UINT uiDataType, INT iValue, FILETIME* pftValue, LPWSTR szValue )
|
||||
UINT uiDataType, INT iValue, FILETIME* pftValue, LPCWSTR szValue )
|
||||
{
|
||||
awstring str;
|
||||
awcstring str;
|
||||
|
||||
TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType,
|
||||
iValue, pftValue, debugstr_w(szValue) );
|
||||
|
@ -712,9 +720,9 @@ UINT WINAPI MsiSummaryInfoSetPropertyW( MSIHANDLE handle, UINT uiProperty,
|
|||
}
|
||||
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyA( MSIHANDLE handle, UINT uiProperty,
|
||||
UINT uiDataType, INT iValue, FILETIME* pftValue, LPSTR szValue )
|
||||
UINT uiDataType, INT iValue, FILETIME* pftValue, LPCSTR szValue )
|
||||
{
|
||||
awstring str;
|
||||
awcstring str;
|
||||
|
||||
TRACE("%ld %u %u %i %p %s\n", handle, uiProperty, uiDataType,
|
||||
iValue, pftValue, debugstr_a(szValue) );
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#ifndef _MSI_NO_CRYPTO
|
||||
#include "wincrypt.h"
|
||||
#endif
|
||||
|
||||
typedef unsigned long MSIHANDLE;
|
||||
|
||||
typedef enum tagINSTALLSTATE
|
||||
|
@ -289,10 +293,34 @@ USERINFOSTATE WINAPI MsiGetUserInfoA(LPCSTR, LPSTR, DWORD*, LPSTR, DWORD*, LPSTR
|
|||
USERINFOSTATE WINAPI MsiGetUserInfoW(LPCWSTR, LPWSTR, DWORD*, LPWSTR, DWORD*, LPWSTR, DWORD*);
|
||||
#define MsiGetUserInfo WINELIB_NAME_AW(MsiGetUserInfo)
|
||||
|
||||
UINT WINAPI MsiCollectUserInfoA( LPCSTR );
|
||||
UINT WINAPI MsiCollectUserInfoW( LPCWSTR );
|
||||
UINT WINAPI MsiCollectUserInfoA(LPCSTR);
|
||||
UINT WINAPI MsiCollectUserInfoW(LPCWSTR);
|
||||
#define MsiCollectUserInfo WINELIB_NAME_AW(MsiCollectUserInfo)
|
||||
|
||||
UINT WINAPI MsiReinstallFeatureA(LPCSTR, LPCSTR, DWORD);
|
||||
UINT WINAPI MsiReinstallFeatureW(LPCWSTR, LPCWSTR, DWORD);
|
||||
#define MsiReinstallFeature WINELIB_NAME_AW(MsiReinstallFeature)
|
||||
|
||||
UINT WINAPI MsiGetShortcutTargetA(LPCSTR, LPSTR, LPSTR, LPSTR);
|
||||
UINT WINAPI MsiGetShortcutTargetW(LPCWSTR, LPWSTR, LPWSTR, LPWSTR);
|
||||
#define MsiGetShortcutTarget WINELIB_NAME_AW(MsiGetShortcutTarget)
|
||||
|
||||
INSTALLSTATE WINAPI MsiUseFeatureW(LPCWSTR, LPCWSTR);
|
||||
INSTALLSTATE WINAPI MsiUseFeatureA(LPCSTR, LPCSTR);
|
||||
#define MsiUseFeature WINELIB_NAME_AW(MsiUseFeature)
|
||||
|
||||
INSTALLSTATE WINAPI MsiUseFeatureExW(LPCWSTR, LPCWSTR, DWORD, DWORD);
|
||||
INSTALLSTATE WINAPI MsiUseFeatureExA(LPCSTR, LPCSTR, DWORD, DWORD);
|
||||
#define MsiUseFeatureEx WINELIB_NAME_AW(MsiUseFeatureEx)
|
||||
|
||||
HRESULT WINAPI MsiGetFileSignatureInformationA(LPCSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*);
|
||||
HRESULT WINAPI MsiGetFileSignatureInformationW(LPCWSTR, DWORD, PCCERT_CONTEXT*, BYTE*, DWORD*);
|
||||
#define MsiGetFileSignatureInformation WINELIB_NAME_AW(MsiGetFileSignatureInformation)
|
||||
|
||||
INSTALLSTATE WINAPI MsiLocateComponentA(LPCSTR, LPSTR, DWORD *);
|
||||
INSTALLSTATE WINAPI MsiLocateComponentW(LPCWSTR, LPWSTR, DWORD *);
|
||||
#define MsiLocateComponent WINELIB_NAME_AW(MsiLocateComponent)
|
||||
|
||||
/* Non Unicode */
|
||||
UINT WINAPI MsiCloseHandle(MSIHANDLE);
|
||||
UINT WINAPI MsiCloseAllHandles(void);
|
||||
|
|
|
@ -189,14 +189,32 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPSTR
|
|||
UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,UINT*,INT*,FILETIME*,LPWSTR,DWORD*);
|
||||
#define MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty)
|
||||
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPSTR);
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyW(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPWSTR);
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCSTR);
|
||||
UINT WINAPI MsiSummaryInfoSetPropertyW(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCWSTR);
|
||||
#define MsiSummaryInfoSetProperty WINELIB_NAME_AW(MsiSummaryInfoSetProperty)
|
||||
|
||||
UINT WINAPI MsiDatabaseExportA(MSIHANDLE, LPCSTR, LPCSTR, LPCSTR);
|
||||
UINT WINAPI MsiDatabaseExportW(MSIHANDLE, LPCWSTR, LPCWSTR, LPCWSTR);
|
||||
#define MsiDatabaseExport WINELIB_NAME_AW(MsiDatabaseExport)
|
||||
|
||||
UINT WINAPI MsiDatabaseImportA(MSIHANDLE, LPCSTR, LPCSTR);
|
||||
UINT WINAPI MsiDatabaseImportW(MSIHANDLE, LPCWSTR, LPCWSTR);
|
||||
#define MsiDatabaseImport WINELIB_NAME_AW(MsiDatabaseImport)
|
||||
|
||||
UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, MSIHANDLE*);
|
||||
UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*);
|
||||
#define MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase)
|
||||
|
||||
UINT WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPSTR);
|
||||
UINT WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPWSTR);
|
||||
#define MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
|
||||
|
||||
UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE);
|
||||
UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,UINT*);
|
||||
|
||||
UINT WINAPI MsiEnableUIPreview(MSIHANDLE, MSIHANDLE*);
|
||||
BOOL WINAPI MsiGetMode(MSIHANDLE, MSIRUNMODE);
|
||||
|
||||
UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);
|
||||
|
||||
#endif /* __WINE_MSIQUERY_H */
|
||||
|
|
Loading…
Reference in a new issue