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
b9349d13
Commit
b9349d13
authored
Jan 08, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Jan 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32/tests: Use ILIsEqual() directly.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
657aecc2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
shelllink.c
dlls/shell32/tests/shelllink.c
+3
-5
No files found.
dlls/shell32/tests/shelllink.c
View file @
b9349d13
...
...
@@ -38,7 +38,6 @@
# define SLDF_HAS_LOGO3ID 0x00000800
/* not available in the Vista SDK */
#endif
static
BOOL
(
WINAPI
*
pILIsEqual
)(
LPCITEMIDLIST
,
LPCITEMIDLIST
);
static
HRESULT
(
WINAPI
*
pSHILCreateFromPath
)(
LPCWSTR
,
LPITEMIDLIST
*
,
DWORD
*
);
static
HRESULT
(
WINAPI
*
pSHGetFolderLocation
)(
HWND
,
INT
,
HANDLE
,
DWORD
,
PIDLIST_ABSOLUTE
*
);
static
HRESULT
(
WINAPI
*
pSHDefExtractIconA
)(
LPCSTR
,
int
,
UINT
,
HICON
*
,
HICON
*
,
UINT
);
...
...
@@ -234,12 +233,12 @@ static void test_get_set(void)
tmp_pidl
=
NULL
;
r
=
IShellLinkA_GetIDList
(
sl
,
&
tmp_pidl
);
ok
(
r
==
S_OK
,
"GetIDList failed (0x%08x)
\n
"
,
r
);
ok
(
tmp_pidl
&&
p
ILIsEqual
(
pidl
,
tmp_pidl
),
ok
(
tmp_pidl
&&
ILIsEqual
(
pidl
,
tmp_pidl
),
"GetIDList returned an incorrect pidl
\n
"
);
r
=
IShellLinkA_GetIDList
(
sl
,
&
second_pidl
);
ok
(
r
==
S_OK
,
"GetIDList failed (0x%08x)
\n
"
,
r
);
ok
(
second_pidl
&&
p
ILIsEqual
(
pidl
,
second_pidl
),
ok
(
second_pidl
&&
ILIsEqual
(
pidl
,
second_pidl
),
"GetIDList returned an incorrect pidl
\n
"
);
ok
(
second_pidl
!=
tmp_pidl
,
"pidls are the same
\n
"
);
...
...
@@ -583,7 +582,7 @@ static void check_lnk_(int line, const WCHAR* path, lnk_desc_t* desc, int todo)
r
=
IShellLinkA_GetIDList
(
sl
,
&
pidl
);
lok
(
r
==
S_OK
,
"GetIDList failed (0x%08x)
\n
"
,
r
);
todo_wine_if
((
todo
&
0x8
)
!=
0
)
lok
(
p
ILIsEqual
(
pidl
,
desc
->
pidl
),
"GetIDList returned an incorrect pidl
\n
"
);
lok
(
ILIsEqual
(
pidl
,
desc
->
pidl
),
"GetIDList returned an incorrect pidl
\n
"
);
}
if
(
desc
->
showcmd
)
{
...
...
@@ -1453,7 +1452,6 @@ START_TEST(shelllink)
HMODULE
hmod
=
GetModuleHandleA
(
"shell32.dll"
);
HMODULE
huser32
=
GetModuleHandleA
(
"user32.dll"
);
pILIsEqual
=
(
void
*
)
GetProcAddress
(
hmod
,
(
LPSTR
)
21
);
pSHILCreateFromPath
=
(
void
*
)
GetProcAddress
(
hmod
,
(
LPSTR
)
28
);
pSHGetFolderLocation
=
(
void
*
)
GetProcAddress
(
hmod
,
"SHGetFolderLocation"
);
pSHDefExtractIconA
=
(
void
*
)
GetProcAddress
(
hmod
,
"SHDefExtractIconA"
);
...
...
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