July 2011 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml.idl: Added missing DispHTMLStyle properties.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: b9d425e7e6534589fcc9070cf95bdaa9c80a9878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d425e7e6534589fcc9070cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 16:29:53 2011 +0200 mshtml.idl: Added missing DispHTMLStyle properties. --- include/mshtml.idl | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index ba933fc..ff2c6ba 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -2272,6 +2272,129 @@ methods: [propget, id(DISPID_IHTMLSTYLE4_MINHEIGHT), displaybind, bindable] VARIANT minHeight(); + + [propput, id(DISPID_IHTMLSTYLE5_MSINTERPOLATIONMODE), displaybind, bindable] + void msInterpolationMode(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE5_MSINTERPOLATIONMODE), displaybind, bindable] + BSTR msInterpolationMode(); + + [propput, id(DISPID_IHTMLSTYLE5_MAXHEIGHT), displaybind, bindable] + void maxHeight(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE5_MAXHEIGHT), displaybind, bindable] + VARIANT maxHeight(); + + [propput, id(DISPID_IHTMLSTYLE5_MINWIDTH), displaybind, bindable] + void minWidth(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE5_MINWIDTH), displaybind, bindable] + VARIANT minWidth(); + + [propput, id(DISPID_IHTMLSTYLE5_MAXWIDTH), displaybind, bindable] + void maxWidth(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE5_MAXWIDTH), displaybind, bindable] + VARIANT maxWidth(); + + [propput, id(DISPID_IHTMLSTYLE6_CONTENT), displaybind, bindable] + void content(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_CONTENT), displaybind, bindable] + BSTR content(); + + [propput, id(DISPID_IHTMLSTYLE6_CAPTIONSIDE), displaybind, bindable] + void captionSide(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_CAPTIONSIDE), displaybind, bindable] + BSTR captionSide(); + + [propput, id(DISPID_IHTMLSTYLE6_COUNTERINCREMENT), displaybind, bindable] + void counterIncrement(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_COUNTERINCREMENT), displaybind, bindable] + BSTR counterIncrement(); + + [propput, id(DISPID_IHTMLSTYLE6_COUNTERRESET), displaybind, bindable] + void counterReset(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_COUNTERRESET), displaybind, bindable] + BSTR counterReset(); + + [propput, id(DISPID_IHTMLSTYLE6_OUTLINE), displaybind, bindable] + void outline(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_OUTLINE), displaybind, bindable] + BSTR outline(); + + [propput, id(DISPID_IHTMLSTYLE6_OUTLINEWIDTH), displaybind, bindable] + void outlineWidth(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE6_OUTLINEWIDTH), displaybind, bindable] + VARIANT outlineWidth(); + + [propput, id(DISPID_IHTMLSTYLE6_OUTLINESTYLE), displaybind, bindable] + void outlineStyle(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_OUTLINESTYLE), displaybind, bindable] + BSTR outlineStyle(); + + [propput, id(DISPID_IHTMLSTYLE6_OUTLINECOLOR), displaybind, bindable] + void outlineColor(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE6_OUTLINECOLOR), displaybind, bindable] + VARIANT outlineColor(); + + [propput, id(DISPID_IHTMLSTYLE6_BOXSIZING), displaybind, bindable] + void boxSizing(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_BOXSIZING), displaybind, bindable] + BSTR boxSizing(); + + [propput, id(DISPID_IHTMLSTYLE6_BORDERSPACING), displaybind, bindable] + void borderSpacing(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_BORDERSPACING), displaybind, bindable] + BSTR borderSpacing(); + + [propput, id(DISPID_IHTMLSTYLE6_ORPHANS), displaybind, bindable] + void orphans(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE6_ORPHANS), displaybind, bindable] + VARIANT orphans(); + + [propput, id(DISPID_IHTMLSTYLE6_WIDOWS), displaybind, bindable] + void widows(VARIANT v); + + [propget, id(DISPID_IHTMLSTYLE6_WIDOWS), displaybind, bindable] + VARIANT widows(); + + [propput, id(DISPID_IHTMLSTYLE6_PAGEBREAKINSIDE), displaybind, bindable] + void pageBreakInside(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_PAGEBREAKINSIDE), displaybind, bindable] + BSTR pageBreakInside(); + + [propput, id(DISPID_IHTMLSTYLE6_EMPTYCELLS), displaybind, bindable] + void emptyCells(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_EMPTYCELLS), displaybind, bindable] + BSTR emptyCells(); + + [propput, id(DISPID_IHTMLSTYLE6_MSBLOCKPROGRESSION), displaybind, bindable] + void msBlockProgression(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_MSBLOCKPROGRESSION), displaybind, bindable] + BSTR msBlockProgression(); + + [propput, id(DISPID_IHTMLSTYLE6_QUOTES), displaybind, bindable] + void quotes(BSTR v); + + [propget, id(DISPID_IHTMLSTYLE6_QUOTES), displaybind, bindable] + BSTR quotes(); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); } [

1 0

Jacek Caban : mshtml: Added IHTMLStyle5 implementation.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 8925638f9f2016328ef1bba044268e540f9c1d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8925638f9f2016328ef1bba04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 28 16:28:59 2011 +0200 mshtml: Added IHTMLStyle5 implementation. --- dlls/mshtml/htmlstyle.c | 3 + dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlstyle3.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 027a2fb..fc8edcc 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -656,6 +656,9 @@ static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, v }else if(IsEqualGUID(&IID_IHTMLStyle4, riid)) { TRACE("(%p)->(IID_IHTMLStyle4 %p)\n", This, ppv); *ppv = &This->IHTMLStyle4_iface; + }else if(IsEqualGUID(&IID_IHTMLStyle5, riid)) { + TRACE("(%p)->(IID_IHTMLStyle5 %p)\n", This, ppv); + *ppv = &This->IHTMLStyle5_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index f23d911..cf103fc 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -22,6 +22,7 @@ struct HTMLStyle { IHTMLStyle2 IHTMLStyle2_iface; IHTMLStyle3 IHTMLStyle3_iface; IHTMLStyle4 IHTMLStyle4_iface; + IHTMLStyle5 IHTMLStyle5_iface; LONG ref; diff --git a/dlls/mshtml/htmlstyle3.c b/dlls/mshtml/htmlstyle3.c index f95cbd7..8c1888c 100644 --- a/dlls/mshtml/htmlstyle3.c +++ b/dlls/mshtml/htmlstyle3.c @@ -458,8 +458,139 @@ static const IHTMLStyle4Vtbl HTMLStyle4Vtbl = { HTMLStyle4_get_minHeight }; +static inline HTMLStyle *impl_from_IHTMLStyle5(IHTMLStyle5 *iface) +{ + return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle5_iface); +} + +static HRESULT WINAPI HTMLStyle5_QueryInterface(IHTMLStyle5 *iface, REFIID riid, void **ppv) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); +} + +static ULONG WINAPI HTMLStyle5_AddRef(IHTMLStyle5 *iface) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); +} + +static ULONG WINAPI HTMLStyle5_Release(IHTMLStyle5 *iface) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + + return IHTMLStyle_Release(&This->IHTMLStyle_iface); +} + +static HRESULT WINAPI HTMLStyle5_GetTypeInfoCount(IHTMLStyle5 *iface, UINT *pctinfo) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLStyle5_GetTypeInfo(IHTMLStyle5 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLStyle5_GetIDsOfNames(IHTMLStyle5 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLStyle5_Invoke(IHTMLStyle5 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLStyle5_put_msInterpolationMode(IHTMLStyle5 *iface, BSTR v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_msInterpolationMode(IHTMLStyle5 *iface, BSTR *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_maxHeight(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_maxHeight(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_minWidth(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_minWidth(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_put_maxWidth(IHTMLStyle5 *iface, VARIANT v) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLStyle5_get_maxWidth(IHTMLStyle5 *iface, VARIANT *p) +{ + HTMLStyle *This = impl_from_IHTMLStyle5(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLStyle5Vtbl HTMLStyle5Vtbl = { + HTMLStyle5_QueryInterface, + HTMLStyle5_AddRef, + HTMLStyle5_Release, + HTMLStyle5_GetTypeInfoCount, + HTMLStyle5_GetTypeInfo, + HTMLStyle5_GetIDsOfNames, + HTMLStyle5_Invoke, + HTMLStyle5_put_msInterpolationMode, + HTMLStyle5_get_msInterpolationMode, + HTMLStyle5_put_maxHeight, + HTMLStyle5_get_maxHeight, + HTMLStyle5_put_minWidth, + HTMLStyle5_get_minWidth, + HTMLStyle5_put_maxWidth, + HTMLStyle5_get_maxWidth +}; + void HTMLStyle3_Init(HTMLStyle *This) { This->IHTMLStyle3_iface.lpVtbl = &HTMLStyle3Vtbl; This->IHTMLStyle4_iface.lpVtbl = &HTMLStyle4Vtbl; + This->IHTMLStyle5_iface.lpVtbl = &HTMLStyle5Vtbl; }

1 0

Piotr Caban : msvcrt: Fix uninitialized memory access in wcsrtombs_l implementation (valgrind).
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: a8c6fda50170b4557a9dd66331b0e0ead344c56b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8c6fda50170b4557a9dd6633… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 12:28:38 2011 +0200 msvcrt: Fix uninitialized memory access in wcsrtombs_l implementation (valgrind). --- dlls/msvcrt/wcs.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index bb720e7..04d3ee2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -313,7 +313,6 @@ static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t MSVCRT_size_t count, MSVCRT__locale_t locale) { MSVCRT_pthreadlocinfo locinfo; - char default_char = '\0'; MSVCRT_size_t tmp = 0; BOOL used_default; @@ -322,16 +321,20 @@ static MSVCRT_size_t CDECL MSVCRT_wcsrtombs_l(char *mbstr, const MSVCRT_wchar_t else locinfo = locale->locinfo; - if(!mbstr) - return WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, -1, NULL, 0, &default_char, &used_default)-1; + if(!mbstr) { + tmp = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, + *wcstr, -1, NULL, 0, NULL, &used_default)-1; + if(used_default) + return -1; + return tmp; + } while(**wcstr) { char buf[3]; MSVCRT_size_t i, size; size = WideCharToMultiByte(locinfo->lc_codepage, WC_NO_BEST_FIT_CHARS, - *wcstr, 1, buf, 3, &default_char, &used_default); + *wcstr, 1, buf, 3, NULL, &used_default); if(used_default) return -1; if(tmp+size > count)

1 0

Huw Davies : gdi32/tests: Add tests for GetDIBits using non-trivial source and destination areas.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 3f629462725a0ed9b99e5279192f40f0de19e50d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f629462725a0ed9b99e52791… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 11:01:05 2011 +0100 gdi32/tests: Add tests for GetDIBits using non-trivial source and destination areas. --- dlls/gdi32/tests/bitmap.c | 330 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 329 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f629462725a0ed9b99e5…

1 0

Huw Davies : gdi32: Add an inline helper to return the number of colour entries in a dib.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 3460665c50cafb5af8e7a8d4d82d6b4aebbbb328 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3460665c50cafb5af8e7a8d4d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 15:34:14 2011 +0100 gdi32: Add an inline helper to return the number of colour entries in a dib. --- dlls/gdi32/dib.c | 16 ++++------------ dlls/gdi32/dibdrv/dc.c | 10 ++-------- dlls/gdi32/gdi_private.h | 6 ++++++ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index a590b94..99baf67 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -91,10 +91,7 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) } else /* assume BITMAPINFOHEADER */ { - colors = info->bmiHeader.biClrUsed; - if (colors > 256) colors = 256; - if (!colors && (info->bmiHeader.biBitCount <= 8)) - colors = 1 << info->bmiHeader.biBitCount; + colors = get_dib_num_of_colors( info ); if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; size = max( info->bmiHeader.biSize, sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) ); return size + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); @@ -212,9 +209,7 @@ static BOOL bitmapinfo_from_user_bitmapinfo( BITMAPINFO *dst, const BITMAPINFO * static int fill_color_table_from_palette( BITMAPINFO *info, DC *dc ) { PALETTEENTRY palEntry[256]; - int i, colors = (info->bmiHeader.biBitCount > 8) ? 0 : 1 << info->bmiHeader.biBitCount; - - if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; + int i, colors = get_dib_num_of_colors( info ); if (!colors) return 0; @@ -809,13 +804,11 @@ static int fill_query_info( BITMAPINFO *info, BITMAPOBJ *bmp ) */ static void copy_color_info(BITMAPINFO *dst, const BITMAPINFO *src, UINT coloruse) { - unsigned int colors = src->bmiHeader.biBitCount > 8 ? 0 : 1 << src->bmiHeader.biBitCount; + unsigned int colors = get_dib_num_of_colors( src ); RGBQUAD *src_colors = (RGBQUAD *)((char *)src + src->bmiHeader.biSize); assert( src->bmiHeader.biSize >= sizeof(BITMAPINFOHEADER) ); - if (src->bmiHeader.biClrUsed) colors = src->bmiHeader.biClrUsed; - if (dst->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) { BITMAPCOREINFO *core = (BITMAPCOREINFO *)dst; @@ -1219,8 +1212,7 @@ static void DIB_CopyColorTable( DC *dc, BITMAPOBJ *bmp, WORD coloruse, const BIT } else { - colors = info->bmiHeader.biClrUsed; - if (!colors) colors = 1 << info->bmiHeader.biBitCount; + colors = get_dib_num_of_colors( info ); } if (colors > 256) { diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 50ceffe..aa74859 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -163,7 +163,7 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u DWORD *masks = NULL; RGBQUAD *color_table = NULL, pal_table[256]; BYTE *ptr = (BYTE*)bi + bi->biSize; - int num_colors = bi->biClrUsed; + int num_colors = get_dib_num_of_colors( (const BITMAPINFO *)bi ); if(bi->biCompression == BI_BITFIELDS) { @@ -171,7 +171,6 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u ptr += 3 * sizeof(DWORD); } - if(!num_colors && bi->biBitCount <= 8) num_colors = 1 << bi->biBitCount; if(num_colors) { if(usage == DIB_PAL_COLORS) @@ -202,15 +201,10 @@ BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD u BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits, enum dib_info_flags flags) { - unsigned int colors = 0; + unsigned int colors = get_dib_num_of_colors( info ); void *colorptr = (char *)&info->bmiHeader + info->bmiHeader.biSize; const DWORD *bitfields = (info->bmiHeader.biCompression == BI_BITFIELDS) ? (DWORD *)colorptr : NULL; - if (info->bmiHeader.biBitCount <= 8) - { - colors = 1 << info->bmiHeader.biBitCount; - if (info->bmiHeader.biClrUsed) colors = info->bmiHeader.biClrUsed; - } return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index b825df9..013eb44 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -564,6 +564,12 @@ static inline int get_dib_image_size( const BITMAPINFO *info ) * abs( info->bmiHeader.biHeight ); } +static inline int get_dib_num_of_colors( const BITMAPINFO *info ) +{ + if (info->bmiHeader.biClrUsed) return min( info->bmiHeader.biClrUsed, 256 ); + return info->bmiHeader.biBitCount > 8 ? 0 : 1 << info->bmiHeader.biBitCount; +} + extern void free_heap_bits( struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; #endif /* __WINE_GDI_PRIVATE_H */

1 0

Huw Davies : gdi32: Better handling of non-trivial source and destination areas.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 863eb31bba7d5b59e52444de6afd500946812764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=863eb31bba7d5b59e52444de6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 11:01:04 2011 +0100 gdi32: Better handling of non-trivial source and destination areas. --- dlls/gdi32/dib.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 72 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 94a69a7..a590b94 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1035,28 +1035,84 @@ INT WINAPI GetDIBits( char src_bmibuf[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; BITMAPINFO *src_info = (BITMAPINFO *)src_bmibuf; struct gdi_image_bits src_bits; - struct bitblt_coords src; + struct bitblt_coords src, dst; DWORD err; + int dst_to_src_offset; + BOOL empty_rect; - src.visrect.left = 0; - src.visrect.right = min( width, bmp->bitmap.bmWidth ); + src.visrect.left = 0; + src.visrect.top = 0; + src.visrect.right = bmp->bitmap.bmWidth; + src.visrect.bottom = bmp->bitmap.bmHeight; - if (startscan >= bmp->bitmap.bmHeight) /* constrain lines to within src bitmap */ - lines = 0; + dst.visrect.left = 0; + dst.visrect.top = 0; + dst.visrect.right = dst_info->bmiHeader.biWidth; + dst.visrect.bottom = abs( dst_info->bmiHeader.biHeight ); + + if (startscan >= dst.visrect.bottom) + { + lines = 1; /* yes, this is strange */ + goto empty_image; + } + + if (dst_info->bmiHeader.biHeight > 0) + { + dst_to_src_offset = -startscan; + lines = min( lines, dst.visrect.bottom - startscan ); + if (lines < dst.visrect.bottom) dst.visrect.top = dst.visrect.bottom - lines; + } else - lines = min( lines, bmp->bitmap.bmHeight - startscan ); - lines = min( lines, abs(height) ); /* and constrain to within dest bitmap */ + { + dst_to_src_offset = dst.visrect.bottom - lines - startscan; + if (dst_to_src_offset < 0) + { + dst_to_src_offset = 0; + lines = dst.visrect.bottom - startscan; + } + if (lines < dst.visrect.bottom) dst.visrect.bottom = lines; + } - if (lines == 0) goto done; + offset_rect( &dst.visrect, 0, dst_to_src_offset ); + empty_rect = !intersect_rect( &src.visrect, &src.visrect, &dst.visrect ); + dst.visrect = src.visrect; + offset_rect( &dst.visrect, 0, -dst_to_src_offset ); + + if (dst_info->bmiHeader.biHeight > 0) + { + if (dst.visrect.bottom < dst_info->bmiHeader.biHeight) + { + int pad_lines = min( dst_info->bmiHeader.biHeight - dst.visrect.bottom, lines ); + int pad_bytes = pad_lines * get_dib_stride( width, bpp ); + memset( bits, 0, pad_bytes ); + bits = (char *)bits + pad_bytes; + } + } + else + { + if (dst.visrect.bottom < lines) + { + int pad_lines = lines - dst.visrect.bottom, stride = get_dib_stride( width, bpp ); + int pad_bytes = pad_lines * stride; + memset( (char *)bits + dst.visrect.bottom * stride, 0, pad_bytes ); + } + } - src.visrect.bottom = bmp->bitmap.bmHeight - startscan; - src.visrect.top = src.visrect.bottom - lines; - src.x = src.visrect.left; - src.y = src.visrect.top; - src.width = src.visrect.right - src.visrect.left; + if (empty_rect) + { + lines = 0; + goto empty_image; + } + + src.x = src.visrect.left; + src.y = src.visrect.top; + src.width = src.visrect.right - src.visrect.left; src.height = src.visrect.bottom - src.visrect.top; + lines = src.height; + err = bmp->funcs->pGetImage( NULL, hbitmap, src_info, &src_bits, &src ); + if(err) { lines = 0; @@ -1072,15 +1128,16 @@ INT WINAPI GetDIBits( } if(dst_info->bmiHeader.biHeight > 0) - dst_info->bmiHeader.biHeight = lines; + dst_info->bmiHeader.biHeight = src.height; else - dst_info->bmiHeader.biHeight = -lines; + dst_info->bmiHeader.biHeight = -src.height; convert_bitmapinfo( src_info, src_bits.ptr, &src.visrect, dst_info, bits ); if (src_bits.free) src_bits.free( &src_bits ); } else lines = abs(height); +empty_image: if (coloruse == DIB_PAL_COLORS) { WORD *index = (WORD *)dst_info->bmiColors;

1 0

Huw Davies : shell32: Initialise the error string pointer.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: fccd4e29c9405344d1f5a4132c94b40e33213e6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fccd4e29c9405344d1f5a4132… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 11:04:27 2011 +0100 shell32: Initialise the error string pointer. --- dlls/shell32/shellpath.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 4bd3de2..8336479 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3199,6 +3199,8 @@ static HRESULT redirect_known_folder( LPWSTR lpRegistryPath = NULL, lpSrcPath = NULL; TRACE("(%s, %p, 0x%08x, %s, %d, %p, %p)\n", debugstr_guid(rfid), hwnd, flags, debugstr_w(pszTargetPath), cFolders, pExclusion, ppszError); + if (ppszError) *ppszError = NULL; + hr = get_known_folder_registry_path(rfid, NULL, &lpRegistryPath); if(SUCCEEDED(hr))

1 0

Alexandre Julliard : rpcrt4: Convert old-style arguments for NdrMesProcEncodeDecode.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 348f00e11653282c4a2e86928dae1b55f018f936 URL: http://source.winehq.org/git/wine.git/?a=commit;h=348f00e11653282c4a2e86928… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 17:30:40 2011 +0200 rpcrt4: Convert old-style arguments for NdrMesProcEncodeDecode. --- dlls/rpcrt4/ndr_es.c | 19 +++---- dlls/rpcrt4/ndr_stubless.c | 125 ++----------------------------------------- dlls/rpcrt4/ndr_stubless.h | 8 ++- 3 files changed, 19 insertions(+), 133 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=348f00e11653282c4a2e8…

1 0

Alexandre Julliard : rpcrt4: Fetch the arguments address from the StubMsg structure.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: 064a81782cbc4a7310848d5789504f386c4e8de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=064a81782cbc4a7310848d578… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 12:48:39 2011 +0200 rpcrt4: Fetch the arguments address from the StubMsg structure. --- dlls/rpcrt4/ndr_es.c | 12 +++++----- dlls/rpcrt4/ndr_stubless.c | 49 +++++++++++++++++++------------------------ dlls/rpcrt4/ndr_stubless.h | 5 +-- 3 files changed, 30 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=064a81782cbc4a7310848…

1 0

Alexandre Julliard : rpcrt4: Simplify tracing of function parameters and flags.
by Alexandre Julliard July 28, 2011

July 28, 2011

Module: wine Branch: master Commit: cf930f1fc9c5485f270a93967b2e3ef4490e7706 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf930f1fc9c5485f270a93967… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 28 12:57:51 2011 +0200 rpcrt4: Simplify tracing of function parameters and flags. --- dlls/rpcrt4/ndr_stubless.c | 99 ++++++++++++++++++++++--------------------- 1 files changed, 51 insertions(+), 48 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index e107285..ad74f92 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -107,33 +107,41 @@ void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) #endif } -static void dump_RPC_FC_PROC_PF(PARAM_ATTRIBUTES param_attributes) +static const char *debugstr_PROC_PF(PARAM_ATTRIBUTES param_attributes) { - if (param_attributes.MustSize) TRACE(" MustSize"); - if (param_attributes.MustFree) TRACE(" MustFree"); - if (param_attributes.IsPipe) TRACE(" IsPipe"); - if (param_attributes.IsIn) TRACE(" IsIn"); - if (param_attributes.IsOut) TRACE(" IsOut"); - if (param_attributes.IsReturn) TRACE(" IsReturn"); - if (param_attributes.IsBasetype) TRACE(" IsBasetype"); - if (param_attributes.IsByValue) TRACE(" IsByValue"); - if (param_attributes.IsSimpleRef) TRACE(" IsSimpleRef"); - if (param_attributes.IsDontCallFreeInst) TRACE(" IsDontCallFreeInst"); - if (param_attributes.SaveForAsyncFinish) TRACE(" SaveForAsyncFinish"); - if (param_attributes.ServerAllocSize) TRACE(" ServerAllocSize = %d", param_attributes.ServerAllocSize * 8); + char buffer[160]; + + buffer[0] = 0; + if (param_attributes.MustSize) strcat(buffer, " MustSize"); + if (param_attributes.MustFree) strcat(buffer, " MustFree"); + if (param_attributes.IsPipe) strcat(buffer, " IsPipe"); + if (param_attributes.IsIn) strcat(buffer, " IsIn"); + if (param_attributes.IsOut) strcat(buffer, " IsOut"); + if (param_attributes.IsReturn) strcat(buffer, " IsReturn"); + if (param_attributes.IsBasetype) strcat(buffer, " IsBasetype"); + if (param_attributes.IsByValue) strcat(buffer, " IsByValue"); + if (param_attributes.IsSimpleRef) strcat(buffer, " IsSimpleRef"); + if (param_attributes.IsDontCallFreeInst) strcat(buffer, " IsDontCallFreeInst"); + if (param_attributes.SaveForAsyncFinish) strcat(buffer, " SaveForAsyncFinish"); + if (param_attributes.ServerAllocSize) + sprintf( buffer + strlen(buffer), " ServerAllocSize = %d", param_attributes.ServerAllocSize * 8); + return buffer[0] ? wine_dbg_sprintf( "%s", buffer + 1 ) : ""; } -static void dump_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags) +static const char *debugstr_INTERPRETER_OPT_FLAGS(INTERPRETER_OPT_FLAGS Oi2Flags) { - if (Oi2Flags.ServerMustSize) TRACE(" ServerMustSize"); - if (Oi2Flags.ClientMustSize) TRACE(" ClientMustSize"); - if (Oi2Flags.HasReturn) TRACE(" HasReturn"); - if (Oi2Flags.HasPipes) TRACE(" HasPipes"); - if (Oi2Flags.Unused) TRACE(" Unused"); - if (Oi2Flags.HasAsyncUuid) TRACE(" HasAsyncUuid"); - if (Oi2Flags.HasExtensions) TRACE(" HasExtensions"); - if (Oi2Flags.HasAsyncHandle) TRACE(" HasAsyncHandle"); - TRACE("\n"); + char buffer[160]; + + buffer[0] = 0; + if (Oi2Flags.ServerMustSize) strcat(buffer, " ServerMustSize"); + if (Oi2Flags.ClientMustSize) strcat(buffer, " ClientMustSize"); + if (Oi2Flags.HasReturn) strcat(buffer, " HasReturn"); + if (Oi2Flags.HasPipes) strcat(buffer, " HasPipes"); + if (Oi2Flags.Unused) strcat(buffer, " Unused"); + if (Oi2Flags.HasAsyncUuid) strcat(buffer, " HasAsyncUuid"); + if (Oi2Flags.HasExtensions) strcat(buffer, " HasExtensions"); + if (Oi2Flags.HasAsyncHandle) strcat(buffer, " HasAsyncHandle"); + return buffer[0] ? wine_dbg_sprintf( "%s", buffer + 1 ) : ""; } #define ARG_FROM_OFFSET(args, offset) ((args) + (offset)) @@ -294,10 +302,7 @@ static void client_do_args(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, { unsigned char *pArg = pStubMsg->StackTop + params[i].stack_offset; - TRACE("param[%d]: new format\n", i); - TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(params[i].attr); TRACE("\n"); - TRACE("\tstack_offset: 0x%x\n", params[i].stack_offset); - TRACE("\tmemory addr (before): %p\n", pArg); + TRACE("param[%d]: %p %s\n", i, pArg, debugstr_PROC_PF( params[i].attr )); if (params[i].attr.IsBasetype) { @@ -643,7 +648,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); - TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); + TRACE("Oif_flags = %s\n", debugstr_INTERPRETER_OPT_FLAGS(Oif_flags) ); if (Oif_flags.HasExtensions) { @@ -1125,10 +1130,8 @@ static LONG_PTR *stub_do_args(MIDL_STUB_MESSAGE *pStubMsg, { unsigned char *pArg = pStubMsg->StackTop + params[i].stack_offset; - TRACE("param[%d]: new format\n", i); - TRACE("\tparam_attributes:"); dump_RPC_FC_PROC_PF(params[i].attr); TRACE("\n"); - TRACE("\tstack_offset: 0x%x\n", params[i].stack_offset); - TRACE("\tmemory addr (before): %p -> %p\n", pArg, *(unsigned char **)pArg); + TRACE("param[%d]: %p -> %p %s\n", i, + pArg, *(unsigned char **)pArg, debugstr_PROC_PF( params[i].attr )); if (params[i].attr.IsBasetype) { @@ -1532,16 +1535,16 @@ LONG WINAPI NdrStubCall2( number_of_params = pOIFHeader->number_of_params; current_offset += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); - } - TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); + TRACE("Oif_flags = %s\n", debugstr_INTERPRETER_OPT_FLAGS(Oif_flags) ); - if (Oif_flags.HasExtensions) - { - const NDR_PROC_HEADER_EXTS *pExtensions = - (const NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; - ext_flags = pExtensions->Flags2; - current_offset += pExtensions->Size; + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = + (const NDR_PROC_HEADER_EXTS *)&pFormat[current_offset]; + ext_flags = pExtensions->Flags2; + current_offset += pExtensions->Size; + } } if (pProcHeader->Oi_flags & RPC_FC_PROC_OIF_OBJECT) @@ -1825,16 +1828,16 @@ LONG_PTR CDECL ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING async_call_data->number_of_params = pOIFHeader->number_of_params; pFormat += sizeof(NDR_PROC_PARTIAL_OIF_HEADER); - } - TRACE("Oif_flags = "); dump_INTERPRETER_OPT_FLAGS(Oif_flags); + TRACE("Oif_flags = %s\n", debugstr_INTERPRETER_OPT_FLAGS(Oif_flags) ); - if (Oif_flags.HasExtensions) - { - const NDR_PROC_HEADER_EXTS *pExtensions = - (const NDR_PROC_HEADER_EXTS *)pFormat; - ext_flags = pExtensions->Flags2; - pFormat += pExtensions->Size; + if (Oif_flags.HasExtensions) + { + const NDR_PROC_HEADER_EXTS *pExtensions = + (const NDR_PROC_HEADER_EXTS *)pFormat; + ext_flags = pExtensions->Flags2; + pFormat += pExtensions->Size; + } } async_call_data->pParamFormat = pFormat;

1 0