[PATCH 2/7] shell32: Set return value correctly in DoPaste.

[Alistair Leslie-Hughes]

From: Michael Müller <michael(a)fds-team.de>

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
---
 dlls/shell32/shlview_cmenu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
index 905dde9..42770c7 100644
--- a/dlls/shell32/shlview_cmenu.c
+++ b/dlls/shell32/shlview_cmenu.c
@@ -1149,7 +1149,8 @@ static BOOL DoPaste(ContextMenu *This)
 	      /* do the copy/move */
 	      if (psfhlpdst && psfhlpsrc)
 	      {
-	        ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl);
+	        if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl)))
+	            bSuccess = TRUE;
 		/* FIXME handle move
 		ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl);
 		*/
-- 
1.9.1

[Huw Davies]

On Fri, May 25, 2018 at 04:49:52AM +0000, Alistair Leslie-Hughes wrote:
> From: Michael Müller <michael(a)fds-team.de>
>
> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
> ---
>  dlls/shell32/shlview_cmenu.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
> index 905dde9..42770c7 100644
> --- a/dlls/shell32/shlview_cmenu.c
> +++ b/dlls/shell32/shlview_cmenu.c
> @@ -1149,7 +1149,8 @@ static BOOL DoPaste(ContextMenu *This)
>         /* do the copy/move */
>         if (psfhlpdst && psfhlpsrc)
>         {
> -	        ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl);
> +	        if (SUCCEEDED(ISFHelper_CopyItems(psfhlpdst, psfFrom, lpcida->cidl, (LPCITEMIDLIST*)apidl)))
> +	            bSuccess = TRUE;
>       /* FIXME handle move
>       ISFHelper_DeleteItems(psfhlpsrc, lpcida->cidl, apidl);
>       */

The return value appears to be unused.  Beside which, it should probably
be an HRESULT.

Huw.