Module: wine Branch: master Commit: e4658e05f2a930caef6d1c45e3605e49503b12bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4658e05f2a930caef6d1c45e3...
Author: James Hawkins truiken@gmail.com Date: Mon Jul 2 20:16:04 2007 -0700
msi: Handle remote calls to MsiGetActiveDatabase.
---
dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 93153e1..78b3e24 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -538,6 +538,7 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ); extern ITypeLib *get_msi_typelib( LPWSTR *path ); extern HRESULT create_msi_custom_remote( IUnknown *pOuter, LPVOID *ppObj ); extern HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj ); +extern IUnknown *msi_get_remote(MSIHANDLE handle);
/* handle functions */ extern void *msihandle2msiinfo(MSIHANDLE handle, UINT type); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 26282c5..cafa656 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -944,6 +944,7 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) { MSIPACKAGE *package; MSIHANDLE handle = 0; + IWineMsiRemotePackage *remote_package;
TRACE("(%ld)\n",hInstall);
@@ -953,6 +954,11 @@ MSIHANDLE WINAPI MsiGetActiveDatabase(MSIHANDLE hInstall) handle = alloc_msihandle( &package->db->hdr ); msiobj_release( &package->hdr ); } + else if ((remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ))) + { + IWineMsiRemotePackage_GetActiveDatabase(remote_package, &handle); + IWineMsiRemotePackage_Release(remote_package); + }
return handle; }