Hans Leidekker : wininet: Pass the object header pointer to INET_QueryOption.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Tue May 25 12:19:32 2010 +0200

wininet: Pass the object header pointer to INET_QueryOption.

---

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

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 1f03199..80cc6f0 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -1176,7 +1176,7 @@ static DWORD FTPFILE_QueryOption(object_header_t *hdr, DWORD option, void *buffe
         }
     }
     }
-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static DWORD FTPFILE_ReadFile(object_header_t *hdr, void *buffer, DWORD size, DWORD *read)
@@ -2395,7 +2395,7 @@ static DWORD FTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *bu
         return ERROR_SUCCESS;
     }

-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static const object_vtbl_t FTPSESSIONVtbl = {
@@ -3476,7 +3476,7 @@ static DWORD FTPFINDNEXT_QueryOption(object_header_t *hdr, DWORD option, void *b
         return ERROR_SUCCESS;
     }

-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static DWORD FTPFINDNEXT_FindNextFileW(object_header_t *hdr, void *data)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index ac0edea..200d03f 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -1754,7 +1754,7 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe
     }
     }

-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size)
@@ -4166,7 +4166,7 @@ static DWORD HTTPSESSION_QueryOption(object_header_t *hdr, DWORD option, void *b
         return ERROR_SUCCESS;
     }

-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static DWORD HTTPSESSION_SetOption(object_header_t *hdr, DWORD option, void *buffer, DWORD size)
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 73e9e66..5159687 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -812,7 +812,7 @@ static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffe
         }
     }

-    return INET_QueryOption(option, buffer, size, unicode);
+    return INET_QueryOption(hdr, option, buffer, size, unicode);
 }

static const object_vtbl_t APPINFOVtbl = {
@@ -2194,7 +2194,7 @@ BOOL WINAPI InternetReadFileExW(HINTERNET hFile, LPINTERNET_BUFFERSW lpBuffer,
     return res == ERROR_SUCCESS;
 }

-DWORD INET_QueryOption(DWORD option, void *buffer, DWORD *size, BOOL unicode)
+DWORD INET_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
 {
     static BOOL warn = TRUE;

@@ -2388,7 +2388,7 @@ BOOL WINAPI InternetQueryOptionW(HINTERNET hInternet, DWORD dwOption,
             WININET_Release(hdr);
         }
     }else {
-        res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, TRUE);
+        res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, TRUE);
     }

if(res != ERROR_SUCCESS)
@@ -2421,7 +2421,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
             WININET_Release(hdr);
         }
     }else {
-        res = INET_QueryOption(dwOption, lpBuffer, lpdwBufferLength, FALSE);
+        res = INET_QueryOption(NULL, dwOption, lpBuffer, lpdwBufferLength, FALSE);
     }

if(res != ERROR_SUCCESS)
diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h
index 64bfdaa..07b92d8 100644
--- a/dlls/wininet/internet.h
+++ b/dlls/wininet/internet.h
@@ -389,7 +389,7 @@ object_header_t *WININET_AddRef( object_header_t *info );
 BOOL WININET_Release( object_header_t *info );
 BOOL WININET_FreeHandle( HINTERNET hinternet );

-DWORD INET_QueryOption(DWORD,void*,DWORD*,BOOL);
+DWORD INET_QueryOption( object_header_t *, DWORD, void *, DWORD *, BOOL );

time_t ConvertTimeString(LPCWSTR asctime);