Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 64273: [WINHTTP] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: akhaldi Date: Thu Sep 25 15:10:02 2014 New Revision: 64273 URL: http://svn.reactos.org/svn/reactos?rev=64273&view=rev Log: [WINHTTP] * Sync with Wine 1.7.27. CORE-8540 Removed: trunk/reactos/dll/win32/winhttp/pac.js Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt trunk/reactos/dll/win32/winhttp/net.c trunk/reactos/dll/win32/winhttp/request.c trunk/reactos/dll/win32/winhttp/rsrc.rc trunk/reactos/dll/win32/winhttp/session.c trunk/reactos/dll/win32/winhttp/url.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/CMakeLists.txt [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -27,7 +27,7 @@ set_module_type(winhttp win32dll) target_link_libraries(winhttp uuid wine) add_delay_importlibs(winhttp oleaut32 ole32 crypt32 secur32) -add_importlibs(winhttp user32 advapi32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(winhttp user32 advapi32 ws2_32 jsproxy msvcrt kernel32 ntdll) add_dependencies(winhttp stdole2) # wininet_tlb.tlb needs stdole2.tlb add_pch(winhttp winhttp_private.h SOURCE) add_cd_file(TARGET winhttp DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/winhttp/net.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/net.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/net.c [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -126,6 +126,28 @@ #define ioctlsocket unix_ioctl #endif +static int sock_send(int fd, const void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = send(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + +static int sock_recv(int fd, void *msg, size_t len, int flags) +{ + int ret; + do + { + ret = recv(fd, msg, len, flags); + } + while(ret == -1 && errno == EINTR); + return ret; +} + static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) { HCERTSTORE store = cert->hCertStore; @@ -331,7 +353,7 @@ res = sock_get_error( errno ); if (res == WSAEWOULDBLOCK || res == WSAEINPROGRESS) { - // ReactOS: use select instead of poll + /* ReactOS: use select instead of poll */ fd_set outfd; struct timeval tv; @@ -396,7 +418,7 @@ TRACE("sending %u bytes\n", out_buf.cbBuffer); - size = send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); + size = sock_send(conn->socket, out_buf.pvBuffer, out_buf.cbBuffer, 0); if(size != out_buf.cbBuffer) { ERR("send failed\n"); res = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -435,7 +457,7 @@ read_buf_size += 1024; } - size = recv(conn->socket, (char *)(read_buf+in_bufs[0].cbBuffer), read_buf_size-in_bufs[0].cbBuffer, 0); + size = sock_recv(conn->socket, read_buf+in_bufs[0].cbBuffer, read_buf_size-in_bufs[0].cbBuffer, 0); if(size < 1) { WARN("recv error\n"); status = ERROR_WINHTTP_SECURE_CHANNEL_ERROR; @@ -481,6 +503,7 @@ } } + heap_free(read_buf); if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context failed: %08x\n", status); @@ -516,7 +539,7 @@ return FALSE; } - if(send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { + if(sock_send(conn->socket, conn->ssl_buf, bufs[0].cbBuffer+bufs[1].cbBuffer+bufs[2].cbBuffer, 0) < 1) { WARN("send failed\n"); return FALSE; } @@ -546,7 +569,7 @@ return TRUE; } - if ((*sent = send( conn->socket, msg, len, 0 )) == -1) + if ((*sent = sock_send( conn->socket, msg, len, 0 )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE; @@ -572,7 +595,7 @@ heap_free(conn->extra_buf); conn->extra_buf = NULL; }else { - buf_len = recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); + buf_len = sock_recv(conn->socket, conn->ssl_buf+conn->extra_len, ssl_buf_size-conn->extra_len, 0); if(buf_len < 0) { WARN("recv failed\n"); return FALSE; @@ -604,7 +627,7 @@ case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - size = recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); + size = sock_recv(conn->socket, conn->ssl_buf+buf_len, ssl_buf_size-buf_len, 0); if(size < 1) return FALSE; @@ -697,7 +720,7 @@ *recvd = size; return TRUE; } - if ((*recvd = recv( conn->socket, buf, len, flags )) == -1) + if ((*recvd = sock_recv( conn->socket, buf, len, flags )) == -1) { set_last_error( sock_get_error( errno ) ); return FALSE; Removed: trunk/reactos/dll/win32/winhttp/pac.js URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/pac.js?r… ============================================================================== --- trunk/reactos/dll/win32/winhttp/pac.js [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/pac.js (removed) @@ -1,244 +0,0 @@ -/* - * 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 explicit 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)); -} Modified: trunk/reactos/dll/win32/winhttp/request.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/request.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/request.c [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -2241,6 +2241,8 @@ request->read_chunked = FALSE; request->read_chunked_eof = FALSE; } + else heap_free( hostname ); + if (!(ret = add_host_header( request, WINHTTP_ADDREQ_FLAG_REPLACE ))) goto end; if (!(ret = open_connection( request ))) goto end; @@ -2269,7 +2271,6 @@ ret = TRUE; end: - if (!ret) heap_free( hostname ); heap_free( location ); return ret; } @@ -2981,7 +2982,7 @@ path[uc.dwUrlPathLength + uc.dwExtraInfoLength] = 0; if (!(verb = strdupW( method ))) goto error; - if (V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; + if (V_VT( &async ) == VT_BOOL && V_BOOL( &async )) flags |= WINHTTP_FLAG_ASYNC; if (!(hsession = WinHttpOpen( user_agentW, WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, NULL, NULL, flags ))) { err = get_last_error(); @@ -3341,7 +3342,7 @@ { sa = V_ARRAY( &data ); if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; - if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) + if ((hr = SafeArrayGetUBound( sa, 1, &size )) != S_OK) { SafeArrayUnaccessData( sa ); return hr; Modified: trunk/reactos/dll/win32/winhttp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/winhttp/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/rsrc.rc [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -22,9 +22,6 @@ /* @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 Modified: trunk/reactos/dll/win32/winhttp/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/session.… ============================================================================== --- trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/session.c [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -27,9 +27,6 @@ #define DEFAULT_CONNECT_TIMEOUT 20000 #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 ) { @@ -1247,15 +1244,6 @@ 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 int reverse_lookup( const struct addrinfo *ai, char *hostname, size_t len ) { int ret = -1; @@ -1287,12 +1275,42 @@ return ret; } +static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen ) +{ +#if defined(MAC_OS_X_VERSION_10_6) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 + CFDictionaryRef settings = CFNetworkCopySystemProxySettings(); + const void *ref; + BOOL ret = FALSE; + + if (!settings) return FALSE; + + if (!(ref = CFDictionaryGetValue( settings, kCFNetworkProxiesProxyAutoConfigURLString ))) + { + CFRelease( settings ); + return FALSE; + } + if (CFStringGetCString( ref, buf, buflen, kCFStringEncodingASCII )) + { + TRACE( "returning %s\n", debugstr_a(buf) ); + ret = TRUE; + } + CFRelease( settings ); + return ret; +#else + FIXME( "no support on this platform\n" ); + return FALSE; +#endif +} + +#define INTERNET_MAX_URL_LENGTH 2084 + /*********************************************************************** * WinHttpDetectAutoProxyConfigUrl (winhttp.@) */ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) { BOOL ret = FALSE; + char system_url[INTERNET_MAX_URL_LENGTH + 1]; TRACE("0x%08x, %p\n", flags, url); @@ -1300,6 +1318,14 @@ { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; + } + if (get_system_proxy_autoconfig_url( system_url, sizeof(system_url) )) + { + WCHAR *urlW; + + if (!(urlW = strdupAW( system_url ))) return FALSE; + *url = urlW; + return TRUE; } if (flags & WINHTTP_AUTO_DETECT_TYPE_DHCP) { @@ -1611,281 +1637,9 @@ 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 ) -{ - *ppv = NULL; - - if (IsEqualGUID( &IID_IUnknown, riid )) - *ppv = iface; - else if (IsEqualGUID( &IID_IActiveScriptSite, riid )) - *ppv = iface; - else - return E_NOINTERFACE; - - IUnknown_AddRef( (IUnknown *)*ppv ); - return S_OK; -} - -static ULONG WINAPI site_AddRef( - IActiveScriptSite *iface ) -{ - return 2; -} - -static ULONG WINAPI site_Release( - IActiveScriptSite *iface ) -{ - return 1; -} - -static HRESULT WINAPI site_GetLCID( - IActiveScriptSite *iface, LCID *lcid ) -{ - return E_NOTIMPL; -} - -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; -} - -static HRESULT WINAPI site_GetDocVersionString( - IActiveScriptSite *iface, BSTR *version ) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI site_OnScriptTerminate( - IActiveScriptSite *iface, const VARIANT *result, const EXCEPINFO *info ) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI site_OnStateChange( - IActiveScriptSite *iface, SCRIPTSTATE state ) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI site_OnScriptError( - IActiveScriptSite *iface, IActiveScriptError *error ) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI site_OnEnterScript( - IActiveScriptSite *iface ) -{ - return E_NOTIMPL; -} - -static HRESULT WINAPI site_OnLeaveScript( - IActiveScriptSite *iface ) -{ - return E_NOTIMPL; -} - -static const IActiveScriptSiteVtbl site_vtbl = -{ - site_QueryInterface, - site_AddRef, - site_Release, - site_GetLCID, - site_GetItemInfo, - site_GetDocVersionString, - site_OnScriptTerminate, - site_OnStateChange, - site_OnScriptError, - site_OnEnterScript, - site_OnLeaveScript -}; - -static IActiveScriptSite script_site = { &site_vtbl }; - -static BOOL parse_script_result( VARIANT result, WINHTTP_PROXY_INFO *info ) -{ - static const WCHAR proxyW[] = {'P','R','O','X','Y'}; - const WCHAR *p; +static BOOL parse_script_result( const char *result, WINHTTP_PROXY_INFO *info ) +{ + const char *p; WCHAR *q; int len; @@ -1893,18 +1647,17 @@ info->lpszProxy = NULL; info->lpszProxyBypass = NULL; - if (V_VT( &result ) != VT_BSTR) return TRUE; - TRACE("%s\n", debugstr_w( V_BSTR( &result ) )); - - p = V_BSTR( &result ); + TRACE("%s\n", debugstr_a( result )); + + p = result; while (*p == ' ') p++; - len = strlenW( p ); - if (len >= 5 && !memicmpW( p, proxyW, sizeof(proxyW)/sizeof(WCHAR) )) + len = strlen( p ); + if (len >= 5 && !strncasecmp( p, "PROXY", sizeof("PROXY") - 1 )) { p += 5; while (*p == ' ') p++; if (!*p || *p == ';') return TRUE; - if (!(info->lpszProxy = q = strdupW( p ))) return FALSE; + if (!(info->lpszProxy = q = strdupAW( p ))) return FALSE; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; for (; *q; q++) { @@ -1918,128 +1671,7 @@ 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; -} - -#ifdef _WIN64 -#define IActiveScriptParse_Release IActiveScriptParse64_Release -#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew -#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText -#else -#define IActiveScriptParse_Release IActiveScriptParse32_Release -#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew -#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText -#endif - -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}; - static const WCHAR findproxyW[] = {'F','i','n','d','P','r','o','x','y','F','o','r','U','R','L',0}; - IActiveScriptParse *parser = NULL; - IActiveScript *engine = NULL; - IDispatch *dispatch = NULL; - BOOL ret = FALSE; - CLSID clsid; - DISPID dispid; - BSTR func = NULL, hostname = NULL, full_script = NULL; - URL_COMPONENTSW uc; - VARIANT args[2], result; - DISPPARAMS params; - HRESULT hr, init; - - memset( &uc, 0, sizeof(uc) ); - uc.dwStructSize = sizeof(uc); - if (!WinHttpCrackUrl( url, 0, 0, &uc )) return FALSE; - if (!(hostname = SysAllocStringLen( NULL, uc.dwHostNameLength + 1 ))) return FALSE; - memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); - hostname[uc.dwHostNameLength] = 0; - - init = CoInitialize( NULL ); - hr = CLSIDFromProgID( jscriptW, &clsid ); - if (hr != S_OK) goto done; - - hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IActiveScript, (void **)&engine ); - if (hr != S_OK) goto done; - - hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse, (void **)&parser ); - if (hr != S_OK) goto done; - - hr = IActiveScriptParse_InitNew( parser ); - if (hr != S_OK) goto done; - - hr = IActiveScript_SetScriptSite( engine, &script_site ); - if (hr != S_OK) goto done; - - hr = IActiveScript_AddNamedItem( engine, global_funcsW, SCRIPTITEM_GLOBALMEMBERS ); - if (hr != S_OK) goto done; - - if (!(full_script = include_pac_utils( script ))) goto done; - - hr = IActiveScriptParse_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); - if (hr != S_OK) goto done; - - hr = IActiveScript_SetScriptState( engine, SCRIPTSTATE_STARTED ); - if (hr != S_OK) goto done; - - hr = IActiveScript_GetScriptDispatch( engine, NULL, &dispatch ); - if (hr != S_OK) goto done; - - if (!(func = SysAllocString( findproxyW ))) goto done; - hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &func, 1, LOCALE_SYSTEM_DEFAULT, &dispid ); - if (hr != S_OK) goto done; - - V_VT( &args[0] ) = VT_BSTR; - V_BSTR( &args[0] ) = hostname; - V_VT( &args[1] ) = VT_BSTR; - V_BSTR( &args[1] ) = SysAllocString( url ); - - params.rgvarg = args; - params.rgdispidNamedArgs = NULL; - params.cArgs = 2; - params.cNamedArgs = 0; - hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, - &params, &result, NULL, NULL ); - VariantClear( &args[1] ); - 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 ); - if (parser) IActiveScriptParse_Release( parser ); - if (engine) IActiveScript_Release( engine ); - if (SUCCEEDED( init )) CoUninitialize(); - if (!ret) set_last_error( ERROR_WINHTTP_BAD_AUTO_PROXY_SCRIPT ); - return ret; -} - -static BSTR download_script( const WCHAR *url ) +static char *download_script( const WCHAR *url, DWORD *out_size ) { static const WCHAR typeW[] = {'*','/','*',0}; static const WCHAR *acceptW[] = {typeW, NULL}; @@ -2048,8 +1680,8 @@ URL_COMPONENTSW uc; DWORD status, size = sizeof(status), offset, to_read, bytes_read, flags = 0; char *tmp, *buffer = NULL; - BSTR script = NULL; - int len; + + *out_size = 0; memset( &uc, 0, sizeof(uc) ); uc.dwStructSize = sizeof(uc); @@ -2078,6 +1710,7 @@ if (!bytes_read) break; to_read -= bytes_read; offset += bytes_read; + *out_size += bytes_read; if (!to_read) { to_read = size; @@ -2086,19 +1719,51 @@ buffer = tmp; } } - len = MultiByteToWideChar( CP_ACP, 0, buffer, offset, NULL, 0 ); - if (!(script = SysAllocStringLen( NULL, len ))) goto done; - MultiByteToWideChar( CP_ACP, 0, buffer, offset, script, len ); - script[len] = 0; done: WinHttpCloseHandle( req ); WinHttpCloseHandle( con ); WinHttpCloseHandle( ses ); - heap_free( buffer ); heap_free( hostname ); - if (!script) set_last_error( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); - return script; + if (!buffer) set_last_error( ERROR_WINHTTP_UNABLE_TO_DOWNLOAD_SCRIPT ); + return buffer; +} + +struct AUTO_PROXY_SCRIPT_BUFFER +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +}; + +BOOL WINAPI InternetDeInitializeAutoProxyDll(LPSTR, DWORD); +BOOL WINAPI InternetGetProxyInfo(LPCSTR, DWORD, LPSTR, DWORD, LPSTR *, LPDWORD); +BOOL WINAPI InternetInitializeAutoProxyDll(DWORD, LPSTR, LPSTR, void *, struct AUTO_PROXY_SCRIPT_BUFFER *); + +static BOOL run_script( char *script, DWORD size, const WCHAR *url, WINHTTP_PROXY_INFO *info ) +{ + BOOL ret; + char *result, *urlA; + DWORD len_result; + struct AUTO_PROXY_SCRIPT_BUFFER buffer; + + buffer.dwStructSize = sizeof(buffer); + buffer.lpszScriptBuffer = script; + buffer.dwScriptBufferSize = size; + + if (!(urlA = strdupWA( url ))) return FALSE; + if (!(ret = InternetInitializeAutoProxyDll( 0, NULL, NULL, NULL, &buffer ))) + { + heap_free( urlA ); + return FALSE; + } + if ((ret = InternetGetProxyInfo( urlA, strlen(urlA), NULL, 0, &result, &len_result ))) + { + ret = parse_script_result( result, info ); + heap_free( result ); + } + heap_free( urlA ); + return InternetDeInitializeAutoProxyDll( NULL, 0 ); } /*********************************************************************** @@ -2110,7 +1775,8 @@ WCHAR *detected_pac_url = NULL; const WCHAR *pac_url; session_t *session; - BSTR script; + char *script; + DWORD size; BOOL ret = FALSE; TRACE("%p, %s, %p, %p\n", hsession, debugstr_w(url), options, info); @@ -2143,9 +1809,11 @@ if (options->dwFlags & WINHTTP_AUTOPROXY_CONFIG_URL) pac_url = options->lpszAutoConfigUrl; else pac_url = detected_pac_url; - if (!(script = download_script( pac_url ))) goto done; - ret = run_script( script, url, info ); - SysFreeString( script ); + if ((script = download_script( pac_url, &size ))) + { + ret = run_script( script, size, url, info ); + heap_free( script ); + } done: GlobalFree( detected_pac_url ); Modified: trunk/reactos/dll/win32/winhttp/url.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/url.c?re… ============================================================================== --- trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/url.c [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -23,6 +23,12 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, DWORD flags ) { + if (*str && !*str_len) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (!*str_len) return TRUE; if (!*str) { if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE))) @@ -160,6 +166,7 @@ { BOOL ret = FALSE; WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; + INTERNET_SCHEME scheme = 0; TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); @@ -193,8 +200,8 @@ set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); return FALSE; } - if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) uc->nScheme = INTERNET_SCHEME_HTTP; - else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) uc->nScheme = INTERNET_SCHEME_HTTPS; + if (p - url == 4 && !strncmpiW( url, scheme_http, 4 )) scheme = INTERNET_SCHEME_HTTP; + else if (p - url == 5 && !strncmpiW( url, scheme_https, 5 )) scheme = INTERNET_SCHEME_HTTPS; else { set_last_error( ERROR_WINHTTP_UNRECOGNIZED_SCHEME ); @@ -238,8 +245,8 @@ else { if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, q - p, flags ))) goto exit; - if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if ((r = memchrW( q, '?', len - (q - url) ))) @@ -264,8 +271,8 @@ else { if (!(set_component( &uc->lpszHostName, &uc->dwHostNameLength, p, len - (p - url), flags ))) goto exit; - if (uc->nScheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; - if (uc->nScheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; + if (scheme == INTERNET_SCHEME_HTTP) uc->nPort = INTERNET_DEFAULT_HTTP_PORT; + if (scheme == INTERNET_SCHEME_HTTPS) uc->nPort = INTERNET_DEFAULT_HTTPS_PORT; } if (!(set_component( &uc->lpszUrlPath, &uc->dwUrlPathLength, (WCHAR *)url + len, 0, flags ))) goto exit; if (!(set_component( &uc->lpszExtraInfo, &uc->dwExtraInfoLength, (WCHAR *)url + len, 0, flags ))) goto exit; @@ -281,6 +288,7 @@ debugstr_wn( uc->lpszExtraInfo, uc->dwExtraInfoLength )); exit: + if (ret) uc->nScheme = scheme; heap_free( url_decoded ); heap_free( url_escaped ); return ret; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 25 15:10:02 2014 @@ -210,7 +210,7 @@ reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.17 reactos/dll/win32/winemp3.acm # Synced to Wine-1.7.17 reactos/dll/win32/wing32 # Out of sync -reactos/dll/win32/winhttp # Synced to Wine-1.7.17 +reactos/dll/win32/winhttp # Synced to Wine-1.7.27 reactos/dll/win32/wininet # Synced to Wine-1.7.17 reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628

1 0

[akhaldi] 64272: [WINHTTP] * Addendum to r64270.
by akhaldi＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: akhaldi Date: Thu Sep 25 15:05:25 2014 New Revision: 64272 URL: http://svn.reactos.org/svn/reactos?rev=64272&view=rev Log: [WINHTTP] * Addendum to r64270. Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h Modified: trunk/reactos/dll/win32/winhttp/winhttp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp_… ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp_private.h [iso-8859-1] Thu Sep 25 15:05:25 2014 @@ -299,37 +299,6 @@ extern HRESULT WinHttpRequest_create( 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 );

1 0

[akhaldi] 64271: [JSPROXY] * Import from Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: akhaldi Date: Thu Sep 25 15:02:29 2014 New Revision: 64271 URL: http://svn.reactos.org/svn/reactos?rev=64271&view=rev Log: [JSPROXY] * Import from Wine 1.7.27. CORE-8540 Added: trunk/reactos/dll/win32/jsproxy/ (with props) trunk/reactos/dll/win32/jsproxy/CMakeLists.txt (with props) trunk/reactos/dll/win32/jsproxy/jsproxy.spec (with props) trunk/reactos/dll/win32/jsproxy/main.c (with props) trunk/reactos/dll/win32/jsproxy/pac.js (with props) trunk/reactos/dll/win32/jsproxy/rsrc.rc (with props) Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -69,6 +69,7 @@ add_subdirectory(itircl) add_subdirectory(itss) add_subdirectory(jscript) +add_subdirectory(jsproxy) add_subdirectory(kernel32) add_subdirectory(loadperf) add_subdirectory(localspl) Propchange: trunk/reactos/dll/win32/jsproxy/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu Sep 25 15:02:29 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/win32/jsproxy/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/win32/jsproxy/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/win32/jsproxy/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/win32/jsproxy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/CMakeLists.txt (added) +++ trunk/reactos/dll/win32/jsproxy/CMakeLists.txt [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -0,0 +1,16 @@ + +add_definitions(-D__WINESRC__) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(jsproxy.dll jsproxy.spec ADD_IMPORTLIB) + +list(APPEND SOURCE + main.c + ${CMAKE_CURRENT_BINARY_DIR}/jsproxy_stubs.c + ${CMAKE_CURRENT_BINARY_DIR}/jsproxy.def) + +add_library(jsproxy SHARED ${SOURCE} rsrc.rc) +set_module_type(jsproxy win32dll) +target_link_libraries(jsproxy uuid wine) +add_importlibs(jsproxy oleaut32 ole32 ws2_32 msvcrt kernel32 ntdll) +add_cd_file(TARGET jsproxy DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/win32/jsproxy/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/jsproxy/jsproxy.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/jsproxy.… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/jsproxy.spec (added) +++ trunk/reactos/dll/win32/jsproxy/jsproxy.spec [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -0,0 +1,5 @@ +@ stdcall InternetInitializeAutoProxyDll(long str str ptr ptr) JSPROXY_InternetInitializeAutoProxyDll +@ stub InternetInitializeExAutoProxyDll +@ stdcall InternetDeInitializeAutoProxyDll(str long) +@ stub InternetDeInitializeExAutoProxyDll +@ stdcall InternetGetProxyInfo(str long str long ptr ptr) Propchange: trunk/reactos/dll/win32/jsproxy/jsproxy.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/jsproxy/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/main.c (added) +++ trunk/reactos/dll/win32/jsproxy/main.c [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -0,0 +1,642 @@ +/* + * Copyright 2014 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 <wine/config.h> + +#define WIN32_NO_STATUS +#define _INC_WINDOWS +#define COM_NO_WINDOWS_H + +#define COBJMACROS + +#include <windef.h> +#include <winbase.h> +#include <objbase.h> +#include <oleauto.h> +#include <dispex.h> +#include <activscp.h> +#include <wininet.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif +#if defined(__MINGW32__) || defined (_MSC_VER) +# include <ws2tcpip.h> +#else +# define closesocket close +# define ioctlsocket ioctl +#endif + +#ifndef __MINGW32__ +#define USE_WS_PREFIX +#endif + +static HINSTANCE instance; + +WINE_DEFAULT_DEBUG_CHANNEL(jsproxy); + +static CRITICAL_SECTION cs_jsproxy; +static CRITICAL_SECTION_DEBUG critsect_debug = +{ + 0, 0, &cs_jsproxy, + { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": cs_jsproxy") } +}; +static CRITICAL_SECTION cs_jsproxy = { &critsect_debug, -1, 0, 0, 0, 0 }; + +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}; + +/****************************************************************** + * DllMain (jsproxy.@) + */ +BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) +{ + switch (reason) + { + case DLL_PROCESS_ATTACH: + instance = hinst; + DisableThreadLibraryCalls( hinst ); + break; + + case DLL_PROCESS_DETACH: + break; + } + return TRUE; +} + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline BOOL heap_free( LPVOID mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *strdupAW( const char *src, DWORD len ) +{ + WCHAR *dst = NULL; + if (src) + { + int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 ); + if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) ))) + { + len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len ); + dst[dst_len] = 0; + } + } + return dst; +} + +static inline char *strdupWA( const WCHAR *src ) +{ + char *dst = NULL; + if (src) + { + int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL ); + if ((dst = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL ); + } + return dst; +} + +static struct pac_script +{ + WCHAR *text; +} pac_script; +static struct pac_script *global_script = &pac_script; + +/****************************************************************** + * InternetDeInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved ) +{ + TRACE( "%s, %u\n", debugstr_a(mime), reserved ); + + EnterCriticalSection( &cs_jsproxy ); + + heap_free( global_script->text ); + global_script->text = NULL; + + LeaveCriticalSection( &cs_jsproxy ); + return TRUE; +} + +static WCHAR *load_script( const char *filename ) +{ + HANDLE handle; + DWORD size, bytes_read; + char *buffer; + int len; + WCHAR *script = NULL; + + handle = CreateFileA( filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + if (handle == INVALID_HANDLE_VALUE) return NULL; + + size = GetFileSize( handle, NULL ); + if (!(buffer = heap_alloc( size ))) goto done; + if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done; + + len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 ); + if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len ); + script[len] = 0; + +done: + CloseHandle( handle ); + heap_free( buffer ); + return script; +} + +/****************************************************************** + * InternetInitializeAutoProxyDll (jsproxy.@) + */ +BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile, LPSTR mime, + AutoProxyHelperFunctions *callbacks, + LPAUTO_PROXY_SCRIPT_BUFFER buffer ) +{ + BOOL ret = FALSE; + + TRACE( "%u, %s, %s, %p, %p\n", version, debugstr_a(tmpfile), debugstr_a(mime), callbacks, buffer ); + + if (callbacks) FIXME( "callbacks not supported\n" ); + + EnterCriticalSection( &cs_jsproxy ); + + if (global_script->text) + { + LeaveCriticalSection( &cs_jsproxy ); + return FALSE; + } + if (buffer && buffer->dwStructSize == sizeof(*buffer) && buffer->lpszScriptBuffer && + (global_script->text = strdupAW( buffer->lpszScriptBuffer, buffer->dwScriptBufferSize ))) ret = TRUE; + else if ((global_script->text = load_script( tmpfile ))) ret = TRUE; + + LeaveCriticalSection( &cs_jsproxy ); + 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 char *get_computer_name( COMPUTER_NAME_FORMAT format ) +{ + char *ret; + DWORD size = 0; + + GetComputerNameExA( format, NULL, &size ); + if (GetLastError() != ERROR_MORE_DATA) return NULL; + if (!(ret = heap_alloc( size ))) return NULL; + if (!GetComputerNameExA( format, ret, &size )) + { + heap_free( ret ); + return NULL; + } + return ret; +} + +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 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 ) +{ + *ppv = NULL; + + if (IsEqualGUID( &IID_IUnknown, riid )) + *ppv = iface; + else if (IsEqualGUID( &IID_IActiveScriptSite, riid )) + *ppv = iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef( (IUnknown *)*ppv ); + return S_OK; +} + +static ULONG WINAPI site_AddRef( + IActiveScriptSite *iface ) +{ + return 2; +} + +static ULONG WINAPI site_Release( + IActiveScriptSite *iface ) +{ + return 1; +} + +static HRESULT WINAPI site_GetLCID( + IActiveScriptSite *iface, LCID *lcid ) +{ + return E_NOTIMPL; +} + +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; +} + +static HRESULT WINAPI site_GetDocVersionString( + IActiveScriptSite *iface, BSTR *version ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI site_OnScriptTerminate( + IActiveScriptSite *iface, const VARIANT *result, const EXCEPINFO *info ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI site_OnStateChange( + IActiveScriptSite *iface, SCRIPTSTATE state ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI site_OnScriptError( + IActiveScriptSite *iface, IActiveScriptError *error ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI site_OnEnterScript( + IActiveScriptSite *iface ) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI site_OnLeaveScript( + IActiveScriptSite *iface ) +{ + return E_NOTIMPL; +} + +static const IActiveScriptSiteVtbl site_vtbl = +{ + site_QueryInterface, + site_AddRef, + site_Release, + site_GetLCID, + site_GetItemInfo, + site_GetDocVersionString, + site_OnScriptTerminate, + site_OnStateChange, + site_OnScriptError, + site_OnEnterScript, + site_OnLeaveScript +}; + +static IActiveScriptSite script_site = { &site_vtbl }; + +static BSTR include_pac_utils( const WCHAR *script ) +{ + static const WCHAR pacjsW[] = {'p','a','c','.','j','s',0}; + HMODULE hmod = GetModuleHandleA( "jsproxy.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 + strlenW( script ) + 1 ))) return NULL; + MultiByteToWideChar( CP_ACP, 0, data, size, ret, len ); + strcpyW( ret + len, script ); + return ret; +} + +#ifdef _WIN64 +#define IActiveScriptParse_Release IActiveScriptParse64_Release +#define IActiveScriptParse_InitNew IActiveScriptParse64_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse64_ParseScriptText +#else +#define IActiveScriptParse_Release IActiveScriptParse32_Release +#define IActiveScriptParse_InitNew IActiveScriptParse32_InitNew +#define IActiveScriptParse_ParseScriptText IActiveScriptParse32_ParseScriptText +#endif + +static BOOL run_script( const WCHAR *script, const WCHAR *url, const WCHAR *hostname, char **result_str, DWORD *result_len ) +{ + static const WCHAR jscriptW[] = {'J','S','c','r','i','p','t',0}; + static const WCHAR findproxyW[] = {'F','i','n','d','P','r','o','x','y','F','o','r','U','R','L',0}; + IActiveScriptParse *parser = NULL; + IActiveScript *engine = NULL; + IDispatch *dispatch = NULL; + BOOL ret = FALSE; + CLSID clsid; + DISPID dispid; + BSTR func = NULL, full_script = NULL; + VARIANT args[2], retval; + DISPPARAMS params; + HRESULT hr, init; + + init = CoInitialize( NULL ); + hr = CLSIDFromProgID( jscriptW, &clsid ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IActiveScript, (void **)&engine ); + if (hr != S_OK) goto done; + + hr = IActiveScript_QueryInterface( engine, &IID_IActiveScriptParse, (void **)&parser ); + if (hr != S_OK) goto done; + + hr = IActiveScriptParse_InitNew( parser ); + if (hr != S_OK) goto done; + + hr = IActiveScript_SetScriptSite( engine, &script_site ); + if (hr != S_OK) goto done; + + hr = IActiveScript_AddNamedItem( engine, global_funcsW, SCRIPTITEM_GLOBALMEMBERS ); + if (hr != S_OK) goto done; + + if (!(full_script = include_pac_utils( script ))) goto done; + + hr = IActiveScriptParse_ParseScriptText( parser, full_script, NULL, NULL, NULL, 0, 0, 0, NULL, NULL ); + if (hr != S_OK) goto done; + + hr = IActiveScript_SetScriptState( engine, SCRIPTSTATE_STARTED ); + if (hr != S_OK) goto done; + + hr = IActiveScript_GetScriptDispatch( engine, NULL, &dispatch ); + if (hr != S_OK) goto done; + + if (!(func = SysAllocString( findproxyW ))) goto done; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &func, 1, LOCALE_SYSTEM_DEFAULT, &dispid ); + if (hr != S_OK) goto done; + + V_VT( &args[0] ) = VT_BSTR; + V_BSTR( &args[0] ) = SysAllocString( hostname ); + V_VT( &args[1] ) = VT_BSTR; + V_BSTR( &args[1] ) = SysAllocString( url ); + + params.rgvarg = args; + params.rgdispidNamedArgs = NULL; + params.cArgs = 2; + params.cNamedArgs = 0; + hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, + &params, &retval, NULL, NULL ); + VariantClear( &args[0] ); + VariantClear( &args[1] ); + if (hr != S_OK) + { + WARN("script failed 0x%08x\n", hr); + goto done; + } + if ((*result_str = strdupWA( V_BSTR( &retval ) ))) + { + TRACE( "result: %s\n", debugstr_a(*result_str) ); + *result_len = strlen( *result_str ) + 1; + ret = TRUE; + } + VariantClear( &retval ); + +done: + SysFreeString( full_script ); + SysFreeString( func ); + if (dispatch) IDispatch_Release( dispatch ); + if (parser) IActiveScriptParse_Release( parser ); + if (engine) IActiveScript_Release( engine ); + if (SUCCEEDED( init )) CoUninitialize(); + return ret; +} + +/****************************************************************** + * InternetGetProxyInfo (jsproxy.@) + */ +BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DWORD len_hostname, LPSTR *proxy, + LPDWORD len_proxy ) +{ + WCHAR *urlW = NULL, *hostnameW = NULL; + BOOL ret = FALSE; + + TRACE( "%s, %u, %s, %u, %p, %p\n", url, len_url, hostname, len_hostname, proxy, len_proxy ); + + EnterCriticalSection( &cs_jsproxy ); + + if (!global_script->text) goto done; + if (!(urlW = strdupAW( url, len_url ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; + + TRACE( "%s\n", debugstr_w(global_script->text) ); + ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); + +done: + heap_free( hostnameW ); + heap_free( urlW ); + LeaveCriticalSection( &cs_jsproxy ); + return ret; +} Propchange: trunk/reactos/dll/win32/jsproxy/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/jsproxy/pac.js URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/pac.js?r… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/pac.js (added) +++ trunk/reactos/dll/win32/jsproxy/pac.js [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -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 explicit 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)); +} Propchange: trunk/reactos/dll/win32/jsproxy/pac.js ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/jsproxy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jsproxy/rsrc.rc?… ============================================================================== --- trunk/reactos/dll/win32/jsproxy/rsrc.rc (added) +++ trunk/reactos/dll/win32/jsproxy/rsrc.rc [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -0,0 +1,20 @@ +/* + * Copyright 2014 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 + */ + +/* @makedep: pac.js */ +pac.js 40 "pac.js" Propchange: trunk/reactos/dll/win32/jsproxy/rsrc.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Sep 25 15:02:29 2014 @@ -94,6 +94,7 @@ reactos/dll/win32/itircl # Synced to Wine-1.7.17 reactos/dll/win32/itss # Synced to Wine-1.7.17 reactos/dll/win32/jscript # Synced to Wine-1.7.17 +reactos/dll/win32/jsproxy # Synced to Wine-1.7.27 reactos/dll/win32/loadperf # Synced to Wine-1.7.17 reactos/dll/win32/localspl # Synced to Wine-1.7.17 reactos/dll/win32/localui # Synced to Wine-1.7.17

1 0

[akhaldi] 64270: [WINE/DEBUG] * Define debugstr_variant and co globally to avoid code duplication. CORE-8540
by akhaldi＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: akhaldi Date: Thu Sep 25 14:59:07 2014 New Revision: 64270 URL: http://svn.reactos.org/svn/reactos?rev=64270&view=rev Log: [WINE/DEBUG] * Define debugstr_variant and co globally to avoid code duplication. CORE-8540 Modified: trunk/reactos/dll/win32/ieframe/ieframe_main.c trunk/reactos/dll/win32/jscript/jsutils.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/msxml3/main.c trunk/reactos/dll/win32/vbscript/vbscript_main.c trunk/reactos/dll/win32/wbemprox/wbemprox_private.h trunk/reactos/include/reactos/wine/debug.h Modified: trunk/reactos/dll/win32/ieframe/ieframe_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/ieframe_… ============================================================================== --- trunk/reactos/dll/win32/ieframe/ieframe_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/ieframe_main.c [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -23,31 +23,6 @@ LONG module_ref = 0; HINSTANCE ieframe_instance; -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)); - default: - return wine_dbg_sprintf("{vt %d}", V_VT(v)); - } -} - static ITypeLib *typelib; static ITypeInfo *typeinfos[LAST_tid]; Modified: trunk/reactos/dll/win32/jscript/jsutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/jscript/jsutils.… ============================================================================== --- trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/jscript/jsutils.c [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -20,35 +20,6 @@ WINE_DECLARE_DEBUG_CHANNEL(heap); -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_UI4: - return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(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_ARRAY|VT_VARIANT: - return "{VT_ARRAY|VT_VARIANT: ...}"; - default: - return wine_dbg_sprintf("{vt %d}", V_VT(v)); - } -} - const char *debugstr_jsval(const jsval_t v) { switch(jsval_type(v)) { Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/mshtml/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mshtml/main.c [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -499,34 +499,3 @@ if(SUCCEEDED(hres)) hres = register_server(FALSE); return hres; } - -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_I2: - return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); - 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_ERROR: - return wine_dbg_sprintf("{VT_ERROR: %08x}", V_ERROR(v)); - case VT_BOOL: - return wine_dbg_sprintf("{VT_BOOL: %x}", V_BOOL(v)); - case VT_UINT: - return wine_dbg_sprintf("{VT_UINT: %u}", V_UINT(v)); - default: - return wine_dbg_sprintf("{vt %d}", V_VT(v)); - } -} Modified: trunk/reactos/dll/win32/msxml3/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/main.c?re… ============================================================================== --- trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/main.c [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -255,50 +255,6 @@ return TRUE; } -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_I1: - return wine_dbg_sprintf("{VT_I1: %d}", V_I1(v)); - case VT_I2: - return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); - case VT_I4: - return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); - case VT_INT: - return wine_dbg_sprintf("{VT_INT: %d}", V_INT(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), debugstr_w(V_BSTRREF(v) ? *V_BSTRREF(v) : NULL)); - case VT_ERROR: - return wine_dbg_sprintf("{VT_ERROR: 0x%08x}", V_ERROR(v)); - case VT_VARIANT|VT_BYREF: - return wine_dbg_sprintf("{VT_VARIANT|VT_BYREF: %s}", debugstr_variant(V_VARIANTREF(v))); - case VT_UI1|VT_ARRAY: - return "{VT_UI1|VT_ARRAY}"; - default: - return wine_dbg_sprintf("{vt %d}", V_VT(v)); - } -} - /*********************************************************************** * DllRegisterServer (MSXML3.@) */ Modified: trunk/reactos/dll/win32/vbscript/vbscript_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/vbscript/vbscrip… ============================================================================== --- trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/vbscript/vbscript_main.c [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -87,38 +87,6 @@ ITypeLib_Release(typelib); } -const char *debugstr_variant(const VARIANT *v) -{ - if(!v) - return "(null)"; - - if(V_ISBYREF(v)) - return wine_dbg_sprintf("{V_BYREF -> %s}", debugstr_variant(V_BYREF(v))); - - switch(V_VT(v)) { - case VT_EMPTY: - return "{VT_EMPTY}"; - case VT_NULL: - return "{VT_NULL}"; - case VT_I2: - return wine_dbg_sprintf("{VT_I2: %d}", V_I2(v)); - case VT_I4: - return wine_dbg_sprintf("{VT_I4: %d}", V_I4(v)); - case VT_UI4: - return wine_dbg_sprintf("{VT_UI4: %u}", V_UI4(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)); - default: - return wine_dbg_sprintf("{vt %d}", V_VT(v)); - } -} - #define MIN_BLOCK_SIZE 128 #define ARENA_FREE_FILLER 0xaa Modified: trunk/reactos/dll/win32/wbemprox/wbemprox_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemprox/wbempro… ============================================================================== --- trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemprox/wbemprox_private.h [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -280,37 +280,6 @@ return dst; } -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 const WCHAR class_processW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR class_serviceW[] = {'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; static const WCHAR class_stdregprovW[] = {'S','t','d','R','e','g','P','r','o','v',0}; Modified: trunk/reactos/include/reactos/wine/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/debug… ============================================================================== --- trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/debug.h [iso-8859-1] Thu Sep 25 14:59:07 2014 @@ -231,6 +231,124 @@ else return wine_dbg_sprintf( "%lx", (unsigned long)ll ); } +#if defined(__oaidl_h__) && defined(V_VT) + +static inline const char *wine_dbgstr_vt( VARTYPE vt ) +{ + static const char *const variant_types[] = + { + "VT_EMPTY","VT_NULL","VT_I2","VT_I4","VT_R4","VT_R8","VT_CY","VT_DATE", + "VT_BSTR","VT_DISPATCH","VT_ERROR","VT_BOOL","VT_VARIANT","VT_UNKNOWN", + "VT_DECIMAL","15","VT_I1","VT_UI1","VT_UI2","VT_UI4","VT_I8","VT_UI8", + "VT_INT","VT_UINT","VT_VOID","VT_HRESULT","VT_PTR","VT_SAFEARRAY", + "VT_CARRAY","VT_USERDEFINED","VT_LPSTR","VT_LPWSTR","32","33","34","35", + "VT_RECORD","VT_INT_PTR","VT_UINT_PTR","39","40","41","42","43","44","45", + "46","47","48","49","50","51","52","53","54","55","56","57","58","59","60", + "61","62","63","VT_FILETIME","VT_BLOB","VT_STREAM","VT_STORAGE", + "VT_STREAMED_OBJECT","VT_STORED_OBJECT","VT_BLOB_OBJECT","VT_CF","VT_CLSID", + "VT_VERSIONED_STREAM" + }; + + static const char *const variant_flags[16] = + { + "", + "|VT_VECTOR", + "|VT_ARRAY", + "|VT_VECTOR|VT_ARRAY", + "|VT_BYREF", + "|VT_VECTOR|VT_ARRAY", + "|VT_ARRAY|VT_BYREF", + "|VT_VECTOR|VT_ARRAY|VT_BYREF", + "|VT_RESERVED", + "|VT_VECTOR|VT_RESERVED", + "|VT_ARRAY|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_RESERVED", + "|VT_ARRAY|VT_BYREF|VT_RESERVED", + "|VT_VECTOR|VT_ARRAY|VT_BYREF|VT_RESERVED", + }; + + if (vt & ~VT_TYPEMASK) + return wine_dbg_sprintf( "%s%s", wine_dbgstr_vt(vt&VT_TYPEMASK), variant_flags[vt>>12] ); + + if (vt < sizeof(variant_types)/sizeof(*variant_types)) + return variant_types[vt]; + + if (vt == VT_BSTR_BLOB) + return "VT_BSTR_BLOB"; + + return wine_dbg_sprintf( "vt(invalid %x)", vt ); +} + +static inline const char *wine_dbgstr_variant( const VARIANT *v ) +{ + if (!v) + return "(null)"; + + if (V_VT(v) & VT_BYREF) { + if (V_VT(v) == (VT_VARIANT|VT_BYREF)) + return wine_dbg_sprintf( "%p {VT_VARIANT|VT_BYREF: %s}", v, wine_dbgstr_variant(V_VARIANTREF(v)) ); + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_BYREF(v) ); + } + + if (V_ISARRAY(v) || V_ISVECTOR(v)) + return wine_dbg_sprintf( "%p {%s %p}", v, wine_dbgstr_vt(V_VT(v)), V_ARRAY(v) ); + + switch(V_VT(v)) { + case VT_EMPTY: + return wine_dbg_sprintf( "%p {VT_EMPTY}", v ); + case VT_NULL: + return wine_dbg_sprintf( "%p {VT_NULL}", v ); + case VT_I2: + return wine_dbg_sprintf( "%p {VT_I2: %d}", v, V_I2(v) ); + case VT_I4: + return wine_dbg_sprintf( "%p {VT_I4: %d}", v, V_I4(v) ); + case VT_R4: + return wine_dbg_sprintf( "%p {VT_R4: %f}", v, V_R4(v) ); + case VT_R8: + return wine_dbg_sprintf( "%p {VT_R8: %lf}", v, V_R8(v) ); + case VT_CY: + return wine_dbg_sprintf( "%p {VT_CY: %s}", v, wine_dbgstr_longlong(V_CY(v).int64) ); + case VT_DATE: + return wine_dbg_sprintf( "%p {VT_DATE: %lf}", v, V_DATE(v) ); + case VT_BSTR: + return wine_dbg_sprintf( "%p {VT_BSTR: %s}", v, wine_dbgstr_w(V_BSTR(v)) ); + case VT_DISPATCH: + return wine_dbg_sprintf( "%p {VT_DISPATCH: %p}", v, V_DISPATCH(v) ); + case VT_ERROR: + return wine_dbg_sprintf( "%p {VT_ERROR: %08x}", v, V_ERROR(v) ); + case VT_BOOL: + return wine_dbg_sprintf( "%p {VT_BOOL: %x}", v, V_BOOL(v) ); + case VT_UNKNOWN: + return wine_dbg_sprintf( "%p {VT_UNKNOWN: %p}", v, V_UNKNOWN(v) ); + case VT_I1: + return wine_dbg_sprintf( "%p {VT_I1: %d}", v, V_I1(v) ); + case VT_UI1: + return wine_dbg_sprintf( "%p {VT_UI1: %u}", v, V_UI1(v) ); + case VT_UI2: + return wine_dbg_sprintf( "%p {VT_UI2: %d}", v, V_UI2(v) ); + case VT_UI4: + return wine_dbg_sprintf( "%p {VT_UI4: %d}", v, V_UI4(v) ); + case VT_I8: + return wine_dbg_sprintf( "%p {VT_I8: %s}", v, wine_dbgstr_longlong(V_I8(v)) ); + case VT_UI8: + return wine_dbg_sprintf( "%p {VT_UI8: %s}", v, wine_dbgstr_longlong(V_UI8(v)) ); + case VT_INT: + return wine_dbg_sprintf( "%p {VT_INT: %d}", v, V_INT(v) ); + case VT_UINT: + return wine_dbg_sprintf( "%p {VT_UINT: %u}", v, V_UINT(v) ); + case VT_VOID: + return wine_dbg_sprintf( "%p {VT_VOID}", v ); + case VT_RECORD: + return wine_dbg_sprintf( "%p {VT_RECORD: %p %p}", v, V_UNION(v,brecVal).pvRecord, V_UNION(v,brecVal).pRecInfo ); + default: + return wine_dbg_sprintf( "%p {vt %s}", v, wine_dbgstr_vt(V_VT(v)) ); + } +} + +#endif /* defined(__oaidl_h__) && defined(V_VT) */ + #ifndef WINE_TRACE #define WINE_TRACE __WINE_DPRINTF(_TRACE,__wine_dbch___default) #define WINE_TRACE_(ch) __WINE_DPRINTF(_TRACE,&__wine_dbch_##ch) @@ -270,6 +388,11 @@ static __inline const char *debugstr_a( const char *s ) { return wine_dbgstr_an( s, -1 ); } static __inline const char *debugstr_w( const WCHAR *s ) { return wine_dbgstr_wn( s, -1 ); } +#if defined(__oaidl_h__) && defined(V_VT) +static __inline const char *debugstr_vt( VARTYPE vt ) { return wine_dbgstr_vt( vt ); } +static __inline const char *debugstr_variant( const VARIANT *v ) { return wine_dbgstr_variant( v ); } +#endif + #define TRACE WINE_TRACE #define TRACE_(ch) WINE_TRACE_(ch) #define TRACE_ON(ch) WINE_TRACE_ON(ch)

1 0

[tfaber] 64269: [SECURE32] - Avoid uninitialized variable use aka fix MSVC build
by tfaber＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: tfaber Date: Thu Sep 25 14:53:32 2014 New Revision: 64269 URL: http://svn.reactos.org/svn/reactos?rev=64269&view=rev Log: [SECURE32] - Avoid uninitialized variable use aka fix MSVC build Modified: trunk/reactos/dll/win32/secur32/lsalpc.c Modified: trunk/reactos/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsalpc.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] Thu Sep 25 14:53:32 2014 @@ -71,7 +71,7 @@ SecurityQos.EffectiveOnly = TRUE; RtlZeroMemory(&ConnectInfo, - ConnectInfoLength); + sizeof(ConnectInfo)); ConnectInfo.CreateContext = FALSE;

1 0

[akhaldi] 64268: [PSDK] * Add AutoProxyHelperVtbl, AutoProxyHelperFunctions and AUTO_PROXY_SCRIPT_BUFFER. CORE-8540
by akhaldi＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: akhaldi Date: Thu Sep 25 14:43:29 2014 New Revision: 64268 URL: http://svn.reactos.org/svn/reactos?rev=64268&view=rev Log: [PSDK] * Add AutoProxyHelperVtbl, AutoProxyHelperFunctions and AUTO_PROXY_SCRIPT_BUFFER. CORE-8540 Modified: trunk/reactos/include/psdk/wininet.h Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Thu Sep 25 14:43:29 2014 @@ -2559,6 +2559,31 @@ #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) +typedef struct AutoProxyHelperVtbl +{ + BOOL (WINAPI *IsResolvable)(LPSTR); + DWORD (WINAPI *GetIPAddress)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostName)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNet)(LPSTR, LPSTR, LPSTR); + BOOL (WINAPI *IsResolvableEx)(LPSTR); + DWORD (WINAPI *GetIPAddressEx)(LPSTR, LPDWORD); + DWORD (WINAPI *ResolveHostNameEx)(LPSTR, LPSTR, LPDWORD); + BOOL (WINAPI *IsInNetEx)(LPSTR, LPSTR); + DWORD (WINAPI *SortIpList)(LPSTR, LPSTR, LPDWORD); +} AutoProxyHelperVtbl; + +typedef struct AutoProxyHelperFunctions +{ + const struct AutoProxyHelperVtbl *lpVtbl; +} AutoProxyHelperFunctions; + +typedef struct +{ + DWORD dwStructSize; + LPSTR lpszScriptBuffer; + DWORD dwScriptBufferSize; +} AUTO_PROXY_SCRIPT_BUFFER, *LPAUTO_PROXY_SCRIPT_BUFFER; + BOOLAPI InternetInitializeAutoProxyDll(_In_ DWORD); BOOLAPI

1 0

[tfaber] 64267: [USBHUB][USBUHCI][CDROM_NEW] - Remove dead code. By Kudratov Olimjon. CORE-8545
by tfaber＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: tfaber Date: Thu Sep 25 12:41:40 2014 New Revision: 64267 URL: http://svn.reactos.org/svn/reactos?rev=64267&view=rev Log: [USBHUB][USBUHCI][CDROM_NEW] - Remove dead code. By Kudratov Olimjon. CORE-8545 Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/usb/usbhub/pdo.c trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Thu Sep 25 12:41:40 2014 @@ -1197,7 +1197,6 @@ IoMarkIrpPending(Irp); IoStartPacket(DeviceObject, Irp, NULL, NULL); return STATUS_PENDING; - break; } case IOCTL_DVD_READ_KEY: { Modified: trunk/reactos/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbhub/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbhub/pdo.c [iso-8859-1] Thu Sep 25 12:41:40 2014 @@ -294,7 +294,6 @@ // Status = FowardUrbToRootHub(RootHubDeviceObject, IOCTL_INTERNAL_USB_SUBMIT_URB, Irp, Urb, NULL); return Status; - break; } // // FIXME: Can these be sent to RootHub? Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Thu Sep 25 12:41:40 2014 @@ -143,13 +143,6 @@ // use full speed queue // m_Hardware->GetQueueHead(UHCI_BULK_QUEUE, &QueueHead); - } - else if (Request->GetTransferType() == USB_ENDPOINT_TYPE_INTERRUPT) - { - // - // use full speed queue - // - m_Hardware->GetQueueHead(UHCI_INTERRUPT_QUEUE, &QueueHead); } else if (Request->GetTransferType() == USB_ENDPOINT_TYPE_INTERRUPT) {

1 0

[ekohl] 64266: [SECUR32][LSASRV][LSALIB] - Move the stubs LsaEnumerateLogonSessions, LsaGetLogonSessionData, LsaRegisterPolicyChangeNotification and LsaUnregisterPolicyChangeNotification from lsali...
by ekohl＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: ekohl Date: Thu Sep 25 12:37:19 2014 New Revision: 64266 URL: http://svn.reactos.org/svn/reactos?rev=64266&view=rev Log: [SECUR32][LSASRV][LSALIB] - Move the stubs LsaEnumerateLogonSessions, LsaGetLogonSessionData, LsaRegisterPolicyChangeNotification and LsaUnregisterPolicyChangeNotification from lsalib to secur32, because these functions are exported by secur32.dll only. - Add new LPC connection code to secur32.dll for use by non-logon related functions. - Implement LsaEnumerateLogonSessions in secur32.dll and LsapEnumLogonSessions in lsasrv.dll. Added: trunk/reactos/dll/win32/secur32/lsalpc.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/authport.c trunk/reactos/dll/win32/lsasrv/lsasrv.h trunk/reactos/dll/win32/lsasrv/session.c trunk/reactos/dll/win32/secur32/CMakeLists.txt trunk/reactos/dll/win32/secur32/dllmain.c trunk/reactos/include/psdk/ntsecapi.h trunk/reactos/include/reactos/subsys/lsass/lsass.h trunk/reactos/lib/lsalib/lsa.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -8,7 +8,6 @@ #include "lsasrv.h" -#include <ndk/mmfuncs.h> #include <ndk/sefuncs.h> #include <ndk/umfuncs.h> Modified: trunk/reactos/dll/win32/lsasrv/authport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authport.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authport.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -9,7 +9,6 @@ #include "lsasrv.h" #include <ndk/lpcfuncs.h> -#include <ndk/psfuncs.h> static LIST_ENTRY LsapLogonContextList; @@ -92,18 +91,21 @@ HANDLE ConnectionHandle = NULL; BOOLEAN Accept; REMOTE_PORT_VIEW RemotePortView; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; TRACE("(%p)\n", RequestMsg); TRACE("Logon Process Name: %s\n", RequestMsg->ConnectInfo.LogonProcessNameBuffer); - Status = LsapCheckLogonProcess(RequestMsg, - &LogonContext); - - RequestMsg->ConnectInfo.OperationalMode = 0x43218765; - - RequestMsg->ConnectInfo.Status = Status; + if (RequestMsg->ConnectInfo.CreateContext == TRUE) + { + Status = LsapCheckLogonProcess(RequestMsg, + &LogonContext); + + RequestMsg->ConnectInfo.OperationalMode = 0x43218765; + + RequestMsg->ConnectInfo.Status = Status; + } if (NT_SUCCESS(Status)) { @@ -129,10 +131,13 @@ if (Accept == TRUE) { - LogonContext->ConnectionHandle = ConnectionHandle; - - InsertHeadList(&LsapLogonContextList, - &LogonContext->Entry); + if (LogonContext != NULL) + { + LogonContext->ConnectionHandle = ConnectionHandle; + + InsertHeadList(&LsapLogonContextList, + &LogonContext->Entry); + } Status = NtCompleteConnectPort(ConnectionHandle); if (!NT_SUCCESS(Status)) @@ -227,6 +232,11 @@ ReplyMsg = &RequestMsg; break; + case LSASS_REQUEST_ENUM_LOGON_SESSIONS: + RequestMsg.Status = LsapEnumLogonSessions(&RequestMsg); + ReplyMsg = &RequestMsg; + break; + default: RequestMsg.Status = STATUS_INVALID_SYSTEM_SERVICE; ReplyMsg = &RequestMsg; Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -23,7 +23,9 @@ #define NTOS_MODE_USER #include <ndk/cmfuncs.h> #include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> #include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> #include <ndk/rtlfuncs.h> #include <ndk/setypes.h> @@ -402,6 +404,9 @@ NTSTATUS LsapSetLogonSessionData(IN PLUID LogonId); +NTSTATUS +LsapEnumLogonSessions(IN OUT PLSA_API_MSG RequestMsg); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Modified: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -122,4 +122,93 @@ return STATUS_SUCCESS; } + +NTSTATUS +LsapEnumLogonSessions(IN OUT PLSA_API_MSG RequestMsg) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ProcessHandle = NULL; + PLIST_ENTRY SessionEntry; + PLSAP_LOGON_SESSION CurrentSession; + PLUID SessionList; + ULONG i, Length; + PVOID ClientBaseAddress; + NTSTATUS Status; + + TRACE("LsapEnumLogonSessions()\n"); + + Length = SessionCount * sizeof(LUID); + SessionList = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + Length); + if (SessionList == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + i = 0; + SessionEntry = SessionListHead.Flink; + while (SessionEntry != &SessionListHead) + { + CurrentSession = CONTAINING_RECORD(SessionEntry, + LSAP_LOGON_SESSION, + Entry); + + RtlCopyLuid(&SessionList[i], + &CurrentSession->LogonId); + + SessionEntry = SessionEntry->Flink; + i++; + } + + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + Status = NtOpenProcess(&ProcessHandle, + PROCESS_VM_READ | PROCESS_VM_WRITE | PROCESS_VM_OPERATION | PROCESS_DUP_HANDLE, + &ObjectAttributes, + &RequestMsg->h.ClientId); + if (!NT_SUCCESS(Status)) + { + TRACE("NtOpenProcess() failed (Status %lx)\n", Status); + goto done; + } + + Status = NtAllocateVirtualMemory(ProcessHandle, + &ClientBaseAddress, + 0, + &Length, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + TRACE("NtAllocateVirtualMemory() failed (Status %lx)\n", Status); + goto done; + } + + Status = NtWriteVirtualMemory(ProcessHandle, + ClientBaseAddress, + SessionList, + Length, + NULL); + if (!NT_SUCCESS(Status)) + { + TRACE("NtWriteVirtualMemory() failed (Status %lx)\n", Status); + goto done; + } + + RequestMsg->EnumLogonSessions.Reply.LogonSessionCount = SessionCount; + RequestMsg->EnumLogonSessions.Reply.LogonSessionBuffer = ClientBaseAddress; + +done: + if (ProcessHandle != NULL) + NtClose(ProcessHandle); + + if (SessionList != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, SessionList); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/secur32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/CMakeLists.txt [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -6,6 +6,7 @@ list(APPEND SOURCE dllmain.c + lsalpc.c secext.c sspi.c stubs.c Modified: trunk/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/dllmain.… ============================================================================== --- trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/dllmain.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -8,6 +8,9 @@ */ #include "precomp.h" + +VOID LsapInitLsaPort(VOID); +VOID LsapCloseLsaPort(VOID); /* GLOBALS *******************************************************************/ @@ -29,9 +32,11 @@ { return FALSE; } + LsapInitLsaPort(); break; case DLL_PROCESS_DETACH: + LsapCloseLsaPort(); if (!RtlDestroyHeap(Secur32Heap)) { return FALSE; Added: trunk/reactos/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsalpc.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsalpc.c (added) +++ trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -0,0 +1,188 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/secur32/lsalpc.c + * PURPOSE: LSA LPC port functions + */ + +/* INCLUDES ******************************************************************/ + +#include "precomp.h" + +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/obfuncs.h> +#include <psdk/ntsecapi.h> +#include <lsass/lsass.h> + +#include <wine/debug.h> +WINE_DEFAULT_DEBUG_CHANNEL(secur32); + + +/* GLOBALS *******************************************************************/ + +HANDLE LsaPortHandle; + +extern HANDLE Secur32Heap; + + +/* FUNCTIONS *****************************************************************/ + +VOID +LsapInitLsaPort(VOID) +{ + LsaPortHandle = NULL; +} + + +VOID +LsapCloseLsaPort(VOID) +{ + if (LsaPortHandle != NULL) + { + NtClose(LsaPortHandle); + LsaPortHandle = NULL; + } +} + + +NTSTATUS +LsapOpenLsaPort(VOID) +{ + UNICODE_STRING PortName; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + LSA_CONNECTION_INFO ConnectInfo; + ULONG ConnectInfoLength; + NTSTATUS Status; + + TRACE("LsapOpenLsaPort()\n"); + + if (LsaPortHandle != NULL) + return STATUS_SUCCESS; + + RtlInitUnicodeString(&PortName, + L"\\LsaAuthenticationPort"); + + SecurityQos.Length = sizeof(SecurityQos); + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + RtlZeroMemory(&ConnectInfo, + ConnectInfoLength); + + ConnectInfo.CreateContext = FALSE; + + ConnectInfoLength = sizeof(LSA_CONNECTION_INFO); + Status = NtConnectPort(&LsaPortHandle, + &PortName, + &SecurityQos, + NULL, + NULL, + NULL, + &ConnectInfo, + &ConnectInfoLength); + if (!NT_SUCCESS(Status)) + { + TRACE("NtConnectPort failed (Status 0x%08lx)\n", Status); + } + + return Status; +/* + if (!NT_SUCCESS(ConnectInfo.Status)) + { + DPRINT1("ConnectInfo.Status: 0x%08lx\n", ConnectInfo.Status); + } + + return ConnectInfo.Status; +*/ +} + + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +LsaEnumerateLogonSessions(PULONG LogonSessionCount, + PLUID *LogonSessionList) +{ + LSA_API_MSG ApiMessage; + NTSTATUS Status; + + TRACE("LsaEnumerateLogonSessions(%p %p)\n", LogonSessionCount, LogonSessionList); + + Status = LsapOpenLsaPort(); + if (!NT_SUCCESS(Status)) + return Status; + + ApiMessage.ApiNumber = LSASS_REQUEST_ENUM_LOGON_SESSIONS; + ApiMessage.h.u1.s1.DataLength = LSA_PORT_DATA_SIZE(ApiMessage.EnumLogonSessions); + ApiMessage.h.u1.s1.TotalLength = LSA_PORT_MESSAGE_SIZE; + ApiMessage.h.u2.ZeroInit = 0; + + Status = NtRequestWaitReplyPort(LsaPortHandle, + (PPORT_MESSAGE)&ApiMessage, + (PPORT_MESSAGE)&ApiMessage); + if (!NT_SUCCESS(Status)) + { + ERR("NtRequestWaitReplyPort() failed (Status 0x%08lx)\n", Status); + return Status; + } + + if (!NT_SUCCESS(ApiMessage.Status)) + { + ERR("NtRequestWaitReplyPort() failed (ApiMessage.Status 0x%08lx)\n", ApiMessage.Status); + return ApiMessage.Status; + } + + *LogonSessionCount = ApiMessage.EnumLogonSessions.Reply.LogonSessionCount; + *LogonSessionList = ApiMessage.EnumLogonSessions.Reply.LogonSessionBuffer; + + return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaGetLogonSessionData(PLUID LogonId, + PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/secur32/lsalpc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -699,6 +699,7 @@ ULONG,PULONG); NTSTATUS NTAPI LsaEnumerateAccountsWithUserRight(LSA_HANDLE,PLSA_UNICODE_STRING, PVOID*,PULONG); +NTSTATUS NTAPI LsaEnumerateLogonSessions(PULONG,PLUID*); NTSTATUS NTAPI LsaEnumeratePrivileges(LSA_HANDLE,PLSA_ENUMERATION_HANDLE, PVOID*,ULONG,PULONG); NTSTATUS NTAPI LsaEnumeratePrivilegesOfAccount(LSA_HANDLE,PPRIVILEGE_SET*); Modified: trunk/reactos/include/reactos/subsys/lsass/lsass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/lsa… ============================================================================== --- trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/lsass/lsass.h [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -21,6 +21,7 @@ LSASS_REQUEST_DEREGISTER_LOGON_PROCESS, LSASS_REQUEST_LOGON_USER, LSASS_REQUEST_LOOKUP_AUTHENTICATION_PACKAGE, + LSASS_REQUEST_ENUM_LOGON_SESSIONS, LSASS_REQUEST_MAXIMUM } LSA_API_NUMBER, *PLSA_API_NUMBER; @@ -31,6 +32,7 @@ LSA_OPERATIONAL_MODE OperationalMode; ULONG Length; CHAR LogonProcessNameBuffer[LSASS_MAX_LOGON_PROCESS_NAME_LENGTH + 1]; + BOOL CreateContext; } LSA_CONNECTION_INFO, *PLSA_CONNECTION_INFO; @@ -69,21 +71,12 @@ { struct { -#if 0 - ULONG AuthenticationPackage; - ULONG InBufferLength; - UCHAR InBuffer[0]; -#endif ULONG AuthenticationPackage; PVOID ProtocolSubmitBuffer; ULONG SubmitBufferLength; } Request; struct { -#if 0 - ULONG OutBufferLength; - UCHAR OutBuffer[0]; -#endif PVOID ProtocolReturnBuffer; ULONG ReturnBufferLength; NTSTATUS ProtocolStatus; @@ -125,6 +118,24 @@ } LSA_LOOKUP_AUTHENTICATION_PACKAGE_MSG, *PLSA_LOOKUP_AUTHENTICATION_PACKAGE_MSG; +typedef struct _LSA_ENUM_LOGON_SESSIONS_MSG +{ + union + { + struct + { + ULONG Dummy; + } Request; + struct + { + ULONG LogonSessionCount; + ULONG LogonSessionBufferLength; + PVOID LogonSessionBuffer; + } Reply; + }; +} LSA_ENUM_LOGON_SESSIONS_MSG, *PLSA_ENUM_LOGON_SESSIONS_MSG; + + typedef struct _LSA_API_MSG { PORT_MESSAGE h; @@ -141,6 +152,7 @@ LSA_CALL_AUTHENTICATION_PACKAGE_MSG CallAuthenticationPackage; LSA_DEREGISTER_LOGON_PROCESS_MSG DeregisterLogonProcess; LSA_LOOKUP_AUTHENTICATION_PACKAGE_MSG LookupAuthenticationPackage; + LSA_ENUM_LOGON_SESSIONS_MSG EnumLogonSessions; }; }; }; Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=64266… ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Thu Sep 25 12:37:19 2014 @@ -91,6 +91,8 @@ RtlZeroMemory(&ConnectInfo, ConnectInfoLength); + + ConnectInfo.CreateContext = TRUE; Status = ZwConnectPort(LsaHandle, &PortName, @@ -328,6 +330,7 @@ LsaLogonProcessName->Length); ConnectInfo.Length = LsaLogonProcessName->Length; ConnectInfo.LogonProcessNameBuffer[ConnectInfo.Length] = '\0'; + ConnectInfo.CreateContext = TRUE; Status = ZwConnectPort(Handle, &PortName, @@ -354,54 +357,3 @@ return ConnectInfo.Status; } - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaEnumerateLogonSessions(PULONG LogonSessionCount, - PLUID *LogonSessionList) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaGetLogonSessionData(PLUID LogonId, - PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - HANDLE NotificationEventHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -NTSTATUS -WINAPI -LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - HANDLE NotificationEventHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -}

1 0

[pschweitzer] 64265: [NTFS] Compute index record size on mount and save it.
by pschweitzer＠svn.reactos.org 25 Sep '14

25 Sep '14

Author: pschweitzer Date: Thu Sep 25 06:36:14 2014 New Revision: 64265 URL: http://svn.reactos.org/svn/reactos?rev=64265&view=rev Log: [NTFS] Compute index record size on mount and save it. Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Sep 25 06:36:14 2014 @@ -232,6 +232,10 @@ NtfsInfo->BytesPerFileRecord = BootSector->EBPB.ClustersPerMftRecord * NtfsInfo->BytesPerCluster; else NtfsInfo->BytesPerFileRecord = 1 << (-BootSector->EBPB.ClustersPerMftRecord); + if (BootSector->EBPB.ClustersPerIndexRecord > 0) + NtfsInfo->BytesPerIndexRecord = BootSector->EBPB.ClustersPerIndexRecord * NtfsInfo->BytesPerCluster; + else + NtfsInfo->BytesPerIndexRecord = 1 << (-BootSector->EBPB.ClustersPerIndexRecord); DPRINT("Boot sector information:\n"); DPRINT(" BytesPerSector: %hu\n", BootSector->BPB.BytesPerSector); Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Thu Sep 25 06:36:14 2014 @@ -63,6 +63,7 @@ ULARGE_INTEGER MftStart; ULARGE_INTEGER MftMirrStart; ULONG BytesPerFileRecord; + ULONG BytesPerIndexRecord; ULONGLONG SerialNumber; USHORT VolumeLabelLength;

1 0

[tkreuzer] 64264: [CRT] Add arm stub for __chkstk, dedicated to Z98
by tkreuzer＠svn.reactos.org 24 Sep '14

24 Sep '14

Author: tkreuzer Date: Wed Sep 24 23:12:34 2014 New Revision: 64264 URL: http://svn.reactos.org/svn/reactos?rev=64264&view=rev Log: [CRT] Add arm stub for __chkstk, dedicated to Z98 Added: trunk/reactos/lib/sdk/crt/except/arm/ (with props) trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s (with props) Propchange: trunk/reactos/lib/sdk/crt/except/arm/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Sep 24 23:12:34 2014 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/crt/except/arm/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/except/arm/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/crt/except/arm/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/arm/chk… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s (added) +++ trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s [iso-8859-1] Wed Sep 24 23:12:34 2014 @@ -0,0 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * PURPOSE: Implementation of _chkstk and _alloca_probe + * FILE: lib/sdk/crt/math/amd64/chkstk_asm.s + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <asm.inc> + +/* CODE **********************************************************************/ +.code64 + +MsgUnimplemented: + .ascii "Unimplemented", CR, LF, NUL + +FUNC __chkstk + .endprolog + UNIMPLEMENTED chkstk + ret +ENDFUNC + +FUNC __alloca_probe + .endprolog + UNIMPLEMENTED alloca_probe + ret +ENDFUNC + +END +/* EOF */ Propchange: trunk/reactos/lib/sdk/crt/except/arm/chkstk_asm.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs