Module: wine Branch: master Commit: 8a13cc643768343edd550737c80e3e0567356d91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a13cc643768343edd550737c...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Jan 9 09:21:47 2020 +0300
shell32/tests: Use SHParseDisplayName() directly.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/shell32/tests/ebrowser.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index 65a9571980..7aefd14b37 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -35,7 +35,6 @@ static HWND hwnd;
static HRESULT (WINAPI *pSHCreateShellItem)(LPCITEMIDLIST,IShellFolder*,LPCITEMIDLIST,IShellItem**); -static HRESULT (WINAPI *pSHParseDisplayName)(LPCWSTR,IBindCtx*,LPITEMIDLIST*,SFGAOF,SFGAOF*);
static void init_function_pointers(void) { @@ -43,7 +42,6 @@ static void init_function_pointers(void)
hmod = GetModuleHandleA("shell32.dll"); pSHCreateShellItem = (void*)GetProcAddress(hmod, "SHCreateShellItem"); - pSHParseDisplayName = (void*)GetProcAddress(hmod, "SHParseDisplayName"); }
/********************************************************************* @@ -1295,7 +1293,6 @@ static void test_navigation(void) static const WCHAR testfolderW[] = {'w','i','n','e','t','e','s','t','f','o','l','d','e','r','\0'};
- ok(pSHParseDisplayName != NULL, "pSHParseDisplayName unexpectedly missing.\n"); ok(pSHCreateShellItem != NULL, "pSHCreateShellItem unexpectedly missing.\n");
GetCurrentDirectoryW(MAX_PATH, current_path); @@ -1311,8 +1308,10 @@ static void test_navigation(void)
CreateDirectoryW(child_path, NULL);
- pSHParseDisplayName(current_path, NULL, &pidl_current, 0, NULL); - pSHParseDisplayName(child_path, NULL, &pidl_child, 0, NULL); + hr = SHParseDisplayName(current_path, NULL, &pidl_current, 0, NULL); + ok(hr == S_OK, "Failed to parse a path, hr %#x.\n", hr); + hr = SHParseDisplayName(child_path, NULL, &pidl_child, 0, NULL); + ok(hr == S_OK, "Failed to parse a path, hr %#x.\n", hr);
ebrowser_instantiate(&peb); ebrowser_initialize(peb);