[WINHTTP]

- Sync to Wine 1.5.4
- Fïx warnings
See issue #7186 for more details.

svn path=/trunk/; revision=56891

reactos/dll/win32/winhttp/CMakeLists.txt

@@ -1,5 +1,9 @@
 
-add_definitions(-D__WINESRC__)
+add_typelib(winhttp_tlb.idl)
+
+add_definitions(
+    -D__WINESRC__
+    -D_WINE)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(winhttp.dll winhttp.spec ADD_IMPORTLIB)
@@ -12,17 +16,19 @@ list(APPEND SOURCE
     request.c
     session.c
     url.c
+    rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/winhttp.def)
 
+set_source_files_properties(rsrc.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/winhttp_tlb.tlb)
+
 add_library(winhttp SHARED ${SOURCE})
 
 set_module_type(winhttp win32dll)
-target_link_libraries(winhttp wine)
-add_delay_importlibs(winhttp crypt32)
-add_importlibs(winhttp shlwapi wininet ws2_32 msvcrt advapi32 kernel32 ntdll)
+target_link_libraries(winhttp uuid wine)
+add_delay_importlibs(winhttp oleaut32 ole32 crypt32)
+add_importlibs(winhttp user32 advapi32 ws2_32 msvcrt kernel32 ntdll)
+
+# wininet_tlb.tlb needs stdole2.tlb
+add_dependencies(winhttp stdole2)
 
 add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all)
-
-if(NOT MSVC)
-    allow_warnings(winhttp)
-endif()

reactos/dll/win32/winhttp/handle.c

@@ -103,7 +103,7 @@ HINTERNET alloc_handle( object_header_t *hdr )
     }
     if (max_handles == next_handle)
     {
-        num = max_handles + HANDLE_CHUNK_SIZE;
+        num = max_handles * 2;
         if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end;
         handles = p;
         max_handles = num;

reactos/dll/win32/winhttp/main.c

@@ -16,19 +16,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#define COBJMACROS
 #include "config.h"
-
 #include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"
 #include "objbase.h"
+#include "rpcproxy.h"
+#include "httprequest.h"
 #include "winhttp.h"
 
 #include "wine/debug.h"
-
 #include "winhttp_private.h"
 
+static HINSTANCE instance;
+
 WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
 
 /******************************************************************
@@ -39,6 +42,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     switch(fdwReason)
     {
     case DLL_PROCESS_ATTACH:
+        instance = hInstDLL;
         DisableThreadLibraryCalls(hInstDLL);
         break;
     case DLL_PROCESS_DETACH:
@@ -48,13 +52,109 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv)
     return TRUE;
 }
 
+typedef HRESULT (*fnCreateInstance)( IUnknown *outer, void **obj );
+
+struct winhttp_cf
+{
+    IClassFactory IClassFactory_iface;
+    fnCreateInstance pfnCreateInstance;
+};
+
+static inline struct winhttp_cf *impl_from_IClassFactory( IClassFactory *iface )
+{
+    return CONTAINING_RECORD( iface, struct winhttp_cf, IClassFactory_iface );
+}
+
+static HRESULT WINAPI requestcf_QueryInterface(
+    IClassFactory *iface,
+    REFIID riid,
+    void **obj )
+{
+    if (IsEqualGUID( riid, &IID_IUnknown ) ||
+        IsEqualGUID( riid, &IID_IClassFactory ))
+    {
+        IClassFactory_AddRef( iface );
+        *obj = iface;
+        return S_OK;
+    }
+    FIXME("interface %s not implemented\n", debugstr_guid(riid));
+    return E_NOINTERFACE;
+}
+
+static ULONG WINAPI requestcf_AddRef(
+    IClassFactory *iface )
+{
+    return 2;
+}
+
+static ULONG WINAPI requestcf_Release(
+    IClassFactory *iface )
+{
+    return 1;
+}
+
+static HRESULT WINAPI requestcf_CreateInstance(
+    IClassFactory *iface,
+    LPUNKNOWN outer,
+    REFIID riid,
+    void **obj )
+{
+    struct winhttp_cf *cf = impl_from_IClassFactory( iface );
+    IUnknown *unknown;
+    HRESULT hr;
+
+    TRACE("%p, %s, %p\n", outer, debugstr_guid(riid), obj);
+
+    *obj = NULL;
+    if (outer)
+        return CLASS_E_NOAGGREGATION;
+
+    hr = cf->pfnCreateInstance( outer, (void **)&unknown );
+    if (FAILED(hr))
+        return hr;
+
+    hr = IUnknown_QueryInterface( unknown, riid, obj );
+    if (FAILED(hr))
+        return hr;
+
+    IUnknown_Release( unknown );
+    return hr;
+}
+
+static HRESULT WINAPI requestcf_LockServer(
+    IClassFactory *iface,
+    BOOL dolock )
+{
+    FIXME("%p, %d\n", iface, dolock);
+    return S_OK;
+}
+
+static const struct IClassFactoryVtbl winhttp_cf_vtbl =
+{
+    requestcf_QueryInterface,
+    requestcf_AddRef,
+    requestcf_Release,
+    requestcf_CreateInstance,
+    requestcf_LockServer
+};
+
+static struct winhttp_cf request_cf = { { &winhttp_cf_vtbl }, WinHttpRequest_create };
+
 /******************************************************************
  *		DllGetClassObject (winhttp.@)
  */
 HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
-    FIXME("(%s %s %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
-    return CLASS_E_CLASSNOTAVAILABLE;
+    IClassFactory *cf = NULL;
+
+    TRACE("%s, %s, %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
+
+    if (IsEqualGUID( rclsid, &CLSID_WinHttpRequest ))
+    {
+       cf = &request_cf.IClassFactory_iface;
+    }
+    if (!cf) return CLASS_E_CLASSNOTAVAILABLE;
+    return IClassFactory_QueryInterface( cf, riid, ppv );
 }
 
 /******************************************************************
@@ -70,8 +170,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
  */
 HRESULT WINAPI DllRegisterServer(void)
 {
-    FIXME("()\n");
-    return S_OK;
+    return __wine_register_resources( instance );
 }
 
 /***********************************************************************
@@ -79,6 +178,5 @@ HRESULT WINAPI DllRegisterServer(void)
  */
 HRESULT WINAPI DllUnregisterServer(void)
 {
-    FIXME("()\n");
-    return S_OK;
+    return __wine_unregister_resources( instance );
 }

reactos/dll/win32/winhttp/net.c

@@ -116,6 +116,7 @@ MAKE_FUNCPTR( SSL_connect );
 MAKE_FUNCPTR( SSL_shutdown );
 MAKE_FUNCPTR( SSL_write );
 MAKE_FUNCPTR( SSL_read );
+MAKE_FUNCPTR( SSL_pending );
 MAKE_FUNCPTR( SSL_get_error );
 MAKE_FUNCPTR( SSL_get_ex_new_index );
 MAKE_FUNCPTR( SSL_get_ex_data );
@@ -159,7 +160,7 @@ static void ssl_lock_callback(int mode, int type, const char *file, int line)
 #endif
 
 /* translate a unix error code into a winsock error code */
-#if 0
+#ifndef __REACTOS__
 static int sock_get_error( int err )
 {
 #if !defined(__MINGW32__) && !defined (_MSC_VER)
@@ -227,6 +228,12 @@ static int sock_get_error( int err )
 }
 #else
 #define sock_get_error(x) WSAGetLastError()
+
+static inline int unix_ioctl(int filedes, long request, void *arg)
+{
+    return ioctlsocket(filedes, request, arg);
+}
+#define ioctlsocket unix_ioctl
 #endif
 
 #ifdef SONAME_LIBSSL
@@ -463,6 +470,7 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
     LOAD_FUNCPTR( SSL_shutdown );
     LOAD_FUNCPTR( SSL_write );
     LOAD_FUNCPTR( SSL_read );
+    LOAD_FUNCPTR( SSL_pending );
     LOAD_FUNCPTR( SSL_get_error );
     LOAD_FUNCPTR( SSL_get_ex_new_index );
     LOAD_FUNCPTR( SSL_get_ex_data );
@@ -536,14 +544,18 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
 
     pCRYPTO_set_id_callback(ssl_thread_id);
     num_ssl_locks = pCRYPTO_num_locks();
-    ssl_locks = HeapAlloc(GetProcessHeap(), 0, num_ssl_locks * sizeof(CRITICAL_SECTION));
+    ssl_locks = heap_alloc(num_ssl_locks * sizeof(CRITICAL_SECTION));
     if (!ssl_locks)
     {
         set_last_error( ERROR_OUTOFMEMORY );
         LeaveCriticalSection( &init_ssl_cs );
         return FALSE;
     }
-    for (i = 0; i < num_ssl_locks; i++) InitializeCriticalSection( &ssl_locks[i] );
+    for (i = 0; i < num_ssl_locks; i++)
+    {
+        InitializeCriticalSection( &ssl_locks[i] );
+        ssl_locks[i].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ssl_locks");
+    }
     pCRYPTO_set_locking_callback(ssl_lock_callback);
 
     LeaveCriticalSection( &init_ssl_cs );
@@ -572,9 +584,17 @@ void netconn_unload( void )
     if (ssl_locks)
     {
         int i;
-        for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] );
-        HeapFree( GetProcessHeap(), 0, ssl_locks );
+        for (i = 0; i < num_ssl_locks; i++)
+        {
+            ssl_locks[i].DebugInfo->Spare[0] = 0;
+            DeleteCriticalSection( &ssl_locks[i] );
+        }
+        heap_free( ssl_locks );
     }
+    DeleteCriticalSection(&init_ssl_cs);
+#endif
+#ifndef HAVE_GETADDRINFO
+    DeleteCriticalSection(&cs_gethostbyname);
 #endif
 }
 
@@ -638,6 +658,7 @@ BOOL netconn_connect( netconn_t *conn, const struct sockaddr *sockaddr, unsigned
         res = sock_get_error( errno );
         if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS)
         {
+            // ReactOS: use select instead of poll
             fd_set outfd;
             struct timeval tv;
 
@@ -744,8 +765,6 @@ BOOL netconn_send( netconn_t *conn, const void *msg, size_t len, int flags, int
 
 BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd )
 {
-    int ret;
-
     *recvd = 0;
     if (!netconn_connected( conn )) return FALSE;
     if (!len) return TRUE;
@@ -753,6 +772,8 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd
     if (conn->secure)
     {
 #ifdef SONAME_LIBSSL
+        int ret;
+
         if (flags & ~(MSG_PEEK | MSG_WAITALL))
             FIXME("SSL_read does not support the following flags: %08x\n", flags);
 
@@ -806,7 +827,7 @@ BOOL netconn_recv( netconn_t *conn, void *buf, size_t len, int flags, int *recvd
             }
             else memcpy( conn->peek_msg, buf, ret );
         }
-        *recvd = ret;
+        *recvd += ret;
         return TRUE;
 #else
         return FALSE;
@@ -831,7 +852,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
     if (conn->secure)
     {
 #ifdef SONAME_LIBSSL
-        if (conn->peek_msg) *available = conn->peek_len;
+        *available = pSSL_pending( conn->ssl_conn ) + conn->peek_len;
 #endif
         return TRUE;
     }
@@ -843,6 +864,7 @@ BOOL netconn_query_data_available( netconn_t *conn, DWORD *available )
 
 BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
 {
+    // ReactOS: use select instead of poll
     fd_set infd;
     BOOL ret = FALSE;
     DWORD recvd = 0;

reactos/dll/win32/winhttp/pac.js

@@ -0,0 +1,244 @@
+/*
+ * Copyright 2011 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ *
+ * Based on nsProxyAutoConfig.js from mozilla.org.
+ */
+
+function myIpAddress() {
+    try {
+        return dns_resolve('');
+    } catch (e) {
+        return '127.0.0.1';
+    }
+}
+
+function dnsResolve(host) {
+    try {
+        return dns_resolve(host);
+    } catch (e) {
+        return null;
+    }
+}
+
+function dnsDomainIs(host, domain) {
+    return (host.length >= domain.length &&
+            host.substring(host.length - domain.length) == domain);
+}
+
+function dnsDomainLevels(host) {
+    return host.split('.').length-1;
+}
+
+function convert_addr(ipchars) {
+    var bytes = ipchars.split('.');
+    var result = ((bytes[0] & 0xff) << 24) |
+                 ((bytes[1] & 0xff) << 16) |
+                 ((bytes[2] & 0xff) <<  8) |
+                  (bytes[3] & 0xff);
+    return result;
+}
+
+function isInNet(ipaddr, pattern, maskstr) {
+    var test = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/.exec(ipaddr);
+    if (test == null) {
+        ipaddr = dnsResolve(ipaddr);
+        if (ipaddr == null)
+            return false;
+    } else if (test[1] > 255 || test[2] > 255 ||
+               test[3] > 255 || test[4] > 255) {
+        return false;    // not an IP address
+    }
+    var host = convert_addr(ipaddr);
+    var pat  = convert_addr(pattern);
+    var mask = convert_addr(maskstr);
+    return ((host & mask) == (pat & mask));
+}
+
+function isPlainHostName(host) {
+    return (host.search('\\.') == -1);
+}
+
+function isResolvable(host) {
+    var ip = dnsResolve(host);
+    return (ip != null);
+}
+
+function localHostOrDomainIs(host, hostdom) {
+    return (host == hostdom) ||
+           (hostdom.lastIndexOf(host + '.', 0) == 0);
+}
+
+function shExpMatch(url, pattern) {
+   pattern = pattern.replace(/\./g, '\\.');
+   pattern = pattern.replace(/\*/g, '.*');
+   pattern = pattern.replace(/\?/g, '.');
+   var newRe = new RegExp('^'+pattern+'$');
+   return newRe.test(url);
+}
+
+var wdays = {SUN: 0, MON: 1, TUE: 2, WED: 3, THU: 4, FRI: 5, SAT: 6};
+var months = {JAN: 0, FEB: 1, MAR: 2, APR: 3, MAY: 4, JUN: 5, JUL: 6, AUG: 7, SEP: 8, OCT: 9, NOV: 10, DEC: 11};
+
+function weekdayRange() {
+    function getDay(weekday) {
+        if (weekday in wdays) {
+            return wdays[weekday];
+        }
+        return -1;
+    }
+    var date = new Date();
+    var argc = arguments.length;
+    var wday;
+    if (argc < 1)
+        return false;
+    if (arguments[argc - 1] == 'GMT') {
+        argc--;
+        wday = date.getUTCDay();
+    } else {
+        wday = date.getDay();
+    }
+    var wd1 = getDay(arguments[0]);
+    var wd2 = (argc == 2) ? getDay(arguments[1]) : wd1;
+    return (wd1 == -1 || wd2 == -1) ? false
+                                    : (wd1 <= wday && wday <= wd2);
+}
+
+function dateRange() {
+    function getMonth(name) {
+        if (name in months) {
+            return months[name];
+        }
+        return -1;
+    }
+    var date = new Date();
+    var argc = arguments.length;
+    if (argc < 1) {
+        return false;
+    }
+    var isGMT = (arguments[argc - 1] == 'GMT');
+
+    if (isGMT) {
+        argc--;
+    }
+    // function will work even without explict handling of this case
+    if (argc == 1) {
+        var tmp = parseInt(arguments[0]);
+        if (isNaN(tmp)) {
+            return ((isGMT ? date.getUTCMonth() : date.getMonth()) == getMonth(arguments[0]));
+        } else if (tmp < 32) {
+            return ((isGMT ? date.getUTCDate() : date.getDate()) == tmp);
+        } else {
+            return ((isGMT ? date.getUTCFullYear() : date.getFullYear()) == tmp);
+        }
+    }
+    var year = date.getFullYear();
+    var date1, date2;
+    date1 = new Date(year,  0,  1,  0,  0,  0);
+    date2 = new Date(year, 11, 31, 23, 59, 59);
+    var adjustMonth = false;
+    for (var i = 0; i < (argc >> 1); i++) {
+        var tmp = parseInt(arguments[i]);
+        if (isNaN(tmp)) {
+            var mon = getMonth(arguments[i]);
+            date1.setMonth(mon);
+        } else if (tmp < 32) {
+            adjustMonth = (argc <= 2);
+            date1.setDate(tmp);
+        } else {
+            date1.setFullYear(tmp);
+        }
+    }
+    for (var i = (argc >> 1); i < argc; i++) {
+        var tmp = parseInt(arguments[i]);
+        if (isNaN(tmp)) {
+            var mon = getMonth(arguments[i]);
+            date2.setMonth(mon);
+        } else if (tmp < 32) {
+            date2.setDate(tmp);
+        } else {
+            date2.setFullYear(tmp);
+        }
+    }
+    if (adjustMonth) {
+        date1.setMonth(date.getMonth());
+        date2.setMonth(date.getMonth());
+    }
+    if (isGMT) {
+    var tmp = date;
+        tmp.setFullYear(date.getUTCFullYear());
+        tmp.setMonth(date.getUTCMonth());
+        tmp.setDate(date.getUTCDate());
+        tmp.setHours(date.getUTCHours());
+        tmp.setMinutes(date.getUTCMinutes());
+        tmp.setSeconds(date.getUTCSeconds());
+        date = tmp;
+    }
+    return ((date1 <= date) && (date <= date2));
+}
+
+function timeRange() {
+    var argc = arguments.length;
+    var date = new Date();
+    var isGMT= false;
+
+    if (argc < 1) {
+        return false;
+    }
+    if (arguments[argc - 1] == 'GMT') {
+        isGMT = true;
+        argc--;
+    }
+
+    var hour = isGMT ? date.getUTCHours() : date.getHours();
+    var date1, date2;
+    date1 = new Date();
+    date2 = new Date();
+
+    if (argc == 1) {
+        return (hour == arguments[0]);
+    } else if (argc == 2) {
+        return ((arguments[0] <= hour) && (hour <= arguments[1]));
+    } else {
+        switch (argc) {
+        case 6:
+            date1.setSeconds(arguments[2]);
+            date2.setSeconds(arguments[5]);
+        case 4:
+            var middle = argc >> 1;
+            date1.setHours(arguments[0]);
+            date1.setMinutes(arguments[1]);
+            date2.setHours(arguments[middle]);
+            date2.setMinutes(arguments[middle + 1]);
+            if (middle == 2) {
+                date2.setSeconds(59);
+            }
+            break;
+        default:
+          throw 'timeRange: bad number of arguments'
+        }
+    }
+
+    if (isGMT) {
+        date.setFullYear(date.getUTCFullYear());
+        date.setMonth(date.getUTCMonth());
+        date.setDate(date.getUTCDate());
+        date.setHours(date.getUTCHours());
+        date.setMinutes(date.getUTCMinutes());
+        date.setSeconds(date.getUTCSeconds());
+    }
+    return ((date1 <= date) && (date <= date2));
+}

reactos/dll/win32/winhttp/rsrc.rc

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2008 Robert Shearman
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* @makedep: winhttp_tlb.tlb */
+1 TYPELIB winhttp_tlb.tlb
+
+/* @makedep: winhttp_tlb.rgs */
+1 WINE_REGISTRY winhttp_tlb.rgs
+
+/* @makedep: pac.js */
+pac.js 40 "pac.js"
+
+#define WINE_FILEDESCRIPTION_STR "Wine HTTP Library"
+#define WINE_FILENAME_STR "winhttp.dll"
+#define WINE_FILEVERSION_MAJOR 5
+#define WINE_FILEVERSION_MINOR 1
+#define WINE_FILEVERSION_BUILD 2600
+#define WINE_FILEVERSION_PLATFORMID 2180
+
+#include "wine/wine_common_ver.rc"

reactos/dll/win32/winhttp/url.c

@@ -38,7 +38,7 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len,
 {
     if (!*str)
     {
-        if (len && (flags & ICU_DECODE))
+        if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE)))
         {
             set_last_error( ERROR_INVALID_PARAMETER );
             return FALSE;
@@ -61,12 +61,109 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len,
     return TRUE;
 }
 
-static BOOL decode_url( LPCWSTR url, LPWSTR buffer, LPDWORD buflen )
+static WCHAR *decode_url( LPCWSTR url, DWORD *len )
 {
-    HRESULT hr = UrlCanonicalizeW( url, buffer, buflen, URL_WININET_COMPATIBILITY | URL_UNESCAPE );
-    if (hr == E_POINTER) set_last_error( ERROR_INSUFFICIENT_BUFFER );
-    if (hr == E_INVALIDARG) set_last_error( ERROR_INVALID_PARAMETER );
-    return (SUCCEEDED(hr)) ? TRUE : FALSE;
+    const WCHAR *p = url;
+    WCHAR hex[3], *q, *ret;
+
+    if (!(ret = heap_alloc( *len * sizeof(WCHAR) ))) return NULL;
+    q = ret;
+    while (*len > 0)
+    {
+        if (p[0] == '%' && isxdigitW( p[1] ) && isxdigitW( p[2] ))
+        {
+            hex[0] = p[1];
+            hex[1] = p[2];
+            hex[2] = 0;
+            *q++ = strtolW( hex, NULL, 16 );
+            p += 3;
+            *len -= 3;
+        }
+        else
+        {
+            *q++ = *p++;
+            *len -= 1;
+        }
+    }
+    *len = q - ret;
+    return ret;
+}
+
+static BOOL need_escape( WCHAR c )
+{
+    if (isalnumW( c )) return FALSE;
+
+    if (c <= 31 || c >= 127) return TRUE;
+    else
+    {
+        switch (c)
+        {
+        case ' ':
+        case '"':
+        case '#':
+        case '%':
+        case '<':
+        case '>':
+        case ']':
+        case '\\':
+        case '[':
+        case '^':
+        case '`':
+        case '{':
+        case '|':
+        case '}':
+        case '~':
+            return TRUE;
+        default:
+            return FALSE;
+        }
+    }
+}
+
+static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len )
+{
+    static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
+    DWORD ret = len;
+    unsigned int i;
+    WCHAR *p = dst;
+
+    for (i = 0; i < len; i++, p++)
+    {
+        if (need_escape( src[i] ))
+        {
+            p[0] = '%';
+            p[1] = hex[(src[i] >> 4) & 0xf];
+            p[2] = hex[src[i] & 0xf];
+            ret += 2;
+            p += 2;
+        }
+        else *p = src[i];
+    }
+    dst[ret] = 0;
+    return ret;
+}
+
+static WCHAR *escape_url( LPCWSTR url, DWORD *len )
+{
+    WCHAR *ret;
+    const WCHAR *p, *q;
+
+    if ((p = q = strrchrW( url, '/' )))
+    {
+        while (*q)
+        {
+            if (need_escape( *q )) *len += 2;
+            q++;
+        }
+    }
+    if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL;
+    if (!p) strcpyW( ret, url );
+    else
+    {
+        memcpy( ret, url, (p - url) * sizeof(WCHAR) );
+        copy_escape( ret + (p - url), p, q - p );
+    }
+    return ret;
 }
 
 /***********************************************************************
@@ -75,13 +172,10 @@ static BOOL decode_url( LPCWSTR url, LPWSTR buffer, LPDWORD buflen )
 BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc )
 {
     BOOL ret = FALSE;
-    WCHAR *p, *q, *r;
-    WCHAR *url_decoded = NULL;
+    WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL;
 
     TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc);
 
-    if (flags & ICU_ESCAPE) FIXME("flag ICU_ESCAPE not supported\n");
-
     if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS))
     {
         set_last_error( ERROR_INVALID_PARAMETER );
@@ -89,30 +183,23 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
     }
     if (!len) len = strlenW( url );
 
-    if (flags & ICU_DECODE)
+    if (flags & ICU_ESCAPE)
     {
-        WCHAR *url_tmp;
-        DWORD url_len = len + 1;
-
-        if (!(url_tmp = HeapAlloc( GetProcessHeap(), 0, url_len * sizeof(WCHAR) )))
+        if (!(url_escaped = escape_url( url, &len )))
         {
             set_last_error( ERROR_OUTOFMEMORY );
             return FALSE;
         }
-        memcpy( url_tmp, url, len * sizeof(WCHAR) );
-        url_tmp[len] = 0;
-        if (!(url_decoded = HeapAlloc( GetProcessHeap(), 0, url_len * sizeof(WCHAR) )))
+        url = url_escaped;
+    }
+    else if (flags & ICU_DECODE)
+    {
+        if (!(url_decoded = decode_url( url, &len )))
         {
-            HeapFree( GetProcessHeap(), 0, url_tmp );
             set_last_error( ERROR_OUTOFMEMORY );
             return FALSE;
         }
-        if (decode_url( url_tmp, url_decoded, &url_len ))
-        {
-            len = url_len;
-            url = url_decoded;
-        }
-        HeapFree( GetProcessHeap(), 0, url_tmp );
+        url = url_decoded;
     }
     if (!(p = strchrW( url, ':' )))
     {
@@ -207,7 +294,8 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN
           debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength ));
 
 exit:
-    HeapFree( GetProcessHeap(), 0, url_decoded );
+    heap_free( url_decoded );
+    heap_free( url_escaped );
     return ret;
 }
 
@@ -232,60 +320,6 @@ static BOOL uses_default_port( INTERNET_SCHEME scheme, INTERNET_PORT port )
     return FALSE;
 }
 
-static BOOL need_escape( WCHAR c )
-{
-    if (isalnumW( c )) return FALSE;
-
-    if (c <= 31 || c >= 127) return TRUE;
-    else
-    {
-        switch (c)
-        {
-        case ' ':
-        case '"':
-        case '#':
-        case '%':
-        case '<':
-        case '>':
-        case ']':
-        case '\\':
-        case '[':
-        case '^':
-        case '`':
-        case '{':
-        case '|':
-        case '}':
-        case '~':
-            return TRUE;
-        default:
-            return FALSE;
-        }
-    }
-}
-
-static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len )
-{
-    static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};
-    DWORD ret = len;
-    unsigned int i;
-    WCHAR *p = dst;
-
-    for (i = 0; i < len; i++, p++)
-    {
-        if (need_escape( src[i] ))
-        {
-            p[0] = '%';
-            p[1] = hex[(src[i] >> 4) & 0xf];
-            p[2] = hex[src[i] & 0xf];
-            ret += 2;
-            p += 2;
-        }
-        else *p = src[i];
-    }
-    dst[ret] = 0;
-    return ret;
-}
-
 static DWORD comp_length( DWORD len, DWORD flags, WCHAR *comp )
 {
     DWORD ret;

reactos/dll/win32/winhttp/winhttp_private.h

@@ -42,9 +42,11 @@
 # define closesocket close
 # define ioctlsocket ioctl
 #endif
+#include "ole2.h"
 
 static const WCHAR getW[]    = {'G','E','T',0};
 static const WCHAR postW[]   = {'P','O','S','T',0};
+static const WCHAR headW[]   = {'H','E','A','D',0};
 static const WCHAR slashW[]  = {'/',0};
 static const WCHAR http1_0[] = {'H','T','T','P','/','1','.','0',0};
 static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0};
@@ -118,6 +120,7 @@ typedef struct
     INTERNET_PORT hostport;
     INTERNET_PORT serverport;
     struct sockaddr_storage sockaddr;
+    BOOL resolved;
 } connect_t;
 
 typedef struct
@@ -156,6 +159,8 @@ typedef struct
     DWORD content_read;   /* bytes read so far */
     header_t *headers;
     DWORD num_headers;
+    WCHAR **accept_types;
+    DWORD num_accept_types;
 } request_t;
 
 typedef struct _task_header_t task_header_t;
@@ -237,6 +242,39 @@ BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ) DECLSPEC_HIDDEN;
 void delete_domain( domain_t * ) DECLSPEC_HIDDEN;
 BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) DECLSPEC_HIDDEN;
 
+extern HRESULT WinHttpRequest_create( IUnknown *, void ** ) DECLSPEC_HIDDEN;
+
+static inline const char *debugstr_variant( const VARIANT *v )
+{
+    if (!v) return "(null)";
+    switch (V_VT(v))
+    {
+    case VT_EMPTY:
+        return "{VT_EMPTY}";
+    case VT_NULL:
+        return "{VT_NULL}";
+    case VT_I4:
+        return wine_dbg_sprintf( "{VT_I4: %d}", V_I4(v) );
+    case VT_R8:
+        return wine_dbg_sprintf( "{VT_R8: %lf}", V_R8(v) );
+    case VT_BSTR:
+        return wine_dbg_sprintf( "{VT_BSTR: %s}", debugstr_w(V_BSTR(v)) );
+    case VT_DISPATCH:
+        return wine_dbg_sprintf( "{VT_DISPATCH: %p}", V_DISPATCH(v) );
+    case VT_BOOL:
+        return wine_dbg_sprintf( "{VT_BOOL: %x}", V_BOOL(v) );
+    case VT_UNKNOWN:
+        return wine_dbg_sprintf( "{VT_UNKNOWN: %p}", V_UNKNOWN(v) );
+    case VT_UINT:
+        return wine_dbg_sprintf( "{VT_UINT: %u}", V_UINT(v) );
+    case VT_BSTR|VT_BYREF:
+        return wine_dbg_sprintf( "{VT_BSTR|VT_BYREF: ptr %p, data %s}",
+            V_BSTRREF(v), V_BSTRREF(v) ? debugstr_w( *V_BSTRREF(v) ) : NULL );
+    default:
+        return wine_dbg_sprintf( "{vt %d}", V_VT(v) );
+    }
+}
+
 static inline void *heap_alloc( SIZE_T size )
 {
     return HeapAlloc( GetProcessHeap(), 0, size );

reactos/dll/win32/winhttp/winhttp_ros.diff

@@ -1,37 +1,44 @@
---- wine-1.3.4/dlls/winhttp/net.c	2010-10-01 14:46:44.000000000 -0400
-+++ dll/win32/winhttp/net.c	2010-10-09 17:04:11.000000000 -0400
-@@ -158,6 +158,7 @@
+--- wine-1.5.4/dlls/winhttp/net.c	2012-06-20 14:30:41 +0200
++++ dll/win32/winhttp/net.c	2012-06-21 18:00:53 +0200
+@@ -160,6 +160,7 @@ static void ssl_lock_callback(int mode,
  #endif
  
  /* translate a unix error code into a winsock error code */
-+#if 0
++#ifndef __REACTOS__
  static int sock_get_error( int err )
  {
  #if !defined(__MINGW32__) && !defined (_MSC_VER)
-@@ -223,6 +224,9 @@
+@@ -225,6 +226,15 @@ static int sock_get_error( int err )
  #endif
      return err;
  }
 +#else
 +#define sock_get_error(x) WSAGetLastError()
++
++static inline int unix_ioctl(int filedes, long request, void *arg)
++{
++    return ioctlsocket(filedes, request, arg);
++}
++#define ioctlsocket unix_ioctl
 +#endif
  
  #ifdef SONAME_LIBSSL
  static PCCERT_CONTEXT X509_to_cert_context(X509 *cert)
-@@ -632,11 +636,16 @@
+@@ -648,11 +658,17 @@ BOOL netconn_connect( netconn_t *conn, c
          res = sock_get_error( errno );
          if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS)
          {
 -            struct pollfd pfd;
++            // ReactOS: use select instead of poll
 +            fd_set outfd;
 +            struct timeval tv;
-+
-+            FD_ZERO(&outfd);
-+            FD_SET(conn->socket, &outfd);
  
 -            pfd.fd = conn->socket;
 -            pfd.events = POLLOUT;
 -            if (poll( &pfd, 1, timeout ) > 0)
++            FD_ZERO(&outfd);
++            FD_SET(conn->socket, &outfd);
++
 +            tv.tv_sec = 0;
 +            tv.tv_usec = timeout * 1000;
 +
@@ -39,26 +46,25 @@
                  ret = TRUE;
              else
                  res = sock_get_error( errno );
-@@ -832,7 +841,7 @@
+@@ -848,7 +864,8 @@ BOOL netconn_query_data_available( netco
  
  BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen )
  {
 -    struct pollfd pfd;
++    // ReactOS: use select instead of poll
 +    fd_set infd;
      BOOL ret = FALSE;
      DWORD recvd = 0;
  
-@@ -867,20 +876,22 @@
-         return FALSE;
+@@ -884,19 +901,21 @@ BOOL netconn_get_next_line( netconn_t *c
  #endif
      }
--
+ 
 -    pfd.fd = conn->socket;
 -    pfd.events = POLLIN;
-+    
 +    FD_ZERO(&infd);
 +    FD_SET(conn->socket, &infd);
-+    
++
      while (recvd < *buflen)
      {
 -        int timeout, res;
@@ -74,26 +80,14 @@
 -            timeout = -1;
 -        if (poll( &pfd, 1, timeout ) > 0)
 +            ptv = NULL;
-+            
++
 +        if (select( 0, &infd, NULL, NULL, ptv ) > 0)
          {
              if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0)
              {
---- wine-1.3.4/dlls/winhttp/session.c	2010-10-01 14:46:44.000000000 -0400
-+++ dll/win32/winhttp/session.c	2010-10-09 17:04:11.000000000 -0400
-@@ -38,6 +38,9 @@
- #define DEFAULT_SEND_TIMEOUT        30000
- #define DEFAULT_RECEIVE_TIMEOUT     30000
- 
-+/* FIXME */
-+#define CP_UNIXCP CP_ACP
-+
- void set_last_error( DWORD error )
- {
-     /* FIXME */
---- wine-1.3.4/dlls/winhttp/request.c	2010-10-01 14:46:44.000000000 -0400
-+++ dll/win32/winhttp/request.c	2010-10-09 17:04:11.000000000 -0400
-@@ -34,6 +34,8 @@
+--- wine-1.5.4/dlls/winhttp/request.c	2012-06-20 14:30:41 +0200
++++ dll/win32/winhttp/request.c	2012-06-21 17:32:47 +0200
+@@ -38,6 +38,8 @@
  
  #include "winhttp_private.h"
  
@@ -101,4 +95,43 @@
 +
  WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
  
- static const WCHAR attr_accept[] = {'A','c','c','e','p','t',0};
+ static const WCHAR attr_accept[] = {'A','c','c','e','p','t',0};
+--- wine-1.5.4/dlls/winhttp/rsrc.rc	2012-06-20 14:30:41 +0200
++++ dll/win32/winhttp/rsrc.rc	2012-07-14 15:25:28 +0200
+@@ -16,6 +16,12 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++/* @makedep: winhttp_tlb.tlb */
++1 TYPELIB winhttp_tlb.tlb
++
++/* @makedep: winhttp_tlb.rgs */
++1 WINE_REGISTRY winhttp_tlb.rgs
++
+ /* @makedep: pac.js */
+ pac.js 40 "pac.js"
+ 
+--- wine-1.5.4/dlls/winhttp/session.c	2012-07-13 15:34:57 +0200
++++ dll/win32/winhttp/session.c	2012-06-23 17:51:47 +0200
+@@ -95,6 +95,9 @@ static void session_destroy( object_head
+     heap_free( session->proxy_username );
+     heap_free( session->proxy_password );
+     heap_free( session );
++#ifdef __REACTOS__
++    WSACleanup();
++#endif
+ }
+ 
+ static BOOL session_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen )
+@@ -203,6 +206,11 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR ag
+ {
+     session_t *session;
+     HINTERNET handle = NULL;
++#ifdef __REACTOS__
++    WSADATA wsaData;
++    int error = WSAStartup(MAKEWORD(2, 2), &wsaData);
++    if (error) ERR("WSAStartup failed: %d\n", error);
++#endif
+ 
+     TRACE("%s, %u, %s, %s, 0x%08x\n", debugstr_w(agent), access, debugstr_w(proxy), debugstr_w(bypass), flags);
+ 

reactos/dll/win32/winhttp/winhttp_tlb.idl

@@ -0,0 +1,21 @@
+/*
+ * Typelib for winhttp
+ *
+ * Copyright 2011 Hans Leidekker for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "httprequest.idl"

reactos/dll/win32/winhttp/winhttp_tlb.rgs

@@ -0,0 +1,37 @@
+HKCR
+{
+    NoRemove Typelib
+    {
+        NoRemove '{662901FC-6951-4854-9EB2-D9A2570F2B2E}'
+        {
+            '5.1' = s 'Microsoft WinHTTP Services, version 5.1'
+            {
+                '0' { win32 = s '%MODULE%' }
+                FLAGS = s '0'
+            }
+        }
+    }
+    NoRemove Interface
+    {
+        '{016FE2EC-B2C8-45F8-B23B-39E53A75396B}' = s 'IWinHttpRequest'
+        {
+            ProxyStubClsid = s '{00020424-0000-0000-C000-000000000046}'
+            ProxyStubClsid32 = s '{00020424-0000-0000-C000-000000000046}'
+            TypeLib = s '{662901FC-6951-4854-9EB2-D9A2570F2B2E}' { val Version = s '5.1' }
+        }
+    }
+    NoRemove CLSID
+    {
+        '{2087C2F4-2CEF-4953-A8AB-66779B670495}' = s 'WinHttpRequest Component version 5.1'
+        {
+            InprocServer32 = s '%MODULE%' { val ThreadingModel = s 'Apartment' }
+            ProgId = s 'WinHttp.WinHttpRequest.5.1'
+            TypeLib = s '{662901FC-6951-4854-9EB2-D9A2570F2B2E}'
+            Version = s '5.1'
+        }
+    }
+    'WinHttp.WinHttpRequest.5.1' = s 'WinHttpRequest Component version 5.1'
+    {
+        CLSID = s '{2087C2F4-2CEF-4953-A8AB-66779B670495}'
+    }
+}

reactos/media/doc/README.WINE

@@ -184,7 +184,7 @@ reactos/dll/win32/wer             # Autosync
 reactos/dll/win32/windowscodecs   # Autosync
 reactos/dll/win32/winemp3.acm     # Synced to Wine-1.5.4
 reactos/dll/win32/wing32          # Out of sync
-reactos/dll/win32/winhttp         # Autosync
+reactos/dll/win32/winhttp         # Synced to Wine-1.5.4
 reactos/dll/win32/wininet         # Synced to Wine-1.5.4
 reactos/dll/win32/winmm           # Forked at Wine-20050628
 reactos/dll/win32/winmm/midimap   # Forked at Wine-20050628