wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

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

11 Dec '09

Module: wine Branch: master Commit: 11b4fe743a362afa2a46e9963583031e999c7130 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11b4fe743a362afa2a46e9963… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:58 2009 -0800 msi: Refactor the Installer.RegistryValue method into InstallerImpl_RegistryValue. --- dlls/msi/automation.c | 244 ++++++++++++++++++++++++++++++------------------ 1 files changed, 152 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11b4fe743a362afa2a46e…

1 0

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

11 Dec '09

Module: wine Branch: master Commit: 138d5f1f6c8b0b5769bd054ab51718fefd8e643e URL: http://source.winehq.org/git/wine.git/?a=commit;h=138d5f1f6c8b0b5769bd054ab… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:49 2009 -0800 msi: Refactor the Installer.Version method into InstallerImpl_Version. --- dlls/msi/automation.c | 48 ++++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 031b11e..f26ad53 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1799,6 +1799,34 @@ done: return hr; } +static HRESULT InstallerImpl_Version(WORD wFlags, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + DLLVERSIONINFO verinfo; + WCHAR version[MAX_PATH]; + + static const WCHAR format[] = { + '%','d','.','%','d','.','%','d','.','%','d',0}; + + if (!(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + verinfo.cbSize = sizeof(DLLVERSIONINFO); + hr = DllGetVersion(&verinfo); + if (FAILED(hr)) + return hr; + + sprintfW(version, format, verinfo.dwMajorVersion, verinfo.dwMinorVersion, + verinfo.dwBuildNumber, verinfo.dwPlatformID); + + V_VT(pVarResult) = VT_BSTR; + V_BSTR(pVarResult) = SysAllocString(version); + return S_OK; +} + static HRESULT InstallerImpl_LastErrorRecord(WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, @@ -1933,24 +1961,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( puArgErr); case DISPID_INSTALLER_VERSION: - if (wFlags & DISPATCH_PROPERTYGET) { - DLLVERSIONINFO verinfo; - WCHAR version[MAX_PATH]; - - static const WCHAR format[] = {'%','d','.','%','d','.','%','d','.','%','d',0}; - - verinfo.cbSize = sizeof(DLLVERSIONINFO); - hr = DllGetVersion(&verinfo); - if (FAILED(hr)) return hr; - - sprintfW(version, format, verinfo.dwMajorVersion, verinfo.dwMinorVersion, - verinfo.dwBuildNumber, verinfo.dwPlatformID); - - V_VT(pVarResult) = VT_BSTR; - V_BSTR(pVarResult) = SysAllocString(version); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_Version(wFlags, pVarResult, + pExcepInfo, puArgErr); case DISPID_INSTALLER_LASTERRORRECORD: return InstallerImpl_LastErrorRecord(wFlags, pDispParams,

1 0

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

11 Dec '09

Module: wine Branch: master Commit: 96c480b880fe9c696791a074286d47fded32eeee URL: http://source.winehq.org/git/wine.git/?a=commit;h=96c480b880fe9c696791a0742… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:39 2009 -0800 msi: Refactor the Installer.InstallProduct method into InstallerImpl_InstallProduct. --- dlls/msi/automation.c | 59 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 1e25ec9..031b11e 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1763,6 +1763,42 @@ static HRESULT InstallerImpl_EnableLog(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_InstallProduct(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + 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; + + ret = MsiInstallProductW(V_BSTR(&varg0), V_BSTR(&varg1)); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT InstallerImpl_LastErrorRecord(WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, @@ -1892,26 +1928,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_INSTALLPRODUCT: - 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; - } - if ((ret = MsiInstallProductW(V_BSTR(&varg0), V_BSTR(&varg1))) != ERROR_SUCCESS) - { - VariantClear(&varg1); - VariantClear(&varg0); - ERR("MsiInstallProduct returned %d\n", ret); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_InstallProduct(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_VERSION: if (wFlags & DISPATCH_PROPERTYGET) {

1 0

James Hawkins : msi: Refactor the remaining Installer object stub methods into respective functions .
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 851e4779be4c76f46b5eec4eed2e7bc2ee6c2230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851e4779be4c76f46b5eec4ee… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:32 2009 -0800 msi: Refactor the remaining Installer object stub methods into respective functions. --- dlls/msi/automation.c | 146 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 104 insertions(+), 42 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 674bd8d..1e25ec9 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1748,6 +1748,96 @@ static HRESULT InstallerImpl_UILevel(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_EnableLog(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_LastErrorRecord(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_Environment(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileAttributes(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileSize(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + +static HRESULT InstallerImpl_FileVersion(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1798,13 +1888,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_ENABLELOG: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: EnableLog"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_EnableLog(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_INSTALLPRODUCT: if (wFlags & DISPATCH_METHOD) @@ -1849,13 +1934,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; case DISPID_INSTALLER_LASTERRORRECORD: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: LastErrorRecord"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_LastErrorRecord(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_REGISTRYVALUE: if (wFlags & DISPATCH_METHOD) { @@ -1952,40 +2033,21 @@ static HRESULT WINAPI InstallerImpl_Invoke( break; case DISPID_INSTALLER_ENVIRONMENT: - if (wFlags & DISPATCH_PROPERTYGET || wFlags & DISPATCH_PROPERTYPUT) - { - VariantInit(pVarResult); - FIXME("Unhandled property: Environment"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_Environment(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_FILEATTRIBUTES: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileAttributes"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileAttributes(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_FILESIZE: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileSize"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileSize(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_FILEVERSION: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: FileVersion"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_FileVersion(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTSTATE: if (wFlags & DISPATCH_PROPERTYGET) {

1 0

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

11 Dec '09

Module: wine Branch: master Commit: dc0889752ae6a08303bfcb7c4d2013635e870f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0889752ae6a08303bfcb7c4… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:24 2009 -0800 msi: Refactor the Installer.UILevel method into InstallerImpl_UILevel. --- dlls/msi/automation.c | 63 ++++++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 0d42382..674bd8d 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1711,6 +1711,43 @@ static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_UILevel(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + INSTALLUILEVEL ui; + + if (!(wFlags & DISPATCH_PROPERTYPUT) && !(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + if (wFlags & DISPATCH_PROPERTYPUT) + { + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + ui = MsiSetInternalUI(V_I4(&varg0), NULL); + if (ui == INSTALLUILEVEL_NOCHANGE) + return DISP_E_EXCEPTION; + } + else if (wFlags & DISPATCH_PROPERTYGET) + { + ui = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL); + if (ui == INSTALLUILEVEL_NOCHANGE) + return DISP_E_EXCEPTION; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = ui; + } + + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1728,7 +1765,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( HRESULT hr; LPWSTR szString = NULL; DWORD dwSize = 0; - INSTALLUILEVEL ui; VariantInit(&varg0); VariantInit(&varg1); @@ -1758,29 +1794,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( puArgErr); case DISPID_INSTALLER_UILEVEL: - if (wFlags & DISPATCH_PROPERTYPUT) - { - hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); - if (FAILED(hr)) return hr; - if ((ui = MsiSetInternalUI(V_I4(&varg0), NULL) == INSTALLUILEVEL_NOCHANGE)) - { - ERR("MsiSetInternalUI failed\n"); - return DISP_E_EXCEPTION; - } - } - else if (wFlags & DISPATCH_PROPERTYGET) - { - if ((ui = MsiSetInternalUI(INSTALLUILEVEL_NOCHANGE, NULL) == INSTALLUILEVEL_NOCHANGE)) - { - ERR("MsiSetInternalUI failed\n"); - return DISP_E_EXCEPTION; - } - - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = ui; - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_UILevel(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_ENABLELOG: if (wFlags & DISPATCH_METHOD)

1 0

James Hawkins : msi: Refactor the Installer. SummaryInformation method to InstallerImpl_SummaryInformation.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 18ba830ff8f16395ad43da996b995d6ea8113bf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ba830ff8f16395ad43da996… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:02:16 2009 -0800 msi: Refactor the Installer.SummaryInformation method to InstallerImpl_SummaryInformation. --- dlls/msi/automation.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 30cdc54..0d42382 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -1696,6 +1696,21 @@ done: return hr; } +static HRESULT InstallerImpl_SummaryInformation(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + if (!(wFlags & DISPATCH_METHOD)) + return DISP_E_MEMBERNOTFOUND; + + FIXME("\n"); + + VariantInit(pVarResult); + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -1738,13 +1753,9 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_SUMMARYINFORMATION: - if (wFlags & DISPATCH_METHOD) - { - VariantInit(pVarResult); - FIXME("Unhandled method: SummaryInformation"); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_SummaryInformation(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); case DISPID_INSTALLER_UILEVEL: if (wFlags & DISPATCH_PROPERTYPUT)

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

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 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: 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

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 December 2009