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

Huw Davies : riched20/tests: Fix test on 64-bit win8.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: ef072b1eb241238ea1be7fe850492ad60bf17ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef072b1eb241238ea1be7fe85… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:18:36 2015 +0100 riched20/tests: Fix test on 64-bit win8. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 65752af..09437ef 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3412,7 +3412,7 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, LONG *pcb) { char** str = (char**)dwCookie; - ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + ok(*pcb == cb || *pcb == 0, "cb %d, *pcb %d\n", cb, *pcb); *pcb = 0; if (cb > 0) { memcpy(*str, pbBuff, cb);

1 0

Huw Davies : ole32/tests: Win 8 releases the drop target in OleUninitialize().
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: a38699084b52774f564e1bb69e07ce387f4c8b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a38699084b52774f564e1bb69… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:37:46 2015 +0100 ole32/tests: Win 8 releases the drop target in OleUninitialize(). --- dlls/ole32/tests/dragdrop.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 8051f58..37a3dfe 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -447,13 +447,16 @@ static void test_Register_Revoke(void) ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); OleUninitialize(); - ok(droptarget_refs >= 1, "DropTarget refs should be at least one\n"); - hr = RevokeDragDrop(hwnd); - ok_ole_success(hr, "RevokeDragDrop"); - ok(droptarget_refs == 0 || - broken(droptarget_refs == 1), /* NT4 */ - "DropTarget refs should be zero not %d\n", droptarget_refs); + /* Win 8 releases the ref in OleUninitialize() */ + if (droptarget_refs >= 1) + { + hr = RevokeDragDrop(hwnd); + ok_ole_success(hr, "RevokeDragDrop"); + ok(droptarget_refs == 0 || + broken(droptarget_refs == 1), /* NT4 */ + "DropTarget refs should be zero not %d\n", droptarget_refs); + } hr = RevokeDragDrop(NULL); ok(hr == DRAGDROP_E_INVALIDHWND, "RevokeDragDrop with NULL hwnd should return DRAGDROP_E_INVALIDHWND instead of 0x%08x\n", hr);

1 0

Jacek Caban : mshtml: Get rid of duplicated NS_DLSYM defines.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: a0ec86b7b7672f4f58458d54243f7539765780cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ec86b7b7672f4f58458d542… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 15:46:35 2015 +0200 mshtml: Get rid of duplicated NS_DLSYM defines. --- dlls/mshtml/nsembed.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index ac33015..d166ef3 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -518,14 +518,6 @@ static BOOL load_xul(const PRUnichar *gre_path) NS_DLSYM(NS_CStringGetData); NS_DLSYM(NS_Alloc); NS_DLSYM(NS_Free); - -#undef NS_DLSYM - -#define NS_DLSYM(func) \ - func = (void *)GetProcAddress(xul_handle, #func); \ - if(!func) \ - ERR("Could not GetProcAddress(" #func ") failed\n") - NS_DLSYM(ccref_incr); NS_DLSYM(ccref_decr); NS_DLSYM(ccref_init);

1 0

Jacek Caban : mshtml: Fixed binding event scripts to window objects.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 7c85ed6aabf2ea5ca021d3cefce80541a12f2247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c85ed6aabf2ea5ca021d3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 16:35:24 2015 +0200 mshtml: Fixed binding event scripts to window objects. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a14ce72..30ce6b1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1529,11 +1529,12 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) +void bind_target_event(HTMLDocumentNode *doc, event_target_t **event_target, DispatchEx *dispex, + const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, dispex, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1541,7 +1542,7 @@ void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLD return; } - set_event_handler_disp(&node->dispex, event_target, doc, eid, disp); + set_event_handler_disp(dispex, event_target, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0517834..86d5816 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,7 +64,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLS HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_target_event(HTMLDocumentNode*,event_target_t**,DispatchEx*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4590854..e3c9498 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1314,9 +1314,9 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, DispatchEx **ret_target_dispex) { - HTMLDOMNode *target_node = NULL; + DispatchEx *target_dispex = NULL; event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; @@ -1336,22 +1336,26 @@ static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptEleme FIXME("Empty for attribute\n"); }else if(!strcmpW(target_id, documentW)) { target = &doc->node.event_target; - target_node = &doc->node; - IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + target_dispex = &doc->node.dispex; + htmldoc_addref(&doc->basedoc); }else if(!strcmpW(target_id, windowW)) { - target = &doc->body_event_target; + if(doc->window) { + target_dispex = &doc->window->dispex; + IDispatchEx_AddRef(&target_dispex->IDispatchEx_iface); + target = &doc->body_event_target; + } }else { HTMLElement *target_elem; hres = get_doc_elem_by_id(doc, target_id, &target_elem); if(SUCCEEDED(hres) && target_elem) { - target_node = &target_elem->node; + target_dispex = &target_elem->node.dispex; target = &target_elem->node.event_target; } } nsAString_Finish(&target_id_str); - *ret_target_node = target_node; + *ret_target_dispex = target_dispex; return target; } @@ -1449,7 +1453,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLScriptElement *script_elem; event_target_t **event_target; nsIDOMNodeList *node_list; - HTMLDOMNode *target_node; + DispatchEx *target_dispex; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1496,10 +1500,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem, &target_node); + event_target = find_event_target(doc, script_elem, &target_dispex); if(event_target) { - if(target_node) - hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + if(target_dispex) + hres = IDispatchEx_QueryInterface(&target_dispex->IDispatchEx_iface, &IID_HTMLPluginContainer, (void**)&plugin_container); else hres = E_NOINTERFACE; @@ -1507,10 +1511,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_node_event(doc, event_target, target_node, event, event_disp); + bind_target_event(doc, event_target, target_dispex, event, event_disp); - if(target_node) { - IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(target_dispex) { + IDispatchEx_Release(&target_dispex->IDispatchEx_iface); if(plugin_container) node_release(&plugin_container->element.node); }

1 0

Thomas Faber : comctl32: Avoid use-after-free in DPA_Merge (DPH).
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 13b65faf4e758439afc5139098b4231407c5bb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b65faf4e758439afc513909… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 18 12:08:29 2015 +0200 comctl32: Avoid use-after-free in DPA_Merge (DPH). --- dlls/comctl32/dpa.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 148d3f1..b5b7ff8 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -303,16 +303,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, hdpa1->nItemCount, hdpa2->nItemCount); - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - nIndex = hdpa1->nItemCount - 1; nCount = hdpa2->nItemCount - 1; do { + pWork1 = &hdpa1->ptrs[nIndex]; + pWork2 = &hdpa2->ptrs[nCount]; + if (nIndex < 0) { if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ @@ -343,10 +341,8 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, return FALSE; nCount--; - pWork2--; *pWork1 = ptr; nIndex--; - pWork1--; } else if (nResult > 0) { @@ -361,7 +357,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; - pWork1--; } else { @@ -377,7 +372,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, DPA_InsertPtr (hdpa1, nIndex+1, ptr); } nCount--; - pWork2--; } }

1 0

Sebastian Lackner : msxml3: Add a missing break (Coverity).
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 45e00e55161fb4bb33222592523878c399b833d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e00e55161fb4bb332225925… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 18 23:31:02 2015 +0200 msxml3: Add a missing break (Coverity). --- dlls/msxml3/node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7119a43..1ddc9bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2055,6 +2055,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; + break; } default: ERR("Called for unsupported node type %d\n", node->type);

1 0

Marcus Meissner : inetcomm: Avoid overlapping memcpy (Coverity).
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: a57b06c5acac1bed5a4aa632ab939ca5a1cd028d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57b06c5acac1bed5a4aa632a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:50:42 2015 +0200 inetcomm: Avoid overlapping memcpy (Coverity). --- dlls/inetcomm/mimeole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6a6cbd8..94fb558 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1613,13 +1613,13 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc if(overlap == buf) /* 1st iteration */ { - memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); overlap = buf + overlap_no; start += read - overlap_no; } else { - memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE, overlap_no); start += read; } } while(1);

1 0

Marcus Meissner : ntdll: Potential buffer overwrite (Coverity).
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: 33d4125a8f471ab52455051479609cbb6da9ca0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d4125a8f471ab5245505147… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:59:22 2015 +0200 ntdll: Potential buffer overwrite (Coverity). --- dlls/ntdll/cdrom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 34910e7..25a3fde 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3090,8 +3090,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(DVD_REGION); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - TRACE("doing DVD_Get_REGION\n"); - status = DVD_GetRegion(fd, lpOutBuffer); + else + { + TRACE("doing DVD_Get_REGION\n"); + status = DVD_GetRegion(fd, lpOutBuffer); + } break; case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR);

1 0

Huw Davies : dssenh/tests: Fix some tests on Win 8.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: ad9910bdfbb2294dccf89520647ce1407e698750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad9910bdfbb2294dccf895206… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 08:56:39 2015 +0100 dssenh/tests: Fix some tests on Win 8. --- dlls/dssenh/tests/dssenh.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 8b83586..feb9a30 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -20,6 +20,8 @@ #include <string.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" @@ -186,6 +188,7 @@ struct keylength_test { DWORD expectedError; BOOL brokenResult; DWORD brokenError; + DWORD altError; }; static const struct keylength_test baseDSS_keylength[] = { @@ -197,7 +200,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024 increment by 64 */ {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -214,7 +217,7 @@ static const struct keylength_test baseDSS_keylength[] = { /* min 512 max 1024, increment by 64 */ {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -230,7 +233,7 @@ static const struct keylength_test dssDH_keylength[] = { {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, @@ -248,7 +251,7 @@ static const struct keylength_test dssDH_keylength[] = { {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -269,7 +272,7 @@ static const struct keylength_test dssENH_keylength[] = { {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, {AT_SIGNATURE, 512 << 16, TRUE}, - {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {AT_SIGNATURE, 768 << 16, TRUE}, {AT_SIGNATURE, 1024 << 16, TRUE}, {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, @@ -287,7 +290,7 @@ static const struct keylength_test dssENH_keylength[] = { {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, {CALG_DSS_SIGN, 512 << 16, TRUE}, - {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS, STATUS_INVALID_PARAMETER}, /* WinNT4 and Win2k */ {CALG_DSS_SIGN, 768 << 16, TRUE}, {CALG_DSS_SIGN, 1024 << 16, TRUE}, {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} @@ -307,7 +310,7 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t /* success */ if(tests[i].expectedResult) { - ok(result, "Expected a key, got %08x\n", GetLastError()); + ok(result, "%d: Expected a key, got %08x\n", i, GetLastError()); result = CryptDestroyKey(key); ok(result, "Expected no errors.\n"); } @@ -315,19 +318,21 @@ static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *t { /* error but success on older system */ if(tests[i].brokenResult) ok((!result && GetLastError() == tests[i].expectedError) || - broken(result), "Expected a key, got %x.\n", GetLastError()); + broken(result), "%d: Didn't really expect a key, got %x, %d\n", + i, GetLastError(), result); else { /* error */ if(!tests[i].brokenError) ok(!result && GetLastError() == tests[i].expectedError, - "Expected a key, got %x.\n", GetLastError()); + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); /* error but different error on older system */ else ok(!result && (GetLastError() == tests[i].expectedError || - broken(GetLastError() == tests[i].brokenError)), - "Expected a key, got %x.\n", GetLastError()); + GetLastError() == tests[i].altError || + broken(GetLastError() == tests[i].brokenError) ), + "%d: Expected an error, got %x, %d.\n", i, GetLastError(), result); } } }

1 0

Huw Davies : rpcrt4/tests: Avoid a double-free.
by Alexandre Julliard 20 Apr '15

20 Apr '15

Module: wine Branch: master Commit: b24ce98af36431d1b7715db4090d903b82d095c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b24ce98af36431d1b7715db40… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 20 09:57:29 2015 +0100 rpcrt4/tests: Avoid a double-free. Commit 4cf70b1418260fda95d69bcb50374a64f1ce895b was causing the tests to crash. The reason is due to a Wine bug in NdrPointerUnmarshall(). Windows returns the same pointer (which is later released in a call to NdrPointerFree()), while Wine makes a copy which Valgrind correctly spots is leaked. --- dlls/rpcrt4/tests/ndr_marshall.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 917c9e5..411ba8b 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1560,6 +1560,11 @@ todo_wine { ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + /* Prevent a memory leak when running with Wine. + Remove once the todo_wine block above is fixed. */ + if (mem != mem_orig) + HeapFree(GetProcessHeap(), 0, mem_orig); + my_free_called = 0; StubMsg.Buffer = StubMsg.BufferStart; NdrPointerFree( &StubMsg, mem, fmtstr_conf_str ); @@ -1590,7 +1595,6 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } - HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0