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
537bfbf4
Commit
537bfbf4
authored
Jul 16, 2010
by
Vincent Povirk
Committed by
Alexandre Julliard
Jul 19, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Don't access szFullPath when SHGFI_PIDL is set in SHGetFileInfo.
parent
1ebdd6b9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
shell32_main.c
dlls/shell32/shell32_main.c
+3
-3
No files found.
dlls/shell32/shell32_main.c
View file @
537bfbf4
...
@@ -436,7 +436,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
...
@@ -436,7 +436,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
/* get the displayname */
/* get the displayname */
if
(
SUCCEEDED
(
hr
)
&&
(
flags
&
SHGFI_DISPLAYNAME
))
if
(
SUCCEEDED
(
hr
)
&&
(
flags
&
SHGFI_DISPLAYNAME
))
{
{
if
(
flags
&
SHGFI_USEFILEATTRIBUTES
)
if
(
flags
&
SHGFI_USEFILEATTRIBUTES
&&
!
(
flags
&
SHGFI_PIDL
)
)
{
{
lstrcpyW
(
psfi
->
szDisplayName
,
PathFindFileNameW
(
szFullPath
));
lstrcpyW
(
psfi
->
szDisplayName
,
PathFindFileNameW
(
szFullPath
));
}
}
...
@@ -455,7 +455,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
...
@@ -455,7 +455,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
static
const
WCHAR
szFile
[]
=
{
'F'
,
'i'
,
'l'
,
'e'
,
0
};
static
const
WCHAR
szFile
[]
=
{
'F'
,
'i'
,
'l'
,
'e'
,
0
};
static
const
WCHAR
szDashFile
[]
=
{
'-'
,
'f'
,
'i'
,
'l'
,
'e'
,
0
};
static
const
WCHAR
szDashFile
[]
=
{
'-'
,
'f'
,
'i'
,
'l'
,
'e'
,
0
};
if
(
!
(
flags
&
SHGFI_USEFILEATTRIBUTES
))
if
(
!
(
flags
&
SHGFI_USEFILEATTRIBUTES
)
||
(
flags
&
SHGFI_PIDL
)
)
{
{
char
ftype
[
80
];
char
ftype
[
80
];
...
@@ -508,7 +508,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
...
@@ -508,7 +508,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
{
{
UINT
uDummy
,
uFlags
;
UINT
uDummy
,
uFlags
;
if
(
flags
&
SHGFI_USEFILEATTRIBUTES
)
if
(
flags
&
SHGFI_USEFILEATTRIBUTES
&&
!
(
flags
&
SHGFI_PIDL
)
)
{
{
if
(
dwFileAttributes
&
FILE_ATTRIBUTE_DIRECTORY
)
if
(
dwFileAttributes
&
FILE_ATTRIBUTE_DIRECTORY
)
{
{
...
...
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