wine-commits August 2010

wine-commits@winehq.org

2 participants
884 discussions

Austin English : ntdll: Check for __FreeBSD_kernel__, remove redundant ifdef's, make FIXME's consistent.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: f7c197854804d99c44d306bc7b4a770b7089fc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7c197854804d99c44d306bc7… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Aug 19 03:52:34 2010 -0500 ntdll: Check for __FreeBSD_kernel__, remove redundant ifdef's, make FIXME's consistent. --- dlls/ntdll/cdrom.c | 65 +++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7c197854804d99c44d30…

1 0

David Hedberg : explorerframe: Some additional basic tests.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 2a2ac73f2c8c9fa157199b0a245cf9aeb7a2ae88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2ac73f2c8c9fa157199b0a2… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 19 08:17:56 2010 +0200 explorerframe: Some additional basic tests. --- dlls/explorerframe/tests/nstc.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index cb6ed44..83ec748 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -737,6 +737,7 @@ static void test_basics(void) RECT rc; IShellItem *roots[10]; POINT pt; + int cbstate; WCHAR curdirW[MAX_PATH]; WCHAR buf[MAX_PATH]; static const WCHAR testdirW[] = {'t','e','s','t','d','i','r',0}; @@ -744,6 +745,8 @@ static void test_basics(void) {'t','e','s','t','d','i','r','\\','t','e','s','t','d','i','r','2',0}; static const WCHAR test1W[] = {'t','e','s','t','d','i','r','\\','t','e','s','t','1','.','t','x','t',0}; + static const WCHAR explorerW[] = {'E','x','p','l','o','r','e','r',0}; + static const WCHAR randomW[] = {'_','_','h','e','l','l','o',0}; /* These should exist on platforms supporting the NSTC */ ok(pSHCreateShellItem != NULL, "No SHCreateShellItem.\n"); @@ -1641,6 +1644,58 @@ static void test_basics(void) hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); ok(hr == S_OK, "Got 0x%08x\n", hr); + /* GetItemCustomState / SetItemCustomState */ + if(0) + { + /* Crashes under Windows 7 */ + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, NULL); + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, NULL, &cbstate); + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, NULL); + hr = INameSpaceTreeControl_SetItemCustomState(pnstc, NULL, 0); + } + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir, + SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, + 0, NULL); + process_msgs(); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + todo_wine + { + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(cbstate == BST_UNCHECKED || broken(cbstate == BST_CHECKED /* Vista x64 */), + "Got %d\n", cbstate); + + hr = INameSpaceTreeControl_SetItemCustomState(pnstc, psitestdir, BST_CHECKED); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(cbstate == BST_CHECKED, "Got %d\n", cbstate); + + hr = INameSpaceTreeControl_SetItemCustomState(pnstc, psitestdir, 0xFFF); + ok(hr == S_OK, "Got 0x%08x\n", hr); + + hr = INameSpaceTreeControl_GetItemCustomState(pnstc, psitestdir, &cbstate); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(cbstate == 0xF, "Got %d\n", cbstate); + } + + /* SetTheme */ + todo_wine + { + hr = INameSpaceTreeControl_SetTheme(pnstc, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = INameSpaceTreeControl_SetTheme(pnstc, explorerW); + ok(hr == S_OK, "Got 0x%08x\n", hr); + hr = INameSpaceTreeControl_SetTheme(pnstc, randomW); + ok(hr == S_OK, "Got 0x%08x\n", hr); + } + + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + IShellItem_Release(psidesktop); IShellItem_Release(psidesktop2); IShellItem_Release(psitestdir);

1 0

David Hedberg : explorerframe: Implement EnsureItemVisible.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: e5ab57f2c6805029cc0b56ae7fae0b35f8633c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5ab57f2c6805029cc0b56ae7… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 19 08:17:55 2010 +0200 explorerframe: Implement EnsureItemVisible. --- dlls/explorerframe/nstc.c | 14 +++++++- dlls/explorerframe/tests/nstc.c | 64 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index b77297e..02633b0 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1259,8 +1259,18 @@ static HRESULT WINAPI NSTC2_fnEnsureItemVisible(INameSpaceTreeControl2* iface, IShellItem *psi) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p)\n", This, psi); - return E_NOTIMPL; + HTREEITEM hitem; + + TRACE("%p (%p)\n", This, psi); + + hitem = treeitem_from_shellitem(This, psi); + if(hitem) + { + SendMessageW(This->hwnd_tv, TVM_ENSUREVISIBLE, 0, (WPARAM)hitem); + return S_OK; + } + + return E_INVALIDARG; } static HRESULT WINAPI NSTC2_fnSetTheme(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 9d4d0b4..cb6ed44 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -35,6 +35,7 @@ static HWND hwnd; static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); static HRESULT (WINAPI *pSHGetIDListFromObject)(IUnknown*, PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHCreateItemFromParsingName)(PCWSTR,IBindCtx*,REFIID,void**); +static HRESULT (WINAPI *pSHGetSpecialFolderLocation)(HWND, int, LPITEMIDLIST *); #define NUM_MSG_SEQUENCES 1 #define TREEVIEW_SEQ_INDEX 0 @@ -53,6 +54,7 @@ static void init_function_pointers(void) pSHCreateShellItem = (void*)GetProcAddress(hmod, "SHCreateShellItem"); pSHGetIDListFromObject = (void*)GetProcAddress(hmod, "SHGetIDListFromObject"); pSHCreateItemFromParsingName = (void*)GetProcAddress(hmod, "SHCreateItemFromParsingName"); + pSHGetSpecialFolderLocation = (void*)GetProcAddress(hmod, "SHGetSpecialFolderLocation"); } /******************************************************* @@ -1672,6 +1674,7 @@ static void test_events(void) IShellItem *psidesktop; IOleWindow *pow; LPITEMIDLIST pidl_desktop; + LPITEMIDLIST pidl_drives; NSTCITEMSTATE itemstate; IShellItem *psi; DWORD cookie1, cookie2; @@ -2195,6 +2198,67 @@ static void test_events(void) ok_event_count(pnstceimpl, OnItemDeleted, 1); ok_no_events(pnstceimpl); + /* EnsureItemVisible */ + if(0) + { + /* Crashes on Windows 7 */ + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, NULL); + } + + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psidesktop); + ok(hr == E_INVALIDARG || hr == E_FAIL, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = pSHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl_drives); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) + { + hr = pSHCreateShellItem(NULL, NULL, pidl_drives, &psi); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + if(SUCCEEDED(hr)) + { + hr = INameSpaceTreeControl_AppendRoot(pnstc, psi, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, 0, NULL); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + process_msgs(); + ok_event_count_broken(pnstceimpl, OnItemAdded, 1, 0 /* Vista */); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psidesktop); + ok(hr == E_INVALIDARG, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psi); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psidesktop, SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, 0, NULL); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + process_msgs(); + ok_event_count_broken(pnstceimpl, OnItemAdded, 1, 0 /* Vista */); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psidesktop); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + hr = INameSpaceTreeControl_EnsureItemVisible(pnstc, psi); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok_no_events(pnstceimpl); + + } + else + skip("Failed to create shellitem.\n"); + + ILFree(pidl_drives); + } + else + skip("Failed to get pidl for CSIDL_DRIVES.\n"); + + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + ok_event_count(pnstceimpl, OnItemDeleted, 2); + ok_no_events(pnstceimpl); + hr = INameSpaceTreeControl_QueryInterface(pnstc, &IID_IOleWindow, (void**)&pow); ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr))

1 0

David Hedberg : explorerframe: Implement HitTest.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 6923ec27085baa8c364313b07fc3b6a980e877f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6923ec27085baa8c364313b07… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 19 08:17:54 2010 +0200 explorerframe: Implement HitTest. --- dlls/explorerframe/nstc.c | 33 ++++++++++++++- dlls/explorerframe/tests/nstc.c | 84 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 2a68d95..b77297e 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -422,6 +422,18 @@ static void collapse_all(NSTC2Impl *This, HTREEITEM node) if(next) collapse_all(This, next); } +static HTREEITEM treeitem_from_point(NSTC2Impl *This, POINT *pt, UINT *hitflag) +{ + TVHITTESTINFO tviht; + tviht.pt.x = pt->x; + tviht.pt.y = pt->y; + tviht.hItem = NULL; + + SendMessageW(This->hwnd_tv, TVM_HITTEST, 0, (LPARAM)&tviht); + if(hitflag) *hitflag = tviht.flags; + return tviht.hItem; +} + /************************************************************************* * NamespaceTree window functions */ @@ -1309,8 +1321,25 @@ static HRESULT WINAPI NSTC2_fnHitTest(INameSpaceTreeControl2* iface, IShellItem **ppsiOut) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p, %p)\n", This, ppsiOut, ppt); - return E_NOTIMPL; + HTREEITEM hitem; + TRACE("%p (%p, %p)\n", This, ppsiOut, ppt); + + if(!ppt || !ppsiOut) + return E_POINTER; + + *ppsiOut = NULL; + + hitem = treeitem_from_point(This, ppt, NULL); + if(hitem) + *ppsiOut = shellitem_from_treeitem(This, hitem); + + if(*ppsiOut) + { + IShellItem_AddRef(*ppsiOut); + return S_OK; + } + + return S_FALSE; } static HRESULT WINAPI NSTC2_fnGetItemRect(INameSpaceTreeControl2* iface, diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 363b982..9d4d0b4 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -734,6 +734,7 @@ static void test_basics(void) HWND hwnd_tv; RECT rc; IShellItem *roots[10]; + POINT pt; WCHAR curdirW[MAX_PATH]; WCHAR buf[MAX_PATH]; static const WCHAR testdirW[] = {'t','e','s','t','d','i','r',0}; @@ -1555,6 +1556,89 @@ static void test_basics(void) hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); ok(hr == S_OK, "Got (0x%08x)\n", hr); + /* HitTest */ + hr = INameSpaceTreeControl_HitTest(pnstc, NULL, NULL); + ok(hr == E_POINTER, "Got 0x%08x\n", hr); + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, NULL); + ok(hr == E_POINTER, "Got 0x%08x\n", hr); + hr = INameSpaceTreeControl_HitTest(pnstc, NULL, &psi); + ok(hr == E_POINTER, "Got 0x%08x\n", hr); + + psi = (void*)0xdeadbeef; + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); + ok(hr == S_FALSE, "Got 0x%08x\n", hr); + ok(psi == NULL, "Got psi %p\n", psi); + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir, + SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, + NSTCRS_EXPANDED, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + process_msgs(); + + pt.x = pt.y = 0; + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + int cmp; + hr = IShellItem_Compare(psi, psitestdir, SICHINT_DISPLAY, &cmp); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!cmp, "Got cmp %d\n", cmp); + IShellItem_Release(psi); + } + + pt.y += height - 1; + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + int cmp; + hr = IShellItem_Compare(psi, psitestdir, SICHINT_DISPLAY, &cmp); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!cmp, "Got cmp %d\n", cmp); + IShellItem_Release(psi); + } + + pt.y += 1; + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + int cmp; + todo_wine + { + hr = IShellItem_Compare(psi, psitestdir, SICHINT_DISPLAY, &cmp); + ok(hr == S_FALSE, "Got 0x%08x\n", hr); + ok(cmp, "no cmp value.\n"); + hr = IShellItem_Compare(psi, psitestdir2, SICHINT_DISPLAY, &cmp); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!cmp, "Got cmp %d\n", cmp); + } + IShellItem_Release(psi); + } + + hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir2, &rc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + MapWindowPoints(NULL, hwnd, (POINT*)&rc, 2); + pt.x = rc.left; pt.y = rc.top; + + hr = INameSpaceTreeControl_HitTest(pnstc, &pt, &psi); + ok(hr == S_OK, "Got 0x%08x\n", hr); + if(SUCCEEDED(hr)) + { + int cmp; + hr = IShellItem_Compare(psi, psitestdir2, SICHINT_DISPLAY, &cmp); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(!cmp, "Got cmp %d\n", cmp); + IShellItem_Release(psi); + } + } + + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + IShellItem_Release(psidesktop); IShellItem_Release(psidesktop2); IShellItem_Release(psitestdir);

1 0

David Hedberg : explorerframe: Implement GetItemRect.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 193fe3c3030759bffc00be65f1ba24201527a955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=193fe3c3030759bffc00be65f… Author: David Hedberg <david.hedberg(a)gmail.com> Date: Thu Aug 19 08:17:53 2010 +0200 explorerframe: Implement GetItemRect. --- dlls/explorerframe/nstc.c | 20 +++++++++++- dlls/explorerframe/tests/nstc.c | 61 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/explorerframe/nstc.c b/dlls/explorerframe/nstc.c index 4269b73..2a68d95 100644 --- a/dlls/explorerframe/nstc.c +++ b/dlls/explorerframe/nstc.c @@ -1318,8 +1318,24 @@ static HRESULT WINAPI NSTC2_fnGetItemRect(INameSpaceTreeControl2* iface, RECT *prect) { NSTC2Impl *This = (NSTC2Impl*)iface; - FIXME("stub, %p (%p, %p)\n", This, psi, prect); - return E_NOTIMPL; + HTREEITEM hitem; + TRACE("%p (%p, %p)\n", This, psi, prect); + + if(!psi || !prect) + return E_POINTER; + + hitem = treeitem_from_shellitem(This, psi); + if(hitem) + { + *(HTREEITEM*)prect = hitem; + if(SendMessageW(This->hwnd_tv, TVM_GETITEMRECT, FALSE, (LPARAM)prect)) + { + MapWindowPoints(This->hwnd_tv, HWND_DESKTOP, (POINT*)prect, 2); + return S_OK; + } + } + + return E_INVALIDARG; } static HRESULT WINAPI NSTC2_fnCollapseAll(INameSpaceTreeControl2* iface) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index d05db8e..363b982 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -730,7 +730,8 @@ static void test_basics(void) LPITEMIDLIST pidl_desktop; NSTCITEMSTATE istate; HRESULT hr; - UINT i, res; + UINT i, res, height; + HWND hwnd_tv; RECT rc; IShellItem *roots[10]; WCHAR curdirW[MAX_PATH]; @@ -1496,6 +1497,64 @@ static void test_basics(void) hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); ok(hr == S_OK, "Got (0x%08x)\n", hr); + /* GetItemRect */ + rc.top = rc.left = rc.bottom = rc.right = 0; + if(0) + { + /* Crashes under win 7 */ + hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, NULL); + hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, NULL); + hr = INameSpaceTreeControl_GetItemRect(pnstc, NULL, &rc); + } + + hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, &rc); + ok(hr == E_INVALIDARG, "Got 0x%08x\n", hr); + + hr = INameSpaceTreeControl_AppendRoot(pnstc, psitestdir, + SHCONTF_FOLDERS | SHCONTF_NONFOLDERS, + NSTCRS_EXPANDED, NULL); + ok(hr == S_OK, "Got 0x%08x\n", hr); + process_msgs(); + + hr = INameSpaceTreeControl_GetItemRect(pnstc, psitestdir, &rc); + ok(hr == S_OK, "Got 0x%08x\n", hr); + ok(rc.top != rc.bottom, "Got 0 height.\n"); + ok(rc.left != rc.bottom, "Got 0 width.\n"); + + height = 0; + hwnd_tv = get_treeview_hwnd(pnstc); + if(hwnd_tv) + { + HTREEITEM hroot = (HTREEITEM)SendMessageW(hwnd_tv, TVM_GETNEXTITEM, TVGN_ROOT, 0); + ok(hroot != NULL, "Failed to get root.\n"); + if(hroot) + { + RECT tv_rc; + BOOL bret; + + *(HTREEITEM*)&tv_rc = hroot; + bret = SendMessageW(hwnd_tv, TVM_GETITEMRECT, FALSE, (LPARAM)&tv_rc); + ok(bret, "TVM_GETITEMRECT failed.\n"); + + /* The NamespaceTreeControl returns screen coordinates. */ + MapWindowPoints(NULL, hwnd, (POINT*)&rc, 2); + ok(rc.left == tv_rc.left, "Differed, got %d and %d\n", rc.left, tv_rc.left); + ok(rc.top == tv_rc.top, "Differed, got %d and %d\n", rc.top, tv_rc.top); + ok(rc.right == tv_rc.right, "Differed, got %d and %d\n", rc.right, tv_rc.right); + ok(rc.bottom == tv_rc.bottom, "Differed, got %d and %d\n", rc.bottom, tv_rc.bottom); + + /* Save the height and compare to that of other items. + Observed values: 18, 19, 21 */ + height = rc.bottom - rc.top; + trace("height: %d\n", height); + } + } + else + win_skip("Skipping some GetItemRect tests.\n"); + + hr = INameSpaceTreeControl_RemoveAllRoots(pnstc); + ok(hr == S_OK, "Got (0x%08x)\n", hr); + IShellItem_Release(psidesktop); IShellItem_Release(psidesktop2); IShellItem_Release(psitestdir);

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_GetFragment.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 9816ec856f969cd8589dc0785d6ac65b8b65502e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9816ec856f969cd8589dc0785… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 18 20:31:29 2010 -0400 urlmon/tests: Added tests for IUriBuilder_GetFragment. --- dlls/urlmon/tests/uri.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 13 +++++ 2 files changed, 148 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 743c42c..fb105f7 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5314,6 +5314,135 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { if(builder) IUriBuilder_Release(builder); } +/* Tests invalid args to the "Get*" functions. */ +static void test_IUriBuilder_GetInvalidArgs(void) { + IUriBuilder *builder = NULL; + HRESULT hr; + + hr = pCreateIUriBuilder(NULL, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + LPCWSTR received = (void*) 0xdeadbeef; + DWORD len = -1; + + hr = IUriBuilder_GetFragment(builder, NULL, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + hr = IUriBuilder_GetFragment(builder, NULL, &received); + ok(hr == E_POINTER, "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!received, "Error: Expected received to be NULL, but was %p instead.\n", received); + hr = IUriBuilder_GetFragment(builder, &len, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + ok(!len, "Error: Expected len to be 0, but was %d instead.\n", len); + } + if(builder) IUriBuilder_Release(builder); +} + +static void test_IUriBuilder_GetFragment(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + DWORD i; + LPCWSTR received = NULL; + DWORD len = -1; + const uri_builder_property *prop = NULL; + + /* Check if the property was set earlier. */ + for(i = 0; i < sizeof(test->properties)/sizeof(test->properties[0]); ++i) { + if(test->properties[i].change && test->properties[i].property == Uri_PROPERTY_FRAGMENT) + prop = &(test->properties[i]); + } + + if(prop) { + /* Use expected_value unless it's NULL, then use value. */ + LPCSTR expected = prop->expected_value ? prop->expected_value : prop->value; + hr = IUriBuilder_GetFragment(builder, &len, &received); + if(prop->todo) { + todo_wine { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + } + todo_wine { + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + ok(hr == (expected ? S_OK : S_FALSE), + "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, (expected ? S_OK : S_FALSE), test_index); + ok(!strcmp_aw(expected, received), "Error: Expected %s but got %s on uri_builder_tests[%d].\n", + expected, wine_dbgstr_w(received), test_index); + ok(lstrlen(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlen(expected), len, test_index); + } + } else { + /* The property wasn't set earlier, so it should return whatever + * the base IUri contains (if anything). + */ + IUri *uri = NULL; + hr = IUriBuilder_GetIUri(builder, &uri); + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetIUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + BOOL has_prop = FALSE; + BSTR expected = NULL; + + hr = IUri_GetFragment(uri, &expected); + ok(SUCCEEDED(hr), + "Error: Expected IUri_GetFragment to succeed, but got 0x%08x instead on uri_builder_tests[%d].\n", + hr, test_index); + has_prop = hr == S_OK; + + hr = IUriBuilder_GetFragment(builder, &len, &received); + if(has_prop) { + todo_wine { + ok(hr == S_OK, + "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + } + if(SUCCEEDED(hr)) { + todo_wine { + ok(!lstrcmpW(expected, received), + "Error: Expected %s but got %s instead on uri_builder_tests[%d].\n", + wine_dbgstr_w(expected), wine_dbgstr_w(received), test_index); + } + todo_wine { + ok(lstrlenW(expected) == len, + "Error: Expected the length to be %d, but was %d instead on uri_builder_tests[%d].\n", + lstrlenW(expected), len, test_index); + } + } + } else { + todo_wine { + ok(hr == S_FALSE, + "Error: IUriBuilder_GetFragment returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_FALSE, test_index); + } + todo_wine { + ok(!received, "Error: Expected received to be NULL on uri_builder_tests[%d].\n", test_index); + } + todo_wine { + ok(!len, "Error: Expected the length to be 0, but was %d instead on uri_builder_tests[%d].\n", + len, test_index); + } + } + SysFreeString(expected); + } + if(uri) IUri_Release(uri); + } +} + /* Tests IUriBuilder functions. */ static void test_IUriBuilder(void) { HRESULT hr; @@ -5367,6 +5496,9 @@ static void test_IUriBuilder(void) { } } + /* Test the "Get*" functions. */ + test_IUriBuilder_GetFragment(builder, &test, i); + test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); test_IUriBuilder_CreateUriWithFlags(builder, &test, i); @@ -5440,4 +5572,7 @@ START_TEST(uri) { trace("test IUriBuilder...\n"); test_IUriBuilder(); + + trace("test IUriBuilder_GetInvalidArgs...\n"); + test_IUriBuilder_GetInvalidArgs(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 8aa130a..52b4271 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4195,6 +4195,19 @@ static HRESULT WINAPI UriBuilder_SetIUri(IUriBuilder *iface, IUri *pIUri) static HRESULT WINAPI UriBuilder_GetFragment(IUriBuilder *iface, DWORD *pcchFragment, LPCWSTR *ppwzFragment) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%p %p)\n", This, pcchFragment, ppwzFragment); + + if(!pcchFragment) { + if(ppwzFragment) + *ppwzFragment = NULL; + return E_POINTER; + } + + if(!ppwzFragment) { + *pcchFragment = 0; + return E_POINTER; + } + FIXME("(%p)->(%p %p)\n", This, pcchFragment, ppwzFragment); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_CreateUriWithFlags.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: a88421ccd15426be5145b660ed056cab278b89d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a88421ccd15426be5145b660e… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 18 17:46:41 2010 -0400 urlmon/tests: Added tests for IUriBuilder_CreateUriWithFlags. --- dlls/urlmon/tests/uri.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 17 ++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 0d4d237..743c42c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5167,6 +5167,39 @@ static void test_IUriBuilder_CreateUriSimple(IUriBuilder *builder, const uri_bui if(uri) IUri_Release(uri); } +static void test_IUriBuilder_CreateUriWithFlags(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + IUri *uri = NULL; + + hr = IUriBuilder_CreateUriWithFlags(builder, test->uri_with_flags, test->uri_with_builder_flags, + test->uri_with_encode_flags, 0, &uri); + if(test->uri_todo) { + todo_wine { + ok(hr == test->uri_with_hres, + "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, test->uri_with_hres, test_index); + } + } else { + ok(hr == test->uri_with_hres, + "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, test->uri_with_hres, test_index); + } + + if(SUCCEEDED(hr)) { + BSTR received = NULL; + + hr = IUri_GetAbsoluteUri(uri, &received); + ok(hr == S_OK, "Error: IUri_GetAbsoluteUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + ok(!strcmp_aw(test->uri_with_expected, received), + "Error: Expected the URI to be %s but was %s instead on uri_builder_tests[%d].\n", + test->uri_with_expected, wine_dbgstr_w(received), test_index); + SysFreeString(received); + } + if(uri) IUri_Release(uri); +} + static void test_IUriBuilder_CreateInvalidArgs(void) { IUriBuilder *builder; HRESULT hr; @@ -5205,6 +5238,23 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { hr, E_NOTIMPL); ok(!uri, "Error: Expected uri to NULL, but was %p instead.\n", uri); + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, &uri); + ok(hr == INET_E_INVALID_URL, + "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, INET_E_INVALID_URL); + ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); + + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, Uri_HAS_USER_NAME, 0, &uri); + ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, E_NOTIMPL); + ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); + hr = pCreateUri(http_urlW, 0, 0, &test); ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { @@ -5229,6 +5279,15 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { todo_wine { ok(uri != NULL, "Error: uri was NULL.\n"); } if(uri) IUri_Release(uri); + uri = NULL; + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, 0, 0, &uri); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + todo_wine { ok(uri != NULL, "Error: uri was NULL.\n"); } + if(uri) IUri_Release(uri); + hr = IUriBuilder_SetFragment(builder, NULL); todo_wine { ok(hr == S_OK, "Error: IUriBuilder_SetFragment returned 0x%08x, expected 0x%08x.\n", hr, S_OK); } @@ -5243,6 +5302,12 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", hr, S_OK); ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); + + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriWithFlags(builder, 0, 0, Uri_HAS_USER_NAME, 0, &uri); + ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUriWithFlags returned 0x%08x, expected 0x%08x.\n", + hr, E_NOTIMPL); + ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } if(test) IUri_Release(test); } @@ -5304,6 +5369,7 @@ static void test_IUriBuilder(void) { test_IUriBuilder_CreateUri(builder, &test, i); test_IUriBuilder_CreateUriSimple(builder, &test, i); + test_IUriBuilder_CreateUriWithFlags(builder, &test, i); } if(builder) IUriBuilder_Release(builder); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index a578b88..8aa130a 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4156,6 +4156,23 @@ static HRESULT WINAPI UriBuilder_CreateUriWithFlags(IUriBuilder *iface, IUri **ppIUri) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, + dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + + if(!ppIUri) + return E_POINTER; + + /* Same as CreateUri. */ + if(dwAllowEncodingPropertyMask && !This->uri) { + *ppIUri = NULL; + return E_NOTIMPL; + } + + if(!This->uri) { + *ppIUri = NULL; + return INET_E_INVALID_URL; + } + FIXME("(%p)->(0x%08x 0x%08x %d %d %p)\n", This, dwCreateFlags, dwUriBuilderFlags, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL;

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_CreateUriSimple.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 2776e2b9aff8e6afd358f8559ad46ad6109e41c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2776e2b9aff8e6afd358f8559… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Wed Aug 18 17:27:06 2010 -0400 urlmon/tests: Added tests for IUriBuilder_CreateUriSimple. --- dlls/urlmon/tests/uri.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 16 +++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 2d3c316..0d4d237 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -5135,6 +5135,38 @@ static void test_IUriBuilder_CreateUri(IUriBuilder *builder, const uri_builder_t if(uri) IUri_Release(uri); } +static void test_IUriBuilder_CreateUriSimple(IUriBuilder *builder, const uri_builder_test *test, + DWORD test_index) { + HRESULT hr; + IUri *uri = NULL; + + hr = IUriBuilder_CreateUriSimple(builder, test->uri_simple_encode_flags, 0, &uri); + if(test->uri_todo) { + todo_wine { + ok(hr == test->uri_simple_hres, + "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, test->uri_simple_hres, test_index); + } + } else { + ok(hr == test->uri_simple_hres, + "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, test->uri_simple_hres, test_index); + } + + if(SUCCEEDED(hr)) { + BSTR received = NULL; + + hr = IUri_GetAbsoluteUri(uri, &received); + ok(hr == S_OK, "Error: IUri_GetAbsoluteUri returned 0x%08x, expected 0x%08x on uri_builder_tests[%d].\n", + hr, S_OK, test_index); + ok(!strcmp_aw(test->uri_simple_expected, received), + "Error: Expected the URI to be %s but was %s instead on uri_builder_tests[%d].\n", + test->uri_simple_expected, wine_dbgstr_w(received), test_index); + SysFreeString(received); + } + if(uri) IUri_Release(uri); +} + static void test_IUriBuilder_CreateInvalidArgs(void) { IUriBuilder *builder; HRESULT hr; @@ -5157,6 +5189,22 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, E_NOTIMPL); ok(uri == NULL, "Error: expected uri to be NULL, but was %p instead.\n", uri); + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriSimple(builder, 0, 0, &uri); + ok(hr == INET_E_INVALID_URL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", + hr, INET_E_INVALID_URL); + ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); + + hr = IUriBuilder_CreateUriSimple(builder, 0, 0, NULL); + ok(hr == E_POINTER, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", + hr, E_POINTER); + + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriSimple(builder, Uri_HAS_USER_NAME, 0, &uri); + ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", + hr, E_NOTIMPL); + ok(!uri, "Error: Expected uri to NULL, but was %p instead.\n", uri); + hr = pCreateUri(http_urlW, 0, 0, &test); ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); if(SUCCEEDED(hr)) { @@ -5172,6 +5220,15 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { todo_wine { ok(uri != NULL, "Error: The uri was NULL.\n"); } if(uri) IUri_Release(uri); + uri = NULL; + hr = IUriBuilder_CreateUriSimple(builder, Uri_HAS_USER_NAME, 0, &uri); + todo_wine { + ok(hr == S_OK, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + } + todo_wine { ok(uri != NULL, "Error: uri was NULL.\n"); } + if(uri) IUri_Release(uri); + hr = IUriBuilder_SetFragment(builder, NULL); todo_wine { ok(hr == S_OK, "Error: IUriBuilder_SetFragment returned 0x%08x, expected 0x%08x.\n", hr, S_OK); } @@ -5180,6 +5237,12 @@ static void test_IUriBuilder_CreateInvalidArgs(void) { hr = IUriBuilder_CreateUri(builder, 0, Uri_HAS_USER_NAME, 0, &uri); ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); ok(!uri, "Error: Expected uri to be NULL but was %p instead.\n", uri); + + uri = (void*) 0xdeadbeef; + hr = IUriBuilder_CreateUriSimple(builder, Uri_HAS_USER_NAME, 0, &uri); + ok(hr == E_NOTIMPL, "Error: IUriBuilder_CreateUriSimple returned 0x%08x, expected 0x%08x.\n", + hr, S_OK); + ok(!uri, "Error: Expected uri to be NULL, but was %p instead.\n", uri); } if(test) IUri_Release(test); } @@ -5240,6 +5303,7 @@ static void test_IUriBuilder(void) { } test_IUriBuilder_CreateUri(builder, &test, i); + test_IUriBuilder_CreateUriSimple(builder, &test, i); } if(builder) IUriBuilder_Release(builder); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 11d9497..a578b88 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -4096,6 +4096,22 @@ static HRESULT WINAPI UriBuilder_CreateUriSimple(IUriBuilder *iface, IUri **ppIUri) { UriBuilder *This = URIBUILDER_THIS(iface); + TRACE("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); + + if(!ppIUri) + return E_POINTER; + + /* Acts the same way as CreateUri. */ + if(dwAllowEncodingPropertyMask && !This->uri) { + *ppIUri = NULL; + return E_NOTIMPL; + } + + if(!This->uri) { + *ppIUri = NULL; + return INET_E_INVALID_URL; + } + FIXME("(%p)->(%d %d %p)\n", This, dwAllowEncodingPropertyMask, (DWORD)dwReserved, ppIUri); return E_NOTIMPL; }

1 0

Thomas Mullaly : urlmon/tests: Added tests for IUriBuilder_CreateUri.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 4eff8ce517a11d2bdb8215f48f52f0023ae3f593 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eff8ce517a11d2bdb8215f48… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Thu Aug 12 20:27:56 2010 -0400 urlmon/tests: Added tests for IUriBuilder_CreateUri. --- dlls/urlmon/tests/uri.c | 343 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 21 +++ 2 files changed, 364 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4eff8ce517a11d2bdb821…

1 0

Thomas Mullaly : urlmon/tests: Added a few tests for CreateIUriBuilder.
by Alexandre Julliard 19 Aug '10

19 Aug '10

Module: wine Branch: master Commit: 516aac903aff360406e96c4a006b733a0cef7883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516aac903aff360406e96c4a0… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Aug 10 22:37:33 2010 -0400 urlmon/tests: Added a few tests for CreateIUriBuilder. --- dlls/urlmon/tests/uri.c | 50 +++++++++++++++++++++++++++++++++++++--------- dlls/urlmon/uri.c | 13 +++++++++++- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index 88f89db..78ddf72 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -18,16 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* - * IUri testing framework goals: - * - Test invalid args - * - invalid flags - * - invalid args (IUri, uri string) - * - Test parsing for components when no canonicalization occurs - * - Test parsing for components when canonicalization occurs. - * - More tests... - */ - #include <wine/test.h> #include <stdarg.h> #include <stddef.h> @@ -44,6 +34,7 @@ static HRESULT (WINAPI *pCreateUri)(LPCWSTR, DWORD, DWORD_PTR, IUri**); static HRESULT (WINAPI *pCreateUriWithFragment)(LPCWSTR, LPCWSTR, DWORD, DWORD_PTR, IUri**); +static HRESULT (WINAPI *pCreateIUriBuilder)(IUri*, DWORD, DWORD_PTR, IUriBuilder**); static const WCHAR http_urlW[] = { 'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', '.','o','r','g','/',0}; @@ -3756,6 +3747,11 @@ static inline DWORD strcmp_aw(LPCSTR strA, LPCWSTR strB) { return ret; } +static inline ULONG get_refcnt(IUri *uri) { + IUri_AddRef(uri); + return IUri_Release(uri); +} + /* * Simple tests to make sure the CreateUri function handles invalid flag combinations * correctly. @@ -4884,12 +4880,43 @@ static void test_CreateUriWithFragment(void) { } } +static void test_CreateIUriBuilder(void) { + HRESULT hr; + IUriBuilder *builder = NULL; + IUri *uri; + + hr = pCreateIUriBuilder(NULL, 0, 0, NULL); + ok(hr == E_POINTER, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x\n", + hr, E_POINTER); + + /* CreateIUriBuilder increases the ref count of the IUri it receives. */ + hr = pCreateUri(http_urlW, 0, 0, &uri); + ok(hr == S_OK, "Error: CreateUri returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + if(SUCCEEDED(hr)) { + ULONG cur_count, orig_count; + + orig_count = get_refcnt(uri); + hr = pCreateIUriBuilder(uri, 0, 0, &builder); + ok(hr == S_OK, "Error: CreateIUriBuilder returned 0x%08x, expected 0x%08x.\n", hr, S_OK); + ok(builder != NULL, "Error: Expecting builder not to be NULL\n"); + + cur_count = get_refcnt(uri); + ok(cur_count == orig_count+1, "Error: Expected the ref count to be %u, but was %u instead.\n", orig_count+1, cur_count); + + if(builder) IUriBuilder_Release(builder); + cur_count = get_refcnt(uri); + ok(cur_count == orig_count, "Error: Expected the ref count to be %u, but was %u instead.\n", orig_count, cur_count); + } + if(uri) IUri_Release(uri); +} + START_TEST(uri) { HMODULE hurlmon; hurlmon = GetModuleHandle("urlmon.dll"); pCreateUri = (void*) GetProcAddress(hurlmon, "CreateUri"); pCreateUriWithFragment = (void*) GetProcAddress(hurlmon, "CreateUriWithFragment"); + pCreateIUriBuilder = (void*) GetProcAddress(hurlmon, "CreateIUriBuilder"); if(!pCreateUri) { win_skip("CreateUri is not present, skipping tests.\n"); @@ -4937,4 +4964,7 @@ START_TEST(uri) { trace("test CreateUriWithFragment...\n"); test_CreateUriWithFragment(); + + trace("test CreateIUriBuilder...\n"); + test_CreateIUriBuilder(); } diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index e977426..31de387 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -75,6 +75,8 @@ typedef struct { typedef struct { const IUriBuilderVtbl *lpIUriBuilderVtbl; LONG ref; + + IUri *uri; } UriBuilder; typedef struct { @@ -4080,8 +4082,10 @@ static ULONG WINAPI UriBuilder_Release(IUriBuilder *iface) TRACE("(%p) ref=%d\n", This, ref); - if(!ref) + if(!ref) { + if(This->uri) IUri_Release(This->uri); heap_free(This); + } return ref; } @@ -4300,6 +4304,9 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve TRACE("(%p %x %x %p)\n", pIUri, dwFlags, (DWORD)dwReserved, ppIUriBuilder); + if(!ppIUriBuilder) + return E_POINTER; + ret = heap_alloc(sizeof(UriBuilder)); if(!ret) return E_OUTOFMEMORY; @@ -4307,6 +4314,10 @@ HRESULT WINAPI CreateIUriBuilder(IUri *pIUri, DWORD dwFlags, DWORD_PTR dwReserve ret->lpIUriBuilderVtbl = &UriBuilderVtbl; ret->ref = 1; + ret->uri = pIUri; + if(pIUri) + IUri_AddRef(pIUri); + *ppIUriBuilder = URIBUILDER(ret); return S_OK; }

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
89
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2010