December 2009 - Wine-commits

Paul Vriens : shell32/tests: Fix a test failure on a default Windows 7 system.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 9233215ae7a54d4a4ab7730d362669b37e7a9742 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9233215ae7a54d4a4ab7730d3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 11 12:56:01 2009 +0100 shell32/tests: Fix a test failure on a default Windows 7 system. --- dlls/shell32/tests/shlfolder.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index caae425..f676a2a 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -647,8 +647,12 @@ static void test_CallForAttributes(void) * key. So the test will return at this point, if run on wine. */ lResult = RegOpenKeyExW(HKEY_CLASSES_ROOT, wszMyDocumentsKey, 0, KEY_WRITE|KEY_READ, &hKey); - ok (lResult == ERROR_SUCCESS, "RegOpenKeyEx failed! result: %08x\n", lResult); + ok (lResult == ERROR_SUCCESS || + lResult == ERROR_ACCESS_DENIED, + "RegOpenKeyEx failed! result: %08x\n", lResult); if (lResult != ERROR_SUCCESS) { + if (lResult == ERROR_ACCESS_DENIED) + skip("Not enough rights to open the registry key\n"); IMalloc_Free(ppM, pidlMyDocuments); IShellFolder_Release(psfDesktop); return;

1 0

Aric Stewart : shlwapi: Ordinal 196 is SHVerbExistsNA not DnsRecordSetCompare.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 3635bbb928d75a6660b8138722e7fd1b4dc01bd2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3635bbb928d75a6660b813872… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Dec 11 08:43:22 2009 -0600 shlwapi: Ordinal 196 is SHVerbExistsNA not DnsRecordSetCompare. --- dlls/shlwapi/Makefile.in | 2 +- dlls/shlwapi/ordinal.c | 19 +++++++++++++++++++ dlls/shlwapi/shlwapi.spec | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/Makefile.in b/dlls/shlwapi/Makefile.in index 20329f6..2594a19 100644 --- a/dlls/shlwapi/Makefile.in +++ b/dlls/shlwapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = shlwapi.dll IMPORTLIB = shlwapi IMPORTS = uuid user32 gdi32 advapi32 kernel32 ntdll -DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version dnsapi +DELAYIMPORTS = oleaut32 ole32 comctl32 comdlg32 mpr mlang urlmon shell32 winmm version C_SRCS = \ assoc.c \ diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 73d0f7e..f127ca1 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4709,3 +4709,22 @@ INT WINAPI ZoneCheckUrlExW(LPWSTR szURL, PVOID pUnknown, DWORD dwUnknown2, return 0; } + +/*********************************************************************** + * SHVerbExistsNA [SHLWAPI.196] + * + * + * PARAMS + * + * verb [I] a string, often appears to be an extension. + * + * Other parameters currently unknown. + * + * RETURNS + * unknown + */ +INT WINAPI SHVerbExistsNA(LPSTR verb, PVOID pUnknown, PVOID pUnknown2, DWORD dwUnknown3) +{ + FIXME("(%s, %p, %p, %i) STUB\n",verb, pUnknown, pUnknown2, dwUnknown3); + return 0; +} diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index a8e7428..c877dd1 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -193,7 +193,7 @@ 193 stdcall -noname SHGetCurColorRes() 194 stdcall -noname SHWaitForSendMessageThread(ptr long) 195 stdcall -noname SHIsExpandableFolder(ptr ptr) -196 stdcall -noname DnsRecordSetCompare(ptr ptr ptr ptr) dnsapi.DnsRecordSetCompare +196 stdcall -noname SHVerbExistsNA(str ptr ptr long) 197 stdcall -noname SHFillRectClr(long ptr long) 198 stdcall -noname SHSearchMapInt(ptr ptr long long) 199 stdcall -noname IUnknown_Set(ptr ptr)

1 0

Nikolay Sivov : oleaut32/tests: Fix a couple of leaks in tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 7f9d5aad7ca1b6468df4aa9259f4b4fcaa588555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f9d5aad7ca1b6468df4aa925… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Dec 11 15:14:32 2009 +0300 oleaut32/tests: Fix a couple of leaks in tests. --- dlls/oleaut32/tests/olepicture.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 55d883b..c8ddc8a 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -357,6 +357,7 @@ static void test_empty_image(void) { ok (hres == S_OK,"empty picture get handle failed with hres 0x%08x\n", hres); ok (handle == 0, "empty picture get handle did not return 0, but 0x%08x\n", handle); IPicture_Release (pic); + IStream_Release (stream); } static void test_empty_image_2(void) { @@ -395,6 +396,7 @@ static void test_empty_image_2(void) { ok (type == PICTYPE_NONE,"type is %d, but should be PICTYPE_NONE(0)\n", type); IPicture_Release (pic); + IStream_Release (stream); } static void test_Invoke(void) @@ -408,16 +410,17 @@ static void test_Invoke(void) HGLOBAL hglob; void *data; - hglob = GlobalAlloc (0, sizeof(gifimage)); - data = GlobalLock(hglob); - memcpy(data, gifimage, sizeof(gifimage)); + hglob = GlobalAlloc (0, sizeof(gifimage)); + data = GlobalLock(hglob); + memcpy(data, gifimage, sizeof(gifimage)); GlobalUnlock(hglob); - hr = CreateStreamOnHGlobal (hglob, FALSE, &stream); + hr = CreateStreamOnHGlobal (hglob, FALSE, &stream); ok_ole_success(hr, "CreateStreamOnHGlobal"); - hr = pOleLoadPicture(stream, sizeof(gifimage), TRUE, &IID_IPictureDisp, (void **)&picdisp); + hr = pOleLoadPicture(stream, sizeof(gifimage), TRUE, &IID_IPictureDisp, (void **)&picdisp); IStream_Release(stream); + GlobalFree(hglob); ok_ole_success(hr, "OleLoadPicture"); V_VT(&vararg) = VT_BOOL;

1 0

Huw Davies : oleaut32: Fix double-free in tests.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: 026576995ead1df76e56546b981a7dce398fd808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=026576995ead1df76e56546b9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 11 13:28:19 2009 +0000 oleaut32: Fix double-free in tests. Found by Valgrind. --- dlls/oleaut32/tests/vartype.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 7e7fe35..3ea6ac2 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -4889,7 +4889,8 @@ static void test_VarBstrFromR4(void) } } -#define BSTR_DATE(dt,str) SysFreeString(bstr); bstr = NULL; \ +#define BSTR_DATE(dt,str) \ + bstr = NULL; \ hres = pVarBstrFromDate(dt,lcid,LOCALE_NOUSEROVERRIDE,&bstr); \ if (bstr) {WideCharToMultiByte(CP_ACP, 0, bstr, -1, buff, sizeof(buff), 0, 0); SysFreeString(bstr);} \ else buff[0] = 0; \ @@ -4901,7 +4902,7 @@ static void test_VarBstrFromDate(void) char buff[256]; LCID lcid; HRESULT hres; - BSTR bstr = NULL; + BSTR bstr; CHECKPTR(VarBstrFromDate); lcid = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT);

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. 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. ProductState method into InstallerImpl_ProductState.
by Alexandre Julliard 11 Dec '09

11 Dec '09

Module: wine Branch: master Commit: fd2884a1553994b055aa8c6588e821d68db40ac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd2884a1553994b055aa8c658… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:03:04 2009 -0800 msi: Refactor the Installer.ProductState method into InstallerImpl_ProductState. --- dlls/msi/automation.c | 35 +++++++++++++++++++++++++++-------- 1 files changed, 27 insertions(+), 8 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 16eb836..9317ff4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2051,6 +2051,31 @@ static HRESULT InstallerImpl_FileVersion(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_ProductState(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + HRESULT hr; + VARIANTARG varg0; + + + if (!(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = MsiQueryProductStateW(V_BSTR(&varg0)); + + VariantClear(&varg0); + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -2141,14 +2166,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTSTATE: - if (wFlags & DISPATCH_PROPERTYGET) { - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = MsiQueryProductStateW(V_BSTR(&varg0)); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_ProductState(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTINFO: if (wFlags & DISPATCH_PROPERTYGET) {

1 0

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

11 Dec '09

Module: wine Branch: master Commit: 9f09d47be3aab11db89eba2eca59d261b7cc5c60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f09d47be3aab11db89eba2ec… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:03:10 2009 -0800 msi: Refactor the Installer.ProductInfo method into InstallerImpl_ProductInfo. --- dlls/msi/automation.c | 94 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 62 insertions(+), 32 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 9317ff4..7a5e355 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2060,7 +2060,6 @@ static HRESULT InstallerImpl_ProductState(WORD wFlags, HRESULT hr; VARIANTARG varg0; - if (!(wFlags & DISPATCH_PROPERTYGET)) return DISP_E_MEMBERNOTFOUND; @@ -2076,6 +2075,66 @@ static HRESULT InstallerImpl_ProductState(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_ProductInfo(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + DWORD size; + LPWSTR str; + VARIANTARG varg0, varg1; + + if (!(wFlags & DISPATCH_PROPERTYGET)) + 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_BSTR; + V_BSTR(pVarResult) = NULL; + + ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), NULL, &size); + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + str = msi_alloc(++size * sizeof(WCHAR)); + if (!str) + { + hr = E_OUTOFMEMORY; + goto done; + } + + ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), str, &size); + msi_free(str); + + if (ret != ERROR_SUCCESS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + V_BSTR(pVarResult) = SysAllocString(str); + hr = S_OK; + +done: + VariantClear(&varg0); + VariantClear(&varg1); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -2091,8 +2150,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( UINT ret; VARIANTARG varg0, varg1, varg2; HRESULT hr; - LPWSTR szString = NULL; - DWORD dwSize = 0; VariantInit(&varg0); VariantInit(&varg1); @@ -2170,35 +2227,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTINFO: - if (wFlags & DISPATCH_PROPERTYGET) { - 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_BSTR; - V_BSTR(pVarResult) = NULL; - if ((ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), NULL, &dwSize)) == ERROR_SUCCESS) - { - if (!(szString = msi_alloc((++dwSize)*sizeof(WCHAR)))) - ERR("Out of memory\n"); - else if ((ret = MsiGetProductInfoW(V_BSTR(&varg0), V_BSTR(&varg1), szString, &dwSize)) == ERROR_SUCCESS) - V_BSTR(pVarResult) = SysAllocString(szString); - msi_free(szString); - } - if (ret != ERROR_SUCCESS) - { - ERR("MsiGetProductInfo returned %d\n", ret); - VariantClear(&varg1); - VariantClear(&varg0); - return DISP_E_EXCEPTION; - } - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_ProductInfo(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTS: if (wFlags & DISPATCH_PROPERTYGET)

1 0

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

11 Dec '09

Module: wine Branch: master Commit: 105933f202e0e705046ca2fe55110640887ef22a URL: http://source.winehq.org/git/wine.git/?a=commit;h=105933f202e0e705046ca2fe5… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:03:16 2009 -0800 msi: Refactor the Installer.Products method into InstallerImpl_Products. --- dlls/msi/automation.c | 116 ++++++++++++++++++++++++++++++++----------------- 1 files changed, 76 insertions(+), 40 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 7a5e355..a73dafa 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2135,6 +2135,80 @@ done: return hr; } +static void cleanup_products(IDispatch* dispatch, ULONG count) +{ + UINT i; + ListData* ldata = private_data((AutomationObject *)dispatch); + + for (i = 0; i < count - 1; i++) + VariantClear(&ldata->pVars[i]); + + ldata->ulCount = 0; + msi_free(ldata->pVars); + + IDispatch_Release(dispatch); +} + +static HRESULT InstallerImpl_Products(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + HRESULT hr; + ULONG idx = 0; + ListData *ldata; + IDispatch *dispatch; + WCHAR product[GUID_SIZE]; + + if (!(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + /* Find number of products. */ + while ((ret = MsiEnumProductsW(idx, product)) == ERROR_SUCCESS) + idx++; + + if (ret != ERROR_NO_MORE_ITEMS) + return DISP_E_EXCEPTION; + + V_VT(pVarResult) = VT_DISPATCH; + hr = create_automation_object(0, NULL, (LPVOID*)&dispatch, + &DIID_StringList, ListImpl_Invoke, + ListImpl_Free, sizeof(ListData)); + if (FAILED(hr)) + return hr; + + V_DISPATCH(pVarResult) = dispatch; + + /* Save product strings. */ + ldata = private_data((AutomationObject *)dispatch); + ldata->ulCount = 0; + ldata->pVars = msi_alloc_zero(sizeof(VARIANT) * idx); + if (!ldata->pVars) + { + IDispatch_Release(dispatch); + return E_OUTOFMEMORY; + } + + ldata->ulCount = idx; + for (idx = 0; idx < ldata->ulCount; idx++) + { + ret = MsiEnumProductsW(idx, product); + if (ret != ERROR_SUCCESS) + { + cleanup_products(dispatch, idx - 1); + return DISP_E_EXCEPTION; + } + + VariantInit(&ldata->pVars[idx]); + V_VT(&ldata->pVars[idx]) = VT_BSTR; + V_BSTR(&ldata->pVars[idx]) = SysAllocString(product); + } + + return S_OK; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -2231,46 +2305,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_PRODUCTS: - if (wFlags & DISPATCH_PROPERTYGET) - { - ListData *ldata = NULL; - ULONG idx = 0; - WCHAR szProductBuf[GUID_SIZE]; - - /* Find number of products */ - while ((ret = MsiEnumProductsW(idx, szProductBuf)) == ERROR_SUCCESS) idx++; - if (ret != ERROR_NO_MORE_ITEMS) - { - ERR("MsiEnumProducts returned %d\n", ret); - return DISP_E_EXCEPTION; - } - - V_VT(pVarResult) = VT_DISPATCH; - if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) - { - V_DISPATCH(pVarResult) = pDispatch; - - /* Save product strings */ - ldata = private_data((AutomationObject *)pDispatch); - if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) - ERR("Out of memory\n"); - else - { - ldata->ulCount = idx; - for (idx = 0; idx < ldata->ulCount; idx++) - { - ret = MsiEnumProductsW(idx, szProductBuf); - VariantInit(&ldata->pVars[idx]); - V_VT(&ldata->pVars[idx]) = VT_BSTR; - V_BSTR(&ldata->pVars[idx]) = SysAllocString(szProductBuf); - } - } - } - else - ERR("Failed to create StringList object, hresult 0x%08x\n", hr); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_Products(wFlags, pDispParams, + pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_RELATEDPRODUCTS: if (wFlags & DISPATCH_PROPERTYGET)

1 0

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

11 Dec '09

Module: wine Branch: master Commit: e38c36a1f9a10152669c25de391ff1293bda1062 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38c36a1f9a10152669c25de3… Author: James Hawkins <truiken(a)gmail.com> Date: Thu Dec 10 17:03:23 2009 -0800 msi: Refactor the Installer.RelatedProducts method into InstallerImpl_RelatedProducts. --- dlls/msi/automation.c | 144 ++++++++++++++++++++++++++++-------------------- 1 files changed, 84 insertions(+), 60 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index a73dafa..3b40384 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -2209,6 +2209,86 @@ static HRESULT InstallerImpl_Products(WORD wFlags, return S_OK; } +static HRESULT InstallerImpl_RelatedProducts(WORD wFlags, + DISPPARAMS* pDispParams, + VARIANT* pVarResult, + EXCEPINFO* pExcepInfo, + UINT* puArgErr) +{ + UINT ret; + ULONG idx; + HRESULT hr; + ListData *ldata; + VARIANTARG varg0; + IDispatch* dispatch; + WCHAR product[GUID_SIZE]; + + if (!(wFlags & DISPATCH_PROPERTYGET)) + return DISP_E_MEMBERNOTFOUND; + + VariantInit(&varg0); + hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); + if (FAILED(hr)) + return hr; + + /* Find number of related products. */ + idx = 0; + do + { + ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, product); + if (ret == ERROR_SUCCESS) + idx++; + } while (ret == ERROR_SUCCESS); + + if (ret != ERROR_NO_MORE_ITEMS) + { + hr = DISP_E_EXCEPTION; + goto done; + } + + V_VT(pVarResult) = VT_DISPATCH; + + hr = create_automation_object(0, NULL, (LPVOID*)&dispatch, + &DIID_StringList, ListImpl_Invoke, + ListImpl_Free, sizeof(ListData)); + if (FAILED(hr)) + goto done; + + V_DISPATCH(pVarResult) = dispatch; + + /* Save product strings. */ + ldata = private_data((AutomationObject *)dispatch); + ldata->pVars = msi_alloc(sizeof(VARIANT) * idx); + if (!ldata->pVars) + { + IDispatch_Release(dispatch); + hr = E_OUTOFMEMORY; + goto done; + } + + ldata->ulCount = idx; + for (idx = 0; idx < ldata->ulCount; idx++) + { + ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, product); + if (ret != ERROR_SUCCESS) + { + cleanup_products(dispatch, idx - 1); + hr = DISP_E_EXCEPTION; + goto done; + } + + VariantInit(&ldata->pVars[idx]); + V_VT(&ldata->pVars[idx]) = VT_BSTR; + V_BSTR(&ldata->pVars[idx]) = SysAllocString(product); + } + + hr = S_OK; + +done: + VariantClear(&varg0); + return hr; +} + static HRESULT WINAPI InstallerImpl_Invoke( AutomationObject* This, DISPID dispIdMember, @@ -2220,15 +2300,6 @@ static HRESULT WINAPI InstallerImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - IDispatch *pDispatch = NULL; - UINT ret; - VARIANTARG varg0, varg1, varg2; - HRESULT hr; - - VariantInit(&varg0); - VariantInit(&varg1); - VariantInit(&varg2); - switch (dispIdMember) { case DISPID_INSTALLER_CREATERECORD: @@ -2309,60 +2380,13 @@ static HRESULT WINAPI InstallerImpl_Invoke( pVarResult, pExcepInfo, puArgErr); case DISPID_INSTALLER_RELATEDPRODUCTS: - if (wFlags & DISPATCH_PROPERTYGET) - { - ListData *ldata = NULL; - ULONG idx = 0; - WCHAR szProductBuf[GUID_SIZE]; - - hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); - if (FAILED(hr)) return hr; - - /* Find number of related products */ - while ((ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf)) == ERROR_SUCCESS) idx++; - if (ret != ERROR_NO_MORE_ITEMS) - { - VariantClear(&varg0); - ERR("MsiEnumRelatedProducts returned %d\n", ret); - return DISP_E_EXCEPTION; - } - - V_VT(pVarResult) = VT_DISPATCH; - if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) - { - V_DISPATCH(pVarResult) = pDispatch; - - /* Save product strings */ - ldata = private_data((AutomationObject *)pDispatch); - if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) - ERR("Out of memory\n"); - else - { - ldata->ulCount = idx; - for (idx = 0; idx < ldata->ulCount; idx++) - { - ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf); - VariantInit(&ldata->pVars[idx]); - V_VT(&ldata->pVars[idx]) = VT_BSTR; - V_BSTR(&ldata->pVars[idx]) = SysAllocString(szProductBuf); - } - } - } - else - ERR("Failed to create StringList object, hresult 0x%08x\n", hr); - } - else return DISP_E_MEMBERNOTFOUND; - break; + return InstallerImpl_RelatedProducts(wFlags, pDispParams, + pVarResult, pExcepInfo, + puArgErr); - default: + default: return DISP_E_MEMBERNOTFOUND; } - - VariantClear(&varg2); - VariantClear(&varg1); - VariantClear(&varg0); - - return S_OK; } /* Wrapper around create_automation_object to create an installer object. */

1 0