October 2017 - Wine-commits

Jacek Caban : mshtml: Don't use fire_event to dispatch window load event.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: a52828c8b216eda2c89e4a129347bf7709774263 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52828c8b216eda2c89e4a129… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:36 2017 +0200 mshtml: Don't use fire_event to dispatch window load event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsevents.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 733d7e7..b5dc0bf 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -267,10 +267,18 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event &doc->basedoc.window->base.IHTMLWindow2_iface, 0); if(doc->nsdoc) { + DOMEvent *load_event; + HRESULT hres; + flush_pending_tasks(doc->basedoc.task_magic); fire_event(doc, EVENTID_LOAD, TRUE, &doc->node.event_target, event); - fire_event(doc, EVENTID_LOAD, TRUE, &doc->window->event_target, event); + + hres = create_event_from_nsevent(event, &load_event); + if(SUCCEEDED(hres)) { + fire_event_obj(&doc->window->event_target, load_event); + IDOMEvent_Release(&load_event->IDOMEvent_iface); + } }else { ERR("NULL nsdoc\n"); nsres = NS_ERROR_FAILURE;

1 0

Jacek Caban : mshtml: Use create_event_from_nsevent in handle_htmlevent.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: b271b48d5bfb5498007e9986c01f9ea60fb51911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b271b48d5bfb5498007e9986c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 20 15:09:55 2017 +0200 mshtml: Use create_event_from_nsevent in handle_htmlevent. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/nsevents.c | 25 ++++++++++++------------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 352121b..8167694 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -195,7 +195,7 @@ static const event_info_t event_info[] = { static BOOL use_event_quirks(EventTarget*); -eventid_t str_to_eid(LPCWSTR str) +static eventid_t str_to_eid(const WCHAR *str) { int i; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8c26c38..1d99604 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -71,7 +71,6 @@ typedef struct { BOOL no_event_obj; } DOMEvent; -eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,EventTarget*,nsIDOMEvent*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index b5dc0bf..4e79f63 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -288,16 +288,14 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event return nsres; } -static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event) +static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *nsevent) { nsEventListener *This = impl_from_nsIDOMEventListener(iface); HTMLDocumentNode *doc = This->This->doc; - const PRUnichar *type; nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; - nsAString type_str; HTMLDOMNode *node; - eventid_t eid; + DOMEvent *event; nsresult nsres; HRESULT hres; @@ -308,13 +306,7 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - nsAString_Init(&type_str, NULL); - nsIDOMEvent_GetType(event, &type_str); - nsAString_GetData(&type_str, &type); - eid = str_to_eid(type); - nsAString_Finish(&type_str); - - nsres = nsIDOMEvent_GetTarget(event, &event_target); + nsres = nsIDOMEvent_GetTarget(nsevent, &event_target); if(NS_FAILED(nsres) || !event_target) { ERR("GetEventTarget failed: %08x\n", nsres); return NS_OK; @@ -332,8 +324,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(FAILED(hres)) return NS_OK; + hres = create_event_from_nsevent(nsevent, &event); + if(FAILED(hres)) { + node_release(node); + return NS_OK; + } + /* If we fine need for more special cases here, we may consider handling it in a more generic way. */ - switch(eid) { + switch(event->event_id) { case EVENTID_FOCUS: if(doc->event_vector[EVENTID_FOCUSIN]) fire_event(doc, EVENTID_FOCUSIN, TRUE, &node->event_target, NULL); @@ -346,8 +344,9 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * break; } - fire_event(doc, eid, TRUE, &node->event_target, event); + fire_event_obj(&node->event_target, event); + IDOMEvent_Release(&event->IDOMEvent_iface); node_release(node); return NS_OK; }

1 0

Alexandre Julliard : Wine release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

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

Michael Stefaniuc : Release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

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

Tag wine-2.0.3 : Alexandre Julliard : Release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

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

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

20 Oct '17

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 : comctl32/toolbar: Support undocumented IDs for standard bitmap lists.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 852b83950ee06fa06e9ba42fa6e3a6b23424beb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852b83950ee06fa06e9ba42fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 05:56:39 2017 +0300 comctl32/toolbar: Support undocumented IDs for standard bitmap lists. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d93ae6ff346d0a84ad0db2cc034b72f0595e59e0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 93 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 7 +++- 2 files changed, 97 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index a8bcd40..1cfbe3e 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -490,13 +490,81 @@ static void add_128x15_bitmap(HWND hToolbar, int nCmds) static void test_add_bitmap(void) { + TBADDBITMAP stdsmall, std; HWND hToolbar = NULL; TBADDBITMAP bmp128; TBADDBITMAP bmp80; - TBADDBITMAP stdsmall; TBADDBITMAP addbmp; HIMAGELIST himl; - INT ret; + INT ret, id; + + /* Test default bitmaps range */ + for (id = IDB_STD_SMALL_COLOR; id < IDB_HIST_LARGE_COLOR; id++) + { + HIMAGELIST himl; + int cx, cy, count; + + rebuild_toolbar(&hToolbar); + + std.hInst = HINST_COMMCTRL; + std.nID = id; + + ret = SendMessageA(hToolbar, TB_ADDBITMAP, 0, (LPARAM)&std); + ok(ret == 0, "Got %d\n", ret); + + himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); + ok(himl != NULL, "Got %p\n", himl); + + ret = ImageList_GetIconSize(himl, &cx, &cy); + ok(ret, "Got %d\n", ret); + ok(cx == cy, "Got %d x %d\n", cx, cy); + + count = ImageList_GetImageCount(himl); + + /* Image count */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case IDB_STD_LARGE_COLOR: + case 2: + case 3: + ok(count == 15, "got count %d\n", count); + break; + case IDB_VIEW_SMALL_COLOR: + case IDB_VIEW_LARGE_COLOR: + case 6: + case 7: + ok(count == 12, "got count %d\n", count); + break; + case IDB_HIST_SMALL_COLOR: + case IDB_HIST_LARGE_COLOR: + ok(count == 5, "got count %d\n", count); + break; + default: + ok(0, "id %d, count %d\n", id, count); + } + + /* Image sizes */ + switch (id) + { + case IDB_STD_SMALL_COLOR: + case 2: + case IDB_VIEW_SMALL_COLOR: + case 6: + case IDB_HIST_SMALL_COLOR: + ok(cx == 16, "got size %d\n", cx); + break; + case IDB_STD_LARGE_COLOR: + case 3: + case IDB_VIEW_LARGE_COLOR: + case 7: + case IDB_HIST_LARGE_COLOR: + ok(cx == 24, "got size %d\n", cx); + break; + default: + ok(0, "id %d, size %d\n", id, cx); + } + } /* empty 128x15 bitmap */ bmp128.hInst = GetModuleHandleA(NULL); @@ -2408,6 +2476,26 @@ todo_wine DestroyWindow(hwnd); } +static void test_imagelist(void) +{ + HIMAGELIST imagelist; + HWND hwnd = NULL; + int ret; + + rebuild_toolbar(&hwnd); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + ret = SendMessageA(hwnd, TB_SETBITMAPSIZE, 0, MAKELONG(16, 16)); + ok(ret, "got %d\n", ret); + + imagelist = (HIMAGELIST)SendMessageA(hwnd, TB_GETIMAGELIST, 0, 0); + ok(imagelist == NULL, "got %p\n", imagelist); + + DestroyWindow(hwnd); +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2453,6 +2541,7 @@ START_TEST(toolbar) test_noresize(); test_save(); test_drawtext_flags(); + test_imagelist(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) { diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 92ab856..b6e4a05 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -2809,18 +2809,22 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp switch (lpAddBmp->nID) { case IDB_STD_SMALL_COLOR: + case 2: info.nButtons = 15; info.nID = IDB_STD_SMALL; break; case IDB_STD_LARGE_COLOR: + case 3: info.nButtons = 15; info.nID = IDB_STD_LARGE; break; case IDB_VIEW_SMALL_COLOR: + case 6: info.nButtons = 12; info.nID = IDB_VIEW_SMALL; break; case IDB_VIEW_LARGE_COLOR: + case 7: info.nButtons = 12; info.nID = IDB_VIEW_LARGE; break; @@ -2833,6 +2837,7 @@ TOOLBAR_AddBitmap (TOOLBAR_INFO *infoPtr, INT count, const TBADDBITMAP *lpAddBmp info.nID = IDB_HIST_LARGE; break; default: + WARN("unknown bitmap id, %ld\n", lpAddBmp->nID); return -1; } @@ -4345,7 +4350,7 @@ TOOLBAR_SetBitmapSize (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) short width = (short)LOWORD(lParam); short height = (short)HIWORD(lParam); - TRACE("hwnd=%p, wParam=%ld, lParam=%ld\n", infoPtr->hwndSelf, wParam, lParam); + TRACE("hwnd=%p, wParam=%ld, size %d x %d\n", infoPtr->hwndSelf, wParam, width, height); if (wParam != 0) FIXME("wParam is %ld. Perhaps image list index?\n", wParam);

1 0

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

20 Oct '17

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

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

20 Oct '17

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

Michael Stefaniuc : fonts: Increase the Em size to fix a build failure with freetype 2.8.1.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 68852272b7ae275ef230178588fc198d78097e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=68852272b7ae275ef23017858… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 28 00:23:42 2017 +0200 fonts: Increase the Em size to fix a build failure with freetype 2.8.1. Freetype 2.8.1 implemented the stricter Em bounds from OpenType 1.8.2 which require a minimum Em size of 16. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 40166848a7944383a4cfdaac9b18bd03fbb2b4f9) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- fonts/courier.sfd | 1015 +++++++++++++------------- fonts/courier.ttf | Bin 17884 -> 17892 bytes fonts/fixedsys.sfd | 519 ++++++------- fonts/fixedsys.ttf | Bin 10696 -> 10704 bytes fonts/ms_sans_serif.sfd | 1051 +++++++++++++------------- fonts/ms_sans_serif.ttf | Bin 38360 -> 38536 bytes fonts/small_fonts.sfd | 1825 +++++++++++++++++++++++----------------------- fonts/small_fonts.ttf | Bin 18796 -> 19068 bytes fonts/small_fonts_jp.sfd | 881 +++++++++++----------- fonts/small_fonts_jp.ttf | Bin 9820 -> 9828 bytes 10 files changed, 2648 insertions(+), 2643 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68852272b7ae275ef2301…

1 0