[ros-diffs] [cwittich] 46305: [MSI] sync msi with wine 1.1.41
cwittich at svn.reactos.org
cwittich at svn.reactos.org
Sun Mar 21 16:18:13 CET 2010
Author: cwittich
Date: Sun Mar 21 16:18:13 2010
New Revision: 46305
URL: http://svn.reactos.org/svn/reactos?rev=46305&view=rev
Log:
[MSI]
sync msi with wine 1.1.41
Modified:
trunk/reactos/dll/win32/msi/database.c
trunk/reactos/dll/win32/msi/msi_De.rc
trunk/reactos/dll/win32/msi/msi_Fr.rc
trunk/reactos/dll/win32/msi/msi_It.rc
trunk/reactos/dll/win32/msi/msi_Lt.rc
trunk/reactos/dll/win32/msi/msi_Ro.rc
trunk/reactos/dll/win32/msi/msi_Ru.rc
trunk/reactos/dll/win32/msi/msi_Si.rc
trunk/reactos/dll/win32/msi/msiquery.c
trunk/reactos/dll/win32/msi/msiserver.idl
Modified: trunk/reactos/dll/win32/msi/database.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/database.c?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/database.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/database.c [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -2057,7 +2057,7 @@
}
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);
@@ -2065,7 +2065,7 @@
}
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);
@@ -2081,7 +2081,7 @@
}
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);
Modified: trunk/reactos/dll/win32/msi/msi_De.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_De.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_De.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_De.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -36,4 +36,3 @@
14 "Feature von:"
15 "Wählen Sie das Verzeichnis aus, dass %s enthält."
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_Fr.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Fr.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_Fr.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_Fr.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -37,4 +37,3 @@
14 "fonctionnalité depuis :"
15 "sélectionnez le dossier contenant %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_It.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_It.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_It.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_It.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -37,4 +37,3 @@
14 "funzionalità da:"
15 "selezionare la cartella che contiene %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_Lt.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Lt.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_Lt.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_Lt.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -37,4 +37,3 @@
14 "komponentas iš:"
15 "parinkite aplankÄ
, kuris turi %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_Ro.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ro.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_Ro.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_Ro.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -35,4 +35,3 @@
14 "caracteristică de la:"
15 "selectați fișierul care conține %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_Ru.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Ru.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_Ru.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_Ru.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -37,4 +37,3 @@
14 "возможноÑÑ‚ÑŒ из:"
15 "выберите каталог, Ñодержащий %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msi_Si.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Si.rc?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi_Si.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi_Si.rc [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -36,4 +36,3 @@
14 "funkcija z:"
15 "izberite mapo, ki vsebuje %s"
}
-#pragma code_page(default)
Modified: trunk/reactos/dll/win32/msi/msiquery.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiquery.c?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msiquery.c [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -262,7 +262,7 @@
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))
@@ -943,7 +943,7 @@
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))
@@ -1030,7 +1030,7 @@
return MSICONDITION_ERROR;
hr = IWineMsiRemoteDatabase_IsTablePersistent( remote_database,
- (BSTR)szTableName, &condition );
+ szTableName, &condition );
IWineMsiRemoteDatabase_Release( remote_database );
if (FAILED(hr))
Modified: trunk/reactos/dll/win32/msi/msiserver.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msiserver.idl?rev=46305&r1=46304&r2=46305&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msiserver.idl [iso-8859-1] Sun Mar 21 16:18:13 2010
@@ -38,10 +38,10 @@
]
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 OpenView( [in] BSTR query, [out] MSIHANDLE *view );
+ HRESULT OpenView( [in] LPCWSTR query, [out] MSIHANDLE *view );
HRESULT SetMsiHandle( [in] MSIHANDLE handle );
}
More information about the Ros-diffs
mailing list