Author: winesync Date: Sun Apr 20 12:11:36 2008 New Revision: 33074
URL: http://svn.reactos.org/svn/reactos?rev=33074&view=rev Log: Autosyncing with Wine HEAD
Modified: trunk/reactos/dll/win32/winhttp/main.c trunk/reactos/dll/win32/winhttp/winhttp.rbuild trunk/reactos/dll/win32/winhttp/winhttp.spec
Modified: trunk/reactos/dll/win32/winhttp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/main.c?re... ============================================================================== --- trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/main.c [iso-8859-1] Sun Apr 20 12:11:36 2008 @@ -94,6 +94,17 @@ }
/*********************************************************************** + * WinHttpDetectAutoProxyConfigUrl (winhttp.@) + */ +BOOL WINAPI WinHttpDetectAutoProxyConfigUrl(DWORD flags, LPWSTR *url) +{ + FIXME("(%x %p)\n", flags, url); + + SetLastError(ERROR_WINHTTP_AUTODETECTION_FAILED); + return FALSE; +} + +/*********************************************************************** * WinHttpGetIEProxyConfigForCurrentUser (winhttp.@) */ BOOL WINAPI WinHttpGetIEProxyConfigForCurrentUser(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG* config)
Modified: trunk/reactos/dll/win32/winhttp/winhttp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.r... ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp.rbuild [iso-8859-1] Sun Apr 20 12:11:36 2008 @@ -1,16 +1,18 @@ -<module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true" entrypoint="0"> - <importlibrary definition="winhttp.spec.def" /> - <include base="winhttp">.</include> - <include base="ReactOS">include/reactos/wine</include> - <define name="__REACTOS__" /> - <define name="__WINESRC__" /> - <define name="__USE_W32API" /> - <define name="_WIN32_IE">0x600</define> - <define name="_WIN32_WINNT">0x501</define> - <define name="WINVER">0x501</define> - <library>wine</library> - <library>kernel32</library> - <library>ntdll</library> - <file>main.c</file> - <file>winhttp.spec</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="winhttp" type="win32dll" baseaddress="${BASEADDRESS_WINHTTP}" installbase="system32" installname="winhttp.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> + <importlibrary definition="winhttp.spec.def" /> + <include base="winhttp">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__WINESRC__" /> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <file>main.c</file> + <file>winhttp.spec</file> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> +</module> +</group>
Modified: trunk/reactos/dll/win32/winhttp/winhttp.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winhttp/winhttp.s... ============================================================================== --- trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winhttp/winhttp.spec [iso-8859-1] Sun Apr 20 12:11:36 2008 @@ -8,7 +8,7 @@ @ stub WinHttpConnect @ stub WinHttpCrackUrl @ stub WinHttpCreateUrl -@ stub WinHttpDetectAutoProxyConfigUrl +@ stdcall WinHttpDetectAutoProxyConfigUrl(long ptr) @ stub WinHttpGetDefaultProxyConfiguration @ stdcall WinHttpGetIEProxyConfigForCurrentUser(ptr) @ stub WinHttpGetProxyForUrl