Juan Lang : wininet: Don' t call URL_LocalFileNameToPathA when asked for a unicode string and URL_LocalFileNameToPathW fails .

Alexandre Julliard julliard at winehq.org
Wed Oct 8 08:32:37 CDT 2008


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Oct  3 10:45:06 2008 -0700

wininet: Don't call URL_LocalFileNameToPathA when asked for a unicode string and URL_LocalFileNameToPathW fails.

---

 dlls/wininet/urlcache.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c
index ce9e7d4..3649a05 100644
--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -1005,7 +1005,7 @@ static DWORD URLCache_CopyEntry(
         lpszLocalFileName = (LPSTR)lpCacheEntryInfo + dwRequiredSize;
         nLocalFilePathSize = *lpdwBufferSize - dwRequiredSize;
         if ((bUnicode && URLCache_LocalFileNameToPathW(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, (LPWSTR)lpszLocalFileName, &nLocalFilePathSize)) ||
-            URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize))
+            (!bUnicode && URLCache_LocalFileNameToPathA(pContainer, pHeader, (LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName, pUrlEntry->CacheDir, lpszLocalFileName, &nLocalFilePathSize)))
         {
             lpCacheEntryInfo->lpszLocalFileName = lpszLocalFileName;
         }




More information about the wine-cvs mailing list