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

Nikolay Sivov : msxml3/tests: Consistently use non-null pointer value.
by Alexandre Julliard 01 May '17

01 May '17

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 01 May '17

01 May '17

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

Nikolay Sivov : comctl32/tests: Fully initialize message test data ( Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: e9c1f8112df0f2ecf428a753696addf6cdb746db URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9c1f8112df0f2ecf428a7536… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:20:28 2017 +0300 comctl32/tests: Fully initialize message test data (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/comboex.c | 2 +- dlls/comctl32/tests/header.c | 5 ++--- dlls/comctl32/tests/treeview.c | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/comboex.c index faa32a3..fede917 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/comboex.c @@ -85,8 +85,8 @@ static LRESULT WINAPI editbox_subclass_proc(HWND hwnd, UINT message, WPARAM wPar { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; msg.message = message; msg.flags = sent|wparam|lparam; diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3ae83f8..defd635 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -383,7 +383,7 @@ static char pszOutOfRangeItem[] = "Out Of Range Item"; static char *str_items[] = {pszFirstItem, pszSecondItem, pszThirdItem, pszFourthItem, pszReplaceItem, pszOutOfRangeItem}; - + static char pszUniTestA[] = "TST"; static WCHAR pszUniTestW[] = {'T','S','T',0}; @@ -403,15 +403,14 @@ static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wPara { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; msg.message = message; msg.flags = sent|wparam|lparam; if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; - msg.id = 0; add_message(sequences, HEADER_SEQ_INDEX, &msg); defwndproc_counter++; diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 19a5ac0..43de61c 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1098,7 +1098,7 @@ static void test_get_set_unicodeformat(void) static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; - struct message msg; + struct message msg = { 0 }; LRESULT ret; RECT rect; HTREEITEM visibleItem; @@ -1110,8 +1110,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, msg.lParam = lParam; if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; - else - msg.id = 0; /* log system messages, except for painting */ if (message < WM_USER &&

1 0

Nikolay Sivov : dwrite/tests: Fully initialize call sequence test data ( Coverity).
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 901914519f72db89f64935f751ec4fe7f12e83c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901914519f72db89f64935f75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 21:21:17 2017 +0300 dwrite/tests: Fully initialize call sequence test data (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f48fc42..843ab0d 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -617,7 +617,7 @@ static HRESULT WINAPI testrenderer_DrawUnderline(IDWriteTextRenderer *iface, IUnknown *effect) { struct renderer_context *ctxt = (struct renderer_context*)context; - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; if (ctxt) TEST_MEASURING_MODE(ctxt, underline->measuringMode); @@ -656,7 +656,7 @@ static HRESULT WINAPI testrenderer_DrawStrikethrough(IDWriteTextRenderer *iface, IUnknown *effect) { struct renderer_context *ctxt = (struct renderer_context*)context; - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; if (ctxt) TEST_MEASURING_MODE(ctxt, strikethrough->measuringMode); @@ -677,7 +677,7 @@ static HRESULT WINAPI testrenderer_DrawInlineObject(IDWriteTextRenderer *iface, BOOL is_rtl, IUnknown *effect) { - struct drawcall_entry entry; + struct drawcall_entry entry = { 0 }; entry.kind = DRAW_INLINE; if (effect) entry.kind |= DRAW_EFFECT;

1 0

Nikolay Sivov : shell32: Move SHCreateShellFolderView/ SHCreateShellFolderViewEx and tests to corresponding files.
by Alexandre Julliard 01 May '17

01 May '17

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 : shell32/tests: Don't trace all messages sent to listview.
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: 8ce45458fb77b437e655c4c94e4e4524723939d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ce45458fb77b437e655c4c94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:54 2017 +0300 shell32/tests: Don't trace all messages sent to listview. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlview.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index c15d2d6..f5adae5 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -53,10 +53,8 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; + struct message msg = { 0 }; LRESULT ret; - struct message msg; - - trace("listview: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); msg.message = message; msg.flags = sent|wparam|lparam;

1 0

Nikolay Sivov : shell32/shellview: Set provided callback in SHCreateShellFolderView().
by Alexandre Julliard 01 May '17

01 May '17

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

Nikolay Sivov : shell32/shellview: Handle NULL folder pointer in SHCreateShellFolderViewEx().
by Alexandre Julliard 01 May '17

01 May '17

Module: wine Branch: master Commit: a528ddd745f2c2029d60e8fe655fe7bb566776f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a528ddd745f2c2029d60e8fe6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Apr 30 22:01:56 2017 +0300 shell32/shellview: Handle NULL folder pointer in SHCreateShellFolderViewEx(). 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 | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 2c8b6bd..f815011 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -3806,6 +3806,9 @@ HRESULT WINAPI SHCreateShellFolderViewEx(CSFV *desc, IShellView **shellview) TRACE("sf=%p pidl=%p cb=%p mode=0x%08x parm=%p\n", desc->pshf, desc->pidl, desc->pfnCallback, desc->fvm, desc->psvOuter); + if (!desc->pshf) + return E_UNEXPECTED; + *shellview = IShellView_Constructor(desc->pshf); if (!*shellview) return E_OUTOFMEMORY; diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index f5adae5..8603ddb 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -1433,6 +1433,16 @@ static void test_SHCreateShellFolderViewEx(void) ok(refCount == 0, "refCount = %u\n", refCount); } +if (0) +{ + /* Crashes on null shellfolder, on XP/2k3 */ + memset(&csfv, 0, sizeof(csfv)); + csfv.pshf = NULL; + psv = (void *)0xdeadbeef; + hr = SHCreateShellFolderViewEx(&csfv, &psv); + ok(hr == E_UNEXPECTED, "Got 0x%08x\n", hr); + ok(psv == NULL, "psv = %p\n", psv); +} memset(&csfv, 0, sizeof(csfv)); csfv.cbSize = sizeof(csfv); csfv.pshf = desktop;

1 0

Nikolay Sivov : shell32/shellview: Respond to special interface id CDefView.
by Alexandre Julliard 01 May '17

01 May '17

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 : comctl32/taskdialog: Remove superfluous title pointer check (Coverity).
by Alexandre Julliard 01 May '17

01 May '17

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