ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Handle remote calls to MsiGetFeatureState.

This commit is contained in:
James Hawkins 2007-07-03 19:18:44 -07:00 committed by Alexandre Julliard
parent f45b3ce60e
commit 7d93e1a2a5
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/msi/install.c
View File

@ -829,7 +829,28 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature,
package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE);
if (!package) if (!package)
return ERROR_INVALID_HANDLE; {
HRESULT hr;
IWineMsiRemotePackage *remote_package;
remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall);
if (!remote_package)
return ERROR_INVALID_HANDLE;
hr = IWineMsiRemotePackage_GetFeatureState(remote_package, (BSTR *)szFeature,
piInstalled, piAction);
if (FAILED(hr))
{
if (HRESULT_FACILITY(hr) == FACILITY_WIN32)
return HRESULT_CODE(hr);
return ERROR_FUNCTION_FAILED;
}
return ERROR_SUCCESS;
}
ret = MSI_GetFeatureStateW(package, szFeature, piInstalled, piAction); ret = MSI_GetFeatureStateW(package, szFeature, piInstalled, piAction);
msiobj_release( &package->hdr ); msiobj_release( &package->hdr );
return ret; return ret;

1
dlls/msi/msiserver.idl
View File

@ -48,6 +48,7 @@ interface IWineMsiRemotePackage : IUnknown
HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value );
HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size );
HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret );
HRESULT GetFeatureState( [in] BSTR *feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action );
HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state ); HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state );
} }

9
dlls/msi/package.c
View File

@ -1618,6 +1618,14 @@ HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL
return S_OK; return S_OK;
} }
HRESULT WINAPI mrp_GetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature,
INSTALLSTATE *installed, INSTALLSTATE *action )
{
msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
UINT r = MsiGetFeatureStateW(This->package, (LPWSTR)feature, installed, action);
return HRESULT_FROM_WIN32(r);
}
HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature, INSTALLSTATE state ) HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature, INSTALLSTATE state )
{ {
msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface );
@ -1641,6 +1649,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl =
mrp_SetTargetPath, mrp_SetTargetPath,
mrp_GetSourcePath, mrp_GetSourcePath,
mrp_GetMode, mrp_GetMode,
mrp_GetFeatureState,
mrp_SetFeatureState, mrp_SetFeatureState,
}; };