December 2009 - Wine-commits

James Hawkins : msi: Wine fails the test and passes us a Session object back, so free it in this case.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 50833f0780f34e33904b50ab1d9619f7cb4cc966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50833f0780f34e33904b50ab1… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:24 2009 -0800 msi: Wine fails the test and passes us a Session object back, so free it in this case. --- dlls/msi/tests/automation.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index bf3f942..bb498c0 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -721,6 +721,8 @@ static void test_dispatch(void) todo_wine ok(hr == DISP_E_EXCEPTION, "IDispatch::Invoke returned 0x%08x\n", hr); ok_exception(hr, szOpenPackageException); VariantClear(&vararg[0]); + if (hr != DISP_E_EXCEPTION) + VariantClear(&varresult); /* Try one parameter, the required BSTR. Second parameter is optional. * Proper installer package exists. Path to the package is absolute.

1 0

Andrew Nguyen : dxdiagn: Initialize a structure size member before calling EnumDisplayDevicesW.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 957281a8e3d20a07168fbd228f14bb732f3832bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=957281a8e3d20a07168fbd228… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Thu Dec 10 20:02:24 2009 -0600 dxdiagn: Initialize a structure size member before calling EnumDisplayDevicesW. --- dlls/dxdiagn/provider.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index cb91ed4..88d67b6 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -498,6 +498,7 @@ static HRESULT DXDiag_InitDXDiagDisplayContainer(IDxDiagContainer* pSubCont) hr = IDxDiagContainerImpl_AddChildContainer( pSubCont, szAdapterID, pDisplayAdapterSubCont ); if (FAILED( hr )) return hr; + disp_dev.cb = sizeof(disp_dev); if (EnumDisplayDevicesW( NULL, 0, &disp_dev, 0 )) { add_prop_str( pDisplayAdapterSubCont, szDeviceName, disp_dev.DeviceName );

1 0

Marcus Meissner : dmime: Actually get a pCLSID stream before using it ( Coverity).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 981589884094884173dad9bd35641db68d31fdce URL: http://source.winehq.org/git/wine.git/?a=commit;h=981589884094884173dad9bd3… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 11 00:04:40 2009 +0100 dmime: Actually get a pCLSID stream before using it (Coverity). --- dlls/dmime/segment.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 64cb10a..ca127d7 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -359,6 +359,12 @@ static HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_GetParam (LP LIST_FOR_EACH (pEntry, &This->Tracks) { pIt = LIST_ENTRY(pEntry, DMUS_PRIVATE_SEGMENT_TRACK, entry); + hr = IDirectMusicTrack_QueryInterface(pIt->pTrack, &IID_IPersistStream, (void**) &pCLSIDStream); + if (FAILED(hr)) { + ERR("(%p): object %p don't implement IPersistStream Interface. Expect a crash (critical problem)\n", This, pIt->pTrack); + continue ; + } + TRACE(" - %p -> 0x%x,%p\n", pIt, pIt->dwGroupBits, pIt->pTrack); if (0xFFFFFFFF != dwGroupBits && 0 == (pIt->dwGroupBits & dwGroupBits)) continue ;

1 0

Marcus Meissner : dmloader: pObject NULL checks are not necessary (Coverity ).
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 6891b963645b01909bdcec9830cf5f43004fffe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6891b963645b01909bdcec983… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Dec 11 00:10:02 2009 +0100 dmloader: pObject NULL checks are not necessary (Coverity). --- dlls/dmloader/loader.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 17a8eb2..393b6b9 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -333,18 +333,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR if (!pObjectEntry) { pObjectEntry = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(WINE_LOADER_ENTRY)); DM_STRUCT_INIT(&pObjectEntry->Desc); - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; list_add_head (This->pObjects, &pObjectEntry->entry); } else { - if (pObject) { - DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); - pObjectEntry->pObject = pObject; - pObjectEntry->bInvalidDefaultDLS = FALSE; - } + DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); + pObjectEntry->pObject = pObject; + pObjectEntry->bInvalidDefaultDLS = FALSE; } TRACE(": filled in cache entry\n"); } else TRACE(": caching disabled\n");

1 0

James Hawkins : msi: Fix a handle leak in the record tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: a44b653d53806a62cd8b80a59174e3923113ae6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a44b653d53806a62cd8b80a59… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:06 2009 -0800 msi: Fix a handle leak in the record tests. --- dlls/msi/tests/record.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/record.c b/dlls/msi/tests/record.c index e8dd6f5..0da69c7 100644 --- a/dlls/msi/tests/record.c +++ b/dlls/msi/tests/record.c @@ -604,6 +604,7 @@ static void test_fieldzero(void) r = MsiRecordIsNull(rec, 0); ok(r == FALSE, "Expected FALSE, got %d\n", r); + MsiCloseHandle(rec); MsiCloseHandle(hdb); DeleteFileA(msifile); }

1 0

James Hawkins : msi: Close the original record before copying new data into it.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 9ab7d9e21a0e6af8159902835f17b2d82a9d0380 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab7d9e21a0e6af8159902835… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:12 2009 -0800 msi: Close the original record before copying new data into it. --- dlls/msi/msipriv.h | 1 + dlls/msi/record.c | 2 +- dlls/msi/table.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5b23f55..0e1a23b 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -698,6 +698,7 @@ extern UINT msi_parse_command_line( MSIPACKAGE *package, LPCWSTR szCommandLine, BOOL preserve_case ); /* record internals */ +extern void MSI_CloseRecord( MSIOBJECTHDR * ); extern UINT MSI_RecordSetIStream( MSIRECORD *, UINT, IStream *); extern UINT MSI_RecordGetIStream( MSIRECORD *, UINT, IStream **); extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, UINT ); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index 68eab69..45adbac 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -64,7 +64,7 @@ static void MSI_FreeField( MSIFIELD *field ) } } -static void MSI_CloseRecord( MSIOBJECTHDR *arg ) +void MSI_CloseRecord( MSIOBJECTHDR *arg ) { MSIRECORD *rec = (MSIRECORD *) arg; UINT i; diff --git a/dlls/msi/table.c b/dlls/msi/table.c index d2b9a00..7c341a7 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1835,6 +1835,9 @@ static UINT msi_refresh_record( struct tagMSIVIEW *view, MSIRECORD *rec, UINT ro if (r != ERROR_SUCCESS) return r; + /* Close the original record */ + MSI_CloseRecord(&rec->hdr); + count = MSI_RecordGetFieldCount(rec); for (i = 0; i < count; i++) MSI_RecordCopyField(curr, i + 1, rec, i + 1);

1 0

James Hawkins : msi: Stub out a few more Installer object methods.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: ae58e29e5e436b16c75f6ea0b63dab7acd701299 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae58e29e5e436b16c75f6ea0b… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:43 2009 -0800 msi: Stub out a few more Installer object methods. --- dlls/msi/automation.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/msi/msiserver.idl | 27 ++++++++++++++++ dlls/msi/msiserver_dispids.h | 8 +++++ dlls/msi/tests/automation.c | 35 +++++++++----------- 4 files changed, 123 insertions(+), 19 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 3b3aa8f..2975df7 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1624,6 +1624,15 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_OPENPRODUCT: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: OpenProduct"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_OPENDATABASE: if (wFlags & DISPATCH_METHOD) { @@ -1658,6 +1667,15 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_SUMMARYINFORMATION: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: SummaryInformation"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_UILEVEL: if (wFlags & DISPATCH_PROPERTYPUT) { @@ -1683,6 +1701,15 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_ENABLELOG: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: EnableLog"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_INSTALLPRODUCT: if (wFlags & DISPATCH_METHOD) { @@ -1725,6 +1752,15 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_LASTERRORRECORD: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: LastErrorRecord"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_REGISTRYVALUE: if (wFlags & DISPATCH_METHOD) { HKEY hkey; @@ -1819,6 +1855,42 @@ static HRESULT WINAPI InstallerImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_INSTALLER_ENVIRONMENT: + if (wFlags & DISPATCH_PROPERTYGET || wFlags & DISPATCH_PROPERTYPUT) + { + VariantInit(pVarResult); + FIXME("Unhandled property: Environment"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + + case DISPID_INSTALLER_FILEATTRIBUTES: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: FileAttributes"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + + case DISPID_INSTALLER_FILESIZE: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: FileSize"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + + case DISPID_INSTALLER_FILEVERSION: + if (wFlags & DISPATCH_METHOD) + { + VariantInit(pVarResult); + FIXME("Unhandled method: FileVersion"); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_INSTALLER_PRODUCTSTATE: if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 753cbb0..8e49368 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -152,21 +152,48 @@ library WindowsInstaller Session* OpenPackage( [in] VARIANT PackagePath, [in, optional, defaultvalue(0)] long Options); + [id(DISPID_INSTALLER_OPENPRODUCT)] + Session* OpenProduct( + [in] BSTR ProductCode); + [id(DISPID_INSTALLER_SUMMARYINFORMATION)] + SummaryInfo* SummaryInformation( + [in] BSTR PackagePath, + [in, optional, defaultvalue(0)] long UpdateCount); [id(DISPID_INSTALLER_OPENDATABASE)] Database *OpenDatabase( [in] BSTR DatabasePath, [in] VARIANT OpenMode); + [id(DISPID_INSTALLER_ENABLELOG)] + void EnableLog( + [in] BSTR LogMode, + [in] BSTR LogFile); [id(DISPID_INSTALLER_INSTALLPRODUCT)] void InstallProduct( [in] BSTR PackagePath, [in, optional, defaultvalue("0")] BSTR PropertyValues); [id(DISPID_INSTALLER_VERSION)] BSTR Version(); + [id(DISPID_INSTALLER_LASTERRORRECORD)] + Record* LastErrorRecord(); [id(DISPID_INSTALLER_REGISTRYVALUE), propget] BSTR RegistryValue( [in] VARIANT Root, [in] BSTR Key, [in, optional] VARIANT Value); + [id(DISPID_INSTALLER_ENVIRONMENT), propget] + BSTR Environment([in] BSTR Variable); + [id(DISPID_INSTALLER_ENVIRONMENT), propput] + void Environment( + [in] BSTR Variable, + [in] BSTR rhs); + [id(DISPID_INSTALLER_FILEATTRIBUTES)] + long FileAttributes([in] BSTR FilePath); + [id(DISPID_INSTALLER_FILESIZE)] + long FileSize([in] BSTR FilePath); + [id(DISPID_INSTALLER_FILEVERSION)] + BSTR FileVersion( + [in] BSTR FilePath, + [in, optional] VARIANT Language); [id(DISPID_INSTALLER_PRODUCTSTATE), propget] MsiInstallState ProductState( [in] BSTR Product); diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index e6078fd..d98d784 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -18,11 +18,19 @@ #define DISPID_INSTALLER_CREATERECORD 1 #define DISPID_INSTALLER_OPENPACKAGE 2 +#define DISPID_INSTALLER_OPENPRODUCT 3 #define DISPID_INSTALLER_OPENDATABASE 4 +#define DISPID_INSTALLER_SUMMARYINFORMATION 5 #define DISPID_INSTALLER_UILEVEL 6 +#define DISPID_INSTALLER_ENABLELOG 7 #define DISPID_INSTALLER_INSTALLPRODUCT 8 #define DISPID_INSTALLER_VERSION 9 +#define DISPID_INSTALLER_LASTERRORRECORD 10 #define DISPID_INSTALLER_REGISTRYVALUE 11 +#define DISPID_INSTALLER_ENVIRONMENT 12 +#define DISPID_INSTALLER_FILEATTRIBUTES 13 +#define DISPID_INSTALLER_FILESIZE 15 +#define DISPID_INSTALLER_FILEVERSION 16 #define DISPID_INSTALLER_PRODUCTSTATE 17 #define DISPID_INSTALLER_PRODUCTINFO 18 #define DISPID_INSTALLER_PRODUCTS 35 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 6c24908..bf3f942 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -477,35 +477,32 @@ static void test_dispid(void) ok(dispid == 1, "Expected 1, got %d\n", dispid); dispid = get_dispid(pInstaller, "OpenPackage"); ok(dispid == 2, "Expected 2, got %d\n", dispid); + dispid = get_dispid(pInstaller, "OpenProduct"); + ok(dispid == 3, "Expected 3, got %d\n", dispid); dispid = get_dispid(pInstaller, "OpenDatabase"); ok(dispid == 4, "Expected 4, got %d\n", dispid); + dispid = get_dispid(pInstaller, "SummaryInformation"); + ok(dispid == 5, "Expected 5, got %d\n", dispid); dispid = get_dispid( pInstaller, "UILevel" ); ok(dispid == 6, "Expected 6, got %d\n", dispid); + dispid = get_dispid(pInstaller, "EnableLog"); + ok(dispid == 7, "Expected 7, got %d\n", dispid); dispid = get_dispid(pInstaller, "InstallProduct"); ok(dispid == 8, "Expected 8, got %d\n", dispid); dispid = get_dispid(pInstaller, "Version"); ok(dispid == 9, "Expected 9, got %d\n", dispid); + dispid = get_dispid(pInstaller, "LastErrorRecord"); + ok(dispid == 10, "Expected 10, got %d\n", dispid); dispid = get_dispid(pInstaller, "RegistryValue"); ok(dispid == 11, "Expected 11, got %d\n", dispid); - todo_wine - { - dispid = get_dispid(pInstaller, "OpenProduct"); - ok(dispid == 3, "Expected 3, got %d\n", dispid); - dispid = get_dispid(pInstaller, "SummaryInformation"); - ok(dispid == 5, "Expected 5, got %d\n", dispid); - dispid = get_dispid(pInstaller, "EnableLog"); - ok(dispid == 7, "Expected 7, got %d\n", dispid); - dispid = get_dispid(pInstaller, "LastErrorRecord"); - ok(dispid == 10, "Expected 10, got %d\n", dispid); - dispid = get_dispid(pInstaller, "Environment"); - ok(dispid == 12, "Expected 12, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileAttributes"); - ok(dispid == 13, "Expected 13, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileSize"); - ok(dispid == 15, "Expected 15, got %d\n", dispid); - dispid = get_dispid(pInstaller, "FileVersion"); - ok(dispid == 16, "Expected 16, got %d\n", dispid); - } + dispid = get_dispid(pInstaller, "Environment"); + ok(dispid == 12, "Expected 12, got %d\n", dispid); + dispid = get_dispid(pInstaller, "FileAttributes"); + ok(dispid == 13, "Expected 13, got %d\n", dispid); + dispid = get_dispid(pInstaller, "FileSize"); + ok(dispid == 15, "Expected 15, got %d\n", dispid); + dispid = get_dispid(pInstaller, "FileVersion"); + ok(dispid == 16, "Expected 16, got %d\n", dispid); dispid = get_dispid(pInstaller, "ProductState"); ok(dispid == 17, "Expected 17, got %d\n", dispid); dispid = get_dispid(pInstaller, "ProductInfo");

1 0

James Hawkins : msi: Refactor the Installer. CreateRecord method into InstallerImpl_CreateRecord.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: b73389b6bf5c4649761f8650d013b9bdc88a5fd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73389b6bf5c4649761f8650d… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:50 2009 -0800 msi: Refactor the Installer.CreateRecord method into InstallerImpl_CreateRecord. --- dlls/msi/automation.c | 55 +++++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 20 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 2975df7..83f5f79 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1534,6 +1534,39 @@ static void variant_from_registry_value(VARIANT *pVarResult, DWORD dwType, LPBYT } } +static HRESULT InstallerImpl_CreateRecord(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + MSIHANDLE hrec; + IDispatch* dispatch; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + V_VT(pVarResult) = VT_DISPATCH; + + hrec = MsiCreateRecord(V_I4(&varg0)); + if (!hrec) + return DISP_E_EXCEPTION; + + hr = create_automation_object(hrec, NULL, (LPVOID*)&dispatch, + &DIID_Record, RecordImpl_Invoke, NULL, 0); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1561,26 +1594,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( switch (dispIdMember) { case DISPID_INSTALLER_CREATERECORD: - if (wFlags & DISPATCH_METHOD) - { - hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); - if (FAILED(hr)) return hr; - V_VT(pVarResult) = VT_DISPATCH; - if ((msiHandle = MsiCreateRecord(V_I4(&varg0)))) - { - if (SUCCEEDED(hr = create_automation_object(msiHandle, NULL, (LPVOID*)&pDispatch, &DIID_Record, RecordImpl_Invoke, NULL, 0))) - V_DISPATCH(pVarResult) = pDispatch; - else - ERR("Failed to create Record object, hresult 0x%08x\n", hr); - } - else - { - ERR("MsiCreateRecord failed\n"); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_CreateRecord(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPACKAGE: if (wFlags & DISPATCH_METHOD)

1 0

James Hawkins : msi: Refactor the Installer. OpenPackage method into InstallerImpl_OpenPackage.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: b33d47e773958207465007f74ea89b3fc7e0bee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b33d47e773958207465007f74… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:01:58 2009 -0800 msi: Refactor the Installer.OpenPackage method into InstallerImpl_OpenPackage. --- dlls/msi/automation.c | 101 +++++++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 83f5f79..61c6221 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1567,6 +1567,65 @@ static HRESULT InstallerImpl_CreateRecord(WORD wFlags, return hr; } +static HRESULT InstallerImpl_OpenPackage(AutomationObject* This, + WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + MSIHANDLE hpkg; + IDispatch* dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + if (pDispParams->cArgs == 0) + return DISP_E_TYPEMISMATCH; + + if (V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1]) != VT_BSTR) + return DISP_E_TYPEMISMATCH; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + VariantInit(&varg1); + if (pDispParams->cArgs == 2) + { + hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); + if (FAILED(hr)) + goto done; + } + else + { + V_VT(&varg1) = VT_I4; + V_I4(&varg1) = 0; + } + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &hpkg); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_session(hpkg, (IDispatch *)This, &dispatch); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1598,46 +1657,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPACKAGE: - if (wFlags & DISPATCH_METHOD) - { - if (pDispParams->cArgs == 0) - return DISP_E_TYPEMISMATCH; - if (V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1]) != VT_BSTR) - return DISP_E_TYPEMISMATCH; - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - if (pDispParams->cArgs == 2) - { - hr = DispGetParam(pDispParams, 1, VT_I4, &varg1, puArgErr); - if (FAILED(hr)) - { - VariantClear(&varg0); - return hr; - } - } - else - { - VariantInit(&varg1); - V_VT(&varg1) = VT_I4; - V_I4(&varg1) = 0; - } - V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiOpenPackageExW(V_BSTR(&varg0), V_I4(&varg1), &msiHandle)) == ERROR_SUCCESS) - { - if (SUCCEEDED(hr = create_session(msiHandle, (IDispatch *)This, &pDispatch))) - V_DISPATCH(pVarResult) = pDispatch; - else - ERR("Failed to create Session object, hresult 0x%08x\n", hr); - } - else - { - VariantClear(&varg0); - ERR("MsiOpenPackageEx returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenPackage(This, wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPRODUCT: if (wFlags & DISPATCH_METHOD)

1 0

James Hawkins : msi: Refactor Installer.OpenProduct and Installer. OpenDatabase into respective functions.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 554e1318c046d079ad4a866082ce0814ea19d58e URL: http://source.winehq.org/git/wine.git/?a=commit;h=554e1318c046d079ad4a86608… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:08 2009 -0800 msi: Refactor Installer.OpenProduct and Installer.OpenDatabase into respective functions. --- dlls/msi/automation.c | 114 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 74 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 61c6221..30cdc54 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1626,6 +1626,76 @@ done: return hr; } +static HRESULT InstallerImpl_OpenProduct(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + FIXME("%s\n", debugstr_w(V_BSTR(&varg0))); + + VariantInit(pVarResult); + + VariantClear(&varg0); + return S_OK; +} + +static HRESULT InstallerImpl_OpenDatabase(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + MSIHANDLE hdb; + IDispatch* dispatch; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + VariantInit(&varg1); + hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); + if (FAILED(hr)) + goto done; + + V_VT(pVarResult) = VT_DISPATCH; + + ret = MsiOpenDatabaseW(V_BSTR(&varg0), V_BSTR(&varg1), &hdb); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + hr = create_automation_object(hdb, NULL, (LPVOID *)&dispatch, + &DIID_Database, DatabaseImpl_Invoke, NULL, 0); + if (SUCCEEDED(hr)) + V_DISPATCH(pVarResult) = dispatch; + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1637,7 +1707,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - MSIHANDLE msiHandle; IDispatch *pDispatch = NULL; UINT ret; VARIANTARG varg0, varg1, varg2; @@ -1661,47 +1730,12 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENPRODUCT: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: OpenProduct"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenProduct(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_OPENDATABASE: - if (wFlags & DISPATCH_METHOD) - { - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - - hr = DispGetParam(pDispParams, 1, VT_BSTR, &varg1, puArgErr); - if (FAILED(hr)) - { - VariantClear(&varg0); - return hr; - } - - V_VT(pVarResult) = VT_DISPATCH; - if ((ret = MsiOpenDatabaseW(V_BSTR(&varg0), V_BSTR(&varg1), &msiHandle)) == ERROR_SUCCESS) - { - hr = create_automation_object(msiHandle, NULL, (LPVOID *)&pDispatch, - &DIID_Database, DatabaseImpl_Invoke, NULL, 0); - if (SUCCEEDED(hr)) - V_DISPATCH(pVarResult) = pDispatch; - else - ERR("Failed to create Database object: 0x%08x\n", hr); - } - else - { - VariantClear(&varg0); - VariantClear(&varg1); - ERR("MsiOpenDatabase returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_OpenDatabase(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_SUMMARYINFORMATION: if (wFlags & DISPATCH_METHOD)

1 0