[ros-diffs] [cwittich] 72566: [SHELL32] some minor wine syncs

Author: cwittich
Date: Sun Sep  4 08:44:20 2016
New Revision: 72566

URL: http://svn.reactos.org/svn/reactos?rev=72566&view=rev
Log:
[SHELL32] some minor wine syncs

Modified:
    trunk/reactos/dll/win32/shell32/wine/brsfolder.c
    trunk/reactos/dll/win32/shell32/wine/shellord.c

Modified: trunk/reactos/dll/win32/shell32/wine/brsfolder.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/brs…
==============================================================================
--- trunk/reactos/dll/win32/shell32/wine/brsfolder.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/wine/brsfolder.c	[iso-8859-1] Sun Sep  4 08:44:20
2016
@@ -782,10 +782,11 @@
     if(FAILED(hr))
         return hr;
 
-    hr = SHGetPathFromIDListW(info->pidlRet, name);
-    if(FAILED(hr))
+    if(!SHGetPathFromIDListW(info->pidlRet, name)) {
+        hr = E_FAIL;
         goto cleanup;
-        
+    }
+
     len = strlenW(name);
     if(len<MAX_PATH)
         name[len++] = '\\';

Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/she…
==============================================================================
--- trunk/reactos/dll/win32/shell32/wine/shellord.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/wine/shellord.c	[iso-8859-1] Sun Sep  4 08:44:20 2016
@@ -900,7 +900,7 @@
 		/* buffer size looks good */
 		ptr += 12; /* get to string */
 		len = bufused - (ptr-buffer);  /* get length of buf remaining */
-		if ((lstrlenA(ptr) > 0) && (lstrlenA(ptr) <= len-1)) {
+                if (ptr[0] && (lstrlenA(ptr) <= len-1)) {
 		    /* appears to be good string */
 		    lstrcpyA(old_lnk_name, link_dir);
 		    PathAppendA(old_lnk_name, ptr);