wine-commits November 2014

wine-commits@winehq.org

2 participants
394 discussions

Jacek Caban : mshtml: Added IHTMLDocument2::execCommand implementation.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: a0d1d8cd27a4f5d2212f9524cc56be935c5d0483 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d1d8cd27a4f5d2212f9524c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 13:03:30 2014 +0100 mshtml: Added IHTMLDocument2::execCommand implementation. --- dlls/mshtml/htmldoc.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 18 +++++++++++++++ 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 60ee739..c760c36 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -31,6 +31,7 @@ #include "ole2.h" #include "perhist.h" #include "mshtmdid.h" +#include "mshtmcid.h" #include "wine/debug.h" @@ -1095,6 +1096,40 @@ static HRESULT WINAPI HTMLDocument_clear(IHTMLDocument2 *iface) return S_OK; } +static const WCHAR insertorderedlistW[] = + {'i','n','s','e','r','t','o','r','d','e','r','e','d','l','i','s','t',0}; +static const WCHAR insertunorderedlistW[] = + {'i','n','s','e','r','t','u','n','o','r','d','e','r','e','d','l','i','s','t',0}; +static const WCHAR outdentW[] = + {'o','u','t','d','e','n','t',0}; +static const WCHAR respectvisibilityindesignW[] = + {'r','e','s','p','e','c','t','v','i','s','i','b','i','l','i','t','y','i','n','d','e','s','i','g','n',0}; + +static const struct { + const WCHAR *name; + OLECMDID id; +}command_names[] = { + {insertorderedlistW, IDM_ORDERLIST}, + {insertunorderedlistW, IDM_UNORDERLIST}, + {outdentW, IDM_OUTDENT}, + {respectvisibilityindesignW, IDM_RESPECTVISIBILITY_INDESIGN} +}; + +static BOOL cmdid_from_string(const WCHAR *str, OLECMDID *cmdid) +{ + int i; + + for(i = 0; i < sizeof(command_names)/sizeof(*command_names); i++) { + if(!strcmpiW(command_names[i].name, str)) { + *cmdid = command_names[i].id; + return TRUE; + } + } + + FIXME("Unknown command %s\n", debugstr_w(str)); + return FALSE; +} + static HRESULT WINAPI HTMLDocument_queryCommandSupported(IHTMLDocument2 *iface, BSTR cmdID, VARIANT_BOOL *pfRet) { @@ -1147,8 +1182,28 @@ static HRESULT WINAPI HTMLDocument_execCommand(IHTMLDocument2 *iface, BSTR cmdID VARIANT_BOOL showUI, VARIANT value, VARIANT_BOOL *pfRet) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); - return E_NOTIMPL; + OLECMDID cmdid; + VARIANT ret; + HRESULT hres; + + TRACE("(%p)->(%s %x %s %p)\n", This, debugstr_w(cmdID), showUI, debugstr_variant(&value), pfRet); + + if(!cmdid_from_string(cmdID, &cmdid)) + return OLECMDERR_E_NOTSUPPORTED; + + V_VT(&ret) = VT_EMPTY; + hres = IOleCommandTarget_Exec(&This->IOleCommandTarget_iface, &CGID_MSHTML, cmdid, + showUI ? 0 : OLECMDEXECOPT_DONTPROMPTUSER, &value, &ret); + if(FAILED(hres)) + return hres; + + if(V_VT(&ret) != VT_EMPTY) { + FIXME("Handle ret %s\n", debugstr_variant(&ret)); + VariantClear(&ret); + } + + *pfRet = VARIANT_TRUE; + return S_OK; } static HRESULT WINAPI HTMLDocument_execCommandShowHelp(IHTMLDocument2 *iface, BSTR cmdID, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index a919b3d..2d526fc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6005,8 +6005,10 @@ static void test_defaults(IHTMLDocument2 *doc) IHTMLElement2 *elem2; IHTMLElement *elem; IHTMLStyle *style; + VARIANT v; BSTR str; LONG l; + VARIANT_BOOL b; HRESULT hres; IHTMLElementCollection *collection; @@ -6129,6 +6131,22 @@ static void test_defaults(IHTMLDocument2 *doc) hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFiltersCollection, (void**)&body); ok(hres == E_NOINTERFACE, "got interface IHTMLFiltersCollection\n"); + str = a2bstr("xxx"); + b = 100; + V_VT(&v) = VT_EMPTY; + hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); + ok(hres == OLECMDERR_E_NOTSUPPORTED || hres == E_INVALIDARG, + "execCommand failed: %08x, expected OLECMDERR_E_NOTSUPPORTED or E_INVALIDARG\n", hres); + SysFreeString(str); + + str = a2bstr("respectvisibilityindesign"); + b = 100; + V_VT(&v) = VT_BOOL; + V_BOOL(&v) = VARIANT_TRUE; + hres = IHTMLDocument2_execCommand(doc, str, FALSE, v, &b); + ok(hres == S_OK, "execCommand failed: %08x, expected DRAGDROP_E_NOTREGISTERED\n", hres); + SysFreeString(str); + test_default_selection(doc); test_doc_title(doc, ""); test_dom_implementation(doc);

1 0

Jacek Caban : mshtml: Improved IDM_RESPECTVISIBILITY_INDESIGN stub.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: d90016ffed93d1e2e8937329f807300c843e4f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90016ffed93d1e2e8937329f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 24 13:03:24 2014 +0100 mshtml: Improved IDM_RESPECTVISIBILITY_INDESIGN stub. --- dlls/mshtml/olecmd.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/olecmd.c b/dlls/mshtml/olecmd.c index 082777c..eea3aa2 100644 --- a/dlls/mshtml/olecmd.c +++ b/dlls/mshtml/olecmd.c @@ -615,8 +615,13 @@ static HRESULT exec_baselinefont3(HTMLDocument *This, DWORD cmdexecopt, VARIANT static HRESULT exec_respectvisibility_indesign(HTMLDocument *This, DWORD cmdexecopt, VARIANT *in, VARIANT *out) { - FIXME("(%p)->(%08x %p %p)\n", This, cmdexecopt, in, out); - return E_NOTIMPL; + TRACE("(%p)->(%x %s %p)\n", This, cmdexecopt, debugstr_variant(in), out); + + /* This is turned on by default in Gecko. */ + if(!in || V_VT(in) != VT_BOOL || !V_BOOL(in)) + FIXME("Unsupported argument %s\n", debugstr_variant(in)); + + return S_OK; } static HRESULT query_enabled_stub(HTMLDocument *This, OLECMD *cmd)

1 0

Nikolay Sivov : dwrite: Use usWin* values from OS/2 table as font ascent/ descent.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 87a9b51ccc8b82c72c55177777b4bffc8cd31f5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a9b51ccc8b82c72c5517777… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 24 12:06:38 2014 +0300 dwrite: Use usWin* values from OS/2 table as font ascent/descent. --- dlls/dwrite/opentype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 1f5e178..a0f1c31 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -867,8 +867,8 @@ void opentype_get_font_metrics(const void *os2, const void *head, const void *po memset(metrics, 0, sizeof(*metrics)); if (tt_os2) { - metrics->ascent = GET_BE_WORD(tt_os2->sTypoAscender); - metrics->descent = GET_BE_WORD(tt_os2->sTypoDescender); + metrics->ascent = GET_BE_WORD(tt_os2->usWinAscent); + metrics->descent = GET_BE_WORD(tt_os2->usWinDescent); metrics->lineGap = GET_BE_WORD(tt_os2->sTypoLineGap); metrics->capHeight = GET_BE_WORD(tt_os2->sCapHeight); metrics->xHeight = GET_BE_WORD(tt_os2->sxHeight);

1 0

Nikolay Sivov : dwrite: Update to IDWriteBitmapRenderTarget1.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: b8db7f6a04bbf92fb8d720c891a51f80a34baa31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8db7f6a04bbf92fb8d720c89… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Nov 23 22:22:01 2014 +0300 dwrite: Update to IDWriteBitmapRenderTarget1. --- dlls/dwrite/gdiinterop.c | 92 +++++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/font.c | 25 +++++++++++++ 2 files changed, 84 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8db7f6a04bbf92fb8d72…

1 0

Nikolay Sivov : dwrite: Forward more font methods to fontface.
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 7ae3426ea4198d614d2dc808d1de13799e983ba2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ae3426ea4198d614d2dc808d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Nov 22 20:15:27 2014 +0300 dwrite: Forward more font methods to fontface. --- dlls/dwrite/font.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index eb7a274..cef4a27 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -782,8 +782,16 @@ static DWRITE_FONT_STYLE WINAPI dwritefont_GetStyle(IDWriteFont2 *iface) static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsSymbolFont(fontface); } static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocalizedStrings **names) @@ -965,18 +973,34 @@ static HRESULT WINAPI dwritefont1_GetUnicodeRanges(IDWriteFont2 *iface, UINT32 m return IDWriteFontFace2_GetUnicodeRanges(fontface, max_count, ranges, count); } -static HRESULT WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) +static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsMonospacedFont(fontface); } static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + IDWriteFontFace2 *fontface; + HRESULT hr; + + TRACE("(%p)\n", This); + + hr = get_fontface_from_font(This, &fontface); + if (FAILED(hr)) + return hr; + + return IDWriteFontFace2_IsColorFont(fontface); } static const IDWriteFont2Vtbl dwritefontvtbl = {

1 0

André Hentschel : dwrite: Remove unused code (Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 2b3c5d6194c4843a7f8ec4a53099e2397fe54131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3c5d6194c4843a7f8ec4a53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:58:56 2014 +0100 dwrite: Remove unused code (Clang). --- dlls/dwrite/bidi.c | 6 ------ dlls/dwrite/shape.c | 2 -- 2 files changed, 8 deletions(-) diff --git a/dlls/dwrite/bidi.c b/dlls/dwrite/bidi.c index 48a7a06..69eae5a 100644 --- a/dlls/dwrite/bidi.c +++ b/dlls/dwrite/bidi.c @@ -513,12 +513,6 @@ static inline int get_prev_valid_char_from_run(IsolatedRun *run, int index) return index; } -static inline int iso_previousChar(IsolatedRun *run, int index) -{ - if (index <= 0) return -1; - return index--; -} - static inline void iso_dump_types(const char* header, IsolatedRun *run) { int i, len = 0; diff --git a/dlls/dwrite/shape.c b/dlls/dwrite/shape.c index c1ae452..a603932 100644 --- a/dlls/dwrite/shape.c +++ b/dlls/dwrite/shape.c @@ -23,8 +23,6 @@ #include "dwrite_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(dwrite); - struct scriptshaping_cache { IDWriteFontFace *fontface;

1 0

André Hentschel : d3d10core: Remove unused struct ( Clang).
by Alexandre Julliard 25 Nov '14

25 Nov '14

Module: wine Branch: master Commit: 5ddc53f30e422b78970093d783188f5a63c4f70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ddc53f30e422b78970093d78… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 20:59:12 2014 +0100 d3d10core: Remove unused struct (Clang). --- dlls/d3d10core/device.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ad6bc4d..44a8085 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -2173,13 +2173,6 @@ static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl = d3d10_multithread_GetMultithreadProtected, }; -static void STDMETHODCALLTYPE d3d10_subresource_destroyed(void *parent) {} - -static const struct wined3d_parent_ops d3d10_subresource_parent_ops = -{ - d3d10_subresource_destroyed, -}; - /* IWineDXGIDeviceParent IUnknown methods */ static inline struct d3d10_device *device_from_dxgi_device_parent(IWineDXGIDeviceParent *iface)

1 0

André Hentschel : Add WWN 380
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 3c7a591499d920f56a5d3afe6cf61027abb44d52 URL: http://source.winehq.org/git/website.git/?a=commit;h=3c7a591499d920f56a5d3a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 21 22:45:52 2014 +0100 Add WWN 380 --- news/de/2014112101.xml | 11 + news/en/2014112101.xml | 11 + wwn/en/wn20141121_380.xml | 511 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 533 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=3c7a591499d920f56a…

1 0

Jeremy Newman : Merge branch 'master' of winehq.org:/home/winehq/opt/ source/git/website
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 1de2290da91ebd98f3d129dc4d8bae0e605825b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=1de2290da91ebd98f3d129… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:05:01 2014 -0600 Merge branch 'master' of winehq.org:/home/winehq/opt/source/git/website ---

1 0

Jeremy Newman : fix typo
by Jeremy Newman 21 Nov '14

21 Nov '14

Module: website Branch: master Commit: 69beaf110089cd1bd0ee968abd525718e0bb5073 URL: http://source.winehq.org/git/website.git/?a=commit;h=69beaf110089cd1bd0ee96… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri Nov 21 13:04:43 2014 -0600 fix typo --- include/plugins/news.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/plugins/news.php b/include/plugins/news.php index aae63d2..a42c9fc 100644 --- a/include/plugins/news.php +++ b/include/plugins/news.php @@ -111,7 +111,7 @@ switch (true) unset($c); $rss = array( 'rss_date' => date("r", $top_date), - 'rss_title' => "{$config->site_name News", + 'rss_title' => "{$config->site_name} News", 'rss_link' => "{$config->base_url}news/rss/", 'rss_img' => "https://media.codeweavers.com/pub/crossover/marketing/og/wine-hq-announceme…", 'rss_desc' => 'News and information about Wine',

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
40
Older →

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 November 2014