Commit 53e76f83 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

wininet: Check file handles against INVALID_HANDLE_VALUE, not NULL.

Simplify the file handle handling in FTP_FtpPutFileW().
parent d3245723
......@@ -271,7 +271,7 @@ lend:
BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile,
LPCWSTR lpszNewRemoteFile, DWORD dwFlags, DWORD dwContext)
{
HANDLE hFile = NULL;
HANDLE hFile;
BOOL bSuccess = FALSE;
LPWININETAPPINFOW hIC = NULL;
INT nResCode;
......@@ -324,7 +324,6 @@ BOOL WINAPI FTP_FtpPutFileW(LPWININETFTPSESSIONW lpwfs, LPCWSTR lpszLocalFile,
&iar, sizeof(INTERNET_ASYNC_RESULT));
}
if (hFile)
CloseHandle(hFile);
return bSuccess;
......@@ -1350,7 +1349,7 @@ lend:
if (lpwfs->lstnSocket != -1)
closesocket(lpwfs->lstnSocket);
if (hFile)
if (INVALID_HANDLE_VALUE != hFile)
CloseHandle(hFile);
hIC = lpwfs->lpAppInfo;
......
......@@ -380,7 +380,6 @@ static void test_getfile(void)
SetLastError(0xdeadbeef);
bRet = FtpGetFileA(hFtp, "welcome.msg", "should_be_non_existing_deadbeef", TRUE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0);
ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n");
todo_wine
ok ( GetLastError() == ERROR_FILE_EXISTS,
"Expected ERROR_FILE_EXISTS, got %d\n", GetLastError());
......@@ -388,7 +387,6 @@ static void test_getfile(void)
SetLastError(0xdeadbeef);
bRet = FtpGetFileA(hFtp, "should_be_non_existing_deadbeef", "should_be_non_existing_deadbeef", TRUE, FILE_ATTRIBUTE_NORMAL, FTP_TRANSFER_TYPE_UNKNOWN, 0);
ok ( bRet == FALSE, "Expected FtpGetFileA to fail\n");
todo_wine
ok ( GetLastError() == ERROR_FILE_EXISTS,
"Expected ERROR_FILE_EXISTS, got %d\n", GetLastError());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment