October 2017 - Wine-Commits

Nikolay Sivov : include: Fix DWRITE_FONT_PROPERTY_ID enum.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 699c65ab1a9a53a434378d96b829faef1400d1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699c65ab1a9a53a434378d96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:15 2017 +0300 include: Fix DWRITE_FONT_PROPERTY_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index b80d033..6b4931c 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -57,6 +57,7 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG, DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH,

1 0

Jacek Caban : mshtml: Use fire_event_obj to dispatch XHR readystatechange event.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: master Commit: 62e76f1847f648a4973fec72c7c8345782366a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e76f1847f648a4973fec72c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:20 2017 +0200 mshtml: Use fire_event_obj to dispatch XHR readystatechange event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 ++-- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/xmlhttprequest.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6314b14..352121b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1252,7 +1252,7 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) return FALSE; } -void call_event_handlers(EventTarget *event_target, DOMEvent *event) +static void call_event_handlers(EventTarget *event_target, DOMEvent *event) { const eventid_t eid = event->event_id; handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); @@ -1370,7 +1370,7 @@ void call_event_handlers(EventTarget *event_target, DOMEvent *event) } } -static void fire_event_obj(EventTarget *event_target, DOMEvent *event) +void fire_event_obj(EventTarget *event_target, DOMEvent *event) { EventTarget *target_chain_buf[8], **target_chain = target_chain_buf; unsigned chain_cnt, chain_buf_size, i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index f348076..8c26c38 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -87,7 +87,7 @@ HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; -void call_event_handlers(EventTarget*,DOMEvent*); +void fire_event_obj(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; HRESULT create_document_event_str(HTMLDocumentNode*,const WCHAR*,IDOMEvent**) DECLSPEC_HIDDEN; HRESULT create_event_from_nsevent(nsIDOMEvent*,DOMEvent**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index cc7a5e0..455bbfb 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -195,7 +195,7 @@ static nsresult NSAPI XMLHttpReqEventListener_HandleEvent(nsIDOMEventListener *i hres = create_event_from_nsevent(nsevent, &event); if(SUCCEEDED(hres) ){ event->no_event_obj = TRUE; - call_event_handlers(&This->xhr->event_target, event); + fire_event_obj(&This->xhr->event_target, event); IDOMEvent_Release(&event->IDOMEvent_iface); } return NS_OK;

1 0

Alexandre Julliard : Wine release 2.0.3
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: website Branch: master Commit: f94ebd6c733eb0b8acfd3c40473b2da4406c34e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=f94ebd6c733eb0b8acfd3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 14:20:07 2017 +0200 Wine release 2.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017102001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2017102001.xml b/news/en/2017102001.xml new file mode 100644 index 0000000..4732f6d --- /dev/null +++ b/news/en/2017102001.xml @@ -0,0 +1,13 @@ +<news> +<date>October 20, 2017</date> +<title>Wine 2.0.3 Released</title> +<body> + The Wine maintenance release 2.0.3 is now available. + <a href="{$root}/announce/2.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>FreeType 2.8.1 compatibility fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.0.3 : Alexandre Julliard : Release 2.0.3
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: refs/tags/wine-2.0.3 Tag: d27ee71d1da516136214cfa164ec9e5fa4f99291 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d27ee71d1da516136214cfa164ec… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 14:17:32 2017 +0200 Release 2.0.3

1 0

Michael Stefaniuc : Release 2.0.3
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: da73ab413f1e642ab3c3ba4e4480caa556a15816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da73ab413f1e642ab3c3ba4e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 10 09:44:51 2017 +0200 Release 2.0.3 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 347 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 158 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da73ab413f1e642ab3c3b…

1 0

Michael Stefaniuc : tools/sfnt2fon: Just skip all glyphs below 0x20.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: a4cea8118a92f90c60cb13c8f292ecacc5bc6b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4cea8118a92f90c60cb13c8f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:41 2017 +0200 tools/sfnt2fon: Just skip all glyphs below 0x20. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89e79d8144308a24676ef069d567a14655985b0c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/sfnt2fon/sfnt2fon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/sfnt2fon/sfnt2fon.c b/tools/sfnt2fon/sfnt2fon.c index ea915da..25f0763 100644 --- a/tools/sfnt2fon/sfnt2fon.c +++ b/tools/sfnt2fon/sfnt2fon.c @@ -439,9 +439,9 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc, el = 0; first_char = FT_Get_First_Char(face, &gi); - if(first_char == 0xd) /* fontforge's first glyph is 0xd, we'll catch this and skip it */ - first_char = 32; /* FT_Get_Next_Char for some reason returns too high - number in this case */ + if(first_char < 0x20) /* Ignore glyphs below 0x20 */ + first_char = 0x20; /* FT_Get_Next_Char for some reason returns too high + number in this case */ info = calloc( 1, sizeof(*info) );

1 0

Nikolay Sivov : gdi32: Pick first charmap if none was selected using preferred encoding.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 9f96ad8edb12e53c54bc235da57ea8ffc5bdd951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f96ad8edb12e53c54bc235da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 26 10:13:47 2017 +0100 gdi32: Pick first charmap if none was selected using preferred encoding. FreeType 2.8.1 has similar logic removed from WinFNT module, that always pre-selected first charmap. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d82321006de92dcd74465c905121618a76eae76a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a5147b5..e8cdd14 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5145,6 +5145,13 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) if (select_charmap( face, *encs )) break; encs++; } + + if (!face->charmap && face->num_charmaps) + { + if (!pFT_Set_Charmap(face, face->charmaps[0])) + return face->charmap->encoding; + } + return *encs; }

1 0

Nikolay Sivov : comctl32/toolbar: Don't add NULL imagelist entries.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: dfda3173b3951781fa197c625d34bbe861d220b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfda3173b3951781fa197c625… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:38 2017 +0300 comctl32/toolbar: Don't add NULL imagelist entries. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ece34a1319f47cb7cd242c0f95d57cd1d35ae8f4) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 784745c..92ab856 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6903,6 +6903,10 @@ static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIS /* Check if the entry already exists */ c = TOOLBAR_GetImageListEntry(*pies, *cies, id); + /* Don't add new entry for NULL imagelist */ + if (!c && !himl) + return NULL; + /* If this is a new entry we must create it and insert into the array */ if (!c) {

1 0

Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: f2561f395fda36e27794ac3e6ceb402757636d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2561f395fda36e27794ac3e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 13:21:42 2017 +0300 shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/ebrowser.c | 3 ++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index bbccf88..07046502 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IExplorerBrowser_iface; } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + else if(IsEqualIID(riid, &IID_IShellBrowser) || + IsEqualIID(riid, &IID_IOleWindow)) { *ppvObject = &This->IShellBrowser_iface; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c04a2b4..7db5842 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -575,7 +575,7 @@ static void test_QueryInterface(void) test_qinterface(IID_IUnknown, S_OK); test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); - todo_wine test_qinterface(IID_IOleWindow, S_OK); + test_qinterface(IID_IOleWindow, S_OK); test_qinterface(IID_ICommDlgBrowser, S_OK); test_qinterface(IID_ICommDlgBrowser2, S_OK); test_qinterface(IID_ICommDlgBrowser3, S_OK);

1 0

Michael Müller : include: Fix an invalid UUID in dxva2api.idl.
by Alexandre Julliard Oct. 20, 2017

Oct. 20, 2017

Module: wine Branch: stable Commit: 305c86b0bcbed42359ddd4756c03e9eec52ba488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305c86b0bcbed42359ddd4756… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 24 16:27:25 2017 +0200 include: Fix an invalid UUID in dxva2api.idl. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11a1ceebc3544dd7954f4ef140a913cd722aa286) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index ebd508b..7a29157 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -434,7 +434,7 @@ interface IDirectXVideoDecoder : IUnknown */ [ object, - uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), + uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), local ] interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService

1 0