ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wine_get_dos_file_name rather than relying on GetFullPathNameW 

hack.
This commit is contained in:
Juan Lang 2005-10-04 15:50:35 +00:00 committed by Alexandre Julliard
parent 6ab0b0194d
commit 8630b8ab6e
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/shell32/shellpath.c
View File

@ -1265,13 +1265,20 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath)
/* special case for "My Documents", map to $HOME */
if (home)
{
WCHAR homeW[MAX_PATH];
LPWSTR homeW = wine_get_dos_file_name(home);
MultiByteToWideChar(CP_UNIXCP, 0, home, -1, homeW, MAX_PATH);
if (GetFullPathNameW(homeW, MAX_PATH, pszPath, NULL) != 0 &&
PathIsDirectoryW(pszPath))
if (homeW)
{
if (PathIsDirectoryW(homeW))
{
lstrcpynW(pszPath, homeW, MAX_PATH);
hr = S_OK;
}
HeapFree(GetProcessHeap(), 0, homeW);
}
else
hr = HRESULT_FROM_WIN32(GetLastError());
}
break;
}
case CSIDL_DESKTOP:
@ -1282,14 +1289,23 @@ static HRESULT _SHGetDefaultValue(BYTE folder, LPWSTR pszPath)
/* special case for Desktop, map to $HOME/Desktop if it exists */
if (home)
{
WCHAR desktopW[MAX_PATH];
LPWSTR homeW = wine_get_dos_file_name(home);
MultiByteToWideChar(CP_UNIXCP, 0, home, -1, desktopW, MAX_PATH);
PathAppendW(desktopW, DesktopW);
if (GetFullPathNameW(desktopW, MAX_PATH, pszPath, NULL) != 0 &&
PathIsDirectoryW(pszPath))
if (homeW)
{
lstrcpynW(pszPath, homeW, MAX_PATH);
if (PathAppendW(pszPath, DesktopW))
{
if (PathIsDirectoryW(pszPath))
hr = S_OK;
}
else
hr = HRESULT_FROM_WIN32(GetLastError());
HeapFree(GetProcessHeap(), 0, homeW);
}
else
hr = HRESULT_FROM_WIN32(GetLastError());
}
break;
}
}