wininet: Fix URLCache_LocalFileNameToPathA to return a full path, rather than…

wininet: Fix URLCache_LocalFileNameToPathA to return a full path, rather than just the container path. This was caused by path_len including the nul-terminator and so the rest of the string was being added after the nul-terminator, which is incorrect. This is fixed by making path_len not include the nul-terminator. Also fix a few other issues with the function, like not passing a correct length into the second call to WideCharToMultiByte, nRequired being calculated incorrectly and the string not always being nul-terminated. Add a test for this function by testing the lpszLocalFileName field obtained from RetrieveUrlCacheEntryFileA.

wininet: Fix URLCache_LocalFileNameToPathA to return a full path, rather than…
cdd135c2 · Rob Shearman · Alexandre Julliard · c46279ce · cdd135c2 · cdd135c2
Commit cdd135c2 authored Mar 12, 2008 by Rob Shearman Committed by Alexandre Julliard Mar 12, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

urlcache.c dlls/wininet/tests/urlcache.c +1 -0

urlcache.c dlls/wininet/urlcache.c +4 -4

No files found.
--- a/dlls/wininet/tests/urlcache.c
+++ b/dlls/wininet/tests/urlcache.c
@@ -70,6 +70,7 @@ static void test_urlcacheA(void)
    ok(lpCacheEntryInfo->dwStructSize == sizeof(*lpCacheEntryInfo), "lpCacheEntryInfo->dwStructSize was %d\n", lpCacheEntryInfo->dwStructSize);
    ok(!strcmp(lpCacheEntryInfo->lpszSourceUrlName, TEST_URL), "lpCacheEntryInfo->lpszSourceUrlName should be %s instead of %s\n", TEST_URL, lpCacheEntryInfo->lpszSourceUrlName);
+    ok(!strcmp(lpCacheEntryInfo->lpszLocalFileName, filename), "lpCacheEntryInfo->lpszLocalFileName should be %s instead of %s\n", filename, lpCacheEntryInfo->lpszLocalFileName);
    HeapFree(GetProcessHeap(), 0, lpCacheEntryInfo);

--- a/dlls/wininet/urlcache.c
+++ b/dlls/wininet/urlcache.c
@@ -909,14 +909,14 @@ static BOOL URLCache_LocalFileNameToPathA(
        return FALSE;
    }
-    path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL);
+    path_len = WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, NULL, 0, NULL, NULL) - 1;
-    file_name_len = strlen(szLocalFileName);
+    file_name_len = strlen(szLocalFileName) + 1 /* for nul-terminator */;
    dir_len = DIR_LENGTH;
-    nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(WCHAR);
+    nRequired = (path_len + dir_len + 1 + file_name_len) * sizeof(char);
    if (nRequired < *lpBufferSize)
    {
-        WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, -1, NULL, NULL);
+        WideCharToMultiByte(CP_ACP, 0, pContainer->path, -1, szPath, path_len, NULL, NULL);
        memcpy(szPath+path_len, pHeader->directory_data[Directory].filename, dir_len);
        szPath[path_len + dir_len] = '\\';
        memcpy(szPath + path_len + dir_len + 1, szLocalFileName, file_name_len);