May 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : mshtml/tests: Fix BSTR double-free (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 5587efe51b4de167a91f2044d332c51807100d69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5587efe51b4de167a91f2044d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 23:07:12 2017 +0300 mshtml/tests: Fix BSTR double-free (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/script.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 41aaa3e..322314b 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3118,7 +3118,6 @@ static HRESULT WINAPI ProtocolEx_StartEx(IInternetProtocolEx *iface, IUri *uri, }else { src = FindResourceW(NULL, *path == '/' ? path+1 : path, (const WCHAR*)RT_HTML); ok(src != NULL, "Could not find resource for path %s\n", wine_dbgstr_w(path)); - SysFreeString(path); if(src) { This->size = SizeofResource(NULL, src); This->data = LoadResource(NULL, src);

1 0

Nikolay Sivov : inetcomm: Fixed buffer leak on error path (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: dcc545be219290df91c9b7ab9bb41d918541223c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc545be219290df91c9b7ab9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:42:13 2017 +0300 inetcomm: Fixed buffer leak on error path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index c77cf26..b7b01d4 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -495,8 +495,10 @@ static HRESULT WINAPI MimeHtmlProtocol_Start(IInternetProtocol *iface, const WCH binding->url[url.mhtml_len] = 0; hres = CreateURLMoniker(NULL, binding->url, &mon); - if(FAILED(hres)) + if(FAILED(hres)) { + heap_free(binding); return hres; + } binding->IBindStatusCallback_iface.lpVtbl = &BindStatusCallbackVtbl; binding->ref = 1;

1 0

Nikolay Sivov : comctl32/taskdialog: Remove superfluous title pointer check (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: b1d46e0b5fb9a0b1f20291cb2bf7fa159bf10816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1d46e0b5fb9a0b1f20291cb2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:16:22 2017 +0300 comctl32/taskdialog: Remove superfluous title pointer check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 6b8bcfc..e452d34 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -271,8 +271,7 @@ static DLGTEMPLATE *create_taskdialog_template(const TASKDIALOGCONFIG *taskconfi title_size = (strlenW(titleW) + 1) * sizeof(WCHAR); size = sizeof(DLGTEMPLATE) + 2 * sizeof(WORD); - if (titleW) - size += title_size; + size += title_size; size += 2; /* font size */ list_init(&desc.controls);

1 0

Nikolay Sivov : shell32/shellview: Respond to special interface id CDefView.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 627630c2623791c352fba665eae5441ac4b2bbc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=627630c2623791c352fba665e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:57 2017 +0300 shell32/shellview: Respond to special interface id CDefView. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 3 ++- dlls/shell32/tests/shlview.c | 20 ++++++++++++++++++++ include/shlguid.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index f815011..e0dbc3b 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1713,7 +1713,8 @@ static HRESULT WINAPI IShellView_fnQueryInterface(IShellView3 *iface, REFIID rii if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IShellView) || IsEqualIID(riid, &IID_IShellView2) || - IsEqualIID(riid, &IID_IShellView3)) + IsEqualIID(riid, &IID_IShellView3) || + IsEqualIID(riid, &IID_CDefView)) { *ppvObj = &This->IShellView3_iface; } diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 8603ddb..fa6dab4 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -633,6 +633,7 @@ static void test_CreateViewWindow(void) HRESULT hr; RECT r = {0}; ULONG ref1, ref2; + IUnknown *unk; hr = SHGetDesktopFolder(&desktop); ok(hr == S_OK, "got (0x%08x)\n", hr); @@ -640,6 +641,11 @@ static void test_CreateViewWindow(void) hr = IShellFolder_CreateViewObject(desktop, NULL, &IID_IShellView, (void**)&view); ok(hr == S_OK, "got (0x%08x)\n", hr); + hr = IShellView_QueryInterface(view, &IID_CDefView, (void **)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(unk == (IUnknown *)view, "got %p\n", unk); + IUnknown_Release(unk); + if (0) { /* crashes on native */ @@ -1335,6 +1341,7 @@ static void test_SHCreateShellFolderView(void) IShellView *psv; SFV_CREATE sfvc; ULONG refCount; + IUnknown *unk; HRESULT hr; hr = SHGetDesktopFolder(&desktop); @@ -1396,6 +1403,12 @@ if (0) hr = SHCreateShellFolderView(&sfvc, &psv); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(psv != NULL, "psv = %p\n", psv); + + hr = IShellView_QueryInterface(psv, &IID_CDefView, (void **)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(unk == (IUnknown *)psv, "got %p\n", unk); + IUnknown_Release(unk); + refCount = IShellView_Release(psv); ok(refCount == 0, "refCount = %u\n", refCount); @@ -1407,6 +1420,7 @@ static void test_SHCreateShellFolderViewEx(void) IShellFolder *desktop; IShellView *psv; ULONG refCount; + IUnknown *unk; HRESULT hr; CSFV csfv; @@ -1427,6 +1441,12 @@ static void test_SHCreateShellFolderViewEx(void) hr = SHCreateShellFolderViewEx(&csfv, &psv); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(psv != NULL, "psv = %p\n", psv); + + hr = IShellView_QueryInterface(psv, &IID_CDefView, (void **)&unk); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(unk == (IUnknown *)psv, "got %p\n", unk); + IUnknown_Release(unk); + if (psv) { refCount = IShellView_Release(psv); diff --git a/include/shlguid.h b/include/shlguid.h index 2279def..028cb61 100644 --- a/include/shlguid.h +++ b/include/shlguid.h @@ -82,6 +82,7 @@ DEFINE_OLEGUID(IID_IQueryInfo, 0x00021500, 0, 0); DEFINE_GUID(IID_IACList, 0x77A130B0,0x94FD,0x11D0,0xA5,0x44,0x00,0xC0,0x4F,0xD7,0xD0,0x62); DEFINE_GUID(IID_IACList2, 0x470141A0,0x5186,0x11D2,0xBB,0xB6,0x00,0x60,0x97,0x7B,0x46,0x4C); DEFINE_GUID(IID_IObjMgr, 0x00BB2761,0x6A77,0x11D0,0xA5,0x35,0x00,0xC0,0x4F,0xD7,0xD0,0x62); +DEFINE_GUID(IID_CDefView, 0x4434ff80,0xef4c,0x11ce,0xae,0x65,0x08,0x00,0x2b,0x2e,0x12,0x62); DEFINE_GUID(IID_IProgressDialog, 0xEBBC7C04,0x315E,0x11D2,0xB6,0x2F,0x00,0x60,0x97,0xDF,0x5B,0xD4); #define SID_SProgressUI CLSID_ProgressDialog

1 0

Nikolay Sivov : shell32: Move SHCreateShellFolderView/ SHCreateShellFolderViewEx and tests to corresponding files.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 4478e61d168d95f92f39f6b19fe36fabc2444bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4478e61d168d95f92f39f6b19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:53 2017 +0300 shell32: Move SHCreateShellFolderView/SHCreateShellFolderViewEx and tests to corresponding files. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 70 ----------------------- dlls/shell32/shlview.c | 59 ++++++++++++++++++++ dlls/shell32/tests/shlfolder.c | 123 ----------------------------------------- dlls/shell32/tests/shlview.c | 122 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4478e61d168d95f92f39f…

1 0

Nikolay Sivov : msxml3/tests: Consistently use non-null pointer value.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: b565149104a66e12128d7e7a0e41aaa37d1a4fae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b565149104a66e12128d7e7a0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:19:56 2017 +0300 msxml3/tests: Consistently use non-null pointer value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 4bac5a1..076114a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1542,7 +1542,7 @@ if (0) ok( b == VARIANT_FALSE, "succeeded in loading XML string\n"); SysFreeString( str ); - str = (BSTR)0x1; + str = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &str); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(str == NULL, "got %p\n", str); @@ -1621,7 +1621,7 @@ if (0) r = IXMLDOMDocument_get_nodeName( doc, NULL ); ok ( r == E_INVALIDARG, "get_nodeName (NULL) wrong code\n"); - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; r = IXMLDOMDocument_get_baseName( doc, &str ); ok ( r == S_FALSE, "got 0x%08x\n", r); ok (str == NULL, "got %p\n", str); @@ -1743,25 +1743,25 @@ if (0) ok(r == E_INVALIDARG, "ret %08x\n", r ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, -1, 4, &str); ok(r == E_INVALIDARG, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 30, 0, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 0, -1, &str); ok(r == E_INVALIDARG, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; r = IXMLDOMText_substringData(nodetext, 2, 0, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok( str == NULL, "incorrect string\n"); @@ -2016,7 +2016,7 @@ if (0) /* empty comment */ r = IXMLDOMDocument_createComment(doc, _bstr_(""), &node_comment); ok( r == S_OK, "returns %08x\n", r ); - str = (BSTR)0x1; + str = NULL; r = IXMLDOMComment_get_data(node_comment, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty string data\n"); @@ -2025,7 +2025,7 @@ if (0) r = IXMLDOMDocument_createComment(doc, NULL, &node_comment); ok( r == S_OK, "returns %08x\n", r ); - str = (BSTR)0x1; + str = NULL; r = IXMLDOMComment_get_data(node_comment, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && (SysStringLen(str) == 0), "expected empty string data\n"); @@ -2048,7 +2048,7 @@ if (0) ok(nodeChild == NULL, "pLastChild not NULL\n"); /* baseName */ - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; r = IXMLDOMComment_get_baseName(node_comment, &str); ok(r == S_FALSE, "ret %08x\n", r ); ok(str == NULL, "Expected NULL\n"); @@ -2095,7 +2095,7 @@ if (0) SysFreeString(str); /* test baseName */ - str = (BSTR)0x1; + str = NULL; r = IXMLDOMProcessingInstruction_get_baseName(nodePI, &str); ok(r == S_OK, "ret %08x\n", r ); ok( !lstrcmpW( str, _bstr_("xml") ), "incorrect nodeName string\n"); @@ -2424,7 +2424,7 @@ static void test_domnode( void ) ok( r == S_OK, "getNamedItem returned wrong code\n"); ok( type == NODE_TEXT, "node not text\n"); - str = (BSTR) 1; + str = (void *)0xdeadbeef; r = IXMLDOMNode_get_baseName( next, &str ); ok( r == S_FALSE, "get_baseName returned wrong code\n"); ok( str == NULL, "basename was wrong\n"); @@ -5458,25 +5458,25 @@ static void test_xmlTypes(void) ok(hr == E_INVALIDARG, "ret %08x\n", hr ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, -1, 4, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 30, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 0, -1, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMComment_substringData(pComment, 2, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); @@ -5896,25 +5896,25 @@ static void test_xmlTypes(void) ok(hr == E_INVALIDARG, "ret %08x\n", hr ); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, -1, 4, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid offset */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 30, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 0, -1, &str); ok(hr == E_INVALIDARG, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); /* test substringData - Invalid size */ - str = (BSTR)&szElement; + str = (void *)0xdeadbeef; hr = IXMLDOMCDATASection_substringData(pCDataSec, 2, 0, &str); ok(hr == S_FALSE, "ret %08x\n", hr ); ok( str == NULL, "incorrect string\n"); @@ -6636,7 +6636,7 @@ static void test_namespaces_basic(void) EXPECT_HR(hr, S_OK); ok(b == VARIANT_TRUE, "got %d\n", b); - str = (BSTR)0xdeadbeef; + str = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_namespaceURI(doc, &str); EXPECT_HR(hr, S_FALSE); ok(str == NULL, "got %p\n", str); @@ -10237,7 +10237,7 @@ static void test_load(void) ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(b == VARIANT_FALSE, "got %d\n", b); - bstr1 = (BSTR)0x1; + bstr1 = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &bstr1); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(bstr1 == NULL, "got %p\n", bstr1); @@ -12485,7 +12485,7 @@ static void test_url(void) hr = IXMLDOMDocument_get_url(doc, NULL); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - s = (BSTR)0x1; + s = (void *)0xdeadbeef; hr = IXMLDOMDocument_get_url(doc, &s); ok(hr == S_FALSE, "got 0x%08x\n", hr); ok(s == NULL, "got %s\n", wine_dbgstr_w(s));

1 0

Nikolay Sivov : msxml3/tests: Initialize string pointer on default case too (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 870de39ca496216e7f90373e98855bc140c883a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=870de39ca496216e7f90373e9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:19:57 2017 +0300 msxml3/tests: Initialize string pointer on default case too (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 076114a..fa10a36 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12086,6 +12086,7 @@ static void test_put_data(void) break; } default: + get_data = NULL; break; }

1 0

Michael Müller : ntdll: Implement LdrEnumerateLoadedModules.
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 5a96399b66224a31d426084b3a57c121c1611382 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a96399b66224a31d426084b3… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Apr 28 17:59:41 2017 +0200 ntdll: Implement LdrEnumerateLoadedModules. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 29 +++++++++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/tests/rtl.c | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index cf75850..518a99f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -62,6 +62,7 @@ WINE_DECLARE_DEBUG_CHANNEL(pid); #define ISOLATIONAWARE_MANIFEST_RESOURCE_ID ((ULONG_PTR)2) typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); +typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ @@ -1394,6 +1395,34 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod) } /****************************************************************** + * LdrEnumerateLoadedModules (NTDLL.@) + */ +NTSTATUS WINAPI LdrEnumerateLoadedModules( void *unknown, LDRENUMPROC callback, void *context ) +{ + LIST_ENTRY *mark, *entry; + LDR_MODULE *mod; + BOOLEAN stop = FALSE; + + TRACE( "(%p, %p, %p)\n", unknown, callback, context ); + + if (unknown || !callback) + return STATUS_INVALID_PARAMETER; + + RtlEnterCriticalSection( &loader_section ); + + mark = &NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + mod = CONTAINING_RECORD( entry, LDR_MODULE, InMemoryOrderModuleList ); + callback( mod, context, &stop ); + if (stop) break; + } + + RtlLeaveCriticalSection( &loader_section ); + return STATUS_SUCCESS; +} + +/****************************************************************** * LdrLockLoaderLock (NTDLL.@) * * Note: some flags are not implemented. diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 66618fc..07944ed 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -62,7 +62,7 @@ # @ stub LdrDestroyOutOfProcessImage @ stdcall LdrDisableThreadCalloutsForDll(long) @ stub LdrEnumResources -# @ stub LdrEnumerateLoadedModules +@ stdcall LdrEnumerateLoadedModules(ptr ptr ptr) # @ stub LdrFindCreateProcessManifest @ stdcall LdrFindEntryForAddress(ptr ptr) @ stdcall LdrFindResourceDirectory_U(long ptr long ptr) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 92b7213..7176e44 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2181,7 +2181,7 @@ static void test_LdrEnumerateLoadedModules(void) if (!pLdrEnumerateLoadedModules) { - skip("LdrEnumerateLoadedModules not available\n"); + win_skip("LdrEnumerateLoadedModules not available\n"); return; }

1 0

Nikolay Sivov : dpnet/tests: Fix free buffer access (Coverity).
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 25de063ec0a3ac94f90c2c8a2d5722444e591452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25de063ec0a3ac94f90c2c8a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:25:52 2017 +0300 dpnet/tests: Fix free buffer access (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> 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 | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index e11bfe3..431203b 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -210,13 +210,13 @@ static void test_enum_service_providers(void) trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Client_EnumServiceProviders(client, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts(void) @@ -613,14 +613,11 @@ static void test_enum_service_providers_peer(void) for (i=0;i<items;i++) { - trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + HeapFree(GetProcessHeap(), 0, serv_prov_info); size = 0; items = 0; @@ -638,20 +635,17 @@ static void test_enum_service_providers_peer(void) for (i=0;i<items;i++) { - trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info->pwszName)); - trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info->guid)); - - serv_prov_info++; + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); } - serv_prov_info -= items; /* set pointer back */ - ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); - /* Invalid GUID */ items = 88; hr = IDirectPlay8Peer_EnumServiceProviders(peer, &appguid, NULL, serv_prov_info, &size, &items, 0); ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); } static void test_enum_hosts_peer(void)

1 0

Nikolay Sivov : shell32/shellview: Set provided callback in SHCreateShellFolderView().
by Alexandre Julliard May 1, 2017

May 1, 2017

Module: wine Branch: master Commit: 7a49da50705fe535cd61d45e43a1d848da3a51b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a49da50705fe535cd61d45e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:55 2017 +0300 shell32/shellview: Set provided callback in SHCreateShellFolderView(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 070f070..2c8b6bd 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -43,6 +43,7 @@ #include <stdlib.h> #include <string.h> +#define CINTERFACE #define COBJMACROS #define NONAMELESSUNION @@ -3775,6 +3776,14 @@ HRESULT WINAPI SHCreateShellFolderView(const SFV_CREATE *desc, IShellView **shel if (!*shellview) return E_OUTOFMEMORY; + if (desc->psfvcb) + { + IShellFolderView *view; + IShellView_QueryInterface(*shellview, &IID_IShellFolderView, (void **)&view); + IShellFolderView_SetCallback(view, desc->psfvcb, NULL); + IShellFolderView_Release(view); + } + return S_OK; }

1 0