Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8a13cc64
Commit
8a13cc64
authored
Jan 09, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32/tests: Use SHParseDisplayName() directly.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
44bc06ba
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 deletions
+4
-5
ebrowser.c
dlls/shell32/tests/ebrowser.c
+4
-5
No files found.
dlls/shell32/tests/ebrowser.c
View file @
8a13cc64
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment