wininet: Fixed declaration of INTERNET_STATUS_CALLBACK.

This commit is contained in:
Jacek Caban 2006-10-28 14:14:52 +02:00 committed by Alexandre Julliard
parent ee5a440030
commit cdbab7ddf2
2 changed files with 20 additions and 20 deletions

View File

@ -37,7 +37,7 @@ static HANDLE hCompleteEvent;
static VOID WINAPI callback( static VOID WINAPI callback(
HINTERNET hInternet, HINTERNET hInternet,
DWORD dwContext, DWORD_PTR dwContext,
DWORD dwInternetStatus, DWORD dwInternetStatus,
LPVOID lpvStatusInformation, LPVOID lpvStatusInformation,
DWORD dwStatusInformationLength DWORD dwStatusInformationLength
@ -46,27 +46,27 @@ static VOID WINAPI callback(
switch (dwInternetStatus) switch (dwInternetStatus)
{ {
case INTERNET_STATUS_RESOLVING_NAME: case INTERNET_STATUS_RESOLVING_NAME:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESOLVING_NAME \"%s\" %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
(LPCSTR)lpvStatusInformation,dwStatusInformationLength); (LPCSTR)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_NAME_RESOLVED: case INTERNET_STATUS_NAME_RESOLVED:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_NAME_RESOLVED \"%s\" %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
(LPCSTR)lpvStatusInformation,dwStatusInformationLength); (LPCSTR)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_CONNECTING_TO_SERVER: case INTERNET_STATUS_CONNECTING_TO_SERVER:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTING_TO_SERVER \"%s\" %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
(LPCSTR)lpvStatusInformation,dwStatusInformationLength); (LPCSTR)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_CONNECTED_TO_SERVER: case INTERNET_STATUS_CONNECTED_TO_SERVER:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTED_TO_SERVER \"%s\" %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
(LPCSTR)lpvStatusInformation,dwStatusInformationLength); (LPCSTR)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_SENDING_REQUEST: case INTERNET_STATUS_SENDING_REQUEST:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_SENDING_REQUEST %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_SENDING_REQUEST %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
@ -74,12 +74,12 @@ static VOID WINAPI callback(
ok(dwStatusInformationLength == sizeof(DWORD), ok(dwStatusInformationLength == sizeof(DWORD),
"info length should be sizeof(DWORD) instead of %d\n", "info length should be sizeof(DWORD) instead of %d\n",
dwStatusInformationLength); dwStatusInformationLength);
trace("%04x:Callback %p 0x%x INTERNET_STATUS_REQUEST_SENT 0x%x %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_SENT 0x%x %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
*(DWORD *)lpvStatusInformation,dwStatusInformationLength); *(DWORD *)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_RECEIVING_RESPONSE: case INTERNET_STATUS_RECEIVING_RESPONSE:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RECEIVING_RESPONSE %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
@ -87,27 +87,27 @@ static VOID WINAPI callback(
ok(dwStatusInformationLength == sizeof(DWORD), ok(dwStatusInformationLength == sizeof(DWORD),
"info length should be sizeof(DWORD) instead of %d\n", "info length should be sizeof(DWORD) instead of %d\n",
dwStatusInformationLength); dwStatusInformationLength);
trace("%04x:Callback %p 0x%x INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_RESPONSE_RECEIVED 0x%x %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
*(DWORD *)lpvStatusInformation,dwStatusInformationLength); *(DWORD *)lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_CTL_RESPONSE_RECEIVED: case INTERNET_STATUS_CTL_RESPONSE_RECEIVED:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CTL_RESPONSE_RECEIVED %p %d\n",
GetCurrentThreadId(), hInternet,dwContext, GetCurrentThreadId(), hInternet,dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_PREFETCH: case INTERNET_STATUS_PREFETCH:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_PREFETCH %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_PREFETCH %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_CLOSING_CONNECTION: case INTERNET_STATUS_CLOSING_CONNECTION:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_CLOSING_CONNECTION %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CLOSING_CONNECTION %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
case INTERNET_STATUS_CONNECTION_CLOSED: case INTERNET_STATUS_CONNECTION_CLOSED:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_CONNECTION_CLOSED %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_CONNECTION_CLOSED %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation,dwStatusInformationLength); lpvStatusInformation,dwStatusInformationLength);
break; break;
@ -115,7 +115,7 @@ static VOID WINAPI callback(
ok(dwStatusInformationLength == sizeof(HINTERNET), ok(dwStatusInformationLength == sizeof(HINTERNET),
"info length should be sizeof(HINTERNET) instead of %d\n", "info length should be sizeof(HINTERNET) instead of %d\n",
dwStatusInformationLength); dwStatusInformationLength);
trace("%04x:Callback %p 0x%x INTERNET_STATUS_HANDLE_CREATED %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CREATED %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
*(HINTERNET *)lpvStatusInformation,dwStatusInformationLength); *(HINTERNET *)lpvStatusInformation,dwStatusInformationLength);
break; break;
@ -123,7 +123,7 @@ static VOID WINAPI callback(
ok(dwStatusInformationLength == sizeof(HINTERNET), ok(dwStatusInformationLength == sizeof(HINTERNET),
"info length should be sizeof(HINTERNET) instead of %d\n", "info length should be sizeof(HINTERNET) instead of %d\n",
dwStatusInformationLength); dwStatusInformationLength);
trace("%04x:Callback %p 0x%x INTERNET_STATUS_HANDLE_CLOSING %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_HANDLE_CLOSING %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
*(HINTERNET *)lpvStatusInformation, dwStatusInformationLength); *(HINTERNET *)lpvStatusInformation, dwStatusInformationLength);
break; break;
@ -133,24 +133,24 @@ static VOID WINAPI callback(
ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT), ok(dwStatusInformationLength == sizeof(INTERNET_ASYNC_RESULT),
"info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n", "info length should be sizeof(INTERNET_ASYNC_RESULT) instead of %d\n",
dwStatusInformationLength); dwStatusInformationLength);
trace("%04x:Callback %p 0x%x INTERNET_STATUS_REQUEST_COMPLETE {%d,%d} %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REQUEST_COMPLETE {%d,%d} %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
iar->dwResult,iar->dwError,dwStatusInformationLength); iar->dwResult,iar->dwError,dwStatusInformationLength);
SetEvent(hCompleteEvent); SetEvent(hCompleteEvent);
break; break;
} }
case INTERNET_STATUS_REDIRECT: case INTERNET_STATUS_REDIRECT:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_REDIRECT \"%s\" %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_REDIRECT \"%s\" %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
(LPCSTR)lpvStatusInformation, dwStatusInformationLength); (LPCSTR)lpvStatusInformation, dwStatusInformationLength);
break; break;
case INTERNET_STATUS_INTERMEDIATE_RESPONSE: case INTERNET_STATUS_INTERMEDIATE_RESPONSE:
trace("%04x:Callback %p 0x%x INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n", trace("%04x:Callback %p 0x%lx INTERNET_STATUS_INTERMEDIATE_RESPONSE %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, GetCurrentThreadId(), hInternet, dwContext,
lpvStatusInformation, dwStatusInformationLength); lpvStatusInformation, dwStatusInformationLength);
break; break;
default: default:
trace("%04x:Callback %p 0x%x %d %p %d\n", trace("%04x:Callback %p 0x%lx %d %p %d\n",
GetCurrentThreadId(), hInternet, dwContext, dwInternetStatus, GetCurrentThreadId(), hInternet, dwContext, dwInternetStatus,
lpvStatusInformation, dwStatusInformationLength); lpvStatusInformation, dwStatusInformationLength);
} }

View File

@ -557,7 +557,7 @@ BOOLAPI InternetGetLastResponseInfoA(LPDWORD ,LPSTR lpszBuffer ,LPDWORD);
BOOLAPI InternetGetLastResponseInfoW(LPDWORD ,LPWSTR lpszBuffer ,LPDWORD); BOOLAPI InternetGetLastResponseInfoW(LPDWORD ,LPWSTR lpszBuffer ,LPDWORD);
#define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo) #define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo)
typedef VOID (CALLBACK *INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD ,DWORD , typedef VOID (CALLBACK *INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD_PTR ,DWORD ,
LPVOID lpvStatusInformation ,DWORD); LPVOID lpvStatusInformation ,DWORD);
typedef INTERNET_STATUS_CALLBACK * LPINTERNET_STATUS_CALLBACK; typedef INTERNET_STATUS_CALLBACK * LPINTERNET_STATUS_CALLBACK;