* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "config.h"
+
+#ifdef HAVE_CORESERVICES_CORESERVICES_H
+#define GetCurrentThread MacGetCurrentThread
+#define LoadResource MacLoadResource
+#include <CoreServices/CoreServices.h>
+#undef GetCurrentThread
+#undef LoadResource
+#undef DPRINTF
+#endif
-#include <config.h>
-//#include "wine/port.h"
+#include "winsock2.h"
+#include "ws2ipdef.h"
-//#include <string.h>
-//#include <stdarg.h>
+#include <string.h>
+#include <stdarg.h>
#include <stdio.h>
-//#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_POLL_H
-#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-//#include <stdlib.h>
-//#include <ctype.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-//#include <assert.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
-#include <wininet.h>
-//#include "winineti.h"
-//#include "winnls.h"
-#include <wine/debug.h>
-//#include "winerror.h"
+#include <stdlib.h>
+#include <ctype.h>
+#include <assert.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winuser.h"
+#include "wininet.h"
+#include "winnls.h"
+#include "wine/debug.h"
+#include "winerror.h"
#define NO_SHLWAPI_STREAM
-#include <shlwapi.h>
+#include "shlwapi.h"
-#if defined(__MINGW32__) || defined (_MSC_VER)
-#include <ws2tcpip.h>
-#endif
-
-//#include "wine/exception.h"
+#include "wine/exception.h"
#include "internet.h"
#include "resource.h"
-//#include "wine/unicode.h"
+#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(wininet);
-#define RESPONSE_TIMEOUT 30
-
typedef struct
{
DWORD dwError;
DWORD proxyEnabled;
LPWSTR proxy;
LPWSTR proxyBypass;
+ LPWSTR proxyUsername;
+ LPWSTR proxyPassword;
} proxyinfo_t;
static ULONG max_conns = 2, max_1_0_conns = 4;
+static ULONG connect_timeout = 60000;
static const WCHAR szInternetSettings[] =
{ 'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0 };
static const WCHAR szProxyServer[] = { 'P','r','o','x','y','S','e','r','v','e','r', 0 };
static const WCHAR szProxyEnable[] = { 'P','r','o','x','y','E','n','a','b','l','e', 0 };
+static const WCHAR szProxyOverride[] = { 'P','r','o','x','y','O','v','e','r','r','i','d','e', 0 };
void *alloc_object(object_header_t *parent, const object_vtbl_t *vtbl, size_t size)
{
handle_table[handle] = ret;
ret->valid_handle = TRUE;
- while(handle_table[next_handle] && next_handle < handle_table_size)
+ while(next_handle < handle_table_size && handle_table[next_handle])
next_handle++;
}
if (g_dwTlsErrIndex == TLS_OUT_OF_INDEXES)
return FALSE;
-#ifndef __REACTOS__
- URLCacheContainers_CreateDefaults();
-#endif
+ if(!init_urlcache())
+ {
+ TlsFree(g_dwTlsErrIndex);
+ return FALSE;
+ }
WININET_hModule = hinstDLL;
break;
break;
case DLL_PROCESS_DETACH:
- collect_connections(TRUE);
+ if (lpvReserved) break;
+ collect_connections(COLLECT_CLEANUP);
NETCON_unload();
- URLCacheContainers_DeleteAll();
+ free_urlcache();
+ free_cookie();
if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES)
{
return TRUE;
}
+/***********************************************************************
+ * DllInstall (WININET.@)
+ */
+HRESULT WINAPI DllInstall(BOOL bInstall, LPCWSTR cmdline)
+{
+ FIXME("(%x %s): stub\n", bInstall, debugstr_w(cmdline));
+ return S_OK;
+}
+
/***********************************************************************
* INTERNET_SaveProxySettings
*
}
else
{
- if ((ret = RegDeleteValueW( key, szProxyServer )))
+ if ((ret = RegDeleteValueW( key, szProxyServer )) && ret != ERROR_FILE_NOT_FOUND)
{
RegCloseKey( key );
return ret;
* *foundProxyLen is set to the required size in WCHARs, including the
* NULL terminator, and the last error is set to ERROR_INSUFFICIENT_BUFFER.
*/
-BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundProxy, DWORD *foundProxyLen)
+WCHAR *INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto)
{
- LPCWSTR ptr;
- BOOL ret = FALSE;
+ WCHAR *ret = NULL;
+ const WCHAR *ptr;
TRACE("(%s, %s)\n", debugstr_w(szProxy), debugstr_w(proto));
/* First, look for the specified protocol (proto=scheme://host:port) */
- for (ptr = szProxy; !ret && ptr && *ptr; )
+ for (ptr = szProxy; ptr && *ptr; )
{
LPCWSTR end, equal;
equal - ptr == strlenW(proto) &&
!strncmpiW(proto, ptr, strlenW(proto)))
{
- if (end - equal > *foundProxyLen)
- {
- WARN("buffer too short for %s\n",
- debugstr_wn(equal + 1, end - equal - 1));
- *foundProxyLen = end - equal;
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
- }
- else
- {
- memcpy(foundProxy, equal + 1, (end - equal) * sizeof(WCHAR));
- foundProxy[end - equal] = 0;
- ret = TRUE;
- }
+ ret = heap_strndupW(equal + 1, end - equal - 1);
+ TRACE("found proxy for %s: %s\n", debugstr_w(proto), debugstr_w(ret));
+ return ret;
}
if (*end == ' ')
ptr = end + 1;
else
ptr = end;
}
- if (!ret)
+
+ /* It wasn't found: look for no protocol */
+ for (ptr = szProxy; ptr && *ptr; )
{
- /* It wasn't found: look for no protocol */
- for (ptr = szProxy; !ret && ptr && *ptr; )
- {
- LPCWSTR end, equal;
+ LPCWSTR end;
- if (!(end = strchrW(ptr, ' ')))
- end = ptr + strlenW(ptr);
- if (!(equal = strchrW(ptr, '=')))
- {
- if (end - ptr + 1 > *foundProxyLen)
- {
- WARN("buffer too short for %s\n",
- debugstr_wn(ptr, end - ptr));
- *foundProxyLen = end - ptr + 1;
- SetLastError(ERROR_INSUFFICIENT_BUFFER);
- }
- else
- {
- memcpy(foundProxy, ptr, (end - ptr) * sizeof(WCHAR));
- foundProxy[end - ptr] = 0;
- ret = TRUE;
- }
- }
- if (*end == ' ')
- ptr = end + 1;
- else
- ptr = end;
+ if (!(end = strchrW(ptr, ' ')))
+ end = ptr + strlenW(ptr);
+ if (!strchrW(ptr, '='))
+ {
+ ret = heap_strndupW(ptr, end - ptr);
+ TRACE("found proxy for %s: %s\n", debugstr_w(proto), debugstr_w(ret));
+ return ret;
}
+ if (*end == ' ')
+ ptr = end + 1;
+ else
+ ptr = end;
}
- if (ret)
- TRACE("found proxy for %s: %s\n", debugstr_w(proto),
- debugstr_w(foundProxy));
- return ret;
+
+ return NULL;
}
/***********************************************************************
{
heap_free(lpwpi->proxy);
heap_free(lpwpi->proxyBypass);
+ heap_free(lpwpi->proxyUsername);
+ heap_free(lpwpi->proxyPassword);
}
static proxyinfo_t *global_proxy;
LeaveCriticalSection( &WININET_cs );
}
+static BOOL parse_proxy_url( proxyinfo_t *info, const WCHAR *url )
+{
+ static const WCHAR fmt[] = {'%','.','*','s',':','%','u',0};
+ URL_COMPONENTSW uc = {sizeof(uc)};
+
+ uc.dwHostNameLength = 1;
+ uc.dwUserNameLength = 1;
+ uc.dwPasswordLength = 1;
+
+ if (!InternetCrackUrlW( url, 0, 0, &uc )) return FALSE;
+ if (!uc.dwHostNameLength)
+ {
+ if (!(info->proxy = heap_strdupW( url ))) return FALSE;
+ info->proxyUsername = NULL;
+ info->proxyPassword = NULL;
+ return TRUE;
+ }
+ if (!(info->proxy = heap_alloc( (uc.dwHostNameLength + 12) * sizeof(WCHAR) ))) return FALSE;
+ sprintfW( info->proxy, fmt, uc.dwHostNameLength, uc.lpszHostName, uc.nPort );
+
+ if (!uc.dwUserNameLength) info->proxyUsername = NULL;
+ else if (!(info->proxyUsername = heap_strndupW( uc.lpszUserName, uc.dwUserNameLength )))
+ {
+ heap_free( info->proxy );
+ return FALSE;
+ }
+ if (!uc.dwPasswordLength) info->proxyPassword = NULL;
+ else if (!(info->proxyPassword = heap_strndupW( uc.lpszPassword, uc.dwPasswordLength )))
+ {
+ heap_free( info->proxyUsername );
+ heap_free( info->proxy );
+ return FALSE;
+ }
+ return TRUE;
+}
+
/***********************************************************************
* INTERNET_LoadProxySettings
*
LPCSTR envproxy;
LONG ret;
+ memset( lpwpi, 0, sizeof(*lpwpi) );
+
EnterCriticalSection( &WININET_cs );
if (global_proxy)
{
LeaveCriticalSection( &WININET_cs );
if ((ret = RegOpenKeyW( HKEY_CURRENT_USER, szInternetSettings, &key )))
+ {
+ FreeProxyInfo( lpwpi );
return ret;
+ }
len = sizeof(DWORD);
if (RegQueryValueExW( key, szProxyEnable, NULL, &type, (BYTE *)&lpwpi->proxyEnabled, &len ) || type != REG_DWORD)
lpwpi->proxyEnabled = 0;
if((ret = RegSetValueExW( key, szProxyEnable, 0, REG_DWORD, (BYTE *)&lpwpi->proxyEnabled, sizeof(DWORD) )))
{
+ FreeProxyInfo( lpwpi );
RegCloseKey( key );
return ret;
}
if (!(envproxy = getenv( "http_proxy" )) || lpwpi->proxyEnabled)
{
- TRACE("Proxy is enabled.\n");
-
/* figure out how much memory the proxy setting takes */
if (!RegQueryValueExW( key, szProxyServer, NULL, &type, NULL, &len ) && len && (type == REG_SZ))
{
if (!(szProxy = heap_alloc(len)))
{
RegCloseKey( key );
+ FreeProxyInfo( lpwpi );
return ERROR_OUTOFMEMORY;
}
RegQueryValueExW( key, szProxyServer, NULL, &type, (BYTE*)szProxy, &len );
p += lstrlenW( szHttp );
lstrcpyW( szProxy, p );
}
- p = strchrW( szProxy, ' ' );
+ p = strchrW( szProxy, ';' );
if (p) *p = 0;
+ FreeProxyInfo( lpwpi );
lpwpi->proxy = szProxy;
+ lpwpi->proxyBypass = NULL;
- TRACE("http proxy = %s\n", debugstr_w(lpwpi->proxy));
+ TRACE("http proxy (from registry) = %s\n", debugstr_w(lpwpi->proxy));
}
else
{
TRACE("No proxy server settings in registry.\n");
+ FreeProxyInfo( lpwpi );
lpwpi->proxy = NULL;
+ lpwpi->proxyBypass = NULL;
}
}
else if (envproxy)
len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 );
if (!(envproxyW = heap_alloc(len * sizeof(WCHAR))))
+ {
+ RegCloseKey( key );
return ERROR_OUTOFMEMORY;
+ }
MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len );
- lpwpi->proxyEnabled = 1;
- lpwpi->proxy = envproxyW;
-
- TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy));
+ FreeProxyInfo( lpwpi );
+ if (parse_proxy_url( lpwpi, envproxyW ))
+ {
+ TRACE("http proxy (from environment) = %s\n", debugstr_w(lpwpi->proxy));
+ lpwpi->proxyEnabled = 1;
+ lpwpi->proxyBypass = NULL;
+ }
+ else
+ {
+ WARN("failed to parse http_proxy value %s\n", debugstr_w(envproxyW));
+ lpwpi->proxyEnabled = 0;
+ lpwpi->proxy = NULL;
+ lpwpi->proxyBypass = NULL;
+ }
+ heap_free( envproxyW );
}
- RegCloseKey( key );
- lpwpi->proxyBypass = NULL;
+ if (lpwpi->proxyEnabled)
+ {
+ TRACE("Proxy is enabled.\n");
+
+ if (!(envproxy = getenv( "no_proxy" )))
+ {
+ /* figure out how much memory the proxy setting takes */
+ if (!RegQueryValueExW( key, szProxyOverride, NULL, &type, NULL, &len ) && len && (type == REG_SZ))
+ {
+ LPWSTR szProxy;
+
+ if (!(szProxy = heap_alloc(len)))
+ {
+ RegCloseKey( key );
+ return ERROR_OUTOFMEMORY;
+ }
+ RegQueryValueExW( key, szProxyOverride, NULL, &type, (BYTE*)szProxy, &len );
+ heap_free( lpwpi->proxyBypass );
+ lpwpi->proxyBypass = szProxy;
+
+ TRACE("http proxy bypass (from registry) = %s\n", debugstr_w(lpwpi->proxyBypass));
+ }
+ else
+ {
+ heap_free( lpwpi->proxyBypass );
+ lpwpi->proxyBypass = NULL;
+
+ TRACE("No proxy bypass server settings in registry.\n");
+ }
+ }
+ else
+ {
+ WCHAR *envproxyW;
+
+ len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 );
+ if (!(envproxyW = heap_alloc(len * sizeof(WCHAR))))
+ {
+ RegCloseKey( key );
+ return ERROR_OUTOFMEMORY;
+ }
+ MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len );
+
+ heap_free( lpwpi->proxyBypass );
+ lpwpi->proxyBypass = envproxyW;
+
+ TRACE("http proxy bypass (from environment) = %s\n", debugstr_w(lpwpi->proxyBypass));
+ }
+ }
+ else TRACE("Proxy is disabled.\n");
+
+ RegCloseKey( key );
return ERROR_SUCCESS;
}
if (wpi.proxyEnabled)
{
- WCHAR proxyurl[INTERNET_MAX_URL_LENGTH];
- WCHAR username[INTERNET_MAX_USER_NAME_LENGTH];
- WCHAR password[INTERNET_MAX_PASSWORD_LENGTH];
- WCHAR hostname[INTERNET_MAX_HOST_NAME_LENGTH];
- URL_COMPONENTSW UrlComponents;
-
- UrlComponents.dwStructSize = sizeof UrlComponents;
- UrlComponents.dwSchemeLength = 0;
- UrlComponents.lpszHostName = hostname;
- UrlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
- UrlComponents.lpszUserName = username;
- UrlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH;
- UrlComponents.lpszPassword = password;
- UrlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH;
- UrlComponents.dwUrlPathLength = 0;
- UrlComponents.dwExtraInfoLength = 0;
-
- if(InternetCrackUrlW(wpi.proxy, 0, 0, &UrlComponents))
- {
- static const WCHAR szFormat[] = { 'h','t','t','p',':','/','/','%','s',':','%','u',0 };
-
- if(UrlComponents.nPort == INTERNET_INVALID_PORT_NUMBER)
- UrlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
- sprintfW(proxyurl, szFormat, hostname, UrlComponents.nPort);
+ TRACE("http proxy = %s bypass = %s\n", debugstr_w(wpi.proxy), debugstr_w(wpi.proxyBypass));
- lpwai->accessType = INTERNET_OPEN_TYPE_PROXY;
- lpwai->proxy = heap_strdupW(proxyurl);
- if (UrlComponents.dwUserNameLength)
- {
- lpwai->proxyUsername = heap_strdupW(UrlComponents.lpszUserName);
- lpwai->proxyPassword = heap_strdupW(UrlComponents.lpszPassword);
- }
-
- TRACE("http proxy = %s\n", debugstr_w(lpwai->proxy));
- return TRUE;
- }
- else
- {
- TRACE("Failed to parse proxy: %s\n", debugstr_w(wpi.proxy));
- lpwai->proxy = NULL;
- }
+ lpwai->accessType = INTERNET_OPEN_TYPE_PROXY;
+ lpwai->proxy = wpi.proxy;
+ lpwai->proxyBypass = wpi.proxyBypass;
+ lpwai->proxyUsername = wpi.proxyUsername;
+ lpwai->proxyPassword = wpi.proxyPassword;
+ return TRUE;
}
lpwai->accessType = INTERNET_OPEN_TYPE_DIRECT;
+ FreeProxyInfo(&wpi);
return FALSE;
}
heap_free(lpwai->proxyBypass);
heap_free(lpwai->proxyUsername);
heap_free(lpwai->proxyPassword);
-#ifdef __REACTOS__
- WSACleanup();
-#endif
}
static DWORD APPINFO_QueryOption(object_header_t *hdr, DWORD option, void *buffer, DWORD *size, BOOL unicode)
/* If the buffer is copied, the returned length doesn't include
* the NULL terminator.
*/
- *size = len * sizeof(WCHAR);
+ *size = len;
}else {
if (ai->agent)
*size = WideCharToMultiByte(CP_ACP, 0, ai->agent, -1, NULL, 0, NULL, NULL);
proxyBytesRequired = (lstrlenW(ai->proxy) + 1) * sizeof(WCHAR);
if (ai->proxyBypass)
proxyBypassBytesRequired = (lstrlenW(ai->proxyBypass) + 1) * sizeof(WCHAR);
- if (*size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired)
+ if (!pi || *size < sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired)
{
*size = sizeof(INTERNET_PROXY_INFOW) + proxyBytesRequired + proxyBypassBytesRequired;
return ERROR_INSUFFICIENT_BUFFER;
if (ai->proxyBypass)
proxyBypassBytesRequired = WideCharToMultiByte(CP_ACP, 0, ai->proxyBypass, -1,
NULL, 0, NULL, NULL);
- if (*size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired)
+ if (!pi || *size < sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired)
{
*size = sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired;
return ERROR_INSUFFICIENT_BUFFER;
*size = sizeof(INTERNET_PROXY_INFOA) + proxyBytesRequired + proxyBypassBytesRequired;
return ERROR_SUCCESS;
}
+
+ case INTERNET_OPTION_CONNECT_TIMEOUT:
+ TRACE("INTERNET_OPTION_CONNECT_TIMEOUT\n");
+
+ if (*size < sizeof(ULONG))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *(ULONG*)buffer = ai->connect_timeout;
+ *size = sizeof(ULONG);
+
+ return ERROR_SUCCESS;
}
return INET_QueryOption(hdr, option, buffer, size, unicode);
}
+static DWORD APPINFO_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size)
+{
+ appinfo_t *ai = (appinfo_t*)hdr;
+
+ switch(option) {
+ case INTERNET_OPTION_CONNECT_TIMEOUT:
+ TRACE("INTERNET_OPTION_CONNECT_TIMEOUT\n");
+
+ if(size != sizeof(connect_timeout))
+ return ERROR_INTERNET_BAD_OPTION_LENGTH;
+ if(!*(ULONG*)buf)
+ return ERROR_BAD_ARGUMENTS;
+
+ ai->connect_timeout = *(ULONG*)buf;
+ return ERROR_SUCCESS;
+ case INTERNET_OPTION_USER_AGENT:
+ heap_free(ai->agent);
+ if (!(ai->agent = heap_strdupW(buf))) return ERROR_OUTOFMEMORY;
+ return ERROR_SUCCESS;
+ case INTERNET_OPTION_REFRESH:
+ FIXME("INTERNET_OPTION_REFRESH\n");
+ return ERROR_SUCCESS;
+ }
+
+ return INET_SetOption(hdr, option, buf, size);
+}
+
static const object_vtbl_t APPINFOVtbl = {
APPINFO_Destroy,
NULL,
APPINFO_QueryOption,
- INET_SetOption,
- NULL,
- NULL,
+ APPINFO_SetOption,
NULL,
NULL,
NULL
LPCWSTR lpszProxy, LPCWSTR lpszProxyBypass, DWORD dwFlags)
{
appinfo_t *lpwai = NULL;
+
#ifdef __REACTOS__
- WSADATA wsaData;
- int error = WSAStartup(MAKEWORD(2, 2), &wsaData);
- if (error) ERR("WSAStartup failed: %d\n", error);
+ init_winsock();
#endif
-
if (TRACE_ON(wininet)) {
#define FE(x) { x, #x }
static const wininet_flag_info access_type[] = {
/* Clear any error information */
INTERNET_SetLastError(0);
+ if((dwAccessType == INTERNET_OPEN_TYPE_PROXY) && !lpszProxy) {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return NULL;
+ }
+
lpwai = alloc_object(NULL, &APPINFOVtbl, sizeof(appinfo_t));
if (!lpwai) {
SetLastError(ERROR_OUTOFMEMORY);
lpwai->accessType = dwAccessType;
lpwai->proxyUsername = NULL;
lpwai->proxyPassword = NULL;
+ lpwai->connect_timeout = connect_timeout;
lpwai->agent = heap_strdupW(lpszAgent);
if(dwAccessType == INTERNET_OPEN_TYPE_PRECONFIG)
INTERNET_ConfigureProxy( lpwai );
- else
+ else if(dwAccessType == INTERNET_OPEN_TYPE_PROXY) {
lpwai->proxy = heap_strdupW(lpszProxy);
- lpwai->proxyBypass = heap_strdupW(lpszProxyBypass);
+ lpwai->proxyBypass = heap_strdupW(lpszProxyBypass);
+ }
TRACE("returning %p\n", lpwai);
{
TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved);
- if (lpdwStatus) {
- WARN("always returning LAN connection.\n");
- *lpdwStatus = INTERNET_CONNECTION_LAN;
- }
- return TRUE;
+ return InternetGetConnectedStateExW(lpdwStatus, NULL, 0, dwReserved);
}
/* Must be zero */
if(dwReserved)
- return FALSE;
+ return FALSE;
if (lpdwStatus) {
WARN("always returning LAN connection.\n");
*lpdwStatus = INTERNET_CONNECTION_LAN;
}
- return LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen);
+
+ /* When the buffer size is zero LoadStringW fills the buffer with a pointer to
+ * the resource, avoid it as we must not change the buffer in this case */
+ if(lpszConnectionName && dwNameLen) {
+ *lpszConnectionName = '\0';
+ LoadStringW(WININET_hModule, IDS_LANCONNECTION, lpszConnectionName, dwNameLen);
+ }
+
+ return TRUE;
}
rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen,
dwReserved);
if (rc && lpwszConnectionName)
- {
WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName,
dwNameLen, NULL, NULL);
- heap_free(lpwszConnectionName);
- }
+
+ heap_free(lpwszConnectionName);
return rc;
}
HINTERNET rc = NULL;
DWORD res = ERROR_SUCCESS;
- TRACE("(%p, %s, %i, %s, %s, %i, %i, %lx)\n", hInternet, debugstr_w(lpszServerName),
- nServerPort, debugstr_w(lpszUserName), debugstr_w(lpszPassword),
- dwService, dwFlags, dwContext);
+ TRACE("(%p, %s, %u, %s, %p, %u, %x, %lx)\n", hInternet, debugstr_w(lpszServerName),
+ nServerPort, debugstr_w(lpszUserName), lpszPassword, dwService, dwFlags, dwContext);
if (!lpszServerName)
{
return TRUE;
}
+static BOOL set_url_component(WCHAR **component, DWORD *component_length, const WCHAR *value, DWORD len)
+{
+ TRACE("%s (%d)\n", debugstr_wn(value, len), len);
-/***********************************************************************
- * ConvertUrlComponentValue (Internal)
- *
- * Helper function for InternetCrackUrlA
- *
- */
-static void ConvertUrlComponentValue(LPSTR* lppszComponent, LPDWORD dwComponentLen,
- LPWSTR lpwszComponent, DWORD dwwComponentLen,
- LPCSTR lpszStart, LPCWSTR lpwszStart)
+ if (!*component_length)
+ return TRUE;
+
+ if (!*component) {
+ *(const WCHAR**)component = value;
+ *component_length = len;
+ return TRUE;
+ }
+
+ if (*component_length < len+1) {
+ SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ return FALSE;
+ }
+
+ *component_length = len;
+ if(len)
+ memcpy(*component, value, len*sizeof(WCHAR));
+ (*component)[len] = 0;
+ return TRUE;
+}
+
+static BOOL set_url_component_WtoA(const WCHAR *comp_w, DWORD length, const WCHAR *url_w, char **comp, DWORD *ret_length,
+ const char *url_a)
{
- TRACE("%p %d %p %d %p %p\n", *lppszComponent, *dwComponentLen, lpwszComponent, dwwComponentLen, lpszStart, lpwszStart);
- if (*dwComponentLen != 0)
- {
- DWORD nASCIILength=WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,NULL,0,NULL,NULL);
- if (*lppszComponent == NULL)
- {
- if (lpwszComponent)
- {
- int offset = WideCharToMultiByte(CP_ACP, 0, lpwszStart, lpwszComponent-lpwszStart, NULL, 0, NULL, NULL);
- *lppszComponent = (LPSTR)lpszStart + offset;
- }
- else
- *lppszComponent = NULL;
+ size_t size, ret_size = *ret_length;
- *dwComponentLen = nASCIILength;
- }
- else
- {
- DWORD ncpylen = min((*dwComponentLen)-1, nASCIILength);
- WideCharToMultiByte(CP_ACP,0,lpwszComponent,dwwComponentLen,*lppszComponent,ncpylen+1,NULL,NULL);
- (*lppszComponent)[ncpylen]=0;
- *dwComponentLen = ncpylen;
- }
+ if (!*ret_length)
+ return TRUE;
+ size = WideCharToMultiByte(CP_ACP, 0, comp_w, length, NULL, 0, NULL, NULL);
+
+ if (!*comp) {
+ *comp = comp_w ? (char*)url_a + WideCharToMultiByte(CP_ACP, 0, url_w, comp_w-url_w, NULL, 0, NULL, NULL) : NULL;
+ *ret_length = size;
+ return TRUE;
+ }
+
+ if (size+1 > ret_size) {
+ SetLastError(ERROR_INSUFFICIENT_BUFFER);
+ *ret_length = size+1;
+ return FALSE;
}
+
+ *ret_length = size;
+ WideCharToMultiByte(CP_ACP, 0, comp_w, length, *comp, ret_size-1, NULL, NULL);
+ (*comp)[size] = 0;
+ return TRUE;
}
+static BOOL set_url_component_AtoW(const char *comp_a, DWORD len_a, WCHAR **comp_w, DWORD *len_w, WCHAR **buf)
+{
+ *len_w = len_a;
+
+ if(!comp_a) {
+ *comp_w = NULL;
+ return TRUE;
+ }
+
+ if(!(*comp_w = *buf = heap_alloc(len_a*sizeof(WCHAR)))) {
+ SetLastError(ERROR_OUTOFMEMORY);
+ return FALSE;
+ }
+
+ return TRUE;
+}
/***********************************************************************
* InternetCrackUrlA (WININET.@)
*
* See InternetCrackUrlW.
*/
-BOOL WINAPI InternetCrackUrlA(LPCSTR lpszUrl, DWORD dwUrlLength, DWORD dwFlags,
- LPURL_COMPONENTSA lpUrlComponents)
+BOOL WINAPI InternetCrackUrlA(const char *url, DWORD url_length, DWORD flags, URL_COMPONENTSA *ret_comp)
{
- DWORD nLength;
- URL_COMPONENTSW UCW;
- BOOL ret = FALSE;
- WCHAR *lpwszUrl, *hostname = NULL, *username = NULL, *password = NULL, *path = NULL,
- *scheme = NULL, *extra = NULL;
-
- TRACE("(%s %u %x %p)\n",
- lpszUrl ? debugstr_an(lpszUrl, dwUrlLength ? dwUrlLength : strlen(lpszUrl)) : "(null)",
- dwUrlLength, dwFlags, lpUrlComponents);
-
- if (!lpszUrl || !*lpszUrl || !lpUrlComponents ||
- lpUrlComponents->dwStructSize != sizeof(URL_COMPONENTSA))
- {
- INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
- return FALSE;
- }
+ WCHAR *host = NULL, *user = NULL, *pass = NULL, *path = NULL, *scheme = NULL, *extra = NULL;
+ URL_COMPONENTSW comp;
+ WCHAR *url_w = NULL;
+ BOOL ret;
- if(dwUrlLength<=0)
- dwUrlLength=-1;
- nLength=MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,NULL,0);
+ TRACE("(%s %u %x %p)\n", url_length ? debugstr_an(url, url_length) : debugstr_a(url), url_length, flags, ret_comp);
- /* if dwUrlLength=-1 then nLength includes null but length to
- InternetCrackUrlW should not include it */
- if (dwUrlLength == -1) nLength--;
+ if (!url || !*url || !ret_comp || ret_comp->dwStructSize != sizeof(URL_COMPONENTSA)) {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
- lpwszUrl = heap_alloc((nLength + 1) * sizeof(WCHAR));
- MultiByteToWideChar(CP_ACP,0,lpszUrl,dwUrlLength,lpwszUrl,nLength + 1);
- lpwszUrl[nLength] = '\0';
+ comp.dwStructSize = sizeof(comp);
- memset(&UCW,0,sizeof(UCW));
- UCW.dwStructSize = sizeof(URL_COMPONENTSW);
- if (lpUrlComponents->dwHostNameLength)
- {
- UCW.dwHostNameLength = lpUrlComponents->dwHostNameLength;
- if (lpUrlComponents->lpszHostName)
- {
- hostname = heap_alloc(UCW.dwHostNameLength * sizeof(WCHAR));
- UCW.lpszHostName = hostname;
- }
- }
- if (lpUrlComponents->dwUserNameLength)
- {
- UCW.dwUserNameLength = lpUrlComponents->dwUserNameLength;
- if (lpUrlComponents->lpszUserName)
- {
- username = heap_alloc(UCW.dwUserNameLength * sizeof(WCHAR));
- UCW.lpszUserName = username;
- }
- }
- if (lpUrlComponents->dwPasswordLength)
- {
- UCW.dwPasswordLength = lpUrlComponents->dwPasswordLength;
- if (lpUrlComponents->lpszPassword)
- {
- password = heap_alloc(UCW.dwPasswordLength * sizeof(WCHAR));
- UCW.lpszPassword = password;
- }
- }
- if (lpUrlComponents->dwUrlPathLength)
- {
- UCW.dwUrlPathLength = lpUrlComponents->dwUrlPathLength;
- if (lpUrlComponents->lpszUrlPath)
- {
- path = heap_alloc(UCW.dwUrlPathLength * sizeof(WCHAR));
- UCW.lpszUrlPath = path;
- }
- }
- if (lpUrlComponents->dwSchemeLength)
- {
- UCW.dwSchemeLength = lpUrlComponents->dwSchemeLength;
- if (lpUrlComponents->lpszScheme)
- {
- scheme = heap_alloc(UCW.dwSchemeLength * sizeof(WCHAR));
- UCW.lpszScheme = scheme;
- }
- }
- if (lpUrlComponents->dwExtraInfoLength)
- {
- UCW.dwExtraInfoLength = lpUrlComponents->dwExtraInfoLength;
- if (lpUrlComponents->lpszExtraInfo)
- {
- extra = heap_alloc(UCW.dwExtraInfoLength * sizeof(WCHAR));
- UCW.lpszExtraInfo = extra;
+ ret = set_url_component_AtoW(ret_comp->lpszHostName, ret_comp->dwHostNameLength,
+ &comp.lpszHostName, &comp.dwHostNameLength, &host)
+ && set_url_component_AtoW(ret_comp->lpszUserName, ret_comp->dwUserNameLength,
+ &comp.lpszUserName, &comp.dwUserNameLength, &user)
+ && set_url_component_AtoW(ret_comp->lpszPassword, ret_comp->dwPasswordLength,
+ &comp.lpszPassword, &comp.dwPasswordLength, &pass)
+ && set_url_component_AtoW(ret_comp->lpszUrlPath, ret_comp->dwUrlPathLength,
+ &comp.lpszUrlPath, &comp.dwUrlPathLength, &path)
+ && set_url_component_AtoW(ret_comp->lpszScheme, ret_comp->dwSchemeLength,
+ &comp.lpszScheme, &comp.dwSchemeLength, &scheme)
+ && set_url_component_AtoW(ret_comp->lpszExtraInfo, ret_comp->dwExtraInfoLength,
+ &comp.lpszExtraInfo, &comp.dwExtraInfoLength, &extra);
+
+ if(ret && !(url_w = heap_strndupAtoW(url, url_length ? url_length : -1, &url_length))) {
+ SetLastError(ERROR_OUTOFMEMORY);
+ ret = FALSE;
}
- }
- if ((ret = InternetCrackUrlW(lpwszUrl, nLength, dwFlags, &UCW)))
- {
- ConvertUrlComponentValue(&lpUrlComponents->lpszHostName, &lpUrlComponents->dwHostNameLength,
- UCW.lpszHostName, UCW.dwHostNameLength, lpszUrl, lpwszUrl);
- ConvertUrlComponentValue(&lpUrlComponents->lpszUserName, &lpUrlComponents->dwUserNameLength,
- UCW.lpszUserName, UCW.dwUserNameLength, lpszUrl, lpwszUrl);
- ConvertUrlComponentValue(&lpUrlComponents->lpszPassword, &lpUrlComponents->dwPasswordLength,
- UCW.lpszPassword, UCW.dwPasswordLength, lpszUrl, lpwszUrl);
- ConvertUrlComponentValue(&lpUrlComponents->lpszUrlPath, &lpUrlComponents->dwUrlPathLength,
- UCW.lpszUrlPath, UCW.dwUrlPathLength, lpszUrl, lpwszUrl);
- ConvertUrlComponentValue(&lpUrlComponents->lpszScheme, &lpUrlComponents->dwSchemeLength,
- UCW.lpszScheme, UCW.dwSchemeLength, lpszUrl, lpwszUrl);
- ConvertUrlComponentValue(&lpUrlComponents->lpszExtraInfo, &lpUrlComponents->dwExtraInfoLength,
- UCW.lpszExtraInfo, UCW.dwExtraInfoLength, lpszUrl, lpwszUrl);
-
- lpUrlComponents->nScheme = UCW.nScheme;
- lpUrlComponents->nPort = UCW.nPort;
-
- TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_a(lpszUrl),
- debugstr_an(lpUrlComponents->lpszScheme, lpUrlComponents->dwSchemeLength),
- debugstr_an(lpUrlComponents->lpszHostName, lpUrlComponents->dwHostNameLength),
- debugstr_an(lpUrlComponents->lpszUrlPath, lpUrlComponents->dwUrlPathLength),
- debugstr_an(lpUrlComponents->lpszExtraInfo, lpUrlComponents->dwExtraInfoLength));
- }
- heap_free(lpwszUrl);
- heap_free(hostname);
- heap_free(username);
- heap_free(password);
- heap_free(path);
- heap_free(scheme);
- heap_free(extra);
- return ret;
+
+ if (ret && (ret = InternetCrackUrlW(url_w, url_length, flags, &comp))) {
+ ret_comp->nScheme = comp.nScheme;
+ ret_comp->nPort = comp.nPort;
+
+ ret = set_url_component_WtoA(comp.lpszHostName, comp.dwHostNameLength, url_w,
+ &ret_comp->lpszHostName, &ret_comp->dwHostNameLength, url)
+ && set_url_component_WtoA(comp.lpszUserName, comp.dwUserNameLength, url_w,
+ &ret_comp->lpszUserName, &ret_comp->dwUserNameLength, url)
+ && set_url_component_WtoA(comp.lpszPassword, comp.dwPasswordLength, url_w,
+ &ret_comp->lpszPassword, &ret_comp->dwPasswordLength, url)
+ && set_url_component_WtoA(comp.lpszUrlPath, comp.dwUrlPathLength, url_w,
+ &ret_comp->lpszUrlPath, &ret_comp->dwUrlPathLength, url)
+ && set_url_component_WtoA(comp.lpszScheme, comp.dwSchemeLength, url_w,
+ &ret_comp->lpszScheme, &ret_comp->dwSchemeLength, url)
+ && set_url_component_WtoA(comp.lpszExtraInfo, comp.dwExtraInfoLength, url_w,
+ &ret_comp->lpszExtraInfo, &ret_comp->dwExtraInfoLength, url);
+
+ if(ret)
+ TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_a(url),
+ debugstr_an(ret_comp->lpszScheme, ret_comp->dwSchemeLength),
+ debugstr_an(ret_comp->lpszHostName, ret_comp->dwHostNameLength),
+ debugstr_an(ret_comp->lpszUrlPath, ret_comp->dwUrlPathLength),
+ debugstr_an(ret_comp->lpszExtraInfo, ret_comp->dwExtraInfoLength));
+ }
+
+ heap_free(host);
+ heap_free(user);
+ heap_free(pass);
+ heap_free(path);
+ heap_free(scheme);
+ heap_free(extra);
+ heap_free(url_w);
+ return ret;
}
static const WCHAR url_schemes[][7] =
return INTERNET_SCHEME_UNKNOWN;
for (i = 0; i < sizeof(url_schemes)/sizeof(url_schemes[0]); i++)
- if (!strncmpW(lpszScheme, url_schemes[i], nMaxCmp))
+ if (!strncmpiW(lpszScheme, url_schemes[i], nMaxCmp))
return INTERNET_SCHEME_FIRST + i;
return INTERNET_SCHEME_UNKNOWN;
}
-/***********************************************************************
- * SetUrlComponentValueW (Internal)
- *
- * Helper function for InternetCrackUrlW
- *
- * PARAMS
- * lppszComponent [O] Holds the returned string
- * dwComponentLen [I] Holds the size of lppszComponent
- * [O] Holds the length of the string in lppszComponent without '\0'
- * lpszStart [I] Holds the string to copy from
- * len [I] Holds the length of lpszStart without '\0'
- *
- * RETURNS
- * TRUE on success
- * FALSE on failure
- *
- */
-static BOOL SetUrlComponentValueW(LPWSTR* lppszComponent, LPDWORD dwComponentLen, LPCWSTR lpszStart, DWORD len)
-{
- TRACE("%s (%d)\n", debugstr_wn(lpszStart,len), len);
-
- if ( (*dwComponentLen == 0) && (*lppszComponent == NULL) )
- return FALSE;
-
- if (*dwComponentLen != 0 || *lppszComponent == NULL)
- {
- if (*lppszComponent == NULL)
- {
- *lppszComponent = (LPWSTR)lpszStart;
- *dwComponentLen = len;
- }
- else
- {
- DWORD ncpylen = min((*dwComponentLen)-1, len);
- memcpy(*lppszComponent, lpszStart, ncpylen*sizeof(WCHAR));
- (*lppszComponent)[ncpylen] = '\0';
- *dwComponentLen = ncpylen;
- }
- }
-
- return TRUE;
-}
-
/***********************************************************************
* InternetCrackUrlW (WININET.@)
*
* TRUE on success
* FALSE on failure
*/
-BOOL WINAPI InternetCrackUrlW(LPCWSTR lpszUrl_orig, DWORD dwUrlLength_orig, DWORD dwFlags,
- LPURL_COMPONENTSW lpUC)
+BOOL WINAPI InternetCrackUrlW(const WCHAR *lpszUrl, DWORD dwUrlLength, DWORD dwFlags, URL_COMPONENTSW *lpUC)
{
/*
* RFC 1808
*
*/
LPCWSTR lpszParam = NULL;
- BOOL bIsAbsolute = FALSE;
- LPCWSTR lpszap, lpszUrl = lpszUrl_orig;
- LPCWSTR lpszcp = NULL;
- LPWSTR lpszUrl_decode = NULL;
- DWORD dwUrlLength = dwUrlLength_orig;
+ BOOL found_colon = FALSE;
+ LPCWSTR lpszap;
+ LPCWSTR lpszcp = NULL, lpszNetLoc;
TRACE("(%s %u %x %p)\n",
lpszUrl ? debugstr_wn(lpszUrl, dwUrlLength ? dwUrlLength : strlenW(lpszUrl)) : "(null)",
dwUrlLength, dwFlags, lpUC);
- if (!lpszUrl_orig || !*lpszUrl_orig || !lpUC)
+ if (!lpszUrl || !*lpszUrl || !lpUC)
{
- INTERNET_SetLastError(ERROR_INVALID_PARAMETER);
+ SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
if (!dwUrlLength) dwUrlLength = strlenW(lpszUrl);
if (dwFlags & ICU_DECODE)
{
- WCHAR *url_tmp;
+ WCHAR *url_tmp, *buffer;
DWORD len = dwUrlLength + 1;
+ BOOL ret;
- if (!(url_tmp = heap_alloc(len * sizeof(WCHAR))))
- {
- INTERNET_SetLastError(ERROR_OUTOFMEMORY);
- return FALSE;
- }
- memcpy(url_tmp, lpszUrl_orig, dwUrlLength * sizeof(WCHAR));
- url_tmp[dwUrlLength] = 0;
- if (!(lpszUrl_decode = heap_alloc(len * sizeof(WCHAR))))
+ if (!(url_tmp = heap_strndupW(lpszUrl, dwUrlLength)))
{
- heap_free(url_tmp);
- INTERNET_SetLastError(ERROR_OUTOFMEMORY);
+ SetLastError(ERROR_OUTOFMEMORY);
return FALSE;
}
- if (InternetCanonicalizeUrlW(url_tmp, lpszUrl_decode, &len, ICU_DECODE | ICU_NO_ENCODE))
+
+ buffer = url_tmp;
+ ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE);
+ if (!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER)
{
- dwUrlLength = len;
- lpszUrl = lpszUrl_decode;
+ buffer = heap_alloc(len * sizeof(WCHAR));
+ if (!buffer)
+ {
+ SetLastError(ERROR_OUTOFMEMORY);
+ heap_free(url_tmp);
+ return FALSE;
+ }
+ ret = InternetCanonicalizeUrlW(url_tmp, buffer, &len, ICU_DECODE | ICU_NO_ENCODE);
}
+ if (ret)
+ ret = InternetCrackUrlW(buffer, len, dwFlags & ~ICU_DECODE, lpUC);
+
+ if (buffer != url_tmp) heap_free(buffer);
heap_free(url_tmp);
+ return ret;
}
lpszap = lpszUrl;
lpszap++;
continue;
}
- if ((*lpszap == ':') && (lpszap - lpszUrl >= 2))
+ if (*lpszap == ':')
{
- bIsAbsolute = TRUE;
+ found_colon = TRUE;
lpszcp = lpszap;
}
else
break;
}
+ if(!found_colon){
+ SetLastError(ERROR_INTERNET_UNRECOGNIZED_SCHEME);
+ return FALSE;
+ }
+
lpUC->nScheme = INTERNET_SCHEME_UNKNOWN;
lpUC->nPort = INTERNET_INVALID_PORT_NUMBER;
/* Parse <params> */
- lpszParam = memchrW(lpszap, ';', dwUrlLength - (lpszap - lpszUrl));
- if(!lpszParam)
- lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl));
+ lpszParam = memchrW(lpszap, '?', dwUrlLength - (lpszap - lpszUrl));
if(!lpszParam)
lpszParam = memchrW(lpszap, '#', dwUrlLength - (lpszap - lpszUrl));
- SetUrlComponentValueW(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength,
- lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0);
+ if(!set_url_component(&lpUC->lpszExtraInfo, &lpUC->dwExtraInfoLength,
+ lpszParam, lpszParam ? dwUrlLength-(lpszParam-lpszUrl) : 0))
+ return FALSE;
- if (bIsAbsolute) /* Parse <protocol>:[//<net_loc>] */
- {
- LPCWSTR lpszNetLoc;
- /* Get scheme first. */
- lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl);
- SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength,
- lpszUrl, lpszcp - lpszUrl);
+ /* Get scheme first. */
+ lpUC->nScheme = GetInternetSchemeW(lpszUrl, lpszcp - lpszUrl);
+ if(!set_url_component(&lpUC->lpszScheme, &lpUC->dwSchemeLength, lpszUrl, lpszcp - lpszUrl))
+ return FALSE;
+
+ /* Eat ':' in protocol. */
+ lpszcp++;
+
+ /* double slash indicates the net_loc portion is present */
+ if ((lpszcp[0] == '/') && (lpszcp[1] == '/'))
+ {
+ lpszcp += 2;
- /* Eat ':' in protocol. */
- lpszcp++;
+ lpszNetLoc = memchrW(lpszcp, '/', dwUrlLength - (lpszcp - lpszUrl));
+ if (lpszParam)
+ {
+ if (lpszNetLoc)
+ lpszNetLoc = min(lpszNetLoc, lpszParam);
+ else
+ lpszNetLoc = lpszParam;
+ }
+ else if (!lpszNetLoc)
+ lpszNetLoc = lpszcp + dwUrlLength-(lpszcp-lpszUrl);
- /* double slash indicates the net_loc portion is present */
- if ((lpszcp[0] == '/') && (lpszcp[1] == '/'))
+ /* Parse net-loc */
+ if (lpszNetLoc)
{
- lpszcp += 2;
+ LPCWSTR lpszHost;
+ LPCWSTR lpszPort;
+
+ /* [<user>[<:password>]@]<host>[:<port>] */
+ /* First find the user and password if they exist */
- lpszNetLoc = memchrW(lpszcp, '/', dwUrlLength - (lpszcp - lpszUrl));
- if (lpszParam)
+ lpszHost = memchrW(lpszcp, '@', dwUrlLength - (lpszcp - lpszUrl));
+ if (lpszHost == NULL || lpszHost > lpszNetLoc)
{
- if (lpszNetLoc)
- lpszNetLoc = min(lpszNetLoc, lpszParam);
- else
- lpszNetLoc = lpszParam;
+ /* username and password not specified. */
+ set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0);
+ set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0);
}
- else if (!lpszNetLoc)
- lpszNetLoc = lpszcp + dwUrlLength-(lpszcp-lpszUrl);
-
- /* Parse net-loc */
- if (lpszNetLoc)
+ else /* Parse out username and password */
{
- LPCWSTR lpszHost;
- LPCWSTR lpszPort;
+ LPCWSTR lpszUser = lpszcp;
+ LPCWSTR lpszPasswd = lpszHost;
- /* [<user>[<:password>]@]<host>[:<port>] */
- /* First find the user and password if they exist */
-
- lpszHost = memchrW(lpszcp, '@', dwUrlLength - (lpszcp - lpszUrl));
- if (lpszHost == NULL || lpszHost > lpszNetLoc)
+ while (lpszcp < lpszHost)
{
- /* username and password not specified. */
- SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0);
+ if (*lpszcp == ':')
+ lpszPasswd = lpszcp;
+
+ lpszcp++;
}
- else /* Parse out username and password */
- {
- LPCWSTR lpszUser = lpszcp;
- LPCWSTR lpszPasswd = lpszHost;
- while (lpszcp < lpszHost)
- {
- if (*lpszcp == ':')
- lpszPasswd = lpszcp;
+ if(!set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, lpszUser, lpszPasswd - lpszUser))
+ return FALSE;
- lpszcp++;
- }
+ if (lpszPasswd != lpszHost)
+ lpszPasswd++;
+ if(!set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength,
+ lpszPasswd == lpszHost ? NULL : lpszPasswd, lpszHost - lpszPasswd))
+ return FALSE;
- SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength,
- lpszUser, lpszPasswd - lpszUser);
+ lpszcp++; /* Advance to beginning of host */
+ }
- if (lpszPasswd != lpszHost)
- lpszPasswd++;
- SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength,
- lpszPasswd == lpszHost ? NULL : lpszPasswd,
- lpszHost - lpszPasswd);
+ /* Parse <host><:port> */
- lpszcp++; /* Advance to beginning of host */
- }
+ lpszHost = lpszcp;
+ lpszPort = lpszNetLoc;
- /* Parse <host><:port> */
+ /* special case for res:// URLs: there is no port here, so the host is the
+ entire string up to the first '/' */
+ if(lpUC->nScheme==INTERNET_SCHEME_RES)
+ {
+ if(!set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost))
+ return FALSE;
+ lpszcp=lpszNetLoc;
+ }
+ else
+ {
+ while (lpszcp < lpszNetLoc)
+ {
+ if (*lpszcp == ':')
+ lpszPort = lpszcp;
- lpszHost = lpszcp;
- lpszPort = lpszNetLoc;
+ lpszcp++;
+ }
- /* special case for res:// URLs: there is no port here, so the host is the
- entire string up to the first '/' */
- if(lpUC->nScheme==INTERNET_SCHEME_RES)
+ /* If the scheme is "file" and the host is just one letter, it's not a host */
+ if(lpUC->nScheme==INTERNET_SCHEME_FILE && lpszPort <= lpszHost+1)
{
- SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength,
- lpszHost, lpszPort - lpszHost);
- lpszcp=lpszNetLoc;
+ lpszcp=lpszHost;
+ set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0);
}
else
{
- while (lpszcp < lpszNetLoc)
+ if(!set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, lpszHost, lpszPort - lpszHost))
+ return FALSE;
+ if (lpszPort != lpszNetLoc)
+ lpUC->nPort = atoiW(++lpszPort);
+ else switch (lpUC->nScheme)
{
- if (*lpszcp == ':')
- lpszPort = lpszcp;
-
- lpszcp++;
- }
-
- /* If the scheme is "file" and the host is just one letter, it's not a host */
- if(lpUC->nScheme==INTERNET_SCHEME_FILE && lpszPort <= lpszHost+1)
- {
- lpszcp=lpszHost;
- SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength,
- NULL, 0);
- }
- else
- {
- SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength,
- lpszHost, lpszPort - lpszHost);
- if (lpszPort != lpszNetLoc)
- lpUC->nPort = atoiW(++lpszPort);
- else switch (lpUC->nScheme)
- {
- case INTERNET_SCHEME_HTTP:
- lpUC->nPort = INTERNET_DEFAULT_HTTP_PORT;
- break;
- case INTERNET_SCHEME_HTTPS:
- lpUC->nPort = INTERNET_DEFAULT_HTTPS_PORT;
- break;
- case INTERNET_SCHEME_FTP:
- lpUC->nPort = INTERNET_DEFAULT_FTP_PORT;
- break;
- case INTERNET_SCHEME_GOPHER:
- lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT;
- break;
- default:
- break;
- }
+ case INTERNET_SCHEME_HTTP:
+ lpUC->nPort = INTERNET_DEFAULT_HTTP_PORT;
+ break;
+ case INTERNET_SCHEME_HTTPS:
+ lpUC->nPort = INTERNET_DEFAULT_HTTPS_PORT;
+ break;
+ case INTERNET_SCHEME_FTP:
+ lpUC->nPort = INTERNET_DEFAULT_FTP_PORT;
+ break;
+ case INTERNET_SCHEME_GOPHER:
+ lpUC->nPort = INTERNET_DEFAULT_GOPHER_PORT;
+ break;
+ default:
+ break;
}
}
}
}
- else
- {
- SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0);
- }
}
else
{
- SetUrlComponentValueW(&lpUC->lpszScheme, &lpUC->dwSchemeLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0);
- SetUrlComponentValueW(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0);
+ set_url_component(&lpUC->lpszUserName, &lpUC->dwUserNameLength, NULL, 0);
+ set_url_component(&lpUC->lpszPassword, &lpUC->dwPasswordLength, NULL, 0);
+ set_url_component(&lpUC->lpszHostName, &lpUC->dwHostNameLength, NULL, 0);
}
/* Here lpszcp points to:
if (*lpszcp == '/')
{
len = MAX_PATH;
- PathCreateFromUrlW(lpszUrl_orig, tmppath, &len, 0);
+ PathCreateFromUrlW(lpszUrl, tmppath, &len, 0);
}
else
{
++len;
}
}
- SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength,
- tmppath, len);
+ if(!set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, tmppath, len))
+ return FALSE;
}
- else
- SetUrlComponentValueW(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength,
- lpszcp, len);
+ else if(!set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, len))
+ return FALSE;
}
else
{
- if (lpUC->lpszUrlPath && (lpUC->dwUrlPathLength > 0))
- lpUC->lpszUrlPath[0] = 0;
- lpUC->dwUrlPathLength = 0;
+ set_url_component(&lpUC->lpszUrlPath, &lpUC->dwUrlPathLength, lpszcp, 0);
}
TRACE("%s: scheme(%s) host(%s) path(%s) extra(%s)\n", debugstr_wn(lpszUrl,dwUrlLength),
debugstr_wn(lpUC->lpszUrlPath,lpUC->dwUrlPathLength),
debugstr_wn(lpUC->lpszExtraInfo,lpUC->dwExtraInfoLength));
- heap_free( lpszUrl_decode );
return TRUE;
}
}
+/***********************************************************************
+ * convert_url_canonicalization_flags
+ *
+ * Helper for InternetCanonicalizeUrl
+ *
+ * PARAMS
+ * dwFlags [I] Flags suitable for InternetCanonicalizeUrl
+ *
+ * RETURNS
+ * Flags suitable for UrlCanonicalize
+ */
+static DWORD convert_url_canonicalization_flags(DWORD dwFlags)
+{
+ DWORD dwUrlFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE;
+
+ if (dwFlags & ICU_BROWSER_MODE) dwUrlFlags |= URL_BROWSER_MODE;
+ if (dwFlags & ICU_DECODE) dwUrlFlags |= URL_UNESCAPE;
+ if (dwFlags & ICU_ENCODE_PERCENT) dwUrlFlags |= URL_ESCAPE_PERCENT;
+ if (dwFlags & ICU_ENCODE_SPACES_ONLY) dwUrlFlags |= URL_ESCAPE_SPACES_ONLY;
+ /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
+ if (dwFlags & ICU_NO_ENCODE) dwUrlFlags ^= URL_ESCAPE_UNSAFE;
+ if (dwFlags & ICU_NO_META) dwUrlFlags |= URL_NO_META;
+
+ return dwUrlFlags;
+}
+
/***********************************************************************
* InternetCanonicalizeUrlA (WININET.@)
*
LPDWORD lpdwBufferLength, DWORD dwFlags)
{
HRESULT hr;
- DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE;
- TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_a(lpszUrl), lpszBuffer,
+ TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_a(lpszUrl), lpszBuffer,
lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
- if(dwFlags & ICU_DECODE)
- {
- dwURLFlags |= URL_UNESCAPE;
- dwFlags &= ~ICU_DECODE;
- }
-
- if(dwFlags & ICU_ESCAPE)
- {
- dwURLFlags |= URL_UNESCAPE;
- dwFlags &= ~ICU_ESCAPE;
- }
-
- if(dwFlags & ICU_BROWSER_MODE)
- {
- dwURLFlags |= URL_BROWSER_MODE;
- dwFlags &= ~ICU_BROWSER_MODE;
- }
-
- if(dwFlags & ICU_NO_ENCODE)
- {
- /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
- dwURLFlags ^= URL_ESCAPE_UNSAFE;
- dwFlags &= ~ICU_NO_ENCODE;
- }
-
- if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags);
-
- hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags);
+ dwFlags = convert_url_canonicalization_flags(dwFlags);
+ hr = UrlCanonicalizeA(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags);
if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER);
if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER);
- return (hr == S_OK) ? TRUE : FALSE;
+ return hr == S_OK;
}
/***********************************************************************
LPDWORD lpdwBufferLength, DWORD dwFlags)
{
HRESULT hr;
- DWORD dwURLFlags = URL_WININET_COMPATIBILITY | URL_ESCAPE_UNSAFE;
- TRACE("(%s, %p, %p, 0x%08x) bufferlength: %d\n", debugstr_w(lpszUrl), lpszBuffer,
+ TRACE("(%s, %p, %p, 0x%08x) buffer length: %d\n", debugstr_w(lpszUrl), lpszBuffer,
lpdwBufferLength, dwFlags, lpdwBufferLength ? *lpdwBufferLength : -1);
- if(dwFlags & ICU_DECODE)
- {
- dwURLFlags |= URL_UNESCAPE;
- dwFlags &= ~ICU_DECODE;
- }
-
- if(dwFlags & ICU_ESCAPE)
- {
- dwURLFlags |= URL_UNESCAPE;
- dwFlags &= ~ICU_ESCAPE;
- }
-
- if(dwFlags & ICU_BROWSER_MODE)
- {
- dwURLFlags |= URL_BROWSER_MODE;
- dwFlags &= ~ICU_BROWSER_MODE;
- }
-
- if(dwFlags & ICU_NO_ENCODE)
- {
- /* Flip this bit to correspond to URL_ESCAPE_UNSAFE */
- dwURLFlags ^= URL_ESCAPE_UNSAFE;
- dwFlags &= ~ICU_NO_ENCODE;
- }
-
- if (dwFlags) FIXME("Unhandled flags 0x%08x\n", dwFlags);
-
- hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwURLFlags);
+ dwFlags = convert_url_canonicalization_flags(dwFlags);
+ hr = UrlCanonicalizeW(lpszUrl, lpszBuffer, lpdwBufferLength, dwFlags);
if (hr == E_POINTER) SetLastError(ERROR_INSUFFICIENT_BUFFER);
if (hr == E_INVALIDARG) SetLastError(ERROR_INVALID_PARAMETER);
- return (hr == S_OK) ? TRUE : FALSE;
+ return hr == S_OK;
}
/* #################################################### */
return FALSE;
}
- if(hdr->vtbl->ReadFile)
- res = hdr->vtbl->ReadFile(hdr, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead);
+ if(hdr->vtbl->ReadFile) {
+ res = hdr->vtbl->ReadFile(hdr, lpBuffer, dwNumOfBytesToRead, pdwNumOfBytesRead, 0, 0);
+ if(res == ERROR_IO_PENDING)
+ *pdwNumOfBytesRead = 0;
+ }
WININET_Release(hdr);
TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffersOut, dwFlags, dwContext);
+ if (lpBuffersOut->dwStructSize != sizeof(*lpBuffersOut)) {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
hdr = get_handle_object(hFile);
if (!hdr) {
INTERNET_SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if(hdr->vtbl->ReadFileExA)
- res = hdr->vtbl->ReadFileExA(hdr, lpBuffersOut, dwFlags, dwContext);
+ if(hdr->vtbl->ReadFile)
+ res = hdr->vtbl->ReadFile(hdr, lpBuffersOut->lpvBuffer, lpBuffersOut->dwBufferLength,
+ &lpBuffersOut->dwBufferLength, dwFlags, dwContext);
WININET_Release(hdr);
TRACE("(%p %p 0x%x 0x%lx)\n", hFile, lpBuffer, dwFlags, dwContext);
+ if (!lpBuffer || lpBuffer->dwStructSize != sizeof(*lpBuffer)) {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
hdr = get_handle_object(hFile);
if (!hdr) {
INTERNET_SetLastError(ERROR_INVALID_HANDLE);
return FALSE;
}
- if(hdr->vtbl->ReadFileExW)
- res = hdr->vtbl->ReadFileExW(hdr, lpBuffer, dwFlags, dwContext);
+ if(hdr->vtbl->ReadFile)
+ res = hdr->vtbl->ReadFile(hdr, lpBuffer->lpvBuffer, lpBuffer->dwBufferLength, &lpBuffer->dwBufferLength,
+ dwFlags, dwContext);
WININET_Release(hdr);
return res == ERROR_SUCCESS;
}
-static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode)
+static WCHAR *get_proxy_autoconfig_url(void)
{
- /* FIXME: This function currently handles more options than it should. Options requiring
- * proper handles should be moved to proper functions */
- switch(option) {
- case INTERNET_OPTION_REQUEST_FLAGS:
- TRACE("INTERNET_OPTION_REQUEST_FLAGS\n");
+#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
- if (*size < sizeof(ULONG))
- return ERROR_INSUFFICIENT_BUFFER;
+ CFDictionaryRef settings = CFNetworkCopySystemProxySettings();
+ WCHAR *ret = NULL;
+ SIZE_T len;
+ const void *ref;
- *(ULONG*)buffer = 4;
- *size = sizeof(ULONG);
+ if (!settings) return NULL;
- return ERROR_SUCCESS;
+ if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString )))
+ {
+ CFRelease( settings );
+ return NULL;
+ }
+ len = CFStringGetLength( ref );
+ if (len)
+ ret = heap_alloc( (len+1) * sizeof(WCHAR) );
+ if (ret)
+ {
+ CFStringGetCharacters( ref, CFRangeMake(0, len), ret );
+ ret[len] = 0;
+ }
+ TRACE( "returning %s\n", debugstr_w(ret) );
+ CFRelease( settings );
+ return ret;
+#else
+ static int once;
+ if (!once++) FIXME( "no support on this platform\n" );
+ return NULL;
+#endif
+}
+static DWORD query_global_option(DWORD option, void *buffer, DWORD *size, BOOL unicode)
+{
+ /* FIXME: This function currently handles more options than it should. Options requiring
+ * proper handles should be moved to proper functions */
+ switch(option) {
case INTERNET_OPTION_HTTP_VERSION:
if (*size < sizeof(HTTP_VERSION_INFO))
return ERROR_INSUFFICIENT_BUFFER;
}
case INTERNET_OPTION_PER_CONNECTION_OPTION: {
+ WCHAR *url;
INTERNET_PER_CONN_OPTION_LISTW *con = buffer;
INTERNET_PER_CONN_OPTION_LISTA *conA = buffer;
DWORD res = ERROR_SUCCESS, i;
if((ret = INTERNET_LoadProxySettings(&pi)))
return ret;
+#ifdef __REACTOS__
+ WARN("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n");
+#else
FIXME("INTERNET_OPTION_PER_CONNECTION_OPTION stub\n");
+#endif
if (*size < sizeof(INTERNET_PER_CONN_OPTION_LISTW)) {
FreeProxyInfo(&pi);
return ERROR_INSUFFICIENT_BUFFER;
}
+ url = get_proxy_autoconfig_url();
+
for (i = 0; i < con->dwOptionCount; i++) {
INTERNET_PER_CONN_OPTIONW *optionW = con->pOptions + i;
INTERNET_PER_CONN_OPTIONA *optionA = conA->pOptions + i;
optionW->Value.dwValue = PROXY_TYPE_PROXY;
else
optionW->Value.dwValue = PROXY_TYPE_DIRECT;
+ if (url)
+ /* native includes PROXY_TYPE_DIRECT even if PROXY_TYPE_PROXY is set */
+ optionW->Value.dwValue |= PROXY_TYPE_DIRECT|PROXY_TYPE_AUTO_PROXY_URL;
break;
case INTERNET_PER_CONN_PROXY_SERVER:
break;
case INTERNET_PER_CONN_AUTOCONFIG_URL:
+ if (!url)
+ optionW->Value.pszValue = NULL;
+ else if (unicode)
+ optionW->Value.pszValue = heap_strdupW(url);
+ else
+ optionA->Value.pszValue = heap_strdupWtoA(url);
+ break;
+
case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS:
+ optionW->Value.dwValue = AUTO_PROXY_FLAG_ALWAYS_DETECT;
+ break;
+
case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL:
case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:
memset(&optionW->Value, 0, sizeof(optionW->Value));
break;
+#ifdef __REACTOS__
+ case INTERNET_PER_CONN_FLAGS_UI:
+ WARN("Unhandled dwOption %d\n", optionW->dwOption);
+ break;
+
+#endif
default:
FIXME("Unknown dwOption %d\n", optionW->dwOption);
res = ERROR_INVALID_PARAMETER;
break;
}
}
+ heap_free(url);
FreeProxyInfo(&pi);
return res;
}
+ case INTERNET_OPTION_REQUEST_FLAGS:
case INTERNET_OPTION_USER_AGENT:
+ *size = 0;
return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
case INTERNET_OPTION_POLICY:
return ERROR_INVALID_PARAMETER;
+ case INTERNET_OPTION_CONNECT_TIMEOUT:
+ TRACE("INTERNET_OPTION_CONNECT_TIMEOUT\n");
+
+ if (*size < sizeof(ULONG))
+ return ERROR_INSUFFICIENT_BUFFER;
+
+ *(ULONG*)buffer = connect_timeout;
+ *size = sizeof(ULONG);
+
+ return ERROR_SUCCESS;
}
FIXME("Stub for %d\n", option);
*size = sizeof(DWORD_PTR);
return ERROR_SUCCESS;
+ case INTERNET_OPTION_REQUEST_FLAGS:
+ WARN("INTERNET_OPTION_REQUEST_FLAGS\n");
+ *size = sizeof(DWORD);
+ return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
+
case INTERNET_OPTION_MAX_CONNS_PER_SERVER:
case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER:
WARN("Called on global option %u\n", option);
DWORD INET_SetOption(object_header_t *hdr, DWORD option, void *buf, DWORD size)
{
switch(option) {
+ case INTERNET_OPTION_SETTINGS_CHANGED:
+ FIXME("INTERNETOPTION_SETTINGS_CHANGED semi-stub\n");
+ collect_connections(COLLECT_CONNECTIONS);
+ return ERROR_SUCCESS;
case INTERNET_OPTION_CALLBACK:
WARN("Not settable option %u\n", option);
return ERROR_INTERNET_OPTION_NOT_SETTABLE;
case INTERNET_OPTION_MAX_CONNS_PER_1_0_SERVER:
WARN("Called on global option %u\n", option);
return ERROR_INTERNET_INVALID_OPERATION;
+ case INTERNET_OPTION_REFRESH:
+ return ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
}
return ERROR_INTERNET_INVALID_OPTION;
max_1_0_conns = *(ULONG*)buf;
return ERROR_SUCCESS;
+
+ case INTERNET_OPTION_CONNECT_TIMEOUT:
+ TRACE("INTERNET_OPTION_CONNECT_TIMEOUT\n");
+
+ if(size != sizeof(connect_timeout))
+ return ERROR_INTERNET_BAD_OPTION_LENGTH;
+ if(!*(ULONG*)buf)
+ return ERROR_BAD_ARGUMENTS;
+
+ connect_timeout = *(ULONG*)buf;
+ return ERROR_SUCCESS;
+
+ case INTERNET_OPTION_SUPPRESS_BEHAVIOR:
+ FIXME("INTERNET_OPTION_SUPPRESS_BEHAVIOR stub\n");
+
+ if(size != sizeof(ULONG))
+ return ERROR_INTERNET_BAD_OPTION_LENGTH;
+
+ FIXME("%08x\n", *(ULONG*)buf);
+ return ERROR_SUCCESS;
}
- return ERROR_INTERNET_INVALID_OPTION;
+ return INET_SetOption(NULL, option, buf, size);
}
/***********************************************************************
SetLastError(ERROR_INTERNET_BAD_OPTION_LENGTH);
ret = FALSE;
} else
+ TRACE("INTERNET_OPTION_ERROR_MASK: %x\n", *(ULONG*)lpBuffer);
lpwhh->ErrorMask = *(ULONG*)lpBuffer;
}
break;
FIXME("Option INTERNET_OPTION_RESET_URLCACHE_SESSION: STUB\n");
break;
case INTERNET_OPTION_END_BROWSER_SESSION:
- FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: STUB\n");
+ FIXME("Option INTERNET_OPTION_END_BROWSER_SESSION: semi-stub\n");
+ free_cookie();
break;
case INTERNET_OPTION_CONNECTED_STATE:
FIXME("Option INTERNET_OPTION_CONNECTED_STATE: STUB\n");
FIXME("Option INTERNET_OPTION_DISABLE_AUTODIAL; STUB\n");
break;
case INTERNET_OPTION_HTTP_DECODING:
- FIXME("INTERNET_OPTION_HTTP_DECODING; STUB\n");
- SetLastError(ERROR_INTERNET_INVALID_OPTION);
- ret = FALSE;
+ {
+ if (!lpwhh)
+ {
+ SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE);
+ return FALSE;
+ }
+ if (!lpBuffer || dwBufferLength != sizeof(BOOL))
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ ret = FALSE;
+ }
+ else
+ lpwhh->decoding = *(BOOL *)lpBuffer;
break;
+ }
case INTERNET_OPTION_COOKIES_3RD_PARTY:
FIXME("INTERNET_OPTION_COOKIES_3RD_PARTY; STUB\n");
SetLastError(ERROR_INTERNET_INVALID_OPTION);
case INTERNET_OPTION_PER_CONNECTION_OPTION: {
INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer;
LONG res;
- int i;
+ unsigned int i;
proxyinfo_t pi;
- INTERNET_LoadProxySettings(&pi);
+ if (INTERNET_LoadProxySettings(&pi)) return FALSE;
for (i = 0; i < con->dwOptionCount; i++) {
INTERNET_PER_CONN_OPTIONW *option = con->pOptions + i;
}
break;
+ case INTERNET_PER_CONN_PROXY_BYPASS:
+ heap_free(pi.proxyBypass);
+ pi.proxyBypass = heap_strdupW(option->Value.pszValue);
+ break;
+
case INTERNET_PER_CONN_AUTOCONFIG_URL:
case INTERNET_PER_CONN_AUTODISCOVERY_FLAGS:
case INTERNET_PER_CONN_AUTOCONFIG_SECONDARY_URL:
case INTERNET_PER_CONN_AUTOCONFIG_RELOAD_DELAY_MINS:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_TIME:
case INTERNET_PER_CONN_AUTOCONFIG_LAST_DETECT_URL:
- case INTERNET_PER_CONN_PROXY_BYPASS:
FIXME("Unhandled dwOption %d\n", option->dwOption);
break;
case INTERNET_OPTION_USER_AGENT:
case INTERNET_OPTION_USERNAME:
case INTERNET_OPTION_PASSWORD:
- wlen = MultiByteToWideChar( CP_ACP, 0, lpBuffer, dwBufferLength,
- NULL, 0 );
- wbuffer = heap_alloc(wlen*sizeof(WCHAR) );
- MultiByteToWideChar( CP_ACP, 0, lpBuffer, dwBufferLength,
- wbuffer, wlen );
+ case INTERNET_OPTION_PROXY_USERNAME:
+ case INTERNET_OPTION_PROXY_PASSWORD:
+ wlen = MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, NULL, 0 );
+ if (!(wbuffer = heap_alloc( wlen * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY;
+ MultiByteToWideChar( CP_ACP, 0, lpBuffer, -1, wbuffer, wlen );
break;
case INTERNET_OPTION_PER_CONNECTION_OPTION: {
- int i;
+ unsigned int i;
INTERNET_PER_CONN_OPTION_LISTW *listW;
INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer;
wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW);
if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION)
{
INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer;
- int i;
+ unsigned int i;
for (i = 0; i < list->dwOptionCount; ++i) {
INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i;
switch (opt->dwOption) {
BOOL rc = FALSE;
static const CHAR ping[] = "ping -c 1 ";
static const CHAR redirect[] = " >/dev/null 2>/dev/null";
- CHAR *command = NULL;
- WCHAR hostW[INTERNET_MAX_HOST_NAME_LENGTH];
- DWORD len;
+ WCHAR *host;
+ DWORD len, host_len;
INTERNET_PORT port;
int status = -1;
- FIXME("\n");
+ FIXME("(%s %x %x)\n", debugstr_w(lpszUrl), dwFlags, dwReserved);
/*
* Crack or set the Address
}
else
{
- URL_COMPONENTSW components;
+ URL_COMPONENTSW components = {sizeof(components)};
- ZeroMemory(&components,sizeof(URL_COMPONENTSW));
- components.lpszHostName = (LPWSTR)hostW;
- components.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
+ components.dwHostNameLength = 1;
if (!InternetCrackUrlW(lpszUrl,0,0,&components))
goto End;
- TRACE("host name : %s\n",debugstr_w(components.lpszHostName));
+ host = components.lpszHostName;
+ host_len = components.dwHostNameLength;
port = components.nPort;
- TRACE("port: %d\n", port);
+ TRACE("host name: %s port: %d\n",debugstr_wn(host, host_len), port);
}
if (dwFlags & FLAG_ICC_FORCE_CONNECTION)
{
struct sockaddr_storage saddr;
- socklen_t sa_len = sizeof(saddr);
+ int sa_len = sizeof(saddr);
+ WCHAR *host_z;
int fd;
+ BOOL b;
+
+ host_z = heap_strndupW(host, host_len);
+ if (!host_z)
+ return FALSE;
- if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len))
+ b = GetAddress(host_z, port, (struct sockaddr *)&saddr, &sa_len, NULL);
+ heap_free(host_z);
+ if(!b)
goto End;
+ init_winsock();
fd = socket(saddr.ss_family, SOCK_STREAM, 0);
if (fd != -1)
{
if (connect(fd, (struct sockaddr *)&saddr, sa_len) == 0)
rc = TRUE;
- close(fd);
+ closesocket(fd);
}
}
else
/*
* Build our ping command
*/
- len = WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, NULL, 0, NULL, NULL);
- command = heap_alloc(strlen(ping)+len+strlen(redirect));
- strcpy(command,ping);
- WideCharToMultiByte(CP_UNIXCP, 0, hostW, -1, command+strlen(ping), len, NULL, NULL);
- strcat(command,redirect);
+ char *command;
+
+ len = WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, NULL, 0, NULL, NULL);
+ command = heap_alloc(strlen(ping)+len+strlen(redirect)+1);
+ strcpy(command, ping);
+ WideCharToMultiByte(CP_UNIXCP, 0, host, host_len, command+sizeof(ping)-1, len, NULL, NULL);
+ strcpy(command+sizeof(ping)-1+len, redirect);
TRACE("Ping command is : %s\n",command);
status = system(command);
+ heap_free( command );
TRACE("Ping returned a code of %i\n",status);
}
End:
- heap_free( command );
if (rc == FALSE)
INTERNET_SetLastError(ERROR_NOT_CONNECTED);
static HINTERNET INTERNET_InternetOpenUrlW(appinfo_t *hIC, LPCWSTR lpszUrl,
LPCWSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext)
{
- URL_COMPONENTSW urlComponents;
- WCHAR protocol[INTERNET_MAX_SCHEME_LENGTH];
- WCHAR hostName[INTERNET_MAX_HOST_NAME_LENGTH];
- WCHAR userName[INTERNET_MAX_USER_NAME_LENGTH];
- WCHAR password[INTERNET_MAX_PASSWORD_LENGTH];
- WCHAR path[INTERNET_MAX_PATH_LENGTH];
- WCHAR extra[1024];
+ URL_COMPONENTSW urlComponents = { sizeof(urlComponents) };
+ WCHAR *host, *user = NULL, *pass = NULL, *path;
HINTERNET client = NULL, client1 = NULL;
DWORD res;
TRACE("(%p, %s, %s, %08x, %08x, %08lx)\n", hIC, debugstr_w(lpszUrl), debugstr_w(lpszHeaders),
dwHeadersLength, dwFlags, dwContext);
- urlComponents.dwStructSize = sizeof(URL_COMPONENTSW);
- urlComponents.lpszScheme = protocol;
- urlComponents.dwSchemeLength = INTERNET_MAX_SCHEME_LENGTH;
- urlComponents.lpszHostName = hostName;
- urlComponents.dwHostNameLength = INTERNET_MAX_HOST_NAME_LENGTH;
- urlComponents.lpszUserName = userName;
- urlComponents.dwUserNameLength = INTERNET_MAX_USER_NAME_LENGTH;
- urlComponents.lpszPassword = password;
- urlComponents.dwPasswordLength = INTERNET_MAX_PASSWORD_LENGTH;
- urlComponents.lpszUrlPath = path;
- urlComponents.dwUrlPathLength = INTERNET_MAX_PATH_LENGTH;
- urlComponents.lpszExtraInfo = extra;
- urlComponents.dwExtraInfoLength = 1024;
+ urlComponents.dwHostNameLength = 1;
+ urlComponents.dwUserNameLength = 1;
+ urlComponents.dwPasswordLength = 1;
+ urlComponents.dwUrlPathLength = 1;
+ urlComponents.dwExtraInfoLength = 1;
if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents))
return NULL;
+
+ if ((urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) &&
+ urlComponents.dwExtraInfoLength)
+ {
+ assert(urlComponents.lpszUrlPath + urlComponents.dwUrlPathLength == urlComponents.lpszExtraInfo);
+ urlComponents.dwUrlPathLength += urlComponents.dwExtraInfoLength;
+ }
+
+ host = heap_strndupW(urlComponents.lpszHostName, urlComponents.dwHostNameLength);
+ path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength);
+ if(urlComponents.dwUserNameLength)
+ user = heap_strndupW(urlComponents.lpszUserName, urlComponents.dwUserNameLength);
+ if(urlComponents.dwPasswordLength)
+ pass = heap_strndupW(urlComponents.lpszPassword, urlComponents.dwPasswordLength);
+
switch(urlComponents.nScheme) {
case INTERNET_SCHEME_FTP:
- if(urlComponents.nPort == 0)
- urlComponents.nPort = INTERNET_DEFAULT_FTP_PORT;
- client = FTP_Connect(hIC, hostName, urlComponents.nPort,
- userName, password, dwFlags, dwContext, INET_OPENURL);
+ client = FTP_Connect(hIC, host, urlComponents.nPort,
+ user, pass, dwFlags, dwContext, INET_OPENURL);
if(client == NULL)
break;
client1 = FtpOpenFileW(client, path, GENERIC_READ, dwFlags, dwContext);
case INTERNET_SCHEME_HTTPS: {
static const WCHAR szStars[] = { '*','/','*', 0 };
LPCWSTR accept[2] = { szStars, NULL };
- if(urlComponents.nPort == 0) {
- if(urlComponents.nScheme == INTERNET_SCHEME_HTTP)
- urlComponents.nPort = INTERNET_DEFAULT_HTTP_PORT;
- else
- urlComponents.nPort = INTERNET_DEFAULT_HTTPS_PORT;
- }
+
if (urlComponents.nScheme == INTERNET_SCHEME_HTTPS) dwFlags |= INTERNET_FLAG_SECURE;
/* FIXME: should use pointers, not handles, as handles are not thread-safe */
- res = HTTP_Connect(hIC, hostName, urlComponents.nPort,
- userName, password, dwFlags, dwContext, INET_OPENURL, &client);
+ res = HTTP_Connect(hIC, host, urlComponents.nPort,
+ user, pass, dwFlags, dwContext, INET_OPENURL, &client);
if(res != ERROR_SUCCESS) {
INTERNET_SetLastError(res);
break;
}
- if (urlComponents.dwExtraInfoLength) {
- WCHAR *path_extra;
- DWORD len = urlComponents.dwUrlPathLength + urlComponents.dwExtraInfoLength + 1;
-
- if (!(path_extra = heap_alloc(len * sizeof(WCHAR))))
- {
- InternetCloseHandle(client);
- break;
- }
- strcpyW(path_extra, urlComponents.lpszUrlPath);
- strcatW(path_extra, urlComponents.lpszExtraInfo);
- client1 = HttpOpenRequestW(client, NULL, path_extra, NULL, NULL, accept, dwFlags, dwContext);
- heap_free(path_extra);
- }
- else
- client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext);
-
+ client1 = HttpOpenRequestW(client, NULL, path, NULL, NULL, accept, dwFlags, dwContext);
if(client1 == NULL) {
InternetCloseHandle(client);
break;
}
TRACE(" %p <--\n", client1);
-
+
+ heap_free(host);
+ heap_free(path);
+ heap_free(user);
+ heap_free(pass);
return client1;
}
* RETURNS
* handle of connection or NULL on failure
*/
-static void AsyncInternetOpenUrlProc(WORKREQUEST *workRequest)
+typedef struct {
+ task_header_t hdr;
+ WCHAR *url;
+ WCHAR *headers;
+ DWORD headers_len;
+ DWORD flags;
+ DWORD_PTR context;
+} open_url_task_t;
+
+static void AsyncInternetOpenUrlProc(task_header_t *hdr)
{
- struct WORKREQ_INTERNETOPENURLW const *req = &workRequest->u.InternetOpenUrlW;
- appinfo_t *hIC = (appinfo_t*) workRequest->hdr;
+ open_url_task_t *task = (open_url_task_t*)hdr;
- TRACE("%p\n", hIC);
+ TRACE("%p\n", task->hdr.hdr);
- INTERNET_InternetOpenUrlW(hIC, req->lpszUrl,
- req->lpszHeaders, req->dwHeadersLength, req->dwFlags, req->dwContext);
- heap_free(req->lpszUrl);
- heap_free(req->lpszHeaders);
+ INTERNET_InternetOpenUrlW((appinfo_t*)task->hdr.hdr, task->url, task->headers,
+ task->headers_len, task->flags, task->context);
+ heap_free(task->url);
+ heap_free(task->headers);
}
HINTERNET WINAPI InternetOpenUrlW(HINTERNET hInternet, LPCWSTR lpszUrl,
}
if (hIC->hdr.dwFlags & INTERNET_FLAG_ASYNC) {
- WORKREQUEST workRequest;
- struct WORKREQ_INTERNETOPENURLW *req;
-
- workRequest.asyncproc = AsyncInternetOpenUrlProc;
- workRequest.hdr = WININET_AddRef( &hIC->hdr );
- req = &workRequest.u.InternetOpenUrlW;
- req->lpszUrl = heap_strdupW(lpszUrl);
- req->lpszHeaders = heap_strdupW(lpszHeaders);
- req->dwHeadersLength = dwHeadersLength;
- req->dwFlags = dwFlags;
- req->dwContext = dwContext;
+ open_url_task_t *task;
+
+ task = alloc_async_task(&hIC->hdr, AsyncInternetOpenUrlProc, sizeof(*task));
+ task->url = heap_strdupW(lpszUrl);
+ task->headers = heap_strdupW(lpszHeaders);
+ task->headers_len = dwHeadersLength;
+ task->flags = dwFlags;
+ task->context = dwContext;
- INTERNET_AsyncCall(&workRequest);
- /*
- * This is from windows.
- */
- SetLastError(ERROR_IO_PENDING);
+ INTERNET_AsyncCall(&task->hdr);
+ SetLastError(ERROR_IO_PENDING);
} else {
ret = INTERNET_InternetOpenUrlW(hIC, lpszUrl, lpszHeaders, dwHeadersLength, dwFlags, dwContext);
}
LPCSTR lpszHeaders, DWORD dwHeadersLength, DWORD dwFlags, DWORD_PTR dwContext)
{
HINTERNET rc = NULL;
- DWORD lenHeaders = 0;
LPWSTR szUrl = NULL;
- LPWSTR szHeaders = NULL;
+ WCHAR *headers = NULL;
TRACE("\n");
}
if(lpszHeaders) {
- lenHeaders = MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, NULL, 0 );
- szHeaders = heap_alloc(lenHeaders*sizeof(WCHAR));
- if(!szHeaders) {
+ headers = heap_strndupAtoW(lpszHeaders, dwHeadersLength, &dwHeadersLength);
+ if(!headers) {
heap_free(szUrl);
return NULL;
}
- MultiByteToWideChar(CP_ACP, 0, lpszHeaders, dwHeadersLength, szHeaders, lenHeaders);
}
- rc = InternetOpenUrlW(hInternet, szUrl, szHeaders,
- lenHeaders, dwFlags, dwContext);
+ rc = InternetOpenUrlW(hInternet, szUrl, headers, dwHeadersLength, dwFlags, dwContext);
heap_free(szUrl);
- heap_free(szHeaders);
+ heap_free(headers);
return rc;
}
*/
static DWORD CALLBACK INTERNET_WorkerThreadFunc(LPVOID lpvParam)
{
- LPWORKREQUEST lpRequest = lpvParam;
- WORKREQUEST workRequest;
+ task_header_t *task = lpvParam;
TRACE("\n");
- workRequest = *lpRequest;
- heap_free(lpRequest);
-
- workRequest.asyncproc(&workRequest);
- WININET_Release( workRequest.hdr );
+ task->proc(task);
+ WININET_Release(task->hdr);
+ heap_free(task);
if (g_dwTlsErrIndex != TLS_OUT_OF_INDEXES)
{
return TRUE;
}
+void *alloc_async_task(object_header_t *hdr, async_task_proc_t proc, size_t size)
+{
+ task_header_t *task;
+
+ task = heap_alloc(size);
+ if(!task)
+ return NULL;
+
+ task->hdr = WININET_AddRef(hdr);
+ task->proc = proc;
+ return task;
+}
/***********************************************************************
* INTERNET_AsyncCall (internal)
* RETURNS
*
*/
-DWORD INTERNET_AsyncCall(LPWORKREQUEST lpWorkRequest)
+DWORD INTERNET_AsyncCall(task_header_t *task)
{
BOOL bSuccess;
- LPWORKREQUEST lpNewRequest;
TRACE("\n");
- lpNewRequest = heap_alloc(sizeof(WORKREQUEST));
- if (!lpNewRequest)
- return ERROR_OUTOFMEMORY;
-
- *lpNewRequest = *lpWorkRequest;
-
- bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, lpNewRequest, WT_EXECUTELONGFUNCTION);
+ bSuccess = QueueUserWorkItem(INTERNET_WorkerThreadFunc, task, WT_EXECUTELONGFUNCTION);
if (!bSuccess)
{
- heap_free(lpNewRequest);
+ heap_free(task);
return ERROR_INTERNET_ASYNC_THREAD_FAILED;
}
return ERROR_SUCCESS;
return lpwite->response;
}
-/***********************************************************************
- * INTERNET_GetNextLine (internal)
- *
- * Parse next line in directory string listing
- *
- * RETURNS
- * Pointer to beginning of next line
- * NULL on failure
- *
- */
-
-LPSTR INTERNET_GetNextLine(INT nSocket, LPDWORD dwLen)
-{
- // ReactOS: use select instead of poll
- fd_set infd;
- struct timeval tv;
- BOOL bSuccess = FALSE;
- INT nRecv = 0;
- LPSTR lpszBuffer = INTERNET_GetResponseBuffer();
-
- TRACE("\n");
-
- FD_ZERO(&infd);
- FD_SET(nSocket,&infd);
- tv.tv_sec = RESPONSE_TIMEOUT;
- tv.tv_usec = 0;
-
- while (nRecv < MAX_REPLY_LEN)
- {
- if (select(0, &infd, NULL, NULL, &tv) > 0)
- {
- if (recv(nSocket, &lpszBuffer[nRecv], 1, 0) <= 0)
- {
- INTERNET_SetLastError(ERROR_FTP_TRANSFER_IN_PROGRESS);
- goto lend;
- }
-
- if (lpszBuffer[nRecv] == '\n')
- {
- bSuccess = TRUE;
- break;
- }
- if (lpszBuffer[nRecv] != '\r')
- nRecv++;
- }
- else
- {
- INTERNET_SetLastError(ERROR_INTERNET_TIMEOUT);
- goto lend;
- }
- }
-
-lend:
- if (bSuccess)
- {
- lpszBuffer[nRecv] = '\0';
- *dwLen = nRecv - 1;
- TRACE(":%d %s\n", nRecv, lpszBuffer);
- return lpszBuffer;
- }
- else
- {
- return NULL;
- }
-}
-
/**********************************************************
* InternetQueryDataAvailable (WININET.@)
*
* data is available.
*/
BOOL WINAPI InternetQueryDataAvailable( HINTERNET hFile,
- LPDWORD lpdwNumberOfBytesAvailble,
+ LPDWORD lpdwNumberOfBytesAvailable,
DWORD dwFlags, DWORD_PTR dwContext)
{
object_header_t *hdr;
DWORD res;
- TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailble, dwFlags, dwContext);
+ TRACE("(%p %p %x %lx)\n", hFile, lpdwNumberOfBytesAvailable, dwFlags, dwContext);
hdr = get_handle_object( hFile );
if (!hdr) {
}
if(hdr->vtbl->QueryDataAvailable) {
- res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailble, dwFlags, dwContext);
+ res = hdr->vtbl->QueryDataAvailable(hdr, lpdwNumberOfBytesAvailable, dwFlags, dwContext);
}else {
WARN("wrong handle\n");
res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
return res == ERROR_SUCCESS;
}
+DWORD create_req_file(const WCHAR *file_name, req_file_t **ret)
+{
+ req_file_t *req_file;
+
+ req_file = heap_alloc_zero(sizeof(*req_file));
+ if(!req_file)
+ return ERROR_NOT_ENOUGH_MEMORY;
+
+ req_file->ref = 1;
+
+ req_file->file_name = heap_strdupW(file_name);
+ if(!req_file->file_name) {
+ heap_free(req_file);
+ return ERROR_NOT_ENOUGH_MEMORY;
+ }
+
+ req_file->file_handle = CreateFileW(req_file->file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE,
+ NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+ if(req_file->file_handle == INVALID_HANDLE_VALUE) {
+ req_file_release(req_file);
+ return GetLastError();
+ }
+
+ *ret = req_file;
+ return ERROR_SUCCESS;
+}
+
+void req_file_release(req_file_t *req_file)
+{
+ if(InterlockedDecrement(&req_file->ref))
+ return;
+
+ if(!req_file->is_committed)
+ DeleteFileW(req_file->file_name);
+ if(req_file->file_handle && req_file->file_handle != INVALID_HANDLE_VALUE)
+ CloseHandle(req_file->file_handle);
+ heap_free(req_file->file_name);
+ heap_free(req_file->url);
+ heap_free(req_file);
+}
/***********************************************************************
* InternetLockRequestFile (WININET.@)
*/
-BOOL WINAPI InternetLockRequestFile( HINTERNET hInternet, HANDLE
-*lphLockReqHandle)
+BOOL WINAPI InternetLockRequestFile(HINTERNET hInternet, HANDLE *lphLockReqHandle)
{
- FIXME("STUB\n");
- return FALSE;
+ req_file_t *req_file = NULL;
+ object_header_t *hdr;
+ DWORD res;
+
+ TRACE("(%p %p)\n", hInternet, lphLockReqHandle);
+
+ hdr = get_handle_object(hInternet);
+ if (!hdr) {
+ SetLastError(ERROR_INVALID_HANDLE);
+ return FALSE;
+ }
+
+ if(hdr->vtbl->LockRequestFile) {
+ res = hdr->vtbl->LockRequestFile(hdr, &req_file);
+ }else {
+ WARN("wrong handle\n");
+ res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE;
+ }
+
+ WININET_Release(hdr);
+
+ *lphLockReqHandle = req_file;
+ if(res != ERROR_SUCCESS)
+ SetLastError(res);
+ return res == ERROR_SUCCESS;
}
-BOOL WINAPI InternetUnlockRequestFile( HANDLE hLockHandle)
+BOOL WINAPI InternetUnlockRequestFile(HANDLE hLockHandle)
{
- FIXME("STUB\n");
- return FALSE;
+ TRACE("(%p)\n", hLockHandle);
+
+ req_file_release(hLockHandle);
+ return TRUE;
}
{
char szPort[MAX_WORD_DIGITS+1];
- sprintf(szPort, "%d", lpUrlComponents->nPort);
- *lpdwUrlLength += strlen(szPort);
+ *lpdwUrlLength += sprintf(szPort, "%d", lpUrlComponents->nPort);
*lpdwUrlLength += strlen(":");
}
if (!url_uses_default_port(nScheme, lpUrlComponents->nPort))
{
- WCHAR szPort[MAX_WORD_DIGITS+1];
-
- sprintfW(szPort, fmtW, lpUrlComponents->nPort);
*lpszUrl = ':';
lpszUrl++;
- dwLen = strlenW(szPort);
- memcpy(lpszUrl, szPort, dwLen * sizeof(WCHAR));
- lpszUrl += dwLen;
+ lpszUrl += sprintfW(lpszUrl, fmtW, lpUrlComponents->nPort);
}
/* add slash between hostname and path if necessary */
return 0;
}
+/***********************************************************************
+ * InternetGetSecurityInfoByURLA (WININET.@)
+ */
+BOOL WINAPI InternetGetSecurityInfoByURLA(LPSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags)
+{
+ WCHAR *url;
+ BOOL res;
+
+ TRACE("(%s %p %p)\n", debugstr_a(lpszURL), ppCertChain, pdwSecureFlags);
+
+ url = heap_strdupAtoW(lpszURL);
+ if(!url)
+ return FALSE;
+
+ res = InternetGetSecurityInfoByURLW(url, ppCertChain, pdwSecureFlags);
+ heap_free(url);
+ return res;
+}
+
+/***********************************************************************
+ * InternetGetSecurityInfoByURLW (WININET.@)
+ */
+BOOL WINAPI InternetGetSecurityInfoByURLW(LPCWSTR lpszURL, PCCERT_CHAIN_CONTEXT *ppCertChain, DWORD *pdwSecureFlags)
+{
+ URL_COMPONENTSW url = {sizeof(url)};
+ server_t *server;
+ BOOL res;
+
+ TRACE("(%s %p %p)\n", debugstr_w(lpszURL), ppCertChain, pdwSecureFlags);
+
+ if (!ppCertChain && !pdwSecureFlags) {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
+ url.dwHostNameLength = 1;
+ res = InternetCrackUrlW(lpszURL, 0, 0, &url);
+ if(!res || url.nScheme != INTERNET_SCHEME_HTTPS) {
+ SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND);
+ return FALSE;
+ }
+
+ server = get_server(substr(url.lpszHostName, url.dwHostNameLength), url.nPort, TRUE, FALSE);
+ if(!server) {
+ SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND);
+ return FALSE;
+ }
+
+ if(server->cert_chain) {
+ if(pdwSecureFlags)
+ *pdwSecureFlags = server->security_flags & _SECURITY_ERROR_FLAGS_MASK;
+
+ if(ppCertChain && !(*ppCertChain = CertDuplicateCertificateChain(server->cert_chain)))
+ res = FALSE;
+ }else {
+ SetLastError(ERROR_INTERNET_ITEM_NOT_FOUND);
+ res = FALSE;
+ }
+
+ server_release(server);
+ return res;
+}
+
DWORD WINAPI InternetDialA( HWND hwndParent, LPSTR lpszConnectoid, DWORD dwFlags,
DWORD_PTR* lpdwConnection, DWORD dwReserved )
{
BOOL WINAPI InternetQueryFortezzaStatus(DWORD *a, DWORD_PTR b)
{
FIXME("(%p, %08lx) stub\n", a, b);
- return 0;
+ return FALSE;
}
DWORD WINAPI ShowClientAuthCerts(HWND parent)
projects / reactos.git / blobdiff