Commit 8c3ca8d8 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

wininet: Use proc instead of enum in INTERNETOPENURLW request.

parent 5dd5536a
...@@ -2875,6 +2875,19 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr ...@@ -2875,6 +2875,19 @@ HINTERNET WINAPI INTERNET_InternetOpenUrlW(LPWININETAPPINFOW hIC, LPCWSTR lpszUr
* RETURNS * RETURNS
* handle of connection or NULL on failure * handle of connection or NULL on failure
*/ */
static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest)
{
struct WORKREQ_INTERNETOPENURLW const *req = &workRequest->u.InternetOpenUrlW;
LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) workRequest->hdr;
TRACE("%p\n", hIC);
INTERNET_InternetOpenUrlW(hIC, req->lpszUrl,
req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext);
HeapFree(GetProcessHeap(), 0, req->lpszUrl);
HeapFree(GetProcessHeap(), 0, req->lpszHeaders);
}
HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext) LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext)
{ {
...@@ -2904,7 +2917,8 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl, ...@@ -2904,7 +2917,8 @@ HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
WORKREQUEST workRequest; WORKREQUEST workRequest;
struct WORKREQ_INTERNETOPENURLW *req; struct WORKREQ_INTERNETOPENURLW *req;
workRequest.asyncall = INTERNETOPENURLW; workRequest.asyncall = CALLASYNCPROC;
workRequest.asyncproc = AsyncInternetOpenUrlProc;
workRequest.hdr = WININET_AddRef( &hIC->hdr ); workRequest.hdr = WININET_AddRef( &hIC->hdr );
req = &workRequest.u.InternetOpenUrlW; req = &workRequest.u.InternetOpenUrlW;
req->lpszUrl = WININET_strdupW(lpszUrl); req->lpszUrl = WININET_strdupW(lpszUrl);
...@@ -3363,19 +3377,6 @@ static VOID INTERNET_ExecuteWork(void) ...@@ -3363,19 +3377,6 @@ static VOID INTERNET_ExecuteWork(void)
} }
break; break;
case INTERNETOPENURLW:
{
struct WORKREQ_INTERNETOPENURLW *req = &workRequest.u.InternetOpenUrlW;
LPWININETAPPINFOW hIC = (LPWININETAPPINFOW) workRequest.hdr;
TRACE("INTERNETOPENURLW %p\n", hIC);
INTERNET_InternetOpenUrlW(hIC, req->lpszUrl,
req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext);
HeapFree(GetProcessHeap(), 0, req->lpszUrl);
HeapFree(GetProcessHeap(), 0, req->lpszHeaders);
}
break;
case INTERNETREADFILEEXA: case INTERNETREADFILEEXA:
{ {
struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA; struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA;
......
...@@ -261,7 +261,6 @@ typedef enum ...@@ -261,7 +261,6 @@ typedef enum
FTPREMOVEDIRECTORYW, FTPREMOVEDIRECTORYW,
FTPRENAMEFILEW, FTPRENAMEFILEW,
FTPFINDNEXTW, FTPFINDNEXTW,
INTERNETOPENURLW,
INTERNETREADFILEEXA, INTERNETREADFILEEXA,
} ASYNC_FUNC; } ASYNC_FUNC;
......
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