Hans Leidekker : winhttp: Add stub implementations for WinHttpGetDefaultProxyConfiguration, WinHttpGetProxyForUrl and WinHttpSetDefaultProxyConfiguration.

[Alexandre Julliard]

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

Author: Hans Leidekker 
Date:   Fri Aug 15 14:43:23 2008 +0200

winhttp: Add stub implementations for WinHttpGetDefaultProxyConfiguration, WinHttpGetProxyForUrl and WinHttpSetDefaultProxyConfiguration.

---

dlls/winhttp/main.c       |   33 ---------------------
 dlls/winhttp/session.c    |   71 +++++++++++++++++++++++++++++++++++++++++++++
 dlls/winhttp/winhttp.spec |    6 ++--
 3 files changed, 74 insertions(+), 36 deletions(-)

diff --git a/dlls/winhttp/main.c b/dlls/winhttp/main.c
index 44a1e42..bec3cc0 100644
--- a/dlls/winhttp/main.c
+++ b/dlls/winhttp/main.c
@@ -84,39 +84,6 @@ HRESULT WINAPI DllUnregisterServer(void)
 }

/***********************************************************************
- *          WinHttpDetectAutoProxyConfigUrl (winhttp.@)
- */
-BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD flags, LPWSTR *url)
-{
-    FIXME("(%x %p)\n", flags, url);
-
-    SetLastError(ERROR_WINHTTP_AUTODETECTION_FAILED);
-    return FALSE;
-}
-
-/***********************************************************************
- *          WinHttpGetIEProxyConfigForCurrentUser (winhttp.@)
- */
-BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config)
-{
-    if(!config)
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-        return FALSE;
-    }
-
-    /* TODO: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */
-    FIXME("returning no proxy used\n");
-    config->fAutoDetect = FALSE;
-    config->lpszAutoConfigUrl = NULL;
-    config->lpszProxy = NULL;
-    config->lpszProxyBypass = NULL;
-
-    SetLastError(ERROR_SUCCESS);
-    return TRUE;
-}
-
-/***********************************************************************
  *          WinHttpSendRequest (winhttp.@)
  */
 BOOL WINAPI WinHttpSendRequest (HINTERNET hRequest, LPCWSTR pwszHeaders, DWORD dwHeadersLength,
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 26f229e..dd612ec 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -298,6 +298,77 @@ BOOL WINAPI WinHttpCloseHandle( HINTERNET handle )
 }

/***********************************************************************
+ *          WinHttpDetectAutoProxyConfigUrl (winhttp.@)
+ */
+BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url )
+{
+    FIXME("0x%08x, %p\n", flags, url);
+
+    set_last_error( ERROR_WINHTTP_AUTODETECTION_FAILED );
+    return FALSE;
+}
+
+/***********************************************************************
+ *          WinHttpGetDefaultProxyConfiguration (winhttp.@)
+ */
+BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
+{
+    FIXME("%p\n", info);
+
+    info->dwAccessType    = WINHTTP_ACCESS_TYPE_NO_PROXY;
+    info->lpszProxy       = NULL;
+    info->lpszProxyBypass = NULL;
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *          WinHttpGetIEProxyConfigForCurrentUser (winhttp.@)
+ */
+BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser( WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *config )
+{
+    TRACE("%p\n", config);
+
+    if (!config)
+    {
+        set_last_error( ERROR_INVALID_PARAMETER );
+        return FALSE;
+    }
+
+    /* FIXME: read from HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Internet Settings */
+
+    FIXME("returning no proxy used\n");
+    config->fAutoDetect       = FALSE;
+    config->lpszAutoConfigUrl = NULL;
+    config->lpszProxy         = NULL;
+    config->lpszProxyBypass   = NULL;
+
+    return TRUE;
+}
+
+/***********************************************************************
+ *          WinHttpGetProxyForUrl (winhttp.@)
+ */
+BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTOPROXY_OPTIONS *options,
+                                   WINHTTP_PROXY_INFO *info )
+{
+    FIXME("%p, %s, %p, %p\n", hsession, debugstr_w(url), options, info);
+
+    set_last_error( ERROR_WINHTTP_AUTO_PROXY_SERVICE_ERROR );
+    return FALSE;
+}
+
+/***********************************************************************
+ *          WinHttpSetDefaultProxyConfiguration (winhttp.@)
+ */
+BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
+{
+    FIXME("%p [%u, %s, %s]\n", info, info->dwAccessType, debugstr_w(info->lpszProxy),
+          debugstr_w(info->lpszProxyBypass));
+    return TRUE;
+}
+
+/***********************************************************************
  *          WinHttpSetStatusCallback (winhttp.@)
  */
 WINHTTP_STATUS_CALLBACK WINAPI WinHttpSetStatusCallback( HINTERNET handle, WINHTTP_STATUS_CALLBACK callback,
diff --git a/dlls/winhttp/winhttp.spec b/dlls/winhttp/winhttp.spec
index dc13d5d..e86fe60 100644
--- a/dlls/winhttp/winhttp.spec
+++ b/dlls/winhttp/winhttp.spec
@@ -9,9 +9,9 @@
 @ stub WinHttpCrackUrl
 @ stub WinHttpCreateUrl
 @ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr)
-@ stub WinHttpGetDefaultProxyConfiguration
+@ stdcall WinHttpGetDefaultProxyConfiguration(ptr)
 @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr)
-@ stub WinHttpGetProxyForUrl
+@ stdcall WinHttpGetProxyForUrl(ptr wstr ptr ptr)
 @ stdcall WinHttpOpen(wstr long wstr wstr long)
 @ stdcall WinHttpOpenRequest(ptr wstr wstr wstr wstr ptr long)
 @ stub WinHttpQueryAuthSchemes
@@ -22,7 +22,7 @@
 @ stdcall WinHttpReceiveResponse(ptr ptr)
 @ stdcall WinHttpSendRequest(ptr wstr long ptr long long ptr)
 @ stub WinHttpSetCredentials
-@ stub WinHttpSetDefaultProxyConfiguration
+@ stdcall WinHttpSetDefaultProxyConfiguration(ptr long long wstr ptr ptr)
 @ stdcall WinHttpSetOption(ptr long ptr long)
 @ stdcall WinHttpSetStatusCallback(ptr ptr long ptr)
 @ stub WinHttpSetTimeouts