mirror of
https://github.com/reactos/reactos.git
synced 2025-08-02 21:56:06 +00:00
[MSI]
sync msi with wine 1.1.41 svn path=/trunk/; revision=46305
This commit is contained in:
parent
b7cad37389
commit
5b9666d6ad
10 changed files with 9 additions and 16 deletions
|
@ -2057,7 +2057,7 @@ static ULONG WINAPI mrd_Release( 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);
|
||||
|
@ -2065,7 +2065,7 @@ static HRESULT WINAPI mrd_IsTablePersistent( 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);
|
||||
|
@ -2081,7 +2081,7 @@ static HRESULT WINAPI mrd_GetSummaryInformation( 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);
|
||||
|
|
|
@ -36,4 +36,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "Feature von:"
|
||||
15 "Wählen Sie das Verzeichnis aus, dass %s enthält."
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "fonctionnalité depuis :"
|
||||
15 "sélectionnez le dossier contenant %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "funzionalità da:"
|
||||
15 "selezionare la cartella che contiene %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "komponentas iš:"
|
||||
15 "parinkite aplanką, kuris turi %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -35,4 +35,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "caracteristică de la:"
|
||||
15 "selectați fișierul care conține %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -37,4 +37,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "возможность из:"
|
||||
15 "выберите каталог, содержащий %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -36,4 +36,3 @@ STRINGTABLE DISCARDABLE
|
|||
14 "funkcija z:"
|
||||
15 "izberite mapo, ki vsebuje %s"
|
||||
}
|
||||
#pragma code_page(default)
|
||||
|
|
|
@ -262,7 +262,7 @@ UINT WINAPI MsiDatabaseOpenViewW(MSIHANDLE hdb,
|
|||
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 @@ UINT WINAPI MsiDatabaseGetPrimaryKeysW( MSIHANDLE hdb,
|
|||
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 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW(
|
|||
return MSICONDITION_ERROR;
|
||||
|
||||
hr = IWineMsiRemoteDatabase_IsTablePersistent( remote_database,
|
||||
(BSTR)szTableName, &condition );
|
||||
szTableName, &condition );
|
||||
IWineMsiRemoteDatabase_Release( remote_database );
|
||||
|
||||
if (FAILED(hr))
|
||||
|
|
|
@ -38,10 +38,10 @@ cpp_quote("#endif")
|
|||
]
|
||||
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 );
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue