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
51fd7507
Commit
51fd7507
authored
Jan 20, 2006
by
Huw Davies
Committed by
Alexandre Julliard
Jan 20, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell: Fix incorrect usage of the return value of StrRetToStrNW.
parent
8b088357
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
9 deletions
+7
-9
brsfolder.c
dlls/shell32/brsfolder.c
+1
-6
pidl.c
dlls/shell32/pidl.c
+4
-2
shlfolder.c
dlls/shell32/shlfolder.c
+2
-1
No files found.
dlls/shell32/brsfolder.c
View file @
51fd7507
...
@@ -227,12 +227,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR
...
@@ -227,12 +227,7 @@ static BOOL GetName(LPSHELLFOLDER lpsf, LPCITEMIDLIST lpi, DWORD dwFlags, LPWSTR
TRACE
(
"%p %p %lx %p
\n
"
,
lpsf
,
lpi
,
dwFlags
,
lpFriendlyName
);
TRACE
(
"%p %p %lx %p
\n
"
,
lpsf
,
lpi
,
dwFlags
,
lpFriendlyName
);
if
(
SUCCEEDED
(
IShellFolder_GetDisplayNameOf
(
lpsf
,
lpi
,
dwFlags
,
&
str
)))
if
(
SUCCEEDED
(
IShellFolder_GetDisplayNameOf
(
lpsf
,
lpi
,
dwFlags
,
&
str
)))
{
bSuccess
=
StrRetToStrNW
(
lpFriendlyName
,
MAX_PATH
,
&
str
,
lpi
);
if
(
FAILED
(
StrRetToStrNW
(
lpFriendlyName
,
MAX_PATH
,
&
str
,
lpi
)))
{
bSuccess
=
FALSE
;
}
}
else
else
bSuccess
=
FALSE
;
bSuccess
=
FALSE
;
...
...
dlls/shell32/pidl.c
View file @
51fd7507
...
@@ -133,7 +133,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
...
@@ -133,7 +133,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
ret
=
IShellFolder_GetDisplayNameOf
(
lsf
,
pidl
,
flag
,
&
strret
);
ret
=
IShellFolder_GetDisplayNameOf
(
lsf
,
pidl
,
flag
,
&
strret
);
if
(
SUCCEEDED
(
ret
))
if
(
SUCCEEDED
(
ret
))
{
{
ret
=
StrRetToStrNW
(
path
,
MAX_PATH
,
&
strret
,
pidl
);
if
(
!
StrRetToStrNW
(
path
,
MAX_PATH
,
&
strret
,
pidl
))
ret
=
E_FAIL
;
}
}
}
}
else
else
...
@@ -144,7 +145,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
...
@@ -144,7 +145,8 @@ BOOL WINAPI ILGetDisplayNameExW(LPSHELLFOLDER psf, LPCITEMIDLIST pidl, LPWSTR pa
ret
=
IShellFolder_GetDisplayNameOf
(
psfParent
,
pidllast
,
flag
,
&
strret
);
ret
=
IShellFolder_GetDisplayNameOf
(
psfParent
,
pidllast
,
flag
,
&
strret
);
if
(
SUCCEEDED
(
ret
))
if
(
SUCCEEDED
(
ret
))
{
{
ret
=
StrRetToStrNW
(
path
,
MAX_PATH
,
&
strret
,
pidllast
);
if
(
!
StrRetToStrNW
(
path
,
MAX_PATH
,
&
strret
,
pidllast
))
ret
=
E_FAIL
;
}
}
IShellFolder_Release
(
psfParent
);
IShellFolder_Release
(
psfParent
);
}
}
...
...
dlls/shell32/shlfolder.c
View file @
51fd7507
...
@@ -350,7 +350,8 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
...
@@ -350,7 +350,8 @@ HRESULT SHELL32_GetDisplayNameOfChild (IShellFolder2 * psf,
hr
=
IShellFolder_GetDisplayNameOf
(
psfChild
,
pidlNext
,
dwFlags
,
&
strTemp
);
hr
=
IShellFolder_GetDisplayNameOf
(
psfChild
,
pidlNext
,
dwFlags
,
&
strTemp
);
if
(
SUCCEEDED
(
hr
))
{
if
(
SUCCEEDED
(
hr
))
{
hr
=
StrRetToStrNW
(
szOut
,
dwOutLen
,
&
strTemp
,
pidlNext
);
if
(
!
StrRetToStrNW
(
szOut
,
dwOutLen
,
&
strTemp
,
pidlNext
))
hr
=
E_FAIL
;
}
}
IShellFolder_Release
(
psfChild
);
IShellFolder_Release
(
psfChild
);
}
}
...
...
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