make Unicode APIs private

5 files changed, 25 insertions, 11 deletions

diff --git a/libmsi/database.c b/libmsi/database.c
index d4e79a9..f8d02fe 100644
--- a/libmsi/database.c
+++ b/libmsi/database.c
@@ -1176,7 +1176,7 @@ unsigned MsiDatabaseExportW( LibmsiObject *handle, const WCHAR *szTable,
     return r;
 }
 
-unsigned MsiDatabaseExportA( LibmsiObject *handle, const char *szTable,
+unsigned MsiDatabaseExport( LibmsiObject *handle, const char *szTable,
                int fd )
 {
     WCHAR *path = NULL;
@@ -1204,7 +1204,7 @@ end:
     return r;
 }
 
-unsigned MsiDatabaseMergeA(LibmsiObject *hDatabase, LibmsiObject *hDatabaseMerge,
+unsigned MsiDatabaseMerge(LibmsiObject *hDatabase, LibmsiObject *hDatabaseMerge,
                               const char *szTableName)
 {
     unsigned r;
diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h
index 14a3453..27b6d6c 100644
--- a/libmsi/msipriv.h
+++ b/libmsi/msipriv.h
@@ -409,6 +409,20 @@ extern unsigned msi_set_property( LibmsiDatabase *, const WCHAR *, const WCHAR *
 extern unsigned msi_get_property( LibmsiDatabase *, const WCHAR *, WCHAR *, unsigned *);
 extern int msi_get_property_int( LibmsiDatabase *package, const WCHAR *prop, int def );
 
+/* Unicode APIs */
+unsigned MsiDatabaseOpenViewW(LibmsiObject *,const WCHAR *,LibmsiObject **);
+LibmsiDBError MsiViewGetErrorW(LibmsiObject *,WCHAR *,unsigned *);
+unsigned MsiRecordSetStringW(LibmsiObject *,unsigned,const WCHAR *);
+unsigned MsiRecordGetStringW(LibmsiObject *,unsigned,WCHAR *,unsigned *);
+unsigned MsiFormatRecordW(LibmsiObject *,LibmsiObject *,WCHAR *,unsigned *);
+unsigned MsiDatabaseGetPrimaryKeysW(LibmsiObject *,const WCHAR *,LibmsiObject **);
+unsigned MsiCreateTransformSummaryInfoW(LibmsiObject *, LibmsiObject *, const WCHAR *, int, int);
+unsigned MsiSummaryInfoGetPropertyW(LibmsiObject *,unsigned,unsigned *,int *,uint64_t*,WCHAR *,unsigned *);
+unsigned MsiSummaryInfoSetPropertyW(LibmsiObject *, unsigned, unsigned, int, uint64_t*, const WCHAR *);
+unsigned MsiDatabaseExportW(LibmsiObject *, const WCHAR *, int fd);
+LibmsiCondition MsiDatabaseIsTablePersistentW(LibmsiObject *, const WCHAR *);
+unsigned MsiDatabaseMergeW(LibmsiObject *, LibmsiObject *, const WCHAR *);
+
 /* common strings */
 static const WCHAR szSourceDir[] = {'S','o','u','r','c','e','D','i','r',0};
 static const WCHAR szSOURCEDIR[] = {'S','O','U','R','C','E','D','I','R',0};
diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c
index 2a57300..db78c69 100644
--- a/libmsi/msiquery.c
+++ b/libmsi/msiquery.c
@@ -84,7 +84,7 @@ unsigned VIEW_find_column( LibmsiView *table, const WCHAR *name, const WCHAR *ta
     return ERROR_INVALID_PARAMETER;
 }
 
-unsigned MsiDatabaseOpenViewA(LibmsiObject *hdb,
+unsigned MsiDatabaseOpenView(LibmsiObject *hdb,
               const char *szQuery, LibmsiObject **phView)
 {
     unsigned r;
@@ -640,7 +640,7 @@ LibmsiDBError MsiViewGetErrorW( LibmsiObject *handle, WCHAR *buffer, unsigned *b
     return r;
 }
 
-LibmsiDBError MsiViewGetErrorA( LibmsiObject *handle, char *buffer, unsigned *buflen )
+LibmsiDBError MsiViewGetError( LibmsiObject *handle, char *buffer, unsigned *buflen )
 {
     LibmsiQuery *query;
     const WCHAR *column;
@@ -862,7 +862,7 @@ unsigned MsiDatabaseGetPrimaryKeysW( LibmsiObject *hdb,
     return r;
 }
 
-unsigned MsiDatabaseGetPrimaryKeysA(LibmsiObject *hdb, 
+unsigned MsiDatabaseGetPrimaryKeys(LibmsiObject *hdb, 
                     const char *table, LibmsiObject **phRec)
 {
     WCHAR *szwTable = NULL;
@@ -882,7 +882,7 @@ unsigned MsiDatabaseGetPrimaryKeysA(LibmsiObject *hdb,
     return r;
 }
 
-LibmsiCondition MsiDatabaseIsTablePersistentA(
+LibmsiCondition MsiDatabaseIsTablePersistent(
               LibmsiObject *hDatabase, const char *szTableName)
 {
     WCHAR *szwTableName = NULL;
diff --git a/libmsi/record.c b/libmsi/record.c
index 0390fe4..9d1854b 100644
--- a/libmsi/record.c
+++ b/libmsi/record.c
@@ -420,7 +420,7 @@ unsigned MSI_RecordGetStringA(LibmsiRecord *rec, unsigned iField,
     return ret;
 }
 
-unsigned MsiRecordGetStringA(LibmsiObject *handle, unsigned iField,
+unsigned MsiRecordGetString(LibmsiObject *handle, unsigned iField,
                char *szValue, unsigned *pcchValue)
 {
     LibmsiRecord *rec;
@@ -589,7 +589,7 @@ static unsigned MSI_RecordSetStringA( LibmsiRecord *rec, unsigned iField, const
     return 0;
 }
 
-unsigned MsiRecordSetStringA( LibmsiObject *handle, unsigned iField, const char *szValue )
+unsigned MsiRecordSetString( LibmsiObject *handle, unsigned iField, const char *szValue )
 {
     LibmsiRecord *rec;
     unsigned ret;
diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c
index 559788c..77c7459 100644
--- a/libmsi/suminfo.c
+++ b/libmsi/suminfo.c
@@ -616,7 +616,7 @@ WCHAR *msi_get_suminfo_product( IStorage *stg )
     return prod;
 }
 
-unsigned MsiSummaryInfoGetPropertyA(
+unsigned MsiSummaryInfoGetProperty(
       LibmsiObject *handle, unsigned uiProperty, unsigned *puiDataType, int *piValue,
       uint64_t *pftValue, char *szValueBuf, unsigned *pcchValueBuf)
 {
@@ -736,7 +736,7 @@ unsigned MsiSummaryInfoSetPropertyW( LibmsiObject *handle, unsigned uiProperty,
     return ret;
 }
 
-unsigned MsiSummaryInfoSetPropertyA( LibmsiObject *handle, unsigned uiProperty,
+unsigned MsiSummaryInfoSetProperty( LibmsiObject *handle, unsigned uiProperty,
                unsigned uiDataType, int iValue, uint64_t* pftValue, const char *szValue )
 {
     awcstring str;
@@ -927,7 +927,7 @@ unsigned MsiSummaryInfoPersist( LibmsiObject *handle )
     return ret;
 }
 
-unsigned MsiCreateTransformSummaryInfoA( LibmsiObject *db, LibmsiObject *db_ref, const char *transform, int error, int validation )
+unsigned MsiCreateTransformSummaryInfo( LibmsiObject *db, LibmsiObject *db_ref, const char *transform, int error, int validation )
 {
     unsigned r;
     WCHAR *transformW = NULL;