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
815b532b
Commit
815b532b
authored
Jul 30, 2014
by
David Hedberg
Committed by
Alexandre Julliard
Aug 04, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Always initialize shellitem to NULL in SHCreateShellItem.
parent
9ff68534
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
shellitem.c
dlls/shell32/shellitem.c
+2
-1
shlfolder.c
dlls/shell32/tests/shlfolder.c
+2
-0
No files found.
dlls/shell32/shellitem.c
View file @
815b532b
...
...
@@ -555,6 +555,8 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
TRACE
(
"(%p,%p,%p,%p)
\n
"
,
pidlParent
,
psfParent
,
pidl
,
ppsi
);
*
ppsi
=
NULL
;
if
(
!
pidl
)
{
return
E_INVALIDARG
;
...
...
@@ -604,7 +606,6 @@ HRESULT WINAPI SHCreateShellItem(LPCITEMIDLIST pidlParent,
}
else
{
*
ppsi
=
NULL
;
ILFree
(
new_pidl
);
}
return
ret
;
...
...
dlls/shell32/tests/shlfolder.c
View file @
815b532b
...
...
@@ -2236,8 +2236,10 @@ static void test_SHCreateShellItem(void)
pidl_abstestfile
=
pILCombine
(
pidl_cwd
,
pidl_testfile
);
shellitem
=
(
void
*
)
0xdeadbeef
;
ret
=
pSHCreateShellItem
(
NULL
,
NULL
,
NULL
,
&
shellitem
);
ok
(
ret
==
E_INVALIDARG
,
"SHCreateShellItem returned %x
\n
"
,
ret
);
ok
(
shellitem
==
0
,
"Got %p
\n
"
,
shellitem
);
if
(
0
)
/* crashes on Windows XP */
{
...
...
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