[tfaber] 63185: [SHLWAPI] - Fix copypasta in PathRelativePathToW. Patch by Víctor Martínez CORE-8162 #resolve

Author: tfaber
Date: Thu May  8 12:43:10 2014
New Revision: 63185

URL: http://svn.reactos.org/svn/reactos?rev=63185&view=rev
Log:
[SHLWAPI]
- Fix copypasta in PathRelativePathToW. Patch by Víctor Martínez
CORE-8162 #resolve

Modified:
    trunk/reactos/dll/win32/shlwapi/path.c

Modified: trunk/reactos/dll/win32/shlwapi/path.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/path.c?re...
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/path.c	[iso-8859-1] Thu May  8 12:43:10 2014
@@ -19,7 +19,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

-#include "precomp.h"
+#include "config.h"
+#include "wine/port.h"
+
+#include <stdarg.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "wine/unicode.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "winternl.h"
+#define NO_SHLWAPI_STREAM
+#include "shlwapi.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(shell);

/* Get a function pointer from a DLL handle */
 #define GET_FUNC(func, module, name, fail) \
@@ -2189,7 +2207,7 @@
 {
   TRACE("(%s)\n",debugstr_a(lpszPath));

-  if (lpszPath && (lpszPath[0]=='\') && (lpszPath[1]=='\') && (lpszPath[2]!='?'))
+  if (lpszPath && lpszPath[0] == '\' && lpszPath[1] == '\' && lpszPath[2] != '?')
     return TRUE;
   return FALSE;
 }
@@ -2203,7 +2221,7 @@
 {
   TRACE("(%s)\n",debugstr_w(lpszPath));

-  if (lpszPath && (lpszPath[0]=='\') && (lpszPath[1]=='\') && (lpszPath[2]!='?'))
+  if (lpszPath && lpszPath[0] == '\' && lpszPath[1] == '\' && lpszPath[2] != '?')
     return TRUE;
   return FALSE;
 }
@@ -2229,7 +2247,7 @@
 {
   TRACE("(%s)\n", debugstr_a(lpszPath));

-  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\')
+  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\' && *lpszPath != '?')
   {
     while (*lpszPath)
     {
@@ -2251,7 +2269,7 @@
 {
   TRACE("(%s)\n", debugstr_w(lpszPath));

-  if (lpszPath && lpszPath[0] == '\' && lpszPath[1] == '\')
+  if (lpszPath && lpszPath[0] == '\' && lpszPath[1] == '\' && lpszPath[2] != '?')
   {
       return !strchrW( lpszPath + 2, '\' );
   }
@@ -2279,7 +2297,7 @@
 {
   TRACE("(%s)\n", debugstr_a(lpszPath));

-  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\')
+  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\' && *lpszPath != '?')
   {
     BOOL bSeenSlash = FALSE;
     while (*lpszPath)
@@ -2306,7 +2324,7 @@
 {
   TRACE("(%s)\n", debugstr_w(lpszPath));

-  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\')
+  if (lpszPath && *lpszPath++ == '\' && *lpszPath++ == '\' && *lpszPath != '?')
   {
     BOOL bSeenSlash = FALSE;
     while (*lpszPath)
@@ -3515,7 +3533,7 @@

if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY))
     PathRemoveFileSpecW(szFrom);
-  if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY))
+  if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY))
     PathRemoveFileSpecW(szTo);

/* Paths can only be relative if they have a common root */