get rid of handles

1 files changed, 55 insertions, 55 deletions

diff --git a/include/libmsi.h b/include/libmsi.h
index aca7649..6cd8480 100644
--- a/include/libmsi.h
+++ b/include/libmsi.h
@@ -19,7 +19,8 @@
 #ifndef _LIBMSI_H
 #define _LIBMSI_H
 
-typedef unsigned __LONG32 MSIHANDLE;
+struct tagMSIOBJECT;
+typedef struct tagMSIOBJECT MSIOBJECT, *PMSIOBJECT;
 
 typedef enum tagMSICONDITION
 {
@@ -147,98 +148,97 @@ extern "C" {
 
 
 /* view manipulation */
-UINT WINAPI MsiViewFetch(MSIHANDLE,MSIHANDLE*);
-UINT WINAPI MsiViewExecute(MSIHANDLE,MSIHANDLE);
-UINT WINAPI MsiViewClose(MSIHANDLE);
-UINT WINAPI MsiDatabaseOpenViewA(MSIHANDLE,LPCSTR,MSIHANDLE*);
-UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
+UINT WINAPI MsiViewFetch(PMSIOBJECT,PMSIOBJECT*);
+UINT WINAPI MsiViewExecute(PMSIOBJECT,PMSIOBJECT);
+UINT WINAPI MsiViewClose(PMSIOBJECT);
+UINT WINAPI MsiDatabaseOpenViewA(PMSIOBJECT,LPCSTR,PMSIOBJECT*);
+UINT WINAPI MsiDatabaseOpenViewW(PMSIOBJECT,LPCWSTR,PMSIOBJECT*);
 #define     MsiDatabaseOpenView WINELIB_NAME_AW(MsiDatabaseOpenView)
-MSIDBERROR WINAPI MsiViewGetErrorA(MSIHANDLE,LPSTR,LPDWORD);
-MSIDBERROR WINAPI MsiViewGetErrorW(MSIHANDLE,LPWSTR,LPDWORD);
+MSIDBERROR WINAPI MsiViewGetErrorA(PMSIOBJECT,LPSTR,LPDWORD);
+MSIDBERROR WINAPI MsiViewGetErrorW(PMSIOBJECT,LPWSTR,LPDWORD);
 #define     MsiViewGetError WINELIB_NAME_AW(MsiViewGetError)
 
-MSIDBSTATE WINAPI MsiGetDatabaseState(MSIHANDLE);
+MSIDBSTATE WINAPI MsiGetDatabaseState(PMSIOBJECT);
 
 /* record manipulation */
-MSIHANDLE WINAPI MsiCreateRecord(UINT);
-UINT WINAPI MsiRecordClearData(MSIHANDLE);
-UINT WINAPI MsiRecordSetInteger(MSIHANDLE,UINT,int);
-UINT WINAPI MsiRecordSetStringA(MSIHANDLE,UINT,LPCSTR);
-UINT WINAPI MsiRecordSetStringW(MSIHANDLE,UINT,LPCWSTR);
+PMSIOBJECT WINAPI MsiCreateRecord(UINT);
+UINT WINAPI MsiRecordClearData(PMSIOBJECT);
+UINT WINAPI MsiRecordSetInteger(PMSIOBJECT,UINT,int);
+UINT WINAPI MsiRecordSetStringA(PMSIOBJECT,UINT,LPCSTR);
+UINT WINAPI MsiRecordSetStringW(PMSIOBJECT,UINT,LPCWSTR);
 #define     MsiRecordSetString WINELIB_NAME_AW(MsiRecordSetString)
-UINT WINAPI MsiRecordGetStringA(MSIHANDLE,UINT,LPSTR,LPDWORD);
-UINT WINAPI MsiRecordGetStringW(MSIHANDLE,UINT,LPWSTR,LPDWORD);
+UINT WINAPI MsiRecordGetStringA(PMSIOBJECT,UINT,LPSTR,LPDWORD);
+UINT WINAPI MsiRecordGetStringW(PMSIOBJECT,UINT,LPWSTR,LPDWORD);
 #define     MsiRecordGetString WINELIB_NAME_AW(MsiRecordGetString)
-UINT WINAPI MsiRecordGetFieldCount(MSIHANDLE);
-int WINAPI MsiRecordGetInteger(MSIHANDLE,UINT);
-UINT WINAPI MsiRecordDataSize(MSIHANDLE,UINT);
-BOOL WINAPI MsiRecordIsNull(MSIHANDLE,UINT);
-UINT WINAPI MsiFormatRecordA(MSIHANDLE,MSIHANDLE,LPSTR,LPDWORD);
-UINT WINAPI MsiFormatRecordW(MSIHANDLE,MSIHANDLE,LPWSTR,LPDWORD);
+UINT WINAPI MsiRecordGetFieldCount(PMSIOBJECT);
+int WINAPI MsiRecordGetInteger(PMSIOBJECT,UINT);
+UINT WINAPI MsiRecordDataSize(PMSIOBJECT,UINT);
+BOOL WINAPI MsiRecordIsNull(PMSIOBJECT,UINT);
+UINT WINAPI MsiFormatRecordA(PMSIOBJECT,PMSIOBJECT,LPSTR,LPDWORD);
+UINT WINAPI MsiFormatRecordW(PMSIOBJECT,PMSIOBJECT,LPWSTR,LPDWORD);
 #define     MsiFormatRecord WINELIB_NAME_AW(MsiFormatRecord)
-UINT WINAPI MsiRecordSetStreamA(MSIHANDLE,UINT,LPCSTR);
-UINT WINAPI MsiRecordSetStreamW(MSIHANDLE,UINT,LPCWSTR);
+UINT WINAPI MsiRecordSetStreamA(PMSIOBJECT,UINT,LPCSTR);
+UINT WINAPI MsiRecordSetStreamW(PMSIOBJECT,UINT,LPCWSTR);
 #define     MsiRecordSetStream WINELIB_NAME_AW(MsiRecordSetStream)
-UINT WINAPI MsiRecordReadStream(MSIHANDLE,UINT,char*,LPDWORD);
+UINT WINAPI MsiRecordReadStream(PMSIOBJECT,UINT,char*,LPDWORD);
 
-UINT WINAPI MsiDatabaseGetPrimaryKeysA(MSIHANDLE,LPCSTR,MSIHANDLE*);
-UINT WINAPI MsiDatabaseGetPrimaryKeysW(MSIHANDLE,LPCWSTR,MSIHANDLE*);
+UINT WINAPI MsiDatabaseGetPrimaryKeysA(PMSIOBJECT,LPCSTR,PMSIOBJECT*);
+UINT WINAPI MsiDatabaseGetPrimaryKeysW(PMSIOBJECT,LPCWSTR,PMSIOBJECT*);
 #define     MsiDatabaseGetPrimaryKeys WINELIB_NAME_AW(MsiDatabaseGetPrimaryKeys)
 
 /* database transforms */
-UINT WINAPI MsiDatabaseApplyTransformA(MSIHANDLE,LPCSTR,int);
-UINT WINAPI MsiDatabaseApplyTransformW(MSIHANDLE,LPCWSTR,int);
+UINT WINAPI MsiDatabaseApplyTransformA(PMSIOBJECT,LPCSTR,int);
+UINT WINAPI MsiDatabaseApplyTransformW(PMSIOBJECT,LPCWSTR,int);
 #define     MsiDatabaseApplyTransform WINELIB_NAME_AW(MsiDatabaseApplyTransform)
 
-UINT WINAPI MsiViewGetColumnInfo(MSIHANDLE, MSICOLINFO, MSIHANDLE*);
+UINT WINAPI MsiViewGetColumnInfo(PMSIOBJECT, MSICOLINFO, PMSIOBJECT*);
 
-UINT WINAPI MsiCreateTransformSummaryInfoA(MSIHANDLE, MSIHANDLE, LPCSTR, int, int);
-UINT WINAPI MsiCreateTransformSummaryInfoW(MSIHANDLE, MSIHANDLE, LPCWSTR, int, int);
+UINT WINAPI MsiCreateTransformSummaryInfoA(PMSIOBJECT, PMSIOBJECT, LPCSTR, int, int);
+UINT WINAPI MsiCreateTransformSummaryInfoW(PMSIOBJECT, PMSIOBJECT, LPCWSTR, int, int);
 #define     MsiCreateTransformSummaryInfo WINELIB_NAME_AW(MsiCreateTransformSummaryInfo)
 
-UINT WINAPI MsiGetSummaryInformationA(MSIHANDLE, LPCSTR, UINT, MSIHANDLE *);
-UINT WINAPI MsiGetSummaryInformationW(MSIHANDLE, LPCWSTR, UINT, MSIHANDLE *);
+UINT WINAPI MsiGetSummaryInformationA(PMSIOBJECT, LPCSTR, UINT, PMSIOBJECT *);
+UINT WINAPI MsiGetSummaryInformationW(PMSIOBJECT, LPCWSTR, UINT, PMSIOBJECT *);
 #define     MsiGetSummaryInformation WINELIB_NAME_AW(MsiGetSummaryInformation)
 
-UINT WINAPI MsiSummaryInfoGetPropertyA(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPSTR,LPDWORD);
-UINT WINAPI MsiSummaryInfoGetPropertyW(MSIHANDLE,UINT,PUINT,LPINT,FILETIME*,LPWSTR,LPDWORD);
+UINT WINAPI MsiSummaryInfoGetPropertyA(PMSIOBJECT,UINT,PUINT,LPINT,FILETIME*,LPSTR,LPDWORD);
+UINT WINAPI MsiSummaryInfoGetPropertyW(PMSIOBJECT,UINT,PUINT,LPINT,FILETIME*,LPWSTR,LPDWORD);
 #define     MsiSummaryInfoGetProperty WINELIB_NAME_AW(MsiSummaryInfoGetProperty)
 
-UINT WINAPI MsiSummaryInfoSetPropertyA(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCSTR);
-UINT WINAPI MsiSummaryInfoSetPropertyW(MSIHANDLE, UINT, UINT, INT, FILETIME*, LPCWSTR);
+UINT WINAPI MsiSummaryInfoSetPropertyA(PMSIOBJECT, UINT, UINT, INT, FILETIME*, LPCSTR);
+UINT WINAPI MsiSummaryInfoSetPropertyW(PMSIOBJECT, 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);
+UINT WINAPI MsiDatabaseExportA(PMSIOBJECT, LPCSTR, LPCSTR, LPCSTR);
+UINT WINAPI MsiDatabaseExportW(PMSIOBJECT, LPCWSTR, LPCWSTR, LPCWSTR);
 #define     MsiDatabaseExport WINELIB_NAME_AW(MsiDatabaseExport)
 
-UINT WINAPI MsiDatabaseImportA(MSIHANDLE, LPCSTR, LPCSTR);
-UINT WINAPI MsiDatabaseImportW(MSIHANDLE, LPCWSTR, LPCWSTR);
+UINT WINAPI MsiDatabaseImportA(PMSIOBJECT, LPCSTR, LPCSTR);
+UINT WINAPI MsiDatabaseImportW(PMSIOBJECT, LPCWSTR, LPCWSTR);
 #define     MsiDatabaseImport WINELIB_NAME_AW(MsiDatabaseImport)
 
-UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, MSIHANDLE*);
-UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, MSIHANDLE*);
+UINT WINAPI MsiOpenDatabaseW(LPCWSTR, LPCWSTR, PMSIOBJECT*);
+UINT WINAPI MsiOpenDatabaseA(LPCSTR, LPCSTR, PMSIOBJECT*);
 #define     MsiOpenDatabase WINELIB_NAME_AW(MsiOpenDatabase)
 
-MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(MSIHANDLE, LPCSTR);
-MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(MSIHANDLE, LPCWSTR);
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentA(PMSIOBJECT, LPCSTR);
+MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(PMSIOBJECT, LPCWSTR);
 #define     MsiDatabaseIsTablePersistent WINELIB_NAME_AW(MsiDatabaseIsTablePersistent)
 
-UINT WINAPI MsiSummaryInfoPersist(MSIHANDLE);
-UINT WINAPI MsiSummaryInfoGetPropertyCount(MSIHANDLE,PUINT);
+UINT WINAPI MsiSummaryInfoPersist(PMSIOBJECT);
+UINT WINAPI MsiSummaryInfoGetPropertyCount(PMSIOBJECT,PUINT);
 
-UINT WINAPI MsiViewModify(MSIHANDLE, MSIMODIFY, MSIHANDLE);
+UINT WINAPI MsiViewModify(PMSIOBJECT, MSIMODIFY, PMSIOBJECT);
 
-UINT WINAPI MsiDatabaseMergeA(MSIHANDLE, MSIHANDLE, LPCSTR);
-UINT WINAPI MsiDatabaseMergeW(MSIHANDLE, MSIHANDLE, LPCWSTR);
+UINT WINAPI MsiDatabaseMergeA(PMSIOBJECT, PMSIOBJECT, LPCSTR);
+UINT WINAPI MsiDatabaseMergeW(PMSIOBJECT, PMSIOBJECT, LPCWSTR);
 #define     MsiDatabaseMerge WINELIB_NAME_AW(MsiDatabaseMerge)
 
 /* Non Unicode */
-UINT WINAPI MsiDatabaseCommit(MSIHANDLE);
-UINT WINAPI MsiCloseHandle(MSIHANDLE);
-UINT WINAPI MsiCloseAllHandles(void);
+UINT WINAPI MsiDatabaseCommit(PMSIOBJECT);
+UINT WINAPI MsiCloseHandle(PMSIOBJECT);
 
-MSIHANDLE WINAPI MsiGetLastErrorRecord(void);
+PMSIOBJECT WINAPI MsiGetLastErrorRecord(void);
 
 #ifdef __cplusplus
 }