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
0c35d5cc
Commit
0c35d5cc
authored
Mar 05, 2024
by
Zebediah Figura
Committed by
Alexandre Julliard
Mar 07, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Remove the no longer used ISFHelper::CopyItems() helper.
parent
a277ab8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
65 deletions
+0
-65
recyclebin.c
dlls/shell32/recyclebin.c
+0
-8
shellfolder.h
dlls/shell32/shellfolder.h
+0
-2
shfldr_fs.c
dlls/shell32/shfldr_fs.c
+0
-55
No files found.
dlls/shell32/recyclebin.c
View file @
0c35d5cc
...
...
@@ -1200,13 +1200,6 @@ static HRESULT WINAPI RecycleBin_DeleteItems(ISFHelper * iface, UINT cidl,
return
erase_items
(
GetActiveWindow
(),
apidl
,
cidl
,
TRUE
);
}
static
HRESULT
WINAPI
RecycleBin_CopyItems
(
ISFHelper
*
iface
,
IShellFolder
*
pSFFrom
,
UINT
cidl
,
LPCITEMIDLIST
*
apidl
)
{
return
E_NOTIMPL
;
}
static
const
ISFHelperVtbl
sfhelperVtbl
=
{
RecycleBin_ISFHelper_QueryInterface
,
...
...
@@ -1215,7 +1208,6 @@ static const ISFHelperVtbl sfhelperVtbl =
RecycleBin_GetUniqueName
,
RecycleBin_AddFolder
,
RecycleBin_DeleteItems
,
RecycleBin_CopyItems
};
HRESULT
WINAPI
SHQueryRecycleBinA
(
LPCSTR
pszRootPath
,
LPSHQUERYRBINFO
pSHQueryRBInfo
)
...
...
dlls/shell32/shellfolder.h
View file @
0c35d5cc
...
...
@@ -49,7 +49,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown)
STDMETHOD
(
GetUniqueName
)(
THIS_
LPWSTR
lpName
,
UINT
uLen
)
PURE
;
STDMETHOD
(
AddFolder
)(
THIS_
HWND
hwnd
,
LPCWSTR
lpName
,
LPITEMIDLIST
*
ppidlOut
)
PURE
;
STDMETHOD
(
DeleteItems
)(
THIS_
UINT
cidl
,
LPCITEMIDLIST
*
apidl
)
PURE
;
STDMETHOD
(
CopyItems
)(
THIS_
IShellFolder
*
pSFFrom
,
UINT
cidl
,
LPCITEMIDLIST
*
apidl
)
PURE
;
};
#undef INTERFACE
...
...
@@ -62,7 +61,6 @@ DECLARE_INTERFACE_(ISFHelper,IUnknown)
#define ISFHelper_GetUniqueName(p,a,b) (p)->lpVtbl->GetUniqueName(p,a,b)
#define ISFHelper_AddFolder(p,a,b,c) (p)->lpVtbl->AddFolder(p,a,b,c)
#define ISFHelper_DeleteItems(p,a,b) (p)->lpVtbl->DeleteItems(p,a,b)
#define ISFHelper_CopyItems(p,a,b,c) (p)->lpVtbl->CopyItems(p,a,b,c)
#endif
#endif
/* __WINE_SHELLFOLDER_HELP_H */
dlls/shell32/shfldr_fs.c
View file @
0c35d5cc
...
...
@@ -1314,60 +1314,6 @@ ISFHelper_fnDeleteItems (ISFHelper * iface, UINT cidl, LPCITEMIDLIST * apidl)
return
ret
;
}
/****************************************************************************
* ISFHelper_fnCopyItems
*
* copies items to this folder
*/
static
HRESULT
WINAPI
ISFHelper_fnCopyItems
(
ISFHelper
*
iface
,
IShellFolder
*
pSFFrom
,
UINT
cidl
,
LPCITEMIDLIST
*
apidl
)
{
HRESULT
ret
=
E_FAIL
;
IPersistFolder2
*
ppf2
=
NULL
;
WCHAR
wszSrcPathRoot
[
MAX_PATH
],
wszDstPath
[
MAX_PATH
+
1
];
WCHAR
*
wszSrcPathsList
;
IGenericSFImpl
*
This
=
impl_from_ISFHelper
(
iface
);
SHFILEOPSTRUCTW
fop
;
TRACE
(
"(%p)->(%p,%u,%p)
\n
"
,
This
,
pSFFrom
,
cidl
,
apidl
);
IShellFolder_QueryInterface
(
pSFFrom
,
&
IID_IPersistFolder2
,
(
LPVOID
*
)
&
ppf2
);
if
(
ppf2
)
{
LPITEMIDLIST
pidl
;
if
(
SUCCEEDED
(
IPersistFolder2_GetCurFolder
(
ppf2
,
&
pidl
)))
{
SHGetPathFromIDListW
(
pidl
,
wszSrcPathRoot
);
if
(
This
->
sPathTarget
)
lstrcpynW
(
wszDstPath
,
This
->
sPathTarget
,
MAX_PATH
);
else
wszDstPath
[
0
]
=
0
;
PathAddBackslashW
(
wszSrcPathRoot
);
PathAddBackslashW
(
wszDstPath
);
wszSrcPathsList
=
build_paths_list
(
wszSrcPathRoot
,
cidl
,
apidl
);
ZeroMemory
(
&
fop
,
sizeof
(
fop
));
fop
.
hwnd
=
GetActiveWindow
();
fop
.
wFunc
=
FO_COPY
;
fop
.
pFrom
=
wszSrcPathsList
;
fop
.
pTo
=
wszDstPath
;
fop
.
fFlags
=
FOF_ALLOWUNDO
;
ret
=
S_OK
;
if
(
SHFileOperationW
(
&
fop
))
{
WARN
(
"Copy failed
\n
"
);
ret
=
E_FAIL
;
}
free
(
wszSrcPathsList
);
}
SHFree
(
pidl
);
IPersistFolder2_Release
(
ppf2
);
}
return
ret
;
}
static
const
ISFHelperVtbl
shvt
=
{
ISFHelper_fnQueryInterface
,
...
...
@@ -1376,7 +1322,6 @@ static const ISFHelperVtbl shvt =
ISFHelper_fnGetUniqueName
,
ISFHelper_fnAddFolder
,
ISFHelper_fnDeleteItems
,
ISFHelper_fnCopyItems
};
/************************************************************************
...
...
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