May 2015 - Wine-commits - list.winehq.org

Nikolay Sivov : oledlg: Make object name menu item localized.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 66bcad51c0c1f27739ab190bf27e002d20286043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66bcad51c0c1f27739ab190bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 18 10:19:11 2015 +0300 oledlg: Make object name menu item localized. --- dlls/oledlg/oledlg.rc | 1 + dlls/oledlg/oledlg_main.c | 4 ++- dlls/oledlg/resource.h | 3 ++ po/ar.po | 68 ++++++++++++++++++++++----------------------- po/bg.po | 68 ++++++++++++++++++++++----------------------- po/ca.po | 68 ++++++++++++++++++++++----------------------- po/cs.po | 68 ++++++++++++++++++++++----------------------- po/da.po | 68 ++++++++++++++++++++++----------------------- po/de.po | 68 ++++++++++++++++++++++----------------------- po/el.po | 68 ++++++++++++++++++++++----------------------- po/en.po | 68 ++++++++++++++++++++++----------------------- po/en_US.po | 68 ++++++++++++++++++++++----------------------- po/eo.po | 68 ++++++++++++++++++++++----------------------- po/es.po | 68 ++++++++++++++++++++++----------------------- po/fa.po | 68 ++++++++++++++++++++++----------------------- po/fi.po | 68 ++++++++++++++++++++++----------------------- po/fr.po | 68 ++++++++++++++++++++++----------------------- po/he.po | 68 ++++++++++++++++++++++----------------------- po/hi.po | 68 ++++++++++++++++++++++----------------------- po/hr.po | 68 ++++++++++++++++++++++----------------------- po/hu.po | 68 ++++++++++++++++++++++----------------------- po/it.po | 68 ++++++++++++++++++++++----------------------- po/ja.po | 68 ++++++++++++++++++++++----------------------- po/ko.po | 68 ++++++++++++++++++++++----------------------- po/lt.po | 68 ++++++++++++++++++++++----------------------- po/ml.po | 68 ++++++++++++++++++++++----------------------- po/nb_NO.po | 68 ++++++++++++++++++++++----------------------- po/nl.po | 68 ++++++++++++++++++++++----------------------- po/or.po | 68 ++++++++++++++++++++++----------------------- po/pa.po | 68 ++++++++++++++++++++++----------------------- po/pl.po | 68 ++++++++++++++++++++++----------------------- po/pt_BR.po | 68 ++++++++++++++++++++++----------------------- po/pt_PT.po | 68 ++++++++++++++++++++++----------------------- po/rm.po | 68 ++++++++++++++++++++++----------------------- po/ro.po | 68 ++++++++++++++++++++++----------------------- po/ru.po | 68 ++++++++++++++++++++++----------------------- po/sk.po | 68 ++++++++++++++++++++++----------------------- po/sl.po | 68 ++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 70 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 70 +++++++++++++++++++++++------------------------ po/sv.po | 68 ++++++++++++++++++++++----------------------- po/te.po | 68 ++++++++++++++++++++++----------------------- po/th.po | 68 ++++++++++++++++++++++----------------------- po/tr.po | 68 ++++++++++++++++++++++----------------------- po/uk.po | 68 ++++++++++++++++++++++----------------------- po/wa.po | 68 ++++++++++++++++++++++----------------------- po/wine.pot | 68 ++++++++++++++++++++++----------------------- po/zh_CN.po | 68 ++++++++++++++++++++++----------------------- po/zh_TW.po | 68 ++++++++++++++++++++++----------------------- 49 files changed, 1573 insertions(+), 1567 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66bcad51c0c1f27739ab1…

1 0

Alex Henrie : winmm: Improve grammar by changing "or" to "and" in an error message.
by Alexandre Julliard 18 May '15

18 May '15

1 0

Alex Henrie : comctl32/tests: Extend TVS_SINGLEEXPAND tests.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 9f93080754feae79a292508f48f96a17cfdf80cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f93080754feae79a292508f4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:24 2015 -0600 comctl32/tests: Extend TVS_SINGLEEXPAND tests. --- dlls/comctl32/tests/treeview.c | 173 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 166 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index eb7d7e5..72d4c2a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -19,6 +19,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include "windef.h" #include "winbase.h" @@ -226,7 +227,8 @@ static const struct message parent_expand_empty_kb_seq[] = { { 0 } }; -static const struct message parent_singleexpand_seq[] = { +static const struct message parent_singleexpand_seq0[] = { + /* alpha expands */ { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, @@ -235,6 +237,84 @@ static const struct message parent_singleexpand_seq[] = { { 0 } }; +static const struct message parent_singleexpand_seq1[] = { + /* bravo expands */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq2[] = { + /* delta expands, bravo collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq3[] = { + /* foxtrot expands, alpha and delta collapse */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq4[] = { + /* alpha expands, foxtrot collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq5[] = { + /* foxtrot expands while golf is selected, then golf expands and alpha collapses */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_ITEMEXPANDEDA }, + { 0 } +}; + +static const struct message parent_singleexpand_seq6[] = { + /* hotel does not expand and india does not collapse because they have no children */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { 0 } +}; + +static const struct message parent_singleexpand_seq7[] = { + /* india does not expand and hotel does not collapse because they have no children */ + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGINGA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SELCHANGEDA }, + { WM_NOTIFY, sent|id, 0, 0, TVN_SINGLEEXPAND }, + { 0 } +}; + static const struct message parent_get_dispinfo_seq[] = { { WM_NOTIFY, sent|id, 0, 0, TVN_GETDISPINFOA }, { 0 } @@ -1637,21 +1717,100 @@ static void test_expandedimage(void) static void test_TVS_SINGLEEXPAND(void) { HWND hTree; + HTREEITEM alpha, bravo, charlie, delta, echo, foxtrot, golf, hotel, india, juliet; + TVINSERTSTRUCTA ins; + char foo[] = "foo"; + char context[32]; + int i; BOOL ret; + /* build a fairly complex tree + * - TVI_ROOT + * - alpha + * - bravo + * - charlie + * - delta + * - echo + * - foxtrot + * - golf + * - hotel + * - india + * - juliet + */ + struct + { + HTREEITEM *handle; + HTREEITEM *parent; + UINT final_state; + } + items[] = + { + { &alpha, NULL, TVIS_EXPANDEDONCE }, + { &bravo, &alpha, TVIS_EXPANDEDONCE }, + { &charlie, &bravo, 0 }, + { &delta, &alpha, TVIS_EXPANDEDONCE }, + { &echo, &delta, 0 }, + { &foxtrot, NULL, TVIS_EXPANDEDONCE|TVIS_EXPANDED }, + { &golf, &foxtrot, TVIS_EXPANDEDONCE|TVIS_EXPANDED }, + { &hotel, &golf, 0 }, + { &india, &golf, TVIS_SELECTED }, + { &juliet, &foxtrot, 0 } + }; + + struct + { + HTREEITEM *select; + const struct message *sequence; + BOOL todo; + } + sequence_tests[] = + { + { &alpha, parent_singleexpand_seq0, FALSE }, + { &bravo, parent_singleexpand_seq1, FALSE }, + { &delta, parent_singleexpand_seq2, TRUE }, + { &foxtrot, parent_singleexpand_seq3, TRUE }, + { &alpha, parent_singleexpand_seq4, TRUE }, + { &golf, parent_singleexpand_seq5, TRUE }, + { &hotel, parent_singleexpand_seq6, FALSE }, + { &india, parent_singleexpand_seq7, FALSE }, + { &india, empty_seq, TRUE } + }; + hTree = create_treeview_control(0); SetWindowLongA(hTree, GWL_STYLE, GetWindowLongA(hTree, GWL_STYLE) | TVS_SINGLEEXPAND); /* to avoid painting related notifications */ ShowWindow(hTree, SW_HIDE); - fill_tree(hTree); + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + { + ins.hParent = items[i].parent ? *items[i].parent : TVI_ROOT; + ins.hInsertAfter = TVI_FIRST; + U(ins).item.mask = TVIF_TEXT; + U(ins).item.pszText = foo; + *items[i].handle = TreeView_InsertItemA(hTree, &ins); + } - flush_sequences(sequences, NUM_MSG_SEQUENCES); - ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); - ok(ret, "got %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_singleexpand_seq, "singleexpand notifications", FALSE); + for (i = 0; i < sizeof(sequence_tests)/sizeof(sequence_tests[0]); i++) + { + flush_sequences(sequences, NUM_MSG_SEQUENCES); + ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, (LPARAM)(*sequence_tests[i].select)); + ok(ret, "got %d\n", ret); + sprintf(context, "singleexpand notifications %d", i); + ok_sequence(sequences, PARENT_SEQ_INDEX, sequence_tests[i].sequence, context, sequence_tests[i].todo); + } + + for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) + { + ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); + if (i == 0) + todo_wine ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); + else + ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); + } /* a workaround for NT4 that sends expand notifications when nothing is about to expand */ - ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)hRoot); + ret = SendMessageA(hTree, TVM_DELETEITEM, 0, (LPARAM)TVI_ROOT); ok(ret, "got %d\n", ret); fill_tree(hTree); ret = SendMessageA(hTree, TVM_SELECTITEM, TVGN_CARET, 0);

1 0

Alex Henrie : comctl32: Close previously selected treeview item at common ancestor.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: a0ebe244c4aac37db23e89c5ff61ca126ee0988a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ebe244c4aac37db23e89c5f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun May 17 23:36:25 2015 -0600 comctl32: Close previously selected treeview item at common ancestor. Also, send WM_NOTIFY mesages when collapsing the previous selection and expanding the new one. --- dlls/comctl32/tests/treeview.c | 14 +++++--------- dlls/comctl32/treeview.c | 38 +++++++++++--------------------------- 2 files changed, 16 insertions(+), 36 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 72d4c2a..d03b126 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1767,9 +1767,9 @@ static void test_TVS_SINGLEEXPAND(void) { { &alpha, parent_singleexpand_seq0, FALSE }, { &bravo, parent_singleexpand_seq1, FALSE }, - { &delta, parent_singleexpand_seq2, TRUE }, - { &foxtrot, parent_singleexpand_seq3, TRUE }, - { &alpha, parent_singleexpand_seq4, TRUE }, + { &delta, parent_singleexpand_seq2, FALSE }, + { &foxtrot, parent_singleexpand_seq3, FALSE }, + { &alpha, parent_singleexpand_seq4, FALSE }, { &golf, parent_singleexpand_seq5, TRUE }, { &hotel, parent_singleexpand_seq6, FALSE }, { &india, parent_singleexpand_seq7, FALSE }, @@ -1801,12 +1801,8 @@ static void test_TVS_SINGLEEXPAND(void) for (i = 0; i < sizeof(items)/sizeof(items[0]); i++) { ret = SendMessageA(hTree, TVM_GETITEMSTATE, (WPARAM)(*items[i].handle), 0xFFFF); - if (i == 0) - todo_wine ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", - i, items[i].final_state, ret); - else - ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", - i, items[i].final_state, ret); + ok(ret == items[i].final_state, "singleexpand items[%d]: expected state 0x%x got 0x%x\n", + i, items[i].final_state, ret); } /* a workaround for NT4 that sends expand notifications when nothing is about to expand */ diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f13090f..dcb1bf7 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -29,7 +29,7 @@ * * TODO: * missing notifications: TVN_GETINFOTIP, TVN_KEYDOWN, - * TVN_SETDISPINFO, TVN_SINGLEEXPAND + * TVN_SETDISPINFO * * missing styles: TVS_FULLROWSELECT, TVS_INFOTIP, TVS_RTLREADING, * @@ -3508,47 +3508,31 @@ TREEVIEW_Expand(TREEVIEW_INFO *infoPtr, TREEVIEW_ITEM *item, static void TREEVIEW_SingleExpand(TREEVIEW_INFO *infoPtr, HTREEITEM selection, HTREEITEM item) { - TREEVIEW_ITEM *SelItem; + TREEVIEW_ITEM *prev, *curr; if ((infoPtr->dwStyle & TVS_SINGLEEXPAND) == 0 || infoPtr->hwndEdit || !item) return; TREEVIEW_SendTreeviewNotify(infoPtr, TVN_SINGLEEXPAND, TVC_UNKNOWN, TVIF_HANDLE | TVIF_PARAM, item, 0); /* - * Close the previous selection all the way to the root - * as long as the new selection is not a child + * Close the previous item and its ancestors as long as they are not + * ancestors of the current item */ - if(selection && (selection != item)) + for (prev = selection; prev && TREEVIEW_ValidItem(infoPtr, prev); prev = prev->parent) { - BOOL closeit = TRUE; - SelItem = item; - - /* determine if the hitItem is a child of the currently selected item */ - while(closeit && SelItem && TREEVIEW_ValidItem(infoPtr, SelItem) && - (SelItem->parent != infoPtr->root)) - { - closeit = (SelItem != selection); - SelItem = SelItem->parent; - } - - if(closeit) + for (curr = item; curr && TREEVIEW_ValidItem(infoPtr, curr); curr = curr->parent) { - if(TREEVIEW_ValidItem(infoPtr, selection)) - SelItem = selection; - - while(SelItem && (SelItem != item) && TREEVIEW_ValidItem(infoPtr, SelItem) && - SelItem->parent != infoPtr->root) - { - TREEVIEW_Collapse(infoPtr, SelItem, FALSE, FALSE); - SelItem = SelItem->parent; - } + if (curr == prev) + goto finish; } + TREEVIEW_Collapse(infoPtr, prev, FALSE, TRUE); } +finish: /* * Expand the current item */ - TREEVIEW_Expand(infoPtr, item, FALSE, FALSE); + TREEVIEW_Expand(infoPtr, item, FALSE, TRUE); } static BOOL

1 0

Michael Müller : wininet: Fix memory leak by not calling get_cookie_header twice.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 81b136fe1cb19230d51e99f19d22c2c124e9aed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b136fe1cb19230d51e99f19… Author: Michael Müller <michael(a)fds-team.de> Date: Fri May 15 19:55:13 2015 +0200 wininet: Fix memory leak by not calling get_cookie_header twice. --- dlls/wininet/http.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cd2cdcf..45183cf 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4244,7 +4244,6 @@ static void HTTP_InsertCookies(http_request_t *request) if(res != ERROR_SUCCESS || !cookies) return; - get_cookie_header(request->server->name, request->path, &cookies); HTTP_HttpAddRequestHeadersW(request, cookies, strlenW(cookies), HTTP_ADDREQ_FLAG_REPLACE); heap_free(cookies); }

1 0

Jacek Caban : mshtml: Removed unneeded argument from ensure_nsevent_handler.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 4686f3d761eaeeaf14cd25b394fa132043b691fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686f3d761eaeeaf14cd25b39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 15 17:59:35 2015 +0200 mshtml: Removed unneeded argument from ensure_nsevent_handler. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 17 ++++++----------- dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1b72a32..e377d55 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); if(This->window) - update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp); + update_doc_cp_events(This->doc_node, cp); } static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 037010e..897350f 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1336,7 +1336,7 @@ static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, in return TRUE; } -static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, event_target_t *event_target, eventid_t eid) +static HRESULT ensure_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1410,7 +1410,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, HTMLDocumentNod data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - return ensure_nsevent_handler(doc, data, eid); + return ensure_nsevent_handler(doc, eid); } HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, eventid_t eid, VARIANT *var) @@ -1509,7 +1509,7 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, data->event_table[eid]->handlers[i] = disp; *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, data, eid); + return ensure_nsevent_handler(doc->doc_node, eid); } HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) @@ -1557,18 +1557,13 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W set_event_handler_disp(event_target, doc, eid, disp); } -void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp) +void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) { - event_target_t *data; int i; - data = get_event_target_data(event_target, FALSE); - if(!data) - return; /* FIXME */ - for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(window->doc, data, i); + ensure_nsevent_handler(doc, i); } } @@ -1617,7 +1612,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_nsevent_handler(doc, NULL, i); + hres = ensure_nsevent_handler(doc, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6133737..62e808f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; -void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN; +void update_doc_cp_events(HTMLDocumentNode*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : quartz: Implement a trivial case of ConvertTimeFormat().
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 5120fa9090cecb705fb8cdd1e5cb81fcabfd3fa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5120fa9090cecb705fb8cdd1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 15 19:35:25 2015 +0300 quartz: Implement a trivial case of ConvertTimeFormat(). --- dlls/quartz/filtergraph.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index fcdd05b..26a4080 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2500,8 +2500,16 @@ static HRESULT WINAPI MediaSeeking_ConvertTimeFormat(IMediaSeeking *iface, LONGL { IFilterGraphImpl *This = impl_from_IMediaSeeking(iface); - FIXME("(%p/%p)->(%p, %p, 0x%s, %p): stub !!!\n", This, iface, pTarget, - pTargetFormat, wine_dbgstr_longlong(Source), pSourceFormat); + TRACE("(%p/%p)->(%p, %s, 0x%s, %s)\n", This, iface, pTarget, + debugstr_guid(pTargetFormat), wine_dbgstr_longlong(Source), debugstr_guid(pSourceFormat)); + + if (!pSourceFormat) + pSourceFormat = &This->timeformatseek; + + if (IsEqualGUID(pTargetFormat, pSourceFormat)) + *pTarget = Source; + else + FIXME("conversion %s->%s not supported\n", debugstr_guid(pSourceFormat), debugstr_guid(pTargetFormat)); return S_OK; }

1 0

Piotr Caban : msvcrt: Fix functions table reallocation in _onexit.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 70bff7377dbe9bdaaac5e86c49ee45130e65e5d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70bff7377dbe9bdaaac5e86c4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 15 20:44:19 2015 +0200 msvcrt: Fix functions table reallocation in _onexit. --- dlls/msvcrt/exit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 0d2992d..3d79a4d 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -280,7 +280,7 @@ MSVCRT__onexit_t CDECL MSVCRT__onexit(MSVCRT__onexit_t func) UNLOCK_EXIT; return NULL; } - memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size); + memcpy (newtable, MSVCRT_atexit_table, MSVCRT_atexit_table_size*sizeof(void *)); MSVCRT_atexit_table_size += 32; MSVCRT_free (MSVCRT_atexit_table); MSVCRT_atexit_table = newtable;

1 0

Grazvydas Ignotas : kernel32: Don't leak an event handle on errors.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 2e21381177c4ae5c1abb02cd8db364075f901444 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e21381177c4ae5c1abb02cd8… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat May 16 22:29:42 2015 +0300 kernel32: Don't leak an event handle on errors. --- dlls/kernel32/change.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/change.c b/dlls/kernel32/change.c index f3aec8d..781ccfe 100644 --- a/dlls/kernel32/change.c +++ b/dlls/kernel32/change.c @@ -190,12 +190,14 @@ BOOL WINAPI ReadDirectoryChangesW( HANDLE handle, LPVOID buffer, DWORD len, BOOL return TRUE; WaitForSingleObjectEx( ov.hEvent, INFINITE, TRUE ); - CloseHandle( ov.hEvent ); if (returned) *returned = ios->Information; status = ios->u.Status; } + if (!overlapped) + CloseHandle( ov.hEvent ); + if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) );

1 0

Christian Faure : kernel32: Fix a crash in GetStringTypeW() on NULL input string.
by Alexandre Julliard 18 May '15

18 May '15

Module: wine Branch: master Commit: 9cffed782fd447445d4de21394815bf944e507f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cffed782fd447445d4de2139… Author: Christian Faure <christian.faurebouvard(a)gmail.com> Date: Sat May 16 16:52:18 2015 +0300 kernel32: Fix a crash in GetStringTypeW() on NULL input string. --- dlls/kernel32/locale.c | 6 ++++++ dlls/kernel32/tests/locale.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index bcdcdba..bf4ace5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2732,6 +2732,12 @@ BOOL WINAPI GetStringTypeW( DWORD type, LPCWSTR src, INT count, LPWORD chartype C2_OTHERNEUTRAL /* LRE, LRO, RLE, RLO, PDF */ }; + if (!src) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (count == -1) count = strlenW(src) + 1; switch(type) { diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index e2ec152..9920dfc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -3582,9 +3582,26 @@ static void test_GetStringTypeW(void) static const WCHAR space_special[] = {0x09, 0x0d, 0x85}; WORD types[20]; + BOOL ret; WCHAR ch; int i; + /* NULL src */ + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, NULL); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 0, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = GetStringTypeW(CT_CTYPE1, NULL, 5, types); + ok(!ret, "got %d\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + memset(types,0,sizeof(types)); GetStringTypeW(CT_CTYPE1, blanks, 5, types); for (i = 0; i < 5; i++)

1 0