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

Alex Henrie : mshtml: Use the same click event handler for anchor and area elements.
by Alexandre Julliard Aug. 17, 2015

Aug. 17, 2015

Module: wine Branch: master Commit: 0c986f98ad0b5f6ad0139b3ae62336d7c248896d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c986f98ad0b5f6ad0139b3ae… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Aug 7 01:21:48 2015 -0600 mshtml: Use the same click event handler for anchor and area elements. --- dlls/mshtml/htmlanchor.c | 145 ++++++++++++++++++++++--------------------- dlls/mshtml/htmlarea.c | 33 +++++++++- dlls/mshtml/mshtml_private.h | 1 + 3 files changed, 108 insertions(+), 71 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index a52c049..684f3ae 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -43,29 +43,18 @@ typedef struct { nsIDOMHTMLAnchorElement *nsanchor; } HTMLAnchorElement; -static HRESULT navigate_anchor_window(HTMLAnchorElement *This, const WCHAR *target) +static HRESULT navigate_href_new_window(HTMLElement *element, nsAString *href_str, const WCHAR *target) { - nsAString href_str; + const PRUnichar *href; IUri *uri; - nsresult nsres; HRESULT hres; - nsAString_Init(&href_str, NULL); - nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *href; - - nsAString_GetData(&href_str, &href); - hres = create_relative_uri(This->element.node.doc->basedoc.window, href, &uri); - }else { - ERR("Could not get anchor href: %08x\n", nsres); - hres = E_FAIL; - } - nsAString_Finish(&href_str); + nsAString_GetData(href_str, &href); + hres = create_relative_uri(element->node.doc->basedoc.window, href, &uri); if(FAILED(hres)) return hres; - hres = navigate_new_window(This->element.node.doc->basedoc.window, uri, target, NULL, NULL); + hres = navigate_new_window(element->node.doc->basedoc.window, uri, target, NULL, NULL); IUri_Release(uri); return hres; } @@ -119,49 +108,69 @@ HTMLOuterWindow *get_target_window(HTMLOuterWindow *window, nsAString *target_st return ret_window; } -static HRESULT navigate_anchor(HTMLAnchorElement *This) +static HRESULT navigate_href(HTMLElement *element, nsAString *href_str, nsAString *target_str) { - nsAString href_str, target_str; HTMLOuterWindow *window; BOOL use_new_window; - nsresult nsres; - HRESULT hres = E_FAIL; + const PRUnichar *href; + HRESULT hres; + window = get_target_window(element->node.doc->basedoc.window, target_str, &use_new_window); + if(!window) { + if(use_new_window) { + const PRUnichar *target; + nsAString_GetData(target_str, &target); + return navigate_href_new_window(element, href_str, target); + }else { + return S_OK; + } + } - nsAString_Init(&target_str, NULL); - nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); - if(NS_FAILED(nsres)) - return E_FAIL; + nsAString_GetData(href_str, &href); + if(*href) { + hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); + }else { + TRACE("empty href\n"); + hres = S_OK; + } + IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + return hres; +} - window = get_target_window(This->element.node.doc->basedoc.window, &target_str, &use_new_window); - if(!window && use_new_window) { - const PRUnichar *target; +HRESULT handle_link_click_event(HTMLElement *element, nsAString *href_str, nsAString *target_str, + nsIDOMEvent *event, BOOL *prevent_default) +{ + nsIDOMMouseEvent *mouse_event; + INT16 button; + nsresult nsres; + HRESULT hres; - nsAString_GetData(&target_str, &target); - hres = navigate_anchor_window(This, target); - nsAString_Finish(&target_str); - return hres; - } + TRACE("CLICK\n"); - nsAString_Finish(&target_str); - if(!window) - return S_OK; + nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMMouseEvent, (void**)&mouse_event); + assert(nsres == NS_OK); - nsAString_Init(&href_str, NULL); - nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); - if(NS_SUCCEEDED(nsres)) { - const PRUnichar *href; + nsres = nsIDOMMouseEvent_GetButton(mouse_event, &button); + assert(nsres == NS_OK); - nsAString_GetData(&href_str, &href); - if(*href) { - hres = navigate_url(window, href, window->uri_nofrag, BINDING_NAVIGATED); - }else { - TRACE("empty href\n"); - hres = S_OK; - } + nsIDOMMouseEvent_Release(mouse_event); + + switch(button) { + case 0: + *prevent_default = TRUE; + hres = navigate_href(element, href_str, target_str); + break; + case 1: + *prevent_default = TRUE; + hres = navigate_href_new_window(element, href_str, NULL); + break; + default: + *prevent_default = FALSE; + hres = S_OK; } - nsAString_Finish(&href_str); - IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); + + nsAString_Finish(href_str); + nsAString_Finish(target_str); return hres; } @@ -721,33 +730,29 @@ static HRESULT HTMLAnchorElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface); + nsAString href_str, target_str; + nsresult nsres; if(eid == EVENTID_CLICK) { - nsIDOMMouseEvent *mouse_event; - INT16 button; - nsresult nsres; - - TRACE("CLICK\n"); - - nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMMouseEvent, (void**)&mouse_event); - assert(nsres == NS_OK); + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); + if (NS_FAILED(nsres)) { + ERR("Could not get anchor href: %08x\n", nsres); + goto fallback; + } - nsres = nsIDOMMouseEvent_GetButton(mouse_event, &button); - assert(nsres == NS_OK); + nsAString_Init(&target_str, NULL); + nsres = nsIDOMHTMLAnchorElement_GetTarget(This->nsanchor, &target_str); + if (NS_FAILED(nsres)) { + ERR("Could not get anchor target: %08x\n", nsres); + goto fallback; + } - nsIDOMMouseEvent_Release(mouse_event); + return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default); - switch(button) { - case 0: - *prevent_default = TRUE; - return navigate_anchor(This); - case 1: - *prevent_default = TRUE; - return navigate_anchor_window(This, NULL); - default: - *prevent_default = FALSE; - return S_OK; - } +fallback: + nsAString_Finish(&href_str); + nsAString_Finish(&target_str); } return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 33a0468..1a81483 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -403,12 +403,43 @@ static HRESULT HTMLAreaElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } +static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +{ + HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + nsAString href_str, target_str; + nsresult nsres; + + if(eid == EVENTID_CLICK) { + nsAString_Init(&href_str, NULL); + nsres = nsIDOMHTMLAreaElement_GetHref(This->nsarea, &href_str); + if (NS_FAILED(nsres)) { + ERR("Could not get area href: %08x\n", nsres); + goto fallback; + } + + nsAString_Init(&target_str, NULL); + nsres = nsIDOMHTMLAreaElement_GetTarget(This->nsarea, &target_str); + if (NS_FAILED(nsres)) { + ERR("Could not get area target: %08x\n", nsres); + goto fallback; + } + + return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default); + +fallback: + nsAString_Finish(&href_str); + nsAString_Finish(&target_str); + } + + return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); +} + static const NodeImplVtbl HTMLAreaElementImplVtbl = { HTMLAreaElement_QI, HTMLElement_destructor, HTMLElement_cpc, HTMLElement_clone, - HTMLElement_handle_event, + HTMLAreaElement_handle_event, HTMLElement_get_attr_col }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 43fa2a7..58ef423 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -996,6 +996,7 @@ HRESULT search_window_props(HTMLInnerWindow*,BSTR,DWORD,DISPID*) DECLSPEC_HIDDEN HRESULT get_frame_by_name(HTMLOuterWindow*,const WCHAR*,BOOL,HTMLOuterWindow**) DECLSPEC_HIDDEN; HRESULT get_doc_elem_by_id(HTMLDocumentNode*,const WCHAR*,HTMLElement**) DECLSPEC_HIDDEN; HTMLOuterWindow *get_target_window(HTMLOuterWindow*,nsAString*,BOOL*) DECLSPEC_HIDDEN; +HRESULT handle_link_click_event(HTMLElement*,nsAString*,nsAString*,nsIDOMEvent*,BOOL*) DECLSPEC_HIDDEN; HRESULT wrap_iface(IUnknown*,IUnknown*,IUnknown**) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_solid_color_brush_init().
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 7d801d67ed577ee6d04c388bb9e96369e0764c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d801d67ed577ee6d04c388bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:09 2015 +0200 d2d1: Get rid of a FIXME in d2d_solid_color_brush_init(). All properties for solid color brushes are implemented. --- dlls/d2d1/brush.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 6f9200a..f1bfbb0 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -304,8 +304,6 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc) { - FIXME("Ignoring brush properties.\n"); - d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_SOLID, desc, (ID2D1BrushVtbl *)&d2d_solid_color_brush_vtbl); brush->u.solid.color = *color;

1 0

Henri Verbeet : d2d1: Get rid of a FIXME in d2d_wic_render_target_init().
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: d41f568226d84057743731ff345d49f93beacc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d41f568226d84057743731ff3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:12 2015 +0200 d2d1: Get rid of a FIXME in d2d_wic_render_target_init(). --- dlls/d2d1/wic_render_target.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index 973303c..07a19ee 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -788,8 +788,6 @@ HRESULT d2d_wic_render_target_init(struct d2d_wic_render_target *render_target, ID3D10Texture2D *texture; HRESULT hr; - FIXME("Ignoring render target properties.\n"); - render_target->ID2D1RenderTarget_iface.lpVtbl = &d2d_wic_render_target_vtbl; render_target->refcount = 1;

1 0

Nikolay Sivov : dwrite: Fix family name extraction order.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: fb013d7acdea4d68b5b1ba2051878b812ab33932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb013d7acdea4d68b5b1ba205… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:09:58 2015 +0300 dwrite: Fix family name extraction order. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 22 ++------------------ dlls/dwrite/gdiinterop.c | 2 +- dlls/dwrite/opentype.c | 48 +++++++++++++++++++++++++++++++++++++++----- 4 files changed, 48 insertions(+), 27 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 1b7bd3a..0fbe44f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -152,7 +152,8 @@ extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_T extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eda6378..c77c7c5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1108,24 +1108,6 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, - IDWriteLocalizedStrings **names) -{ - const void *name_table = NULL; - void *name_context; - HRESULT hr = E_FAIL; - - opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } - else - *names = NULL; - - return hr; -} - static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) { struct dwrite_font_data *data = font->data; @@ -1318,7 +1300,7 @@ static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface, WARN("no NAME table found.\n"); if (table_exists) { - hr = opentype_get_font_strings_from_id(table_data, stringid, &data->info_strings[stringid]); + hr = opentype_get_font_info_strings(table_data, stringid, &data->info_strings[stringid]); if (FAILED(hr) || !data->info_strings[stringid]) return hr; IDWriteFontFace2_ReleaseFontTable(fontface, context); @@ -2091,7 +2073,7 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - hr = get_family_names_from_stream(stream, i, face_type, &family_name); + hr = opentype_get_font_familyname(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) { WARN("unable to get family name from font\n"); diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 8248431..8c0aa43 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -575,7 +575,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *ifa index = IDWriteFontFace_GetIndex(fontface); face_type = IDWriteFontFace_GetType(fontface); opentype_get_font_properties(stream, face_type, index, &props); - hr = get_family_names_from_stream(stream, index, face_type, &familynames); + hr = opentype_get_font_familyname(stream, index, face_type, &familynames); IDWriteFontFile_Release(file); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index c6d4ec3..76b5c68 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') +#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #ifdef WORDS_BIGENDIAN #define GET_BE_WORD(x) (x) @@ -1194,12 +1195,11 @@ static void get_name_record_locale(enum OPENTYPE_PLATFORM_ID platform, USHORT la } } -HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; - UINT16 name_id; BOOL exists; HRESULT hr; int i; @@ -1222,14 +1222,12 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); - name_id = dwriteid_to_opentypeid[id]; - exists = FALSE; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT lang_id, length, offset, encoding, platform; - if (GET_BE_WORD(record->nameID) != name_id) + if (GET_BE_WORD(record->nameID) != id) continue; exists = TRUE; @@ -1293,6 +1291,46 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, DWRITE_INFORMA *strings = NULL; } + return exists ? S_OK : E_FAIL; +} + +/* Provides a conversion from DWRITE to OpenType name ids, input id be valid, it's not checked. */ +HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIONAL_STRING_ID id, IDWriteLocalizedStrings **strings) +{ + return opentype_get_font_strings_from_id(table_data, dwriteid_to_opentypeid[id], strings); +} + +/* Name locating order is WWS Family Name -> Preferred Name -> Family Name. If font claims to + have 'Preferred Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context, *name_context; + const void *name_table; + HRESULT hr; + + opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + + *names = NULL; + + /* if Preferred Family doesn't conform to WWS model try WWS name */ + if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_FAMILY_NAME, names); + else + hr = E_FAIL; + + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_FAMILY_NAME, names); + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (name_context) + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + return hr; }

1 0

Nikolay Sivov : dwrite: Improve face name extraction.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 2ac68e91a46ddd3f185804ea0e7010c4a1ceeeaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ac68e91a46ddd3f185804ea0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 12 21:10:46 2015 +0300 dwrite: Improve face name extraction. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 19 ++++++++-------- dlls/dwrite/opentype.c | 53 ++++++++++++++++++++++++++++++++++++++------ 3 files changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 0fbe44f..42395ee 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -153,7 +153,8 @@ extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANG extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; -extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_font_facename(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c77c7c5..56a0c4d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -59,6 +59,7 @@ struct dwrite_font_data { DWRITE_FONT_METRICS1 metrics; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; + IDWriteLocalizedStrings *names; /* data needed to create fontface instance */ IDWriteFactory2 *factory; @@ -315,6 +316,7 @@ static void release_font_data(struct dwrite_font_data *data) if (data->info_strings[i]) IDWriteLocalizedStrings_Release(data->info_strings[i]); } + IDWriteLocalizedStrings_Release(data->names); IDWriteFontFile_Release(data->file); IDWriteFactory2_Release(data->factory); @@ -1233,11 +1235,8 @@ static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocali *names = NULL; - if (This->simulations == DWRITE_FONT_SIMULATIONS_NONE) { - BOOL exists; - return IDWriteFont2_GetInformationalStrings(iface, DWRITE_INFORMATIONAL_STRING_WIN32_SUBFAMILY_NAMES, - names, &exists); - } + if (This->simulations == DWRITE_FONT_SIMULATIONS_NONE) + return clone_localizedstring(This->data->names, names); switch (This->simulations) { case DWRITE_FONT_SIMULATIONS_BOLD|DWRITE_FONT_SIMULATIONS_OBLIQUE: @@ -1940,7 +1939,7 @@ HRESULT get_filestream_from_file(IDWriteFontFile *file, IDWriteFontFileStream ** return hr; } -static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, UINT32 face_index, DWRITE_FONT_FACE_TYPE face_type, +static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, IDWriteFontFileStream **stream, struct dwrite_font_data **ret) { void *os2_context, *head_context; @@ -1972,6 +1971,7 @@ static HRESULT init_font_data(IDWriteFactory2 *factory, IDWriteFontFile *file, U opentype_get_font_properties(*stream, face_type, face_index, &props); opentype_get_font_metrics(*stream, face_type, face_index, &data->metrics, NULL); + opentype_get_font_facename(*stream, face_type, face_index, &data->names); data->style = props.style; data->stretch = props.stretch; @@ -2038,9 +2038,8 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat DWRITE_FONT_FACE_TYPE face_type; DWRITE_FONT_FILE_TYPE file_type; IDWriteFontFile *file; - UINT32 face_count; + UINT32 face_count, i; BOOL supported; - int i; current = FALSE; hr = IDWriteFontFileEnumerator_MoveNext(enumerator, &current); @@ -2068,12 +2067,12 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat UINT32 index; /* alloc and init new font data structure */ - hr = init_font_data(factory, file, i, face_type, &stream, &font_data); + hr = init_font_data(factory, file, face_type, i, &stream, &font_data); if (FAILED(hr)) break; /* get family name from font file */ - hr = opentype_get_font_familyname(stream, i, face_type, &family_name); + hr = opentype_get_font_familyname(stream, face_type, i, &family_name); IDWriteFontFileStream_Release(stream); if (FAILED(hr)) { WARN("unable to get family name from font\n"); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 76b5c68..d0411bd 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -780,11 +780,12 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_ void * ttc_context; hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); if (SUCCEEDED(hr)) { - table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) hr = E_INVALIDARG; - else + else { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[font_index]); hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + } IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); } } @@ -1200,6 +1201,7 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_ const TT_NAME_V0 *header; BYTE *storage_area = 0; USHORT count = 0; + WORD format; BOOL exists; HRESULT hr; int i; @@ -1211,14 +1213,17 @@ HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_ if (FAILED(hr)) return hr; header = table_data; + format = GET_BE_WORD(header->format); - switch (header->format) { + switch (format) { case 0: + case 1: break; default: - FIXME("unsupported NAME format %d\n", header->format); + FIXME("unsupported NAME format %d\n", format); } + storage_area = (LPBYTE)table_data + GET_BE_WORD(header->stringOffset); count = GET_BE_WORD(header->count); @@ -1300,9 +1305,9 @@ HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIO return opentype_get_font_strings_from_id(table_data, dwriteid_to_opentypeid[id], strings); } -/* Name locating order is WWS Family Name -> Preferred Name -> Family Name. If font claims to - have 'Preferred Name' in WWS format, then WWS name is not used. */ -HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, +/* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to + have 'Preferred Family Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, IDWriteLocalizedStrings **names) { const TT_OS2_V2 *tt_os2; @@ -1334,6 +1339,40 @@ HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, UINT32 index return hr; } +/* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to + have 'Preferred Face Name' in WWS format, then WWS name is not used. */ +HRESULT opentype_get_font_facename(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, + IDWriteLocalizedStrings **names) +{ + const TT_OS2_V2 *tt_os2; + void *os2_context, *name_context; + const void *name_table; + HRESULT hr; + + opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + + *names = NULL; + + /* if Preferred Family doesn't conform to WWS model try WWS name */ + if (tt_os2 && !(GET_BE_WORD(tt_os2->fsSelection) & OS2_FSSELECTION_WWS)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_WWS_SUBFAMILY_NAME, names); + else + hr = E_FAIL; + + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_PREFERRED_SUBFAMILY_NAME, names); + if (FAILED(hr)) + hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names); + + if (tt_os2) + IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); + if (name_context) + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); + + return hr; +} + static inline const OT_Script *opentype_get_script(const OT_ScriptList *scriptlist, UINT32 scripttag) { UINT16 j;

1 0

Carlo Bramini : wmc: Remove redeclaration of optarg and optind.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 891e9bc96741d27620cd46185a9f9a600f669972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=891e9bc96741d27620cd46185… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 11 10:42:01 2015 +0200 wmc: Remove redeclaration of optarg and optind. --- tools/wmc/wmc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 9d34a40..a7fbd6a 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -157,8 +157,6 @@ static void exit_on_signal( int sig ) int main(int argc,char *argv[]) { - extern char* optarg; - extern int optind; int optc; int opti = 0; int lose = 0;

1 0

Henri Verbeet : d2d1: d2d_bitmap_brush_init() can't fail.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 64ccd138a2cf147070061ebf06753f12a9d452ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=64ccd138a2cf147070061ebf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 12 17:37:11 2015 +0200 d2d1: d2d_bitmap_brush_init() can't fail. --- dlls/d2d1/brush.c | 4 +--- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/render_target.c | 8 +------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 2535f85..f450f24 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -683,7 +683,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = d2d_bitmap_brush_GetBitmap, }; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) { d2d_brush_init(brush, factory, D2D_BRUSH_TYPE_BITMAP, @@ -702,8 +702,6 @@ HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID brush->u.bitmap.extend_mode_y = D2D1_EXTEND_MODE_CLAMP; brush->u.bitmap.interpolation_mode = D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; } - - return S_OK; } struct d2d_brush *unsafe_impl_from_ID2D1Brush(ID2D1Brush *iface) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 6553eeb..4ba41e0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -153,7 +153,7 @@ void d2d_solid_color_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, void d2d_linear_gradient_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient) DECLSPEC_HIDDEN; -HRESULT d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, +void d2d_bitmap_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc) DECLSPEC_HIDDEN; void d2d_brush_bind_resources(struct d2d_brush *brush, struct d2d_d3d_render_target *render_target, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index df9a898..263cb91 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -435,7 +435,6 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re { struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); struct d2d_brush *object; - HRESULT hr; TRACE("iface %p, bitmap %p, bitmap_brush_desc %p, brush_desc %p, brush %p.\n", iface, bitmap, bitmap_brush_desc, brush_desc, brush); @@ -443,12 +442,7 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateBitmapBrush(ID2D1Re if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_bitmap_brush_init(object, render_target->factory, bitmap, bitmap_brush_desc, brush_desc))) - { - WARN("Failed to initialize brush, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + d2d_bitmap_brush_init(object, render_target->factory, bitmap, bitmap_brush_desc, brush_desc); TRACE("Created brush %p.\n", object); *brush = (ID2D1BitmapBrush *)&object->ID2D1Brush_iface;

1 0

Carlo Bramini : wrc: Remove redeclaration of optarg and optind.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 36a39cea9096a1eef46c59392858c26ecae40c39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a39cea9096a1eef46c59392… Author: Carlo Bramini <carlo.bramix(a)libero.it> Date: Tue Aug 11 10:43:28 2015 +0200 wrc: Remove redeclaration of optarg and optind. --- tools/wrc/wrc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 577a6f4..15326ee 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -327,8 +327,6 @@ static void set_target( const char *target ) int main(int argc,char *argv[]) { - extern char* optarg; - extern int optind; int optc; int opti = 0; int stdinc = 1;

1 0

Jacek Caban : windows.foundation.idl: Added struct declarations.
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: a00d6ccb7b5c5c775f499dd87d5527baa7b8527c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00d6ccb7b5c5c775f499dd87… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 10 13:20:07 2015 +0200 windows.foundation.idl: Added struct declarations. --- include/windows.foundation.idl | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 6e0062a..2c16fa2 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -72,6 +72,36 @@ namespace Windows { OtherTypeArray = 1044 }; + [version(0x06020000)] + struct Point { + FLOAT X; + FLOAT Y; + }; + + [version(0x06020000)] + struct Size { + FLOAT Width; + FLOAT Height; + }; + + [version(0x06020000)] + struct Rect { + FLOAT X; + FLOAT Y; + FLOAT Width; + FLOAT Height; + }; + + [version(0x06020000)] + struct DateTime { + INT64 UniversalTime; + }; + + [version(0x06020000)] + struct TimeSpan { + INT64 Duration; + }; + [ version(0x06030000), uuid(96369f54-8eb6-48f0-abce-c1b211e627c3)

1 0

Zhenbo Li : msxml3: Handle NULL parameter in IXMLDOMElement:: get_ownerDocument().
by Alexandre Julliard Aug. 13, 2015

Aug. 13, 2015

Module: wine Branch: master Commit: 59c2b325ea2326ad9ccdc3ed478e1e8ba45a17ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=59c2b325ea2326ad9ccdc3ed4… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Sun Aug 9 21:11:45 2015 +0800 msxml3: Handle NULL parameter in IXMLDOMElement::get_ownerDocument(). --- dlls/msxml3/node.c | 2 ++ dlls/msxml3/tests/domdoc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 1ddc9bf..90b5bde 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -654,6 +654,8 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret) HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc) { + if(!doc) + return E_INVALIDARG; return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc); } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f7f57ac..df71b49 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -7467,6 +7467,19 @@ static void test_get_ownerDocument(void) IXMLDOMSchemaCollection *cache; VARIANT_BOOL b; VARIANT var; + IXMLDOMElement *element; + IXMLDOMNodeList *node_list; + IXMLDOMAttribute *attr; + LONG i, len; + HRESULT hr; + const CHAR nodeXML[] = + "<root id='0'>" + " " + " text node 0" + " <x attr='val'></x>" + " <?foo value='PI for x'?>" + " <![CDATA[ cdata ]]>" + "</root>"; if (!is_clsid_supported(&CLSID_DOMDocument2, &IID_IXMLDOMDocument2)) return; if (!is_clsid_supported(&CLSID_XMLSchemaCache, &IID_IXMLDOMSchemaCollection)) return; @@ -7519,6 +7532,47 @@ static void test_get_ownerDocument(void) check_default_props(doc_owner); check_default_props(doc); + /* NULL check */ + hr = IXMLDOMDocument_loadXML(doc1, _bstr_(nodeXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument_get_documentElement(doc1, &element); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_get_childNodes(element, &node_list); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNodeList_get_length(node_list, &len); + EXPECT_HR(hr, S_OK); + + for(i = 0; i < len; i++) { + hr = IXMLDOMNodeList_get_item(node_list, i, &node); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_get_ownerDocument(node, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + IXMLDOMNode_Release(node); + } + IXMLDOMElement_Release(element); + + /* Test Attribute Node */ + hr = IXMLDOMNodeList_get_item(node_list, 2, &node); + EXPECT_HR(hr, S_OK); + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&element); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(node); + + hr = IXMLDOMElement_getAttributeNode(element, _bstr_("attr"), &attr); + EXPECT_HR(hr, S_OK); + ok(attr != NULL, "attr == NULL\n"); + IXMLDOMElement_Release(element); + hr = IXMLDOMAttribute_get_ownerDocument(attr, NULL); + EXPECT_HR(hr, E_INVALIDARG); + IXMLDOMAttribute_Release(attr); + IXMLDOMNodeList_Release(node_list); + IXMLDOMSchemaCollection_Release(cache); IXMLDOMDocument_Release(doc1); IXMLDOMDocument_Release(doc2);

1 0