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

Piotr Caban : msvcrt/tests: Execute c++ related tests on 64-bit systems.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 83024db0aef79da80237cd8b6fd776d5ca57c81c URL: http://source.winehq.org/git/wine.git/?a=commit;h=83024db0aef79da80237cd8b6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 20 12:47:51 2012 +0200 msvcrt/tests: Execute c++ related tests on 64-bit systems. --- dlls/msvcrt/tests/cpp.c | 401 +++++++++++++++++++++++++---------------------- 1 files changed, 214 insertions(+), 187 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=83024db0aef79da80237c…

1 0

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

Aug. 20, 2012

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

Michael Stefaniuc : quartz: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 645e15894633e77d6cc856dd9736c459d44b0925 URL: http://source.winehq.org/git/wine.git/?a=commit;h=645e15894633e77d6cc856dd9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:03:14 2012 +0200 quartz: COM cleanup for the IClassFactory iface. --- dlls/quartz/main.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index edb9cbc..2a4071c 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -46,12 +46,16 @@ static HRESULT SeekingPassThru_create(IUnknown *pUnkOuter, LPVOID *ppObj) * DirectShow ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -81,34 +85,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_WAVEParser, WAVEParser_create } }; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } *ppobj = NULL; - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -118,10 +118,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -139,9 +139,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -187,12 +187,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) IClassFactoryImpl *factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &factory->ITF_IClassFactory; + *ppv = &factory->IClassFactory_iface; return S_OK; } }

1 0

Piotr Caban : msvcrt: Fixed vector destructors implementation on 64-bit systems.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: fef8a52fc9daefcf66f72dda9d9bbccad0bf7da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef8a52fc9daefcf66f72dda9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Aug 20 12:47:04 2012 +0200 msvcrt: Fixed vector destructors implementation on 64-bit systems. --- dlls/msvcp100/exception.c | 10 ++++---- dlls/msvcp100/ios.c | 58 ++++++++++++++++++++++---------------------- dlls/msvcp100/locale.c | 34 +++++++++++++------------- dlls/msvcp60/exception.c | 8 +++--- dlls/msvcp90/exception.c | 10 ++++---- dlls/msvcp90/ios.c | 58 ++++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 34 +++++++++++++------------- dlls/msvcrt/cpp.c | 10 ++++---- 8 files changed, 111 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fef8a52fc9daefcf66f72…

1 0

Dmitry Timoshkov : gdiplus: Round the layout rectangle down instead of up in gdip_format_string().
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: e9aef40c269cef91c81eebd0bfd43a30b730a041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9aef40c269cef91c81eebd0b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:57 2012 +0900 gdiplus: Round the layout rectangle down instead of up in gdip_format_string(). --- dlls/gdiplus/graphics.c | 4 ++-- dlls/gdiplus/tests/graphics.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c8fad68..a04446b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4728,8 +4728,8 @@ GpStatus gdip_format_string(HDC hdc, stringdup = GdipAlloc((length + 1) * sizeof(WCHAR)); if(!stringdup) return OutOfMemory; - nwidth = roundr(rect->Width); - nheight = roundr(rect->Height); + nwidth = rect->Width; + nheight = rect->Height; if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX; diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 881f697..1288678 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3865,10 +3865,8 @@ todo_wine set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); -todo_wine expect(2, glyphs); expect(1, lines); -todo_wine expectf_(width_2, bounds.Width, 0.01); expectf(height, bounds.Height); @@ -3878,10 +3876,8 @@ todo_wine set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); expect(Ok, status); -todo_wine expect(1, glyphs); expect(1, lines); -todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height);

1 0

Dmitry Timoshkov : gdiplus: Return error code of the failed API to the caller.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 62724c9d574a0d3d3b84abe6dd32794bd8979ff5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62724c9d574a0d3d3b84abe6d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:05 2012 +0900 gdiplus: Return error code of the failed API to the caller. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a04446b..e46cf48 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3188,7 +3188,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image GdipFree(src_data); GdipFree(dst_data); GdipDeleteMatrix(dst_to_src); - return OutOfMemory; + return stat; } apply_image_attributes(imageAttributes, src_data,

1 0

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

Aug. 20, 2012

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: If there is no hbitmap associated with GpBitmap then create one.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 466dfee115c49b0d6f81bd42aa4513730eb2b0f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=466dfee115c49b0d6f81bd42a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:32 2012 +0900 gdiplus: If there is no hbitmap associated with GpBitmap then create one. --- dlls/gdiplus/graphics.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2b7a87b..c8fad68 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3094,7 +3094,6 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image if (imageAttributes || (graphics->image && graphics->image->type == ImageTypeBitmap) || - !((GpBitmap*)image)->hbitmap || ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X || ptf[1].X - ptf[0].X != srcwidth || ptf[2].Y - ptf[0].Y != srcheight || srcx < 0 || srcy < 0 || @@ -3281,7 +3280,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image } else { - hbitmap = bitmap->hbitmap; + if (bitmap->hbitmap) + hbitmap = bitmap->hbitmap; + else + { + GdipCreateHBITMAPFromBitmap(bitmap, &hbitmap, 0); + temp_bitmap = 1; + } + hdc = bitmap->hdc; temp_hdc = (hdc == 0); }

1 0

Jacek Caban : mshtml: Added IHTMLWindow6::get_sessionStorage implementation .
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

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

Michael Stefaniuc : mlang: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 34ed785ff0fa1604675e322c151bf3a8b54be29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ed785ff0fa1604675e322c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:00:03 2012 +0200 mlang: COM cleanup for the IClassFactory iface. --- dlls/mlang/mlang.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 775a723..e9f48a0 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1277,12 +1277,16 @@ HRESULT WINAPI Rfc1766ToLcidA(LCID *lcid, LPCSTR rfc1766A) * MLANG ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -1295,35 +1299,32 @@ static const struct object_creation_info object_creation[] = { &CLSID_CMultiLanguage, "CLSID_CMultiLanguage", MultiLanguage_create }, }; -static HRESULT WINAPI -MLANGCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI MLANGCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - TRACE("%s\n", debugstr_guid(riid) ); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI MLANGCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MLANGCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI MLANGCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MLANGCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -1335,10 +1336,10 @@ static ULONG WINAPI MLANGCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI MLANGCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -1354,7 +1355,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOu return hres; } -static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI MLANGCF_LockServer(IClassFactory *iface, BOOL dolock) { if (dolock) LockModule(); @@ -1404,14 +1405,14 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &MLANGCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &MLANGCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; - TRACE("(%p) <- %p\n", ppv, &(factory->ITF_IClassFactory) ); + TRACE("(%p) <- %p\n", ppv, &factory->IClassFactory_iface); return S_OK; }

1 0