[MSI]

sync msi with wine 1.1.41

svn path=/trunk/; revision=46305

diff --git a/reactos/dll/win32/msi/database.c b/reactos/dll/win32/msi/database.c
index 8ec2411..cfa11e9 100644 (file)
--- a/reactos/dll/win32/msi/database.c
+++ b/reactos/dll/win32/msi/database.c
@@ -2057,7 +2057,7 @@ static ULONG WINAPI mrd_Release( IWineMsiRemoteDatabase *iface )
 }
 
 static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface,
 }
 
 static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface,

-                                             BSTR table, MSICONDITION *persistent )
+                                             LPCWSTR table, MSICONDITION *persistent )

 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     *persistent = MsiDatabaseIsTablePersistentW(This->database, table);
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     *persistent = MsiDatabaseIsTablePersistentW(This->database, table);


@@ -2065,7 +2065,7 @@ static HRESULT WINAPI mrd_IsTablePersistent( IWineMsiRemoteDatabase *iface,
 }
 
 static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface,
 }
 
 static HRESULT WINAPI mrd_GetPrimaryKeys( IWineMsiRemoteDatabase *iface,

-                                          BSTR table, MSIHANDLE *keys )
+                                          LPCWSTR table, MSIHANDLE *keys )

 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys);
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     UINT r = MsiDatabaseGetPrimaryKeysW(This->database, table, keys);


@@ -2081,7 +2081,7 @@ static HRESULT WINAPI mrd_GetSummaryInformation( IWineMsiRemoteDatabase *iface,
 }
 
 static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface,
 }
 
 static HRESULT WINAPI mrd_OpenView( IWineMsiRemoteDatabase *iface,

-                                    BSTR query, MSIHANDLE *view )
+                                    LPCWSTR query, MSIHANDLE *view )

 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     UINT r = MsiDatabaseOpenViewW(This->database, query, view);
 {
     msi_remote_database_impl *This = mrd_from_IWineMsiRemoteDatabase( iface );
     UINT r = MsiDatabaseOpenViewW(This->database, query, view);

diff --git a/reactos/dll/win32/msi/msi_De.rc b/reactos/dll/win32/msi/msi_De.rc
index 7307621..e0cccf0 100644 (file)
--- a/reactos/dll/win32/msi/msi_De.rc
+++ b/reactos/dll/win32/msi/msi_De.rc
@@ -36,4 +36,3 @@ STRINGTABLE DISCARDABLE
        14 "Feature von:"
        15 "Wählen Sie das Verzeichnis aus, dass %s enthält."
 }
        14 "Feature von:"
        15 "Wählen Sie das Verzeichnis aus, dass %s enthält."
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_Fr.rc b/reactos/dll/win32/msi/msi_Fr.rc
index 08b9049..f7f7338 100644 (file)
--- a/reactos/dll/win32/msi/msi_Fr.rc
+++ b/reactos/dll/win32/msi/msi_Fr.rc
@@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
        14 "fonctionnalité depuis :"
        15 "sélectionnez le dossier contenant %s"
 }
        14 "fonctionnalité depuis :"
        15 "sélectionnez le dossier contenant %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_It.rc b/reactos/dll/win32/msi/msi_It.rc
index 11525ad..a40a730 100644 (file)
--- a/reactos/dll/win32/msi/msi_It.rc
+++ b/reactos/dll/win32/msi/msi_It.rc
@@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
        14 "funzionalità da:"
        15 "selezionare la cartella che contiene %s"
 }
        14 "funzionalità da:"
        15 "selezionare la cartella che contiene %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_Lt.rc b/reactos/dll/win32/msi/msi_Lt.rc
index 7660261..1cf1c52 100644 (file)
--- a/reactos/dll/win32/msi/msi_Lt.rc
+++ b/reactos/dll/win32/msi/msi_Lt.rc
@@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
        14 "komponentas iš:"
        15 "parinkite aplanką, kuris turi %s"
 }
        14 "komponentas iš:"
        15 "parinkite aplanką, kuris turi %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_Ro.rc b/reactos/dll/win32/msi/msi_Ro.rc
index 436f83b..b877b42 100644 (file)
--- a/reactos/dll/win32/msi/msi_Ro.rc
+++ b/reactos/dll/win32/msi/msi_Ro.rc
@@ -35,4 +35,3 @@ STRINGTABLE DISCARDABLE
         14 "caracteristică de la:"
         15 "selectați fișierul care conține %s"
 }
         14 "caracteristică de la:"
         15 "selectați fișierul care conține %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_Ru.rc b/reactos/dll/win32/msi/msi_Ru.rc
index 3e59873..8e7aafd 100644 (file)
--- a/reactos/dll/win32/msi/msi_Ru.rc
+++ b/reactos/dll/win32/msi/msi_Ru.rc
@@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
        14 "возможность из:"
        15 "выберите каталог, содержащий %s"
 }
        14 "возможность из:"
        15 "выберите каталог, содержащий %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msi_Si.rc b/reactos/dll/win32/msi/msi_Si.rc
index df7a9f1..7582339 100644 (file)
--- a/reactos/dll/win32/msi/msi_Si.rc
+++ b/reactos/dll/win32/msi/msi_Si.rc
@@ -36,4 +36,3 @@ STRINGTABLE DISCARDABLE
        14 "funkcija z:"
        15 "izberite mapo, ki vsebuje %s"
 }
        14 "funkcija z:"
        15 "izberite mapo, ki vsebuje %s"
 }

-#pragma code_page(default)

diff --git a/reactos/dll/win32/msi/msiquery.c b/reactos/dll/win32/msi/msiquery.c
index b673832..f2723af 100644 (file)
--- a/reactos/dll/win32/msi/msiquery.c
+++ b/reactos/dll/win32/msi/msiquery.c
@@ -262,7 +262,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb,
         if ( !remote_database )
             return ERROR_INVALID_HANDLE;
 
         if ( !remote_database )
             return ERROR_INVALID_HANDLE;
 

-        hr = IWineMsiRemoteDatabase_OpenView( remote_database, (BSTR)szQuery, phView );
+        hr = IWineMsiRemoteDatabase_OpenView( remote_database, szQuery, phView );

         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))
         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))


@@ -943,7 +943,7 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb,
         if ( !remote_database )
             return ERROR_INVALID_HANDLE;
 
         if ( !remote_database )
             return ERROR_INVALID_HANDLE;
 

-        hr = IWineMsiRemoteDatabase_GetPrimaryKeys( remote_database, (BSTR)table, phRec );
+        hr = IWineMsiRemoteDatabase_GetPrimaryKeys( remote_database, table, phRec );

         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))
         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))


@@ -1030,7 +1030,7 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
             return MSICONDITION_ERROR;
 
         hr = IWineMsiRemoteDatabase_IsTablePersistent( remote_database,
             return MSICONDITION_ERROR;
 
         hr = IWineMsiRemoteDatabase_IsTablePersistent( remote_database,

-                                                       (BSTR)szTableName, &condition );
+                                                       szTableName, &condition );

         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))
         IWineMsiRemoteDatabase_Release( remote_database );
 
         if (FAILED(hr))

diff --git a/reactos/dll/win32/msi/msiserver.idl b/reactos/dll/win32/msi/msiserver.idl
index 25210fe..e74c22c 100644 (file)
--- a/reactos/dll/win32/msi/msiserver.idl
+++ b/reactos/dll/win32/msi/msiserver.idl
@@ -38,10 +38,10 @@ cpp_quote("#endif")
 ]
 interface IWineMsiRemoteDatabase : IUnknown
 {
 ]
 interface IWineMsiRemoteDatabase : IUnknown
 {

-    HRESULT IsTablePersistent( [in] BSTR table, [out] MSICONDITION *persistent );
-    HRESULT GetPrimaryKeys( [in] BSTR table, [out] MSIHANDLE *keys );
+    HRESULT IsTablePersistent( [in] LPCWSTR table, [out] MSICONDITION *persistent );
+    HRESULT GetPrimaryKeys( [in] LPCWSTR table, [out] MSIHANDLE *keys );

     HRESULT GetSummaryInformation( [in] UINT updatecount, [out] MSIHANDLE *suminfo );
     HRESULT GetSummaryInformation( [in] UINT updatecount, [out] MSIHANDLE *suminfo );

-    HRESULT OpenView( [in] BSTR query, [out] MSIHANDLE *view );
+    HRESULT OpenView( [in] LPCWSTR query, [out] MSIHANDLE *view );

     HRESULT SetMsiHandle( [in] MSIHANDLE handle );
 }
 
     HRESULT SetMsiHandle( [in] MSIHANDLE handle );
 }