May 2007 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : comctl32: Remove a stray back slash.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 19377e4ed63f6c15139b770c7aefb43ea047d7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19377e4ed63f6c15139b770c7… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed May 2 17:59:42 2007 +0900 comctl32: Remove a stray back slash. --- dlls/comctl32/tests/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 8b7cd6a..3d4c333 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -892,7 +892,7 @@ static void image_list_init(HIMAGELIST himl) #define iml_clear_stream_data() \ HeapFree(GetProcessHeap(), 0, Test_Stream.iml_data); \ Test_Stream.iml_data = NULL; \ - Test_Stream.iml_data_size = 0; \ + Test_Stream.iml_data_size = 0; static void check_iml_data(HIMAGELIST himl, INT cx, INT cy, INT cur, INT max, INT width, INT height, INT bpp, const char *comment)

1 0

Andrew Talbot : dmstyle: Exclude unused headers.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 7e03e6380a127e2f69ed7b168de8a927c0c13c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e03e6380a127e2f69ed7b168… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 1 22:13:46 2007 +0100 dmstyle: Exclude unused headers. --- dlls/dmstyle/dmutils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 0dcc4f5..f441af1 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -31,9 +31,7 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h"

1 0

Andrew Talbot : devenum: Exclude unused header.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 9cbfb794fe673d665b2260d945a4907bb90d49ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cbfb794fe673d665b2260d94… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 1 22:13:33 2007 +0100 devenum: Exclude unused header. --- dlls/devenum/mediacatenum.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index df10936..d230ce1 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -23,7 +23,6 @@ */ #include "devenum_private.h" -#include "vfwmsgs.h" #include "oleauto.h" #include "ocidl.h"

1 0

Andrew Talbot : dmusic32: Exclude unused headers.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 42e2d576b54d1801e62fc9dff2c4ed1fc667b9da URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e2d576b54d1801e62fc9dff… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 1 22:13:49 2007 +0100 dmusic32: Exclude unused headers. --- dlls/dmusic32/dmusic32_main.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dmusic32/dmusic32_main.c b/dlls/dmusic32/dmusic32_main.c index 5c3348b..63178c7 100644 --- a/dlls/dmusic32/dmusic32_main.c +++ b/dlls/dmusic32/dmusic32_main.c @@ -26,9 +26,7 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h"

1 0

Andrew Talbot : dmband: Exclude unused headers.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 8f2349d3098770f84c416d96484ccb8d2f11890a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f2349d3098770f84c416d964… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue May 1 22:13:38 2007 +0100 dmband: Exclude unused headers. --- dlls/dmband/dmutils.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 97922e6..584e20a 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -31,9 +31,7 @@ #include "winuser.h" #include "wine/debug.h" -#include "wine/list.h" #include "wine/unicode.h" -#include "winreg.h" #include "objbase.h" #include "dmusici.h"

1 0

Andrew Talbot : gphoto.ds: Constify a variable.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: 53acd1b1627f9f76f8ae27d99ef774724c020814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53acd1b1627f9f76f8ae27d99… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Mon Apr 30 21:40:25 2007 +0100 gphoto.ds: Constify a variable. --- dlls/gphoto2.ds/capability.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gphoto2.ds/capability.c b/dlls/gphoto2.ds/capability.c index 474d590..e9700cb 100644 --- a/dlls/gphoto2.ds/capability.c +++ b/dlls/gphoto2.ds/capability.c @@ -229,7 +229,8 @@ static TW_BOOL GPHOTO2_OneValueSet16 (pTW_CAPABILITY pCapability, TW_UINT16 valu return FALSE; } -static TW_BOOL GPHOTO2_EnumSet16 (pTW_CAPABILITY pCapability, int nrofvalues, TW_UINT16 *values, int current, int def) +static TW_BOOL GPHOTO2_EnumSet16 (pTW_CAPABILITY pCapability, int nrofvalues, + const TW_UINT16 *values, int current, int def) { pTW_ENUMERATION pVal; pCapability->hContainer = (TW_HANDLE)GlobalAlloc (0, sizeof(TW_ENUMERATION) + nrofvalues * sizeof(TW_UINT16));

1 0

Misha Koshelev : msi: Added handlers for JScript/ VBScript actions that call one script function.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: d70c9e7690ecf25c17795070fa372225d73acd04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d70c9e7690ecf25c17795070f… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:38 2007 -0500 msi: Added handlers for JScript/VBScript actions that call one script function. --- dlls/msi/custom.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 233 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index c38ea98..4467bb4 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -60,6 +60,14 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); +static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action); typedef UINT (WINAPI *MsiCustomActionEntryPoint)( MSIHANDLE ); @@ -272,6 +280,22 @@ UINT ACTION_CustomAction(MSIPACKAGE *package,LPCWSTR action, BOOL execute) rc = MSI_SetPropertyW(package,source,deformated); msi_free(deformated); break; + case 37: /* JScript/VBScript text stored in target column. */ + case 38: + rc = HANDLE_CustomType37_38(package,source,target,type,action); + break; + case 5: + case 6: /* JScript/VBScript file stored in a Binary table stream. */ + rc = HANDLE_CustomType5_6(package,source,target,type,action); + break; + case 21: /* JScript/VBScript file installed with the product. */ + case 22: + rc = HANDLE_CustomType21_22(package,source,target,type,action); + break; + case 53: /* JScript/VBScript text specified by a property value. */ + case 54: + rc = HANDLE_CustomType53_54(package,source,target,type,action); + break; default: FIXME("UNHANDLED ACTION TYPE %i (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, debugstr_w(source), @@ -954,6 +978,215 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, return wait_process_handle(package, type, info.hProcess, action); } +static DWORD WINAPI ACTION_CallScript( const LPGUID guid ) +{ + msi_custom_action_info *info; + UINT r = ERROR_FUNCTION_FAILED; + + info = find_action_by_guid( guid ); + if (!info) + { + ERR("failed to find action %s\n", debugstr_guid( guid) ); + return r; + } + + FIXME("function %s, script %s\n", debugstr_w( info->target ), debugstr_w( info->source ) ); + + if (info->type & msidbCustomActionTypeAsync && + info->type & msidbCustomActionTypeContinue) + free_custom_action_data( info ); + + return S_OK; +} + +static DWORD WINAPI ScriptThread( LPVOID arg ) +{ + LPGUID guid = arg; + DWORD rc = 0; + + TRACE("custom action (%x) started\n", GetCurrentThreadId() ); + + rc = ACTION_CallScript( guid ); + + TRACE("custom action (%x) returned %i\n", GetCurrentThreadId(), rc ); + + MsiCloseAllHandles(); + return rc; +} + +static msi_custom_action_info *do_msidbCustomActionTypeScript( + MSIPACKAGE *package, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action ) +{ + msi_custom_action_info *info; + + info = msi_alloc( sizeof *info ); + if (!info) + return NULL; + + msiobj_addref( &package->hdr ); + info->package = package; + info->type = type; + info->target = strdupW( function ); + info->source = strdupW( script ); + info->action = strdupW( action ); + CoCreateGuid( &info->guid ); + + EnterCriticalSection( &msi_custom_action_cs ); + list_add_tail( &msi_pending_custom_actions, &info->entry ); + LeaveCriticalSection( &msi_custom_action_cs ); + + info->handle = CreateThread( NULL, 0, ScriptThread, &info->guid, 0, NULL ); + if (!info->handle) + { + free_custom_action_data( info ); + return NULL; + } + + return info; +} + +static UINT HANDLE_CustomType37_38(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + msi_custom_action_info *info; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + info = do_msidbCustomActionTypeScript( package, type, target, NULL, action ); + + return wait_thread_handle( info ); +} + +static UINT HANDLE_CustomType5_6(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','B','i' ,'n','a','r','y','`',' ','W','H','E','R','E',' ', + '`','N','a','m','e','`',' ','=',' ','\'','%','s','\'',0}; + MSIRECORD *row = 0; + msi_custom_action_info *info; + CHAR *buffer = NULL; + WCHAR *bufferw = NULL; + DWORD sz = 0; + UINT r; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + row = MSI_QueryGetRecord(package->db, query, source); + if (!row) + return ERROR_FUNCTION_FAILED; + + r = MSI_RecordReadStream(row, 2, NULL, &sz); + if (r != ERROR_SUCCESS) + return r; + + buffer = msi_alloc(sizeof(CHAR)*(sz+1)); + if (!buffer) + return ERROR_FUNCTION_FAILED; + + r = MSI_RecordReadStream(row, 2, buffer, &sz); + if (r != ERROR_SUCCESS) + goto done; + + buffer[sz] = 0; + bufferw = strdupAtoW(buffer); + if (!bufferw) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); + r = wait_thread_handle( info ); + +done: + msi_free(bufferw); + msi_free(buffer); + return r; +} + +static UINT HANDLE_CustomType21_22(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + msi_custom_action_info *info; + MSIFILE *file; + HANDLE hFile; + DWORD sz, szHighWord = 0, read; + CHAR *buffer=NULL; + WCHAR *bufferw=NULL; + BOOL bRet; + UINT r; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + file = get_loaded_file(package,source); + if (!file) + { + ERR("invalid file key %s\n", debugstr_w(source)); + return ERROR_FUNCTION_FAILED; + } + + hFile = CreateFileW(file->TargetPath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + if (hFile == INVALID_HANDLE_VALUE) + return ERROR_FUNCTION_FAILED; + + sz = GetFileSize(hFile, &szHighWord); + if (sz == INVALID_FILE_SIZE || szHighWord != 0) + { + CloseHandle(hFile); + return ERROR_FUNCTION_FAILED; + } + + buffer = msi_alloc(sizeof(CHAR)*(sz+1)); + if (!buffer) + { + CloseHandle(hFile); + return ERROR_FUNCTION_FAILED; + } + + bRet = ReadFile(hFile, buffer, sz, &read, NULL); + CloseHandle(hFile); + if (!bRet) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + buffer[read] = 0; + bufferw = strdupAtoW(buffer); + if (!bufferw) + { + r = ERROR_FUNCTION_FAILED; + goto done; + } + + info = do_msidbCustomActionTypeScript( package, type, bufferw, target, action ); + r = wait_thread_handle( info ); + +done: + msi_free(bufferw); + msi_free(buffer); + return r; +} + +static UINT HANDLE_CustomType53_54(MSIPACKAGE *package, LPCWSTR source, + LPCWSTR target, const INT type, LPCWSTR action) +{ + msi_custom_action_info *info; + WCHAR *prop; + + TRACE("%s %s\n", debugstr_w(source), debugstr_w(target)); + + prop = msi_dup_property(package,source); + if (!prop) + return ERROR_SUCCESS; + + info = do_msidbCustomActionTypeScript( package, type, prop, NULL, action ); + msi_free(prop); + return wait_thread_handle( info ); +} + void ACTION_FinishCustomActions(MSIPACKAGE* package) { struct list *item;

1 0

Misha Koshelev : msi: Add JScript/VBScript support.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: eee455c24a4cd54a112c53c420d0d12e5723afeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=eee455c24a4cd54a112c53c42… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:43 2007 -0500 msi: Add JScript/VBScript support. --- dlls/msi/Makefile.in | 1 + dlls/msi/automation.c | 6 + dlls/msi/custom.c | 12 ++- dlls/msi/msipriv.h | 5 + dlls/msi/script.c | 364 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 387 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eee455c24a4cd54a112c5…

1 0

Misha Koshelev : msi: automation: Expose Installer object.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: f217cacbc2ad5db682b50a5ea83e9956c2563d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f217cacbc2ad5db682b50a5ea… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:31 2007 -0500 msi: automation: Expose Installer object. --- dlls/msi/automation.c | 6 ++++++ dlls/msi/msi_main.c | 6 ------ dlls/msi/msipriv.h | 3 +++ dlls/msi/tests/automation.c | 34 +++++++++++++++++++++++----------- 4 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index d9ca76d..4afef02 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -914,3 +914,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( return S_OK; } + +/* Wrapper around create_automation_object to create an installer object. */ +HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj) +{ + return create_automation_object(0, pOuter, ppObj, &DIID_Installer, InstallerImpl_Invoke); +} diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index a3dac7f..402e173 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -115,12 +115,6 @@ ITypeLib *get_msi_typelib( LPWSTR *path ) return msi_typelib; } -static HRESULT create_msiserver( IUnknown *pOuter, LPVOID *ppObj ) -{ - FIXME("\n"); - return E_FAIL; -} - typedef struct tagIClassFactoryImpl { const IClassFactoryVtbl *lpVtbl; HRESULT (*create_object)( IUnknown*, LPVOID* ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index a12a264..dc9f1d3 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -791,6 +791,9 @@ extern VOID ControlEvent_SubscribeToEvent(MSIPACKAGE *package, msi_dialog *dialo extern VOID ControlEvent_UnSubscribeToEvent( MSIPACKAGE *package, LPCWSTR event, LPCWSTR control, LPCWSTR attribute ); +/* OLE automation */ +extern HRESULT create_msiserver(IUnknown *pOuter, LPVOID *ppObj); + /* User Interface messages from the actions */ extern void ui_progress(MSIPACKAGE *, int, int, int, int); extern void ui_actiondata(MSIPACKAGE *, LPCWSTR, MSIRECORD *); diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index dcb3c7f..475eb3b 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -315,8 +315,19 @@ static WCHAR szSource[] = {'M','s','i',' ','A','P','I',' ','E','r','r','o','r',0 ok_w2("Exception source was \"%s\" but expected to be \"%s\"\n", excepinfo.bstrSource, szSource); \ \ ok(excepinfo.bstrDescription != NULL, "Exception description was NULL\n"); \ - if (excepinfo.bstrDescription) \ - ok_w2("Exception description was \"%s\" but expected to be \"%s\"\n", excepinfo.bstrDescription, szDescription); \ + if (excepinfo.bstrDescription && lstrcmpW(excepinfo.bstrDescription, szDescription) != 0) \ + { \ + len = WideCharToMultiByte(CP_ACP, 0, excepinfo.bstrDescription, -1, string1, MAX_PATH, NULL, NULL); \ + ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ + \ + len = WideCharToMultiByte(CP_ACP, 0, szDescription, -1, string2, MAX_PATH, NULL, NULL); \ + ok(len, "WideCharToMultiByteChar returned error %d\n", GetLastError()); \ + \ + todo_wine { \ + /* Our parameter names are different so the descriptions will not match */ \ + ok(0, "Exception description was \"%s\" but expected to be \"%s\"\n", string1, string2); \ + } \ + } \ } static DISPID get_dispid( IDispatch *disp, const char *name ) @@ -339,9 +350,10 @@ static DISPID get_dispid( IDispatch *disp, const char *name ) static void test_dispid(void) { + ok( get_dispid( pInstaller, "OpenPackage" ) == 2, "dispid wrong\n"); + todo_wine { ok( get_dispid( pInstaller, "CreateRecord" ) == 1, "dispid wrong\n"); - ok( get_dispid( pInstaller, "OpenPackage" ) == 2, "dispid wrong\n"); ok( get_dispid( pInstaller, "OpenProduct" ) == 3, "dispid wrong\n"); ok( get_dispid( pInstaller, "OpenDatabase" ) == 4, "dispid wrong\n"); ok( get_dispid( pInstaller, "SummaryInformation" ) == 5, "dispid wrong\n"); @@ -514,14 +526,14 @@ static void test_dispatch(void) /* Try with NULL params */ hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); /* Try one empty parameter */ dispparams.rgvarg = vararg; dispparams.cArgs = 1; VariantInit(&vararg[0]); hr = IDispatch_Invoke(pInstaller, dispid, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); - ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); + todo_wine ok(hr == DISP_E_TYPEMISMATCH, "IDispatch::Invoke returned 0x%08x\n", hr); /* Try one parameter, function requires two */ VariantInit(&vararg[0]); @@ -968,16 +980,16 @@ static void test_Session(IDispatch *pSession) /* Session::Mode, get */ hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(SUCCEEDED(hr), "Session_ModeGet failed, hresult 0x%08x\n", hr); - ok(!bool, "Reboot at end session mode is %d\n", bool); + todo_wine ok(!bool, "Reboot at end session mode is %d\n", bool); /* Session::Mode, put */ hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, TRUE); - ok(SUCCEEDED(hr), "Session_ModePut failed, hresult 0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "Session_ModePut failed, hresult 0x%08x\n", hr); hr = Session_ModeGet(pSession, MSIRUNMODE_REBOOTATEND, &bool); ok(SUCCEEDED(hr), "Session_ModeGet failed, hresult 0x%08x\n", hr); ok(bool, "Reboot at end session mode is %d, expected 1\n", bool); hr = Session_ModePut(pSession, MSIRUNMODE_REBOOTATEND, FALSE); /* set it again so we don't reboot */ - ok(SUCCEEDED(hr), "Session_ModePut failed, hresult 0x%08x\n", hr); + todo_wine ok(SUCCEEDED(hr), "Session_ModePut failed, hresult 0x%08x\n", hr); /* Session::Database, get */ hr = Session_Database(pSession, &pDatabase); @@ -1064,7 +1076,7 @@ START_TEST(automation) hr = CLSIDFromProgID(szProgId, &clsid); ok (SUCCEEDED(hr), "CLSIDFromProgID returned 0x%08x\n", hr); hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&pUnk); - todo_wine ok(SUCCEEDED(hr), "CoCreateInstance returned 0x%08x\n", hr); + ok(SUCCEEDED(hr), "CoCreateInstance returned 0x%08x\n", hr); if (pUnk) { @@ -1073,8 +1085,8 @@ START_TEST(automation) test_dispid(); test_createrecord_and_version(); - todo_wine test_dispatch(); - todo_wine test_Installer(); + test_dispatch(); + test_Installer(); hr = IUnknown_Release(pUnk); ok (SUCCEEDED(hr), "IUnknown::Release returned 0x%08x\n", hr);

1 0

Misha Koshelev : msi: automation: Implement a few functions from the Session object.
by Alexandre Julliard May 2, 2007

May 2, 2007

Module: wine Branch: master Commit: e4d211a5e925460d0e25fb591c195f1e22530564 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4d211a5e925460d0e25fb591… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Mon Apr 30 20:54:15 2007 -0500 msi: automation: Implement a few functions from the Session object. --- dlls/msi/automation.c | 206 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 206 insertions(+), 0 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index dace6a8..84054c5 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -655,3 +655,209 @@ static HRESULT WINAPI DatabaseImpl_Invoke( return S_OK; } + +static HRESULT WINAPI SessionImpl_Invoke( + AutomationObject* This, + DISPID dispIdMember, + REFIID riid, + LCID lcid, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + WCHAR *szString; + DWORD dwLen; + IDispatch *pDispatch = NULL; + MSIHANDLE msiHandle; + LANGID langId; + UINT ret; + INSTALLSTATE iInstalled, iAction; + VARIANTARG varg0, varg1; + HRESULT hr; + + VariantInit(&varg0); + VariantInit(&varg1); + + switch (dispIdMember) + { + case DISPID_SESSION_PROPERTY: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = NULL; + ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), NULL, &dwLen); + if (ret == ERROR_SUCCESS) + { + szString = msi_alloc((++dwLen)*sizeof(WCHAR)); + if (szString) + { + if ((ret = MsiGetPropertyW(This->msiHandle, V_BSTR(&varg0), szString, &dwLen)) == ERROR_SUCCESS) + V_BSTR(pVarResult) = SysAllocString(szString); + msi_free(szString); + } + } + if (ret != ERROR_SUCCESS) + ERR("MsiGetProperty returned %d\n", ret); + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) { + VariantClear(&varg0); + return hr; + } + if ((ret = MsiSetPropertyW(This->msiHandle, V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetProperty returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_LANGUAGE: + if (wFlags & DISPATCH_PROPERTYGET) { + langId = MsiGetLanguage(This->msiHandle); + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = langId; + } + break; + + case DISPID_SESSION_MODE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_BOOL; + V_BOOL(pVarResult) = MsiGetMode(This->msiHandle, V_I4(&varg0)); + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_BOOL, &varg1, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiSetMode(This->msiHandle, V_I4(&varg0), V_BOOL(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetMode returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_DATABASE: + if (wFlags & DISPATCH_PROPERTYGET) { + V_VT(pVarResult) = VT_DISPATCH; + if ((msiHandle = MsiGetActiveDatabase(This->msiHandle))) + { + if (SUCCEEDED(create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Database, DatabaseImpl_Invoke))) + { + IDispatch_AddRef(pDispatch); + V_DISPATCH(pVarResult) = pDispatch; + } + } + else + { + ERR("MsiGetActiveDatabase failed\n"); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_DOACTION: + if (wFlags & DISPATCH_METHOD) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + ret = MsiDoActionW(This->msiHandle, V_BSTR(&varg0)); + V_VT(pVarResult) = VT_I4; + switch (ret) + { + case ERROR_FUNCTION_NOT_CALLED: + V_I4(pVarResult) = msiDoActionStatusNoAction; + break; + case ERROR_SUCCESS: + V_I4(pVarResult) = msiDoActionStatusSuccess; + break; + case ERROR_INSTALL_USEREXIT: + V_I4(pVarResult) = msiDoActionStatusUserExit; + break; + case ERROR_INSTALL_FAILURE: + V_I4(pVarResult) = msiDoActionStatusFailure; + break; + case ERROR_INSTALL_SUSPEND: + V_I4(pVarResult) = msiDoActionStatusSuspend; + break; + case ERROR_MORE_DATA: + V_I4(pVarResult) = msiDoActionStatusFinished; + break; + case ERROR_INVALID_HANDLE_STATE: + V_I4(pVarResult) = msiDoActionStatusWrongState; + break; + case ERROR_INVALID_DATA: + V_I4(pVarResult) = msiDoActionStatusBadActionData; + break; + default: + FIXME("MsiDoAction returned unhandled value %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + case DISPID_SESSION_SETINSTALLLEVEL: + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + if ((ret = MsiSetInstallLevel(This->msiHandle, V_I4(&varg0))) != ERROR_SUCCESS) + { + ERR("MsiSetInstallLevel returned %d\n", ret); + return DISP_E_EXCEPTION; + } + break; + + case DISPID_SESSION_FEATURECURRENTSTATE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_I4; + if ((ret = MsiGetFeatureStateW(This->msiHandle, V_BSTR(&varg0), &iInstalled, &iAction)) == ERROR_SUCCESS) + V_I4(pVarResult) = iInstalled; + else + { + ERR("MsiGetFeatureState returned %d\n", ret); + V_I4(pVarResult) = msiInstallStateUnknown; + } + } + break; + + case DISPID_SESSION_FEATUREREQUESTSTATE: + if (wFlags & DISPATCH_PROPERTYGET) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + V_VT(pVarResult) = VT_I4; + if ((ret = MsiGetFeatureStateW(This->msiHandle, V_BSTR(&varg0), &iInstalled, &iAction)) == ERROR_SUCCESS) + V_I4(pVarResult) = iAction; + else + { + ERR("MsiGetFeatureState returned %d\n", ret); + V_I4(pVarResult) = msiInstallStateUnknown; + } + } else if (wFlags & DISPATCH_PROPERTYPUT) { + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, DISPID_PROPERTYPUT, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) { + VariantClear(&varg0); + return hr; + } + if ((ret = MsiSetFeatureStateW(This->msiHandle, V_BSTR(&varg0), V_I4(&varg1))) != ERROR_SUCCESS) + { + ERR("MsiSetFeatureState returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + break; + + default: + return DISP_E_MEMBERNOTFOUND; + } + + return S_OK; +}

1 0