Rob Shearman : shell32: Don' t assign a result from a function that returns a BOOL to an HRESULT in shellex_get_dataobj .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3261814e08e791c64d53c2c285dd7ef4231d1039
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3261814e08e791c64d53c2c285...

Author: Rob Shearman <robertshearman(a)gmail.com>
Date:   Sun Aug 17 18:32:26 2008 +0100

shell32: Don't assign a result from a function that returns a BOOL to an HRESULT in shellex_get_dataobj.

Otherwise there could be confusion as to what type GetFullPathNameW is
returning.

---

 dlls/shell32/shlexec.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index d83a132..bf820ca 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -1091,10 +1091,11 @@ static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei )
     else
     {
         WCHAR fullpath[MAX_PATH];
+        BOOL ret;
 
         fullpath[0] = 0;
-        r = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL );
-        if (!r)
+        ret = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL );
+        if (!ret)
             goto end;
 
         pidl = ILCreateFromPathW( fullpath );