Module: wine Branch: master Commit: e66d1cd5e99a546455e4e4481ddeeaebaa8e22bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e66d1cd5e99a546455e4e4481d...
Author: Francois Gouget fgouget@free.fr Date: Tue Jan 9 12:30:45 2007 +0100
wininet: Consistenly use INTERNET_SetLastError().
---
dlls/wininet/ftp.c | 2 +- dlls/wininet/http.c | 8 ++++---- dlls/wininet/internet.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 7ae70c1..841ae3c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -370,7 +370,7 @@ BOOL WINAPI FtpSetCurrentDirectoryW(HINT
if (!lpszDirectory) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; }
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index cdf2bff..07dc596 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1464,7 +1464,7 @@ static BOOL WINAPI HTTP_HttpQueryInfoW( ((dwInfoLevel & HTTP_QUERY_FLAG_REQUEST_HEADERS) && (~lphttpHdr->wFlags & HDR_ISREQUEST))) { - SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); + INTERNET_SetLastError(ERROR_HTTP_HEADER_NOT_FOUND); return bSuccess; }
@@ -1754,7 +1754,7 @@ BOOL WINAPI HttpSendRequestExA(HINTERNET header = HeapAlloc(GetProcessHeap(),0,headerlen*sizeof(WCHAR)); if (!(BuffersInW.lpcszHeader = header)) { - SetLastError(ERROR_OUTOFMEMORY); + INTERNET_SetLastError(ERROR_OUTOFMEMORY); return FALSE; } BuffersInW.dwHeadersLength = MultiByteToWideChar(CP_ACP, 0, @@ -1848,7 +1848,7 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); ret = FALSE; } else @@ -1930,7 +1930,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET h /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); r = FALSE; } else diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index e064ac1..80ddc24 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -769,7 +769,7 @@ HINTERNET WINAPI InternetConnectW(HINTER
if (!lpszServerName) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return NULL; }
@@ -778,7 +778,7 @@ HINTERNET WINAPI InternetConnectW(HINTER hIC = (LPWININETAPPINFOW) WININET_GetObject( hInternet ); if ( (hIC == NULL) || (hIC->hdr.htype != WH_HINIT) ) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); goto lend; }
@@ -1219,7 +1219,7 @@ BOOL WINAPI InternetCrackUrlW(LPCWSTR lp
if (!lpszUrl_orig || !*lpszUrl_orig) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
@@ -1777,7 +1777,7 @@ BOOL WINAPI InternetReadFile(HINTERNET h lpwh = WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; }
@@ -1839,14 +1839,14 @@ BOOL WINAPI InternetReadFileExA(HINTERNE
if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
lpwh = (LPWININETHANDLEHEADER) WININET_GetObject( hFile ); if (!lpwh) { - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; }
@@ -1868,7 +1868,7 @@ BOOL WINAPI InternetReadFileExA(HINTERNE retval = INTERNET_AsyncCall(&workRequest); if (!retval) return FALSE;
- SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); return FALSE; }
@@ -1923,7 +1923,7 @@ static BOOL INET_QueryOptionHelper(BOOL lpwhh = (LPWININETHANDLEHEADER) WININET_GetObject( hInternet ); if (!lpwhh) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
@@ -1936,7 +1936,7 @@ static BOOL INET_QueryOptionHelper(BOOL if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; }
@@ -1976,7 +1976,7 @@ static BOOL INET_QueryOptionHelper(BOOL if (!lpwhh) { WARN("Invalid hInternet handle\n"); - SetLastError(ERROR_INVALID_HANDLE); + INTERNET_SetLastError(ERROR_INVALID_HANDLE); return FALSE; } if (lpwhh->htype == WH_HHTTPREQ) @@ -2519,7 +2519,7 @@ BOOL WINAPI InternetSetOptionExW(HINTERN FIXME("Flags %08x ignored\n", dwFlags); if( dwFlags & ~ISO_VALID_FLAGS ) { - SetLastError( ERROR_INVALID_PARAMETER ); + INTERNET_SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; } return InternetSetOptionW( hInternet, dwOption, lpBuffer, dwBufferLength ); @@ -2760,7 +2760,7 @@ End:
HeapFree( GetProcessHeap(), 0, command ); if (rc == FALSE) - SetLastError(ERROR_NOT_CONNECTED); + INTERNET_SetLastError(ERROR_NOT_CONNECTED);
return rc; } @@ -2919,7 +2919,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER
if (!lpszUrl) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); goto lend; }
@@ -2949,7 +2949,7 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER /* * This is from windows. */ - SetLastError(ERROR_IO_PENDING); + INTERNET_SetLastError(ERROR_IO_PENDING); } else { ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext); } @@ -3227,7 +3227,7 @@ BOOL WINAPI InternetQueryDataAvailable( lpwhr = (LPWININETHTTPREQW) WININET_GetObject( hFile ); if (NULL == lpwhr) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); return FALSE; }
@@ -3240,7 +3240,7 @@ BOOL WINAPI InternetQueryDataAvailable( min(sizeof(buffer), lpwhr->dwContentLength - lpwhr->dwContentRead), MSG_PEEK, (int *)lpdwNumberOfBytesAvailble)) { - SetLastError(ERROR_NO_MORE_FILES); + INTERNET_SetLastError(ERROR_NO_MORE_FILES); retval = FALSE; } else @@ -3459,7 +3459,7 @@ static BOOL calc_url_length(LPURL_COMPON { if (lpUrlComponents->lpszPassword) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } } @@ -3577,7 +3577,7 @@ BOOL WINAPI InternetCreateUrlA(LPURL_COM
if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
@@ -3647,7 +3647,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM
if (lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSW) || !lpdwUrlLength) { - SetLastError(ERROR_INVALID_PARAMETER); + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); return FALSE; }
@@ -3657,7 +3657,7 @@ BOOL WINAPI InternetCreateUrlW(LPURL_COM if (!lpszUrl || *lpdwUrlLength < dwLen) { *lpdwUrlLength = (dwLen + 1) * sizeof(WCHAR); - SetLastError(ERROR_INSUFFICIENT_BUFFER); + INTERNET_SetLastError(ERROR_INSUFFICIENT_BUFFER); return FALSE; }