Jacek Caban : wininet: Get rid of WORKREQ* types.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Jan 30 11:39:34 2013 +0100

wininet: Get rid of WORKREQ* types.

---

dlls/wininet/ftp.c      |    4 ++--
 dlls/wininet/http.c     |    4 ++--
 dlls/wininet/internet.c |    6 +++---
 dlls/wininet/internet.h |    8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 152e336..f0a6257 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1248,9 +1248,9 @@ static void FTP_ReceiveRequestData(ftp_file_t *file, BOOL first_notif)
                           sizeof(INTERNET_ASYNC_RESULT));
 }

-static void FTPFILE_AsyncQueryDataAvailableProc(WORKREQUEST *workRequest)
+static void FTPFILE_AsyncQueryDataAvailableProc(task_header_t *task)
 {
-    ftp_file_t *file = (ftp_file_t*)workRequest->hdr;
+    ftp_file_t *file = (ftp_file_t*)task->hdr;

FTP_ReceiveRequestData(file, FALSE);
 }
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 8d8ffec..d4c822d 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -2993,9 +2993,9 @@ static DWORD HTTPREQ_WriteFile(object_header_t *hdr, const void *buffer, DWORD s
     return res;
 }

-static void AsyncQueryDataAvailableProc(WORKREQUEST *workRequest)
+static void AsyncQueryDataAvailableProc(task_header_t *task)
 {
-    http_request_t *req = (http_request_t*)workRequest->hdr;
+    http_request_t *req = (http_request_t*)task->hdr;

HTTP_ReceiveRequestData(req, FALSE);
 }
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index dff24d9..384516c 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -3715,16 +3715,16 @@ void *alloc_async_task(object_header_t *hdr, async_task_proc_t proc, size_t size
  * RETURNS
  *
  */
-DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest)
+DWORD INTERNET_AsyncCall(task_header_t *task)
 {
     BOOL bSuccess;

TRACE("\n");

-    bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpWorkRequest, WT_EXECUTELONGFUNCTION);
+    bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, task, WT_EXECUTELONGFUNCTION);
     if (!bSuccess)
     {
-        heap_free(lpWorkRequest);
+        heap_free(task);
         return ERROR_INTERNET_ASYNC_THREAD_FAILED;
     }
     return ERROR_SUCCESS;
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index bcb7fe6..6d08db1 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -354,14 +354,14 @@ typedef struct
     netconn_stream_t netconn_stream;
 } http_request_t;

-typedef struct WORKREQ task_header_t;
+typedef struct task_header_t task_header_t;
 typedef void (*async_task_proc_t)(task_header_t*);

-typedef struct WORKREQ
+struct task_header_t
 {
     async_task_proc_t proc;
     object_header_t *hdr;
-} WORKREQUEST, *LPWORKREQUEST;
+};

void *alloc_async_task(object_header_t*,async_task_proc_t,size_t) DECLSPEC_HIDDEN;

@@ -393,7 +393,7 @@ BOOL set_cookie(const WCHAR*,const WCHAR*,const WCHAR*,const WCHAR*) DECLSPEC_HI

void INTERNET_SetLastError(DWORD dwError) DECLSPEC_HIDDEN;
 DWORD INTERNET_GetLastError(void) DECLSPEC_HIDDEN;
-DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest) DECLSPEC_HIDDEN;
+DWORD INTERNET_AsyncCall(task_header_t*) DECLSPEC_HIDDEN;
 LPSTR INTERNET_GetResponseBuffer(void) DECLSPEC_HIDDEN;
 LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen) DECLSPEC_HIDDEN;