August 2012 - Wine-commits - list.winehq.org

Dmitry Timoshkov : gdiplus: GdipGetImageThumbnail should return image in 32bppPARGB format.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 6f630a40911c6c59f9422f6db284fb32c4138104 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f630a40911c6c59f9422f6db… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:17 2012 +0900 gdiplus: GdipGetImageThumbnail should return image in 32bppPARGB format. --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/image.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 1ee5cbc..d6e9faf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4393,7 +4393,7 @@ GpStatus WINGDIPAPI GdipGetImageThumbnail(GpImage *image, UINT width, UINT heigh GdipGetImageWidth(image, &srcwidth); GdipGetImageHeight(image, &srcheight); - stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppARGB, + stat = GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppPARGB, NULL, (GpBitmap**)ret_image); if (stat == Ok) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 9e90cca..4e65b5e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3712,6 +3712,84 @@ static void test_GdipDrawImagePointRect(void) expect(Ok, status); } +static void test_image_format(void) +{ + static const PixelFormat fmt[] = + { + PixelFormat1bppIndexed, PixelFormat4bppIndexed, PixelFormat8bppIndexed, + PixelFormat16bppGrayScale, PixelFormat16bppRGB555, PixelFormat16bppRGB565, + PixelFormat16bppARGB1555, PixelFormat24bppRGB, PixelFormat32bppRGB, + PixelFormat32bppARGB, PixelFormat32bppPARGB, PixelFormat48bppRGB, + PixelFormat64bppARGB, PixelFormat64bppPARGB, PixelFormat32bppCMYK + }; + GpStatus status; + GpBitmap *bitmap; + GpImage *thumb; + HBITMAP hbitmap; + BITMAP bm; + PixelFormat format; + BitmapData data; + UINT i, ret; + + for (i = 0; i < sizeof(fmt)/sizeof(fmt[0]); i++) + { + status = GdipCreateBitmapFromScan0(1, 1, 0, fmt[i], NULL, &bitmap); + ok(status == Ok || broken(status == InvalidParameter) /* before win7 */, + "GdipCreateBitmapFromScan0 error %d\n", status); + if (status != Ok) continue; + + status = GdipGetImagePixelFormat((GpImage *)bitmap, &format); + expect(Ok, status); + expect(fmt[i], format); + + status = GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + if (fmt[i] == PixelFormat16bppGrayScale || fmt[i] == PixelFormat32bppCMYK) + todo_wine expect(InvalidParameter, status); + else + { + expect(Ok, status); + ret = GetObject(hbitmap, sizeof(bm), &bm); + expect(sizeof(bm), ret); + expect(0, bm.bmType); + expect(1, bm.bmWidth); + expect(1, bm.bmHeight); + expect(4, bm.bmWidthBytes); + expect(1, bm.bmPlanes); + expect(32, bm.bmBitsPixel); + DeleteObject(hbitmap); + } + + status = GdipGetImageThumbnail((GpImage *)bitmap, 0, 0, &thumb, NULL, NULL); + if (fmt[i] == PixelFormat16bppGrayScale || fmt[i] == PixelFormat32bppCMYK) + todo_wine + ok(status == OutOfMemory || broken(status == InvalidParameter) /* before win7 */, + "expected OutOfMemory, got %d\n", status); + else + { + expect(Ok, status); + status = GdipGetImagePixelFormat(thumb, &format); + expect(Ok, status); + ok(format == PixelFormat32bppPARGB || broken(format != PixelFormat32bppPARGB) /* before win7 */, + "expected PixelFormat32bppPARGB, got %#x\n", format); + status = GdipDisposeImage(thumb); + expect(Ok, status); + } + + status = GdipBitmapLockBits(bitmap, NULL, ImageLockModeRead, PixelFormat32bppPARGB, &data); + if (fmt[i] == PixelFormat16bppGrayScale || fmt[i] == PixelFormat32bppCMYK) + todo_wine expect(InvalidParameter, status); + else + { + expect(Ok, status); + status = GdipBitmapUnlockBits(bitmap, &data); + expect(Ok, status); + } + + status = GdipDisposeImage((GpImage *)bitmap); + expect(Ok, status); + } +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3724,6 +3802,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_image_format(); test_DrawImage(); test_GdipDrawImagePointRect(); test_bitmapbits();

1 0

Dmitry Timoshkov : gdiplus: Add a test for extra space added by GdipMeasureString.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: de6c150d9826bb4e8b22980427c586a42899b11b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de6c150d9826bb4e8b2298042… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:26 2012 +0900 gdiplus: Add a test for extra space added by GdipMeasureString. --- dlls/gdiplus/tests/graphics.c | 72 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 1288678..8c55abe 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3892,6 +3892,77 @@ todo_wine GdipDeleteStringFormat(format); } +static void test_measured_extra_space(void) +{ + static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; + static const WCHAR string[2] = { 'W','W' }; + GpStringFormat *format; + HDC hdc; + GpGraphics *graphics; + GpFontFamily *family; + GpFont *font; + GpStatus status; + GpUnit gfx_unit, font_unit; + RectF bounds_1, bounds_2, rect; + REAL margin, font_size, dpi; + + status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); + expect(Ok, status); + + status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + expect(Ok, status); + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + expect(Ok, status); + + status = GdipGetDpiX(graphics, &dpi); + expect(Ok, status); + + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ + /* UnitPixel as a font base unit is not tested because it differs in behaviour */ + for (font_unit = 3; font_unit <= 6; font_unit++) + { + status = GdipCreateFont(family, 1234.0, FontStyleRegular, font_unit, &font); + expect(Ok, status); + + status = GdipGetFontSize(font, &font_size); + expect(Ok, status); + font_size = units_to_pixels(font_size, font_unit, dpi); + /*trace("font size/6 = %f pixels\n", font_size / 6.0);*/ + + /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ + for (gfx_unit = 2; gfx_unit <= 6; gfx_unit++) + { + status = GdipSetPageUnit(graphics, gfx_unit); + expect(Ok, status); + + /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ + set_rect_empty(&rect); + set_rect_empty(&bounds_1); + status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds_1, NULL, NULL); + expect(Ok, status); + /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ + set_rect_empty(&rect); + set_rect_empty(&bounds_2); + status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds_2, NULL, NULL); + expect(Ok, status); + + /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ + margin = units_to_pixels(bounds_1.Width - bounds_2.Width / 2.0, gfx_unit, dpi); + /*trace("margin %f pixels\n", margin);*/ +todo_wine + expectf_(font_size / 6.0, margin, font_size / 100.0); + } + + GdipDeleteFont(font); + } + + GdipDeleteGraphics(graphics); + DeleteDC(hdc); + GdipDeleteFontFamily(family); + GdipDeleteStringFormat(format); +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3918,6 +3989,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_measured_extra_space(); test_measure_string(); test_font_height_scaling(); test_transform();

1 0

Dmitry Timoshkov : gdiplus: StringFormatFlagsLineLimit doesn' t allow line wrapping.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 6e63a478b3523ad154ad37bfd1d686c1ba1129d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e63a478b3523ad154ad37bfd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:34 2012 +0900 gdiplus: StringFormatFlagsLineLimit doesn't allow line wrapping. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e46cf48..7068534 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4864,7 +4864,8 @@ GpStatus gdip_format_string(HDC hdc, break; /* Stop if this was a linewrap (but not if it was a linebreak). */ - if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap)) + if ((lret == fitcpy) && format && + (format->attr & (StringFormatFlagsNoWrap | StringFormatFlagsLineLimit))) break; }

1 0

Jacek Caban : mshtml: Added IHTMLWindow6::get_sessionStorage implementation .
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: c74d9a43b8fea10e704065c3aa6fbda1bf6bb049 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c74d9a43b8fea10e704065c3a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 16:19:41 2012 +0200 mshtml: Added IHTMLWindow6::get_sessionStorage implementation. --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlstorage.c | 219 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 14 +++- dlls/mshtml/mshtml_private.h | 5 + 4 files changed, 238 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 8ece8f5..53cd2e9 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -39,6 +39,7 @@ C_SRCS = \ htmlscreen.c \ htmlscript.c \ htmlselect.c \ + htmlstorage.c \ htmlstyle.c \ htmlstyle2.c \ htmlstyle3.c \ diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c new file mode 100644 index 0000000..e0c4a53 --- /dev/null +++ b/dlls/mshtml/htmlstorage.c @@ -0,0 +1,219 @@ +/* + * Copyright 2012 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" + +#include "wine/debug.h" + +#include "mshtml_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(mshtml); + +typedef struct { + DispatchEx dispex; + IHTMLStorage IHTMLStorage_iface; + LONG ref; +} HTMLStorage; + +static inline HTMLStorage *impl_from_IHTMLStorage(IHTMLStorage *iface) +{ + return CONTAINING_RECORD(iface, HTMLStorage, IHTMLStorage_iface); +} + +static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID riid, void **ppv) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IHTMLStorage_iface; + }else if(IsEqualGUID(&IID_IHTMLStorage, riid)) { + TRACE("(%p)->(IID_IHTMLStorage %p)\n", This, ppv); + *ppv = &This->IHTMLStorage_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLStorage_GetTypeInfoCount(IHTMLStorage *iface, UINT *pctinfo) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_GetTypeInfo(IHTMLStorage *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLStorage_GetIDsOfNames(IHTMLStorage *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMember, REFIID riid, LCID lcid, + WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLStorage_get_length(IHTMLStorage *iface, LONG *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_get_remainingSpace(IHTMLStorage *iface, LONG *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_key(IHTMLStorage *iface, LONG lIndex, BSTR *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%d %p)\n", This, lIndex, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_getItem(IHTMLStorage *iface, BSTR bstrKey, VARIANT *p) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrKey), p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_setItem(IHTMLStorage *iface, BSTR bstrKey, BSTR bstrValue) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(bstrKey), debugstr_w(bstrValue)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_removeItem(IHTMLStorage *iface, BSTR bstrKey) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrKey)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStorage_clear(IHTMLStorage *iface) +{ + HTMLStorage *This = impl_from_IHTMLStorage(iface); + FIXME("(%p)->()\n", This); + return E_NOTIMPL; +} + +static const IHTMLStorageVtbl HTMLStorageVtbl = { + HTMLStorage_QueryInterface, + HTMLStorage_AddRef, + HTMLStorage_Release, + HTMLStorage_GetTypeInfoCount, + HTMLStorage_GetTypeInfo, + HTMLStorage_GetIDsOfNames, + HTMLStorage_Invoke, + HTMLStorage_get_length, + HTMLStorage_get_remainingSpace, + HTMLStorage_key, + HTMLStorage_getItem, + HTMLStorage_setItem, + HTMLStorage_removeItem, + HTMLStorage_clear +}; + +static const tid_t HTMLStorage_iface_tids[] = { + IHTMLStorage_tid, + 0 +}; +static dispex_static_data_t HTMLStorage_dispex = { + NULL, + IHTMLStorage_tid, + NULL, + HTMLStorage_iface_tids +}; + +HRESULT create_storage(IHTMLStorage **p) +{ + HTMLStorage *storage; + + storage = heap_alloc_zero(sizeof(*storage)); + if(!storage) + return E_OUTOFMEMORY; + + storage->IHTMLStorage_iface.lpVtbl = &HTMLStorageVtbl; + storage->ref = 1; + init_dispex(&storage->dispex, (IUnknown*)&storage->IHTMLStorage_iface, &HTMLStorage_dispex); + + *p = &storage->IHTMLStorage_iface; + return S_OK; +} diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e9a0625..c45df2c 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1876,8 +1876,20 @@ static HRESULT WINAPI HTMLWindow6_get_XDomainRequest(IHTMLWindow6 *iface, VARIAN static HRESULT WINAPI HTMLWindow6_get_sessionStorage(IHTMLWindow6 *iface, IHTMLStorage **p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + if(!This->inner_window->session_storage) { + HRESULT hres; + + hres = create_storage(&This->inner_window->session_storage); + if(FAILED(hres)) + return hres; + } + + IHTMLStorage_AddRef(This->inner_window->session_storage); + *p = This->inner_window->session_storage; + return S_OK; } static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index dee8f90..39b491e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -160,6 +160,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ + XIID(IHTMLStorage) \ XIID(IHTMLStyle) \ XIID(IHTMLStyle2) \ XIID(IHTMLStyle3) \ @@ -180,6 +181,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLWindow2) \ XIID(IHTMLWindow3) \ XIID(IHTMLWindow4) \ + XIID(IHTMLWindow5) \ XIID(IHTMLWindow6) \ XIID(IOmHistory) \ XIID(IOmNavigator) @@ -391,6 +393,7 @@ struct HTMLInnerWindow { HTMLOptionElementFactory *option_factory; IHTMLScreen *screen; IOmHistory *history; + IHTMLStorage *session_storage; global_prop_t *global_props; DWORD global_prop_cnt; @@ -718,6 +721,8 @@ IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_history(IOmHistory**) DECLSPEC_HIDDEN; +HRESULT create_storage(IHTMLStorage**) DECLSPEC_HIDDEN; + void HTMLDocument_HTMLDocument3_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_HTMLDocument5_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Persist_Init(HTMLDocument*) DECLSPEC_HIDDEN;

1 0

Jacek Caban : oleaut32: Ensure that the right interface is passed to the callee in ITypeInfo:: Invoke.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 44936abd8444f676a7d0e8fe415749146da73125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44936abd8444f676a7d0e8fe4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 20 17:42:40 2012 +0200 oleaut32: Ensure that the right interface is passed to the callee in ITypeInfo::Invoke. --- dlls/oleaut32/tests/tmarshal.c | 1 - dlls/oleaut32/typelib.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index cb626d3..337e911 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -782,7 +782,6 @@ static HRESULT WINAPI StaticWidget_Invoke(IStaticWidget *iface, DISPID dispIdMem static HRESULT WINAPI StaticWidget_TestDual(IStaticWidget *iface, ItestDual *p) { trace("TestDual()\n"); - todo_wine ok(p == &TestDual, "wrong ItestDual\n"); return S_OK; } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 3339c49..0fc7a6e 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6357,6 +6357,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; VARIANTARG *src_arg; if (wParamFlags & PARAMFLAG_FLCID) @@ -6509,6 +6510,38 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( { prgpvarg[i] = src_arg; } + + if((tdesc->vt == VT_USERDEFINED || (tdesc->vt == VT_PTR && tdesc->u.lptdesc->vt == VT_USERDEFINED)) + && (V_VT(prgpvarg[i]) == VT_DISPATCH || V_VT(prgpvarg[i]) == VT_UNKNOWN)) { + const TYPEDESC *userdefined_tdesc = tdesc; + IUnknown *userdefined_iface; + ITypeInfo *tinfo2; + TYPEATTR *tattr; + + if(tdesc->vt == VT_PTR) + userdefined_tdesc = tdesc->u.lptdesc; + + hres = ITypeInfo2_GetRefTypeInfo(iface, userdefined_tdesc->u.hreftype, &tinfo2); + if(FAILED(hres)) + break; + + hres = ITypeInfo_GetTypeAttr(tinfo2, &tattr); + if(FAILED(hres)) { + ITypeInfo_Release(tinfo2); + return hres; + } + + hres = IUnknown_QueryInterface(V_UNKNOWN(prgpvarg[i]), &tattr->guid, (void**)&userdefined_iface); + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); + if(FAILED(hres)) { + ERR("argument does not support %s interface\n", debugstr_guid(&tattr->guid)); + break; + } + + IUnknown_Release(V_UNKNOWN(prgpvarg[i])); + V_UNKNOWN(prgpvarg[i]) = userdefined_iface; + } } else if (wParamFlags & PARAMFLAG_FOPT) {

1 0

Nikolay Sivov : mstask: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: b92ea61e71716d6f7facadf328b049fdf9ea4b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92ea61e71716d6f7facadf32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:11:15 2012 +0400 mstask: Call interface methods properly. --- dlls/mstask/factory.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index 9dc1e29..f85a5f9 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -56,14 +56,14 @@ static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI MSTASK_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_AddRef(IClassFactory *face) { TRACE("\n"); InterlockedIncrement(&dll_ref); return 2; } -static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); InterlockedDecrement(&dll_ref); @@ -71,8 +71,8 @@ static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) } static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -89,21 +89,21 @@ static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( if (FAILED(res)) return res; - res = ITaskScheduler_QueryInterface(punk, riid, ppvObj); - ITaskScheduler_Release(punk); + res = IUnknown_QueryInterface(punk, riid, ppvObj); + IUnknown_Release(punk); return res; } static HRESULT WINAPI MSTASK_IClassFactory_LockServer( - LPCLASSFACTORY iface, + IClassFactory *iface, BOOL fLock) { TRACE("\n"); - if (fLock != FALSE) - MSTASK_IClassFactory_AddRef(iface); + if (fLock) + IClassFactory_AddRef(iface); else - MSTASK_IClassFactory_Release(iface); + IClassFactory_Release(iface); return S_OK; }

1 0

Nikolay Sivov : qcap: Call interface methods properly.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 1bd91a4fd2f4a12e6c8ba5bbe48bdfbd72a1a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd91a4fd2f4a12e6c8ba5bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:21:46 2012 +0400 qcap: Call interface methods properly. --- dlls/qcap/capturegraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index aa5c0a4..fd619aa 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -184,7 +184,7 @@ fnCaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface, This->mygraph = pfg; IGraphBuilder_AddRef(This->mygraph); - if (SUCCEEDED(IUnknown_QueryInterface(This->mygraph, + if (SUCCEEDED(IGraphBuilder_QueryInterface(This->mygraph, &IID_IMediaEvent, (LPVOID *)&pmev))) { IMediaEvent_CancelDefaultHandling(pmev, EC_REPAINT); @@ -290,7 +290,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, } /* Uses 'Intelligent Connect', so Connect, not ConnectDirect here */ - hr = IFilterGraph2_Connect(This->mygraph, pin_in, pin_out); + hr = IGraphBuilder_Connect(This->mygraph, pin_in, pin_out); IPin_Release(pin_in); IPin_Release(pin_out); return hr; @@ -474,7 +474,7 @@ fnCaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); + return ICaptureGraphBuilder2_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); } static ULONG WINAPI @@ -482,7 +482,7 @@ fnCaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_AddRef(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_AddRef(&This->ICaptureGraphBuilder2_iface); } static ULONG WINAPI @@ -490,7 +490,7 @@ fnCaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_Release(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_Release(&This->ICaptureGraphBuilder2_iface); } static HRESULT WINAPI

1 0

Henri Verbeet : winex11: Try XRandR 1.0 if 1.2 fails.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 28a9b39372ab05a4df42890f295a06306e4fb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28a9b39372ab05a4df42890f2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:06 2012 +0200 winex11: Try XRandR 1.0 if 1.2 fails. --- dlls/winex11.drv/xrandr.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9eef8f5..16b5d9a 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -344,24 +344,25 @@ static LONG xrandr12_set_current_mode( int mode ) return DISP_CHANGE_SUCCESSFUL; } -static void xrandr12_init_modes(void) +static int xrandr12_init_modes(void) { XRRScreenResources *resources; XRROutputInfo *output_info; XRRCrtcInfo *crtc_info; + int ret = -1; int i, j; if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); - return; + return ret; } if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) { pXRRFreeScreenResources( resources ); ERR("Failed to get CRTC info.\n"); - return; + return ret; } TRACE("CRTC 0: mode %#lx, %ux%u+%d+%d.\n", crtc_info->mode, @@ -372,7 +373,7 @@ static void xrandr12_init_modes(void) pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); ERR("Failed to get output info.\n"); - return; + return ret; } TRACE("OUTPUT 0: name %s.\n", debugstr_a(output_info->name)); @@ -415,11 +416,13 @@ static void xrandr12_init_modes(void) } X11DRV_Settings_AddDepthModes(); + ret = 0; done: pXRRFreeOutputInfo( output_info ); pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); + return ret; } #endif /* HAVE_XRRGETSCREENRESOURCES */ @@ -452,9 +455,7 @@ void X11DRV_XRandR_Init(void) xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); } - if (xrandr_get_screen_resources) - xrandr12_init_modes(); - else + if (!xrandr_get_screen_resources || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); }

1 0

Henri Verbeet : winex11: Try harder to get usable RandR screen resources.
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: e426fa9cb9fce2219dc6099b4d0ca7ab27b3150c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e426fa9cb9fce2219dc6099b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:07 2012 +0200 winex11: Try harder to get usable RandR screen resources. --- dlls/winex11.drv/xrandr.c | 28 ++++++++++++++++++++-------- 1 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 16b5d9a..e17150b 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -53,8 +53,9 @@ MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) +MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) -static typeof(XRRGetScreenResources) *xrandr_get_screen_resources; +static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; #endif @@ -96,6 +97,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRFreeScreenResources) LOAD_FUNCPTR(XRRGetCrtcInfo) LOAD_FUNCPTR(XRRGetOutputInfo) + LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) r = 2; #endif @@ -267,7 +269,7 @@ static int xrandr12_get_current_mode(void) XRRCrtcInfo *crtc_info; int i, ret = -1; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return 0; @@ -312,7 +314,7 @@ static LONG xrandr12_set_current_mode( int mode ) mode = mode % xrandr_mode_count; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return DISP_CHANGE_FAILED; @@ -352,12 +354,22 @@ static int xrandr12_init_modes(void) int ret = -1; int i, j; - if (!(resources = xrandr_get_screen_resources( gdi_display, root_window ))) + if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) { ERR("Failed to get screen resources.\n"); return ret; } + if (!resources->ncrtc) + { + pXRRFreeScreenResources( resources ); + if (!(resources = pXRRGetScreenResources( gdi_display, root_window ))) + { + ERR("Failed to get screen resources.\n"); + return ret; + } + } + if (!resources->ncrtc || !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[0] ))) { pXRRFreeScreenResources( resources ); @@ -450,12 +462,12 @@ void X11DRV_XRandR_Init(void) if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) { if (major > 1 || (major == 1 && minor >= 3)) - xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); - if (!xrandr_get_screen_resources) - xrandr_get_screen_resources = wine_dlsym( xrandr_handle, "XRRGetScreenResources", NULL, 0 ); + pXRRGetScreenResourcesCurrent = wine_dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent", NULL, 0 ); + if (!pXRRGetScreenResourcesCurrent) + pXRRGetScreenResourcesCurrent = pXRRGetScreenResources; } - if (!xrandr_get_screen_resources || xrandr12_init_modes() < 0) + if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); }

1 0

Henri Verbeet : wined3d: Use a slightly shorter timeout in wined3d_event_query_finish().
by Alexandre Julliard 20 Aug '12

20 Aug '12

Module: wine Branch: master Commit: 54976a033b85f5ad37813dd739ea8ec990e410f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54976a033b85f5ad37813dd73… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:08 2012 +0200 wined3d: Use a slightly shorter timeout in wined3d_event_query_finish(). --- dlls/wined3d/query.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4a3d7a7..2ee14a3 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -141,7 +141,10 @@ enum wined3d_event_query_result wined3d_event_query_finish(const struct wined3d_ ENTER_GL(); if (gl_info->supported[ARB_SYNC]) { - GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, 0, ~(GLuint64)0)); + /* Apple seems to be into arbitrary limits, and timeouts larger than + * 0xfffffffffffffbff immediately return GL_TIMEOUT_EXPIRED. We don't + * really care and can live with waiting a few μs less. (OS X 10.7.4). */ + GLenum gl_ret = GL_EXTCALL(glClientWaitSync(query->object.sync, GL_SYNC_FLUSH_COMMANDS_BIT, ~(GLuint64)0xffff)); checkGLcall("glClientWaitSync"); switch (gl_ret)

1 0