wine-commits January 2015

wine-commits@winehq.org

2 participants
302 discussions

Nikolay Sivov : dwrite: Support family name attribute for ranges.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 9661f129e012a273c2f42f8071ef8457e1b03ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9661f129e012a273c2f42f807… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:22:40 2015 +0300 dwrite: Support family name attribute for ranges. --- dlls/dwrite/layout.c | 139 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 102 insertions(+), 37 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index e8b7a10..0fbaf4a 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -68,7 +68,8 @@ enum layout_range_attr_kind { LAYOUT_RANGE_ATTR_UNDERLINE, LAYOUT_RANGE_ATTR_STRIKETHROUGH, LAYOUT_RANGE_ATTR_FONTCOLL, - LAYOUT_RANGE_ATTR_LOCALE + LAYOUT_RANGE_ATTR_LOCALE, + LAYOUT_RANGE_ATTR_FONTFAMILY }; struct layout_range_attr_value { @@ -84,6 +85,7 @@ struct layout_range_attr_value { BOOL strikethrough; IDWriteFontCollection *collection; const WCHAR *locale; + const WCHAR *fontfamily; } u; }; @@ -100,6 +102,7 @@ struct layout_range { BOOL strikethrough; IDWriteFontCollection *collection; WCHAR locale[LOCALE_NAME_MAX_LENGTH]; + WCHAR *fontfamily; }; struct layout_run { @@ -407,6 +410,8 @@ static BOOL is_same_layout_attrvalue(struct layout_range const *range, enum layo return range->collection == value->u.collection; case LAYOUT_RANGE_ATTR_LOCALE: return strcmpW(range->locale, value->u.locale) == 0; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + return strcmpW(range->fontfamily, value->u.fontfamily) == 0; default: ; } @@ -425,7 +430,8 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st left->underline == right->underline && left->strikethrough == right->strikethrough && left->collection == right->collection && - !strcmpW(left->locale, right->locale); + !strcmpW(left->locale, right->locale) && + !strcmpW(left->fontfamily, right->fontfamily); } static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right) @@ -450,6 +456,13 @@ static struct layout_range *alloc_layout_range(struct dwrite_textlayout *layout, range->effect = NULL; range->underline = FALSE; range->strikethrough = FALSE; + + range->fontfamily = heap_strdupW(layout->format.family_name); + if (!range->fontfamily) { + heap_free(range); + return NULL; + } + range->collection = layout->format.collection; if (range->collection) IDWriteFontCollection_AddRef(range->collection); @@ -489,6 +502,7 @@ static void free_layout_range(struct layout_range *range) IUnknown_Release(range->effect); if (range->collection) IDWriteFontCollection_Release(range->collection); + heap_free(range->fontfamily); heap_free(range); } @@ -591,6 +605,13 @@ static BOOL set_layout_range_attrval(struct layout_range *dest, enum layout_rang if (changed) strcpyW(dest->locale, value->u.locale); break; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + changed = strcmpW(dest->fontfamily, value->u.fontfamily) != 0; + if (changed) { + heap_free(dest->fontfamily); + dest->fontfamily = heap_strdupW(value->u.fontfamily); + } + break; default: ; } @@ -735,6 +756,63 @@ done: return S_OK; } +static inline const WCHAR *get_string_attribute_ptr(struct layout_range *range, enum layout_range_attr_kind kind) +{ + const WCHAR *str; + + switch (kind) { + case LAYOUT_RANGE_ATTR_LOCALE: + str = range->locale; + break; + case LAYOUT_RANGE_ATTR_FONTFAMILY: + str = range->fontfamily; + break; + default: + str = NULL; + } + + return str; +} + +static HRESULT get_string_attribute_length(struct dwrite_textlayout *layout, enum layout_range_attr_kind kind, UINT32 position, + UINT32 *length, DWRITE_TEXT_RANGE *r) +{ + struct layout_range *range; + const WCHAR *str; + + range = get_layout_range_by_pos(layout, position); + if (!range) { + *length = 0; + return S_OK; + } + + str = get_string_attribute_ptr(range, kind); + *length = strlenW(str); + return return_range(range, r); +} + +static HRESULT get_string_attribute_value(struct dwrite_textlayout *layout, enum layout_range_attr_kind kind, UINT32 position, + WCHAR *ret, UINT32 length, DWRITE_TEXT_RANGE *r) +{ + struct layout_range *range; + const WCHAR *str; + + if (length == 0) + return E_INVALIDARG; + + ret[0] = 0; + range = get_layout_range_by_pos(layout, position); + if (!range) + return E_INVALIDARG; + + str = get_string_attribute_ptr(range, kind); + if (length < strlenW(str) + 1) + return E_NOT_SUFFICIENT_BUFFER; + + strcpyW(ret, str); + return return_range(range, r); +} + static HRESULT WINAPI dwritetextlayout_QueryInterface(IDWriteTextLayout2 *iface, REFIID riid, void **obj) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); @@ -1030,8 +1108,20 @@ static HRESULT WINAPI dwritetextlayout_SetFontCollection(IDWriteTextLayout2 *ifa static HRESULT WINAPI dwritetextlayout_SetFontFamilyName(IDWriteTextLayout2 *iface, WCHAR const *name, DWRITE_TEXT_RANGE range) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(name), debugstr_range(&range)); - return E_NOTIMPL; + struct layout_range_attr_value value; + + TRACE("(%p)->(%s %s)\n", This, debugstr_w(name), debugstr_range(&range)); + + if (!name) + return E_INVALIDARG; + + if (!validate_text_range(This, &range)) + return S_OK; + + value.range = range; + value.u.fontfamily = name; + + return set_layout_range_attr(This, LAYOUT_RANGE_ATTR_FONTFAMILY, &value); } static HRESULT WINAPI dwritetextlayout_SetFontWeight(IDWriteTextLayout2 *iface, DWRITE_FONT_WEIGHT weight, DWRITE_TEXT_RANGE range) @@ -1212,19 +1302,19 @@ static HRESULT WINAPI dwritetextlayout_layout_GetFontCollection(IDWriteTextLayou } static HRESULT WINAPI dwritetextlayout_layout_GetFontFamilyNameLength(IDWriteTextLayout2 *iface, - UINT32 pos, UINT32* len, DWRITE_TEXT_RANGE *range) + UINT32 position, UINT32 *length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d %p %p): stub\n", This, pos, len, range); - return E_NOTIMPL; + TRACE("(%p)->(%d %p %p)\n", This, position, length, r); + return get_string_attribute_length(This, LAYOUT_RANGE_ATTR_FONTFAMILY, position, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontFamilyName(IDWriteTextLayout2 *iface, - UINT32 position, WCHAR* name, UINT32 name_size, DWRITE_TEXT_RANGE *range) + UINT32 position, WCHAR *name, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%u %p %u %p): stub\n", This, position, name, name_size, range); - return E_NOTIMPL; + TRACE("(%p)->(%u %p %u %p)\n", This, position, name, length, r); + return get_string_attribute_value(This, LAYOUT_RANGE_ATTR_FONTFAMILY, position, name, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetFontWeight(IDWriteTextLayout2 *iface, @@ -1376,41 +1466,16 @@ static HRESULT WINAPI dwritetextlayout_layout_GetLocaleNameLength(IDWriteTextLay UINT32 position, UINT32* length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; - TRACE("(%p)->(%u %p %p)\n", This, position, length, r); - - range = get_layout_range_by_pos(This, position); - if (!range) { - *length = 0; - return S_OK; - } - - *length = strlenW(range->locale); - return return_range(range, r); + return get_string_attribute_length(This, LAYOUT_RANGE_ATTR_LOCALE, position, length, r); } static HRESULT WINAPI dwritetextlayout_layout_GetLocaleName(IDWriteTextLayout2 *iface, UINT32 position, WCHAR* locale, UINT32 length, DWRITE_TEXT_RANGE *r) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - struct layout_range *range; - TRACE("(%p)->(%u %p %u %p)\n", This, position, locale, length, r); - - if (length == 0) - return E_INVALIDARG; - - locale[0] = 0; - range = get_layout_range_by_pos(This, position); - if (!range) - return E_INVALIDARG; - - if (length < strlenW(range->locale) + 1) - return E_NOT_SUFFICIENT_BUFFER; - - strcpyW(locale, range->locale); - return return_range(range, r); + return get_string_attribute_value(This, LAYOUT_RANGE_ATTR_LOCALE, position, locale, length, r); } static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,

1 0

Nikolay Sivov : dwrite: Fix range comparison by locale name.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: ed398419bce3fab6ac50ab025853ec28bc8ae7c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed398419bce3fab6ac50ab025… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 2 22:01:21 2015 +0300 dwrite: Fix range comparison by locale name. --- dlls/dwrite/layout.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0ddb0b4..e8b7a10 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -424,7 +424,8 @@ static inline BOOL is_same_layout_attributes(struct layout_range const *left, st left->effect == right->effect && left->underline == right->underline && left->strikethrough == right->strikethrough && - left->collection == right->collection; + left->collection == right->collection && + !strcmpW(left->locale, right->locale); } static inline BOOL is_same_text_range(const DWRITE_TEXT_RANGE *left, const DWRITE_TEXT_RANGE *right)

1 0

Matteo Bruni : d3d9/tests: Remove a couple duplicate lines.
by Alexandre Julliard 06 Jan '15

06 Jan '15

Module: wine Branch: master Commit: 6f89df2fb4df592942adcd38c79f030337cca233 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f89df2fb4df592942adcd38c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 5 17:17:54 2015 +0100 d3d9/tests: Remove a couple duplicate lines. --- dlls/d3d9/tests/visual.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d1aa3d4..acc3a44 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -6775,8 +6775,6 @@ static void pretransformed_varying_test(void) hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); - hr = IDirect3DDevice9_SetVertexDeclaration(device, decl); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { IDirect3DPixelShader9 *shader;

1 0

Nikolay Sivov : dwrite: Release FreeType resources on dll unload.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 102d8936cc1798e5236f54a07d37b8c492147d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=102d8936cc1798e5236f54a07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 5 22:17:14 2015 +0300 dwrite: Release FreeType resources on dll unload. --- dlls/dwrite/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 8ad5097..a63f48f 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -48,6 +48,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) case DLL_PROCESS_DETACH: if (reserved) break; release_shared_factory(shared_factory); + release_freetype(); } return TRUE; }

1 0

Bruno Jesus : secur32: Always tell the user that libgnutls could not be loaded.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 54b5660378892ded5bde507f540928be58b7f4b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54b5660378892ded5bde507f5… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Dec 31 01:02:25 2014 -0200 secur32: Always tell the user that libgnutls could not be loaded. --- dlls/secur32/schannel_gnutls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 638b3c5..1173574 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -39,6 +39,7 @@ #if defined(SONAME_LIBGNUTLS) && !defined(HAVE_SECURITY_SECURITY_H) WINE_DEFAULT_DEBUG_CHANNEL(secur32); +WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -480,7 +481,7 @@ BOOL schan_imp_init(void) libgnutls_handle = wine_dlopen(SONAME_LIBGNUTLS, RTLD_NOW, NULL, 0); if (!libgnutls_handle) { - WARN("Failed to load libgnutls.\n"); + ERR_(winediag)("Failed to load libgnutls, secure connections will not be available.\n"); return FALSE; }

1 0

Francois Gouget : riched20: Move DestroyIRichEditOle() into IRichEditOle: Release().
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: c9c2692d8edba7208f32b01edf6635751045dcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9c2692d8edba7208f32b01ed… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:42:20 2015 +0100 riched20: Move DestroyIRichEditOle() into IRichEditOle:Release(). --- dlls/riched20/editor.h | 1 - dlls/riched20/richole.c | 28 ++++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index d8abe4e..e4c13a9 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -241,7 +241,6 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void DestroyIRichEditOle(IRichEditOle *iface) DECLSPEC_HIDDEN; void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 0788125..1280016 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -143,7 +143,18 @@ static ULONG WINAPI IRichEditOleImpl_inner_fnRelease(IUnknown *iface) TRACE ("%p ref=%u\n", This, ref); if (!ref) - DestroyIRichEditOle(&This->IRichEditOle_iface); + { + ITextRangeImpl *txtRge; + + TRACE("Destroying %p\n", This); + This->txtSel->reOle = NULL; + This->editor->reOle = NULL; + ITextSelection_Release(&This->txtSel->ITextSelection_iface); + IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); + LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) + txtRge->reOle = NULL; + heap_free(This); + } return ref; } @@ -2365,21 +2376,6 @@ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *p return 1; } -void DestroyIRichEditOle(IRichEditOle *iface) -{ - IRichEditOleImpl *This = impl_from_IRichEditOle(iface); - ITextRangeImpl *txtRge; - - TRACE("Destroying %p\n", This); - This->txtSel->reOle = NULL; - This->editor->reOle = NULL; - ITextSelection_Release(&This->txtSel->ITextSelection_iface); - IOleClientSite_Release(&This->clientSite->IOleClientSite_iface); - LIST_FOR_EACH_ENTRY(txtRge, &This->rangelist, ITextRangeImpl, entry) - txtRge->reOle = NULL; - heap_free(This); -} - static void convert_sizel(const ME_Context *c, const SIZEL* szl, SIZE* sz) { /* sizel is in .01 millimeters, sz in pixels */

1 0

Francois Gouget : dwrite: Make free_glyph_outline() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 3b87dbe062136d193303413e752f6eaf32897e6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b87dbe062136d193303413e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:34:07 2015 +0100 dwrite: Make free_glyph_outline() static. --- dlls/dwrite/dwrite_private.h | 1 - dlls/dwrite/font.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 907a1c3..5227762 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -142,7 +142,6 @@ struct glyph_outline { }; extern HRESULT new_glyph_outline(UINT32,struct glyph_outline**) DECLSPEC_HIDDEN; -extern void free_glyph_outline(struct glyph_outline*) DECLSPEC_HIDDEN; /* FreeType integration */ extern BOOL init_freetype(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 80b7f07..d0c109d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -451,7 +451,7 @@ HRESULT new_glyph_outline(UINT32 count, struct glyph_outline **ret) return S_OK; } -void free_glyph_outline(struct glyph_outline *outline) +static void free_glyph_outline(struct glyph_outline *outline) { heap_free(outline->points); heap_free(outline->tags);

1 0

Francois Gouget : combase: Remove an unused default debug channel.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: 25faba157e78b979b29ba53d31c2886e956ce6cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=25faba157e78b979b29ba53d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:33:32 2015 +0100 combase: Remove an unused default debug channel. --- dlls/combase/string.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/combase/string.c b/dlls/combase/string.c index 5fe4321..9ec05c6 100644 --- a/dlls/combase/string.c +++ b/dlls/combase/string.c @@ -21,9 +21,7 @@ #include "windows.h" #include "winerror.h" #include "hstring.h" -#include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(combase); struct hstring_private {

1 0

Francois Gouget : winex11.drv: Make X11DRV_PALETTE_ComputeColorShifts() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: b1ac59b9e9600a8293a6601bb50d77e4e701d511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ac59b9e9600a8293a6601bb… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:30:44 2015 +0100 winex11.drv: Make X11DRV_PALETTE_ComputeColorShifts() static. --- dlls/winex11.drv/palette.c | 116 ++++++++++++++++++++++----------------------- dlls/winex11.drv/x11drv.h | 1 - 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cf049c5..a399ec9 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -127,6 +127,64 @@ static void palette_set_mapping( HPALETTE hpal, int *mapping ) /*********************************************************************** + * X11DRV_PALETTE_ComputeChannelShift + * + * Calculate conversion parameters for a given color mask + */ +static void X11DRV_PALETTE_ComputeChannelShift(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) +{ + int i; + + if (maskbits==0) + { + physical->shift=0; + physical->scale=0; + physical->max=0; + to_logical->shift=0; + to_logical->scale=0; + to_logical->max=0; + return; + } + + for(i=0;!(maskbits&1);i++) + maskbits >>= 1; + + physical->shift = i; + physical->max = maskbits; + + for(i=0;maskbits!=0;i++) + maskbits >>= 1; + physical->scale = i; + + if (physical->scale>8) + { + /* On FreeBSD, VNC's default 32bpp mode is bgrabb (ffc00000,3ff800,7ff)! + * So we adjust the shifts to also normalize the color fields to + * the Win32 standard of 8 bits per color. + */ + to_logical->shift=physical->shift+(physical->scale-8); + to_logical->scale=8; + to_logical->max=0xff; + } else { + to_logical->shift=physical->shift; + to_logical->scale=physical->scale; + to_logical->max=physical->max; + } +} + +/*********************************************************************** + * X11DRV_PALETTE_ComputeColorShifts + * + * Calculate conversion parameters for a given color + */ +static void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) +{ + X11DRV_PALETTE_ComputeChannelShift(redMask, &shifts->physicalRed, &shifts->logicalRed); + X11DRV_PALETTE_ComputeChannelShift(greenMask, &shifts->physicalGreen, &shifts->logicalGreen); + X11DRV_PALETTE_ComputeChannelShift(blueMask, &shifts->physicalBlue, &shifts->logicalBlue); +} + +/*********************************************************************** * COLOR_Init * * Initialize color management. @@ -211,64 +269,6 @@ int X11DRV_PALETTE_Init(void) } /*********************************************************************** - * X11DRV_PALETTE_ComputeChannelShift - * - * Calculate conversion parameters for a given color mask - */ -static void X11DRV_PALETTE_ComputeChannelShift(unsigned long maskbits, ChannelShift *physical, ChannelShift *to_logical) -{ - int i; - - if (maskbits==0) - { - physical->shift=0; - physical->scale=0; - physical->max=0; - to_logical->shift=0; - to_logical->scale=0; - to_logical->max=0; - return; - } - - for(i=0;!(maskbits&1);i++) - maskbits >>= 1; - - physical->shift = i; - physical->max = maskbits; - - for(i=0;maskbits!=0;i++) - maskbits >>= 1; - physical->scale = i; - - if (physical->scale>8) - { - /* On FreeBSD, VNC's default 32bpp mode is bgrabb (ffc00000,3ff800,7ff)! - * So we adjust the shifts to also normalize the color fields to - * the Win32 standard of 8 bits per color. - */ - to_logical->shift=physical->shift+(physical->scale-8); - to_logical->scale=8; - to_logical->max=0xff; - } else { - to_logical->shift=physical->shift; - to_logical->scale=physical->scale; - to_logical->max=physical->max; - } -} - -/*********************************************************************** - * X11DRV_PALETTE_ComputeColorShifts - * - * Calculate conversion parameters for a given color - */ -void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) -{ - X11DRV_PALETTE_ComputeChannelShift(redMask, &shifts->physicalRed, &shifts->logicalRed); - X11DRV_PALETTE_ComputeChannelShift(greenMask, &shifts->physicalGreen, &shifts->logicalGreen); - X11DRV_PALETTE_ComputeChannelShift(blueMask, &shifts->physicalBlue, &shifts->logicalBlue); -} - -/*********************************************************************** * X11DRV_PALETTE_BuildPrivateMap * * Allocate colorcells and initialize mapping tables. diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index bcbfe14..0adf7f3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -267,7 +267,6 @@ extern BOOL X11DRV_IsSolidColor(COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_ToLogical(X11DRV_PDEVICE *physDev, int pixel) DECLSPEC_HIDDEN; extern int X11DRV_PALETTE_ToPhysical(X11DRV_PDEVICE *physDev, COLORREF color) DECLSPEC_HIDDEN; extern COLORREF X11DRV_PALETTE_GetColor( X11DRV_PDEVICE *physDev, COLORREF color ) DECLSPEC_HIDDEN; -extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long redMask, unsigned long greenMask, unsigned long blueMask) DECLSPEC_HIDDEN; /* GDI escapes */

1 0

Francois Gouget : mshtml: Make create_document_fragment() static.
by Alexandre Julliard 05 Jan '15

05 Jan '15

Module: wine Branch: master Commit: ec8002425a6aee1d3369bdbf63ffece634d332e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec8002425a6aee1d3369bdbf6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 5 19:28:45 2015 +0100 mshtml: Make create_document_fragment() static. --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 77af21f..907e2bd 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -42,6 +42,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret); + HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret) { nsIDOMNodeList *nsnode_list; @@ -4652,7 +4654,7 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob return S_OK; } -HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret) +static HRESULT create_document_fragment(nsIDOMNode *nsnode, HTMLDocumentNode *doc_node, HTMLDocumentNode **ret) { HTMLDocumentNode *doc_frag; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 459be99..1f391a4 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -759,7 +759,6 @@ struct HTMLDocumentNode { HRESULT HTMLDocument_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT HTMLLoadOptions_Create(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument*,HTMLDocumentObj*,HTMLInnerWindow*,HTMLDocumentNode**) DECLSPEC_HIDDEN; -HRESULT create_document_fragment(nsIDOMNode*,HTMLDocumentNode*,HTMLDocumentNode**) DECLSPEC_HIDDEN; HRESULT HTMLOuterWindow_Create(HTMLDocumentObj*,nsIDOMWindow*,HTMLOuterWindow*,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT update_window_doc(HTMLInnerWindow*) DECLSPEC_HIDDEN;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2015