Jacek Caban : wininet: Moved WORKREQ_HTTPENDREQUESTW out of WORKREQUEST.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Tue Jan 29 12:04:16 2013 +0100

wininet: Moved WORKREQ_HTTPENDREQUESTW out of WORKREQUEST.

---

dlls/wininet/http.c     |   26 +++++++++++++++-----------
 dlls/wininet/internet.h |    7 -------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 5ec4089..8d8ffec 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -5065,14 +5065,20 @@ BOOL WINAPI HttpEndRequestA(HINTERNET hRequest,
     return HttpEndRequestW(hRequest, NULL, dwFlags, dwContext);
 }

-static void AsyncHttpEndRequestProc(WORKREQUEST *work)
+typedef struct {
+    task_header_t hdr;
+    DWORD flags;
+    DWORD context;
+} end_request_task_t;
+
+static void AsyncHttpEndRequestProc(task_header_t *hdr)
 {
-    struct WORKREQ_HTTPENDREQUESTW const *req = &work->u.HttpEndRequestW;
-    http_request_t *request = (http_request_t*)work->hdr;
+    end_request_task_t *task = (end_request_task_t*)hdr;
+    http_request_t *req = (http_request_t*)task->hdr.hdr;

-    TRACE("%p\n", request);
+    TRACE("%p\n", req);

-    HTTP_HttpEndRequestW(request, req->dwFlags, req->dwContext);
+    HTTP_HttpEndRequestW(req, task->flags, task->context);
 }

/***********************************************************************
@@ -5112,15 +5118,13 @@ BOOL WINAPI HttpEndRequestW(HINTERNET hRequest,

if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC)
     {
-        WORKREQUEST *task;
-        struct WORKREQ_HTTPENDREQUESTW *work_endrequest;
+        end_request_task_t *task;

task = alloc_async_task(&request->hdr, AsyncHttpEndRequestProc, sizeof(*task));
-        work_endrequest = &task->u.HttpEndRequestW;
-        work_endrequest->dwFlags = dwFlags;
-        work_endrequest->dwContext = dwContext;
+        task->flags = dwFlags;
+        task->context = dwContext;

-        INTERNET_AsyncCall(task);
+        INTERNET_AsyncCall(&task->hdr);
         res = ERROR_IO_PENDING;
     }
     else
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index a9c52e0..c61caf2 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -427,12 +427,6 @@ struct WORKREQ_FTPFINDNEXTW
     LPWIN32_FIND_DATAW lpFindFileData;
 };

-struct WORKREQ_HTTPENDREQUESTW
-{
-    DWORD     dwFlags;
-    DWORD_PTR dwContext;
-};
-
 struct WORKREQ_SENDCALLBACK
 {
     DWORD_PTR dwContext;
@@ -461,7 +455,6 @@ typedef struct WORKREQ
         struct WORKREQ_FTPREMOVEDIRECTORYW      FtpRemoveDirectoryW;
         struct WORKREQ_FTPRENAMEFILEW           FtpRenameFileW;
         struct WORKREQ_FTPFINDNEXTW             FtpFindNextW;
-        struct WORKREQ_HTTPENDREQUESTW          HttpEndRequestW;
         struct WORKREQ_SENDCALLBACK             SendCallback;
     } u;
 } WORKREQUEST, *LPWORKREQUEST;