Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-01 17:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHLWAPI]

Browse source 
- Fix copypasta in PathRelativePathToW. Patch by Víctor Martínez
CORE-8162 #resolve

svn path=/trunk/; revision=63185
This commit is contained in:
Thomas Faber 2014-05-08 12:43:10 +00:00
parent 4cef95b542
commit 0f635ea514
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
reactos/dll/win32/shlwapi/path.c
View file

@ -19,7 +19,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * 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 */ /* Get a function pointer from a DLL handle */
#define GET_FUNC(func, module, name, fail) \ #define GET_FUNC(func, module, name, fail) \
@ -2189,7 +2207,7 @@ BOOL WINAPI PathIsUNCA(LPCSTR lpszPath)
{ {
TRACE("(%s)\n",debugstr_a(lpszPath)); 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 TRUE;
return FALSE; return FALSE;
} }
@ -2203,7 +2221,7 @@ BOOL WINAPI PathIsUNCW(LPCWSTR lpszPath)
{ {
TRACE("(%s)\n",debugstr_w(lpszPath)); 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 TRUE;
return FALSE; return FALSE;
} }
@ -2229,7 +2247,7 @@ BOOL WINAPI PathIsUNCServerA(LPCSTR lpszPath)
{ {
TRACE("(%s)\n", debugstr_a(lpszPath)); TRACE("(%s)\n", debugstr_a(lpszPath));
if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?')
{ {
while (*lpszPath) while (*lpszPath)
{ {
@ -2251,7 +2269,7 @@ BOOL WINAPI PathIsUNCServerW(LPCWSTR lpszPath)
{ {
TRACE("(%s)\n", debugstr_w(lpszPath)); TRACE("(%s)\n", debugstr_w(lpszPath));
if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\') if (lpszPath && lpszPath[0] == '\\' && lpszPath[1] == '\\' && lpszPath[2] != '?')
{ {
return !strchrW( lpszPath + 2, '\\' ); return !strchrW( lpszPath + 2, '\\' );
} }
@ -2279,7 +2297,7 @@ BOOL WINAPI PathIsUNCServerShareA(LPCSTR lpszPath)
{ {
TRACE("(%s)\n", debugstr_a(lpszPath)); TRACE("(%s)\n", debugstr_a(lpszPath));
if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?')
{ {
BOOL bSeenSlash = FALSE; BOOL bSeenSlash = FALSE;
while (*lpszPath) while (*lpszPath)
@ -2306,7 +2324,7 @@ BOOL WINAPI PathIsUNCServerShareW(LPCWSTR lpszPath)
{ {
TRACE("(%s)\n", debugstr_w(lpszPath)); TRACE("(%s)\n", debugstr_w(lpszPath));
if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\') if (lpszPath && *lpszPath++ == '\\' && *lpszPath++ == '\\' && *lpszPath != '?')
{ {
BOOL bSeenSlash = FALSE; BOOL bSeenSlash = FALSE;
while (*lpszPath) while (*lpszPath)
@ -3515,7 +3533,7 @@ BOOL WINAPI PathRelativePathToW(LPWSTR lpszPath, LPCWSTR lpszFrom, DWORD dwAttrF
if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY))
PathRemoveFileSpecW(szFrom); PathRemoveFileSpecW(szFrom);
if(!(dwAttrFrom & FILE_ATTRIBUTE_DIRECTORY)) if(!(dwAttrTo & FILE_ATTRIBUTE_DIRECTORY))
PathRemoveFileSpecW(szTo); PathRemoveFileSpecW(szTo);
/* Paths can only be relative if they have a common root */ /* Paths can only be relative if they have a common root */