Fix more unicode/memory allocation errors.
This commit is contained in:
parent
7de279a73a
commit
e0fffb6c7c
|
@ -326,12 +326,13 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
|
||||||
INT len;
|
INT len;
|
||||||
BOOL rc;
|
BOOL rc;
|
||||||
|
|
||||||
len = lstrlenW(lpszDirectory)+1;
|
len = WideCharToMultiByte(CP_ACP, 0, lpszDirectory, -1, NULL, 0, NULL, NULL);
|
||||||
if (!(szDir = (CHAR *)malloc(len*sizeof(CHAR))))
|
szDir = HeapAlloc(GetProcessHeap(), 0, len);
|
||||||
|
if(!szDir)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
WideCharToMultiByte(CP_ACP, -1, lpszDirectory, -1, szDir, len, NULL, NULL);
|
WideCharToMultiByte(CP_ACP, 0, lpszDirectory, -1, szDir, len, NULL, NULL);
|
||||||
rc = FtpSetCurrentDirectoryA(hConnect, szDir);
|
rc = FtpSetCurrentDirectoryA(hConnect, szDir);
|
||||||
free(szDir);
|
HeapFree(GetProcessHeap(), 0, szDir);
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -450,12 +451,13 @@ BOOL WINAPI FtpCreateDirectoryW(HINTERNET hConnect, LPCWSTR lpszDirectory)
|
||||||
INT len;
|
INT len;
|
||||||
BOOL rc;
|
BOOL rc;
|
||||||
|
|
||||||
len = lstrlenW(lpszDirectory)+1;
|
len = WideCharToMultiByte(CP_ACP, 0, lpszDirectory, -1, NULL, 0, NULL, NULL);
|
||||||
if (!(szDir = (CHAR *)malloc(len*sizeof(CHAR))))
|
szDir = HeapAlloc(GetProcessHeap(), 0, len);
|
||||||
|
if (!szDir)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
WideCharToMultiByte(CP_ACP, -1, lpszDirectory, -1, szDir, len, NULL, NULL);
|
WideCharToMultiByte(CP_ACP, 0, lpszDirectory, -1, szDir, len, NULL, NULL);
|
||||||
rc = FtpCreateDirectoryA(hConnect, szDir);
|
rc = FtpCreateDirectoryA(hConnect, szDir);
|
||||||
free(szDir);
|
HeapFree(GetProcessHeap(), 0, szDir);
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue