February 2017 - Wine-commits

Jacek Caban : rbtree.h: Added WINE_RB_FOR_EACH_DESTRUCTOR and WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR helpers for implementing tree destructors.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 357bf1b56986039b3f95510589183147cbe5e167 URL: http://source.winehq.org/git/wine.git/?a=commit;h=357bf1b56986039b3f9551058… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:12:15 2017 +0100 rbtree.h: Added WINE_RB_FOR_EACH_DESTRUCTOR and WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR helpers for implementing tree destructors. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/rbtree.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h index 598a15f..65d9a90 100644 --- a/include/wine/rbtree.h +++ b/include/wine/rbtree.h @@ -136,16 +136,24 @@ static inline struct wine_rb_entry *wine_rb_postorder_next(struct wine_rb_entry &(elem)->field; \ (elem) = WINE_RB_ENTRY_VALUE(wine_rb_next(&elem->field), type, field)) +/* iterate through the tree using using postorder, making it safe to free the entry */ +#define WINE_RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \ + for ((cursor) = wine_rb_postorder_head((tree)->root); \ + (cursor) && (((cursor2) = wine_rb_postorder_next(cursor)) || 1); \ + (cursor) = (cursor2)) + +/* iterate through the tree using a tree entry and postorder, making it safe to free the entry */ +#define WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \ + for ((elem) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_head((tree)->root), type, field); \ + &(elem)->field \ + && (((elem2) = WINE_RB_ENTRY_VALUE(wine_rb_postorder_next(&(elem)->field), type, field)) || 1); \ + (elem) = (elem2)) + static inline void wine_rb_postorder(struct wine_rb_tree *tree, wine_rb_traverse_func_t *callback, void *context) { struct wine_rb_entry *iter, *next; - - for (iter = wine_rb_postorder_head(tree->root); iter; iter = next) - { - next = wine_rb_postorder_next(iter); - callback(iter, context); - } + WINE_RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); } static inline void wine_rb_init(struct wine_rb_tree *tree, wine_rb_compare_func_t compare)

1 0

Jacek Caban : mshtml: Store event handlers in rb tree.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: c4e9787e8683ae0f88df8225500e914f42db4397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e9787e8683ae0f88df82255… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:12:33 2017 +0100 mshtml: Store event handlers in rb tree. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 89 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 3 +- dlls/mshtml/xmlhttprequest.c | 1 + 6 files changed, 49 insertions(+), 47 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7d11747..27e041c 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -36,15 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { + struct wine_rb_entry entry; + eventid_t event_id; IDispatch *handler_prop; DWORD handler_cnt; IDispatch **handlers; } handler_vector_t; -struct event_target_t { - handler_vector_t *event_table[EVENTID_LAST]; -}; - static const WCHAR abortW[] = {'a','b','o','r','t',0}; static const WCHAR onabortW[] = {'o','n','a','b','o','r','t',0}; @@ -899,37 +897,35 @@ HRESULT create_event_obj(IHTMLEventObj **ret) return S_OK; } -static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) +static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) { - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); + const dispex_static_data_vtbl_t *vtbl; + handler_vector_t *handler_vector; + struct wine_rb_entry *entry; - if(vtbl && vtbl->get_event_target) + vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->get_event_target) event_target = vtbl->get_event_target(&event_target->dispex); - if(event_target->ptr || !alloc) - return event_target->ptr; - return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); -} - -static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) -{ - event_target_t *data; + entry = wine_rb_get(&event_target->handler_map, (const void*)eid); + if(entry) + return WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry); + if(!alloc) + return NULL; - data = get_event_target_data(event_target, alloc); - if(!data) + handler_vector = heap_alloc_zero(sizeof(*handler_vector)); + if(!handler_vector) return NULL; - if(alloc && !data->event_table[eid]) { - data->event_table[eid] = heap_alloc_zero(sizeof(*data->event_table[eid])); - if(data->event_table[eid]) { - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - if(vtbl->bind_event) - vtbl->bind_event(&event_target->dispex, eid); - else - FIXME("Unsupported event binding on target %p\n", event_target); - } - } - return data->event_table[eid]; + handler_vector->event_id = eid; + vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->bind_event) + vtbl->bind_event(&event_target->dispex, eid); + else + FIXME("Unsupported event binding on target %p\n", event_target); + + wine_rb_put(&event_target->handler_map, (const void*)eid, &handler_vector->entry); + return handler_vector; } static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) @@ -1642,25 +1638,28 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } -void release_event_target(EventTarget *event_target) +static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { - int i; - unsigned int j; + return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry)->event_id; +} - if(!event_target->ptr) - return; +void init_event_target(EventTarget *event_target) +{ + wine_rb_init(&event_target->handler_map, event_id_cmp); +} - for(i=0; i < EVENTID_LAST; i++) { - if(event_target->ptr->event_table[i]) { - if(event_target->ptr->event_table[i]->handler_prop) - IDispatch_Release(event_target->ptr->event_table[i]->handler_prop); - for(j=0; j < event_target->ptr->event_table[i]->handler_cnt; j++) - if(event_target->ptr->event_table[i]->handlers[j]) - IDispatch_Release(event_target->ptr->event_table[i]->handlers[j]); - heap_free(event_target->ptr->event_table[i]->handlers); - heap_free(event_target->ptr->event_table[i]); - } - } +void release_event_target(EventTarget *event_target) +{ + handler_vector_t *iter, *iter2; + unsigned i; - heap_free(event_target->ptr); + WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &event_target->handler_map, handler_vector_t, entry) { + if(iter->handler_prop) + IDispatch_Release(iter->handler_prop); + for(i = 0; i < iter->handler_cnt; i++) + if(iter->handlers[i]) + IDispatch_Release(iter->handlers[i]); + heap_free(iter->handlers); + heap_free(iter); + } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d66f359..5bdd435 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,6 +55,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; +void init_event_target(EventTarget*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,HTMLDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ab47323..2dfbeaa 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1214,6 +1214,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode2_iface.lpVtbl = &HTMLDOMNode2Vtbl; ccref_init(&node->ccref, 1); + init_event_target(&node->event_target); if(&doc->node != node) htmldoc_addref(&doc->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e3f22cf..a5db035 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3020,6 +3020,7 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window->base.outer_window = outer_window; window->base.inner_window = window; + init_event_target(&window->event_target); init_dispex(&window->event_target.dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); window->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 457e32b..89f2fcb 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -72,7 +72,6 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; -typedef struct event_target_t event_target_t; typedef struct EventTarget EventTarget; #define TID_LIST \ @@ -366,7 +365,7 @@ typedef struct { struct EventTarget { DispatchEx dispex; - event_target_t *ptr; + struct wine_rb_tree handler_map; }; typedef struct { diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 51e2445..ab14c54 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -851,6 +851,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + init_event_target(&ret->event_target); init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex); ret->ref = 1;

1 0

Piotr Caban : wine.inf: Add Dynamic DST/{First, Last}Entry registry keys.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 8af23cb93e4e1cd3686984399cb50d755f5171e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8af23cb93e4e1cd3686984399… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 14 14:52:56 2017 +0100 wine.inf: Add Dynamic DST/{First,Last}Entry registry keys. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8af23cb93e4e1cd368698…

1 0

Nikolay Sivov : comctl32/tests: Basic test for PGN_CALCSIZE.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 948dd848fba5aff47ddc0a1aca3140296161642f URL: http://source.winehq.org/git/wine.git/?a=commit;h=948dd848fba5aff47ddc0a1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 07:47:38 2017 +0300 comctl32/tests: Basic test for PGN_CALCSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 2 ++ dlls/comctl32/tests/pager.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index ced32be..171d70e 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -1036,6 +1036,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0); + TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index d352140..48753ff 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -83,6 +83,28 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PAGER_SEQ_INDEX, &msg); } + if (message == WM_NOTIFY) + { + NMHDR *nmhdr = (NMHDR *)lParam; + + switch (nmhdr->code) + { + case PGN_CALCSIZE: + { + NMPGCALCSIZE *nmpgcs = (NMPGCALCSIZE *)lParam; + DWORD style = GetWindowLongA(nmpgcs->hdr.hwndFrom, GWL_STYLE); + + if (style & PGS_HORZ) + ok(nmpgcs->dwFlag == PGF_CALCWIDTH, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + else + ok(nmpgcs->dwFlag == PGF_CALCHEIGHT, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + break; + } + default: + ; + } + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--;

1 0

Nikolay Sivov : comctl32/pager: Don't block window size changes.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 14a6c98fd4ab3f8bf324dcbeab733e171c263883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a6c98fd4ab3f8bf324dcbea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 07:47:39 2017 +0300 comctl32/pager: Don't block window size changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 31 ------------------------------- dlls/comctl32/tests/pager.c | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 171d70e..a10d3bb 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -388,34 +388,6 @@ PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress) return 0; } -static LRESULT -PAGER_WindowPosChanging(PAGER_INFO* infoPtr, WINDOWPOS *winpos) -{ - if ((infoPtr->dwStyle & CCS_NORESIZE) && !(winpos->flags & SWP_NOSIZE)) - { - /* don't let the app resize the nonscrollable dimension of a control - * that was created with CCS_NORESIZE style - * (i.e. height for a horizontal pager, or width for a vertical one) */ - - /* except if the current dimension is 0 and app is setting for - * first time, then save amount as dimension. - GA 8/01 */ - - if (infoPtr->dwStyle & PGS_HORZ) - if (!infoPtr->nHeight && winpos->cy) - infoPtr->nHeight = winpos->cy; - else - winpos->cy = infoPtr->nHeight; - else - if (!infoPtr->nWidth && winpos->cx) - infoPtr->nWidth = winpos->cx; - else - winpos->cx = infoPtr->nWidth; - return 0; - } - - return DefWindowProcW (infoPtr->hwndSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM)winpos); -} - /****************************************************************** * For the PGM_RECALCSIZE message (but not the other uses in * * this module), the native control does only the following: * @@ -1096,9 +1068,6 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); - case WM_WINDOWPOSCHANGING: - return PAGER_WindowPosChanging (infoPtr, (WINDOWPOS*)lParam); - case WM_STYLECHANGED: return PAGER_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 48753ff..c22cf27 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -170,7 +170,7 @@ static HWND create_pager_control( DWORD style ) static void test_pager(void) { HWND pager, child; - RECT rect; + RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); if (!pager) @@ -204,6 +204,29 @@ static void test_pager(void) ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE); DestroyWindow( pager ); + + /* Test if resizing works */ + pager = create_pager_control( CCS_NORESIZE ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 200, 100, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.right - rect2.left > rect.right - rect.left, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); + + pager = create_pager_control( CCS_NORESIZE | PGS_HORZ ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 100, 200, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.bottom - rect2.top > rect.bottom - rect.top, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); } START_TEST(pager)

1 0

Alistair Leslie-Hughes : dpnet/tests: Initial IDirectPlay8ThreadPool tests.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 98040833d3d39ce989f3ef656ed712df3b8b698a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98040833d3d39ce989f3ef656… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 14 06:34:46 2017 +0000 dpnet/tests: Initial IDirectPlay8ThreadPool tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/thread.c | 253 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98040833d3d39ce989f3e…

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Peer EnumHost Tests.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 8db78fdd1bf849be2d5106f85504d6201ce65e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db78fdd1bf849be2d5106f85… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 14 06:34:58 2017 +0000 dpnet/tests: Add IDirectPlay8Peer EnumHost Tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 4ea23cd..ca16f57 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -576,15 +576,22 @@ static void test_enum_service_providers_peer(void) static void test_enum_hosts_peer(void) { HRESULT hr; + IDirectPlay8Peer *peer2; IDirectPlay8Address *host = NULL; IDirectPlay8Address *local = NULL; DPN_APPLICATION_DESC appdesc; - DPNHANDLE async = 0; + DPNHANDLE async = 0, async2 = 0; + + ResetEvent(enumevent); + handlecnt = 0; memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); appdesc.guidApplication = appguid; + hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer2); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); @@ -608,6 +615,37 @@ static void test_enum_hosts_peer(void) hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + /* No Initialize has been called on peer2. */ + hr = IDirectPlay8Peer_EnumHosts(peer2, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + + /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + todo_wine ok(async2, "No Handle returned\n"); + todo_wine ok(async2 != async, "Same handle returned.\n"); + + WaitForSingleObject(enumevent, 1000); + + lastAsyncCode = E_FAIL; + lastAsyncHandle = 0xdeadbeef; + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(lastAsyncHandle == async, "got 0x%08x\n", async); + + lastAsyncCode = E_FAIL; + lastAsyncHandle = 0xdeadbeef; + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async2, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(lastAsyncHandle == async2, "got 0x%08x\n", async2); + + IDirectPlay8Peer_Release(peer2); IDirectPlay8Address_Release(local); IDirectPlay8Address_Release(host); }

1 0

Alistair Leslie-Hughes : winnt.h: Implement RtlSecureZeroMemory.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: d5292b1fcf049272a61753dc15eaf6782e2d6a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5292b1fcf049272a61753dc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 13 08:17:57 2017 +0000 winnt.h: Implement RtlSecureZeroMemory. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + include/winnt.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index b07d4df..4ec6f9a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2778,6 +2778,7 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); #define MoveMemory RtlMoveMemory #define ZeroMemory RtlZeroMemory #define CopyMemory RtlCopyMemory +#define SecureZeroMemory RtlSecureZeroMemory /* Wine internal functions */ diff --git a/include/winnt.h b/include/winnt.h index 72c399b..de7622f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5436,6 +5436,14 @@ typedef enum _CM_ERROR_CONTROL_TYPE #define RtlFillMemory(Destination, Length, Fill) memset((Destination),(Fill),(Length)) #define RtlZeroMemory(Destination, Length) memset((Destination),0,(Length)) +static FORCEINLINE void *RtlSecureZeroMemory(void *buffer, SIZE_T length) +{ + volatile char *ptr = buffer; + + while (length--) *ptr++ = 0; + return buffer; +} + #include <guiddef.h> typedef struct _OBJECT_TYPE_LIST {

1 0

Alex Henrie : comdlg32: Use localized "Path does not exist" string.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: bd1b3c104ec894efb53671874027a2875da68714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1b3c104ec894efb53671874… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:47 2017 -0700 comdlg32: Use localized "Path does not exist" string. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 8a83163..86575aa 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -4027,9 +4027,9 @@ static BOOL BrowseSelectedFolder(HWND hwnd) if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser, pidlSelection, SBSP_RELATIVE ) ) ) { - static const WCHAR notexist[] = {'P','a','t','h',' ','d','o','e','s', - ' ','n','o','t',' ','e','x','i','s','t',0}; - MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); + WCHAR buf[64]; + LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); + MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; if(fodInfos->ofnInfos->Flags & OFN_EXPLORER)

1 0

Alex Henrie : comdlg32: Don' t crash if an IShellFolder could not be created.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: e07d20f3f39220d5f1d2a2e5c85cc4d624060f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07d20f3f39220d5f1d2a2e5c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:48 2017 -0700 comdlg32: Don't crash if an IShellFolder could not be created. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 86575aa..8dda4f7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2951,7 +2951,8 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); IShellView_Release(fodInfos->Shell.FOIShellView); } - IShellFolder_Release(fodInfos->Shell.FOIShellFolder); + if (fodInfos->Shell.FOIShellFolder) + IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) IDataObject_Release(fodInfos->Shell.FOIDataObject);

1 0