October 2011 - Wine-Commits

Aric Stewart : usp10: Correct read overflow in ScriptBreak found by Valgrind.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 250a132545a9704b0dff98bb77b14093f9ed2d1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=250a132545a9704b0dff98bb7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 19 12:34:26 2011 -0500 usp10: Correct read overflow in ScriptBreak found by Valgrind. --- dlls/usp10/breaking.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 144da37..3efc3da 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -392,7 +392,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT debug_output_breaks(break_before,count); /* LB31 */ - for (i = 0; i < count; i++) + for (i = 0; i < count-1; i++) else_break(&break_before[i+1],b_s); debug_output_breaks(break_before,count);

1 0

Alexandre Julliard : gdi32: Implement SelectFont as a standard driver entry point.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: ef0fe44327b64ef8d25d7c6fdfeb89e44dc972ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef0fe44327b64ef8d25d7c6fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 13:10:58 2011 +0200 gdi32: Implement SelectFont as a standard driver entry point. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 +- dlls/gdi32/enhmfdrv/objects.c | 13 ++++--- dlls/gdi32/font.c | 24 ++------------ dlls/gdi32/freetype.c | 55 ++++++++++++++++++------------ dlls/gdi32/gdi_private.h | 1 - dlls/gdi32/mfdrv/metafiledrv.h | 2 +- dlls/gdi32/mfdrv/objects.c | 8 ++-- dlls/wineps.drv/font.c | 16 ++++++--- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/xfont.c | 21 ++++++++--- dlls/winex11.drv/xrender.c | 60 +++++++++++++++++++-------------- include/wine/gdi_driver.h | 4 +- 14 files changed, 114 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef0fe44327b64ef8d25d7…

1 0

Jacek Caban : mshtml.idl: Added IHTMLWindow5 and IHTMLStorage declarations.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 05ffda9eb884d41e6d173761c9be6f97fea6e936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05ffda9eb884d41e6d173761c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 16:14:57 2011 +0200 mshtml.idl: Added IHTMLWindow5 and IHTMLStorage declarations. --- include/mshtmdid.h | 55 +++++++++++++++++- include/mshtml.idl | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=05ffda9eb884d41e6d173…

1 0

Huw Davies : gdi32: Add get_pixel primitives.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 70be58c17d034174fcd5e270b2c3c325a817332a URL: http://source.winehq.org/git/wine.git/?a=commit;h=70be58c17d034174fcd5e270b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 12:41:57 2011 +0100 gdi32: Add get_pixel primitives. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 54 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c73bc8e..e5f4645 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -145,6 +145,7 @@ typedef struct primitive_funcs const POINT *origin, int rop2, int overlap); void (* blend_rect)(const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, BLENDFUNCTION blend); + DWORD (* get_pixel)(const dib_info *dib, const POINT *pt); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); COLORREF (* pixel_to_colorref)(const dib_info *dib, DWORD pixel); void (* convert_to)(dib_info *dst, const dib_info *src, const RECT *src_rect); diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 594d05d..0423c43 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -1025,6 +1025,51 @@ static void copy_rect_null(const dib_info *dst, const RECT *rc, return; } +static DWORD get_pixel_32(const dib_info *dib, const POINT *pt) +{ + DWORD *ptr = get_pixel_ptr_32( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_24(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_24( dib, pt->x, pt->y ); + return ptr[0] | ((DWORD)ptr[1] << 8) | ((DWORD)ptr[2] << 16); +} + +static DWORD get_pixel_16(const dib_info *dib, const POINT *pt) +{ + WORD *ptr = get_pixel_ptr_16( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_8(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_8( dib, pt->x, pt->y ); + return *ptr; +} + +static DWORD get_pixel_4(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_4( dib, pt->x, pt->y ); + + if (pt->x & 1) + return *ptr & 0x0f; + else + return (*ptr >> 4) & 0x0f; +} + +static DWORD get_pixel_1(const dib_info *dib, const POINT *pt) +{ + BYTE *ptr = get_pixel_ptr_1( dib, pt->x, pt->y ); + return (*ptr & pixel_masks_1[pt->x & 0x7]) ? 1 : 0; +} + +static DWORD get_pixel_null(const dib_info *dib, const POINT *pt) +{ + return 0; +} + static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) { return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); @@ -4350,6 +4395,7 @@ const primitive_funcs funcs_8888 = pattern_rects_32, copy_rect_32, blend_rect_8888, + get_pixel_32, colorref_to_pixel_888, pixel_to_colorref_888, convert_to_8888, @@ -4364,6 +4410,7 @@ const primitive_funcs funcs_32 = pattern_rects_32, copy_rect_32, blend_rect_32, + get_pixel_32, colorref_to_pixel_masks, pixel_to_colorref_masks, convert_to_32, @@ -4378,6 +4425,7 @@ const primitive_funcs funcs_24 = pattern_rects_24, copy_rect_24, blend_rect_24, + get_pixel_24, colorref_to_pixel_888, pixel_to_colorref_888, convert_to_24, @@ -4392,6 +4440,7 @@ const primitive_funcs funcs_555 = pattern_rects_16, copy_rect_16, blend_rect_555, + get_pixel_16, colorref_to_pixel_555, pixel_to_colorref_555, convert_to_555, @@ -4406,6 +4455,7 @@ const primitive_funcs funcs_16 = pattern_rects_16, copy_rect_16, blend_rect_16, + get_pixel_16, colorref_to_pixel_masks, pixel_to_colorref_masks, convert_to_16, @@ -4420,6 +4470,7 @@ const primitive_funcs funcs_8 = pattern_rects_8, copy_rect_8, blend_rect_8, + get_pixel_8, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_8, @@ -4434,6 +4485,7 @@ const primitive_funcs funcs_4 = pattern_rects_4, copy_rect_4, blend_rect_4, + get_pixel_4, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_4, @@ -4448,6 +4500,7 @@ const primitive_funcs funcs_1 = pattern_rects_1, copy_rect_1, blend_rect_1, + get_pixel_1, colorref_to_pixel_colortable, pixel_to_colorref_colortable, convert_to_1, @@ -4462,6 +4515,7 @@ const primitive_funcs funcs_null = pattern_rects_null, copy_rect_null, blend_rect_null, + get_pixel_null, colorref_to_pixel_null, pixel_to_colorref_null, convert_to_null,

1 0

Jacek Caban : vbscript: Added Global_IsEmpty implementation.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 7fa15c5f4d2cac1e87c1aa87584df336c34f1689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa15c5f4d2cac1e87c1aa875… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 19:39:00 2011 +0200 vbscript: Added Global_IsEmpty implementation. --- dlls/vbscript/global.c | 11 +++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 97fbeb7..98f41f2 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -278,8 +278,15 @@ static HRESULT Global_IsDate(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_IsEmpty(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("(%s)\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + if(res) { + V_VT(res) = VT_BOOL; + V_BOOL(res) = V_VT(arg) == VT_EMPTY ? VARIANT_TRUE : VARIANT_FALSE; + } + return S_OK; } static HRESULT Global_IsNull(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index d5653ab..d5b75db 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -32,6 +32,18 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isEmpty(x), "isEmpty(x) is true?") +x = empty +Call ok(isEmpty(x), "isEmpty(x) is not true?") +Call ok(isEmpty(empty), "isEmpty(empty) is not true?") +Call ok(not isEmpty(Nothing), "isEmpty(Nothing) is not true?") +Call ok(not isEmpty(true), "isEmpty(true) is true?") +Call ok(not isEmpty(4), "isEmpty(4) is true?") +Call ok(not isEmpty("x"), "isEmpty(""x"") is true?") +Call ok(not isEmpty(Null), "isEmpty(Null) is true?") + Call ok(getVT(err) = "VT_DISPATCH", "getVT(err) = " & getVT(err)) Sub TestHex(x, ex)

1 0

Jacek Caban : vbscript: Get rid of no longer needed VB_VARIANT|VT_BYREF in Global_IsObject.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 8a17193d8d4fc4e3259b855b6e5ba525ca333e89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a17193d8d4fc4e3259b855b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 19:38:44 2011 +0200 vbscript: Get rid of no longer needed VB_VARIANT|VT_BYREF in Global_IsObject. --- dlls/vbscript/global.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index dad20b9..97fbeb7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> + #include "vbscript.h" #include "vbscript_defs.h" @@ -302,8 +304,7 @@ static HRESULT Global_IsObject(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, { TRACE("(%s)\n", debugstr_variant(arg)); - if(V_VT(arg) == (VT_VARIANT|VT_BYREF)) - arg = V_VARIANTREF(arg); + assert(args_cnt == 1); if(res) { V_VT(res) = VT_BOOL;

1 0

Ken Sharp : winecfg: Update English resource.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 08cfdd6c5ed1d56881b16fcd21b15de0b4a882d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08cfdd6c5ed1d56881b16fcd2… Author: Ken Sharp <kennybobs(a)o2.co.uk> Date: Wed Oct 19 17:15:59 2011 +0100 winecfg: Update English resource. --- programs/winecfg/En.rc | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index d6e3e6e..d1f4706 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -208,6 +208,23 @@ END LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL +IDD_ABOUTCFG DIALOGEX 0, 0, 260, 220 +STYLE WS_CHILD +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_ABT_PANEL, "STATIC", SS_OWNERDRAW, 0, 0, 260, 140 + LTEXT PACKAGE_NAME,IDC_ABT_TITLE_TEXT,105,30,55,30 + LTEXT PACKAGE_VERSION,IDC_ABT_PANEL_TEXT,160,43,140,8 + CONTROL "",IDC_ABT_WEB_LINK,"SysLink", LWS_TRANSPARENT, 105,53,106,8 + LTEXT "This program 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.", + IDC_ABT_LICENSE_TEXT,105,64,145,60 + GROUPBOX " Windows Registration Information ", IDC_STATIC, 15, 155, 230, 55 + LTEXT "&Owner:", IDC_STATIC, 22, 171, 40, 20 + EDITTEXT IDC_ABT_OWNER, 75, 171, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP + LTEXT "Organi&sation:", IDC_STATIC, 22, 185, 50, 20 + EDITTEXT IDC_ABT_ORG, 75, 185, 160, 13, ES_AUTOHSCROLL | WS_TABSTOP +END + IDD_DESKTOP_INTEGRATION DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg"

1 0

Alexandre Julliard : gdi32: Add an initial Freetype font driver.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 885a4a5c089c2ce8f30a5d041d423f1386cb46ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=885a4a5c089c2ce8f30a5d041… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 18 11:44:41 2011 +0200 gdi32: Add an initial Freetype font driver. --- dlls/gdi32/freetype.c | 163 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 163 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 086fdab..d48feb7 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -375,6 +375,18 @@ static struct list font_subst_list = LIST_INIT(font_subst_list); static struct list font_list = LIST_INIT(font_list); +struct freetype_physdev +{ + struct gdi_physdev dev; +}; + +static inline struct freetype_physdev *get_freetype_dev( PHYSDEV dev ) +{ + return (struct freetype_physdev *)dev; +} + +static const struct gdi_dc_funcs freetype_funcs; + static const WCHAR defSerif[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'}; static const WCHAR defSans[] = {'A','r','i','a','l','\0'}; static const WCHAR defFixed[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'}; @@ -2973,6 +2985,7 @@ static BOOL init_freetype(void) ((FT_Version.minor << 8) & 0x00ff00) | ((FT_Version.patch ) & 0x0000ff); + font_driver = &freetype_funcs; return TRUE; sym_not_found: @@ -3773,6 +3786,32 @@ static BOOL select_charmap(FT_Face ft_face, FT_Encoding encoding) return pFT_Select_Charmap(ft_face, encoding) == FT_Err_Ok; } + +/************************************************************* + * freetype_CreateDC + */ +static BOOL freetype_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device, + LPCWSTR output, const DEVMODEW *devmode ) +{ + struct freetype_physdev *physdev = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*physdev) ); + + if (!physdev) return FALSE; + push_dc_driver( dev, &physdev->dev, &freetype_funcs ); + return TRUE; +} + + +/************************************************************* + * freetype_DeleteDC + */ +static BOOL freetype_DeleteDC( PHYSDEV dev ) +{ + struct freetype_physdev *physdev = get_freetype_dev( dev ); + HeapFree( GetProcessHeap(), 0, physdev ); + return TRUE; +} + + /************************************************************* * WineEngCreateFontInstance * @@ -6978,6 +7017,130 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair return font->total_kern_pairs; } +static const struct gdi_dc_funcs freetype_funcs = +{ + NULL, /* pAbortDoc */ + NULL, /* pAbortPath */ + NULL, /* pAlphaBlend */ + NULL, /* pAngleArc */ + NULL, /* pArc */ + NULL, /* pArcTo */ + NULL, /* pBeginPath */ + NULL, /* pBlendImage */ + NULL, /* pChoosePixelFormat */ + NULL, /* pChord */ + NULL, /* pCloseFigure */ + NULL, /* pCreateBitmap */ + NULL, /* pCreateCompatibleDC */ + freetype_CreateDC, /* pCreateDC */ + NULL, /* pCreateDIBSection */ + NULL, /* pDeleteBitmap */ + freetype_DeleteDC, /* pDeleteDC */ + NULL, /* pDeleteObject */ + NULL, /* pDescribePixelFormat */ + NULL, /* pDeviceCapabilities */ + NULL, /* pEllipse */ + NULL, /* pEndDoc */ + NULL, /* pEndPage */ + NULL, /* pEndPath */ + NULL, /* pEnumDeviceFonts */ + NULL, /* pEnumICMProfiles */ + NULL, /* pExcludeClipRect */ + NULL, /* pExtDeviceMode */ + NULL, /* pExtEscape */ + NULL, /* pExtFloodFill */ + NULL, /* pExtSelectClipRgn */ + NULL, /* pExtTextOut */ + NULL, /* pFillPath */ + NULL, /* pFillRgn */ + NULL, /* pFlattenPath */ + NULL, /* pFrameRgn */ + NULL, /* pGdiComment */ + NULL, /* pGetCharWidth */ + NULL, /* pGetDeviceCaps */ + NULL, /* pGetDeviceGammaRamp */ + NULL, /* pGetICMProfile */ + NULL, /* pGetImage */ + NULL, /* pGetNearestColor */ + NULL, /* pGetPixel */ + NULL, /* pGetPixelFormat */ + NULL, /* pGetSystemPaletteEntries */ + NULL, /* pGetTextExtentExPoint */ + NULL, /* pGetTextMetrics */ + NULL, /* pIntersectClipRect */ + NULL, /* pInvertRgn */ + NULL, /* pLineTo */ + NULL, /* pModifyWorldTransform */ + NULL, /* pMoveTo */ + NULL, /* pOffsetClipRgn */ + NULL, /* pOffsetViewportOrg */ + NULL, /* pOffsetWindowOrg */ + NULL, /* pPaintRgn */ + NULL, /* pPatBlt */ + NULL, /* pPie */ + NULL, /* pPolyBezier */ + NULL, /* pPolyBezierTo */ + NULL, /* pPolyDraw */ + NULL, /* pPolyPolygon */ + NULL, /* pPolyPolyline */ + NULL, /* pPolygon */ + NULL, /* pPolyline */ + NULL, /* pPolylineTo */ + NULL, /* pPutImage */ + NULL, /* pRealizeDefaultPalette */ + NULL, /* pRealizePalette */ + NULL, /* pRectangle */ + NULL, /* pResetDC */ + NULL, /* pRestoreDC */ + NULL, /* pRoundRect */ + NULL, /* pSaveDC */ + NULL, /* pScaleViewportExt */ + NULL, /* pScaleWindowExt */ + NULL, /* pSelectBitmap */ + NULL, /* pSelectBrush */ + NULL, /* pSelectClipPath */ + NULL, /* pSelectFont */ + NULL, /* pSelectPalette */ + NULL, /* pSelectPen */ + NULL, /* pSetArcDirection */ + NULL, /* pSetBkColor */ + NULL, /* pSetBkMode */ + NULL, /* pSetDCBrushColor */ + NULL, /* pSetDCPenColor */ + NULL, /* pSetDIBColorTable */ + NULL, /* pSetDIBitsToDevice */ + NULL, /* pSetDeviceClipping */ + NULL, /* pSetDeviceGammaRamp */ + NULL, /* pSetLayout */ + NULL, /* pSetMapMode */ + NULL, /* pSetMapperFlags */ + NULL, /* pSetPixel */ + NULL, /* pSetPixelFormat */ + NULL, /* pSetPolyFillMode */ + NULL, /* pSetROP2 */ + NULL, /* pSetRelAbs */ + NULL, /* pSetStretchBltMode */ + NULL, /* pSetTextAlign */ + NULL, /* pSetTextCharacterExtra */ + NULL, /* pSetTextColor */ + NULL, /* pSetTextJustification */ + NULL, /* pSetViewportExt */ + NULL, /* pSetViewportOrg */ + NULL, /* pSetWindowExt */ + NULL, /* pSetWindowOrg */ + NULL, /* pSetWorldTransform */ + NULL, /* pStartDoc */ + NULL, /* pStartPage */ + NULL, /* pStretchBlt */ + NULL, /* pStretchDIBits */ + NULL, /* pStrokeAndFillPath */ + NULL, /* pStrokePath */ + NULL, /* pSwapBuffers */ + NULL, /* pUnrealizePalette */ + NULL, /* pWidenPath */ + /* OpenGL not supported */ +}; + #else /* HAVE_FREETYPE */ /*************************************************************************/

1 0

Jacek Caban : mshtml: Added IHTMLWindow6 stub implementation.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 764d3d6a69ada7c3942fd49fbba19aa5bc43fb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=764d3d6a69ada7c3942fd49fb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 19 16:15:16 2011 +0200 mshtml: Added IHTMLWindow6 stub implementation. --- dlls/mshtml/htmlwindow.c | 172 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + 2 files changed, 174 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 960a445..ea02cb1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -164,6 +164,9 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii }else if(IsEqualGUID(&IID_IHTMLWindow4, riid)) { TRACE("(%p)->(IID_IHTMLWindow4 %p)\n", This, ppv); *ppv = &This->IHTMLWindow4_iface; + }else if(IsEqualGUID(&IID_IHTMLWindow6, riid)) { + TRACE("(%p)->(IID_IHTMLWindow6 %p)\n", This, ppv); + *ppv = &This->IHTMLWindow6_iface; }else if(IsEqualGUID(&IID_IHTMLPrivateWindow, riid)) { TRACE("(%p)->(IID_IHTMLPrivateWindow %p)\n", This, ppv); *ppv = &This->IHTMLPrivateWindow_iface; @@ -1622,6 +1625,173 @@ static const IHTMLWindow4Vtbl HTMLWindow4Vtbl = { HTMLWindow4_get_frameElement }; +static inline HTMLWindow *impl_from_IHTMLWindow6(IHTMLWindow6 *iface) +{ + return CONTAINING_RECORD(iface, HTMLWindow, IHTMLWindow6_iface); +} + +static HRESULT WINAPI HTMLWindow6_QueryInterface(IHTMLWindow6 *iface, REFIID riid, void **ppv) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IHTMLWindow2_QueryInterface(&This->IHTMLWindow2_iface, riid, ppv); +} + +static ULONG WINAPI HTMLWindow6_AddRef(IHTMLWindow6 *iface) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); +} + +static ULONG WINAPI HTMLWindow6_Release(IHTMLWindow6 *iface) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); +} + +static HRESULT WINAPI HTMLWindow6_GetTypeInfoCount(IHTMLWindow6 *iface, UINT *pctinfo) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLWindow6_GetTypeInfo(IHTMLWindow6 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLWindow6_GetIDsOfNames(IHTMLWindow6 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI HTMLWindow6_Invoke(IHTMLWindow6 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLWindow6_put_XDomainRequest(IHTMLWindow6 *iface, VARIANT v) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_get_XDomainRequest(IHTMLWindow6 *iface, VARIANT *p) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI HTMLWindow6_get_localStorage(IHTMLWindow6 *iface, IHTMLStorage **p) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_put_onhashchange(IHTMLWindow6 *iface, VARIANT v) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_get_onhashchange(IHTMLWindow6 *iface, VARIANT *p) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_get_maxConnectionsPerServer(IHTMLWindow6 *iface, LONG *p) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_postMessage(IHTMLWindow6 *iface, BSTR msg, VARIANT targetOrigin) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s %s)\n", This, debugstr_w(msg), debugstr_variant(&targetOrigin)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTML, BSTR *pbstrStaticHTML) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrHTML), pbstrStaticHTML); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_put_onmessage(IHTMLWindow6 *iface, VARIANT v) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_get_onmessage(IHTMLWindow6 *iface, VARIANT *p) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLWindow6_msWriteProfilerMark(IHTMLWindow6 *iface, BSTR bstrProfilerMark) +{ + HTMLWindow *This = impl_from_IHTMLWindow6(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(bstrProfilerMark)); + return E_NOTIMPL; +} + +static const IHTMLWindow6Vtbl HTMLWindow6Vtbl = { + HTMLWindow6_QueryInterface, + HTMLWindow6_AddRef, + HTMLWindow6_Release, + HTMLWindow6_GetTypeInfoCount, + HTMLWindow6_GetTypeInfo, + HTMLWindow6_GetIDsOfNames, + HTMLWindow6_Invoke, + HTMLWindow6_put_XDomainRequest, + HTMLWindow6_get_XDomainRequest, + HTMLWindow6_get_sessionStorage, + HTMLWindow6_get_localStorage, + HTMLWindow6_put_onhashchange, + HTMLWindow6_get_onhashchange, + HTMLWindow6_get_maxConnectionsPerServer, + HTMLWindow6_postMessage, + HTMLWindow6_toStaticHTML, + HTMLWindow6_put_onmessage, + HTMLWindow6_get_onmessage, + HTMLWindow6_msWriteProfilerMark +}; + static inline HTMLWindow *impl_from_IHTMLPrivateWindow(IHTMLPrivateWindow *iface) { return CONTAINING_RECORD(iface, HTMLWindow, IHTMLPrivateWindow_iface); @@ -2307,6 +2477,7 @@ static const tid_t HTMLWindow_iface_tids[] = { IHTMLWindow2_tid, IHTMLWindow3_tid, IHTMLWindow4_tid, + IHTMLWindow6_tid, 0 }; @@ -2335,6 +2506,7 @@ HRESULT HTMLWindow_Create(HTMLDocumentObj *doc_obj, nsIDOMWindow *nswindow, HTML window->IHTMLWindow2_iface.lpVtbl = &HTMLWindow2Vtbl; window->IHTMLWindow3_iface.lpVtbl = &HTMLWindow3Vtbl; window->IHTMLWindow4_iface.lpVtbl = &HTMLWindow4Vtbl; + window->IHTMLWindow6_iface.lpVtbl = &HTMLWindow6Vtbl; window->IHTMLPrivateWindow_iface.lpVtbl = &HTMLPrivateWindowVtbl; window->IDispatchEx_iface.lpVtbl = &WindowDispExVtbl; window->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 6ee082e..3a15c58 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -172,6 +172,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLWindow2) \ XIID(IHTMLWindow3) \ XIID(IHTMLWindow4) \ + XIID(IHTMLWindow6) \ XIID(IOmNavigator) typedef enum { @@ -288,6 +289,7 @@ struct HTMLWindow { IHTMLWindow2 IHTMLWindow2_iface; IHTMLWindow3 IHTMLWindow3_iface; IHTMLWindow4 IHTMLWindow4_iface; + IHTMLWindow6 IHTMLWindow6_iface; IHTMLPrivateWindow IHTMLPrivateWindow_iface; IDispatchEx IDispatchEx_iface; IServiceProvider IServiceProvider_iface;

1 0

Huw Davies : gdi32: Fix character code metrics for bitmap fonts.
by Alexandre Julliard Oct. 19, 2011

Oct. 19, 2011

Module: wine Branch: master Commit: 595dbe2eba54d9532aa783c353ac1cee3e684b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595dbe2eba54d9532aa783c35… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 19 16:22:29 2011 +0100 gdi32: Fix character code metrics for bitmap fonts. --- dlls/gdi32/font.c | 7 ++- dlls/gdi32/tests/font.c | 224 +++++++++++++++++++++++++---------------------- 2 files changed, 125 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=595dbe2eba54d9532aa78…

1 0