December 2009 - Wine-Commits

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

Dec. 11, 2009

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

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

Dec. 11, 2009

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

Hans Leidekker : gdi32: Implement WineEngGetCharABCWidthsFloat and forward GetCharABCWidthsFloat to it .
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 1d4fcc027035d11379cd462285b9ceb6b24eb803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d4fcc027035d11379cd46228… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 11 11:38:24 2009 +0100 gdi32: Implement WineEngGetCharABCWidthsFloat and forward GetCharABCWidthsFloat to it. --- dlls/gdi32/font.c | 40 +++++++++++++++++++++++----------------- dlls/gdi32/freetype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 ++ 3 files changed, 63 insertions(+), 17 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 7f8f6f6..eea53fd 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2908,34 +2908,40 @@ BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT a * RETURNS * Success: TRUE * Failure: FALSE - * - * BUGS - * Only works with TrueType fonts. It also doesn't return real - * floats but converted integers because it's implemented on - * top of GetCharABCWidthsW. */ BOOL WINAPI GetCharABCWidthsFloatW( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) { - ABC *abc, *abc_base; - unsigned int i, size = sizeof(ABC) * (last - first + 1); - BOOL ret; + UINT i; + BOOL ret = FALSE; + DC *dc = get_dc_ptr( hdc ); + + TRACE("%p, %d, %d, %p\n", hdc, first, last, abcf); + + if (!dc) return FALSE; - TRACE("%p, %d, %d, %p - partial stub\n", hdc, first, last, abcf); + if (!abcf) + { + release_dc_ptr( dc ); + return FALSE; + } - abc = abc_base = HeapAlloc( GetProcessHeap(), 0, size ); - if (!abc) return FALSE; + if (dc->gdiFont) + ret = WineEngGetCharABCWidthsFloat( dc->gdiFont, first, last, abcf ); + else + FIXME("stub\n"); - ret = GetCharABCWidthsW( hdc, first, last, abc ); if (ret) { - for (i = first; i <= last; i++, abc++, abcf++) + /* convert device units to logical */ + for (i = first; i <= last; i++, abcf++) { - abcf->abcfA = abc->abcA; - abcf->abcfB = abc->abcB; - abcf->abcfC = abc->abcC; + abcf->abcfA = abcf->abcfA * dc->xformVport2World.eM11; + abcf->abcfB = abcf->abcfB * dc->xformVport2World.eM11; + abcf->abcfC = abcf->abcfC * dc->xformVport2World.eM11; } } - HeapFree( GetProcessHeap(), 0, abc_base ); + + release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ed37a25..a93cb60 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5913,6 +5913,38 @@ BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, } /************************************************************* + * WineEngGetCharABCWidthsFloat + * + */ +BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) +{ + static const MAT2 identity = {{0,1}, {0,0}, {0,0}, {0,1}}; + UINT c; + GLYPHMETRICS gm; + FT_UInt glyph_index; + GdiFont *linked_font; + + TRACE("%p, %d, %d, %p\n", font, first, last, buffer); + + GDI_CheckNotLock(); + EnterCriticalSection( &freetype_cs ); + + for (c = first; c <= last; c++) + { + get_glyph_index_linked(font, c, &linked_font, &glyph_index); + WineEngGetGlyphOutline(linked_font, glyph_index, GGO_METRICS | GGO_GLYPH_INDEX, + &gm, 0, NULL, &identity); + buffer[c - first].abcfA = FONT_GM(linked_font, glyph_index)->lsb; + buffer[c - first].abcfB = FONT_GM(linked_font, glyph_index)->bbx; + buffer[c - first].abcfC = FONT_GM(linked_font, glyph_index)->adv - + FONT_GM(linked_font, glyph_index)->lsb - + FONT_GM(linked_font, glyph_index)->bbx; + } + LeaveCriticalSection( &freetype_cs ); + return TRUE; +} + +/************************************************************* * WineEngGetCharABCWidthsI * */ @@ -6605,6 +6637,12 @@ BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, return FALSE; } +BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT first, UINT last, LPABCFLOAT buffer) +{ + ERR("called but we don't have FreeType\n"); + return FALSE; +} + BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 670ef41..d5f9112 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -412,6 +412,8 @@ extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngEnumFonts(LPLOGFONTW, FONTENUMPROCW, LPARAM) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidths(GdiFont *font, UINT firstChar, UINT lastChar, LPABC buffer) DECLSPEC_HIDDEN; +extern BOOL WineEngGetCharABCWidthsFloat(GdiFont *font, UINT firstChar, + UINT lastChar, LPABCFLOAT buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharABCWidthsI(GdiFont *font, UINT firstChar, UINT count, LPWORD pgi, LPABC buffer) DECLSPEC_HIDDEN; extern BOOL WineEngGetCharWidth(GdiFont*, UINT, UINT, LPINT) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : include: Remove useless definitions for nonexistent Win16 messages.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

Module: wine Branch: master Commit: 49675df92eb9af894fc77ceb555b65e2e18a9421 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49675df92eb9af894fc77ceb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 11 12:24:44 2009 +0100 include: Remove useless definitions for nonexistent Win16 messages. --- include/wine/winuser16.h | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index a1898d5..3dc9842 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -401,9 +401,6 @@ typedef struct #define SBM_SETRANGE16 (WM_USER+2) #define SBM_GETRANGE16 (WM_USER+3) #define SBM_ENABLE_ARROWS16 (WM_USER+4) -#define SBM_SETRANGEREDRAW16 WM_NULL /* Not in Win16 */ -#define SBM_SETSCROLLINFO16 WM_NULL /* Not in Win16 */ -#define SBM_GETSCROLLINFO16 WM_NULL /* Not in Win16 */ /* CBT hook structures */ @@ -449,9 +446,6 @@ typedef struct #define BM_GETSTATE16 (WM_USER+2) #define BM_SETSTATE16 (WM_USER+3) #define BM_SETSTYLE16 (WM_USER+4) -#define BM_CLICK16 WM_NULL /* Does not exist in Win16 */ -#define BM_GETIMAGE16 WM_NULL /* Does not exist in Win16 */ -#define BM_SETIMAGE16 WM_NULL /* Does not exist in Win16 */ /* Static Control Messages */ #define STM_SETICON16 (WM_USER+0) @@ -489,15 +483,6 @@ typedef struct #define EM_SETWORDBREAKPROC16 (WM_USER+32) #define EM_GETWORDBREAKPROC16 (WM_USER+33) #define EM_GETPASSWORDCHAR16 (WM_USER+34) -/* - not in win16: - EM_SETMARGINS16 WM_NULL - EM_GETMARGINS16 WM_NULL - EM_GETLIMITTEXT16 WM_NULL - EM_POSFROMCHAR16 WM_NULL - EM_CHARFROMPOS16 WM_NULL - EM_SETLIMITTEXT16 WM_NULL - no name change in win16 -*/ typedef struct {

1 0

James Hawkins : msi: Refactor the Installer. ProductState method into InstallerImpl_ProductState.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

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: Wine fails the test and passes us a Session object back, so free it in this case.
by Alexandre Julliard Dec. 11, 2009

Dec. 11, 2009

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

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

Dec. 11, 2009

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

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

Dec. 11, 2009

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

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

Dec. 11, 2009

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

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

Dec. 11, 2009

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