winhttp: Make the standard utilities available to PAC scripts.

dlls/winhttp/Makefile.in

@@ -15,6 +15,6 @@ C_SRCS = \
 
 IDL_TLB_SRCS = winhttp_tlb.idl
 
-RC_SRCS = version.rc
+RC_SRCS = rsrc.rc
 
 @MAKE_DLL_RULES@

dlls/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));
+}

dlls/winhttp/rsrc.rc

@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+/* @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

dlls/winhttp/session.c

@@ -30,6 +30,7 @@
 #include "winreg.h"
 #define COBJMACROS
 #include "ole2.h"
+#include "dispex.h"
 #include "activscp.h"
 
 #include "winhttp_private.h"
@@ -41,6 +42,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp);
 #define DEFAULT_SEND_TIMEOUT        30000
 #define DEFAULT_RECEIVE_TIMEOUT     30000
 
+static const WCHAR global_funcsW[] = {'g','l','o','b','a','l','_','f','u','n','c','s',0};
+static const WCHAR dns_resolveW[] = {'d','n','s','_','r','e','s','o','l','v','e',0};
+
 void set_last_error( DWORD error )
 {
     /* FIXME */
@@ -1141,24 +1145,27 @@ static BOOL is_domain_suffix( const char *domain, const char *suffix )
     return FALSE;
 }
 
+static void printf_addr( const WCHAR *fmt, WCHAR *buf, struct sockaddr_in *addr )
+{
+    sprintfW( buf, fmt,
+              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff),
+              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff),
+              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff),
+              (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) );
+}
+
 static WCHAR *build_wpad_url( const struct addrinfo *ai )
 {
     static const WCHAR fmtW[] =
         {'h','t','t','p',':','/','/','%','u','.','%','u','.','%','u','.','%','u',
          '/','w','p','a','d','.','d','a','t',0};
-    struct sockaddr_in *addr;
     WCHAR *ret;
 
     while (ai && ai->ai_family != AF_INET) ai = ai->ai_next;
     if (!ai) return NULL;
 
     if (!(ret = GlobalAlloc( 0, sizeof(fmtW) + 12 * sizeof(WCHAR) ))) return NULL;
-    addr = (struct sockaddr_in *)ai->ai_addr;
+    printf_addr( fmtW, ret, (struct sockaddr_in *)ai->ai_addr );
-    sprintfW( ret, fmtW,
-              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 24 & 0xff),
-              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 16 & 0xff),
-              (unsigned int)(ntohl( addr->sin_addr.s_addr ) >> 8 & 0xff),
-              (unsigned int)(ntohl( addr->sin_addr.s_addr ) & 0xff) );
     return ret;
 }
 
@@ -1477,6 +1484,178 @@ done:
     return ret;
 }
 
+static HRESULT WINAPI dispex_QueryInterface(
+    IDispatchEx *iface, REFIID riid, void **ppv )
+{
+    *ppv = NULL;
+
+    if (IsEqualGUID( riid, &IID_IUnknown )  ||
+        IsEqualGUID( riid, &IID_IDispatch ) ||
+        IsEqualGUID( riid, &IID_IDispatchEx ))
+        *ppv = iface;
+    else
+        return E_NOINTERFACE;
+
+    return S_OK;
+}
+
+static ULONG WINAPI dispex_AddRef(
+    IDispatchEx *iface )
+{
+    return 2;
+}
+
+static ULONG WINAPI dispex_Release(
+    IDispatchEx *iface )
+{
+    return 1;
+}
+
+static HRESULT WINAPI dispex_GetTypeInfoCount(
+    IDispatchEx *iface, UINT *info )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetTypeInfo(
+    IDispatchEx *iface, UINT info, LCID lcid, ITypeInfo **type_info )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetIDsOfNames(
+    IDispatchEx *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *id )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_Invoke(
+    IDispatchEx *iface, DISPID member, REFIID riid, LCID lcid, WORD flags,
+    DISPPARAMS *params, VARIANT *result, EXCEPINFO *excep, UINT *err )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_DeleteMemberByName(
+    IDispatchEx *iface, BSTR name, DWORD flags )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_DeleteMemberByDispID(
+    IDispatchEx *iface, DISPID id )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetMemberProperties(
+    IDispatchEx *iface, DISPID id, DWORD flags_fetch, DWORD *flags )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetMemberName(
+    IDispatchEx *iface, DISPID id, BSTR *name )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetNextDispID(
+    IDispatchEx *iface, DWORD flags, DISPID id, DISPID *next )
+{
+    return E_NOTIMPL;
+}
+
+static HRESULT WINAPI dispex_GetNameSpaceParent(
+    IDispatchEx *iface, IUnknown **unk )
+{
+    return E_NOTIMPL;
+}
+
+#define DISPID_GLOBAL_DNSRESOLVE  0x1000
+
+static HRESULT WINAPI dispex_GetDispID(
+    IDispatchEx *iface, BSTR name, DWORD flags, DISPID *id )
+{
+    if (!strcmpW( name, dns_resolveW ))
+    {
+        *id = DISPID_GLOBAL_DNSRESOLVE;
+        return S_OK;
+    }
+    return DISP_E_UNKNOWNNAME;
+}
+
+static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result )
+{
+#ifdef HAVE_GETADDRINFO
+        static const WCHAR fmtW[] = {'%','u','.','%','u','.','%','u','.','%','u',0};
+        WCHAR addr[16];
+        struct addrinfo *ai, *elem;
+        char *hostnameA;
+        int res;
+
+        if (hostname[0])
+            hostnameA = strdupWA( hostname );
+        else
+            hostnameA = get_computer_name( ComputerNamePhysicalDnsFullyQualified );
+
+        if (!hostnameA) return E_OUTOFMEMORY;
+        res = getaddrinfo( hostnameA, NULL, NULL, &ai );
+        heap_free( hostnameA );
+        if (res) return S_FALSE;
+
+        elem = ai;
+        while (elem && elem->ai_family != AF_INET) elem = elem->ai_next;
+        if (!elem)
+        {
+            freeaddrinfo( ai );
+            return S_FALSE;
+        }
+        printf_addr( fmtW, addr, (struct sockaddr_in *)elem->ai_addr );
+        freeaddrinfo( ai );
+        V_VT( result ) = VT_BSTR;
+        V_BSTR( result ) = SysAllocString( addr );
+        return S_OK;
+#else
+        FIXME("getaddrinfo not found at build time\n");
+        return S_FALSE;
+#endif
+}
+
+static HRESULT WINAPI dispex_InvokeEx(
+    IDispatchEx *iface, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params,
+    VARIANT *result, EXCEPINFO *exep, IServiceProvider *caller )
+{
+    if (id == DISPID_GLOBAL_DNSRESOLVE)
+    {
+        if (params->cArgs != 1) return DISP_E_BADPARAMCOUNT;
+        if (V_VT(&params->rgvarg[0]) != VT_BSTR) return DISP_E_BADVARTYPE;
+        return dns_resolve( V_BSTR(&params->rgvarg[0]), result );
+    }
+    return DISP_E_MEMBERNOTFOUND;
+}
+
+static const IDispatchExVtbl dispex_vtbl =
+{
+    dispex_QueryInterface,
+    dispex_AddRef,
+    dispex_Release,
+    dispex_GetTypeInfoCount,
+    dispex_GetTypeInfo,
+    dispex_GetIDsOfNames,
+    dispex_Invoke,
+    dispex_GetDispID,
+    dispex_InvokeEx,
+    dispex_DeleteMemberByName,
+    dispex_DeleteMemberByDispID,
+    dispex_GetMemberProperties,
+    dispex_GetMemberName,
+    dispex_GetNextDispID,
+    dispex_GetNameSpaceParent
+};
+
+static IDispatchEx global_dispex = { &dispex_vtbl };
+
 static HRESULT WINAPI site_QueryInterface(
     IActiveScriptSite *iface, REFIID riid, void **ppv )
 {
@@ -1515,6 +1694,11 @@ static HRESULT WINAPI site_GetItemInfo(
     IActiveScriptSite *iface, LPCOLESTR name, DWORD mask,
     IUnknown **item, ITypeInfo **type_info )
 {
+    if (!strcmpW( name, global_funcsW ) && mask == SCRIPTINFO_IUNKNOWN)
+    {
+        *item = (IUnknown *)&global_dispex;
+        return S_OK;
+    }
     return E_NOTIMPL;
 }
 
@@ -1607,6 +1791,28 @@ static BOOL parse_script_result( VARIANT result, WINHTTP_PROXY_INFO *info )
     return TRUE;
 }
 
+static BSTR include_pac_utils( BSTR script )
+{
+    static const WCHAR pacjsW[] = {'p','a','c','.','j','s',0};
+    HMODULE hmod = GetModuleHandleA( "winhttp.dll" );
+    HRSRC rsrc;
+    DWORD size;
+    const char *data;
+    BSTR ret;
+    int len;
+
+    if (!(rsrc = FindResourceW( hmod, pacjsW, (LPCWSTR)40 ))) return NULL;
+    size = SizeofResource( hmod, rsrc );
+    data = LoadResource( hmod, rsrc );
+
+    len = MultiByteToWideChar( CP_ACP, 0, data, size, NULL, 0 );
+    if (!(ret = SysAllocStringLen( NULL, len + SysStringLen( script ) + 1 ))) return NULL;
+    MultiByteToWideChar( CP_ACP, 0, data, size, ret, len );
+    ret[len] = 0;
+    strcatW( ret, script );
+    return ret;
+}
+
 static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO *info )
 {
     static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0};
@@ -1617,7 +1823,7 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
     BOOL ret = FALSE;
     CLSID clsid;
     DISPID dispid;
-    BSTR func = NULL, hostname = NULL;
+    BSTR func = NULL, hostname = NULL, full_script = NULL;
     URL_COMPONENTSW uc;
     VARIANT args[2], result;
     DISPPARAMS params;
@@ -1645,9 +1851,12 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
     hr = IActiveScript_SetScriptSite( engine, &script_site );
     if (hr != S_OK) goto done;
 
-    /* FIXME: make standard functions available to script */
+    hr = IActiveScript_AddNamedItem( engine, global_funcsW, SCRIPTITEM_GLOBALMEMBERS );
+    if (hr != S_OK) goto done;
 
-    hr = IActiveScriptParse64_ParseScriptText( parser, script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL );
+    if (!(full_script = include_pac_utils( script ))) goto done;
+
+    hr = IActiveScriptParse64_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL );
     if (hr != S_OK) goto done;
 
     hr = IActiveScript_SetScriptState( engine, SCRIPTSTATE_STARTED );
@@ -1672,11 +1881,15 @@ static BOOL run_script( const BSTR script, const WCHAR *url, WINHTTP_PROXY_INFO
     hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD,
                            &params, &result, NULL, NULL );
     VariantClear( &args[1] );
-    if (hr != S_OK) goto done;
+    if (hr != S_OK)
-
+    {
+        WARN("script failed 0x%08x\n", hr);
+        goto done;
+    }
     ret = parse_script_result( result, info );
 
 done:
+    SysFreeString( full_script );
     SysFreeString( hostname );
     SysFreeString( func );
     if (dispatch) IDispatch_Release( dispatch );