July 2007 - Wine-commits - list.winehq.org

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

04 Jul '07

Module: wine Branch: master Commit: 582be6a73a11a6bc3b47fc9c7da73c14aa0c0a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=582be6a73a11a6bc3b47fc9c7… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:16:15 2007 -0700 msi: Handle remote calls to MsiGetSourcePath. --- dlls/msi/install.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 +++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 730c30a..b4f365e 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -314,16 +314,60 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, { MSIPACKAGE *package; LPWSTR path; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; TRACE("%s %p %p\n", debugstr_w(szFolder), szPathBuf, pcchPathBuf ); if (!szFolder) return ERROR_INVALID_PARAMETER; - package = msihandle2msiinfo(hInstall, MSIHANDLETYPE_PACKAGE); + package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if (!package) - return ERROR_INVALID_HANDLE; + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + LPWSTR value = NULL; + DWORD len; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + len = 0; + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, (BSTR *)szFolder, + NULL, &len ); + if (FAILED(hr)) + goto done; + + len++; + value = msi_alloc(len * sizeof(WCHAR)); + if (!value) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, (BSTR *)szFolder, + (BSTR *)value, &len); + if (FAILED(hr)) + goto done; + + r = msi_strcpy_to_awstring( value, szPathBuf, pcchPathBuf ); + +done: + IWineMsiRemotePackage_Release( remote_package ); + msi_free( value ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return r; + } if (szPathBuf->str.w && !pcchPathBuf ) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 708c9ca..8baa167 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 GetSourcePath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 8dd40ce..1b83e56 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_GetSourcePath( IWineMsiRemotePackage *iface, BSTR *folder, BSTR *value, DWORD *size ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiGetSourcePathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1610,6 +1617,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_DoAction, mrp_Sequence, mrp_GetTargetPath, + mrp_GetSourcePath, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

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

04 Jul '07

Module: wine Branch: master Commit: 99714f12cb08fb40521f6d8e12fab2ca7a40b622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99714f12cb08fb40521f6d8e1… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:15:06 2007 -0700 msi: Handle remote calls to MsiSequence. --- 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 77e6756..e06399c 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -131,7 +131,28 @@ UINT WINAPI MsiSequenceW( MSIHANDLE hInstall, LPCWSTR szTable, INT iSequenceMode 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_Sequence( remote_package, (BSTR *)szTable, iSequenceMode ); + + 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_Sequence( package, szTable, iSequenceMode ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 550a44f..521b4ca 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -41,6 +41,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetProperty( [in] BSTR *property, [in] BSTR *value ); HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT DoAction( [in] BSTR *action ); + HRESULT Sequence( [in] BSTR *table, [in] int sequence ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 153ea8c..b453ae5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1583,6 +1583,13 @@ HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR *action ) return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR *table, int sequence ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiSequenceW(This->package, (LPWSTR)table, sequence); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1594,6 +1601,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_SetProperty, mrp_ProcessMessage, mrp_DoAction, + mrp_Sequence, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

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

04 Jul '07

Module: wine Branch: master Commit: b7479be1bb24257533447bbae049cc13d41bfdc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7479be1bb24257533447bbae… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:15:36 2007 -0700 msi: Handle remote calls to MsiGetTargetPath. --- dlls/msi/install.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index e06399c..730c30a 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -200,14 +200,58 @@ static UINT WINAPI MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, { MSIPACKAGE *package; LPWSTR path; - UINT r; + UINT r = ERROR_FUNCTION_FAILED; if (!szFolder) return ERROR_INVALID_PARAMETER; package = msihandle2msiinfo( hInstall, MSIHANDLETYPE_PACKAGE ); if (!package) - return ERROR_INVALID_HANDLE; + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + LPWSTR value = NULL; + DWORD len; + + remote_package = (IWineMsiRemotePackage *)msi_get_remote( hInstall ); + if (!remote_package) + return ERROR_INVALID_HANDLE; + + len = 0; + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, (BSTR *)szFolder, + NULL, &len ); + if (FAILED(hr)) + goto done; + + len++; + value = msi_alloc(len * sizeof(WCHAR)); + if (!value) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, (BSTR *)szFolder, + (BSTR *)value, &len); + if (FAILED(hr)) + goto done; + + r = msi_strcpy_to_awstring( value, szPathBuf, pcchPathBuf ); + +done: + IWineMsiRemotePackage_Release( remote_package ); + msi_free( value ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return r; + } path = resolve_folder( package, szFolder, FALSE, FALSE, TRUE, NULL ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 521b4ca..708c9ca 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -42,6 +42,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT DoAction( [in] BSTR *action ); HRESULT Sequence( [in] BSTR *table, [in] int sequence ); + HRESULT GetTargetPath( [in] BSTR *folder, [out] BSTR *value, [out] DWORD *size ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index b453ae5..8dd40ce 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1590,6 +1590,13 @@ HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR *table, int sequ return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR *folder, BSTR *value, DWORD *size ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiGetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1602,6 +1609,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_ProcessMessage, mrp_DoAction, mrp_Sequence, + mrp_GetTargetPath, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Evan Stade : gdi32: Don't access DC in PolyDraw after releasing handle.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 53e05015f6d5bfb6c2418775688143c7894b4459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e05015f6d5bfb6c24187756… Author: Evan Stade <estade(a)gmail.com> Date: Tue Jul 3 19:06:34 2007 -0700 gdi32: Don't access DC in PolyDraw after releasing handle. --- dlls/gdi32/painting.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index 1b30d6d..3e84f60 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -833,18 +833,18 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, if(dc->funcs->pPolyDraw) { result = dc->funcs->pPolyDraw( dc->physDev, lppt, lpbTypes, cCount ); - GDI_ReleaseObj( hdc ); - return result; + goto end; } - GDI_ReleaseObj( hdc ); /* check for each bezierto if there are two more points */ for( i = 0; i < cCount; i++ ) if( lpbTypes[i] != PT_MOVETO && lpbTypes[i] & PT_BEZIERTO ) { - if( cCount < i+3 ) - return FALSE; + if( cCount < i+3 ){ + result = FALSE; + goto end; + } else i += 2; } @@ -869,8 +869,10 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, PolyBezierTo( hdc, &lppt[i], 3 ); i += 2; } - else - return FALSE; + else{ + result = FALSE; + goto end; + } if( lpbTypes[i] & PT_CLOSEFIGURE ) { @@ -881,7 +883,10 @@ BOOL WINAPI PolyDraw(HDC hdc, const POINT *lppt, const BYTE *lpbTypes, } } - return TRUE; + result = TRUE; +end: + GDI_ReleaseObj( hdc ); + return result; }

1 0

Michael Stefaniuc : msvcrt: Remove superfluous casts of void pointers to other pointer types.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: d7d40b7dd3c8e650be09e9882de7c4bb5e672481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7d40b7dd3c8e650be09e9882… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 3 23:56:55 2007 +0200 msvcrt: Remove superfluous casts of void pointers to other pointer types. --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/file.c | 4 ++-- dlls/msvcrt/process.c | 4 ++-- dlls/msvcrt/undname.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 013ed54..1e65832 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -259,7 +259,7 @@ int CDECL _cprintf(const char* format, ...) resize = (written == -1 ? resize * 2 : written + 1); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (char *)MSVCRT_malloc(resize))) + if (!(mem = MSVCRT_malloc(resize))) return MSVCRT_EOF; va_start( valist, format ); } diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9badd72..990b753 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -79,7 +79,7 @@ MSVCRT__onexit_t CDECL __dllonexit(MSVCRT__onexit_t func, MSVCRT__onexit_t **sta if (++len <= 0) return NULL; - tmp = (MSVCRT__onexit_t *)MSVCRT_realloc(*start, len * sizeof(tmp)); + tmp = MSVCRT_realloc(*start, len * sizeof(tmp)); if (!tmp) return NULL; *start = tmp; diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1be1a10..805bc55 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3012,7 +3012,7 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, va_list valist) resize = (written == -1 ? resize * 2 : written + 1); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (char *)MSVCRT_malloc(resize))) + if (!(mem = MSVCRT_malloc(resize))) return MSVCRT_EOF; } retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); @@ -3038,7 +3038,7 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, va_l resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t)); if (mem != buf) MSVCRT_free (mem); - if (!(mem = (MSVCRT_wchar_t *)MSVCRT_malloc(resize*sizeof(*mem)))) + if (!(mem = MSVCRT_malloc(resize*sizeof(*mem)))) return MSVCRT_EOF; } retval = MSVCRT_fwrite(mem, sizeof(*mem), written, file); diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index b6497b4..c70b6f7 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -106,7 +106,7 @@ static char* msvcrt_argvtos(const char* const* arg, char delim) a++; } - ret = (char*)MSVCRT_malloc(size + 1); + ret = MSVCRT_malloc(size + 1); if (!ret) return NULL; @@ -161,7 +161,7 @@ static char* msvcrt_valisttos(const char* arg0, va_list alist, char delim) arg = va_arg(alist, char*); } while (arg != NULL); - ret = (char*)MSVCRT_malloc(size + 1); + ret = MSVCRT_malloc(size + 1); if (!ret) return NULL; diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index a16d3d8..5d2b816 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -254,7 +254,7 @@ static char* str_printf(struct parsed_symbol* sym, const char* format, ...) else len++; } va_end(args); - if (!(tmp = (char*)und_alloc(sym, len))) return NULL; + if (!(tmp = und_alloc(sym, len))) return NULL; va_start(args, format); for (p = tmp, i = 0; format[i]; i++) {

1 0

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

04 Jul '07

Module: wine Branch: master Commit: be5eec45b5f68aab9469bfc70602ec554e8057f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5eec45b5f68aab9469bfc70… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:13:45 2007 -0700 msi: Handle remote calls to MsiProcessMessage. --- dlls/msi/msiserver.idl | 2 ++ dlls/msi/package.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index ee283f8..8bcaaf7 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -25,6 +25,7 @@ import "oaidl.idl"; cpp_quote("#if 0") typedef unsigned long MSIHANDLE; +typedef int INSTALLMESSAGE; cpp_quote("#endif") [ @@ -38,6 +39,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetActiveDatabase( [out] MSIHANDLE *handle ); HRESULT GetProperty( [in] BSTR *property, [out] BSTR *value, [out] DWORD *size ); HRESULT SetProperty( [in] BSTR *property, [in] BSTR *value ); + HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index e7482e0..a81d6e5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1142,7 +1142,28 @@ INT WINAPI MsiProcessMessage( MSIHANDLE hInstall, INSTALLMESSAGE eMessageType, 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_ProcessMessage( remote_package, eMessageType, hRecord ); + + IWineMsiRemotePackage_Release( remote_package ); + + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) + return HRESULT_CODE(hr); + + return ERROR_FUNCTION_FAILED; + } + + return ERROR_SUCCESS; + } record = msihandle2msiinfo( hRecord, MSIHANDLETYPE_RECORD ); if( !record ) @@ -1548,6 +1569,13 @@ HRESULT WINAPI mrp_SetProperty( IWineMsiRemotePackage *iface, BSTR *property, BS return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_ProcessMessage( IWineMsiRemotePackage *iface, INSTALLMESSAGE message, MSIHANDLE record ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiProcessMessage(This->package, message, record); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1557,6 +1585,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetActiveDatabase, mrp_GetProperty, mrp_SetProperty, + mrp_ProcessMessage, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

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

04 Jul '07

Module: wine Branch: master Commit: 0f321c0af9503219ab8667ce0a84bb75d38fc602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f321c0af9503219ab8667ce0… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jul 3 19:14:37 2007 -0700 msi: Handle remote calls to MsiDoAction. --- dlls/msi/install.c | 27 ++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 1 + dlls/msi/package.c | 8 ++++++++ 3 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 91877e3..77e6756 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -20,6 +20,8 @@ /* Msi top level apis directly related to installs */ +#define COBJMACROS + #include <stdarg.h> #include "windef.h" @@ -28,7 +30,9 @@ #include "wine/debug.h" #include "msi.h" #include "msidefs.h" + #include "msipriv.h" +#include "msiserver.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -67,7 +71,28 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction ) 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_DoAction( remote_package, (BSTR *)szAction ); + + 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 = ACTION_PerformUIAction( package, szAction, -1 ); msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 8bcaaf7..550a44f 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -40,6 +40,7 @@ interface IWineMsiRemotePackage : IUnknown HRESULT GetProperty( [in] BSTR *property, [out] BSTR *value, [out] DWORD *size ); HRESULT SetProperty( [in] BSTR *property, [in] BSTR *value ); HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); + HRESULT DoAction( [in] BSTR *action ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index a81d6e5..153ea8c 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1576,6 +1576,13 @@ HRESULT WINAPI mrp_ProcessMessage( IWineMsiRemotePackage *iface, INSTALLMESSAGE return HRESULT_FROM_WIN32(r); } +HRESULT WINAPI mrp_DoAction( IWineMsiRemotePackage *iface, BSTR *action ) +{ + msi_remote_package_impl* This = mrp_from_IWineMsiRemotePackage( iface ); + UINT r = MsiDoActionW(This->package, (LPWSTR)action); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -1586,6 +1593,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_GetProperty, mrp_SetProperty, mrp_ProcessMessage, + mrp_DoAction, }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Paul Vriens : user32/tests: Use skip.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 918a2911bf2ee73016d67ab7657921d31774ca90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=918a2911bf2ee73016d67ab76… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 3 14:45:09 2007 +0200 user32/tests: Use skip. --- dlls/user32/tests/winstation.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c index 9d64aa0..ac49d4a 100644 --- a/dlls/user32/tests/winstation.c +++ b/dlls/user32/tests/winstation.c @@ -250,7 +250,7 @@ START_TEST(winstation) GetProcessWindowStation(); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - trace("WindowStation calls not supported on this platform\n"); + skip("WindowStation calls not supported on this platform\n"); return; }

1 0

Paul Vriens : user32/tests: Use skip.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 24123e8603eec0dd3dcbf8d942df219a747a35cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24123e8603eec0dd3dcbf8d94… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 3 14:50:06 2007 +0200 user32/tests: Use skip. --- dlls/user32/tests/wsprintf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c index 6ca3ae7..c0ca1c6 100644 --- a/dlls/user32/tests/wsprintf.c +++ b/dlls/user32/tests/wsprintf.c @@ -44,7 +44,10 @@ static void wsprintfWTest(void) rc=wsprintfW(buf, fmt, -1); if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + { + skip("wsprintfW is not implemented\n"); return; + } ok(rc == 10, "wsPrintfW length failure: rc=%d error=%d\n",rc,GetLastError()); ok((lstrcmpW(buf, target) == 0), "wsprintfW zero padded negative value failure\n");

1 0

Paul Vriens : advapi32/tests: Use skip when we don't have enough rights.
by Alexandre Julliard 04 Jul '07

04 Jul '07

Module: wine Branch: master Commit: 8fae3635956dad5b30c2a33d245203ba4046e52e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fae3635956dad5b30c2a33d2… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Tue Jul 3 17:13:07 2007 +0200 advapi32/tests: Use skip when we don't have enough rights. --- dlls/advapi32/tests/lsa.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 49c61bb..575fc21 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -84,7 +84,10 @@ static void test_lsa(void) PPOLICY_DNS_DOMAIN_INFO dns_domain_info; status = pLsaQueryInformationPolicy(handle, PolicyAuditEventsInformation, (PVOID*)&audit_events_info); - ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyAuditEventsInformation) failed, returned 0x%08x\n", status); + if (status == STATUS_ACCESS_DENIED) + skip("Not enought rights to retrieve PolicyAuditEventsInformation\n"); + else + ok(status == STATUS_SUCCESS, "LsaQueryInformationPolicy(PolicyAuditEventsInformation) failed, returned 0x%08x\n", status); if (status == STATUS_SUCCESS) { pLsaFreeMemory((LPVOID)audit_events_info); }

1 0