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
2f257556
Commit
2f257556
authored
Jan 19, 2008
by
Andrew Talbot
Committed by
Alexandre Julliard
Jan 21, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Remove unneeded casts.
parent
52db721a
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
17 deletions
+17
-17
recyclebin.c
dlls/shell32/recyclebin.c
+6
-6
shell.c
dlls/shell32/shell.c
+1
-1
shell32_main.c
dlls/shell32/shell32_main.c
+3
-3
shelllink.c
dlls/shell32/shelllink.c
+2
-2
shfldr_fs.c
dlls/shell32/shfldr_fs.c
+1
-1
shfldr_mycomp.c
dlls/shell32/shfldr_mycomp.c
+1
-1
shfldr_unixfs.c
dlls/shell32/shfldr_unixfs.c
+3
-3
No files found.
dlls/shell32/recyclebin.c
View file @
2f257556
...
...
@@ -206,9 +206,9 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH
HRESULT
ret
;
int
pidls_count
;
int
i
=
0
;
TRACE
(
"(%p, %p, %x, %p)
\n
"
,
This
,
hwnd
,
(
unsigned
int
)
grfFlags
,
ppenumIDList
);
TRACE
(
"(%p, %p, %x, %p)
\n
"
,
This
,
hwnd
,
grfFlags
,
ppenumIDList
);
if
(
grfFlags
&
SHCONTF_NONFOLDERS
)
{
*
ppenumIDList
=
NULL
;
...
...
@@ -293,7 +293,7 @@ static HRESULT WINAPI RecycleBin_CreateViewObject(IShellFolder2 *iface, HWND hwn
static
HRESULT
WINAPI
RecycleBin_GetAttributesOf
(
IShellFolder2
*
This
,
UINT
cidl
,
LPCITEMIDLIST
*
apidl
,
SFGAOF
*
rgfInOut
)
{
TRACE
(
"(%p, %d, {%p, ...}, {%x})
\n
"
,
This
,
cidl
,
apidl
[
0
],
(
unsigned
int
)
*
rgfInOut
);
TRACE
(
"(%p, %d, {%p, ...}, {%x})
\n
"
,
This
,
cidl
,
apidl
[
0
],
*
rgfInOut
);
*
rgfInOut
&=
SFGAO_CANMOVE
|
SFGAO_CANDELETE
|
SFGAO_HASPROPSHEET
|
SFGAO_FILESYSTEM
;
return
S_OK
;
}
...
...
@@ -310,7 +310,7 @@ static HRESULT WINAPI RecycleBin_GetDisplayNameOf(IShellFolder2 *This, LPCITEMID
{
WIN32_FIND_DATAW
data
;
TRACE
(
"(%p, %p, %x, %p)
\n
"
,
This
,
pidl
,
(
unsigned
int
)
uFlags
,
pName
);
TRACE
(
"(%p, %p, %x, %p)
\n
"
,
This
,
pidl
,
uFlags
,
pName
);
TRASH_UnpackItemID
(
&
pidl
->
mkid
,
NULL
,
&
data
);
pName
->
uType
=
STRRET_WSTR
;
pName
->
u
.
pOleStr
=
StrDupW
(
PathFindFileNameW
(
data
.
cFileName
));
...
...
@@ -371,7 +371,7 @@ static HRESULT WINAPI RecycleBin_EnumSearches(IShellFolder2 *iface, IEnumExtraSe
static
HRESULT
WINAPI
RecycleBin_GetDefaultColumn
(
IShellFolder2
*
iface
,
DWORD
dwReserved
,
ULONG
*
pSort
,
ULONG
*
pDisplay
)
{
RecycleBin
*
This
=
(
RecycleBin
*
)
iface
;
TRACE
(
"(%p, %x, %p, %p)
\n
"
,
This
,
(
unsigned
int
)
dwReserved
,
pSort
,
pDisplay
);
TRACE
(
"(%p, %x, %p, %p)
\n
"
,
This
,
dwReserved
,
pSort
,
pDisplay
);
*
pSort
=
0
;
*
pDisplay
=
0
;
return
S_OK
;
...
...
dlls/shell32/shell.c
View file @
2f257556
...
...
@@ -133,7 +133,7 @@ end:
void
WINAPI
DragFinish16
(
HDROP16
h
)
{
TRACE
(
"
\n
"
);
GlobalFree16
(
(
HGLOBAL16
)
h
);
GlobalFree16
(
h
);
}
...
...
dlls/shell32/shell32_main.c
View file @
2f257556
...
...
@@ -526,7 +526,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
static
const
WCHAR
p1W
[]
=
{
'%'
,
'1'
,
0
};
WCHAR
sTemp
[
MAX_PATH
];
szExt
=
(
LPWSTR
)
PathFindExtensionW
(
szFullPath
);
szExt
=
PathFindExtensionW
(
szFullPath
);
TRACE
(
"szExt=%s
\n
"
,
debugstr_w
(
szExt
));
if
(
szExt
&&
HCR_MapTypeToValueW
(
szExt
,
sTemp
,
MAX_PATH
,
TRUE
)
&&
...
...
@@ -584,7 +584,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes,
static
const
WCHAR
p1W
[]
=
{
'%'
,
'1'
,
0
};
psfi
->
iIcon
=
0
;
szExt
=
(
LPWSTR
)
PathFindExtensionW
(
sTemp
);
szExt
=
PathFindExtensionW
(
sTemp
);
if
(
szExt
&&
HCR_MapTypeToValueW
(
szExt
,
sTemp
,
MAX_PATH
,
TRUE
)
&&
HCR_GetDefaultIconW
(
sTemp
,
sTemp
,
MAX_PATH
,
&
icon_idx
))
...
...
@@ -1090,7 +1090,7 @@ BOOL WINAPI ShellAboutW( HWND hWnd, LPCWSTR szApp, LPCWSTR szOtherStuff,
if
(
!
(
hRes
=
FindResourceW
(
shell32_hInstance
,
wszSHELL_ABOUT_MSGBOX
,
(
LPWSTR
)
RT_DIALOG
)))
return
FALSE
;
if
(
!
(
template
=
(
LPVOID
)
LoadResource
(
shell32_hInstance
,
hRes
)))
if
(
!
(
template
=
LoadResource
(
shell32_hInstance
,
hRes
)))
return
FALSE
;
info
.
szApp
=
szApp
;
info
.
szOtherStuff
=
szOtherStuff
;
...
...
dlls/shell32/shelllink.c
View file @
2f257556
...
...
@@ -1539,7 +1539,7 @@ static HRESULT SHELL_PidlGeticonLocationA(IShellFolder* psf, LPCITEMIDLIST pidl,
if
(
SUCCEEDED
(
hr
))
{
IExtractIconA
*
pei
;
hr
=
IShellFolder_GetUIObjectOf
(
psf
,
0
,
1
,
(
LPCITEMIDLIST
*
)
&
pidlLast
,
&
IID_IExtractIconA
,
NULL
,
(
LPVOID
*
)
&
pei
);
hr
=
IShellFolder_GetUIObjectOf
(
psf
,
0
,
1
,
&
pidlLast
,
&
IID_IExtractIconA
,
NULL
,
(
LPVOID
*
)
&
pei
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
IExtractIconA_GetIconLocation
(
pei
,
0
,
pszIconPath
,
MAX_PATH
,
piIcon
,
NULL
);
...
...
@@ -1918,7 +1918,7 @@ static HRESULT SHELL_PidlGeticonLocationW(IShellFolder* psf, LPCITEMIDLIST pidl,
if
(
SUCCEEDED
(
hr
))
{
IExtractIconW
*
pei
;
hr
=
IShellFolder_GetUIObjectOf
(
psf
,
0
,
1
,
(
LPCITEMIDLIST
*
)
&
pidlLast
,
&
IID_IExtractIconW
,
NULL
,
(
LPVOID
*
)
&
pei
);
hr
=
IShellFolder_GetUIObjectOf
(
psf
,
0
,
1
,
&
pidlLast
,
&
IID_IExtractIconW
,
NULL
,
(
LPVOID
*
)
&
pei
);
if
(
SUCCEEDED
(
hr
))
{
hr
=
IExtractIconW_GetIconLocation
(
pei
,
0
,
pszIconPath
,
MAX_PATH
,
piIcon
,
NULL
);
...
...
dlls/shell32/shfldr_fs.c
View file @
2f257556
...
...
@@ -588,7 +588,7 @@ IShellFolder_fnGetAttributesOf (IShellFolder2 * iface, UINT cidl,
IShellFolder
*
psfParent
=
NULL
;
LPCITEMIDLIST
rpidl
=
NULL
;
hr
=
SHBindToParent
(
This
->
pidlRoot
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfParent
,
(
LPCITEMIDLIST
*
)
&
rpidl
);
hr
=
SHBindToParent
(
This
->
pidlRoot
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfParent
,
&
rpidl
);
if
(
SUCCEEDED
(
hr
))
{
SHELL32_GetItemAttributes
(
psfParent
,
rpidl
,
rgfInOut
);
IShellFolder_Release
(
psfParent
);
...
...
dlls/shell32/shfldr_mycomp.c
View file @
2f257556
...
...
@@ -447,7 +447,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetAttributesOf (IShellFolder2 * iface,
IShellFolder
*
psfParent
=
NULL
;
LPCITEMIDLIST
rpidl
=
NULL
;
hr
=
SHBindToParent
(
This
->
pidlRoot
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfParent
,
(
LPCITEMIDLIST
*
)
&
rpidl
);
hr
=
SHBindToParent
(
This
->
pidlRoot
,
&
IID_IShellFolder
,
(
LPVOID
*
)
&
psfParent
,
&
rpidl
);
if
(
SUCCEEDED
(
hr
))
{
SHELL32_GetItemAttributes
(
psfParent
,
rpidl
,
rgfInOut
);
IShellFolder_Release
(
psfParent
);
...
...
dlls/shell32/shfldr_unixfs.c
View file @
2f257556
...
...
@@ -947,11 +947,11 @@ static HRESULT WINAPI UnixFolder_IShellFolder2_BindToObject(IShellFolder2* iface
}
else
{
clsidChild
=
This
->
m_pCLSID
;
}
hr
=
CreateUnixFolder
(
NULL
,
&
IID_IPersistFolder3
,
(
void
**
)
&
persistFolder
,
clsidChild
);
if
(
!
SUCCEEDED
(
hr
))
return
hr
;
hr
=
IPersistFolder_QueryInterface
(
persistFolder
,
riid
,
(
void
**
)
ppvOut
);
hr
=
IPersistFolder_QueryInterface
(
persistFolder
,
riid
,
ppvOut
);
if
(
SUCCEEDED
(
hr
))
{
UnixFolder
*
subfolder
=
ADJUST_THIS
(
UnixFolder
,
IPersistFolder3
,
persistFolder
);
subfolder
->
m_pidlLocation
=
ILCombine
(
This
->
m_pidlLocation
,
pidl
);
...
...
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