February 2017 - Wine-Commits

Jacek Caban : mshtml: Pass event target as EventTarget to release_event_target.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: bc02ba80b922f0e62e00cb366e0f592115b4a63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc02ba80b922f0e62e00cb366… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:50 2017 +0100 mshtml: Pass event target as EventTarget to release_event_target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 21 +++++++++++++-------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/htmlwindow.c | 3 +-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e844728..7d11747 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1642,20 +1642,25 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } -void release_event_target(event_target_t *event_target) +void release_event_target(EventTarget *event_target) { int i; unsigned int j; + if(!event_target->ptr) + return; + for(i=0; i < EVENTID_LAST; i++) { - if(event_target->event_table[i]) { - if(event_target->event_table[i]->handler_prop) - IDispatch_Release(event_target->event_table[i]->handler_prop); - for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - if(event_target->event_table[i]->handlers[j]) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + 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]); } } - heap_free(event_target); + heap_free(event_target->ptr); } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index cc16fd8..d66f359 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,7 +55,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; -void release_event_target(event_target_t*) 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; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1ba477e..ab47323 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1185,12 +1185,11 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) void HTMLDOMNode_destructor(HTMLDOMNode *This) { + release_event_target(&This->event_target); if(This->nsnode) nsIDOMNode_Release(This->nsnode); if(This->doc && &This->doc->node != This) htmldoc_release(&This->doc->basedoc); - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); } static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index aa64fb4..e3f22cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -253,8 +253,7 @@ static void release_inner_window(HTMLInnerWindow *This) htmldoc_release(&This->doc->basedoc); } - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); for(i=0; i < This->global_prop_cnt; i++)

1 0

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 Feb. 14, 2017

Feb. 14, 2017

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/tests: Added body event setters tests.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 8fba2bc6df423104c1a75122126fcd95504c8cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fba2bc6df423104c1a751221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:38 2017 +0100 mshtml/tests: Added body event setters tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 64e03f5..8d5fcc3 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -157,6 +157,18 @@ function test_string_event_handler() { ok(string_handler_called === false, "string handler called"); } +function test_body_events() { + var f = function() {} + + document.body.onload = f; + ok(document.body.onload === f, "body.onload != f"); + ok(window.onload === f, "window.onload != f"); + + document.body.onfocus = f; + ok(document.body.onfocus === f, "body.onfocus != f"); + ok(window.onfocus === f, "window.onfocus != f"); +} + window.onload = function() { try { ok(inlscr_complete_called, "onreadystatechange not fired"); @@ -178,6 +190,7 @@ window.onload = function() { test_handler_this(); test_insert_script(); test_string_event_handler(); + test_body_events(); }catch(e) { ok(false, "Got an exception: " + e.message); }

1 0

Józef Kucia : wined3d: Implement raw buffer views.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 2066d2463462c4a7f3463aa5fda1416fab4f35b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2066d2463462c4a7f3463aa5f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 14 13:15:11 2017 +0100 wined3d: Implement raw buffer views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 48db879..97929cb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -189,12 +189,6 @@ static HRESULT create_buffer_view(struct wined3d_gl_view *view, return WINED3D_OK; } - if (desc->flags & WINED3D_VIEW_BUFFER_RAW) - { - FIXME("Raw buffer views not supported.\n"); - return WINED3D_OK; - } - if (desc->u.buffer.start_idx > ~0u / view_format->byte_count || desc->u.buffer.count > ~0u / view_format->byte_count) return E_INVALIDARG; @@ -491,8 +485,18 @@ static HRESULT wined3d_shader_resource_view_init(struct wined3d_shader_resource_ GLenum view_target; view_format = wined3d_get_format(gl_info, desc->format_id, resource->usage); - if (wined3d_format_is_typeless(view_format) - && !(view_format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view_format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view_format->id)); + return E_INVALIDARG; + } + + view_format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } + + if (wined3d_format_is_typeless(view_format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view_format->id)); return E_INVALIDARG; @@ -672,9 +676,18 @@ static HRESULT wined3d_unordered_access_view_init(struct wined3d_unordered_acces view->parent_ops = parent_ops; view->format = wined3d_get_format(gl_info, desc->format_id, resource->usage); + if (resource->type == WINED3D_RTYPE_BUFFER && desc->flags & WINED3D_VIEW_BUFFER_RAW) + { + if (view->format->id != WINED3DFMT_R32_TYPELESS) + { + WARN("Invalid format %s for raw buffer view.\n", debug_d3dformat(view->format->id)); + return E_INVALIDARG; + } + + view->format = wined3d_get_format(gl_info, WINED3DFMT_R32_UINT, resource->usage); + } - if (wined3d_format_is_typeless(view->format) - && !(view->format->id == WINED3DFMT_R32_TYPELESS && (desc->flags & WINED3D_VIEW_BUFFER_RAW))) + if (wined3d_format_is_typeless(view->format)) { WARN("Trying to create view for typeless format %s.\n", debug_d3dformat(view->format->id)); return E_INVALIDARG;

1 0

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

Feb. 14, 2017

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

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

Feb. 14, 2017

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

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

Feb. 14, 2017

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

Jacek Caban : server: Choose newer async object when searching from client pointer.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 13204d87cfc35b436e50925701b55e55f1ab165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13204d87cfc35b436e5092570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:05:39 2017 +0100 server: Choose newer async object when searching from client pointer. This fixes a race. Client may release and reuse async pointer while processing APC_ASYNC_IO. It is, however, guaranteed that get_async_result will be called on the newest one known to the server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index ec46103..ef548d1 100644 --- a/server/async.c +++ b/server/async.c @@ -255,7 +255,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co else async->iosb = NULL; list_add_tail( &queue->queue, &async->queue_entry ); - list_add_tail( &thread->process->asyncs, &async->process_entry ); + list_add_head( &thread->process->asyncs, &async->process_entry ); grab_object( async ); if (queue->fd) set_fd_signaled( queue->fd, 0 );

1 0

Jacek Caban : ntdll: Don't set io-> Information in server_read_file and server_write_file.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

Module: wine Branch: master Commit: 21d14104948e28d118925d53a9bee9ef80cea7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d14104948e28d118925d53a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:06:19 2017 +0100 ntdll: Don't set io->Information in server_read_file and server_write_file. Currently we set Information, but not Status. According to tests, depending on error type, none or both should be set. Both will be set when APC is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a6c1098..f3ff163 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -579,7 +579,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; @@ -627,7 +626,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = reply->size; } SERVER_END_REQ;

1 0

Alistair Leslie-Hughes : winnt.h: Implement RtlSecureZeroMemory.
by Alexandre Julliard Feb. 14, 2017

Feb. 14, 2017

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