wine-commits July 2007

wine-commits@winehq.org

3 participants
957 discussions

Alexandre Julliard : ntdll: Add check for null pointer in NtQuerySystemInformation( SystemModuleInformation).
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 68a6182188e2cf83f9c0647abc5f2446bbe2408d URL: http://source.winehq.org/git/wine.git/?a=commit;h=68a6182188e2cf83f9c0647ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 4 12:07:22 2007 +0200 ntdll: Add check for null pointer in NtQuerySystemInformation(SystemModuleInformation). --- dlls/ntdll/nt.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index ed707c0..a303dcf 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -845,7 +845,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( break; case SystemModuleInformation: /* FIXME: should be system-wide */ - ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); + if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION; + else ret = LdrQueryProcessModuleInformation( SystemInformation, Length, &len ); break; case SystemHandleInformation: {

1 0

Peter Dons Tychsen : winex11: Fix X11DRV_DIB_GetImageBits() when target bitmaps are larger than fetched.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: cf7cfa85eb14a40e35709c3cdfece56290702f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7cfa85eb14a40e35709c3cd… Author: Peter Dons Tychsen <donpedro@dhcppc2> Date: Tue Jun 26 15:39:30 2007 +0200 winex11: Fix X11DRV_DIB_GetImageBits() when target bitmaps are larger than fetched. --- dlls/winex11.drv/dib.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/dib.c b/dlls/winex11.drv/dib.c index c921034..00b1f23 100644 --- a/dlls/winex11.drv/dib.c +++ b/dlls/winex11.drv/dib.c @@ -3618,7 +3618,11 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr ) } #ifdef HAVE_LIBXXSHM - if (descr->image && descr->useShm) + + /* We must not call XShmGetImage() with a bitmap which is bigger than the avilable area. + If we do, XShmGetImage() will fail (X exception), as it checks for this internally. */ + if((descr->image && descr->useShm) && (bmpImage->width <= (descr->width - descr->xSrc)) + && (bmpImage->height <= (descr->height - descr->ySrc))) { int saveRed, saveGreen, saveBlue;

1 0

James Hawkins : msi: Handle remote calls to MsiSetInstallLevel.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: c6741d83c6476a7862c148f8ad2cb5acd27563a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6741d83c6476a7862c148f8a… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:20:48 2007 -0700 msi: Handle remote calls to MsiSetInstallLevel. --- dlls/msi/install.c | 27 ++++++++++++++++++++++++--- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 6e33c2c..cb5f77b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1100,9 +1100,30 @@ UINT WINAPI MsiSetInstallLevel(MSIHANDLE hInstall, int iInstallLevel) TRACE("%ld %i\n", hInstall, iInstallLevel); - package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); - if ( !package ) - return ERROR_INVALID_HANDLE; + package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + if (!package) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + hr = IWineMsiRemotePackage_SetInstallLevel(remote_package, iInstallLevel); + + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } r = MSI_SetInstallLevel( package, iInstallLevel ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 0e189e0..d31cb22 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -54,6 +54,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetComponentState( [in] BSTR *component, [in] INSTALLSTATE state ); HRESULT GetLanguage( [out] LANGID *language ); + HRESULT SetInstallLevel( [in] int level ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8038dd1..276271b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1655,6 +1655,13 @@ HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) return S_OK; } +HRESULT WINAPI mrp_SetInstallLevel( IWineMsiRemotePackage *iface, int level ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetInstallLevel(This->package, level); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1676,6 +1683,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetComponentState, mrp_SetComponentState, mrp_GetLanguage, + mrp_SetInstallLevel, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiGetLanguage.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 569ea392a7ccc5ced3e4b6fd96ffdc10d04e4c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=569ea392a7ccc5ced3e4b6fd9… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:20:17 2007 -0700 msi: Handle remote calls to MsiGetLanguage. --- dlls/msi/install.c | 17 ++++++++++++++++- dlls/msi/msiserver.idl | 2 ++ dlls/msi/package.c | 8 ++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 88a4c94..6e33c2c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -1045,7 +1045,22 @@ LANGID WINAPI MsiGetLanguage(MSIHANDLE hInstall) package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) - return ERROR_INVALID_HANDLE; + { + HRESULT hr; + LANGID lang; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + hr = IWineMsiRemotePackage_GetLanguage(remote_package, &lang); + + if (SUCCEEDED(hr)) + return lang; + + return 0; + } langid = msi_get_property_int( package, szProductLanguage, 0 ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 502d1bd..0e189e0 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -28,6 +28,7 @@ typedef unsigned long MSIHANDLE; typedef int INSTALLMESSAGE; typedef int MSIRUNMODE; typedef int INSTALLSTATE; +typedef WORD LANGID; cpp_quote("#endif") [ @@ -52,6 +53,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state ); HRESULT GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetComponentState( [in] BSTR *component, [in] INSTALLSTATE state ); + HRESULT GetLanguage( [out] LANGID *language ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 88ad36b..8038dd1 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1648,6 +1648,13 @@ HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR *compon return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_GetLanguage( IWineMsiRemotePackage *iface, LANGID *language ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + *language = MsiGetLanguage(This->package); + return S_OK; +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1668,6 +1675,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetFeatureState, mrp_GetComponentState, mrp_SetComponentState, + mrp_GetLanguage, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiSetComponentState.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 82b0066f706631425d76fa15d8c5784ab29e8044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82b0066f706631425d76fa15d… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:19:44 2007 -0700 msi: Handle remote calls to MsiSetComponentState. --- dlls/msi/install.c | 24 +++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 4ce0eb4..88a4c94 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -964,7 +964,29 @@ UINT WINAPI MsiSetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_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_SetComponentState(remote_package, (BSTR *)szComponent, iState); + + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + ret = MSI_SetComponentStateW(package, szComponent, iState); msiobj_release(&package->hdr); return ret; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index c9f5887..502d1bd 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -51,6 +51,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetFeatureState( [in] BSTR *feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state ); HRESULT GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); + HRESULT SetComponentState( [in] BSTR *component, [in] INSTALLSTATE state ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 79d984d..88ad36b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1641,6 +1641,13 @@ HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR *compon return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_SetComponentState( IWineMsiRemotePackage *iface, BSTR *component, INSTALLSTATE state ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)component, state); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1660,6 +1667,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetFeatureState, mrp_SetFeatureState, mrp_GetComponentState, + mrp_SetComponentState, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiGetComponentState.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 254e27ad31dfb0e34b5474cd831baf73eef2f5c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=254e27ad31dfb0e34b5474cd8… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:19:16 2007 -0700 msi: Handle remote calls to MsiGetComponentState. --- dlls/msi/install.c | 23 ++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 9 +++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e1a6b88..4ce0eb4 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -984,7 +984,28 @@ UINT WINAPI MsiGetComponentStateW(MSIHANDLE hInstall, LPCWSTR szComponent, package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_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_GetComponentState(remote_package, (BSTR *)szComponent, + piInstalled, piAction); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } + ret = MSI_GetComponentStateW( package, szComponent, piInstalled, piAction); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 5708a8b..c9f5887 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -50,6 +50,7 @@ interface IWineMsiRemotePackage : IUnknown 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 GetComponentState( [in] BSTR *component, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a47cbda..79d984d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1633,6 +1633,14 @@ HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature, return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_GetComponentState( IWineMsiRemotePackage *iface, BSTR *component, + INSTALLSTATE *installed, INSTALLSTATE *action ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiGetComponentStateW(This->package, (LPWSTR)component, installed, action); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1651,6 +1659,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetMode, mrp_GetFeatureState, mrp_SetFeatureState, + mrp_GetComponentState, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiGetFeatureState.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 7d93e1a2a5a782f10c5d36d11724584b06fe5dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d93e1a2a5a782f10c5d36d11… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:18:44 2007 -0700 msi: Handle remote calls to MsiGetFeatureState. --- dlls/msi/install.c | 23 ++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 9 +++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index c9a34cc..e1a6b88 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -829,7 +829,28 @@ UINT WINAPI MsiGetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_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); msiobj_release( &package->hdr ); return ret; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f64c8ae..5708a8b 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -48,6 +48,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); 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 ); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 72eae3b..a47cbda 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1618,6 +1618,14 @@ HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL 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 ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); @@ -1641,6 +1649,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetTargetPath, mrp_GetSourcePath, mrp_GetMode, + mrp_GetFeatureState, mrp_SetFeatureState, };

1 0

James Hawkins : msi: Handle remote calls to MsiSetFeatureState.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: f45b3ce60e4282d239b9e5396ed180af41557390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f45b3ce60e4282d239b9e5396… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:18:04 2007 -0700 msi: Handle remote calls to MsiSetFeatureState. --- dlls/msi/install.c | 23 ++++++++++++++++++++++- dlls/msi/msiserver.idl | 2 ++ dlls/msi/package.c | 8 ++++++++ 3 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e7ee92b..c9a34cc 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -749,7 +749,28 @@ UINT WINAPI MsiSetFeatureStateW(MSIHANDLE hInstall, LPCWSTR szFeature, package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_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_SetFeatureState(remote_package, (BSTR *)szFeature, iState); + + IWineMsiRemotePackage_Release(remote_package); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } rc = MSI_SetFeatureStateW(package,szFeature,iState); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index aad2b3a..f64c8ae 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -27,6 +27,7 @@ cpp_quote("#if 0") typedef unsigned long MSIHANDLE; typedef int INSTALLMESSAGE; typedef int MSIRUNMODE; +typedef int INSTALLSTATE; cpp_quote("#endif") [ @@ -47,6 +48,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); + HRESULT SetFeatureState( [in] BSTR *feature, [in] INSTALLSTATE state ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index d25c7ae..72eae3b 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1618,6 +1618,13 @@ HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL return S_OK; } +HRESULT WINAPI mrp_SetFeatureState( IWineMsiRemotePackage *iface, BSTR *feature, INSTALLSTATE state ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetFeatureStateW(This->package, (LPWSTR)feature, state); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1634,6 +1641,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetTargetPath, mrp_GetSourcePath, mrp_GetMode, + mrp_SetFeatureState, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiGetMode.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: c96f1d524b50d4a1506c5ce4c25f8e624221f617 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96f1d524b50d4a1506c5ce4c… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:17:26 2007 -0700 msi: Handle remote calls to MsiGetMode. --- dlls/msi/install.c | 16 ++++++++++++++++ dlls/msi/msiserver.idl | 2 ++ dlls/msi/package.c | 8 ++++++++ 3 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 2d0a365..e7ee92b 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -612,7 +612,23 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); if (!package) + { + BOOL ret; + HRESULT hr; + IWineMsiRemotePackage *remote_package; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote(hInstall); + if (!remote_package) + return FALSE; + + hr = IWineMsiRemotePackage_GetMode(remote_package, iRunMode, &ret); + IWineMsiRemotePackage_Release(remote_package); + + if (hr == S_OK) + return ret; + return FALSE; + } switch (iRunMode) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 36ccc7c..aad2b3a 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -26,6 +26,7 @@ import "oaidl.idl"; cpp_quote("#if 0") typedef unsigned long MSIHANDLE; typedef int INSTALLMESSAGE; +typedef int MSIRUNMODE; cpp_quote("#endif") [ @@ -45,6 +46,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetTargetPath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 62fa702..d25c7ae 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1611,6 +1611,13 @@ HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR *folder, BS return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_GetMode( IWineMsiRemotePackage *iface, MSIRUNMODE mode, BOOL *ret ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + *ret = MsiGetMode(This->package, mode); + return S_OK; +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1626,6 +1633,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetTargetPath, mrp_SetTargetPath, mrp_GetSourcePath, + mrp_GetMode, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

James Hawkins : msi: Handle remote calls to MsiSetTargetPath.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: f935e94adffcdf834972a1ca21649854fcbb05e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f935e94adffcdf834972a1ca2… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:16:54 2007 -0700 msi: Handle remote calls to MsiSetTargetPath. --- dlls/msi/install.c | 23 ++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index b4f365e..2d0a365 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -544,7 +544,28 @@ UINT WINAPI MsiSetTargetPathW(MSIHANDLE hInstall, LPCWSTR szFolder, package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_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_SetTargetPath( remote_package, (BSTR *)szFolder, (BSTR *)szFolderPath ); + + IWineMsiRemotePackage_Release( remote_package ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } ret = MSI_SetTargetPathW( package, szFolder, szFolderPath ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 8baa167..36ccc7c 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -43,6 +43,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT DoAction( [in] BSTR *action ); HRESULT Sequence( [in] BSTR *table, [in] int sequence ); HRESULT GetTargetPath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT SetTargetPath( [in] BSTR *folder, [in] BSTR *value ); HRESULT GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); } diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1b83e56..62fa702 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1597,6 +1597,13 @@ HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR *folder, BS return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR *folder, BSTR *value) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value); + return HRESULT_FROM_WIN32(r); +} + HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR *folder, BSTR *value, DWORD *size ) { msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); @@ -1617,6 +1624,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_DoAction, mrp_Sequence, mrp_GetTargetPath, + mrp_SetTargetPath, mrp_GetSourcePath, };

1 0

← Newer
1
...
84
85
86
87
88
89
90
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2007