wininet/ftp.c: Fix some returned error codes.
This commit is contained in:
parent
54c80612ac
commit
d20833fc52
|
@ -1667,12 +1667,24 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD
|
||||||
BOOL r = FALSE;
|
BOOL r = FALSE;
|
||||||
|
|
||||||
lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession );
|
lpwfs = (LPWININETFTPSESSIONW) WININET_GetObject( hFtpSession );
|
||||||
if (NULL == lpwfs || WH_HFTPSESSION != lpwfs->hdr.htype)
|
if (!lpwfs)
|
||||||
|
{
|
||||||
|
INTERNET_SetLastError(ERROR_INVALID_HANDLE);
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (WH_HFTPSESSION != lpwfs->hdr.htype)
|
||||||
{
|
{
|
||||||
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
|
INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
|
||||||
goto lend;
|
goto lend;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!lpszSrc || !lpszDest)
|
||||||
|
{
|
||||||
|
INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
|
||||||
|
goto lend;
|
||||||
|
}
|
||||||
|
|
||||||
hIC = lpwfs->lpAppInfo;
|
hIC = lpwfs->lpAppInfo;
|
||||||
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
|
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC)
|
||||||
{
|
{
|
||||||
|
@ -1693,7 +1705,6 @@ BOOL WINAPI FtpRenameFileW(HINTERNET hFtpSession, LPCWSTR lpszSrc, LPCWSTR lpszD
|
||||||
}
|
}
|
||||||
|
|
||||||
lend:
|
lend:
|
||||||
if( lpwfs )
|
|
||||||
WININET_Release( &lpwfs->hdr );
|
WININET_Release( &lpwfs->hdr );
|
||||||
|
|
||||||
return r;
|
return r;
|
||||||
|
|
|
@ -666,7 +666,6 @@ static void test_renamefile(void)
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
bRet = FtpRenameFileA(NULL , "should_be_non_existing_deadbeef", "new");
|
bRet = FtpRenameFileA(NULL , "should_be_non_existing_deadbeef", "new");
|
||||||
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
||||||
todo_wine
|
|
||||||
ok ( GetLastError() == ERROR_INVALID_HANDLE,
|
ok ( GetLastError() == ERROR_INVALID_HANDLE,
|
||||||
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
|
"Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError());
|
||||||
|
|
||||||
|
@ -685,7 +684,6 @@ static void test_renamefile(void)
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
bRet = FtpRenameFileA(hFtp , NULL, "new");
|
bRet = FtpRenameFileA(hFtp , NULL, "new");
|
||||||
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
||||||
todo_wine
|
|
||||||
ok ( GetLastError() == ERROR_INVALID_PARAMETER,
|
ok ( GetLastError() == ERROR_INVALID_PARAMETER,
|
||||||
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
||||||
|
|
||||||
|
@ -693,7 +691,6 @@ static void test_renamefile(void)
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", NULL);
|
bRet = FtpRenameFileA(hFtp , "should_be_non_existing_deadbeef", NULL);
|
||||||
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
ok ( bRet == FALSE, "Expected FtpRenameFileA to fail\n");
|
||||||
todo_wine
|
|
||||||
ok ( GetLastError() == ERROR_INVALID_PARAMETER,
|
ok ( GetLastError() == ERROR_INVALID_PARAMETER,
|
||||||
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
"Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue