Jacek Caban : wininet: Use proc instead of enum in INTERNETOPENURLW request .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8c3ca8d817ea610dc8b0b6c8b6d7c17b77afeecf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c3ca8d817ea610dc8b0b6c8b6d7c17b77afeecf

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Dec 25 21:33:49 2006 +0100

wininet: Use proc instead of enum in INTERNETOPENURLW request.

---

 dlls/wininet/internet.c |   31 ++++++++++++++++---------------
 dlls/wininet/internet.h |    1 -
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 7a3d178..78c9c90 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -2875,6 +2875,19 @@ HINTERNET WINAPI INTERNET_InternetOpenUr
  * RETURNS
  *   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,
     LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD dwContext)
 {
@@ -2903,8 +2916,9 @@ HINTERNET WINAPI InternetOpenUrlW(HINTER
     if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) {
 	WORKREQUEST workRequest;
 	struct WORKREQ_INTERNETOPENURLW *req;
-	
-	workRequest.asyncall = INTERNETOPENURLW;
+
+	workRequest.asyncall = CALLASYNCPROC;
+	workRequest.asyncproc = AsyncInternetOpenUrlProc;
 	workRequest.hdr = WININET_AddRef( &hIC->hdr );
 	req = &workRequest.u.InternetOpenUrlW;
 	req->lpszUrl = WININET_strdupW(lpszUrl);
@@ -3363,19 +3377,6 @@ static VOID INTERNET_ExecuteWork(void)
         }
 	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:
         {
         struct WORKREQ_INTERNETREADFILEEXA *req = &workRequest.u.InternetReadFileExA;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 7a86e4f..989fb9a 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -261,7 +261,6 @@ typedef enum
     FTPREMOVEDIRECTORYW,
     FTPRENAMEFILEW,
     FTPFINDNEXTW,
-    INTERNETOPENURLW,
     INTERNETREADFILEEXA,
 } ASYNC_FUNC;