Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60436: [WUAPI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:35:15 2013 New Revision: 60436 URL: http://svn.reactos.org/svn/reactos?rev=60436&view=rev Log: [WUAPI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt trunk/reactos/dll/win32/wuapi/main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wuapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:35:15 2013 @@ -1,17 +1,9 @@ - -add_typelib(wuapi_tlb.idl) add_definitions( -D__WINESRC__ -DCOM_NO_WINDOWS_H) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/wine) - - +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) spec2def(wuapi.dll wuapi.spec) list(APPEND SOURCE @@ -22,18 +14,13 @@ session.c systeminfo.c updates.c - wuapi.rc ${CMAKE_CURRENT_BINARY_DIR}/wuapi.def) +add_typelib(wuapi_tlb.idl) set_source_files_properties(wuapi.rc PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/wuapi_tlb.tlb) - -add_library(wuapi SHARED ${SOURCE}) - +add_library(wuapi SHARED ${SOURCE} wuapi.rc) set_module_type(wuapi win32dll) target_link_libraries(wuapi uuid wine wuguid) -add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll) - -# wuapi_tlb.tlb needs stdole2.tlb -add_dependencies(wuapi stdole2) - +add_importlibs(wuapi msvcrt kernel32 ntdll) +add_dependencies(wuapi stdole2) # wuapi_tlb.tlb needs stdole2.tlb add_cd_file(TARGET wuapi DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wuapi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wuapi/main.c?rev… ============================================================================== --- trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wuapi/main.c [iso-8859-1] Sat Sep 28 15:35:15 2013 @@ -132,8 +132,6 @@ instance = hinst; DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } 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] Sat Sep 28 15:35:15 2013 @@ -211,7 +211,7 @@ reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 -reactos/dll/win32/wuapi # Synced to Wine-1.5.19 +reactos/dll/win32/wuapi # Synced to Wine-1.7.1 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_3 # Synced to Wine-1.5.19

1 0

[akhaldi] 60435: [WTSAPI32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:34:01 2013 New Revision: 60435 URL: http://svn.reactos.org/svn/reactos?rev=60435&view=rev Log: [WTSAPI32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt trunk/reactos/dll/win32/wtsapi32/wtsapi32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(wtsapi32.dll wtsapi32.spec) list(APPEND SOURCE @@ -10,11 +9,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/wtsapi32.def) add_library(wtsapi32 SHARED ${SOURCE}) - set_module_type(wtsapi32 win32dll) - target_link_libraries(wtsapi32 wine) - -add_importlibs(wtsapi32 advapi32 msvcrt kernel32 ntdll) - +add_importlibs(wtsapi32 msvcrt kernel32 ntdll) add_cd_file(TARGET wtsapi32 DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wtsapi32/wtsapi32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wtsapi32/wtsapi3… ============================================================================== --- trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wtsapi32/wtsapi32.c [iso-8859-1] Sat Sep 28 15:34:01 2013 @@ -25,27 +25,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wtsapi); -static HMODULE WTSAPI32_hModule; - -BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); - - switch (fdwReason) { - case DLL_PROCESS_ATTACH: - { - DisableThreadLibraryCalls(hinstDLL); - WTSAPI32_hModule = hinstDLL; - break; - } - case DLL_PROCESS_DETACH: - { - break; - } - } - - return TRUE; -} /************************************************************ * WTSCloseServer (WTSAPI32.@) 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] Sat Sep 28 15:34:01 2013 @@ -210,7 +210,7 @@ reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.7.1 -reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 +reactos/dll/win32/wtsapi32 # Synced to Wine-1.7.1 reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_2 # Synced to Wine-1.5.19

1 0

[akhaldi] 60434: [WMI] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:32:10 2013 New Revision: 60434 URL: http://svn.reactos.org/svn/reactos?rev=60434&view=rev Log: [WMI] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wmi/wmi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wmi/wmi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wmi/wmi.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/wmi/wmi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wmi/wmi.spec [iso-8859-1] Sat Sep 28 15:32:10 2013 @@ -11,12 +11,12 @@ @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW @ stdcall TraceEvent(long ptr) advapi32.TraceEvent @ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance @ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids 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] Sat Sep 28 15:32:10 2013 @@ -209,7 +209,7 @@ reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 -reactos/dll/win32/wmi # Synced to Wine-1.5.19 +reactos/dll/win32/wmi # Synced to Wine-1.7.1 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wuapi # Synced to Wine-1.5.19 reactos/dll/win32/xinput1_1 # Synced to Wine-1.5.19

1 0

[akhaldi] 60433: [WLDAP32_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:31:01 2013 New Revision: 60433 URL: http://svn.reactos.org/svn/reactos?rev=60433&view=rev Log: [WLDAP32_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt trunk/rostests/winetests/wldap32/parse.c trunk/rostests/winetests/wldap32/testlist.c Modified: trunk/rostests/winetests/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:31:01 2013 @@ -1,10 +1,5 @@ - -add_definitions( - -D__ROS_LONG64__ - -D_DLL -D__USE_CRTIMP) add_executable(wldap32_winetest parse.c testlist.c) -target_link_libraries(wldap32_winetest wine) set_module_type(wldap32_winetest win32cui) -add_importlibs(wldap32_winetest wldap32 msvcrt kernel32 ntdll) +add_importlibs(wldap32_winetest wldap32 msvcrt kernel32) add_cd_file(TARGET wldap32_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/parse.c… ============================================================================== --- trunk/rostests/winetests/wldap32/parse.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/parse.c [iso-8859-1] Sat Sep 28 15:31:01 2013 @@ -86,6 +86,43 @@ ldap_controls_free( server_ctrls ); } +static void test_ldap_search_extW( LDAP *ld ) +{ + ULONG ret, message, timelimit; + WCHAR base[] = {0}, filter[] = {'o','u','=','*',0}; + + timelimit = 20; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip("test server can't be reached\n"); + return; + } + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); + + timelimit = 0; + ret = ldap_search_extW( ld, base, LDAP_SCOPE_SUBTREE, filter, NULL, 0, NULL, NULL, timelimit, 0, &message ); + ok( !ret, "ldap_search_extW failed 0x%08x\n", ret ); +} + +static void test_ldap_set_optionW( LDAP *ld ) +{ + ULONG ret, oldvalue; + + ret = ldap_get_optionW( ld, LDAP_OPT_REFERRALS, &oldvalue ); + if (ret == LDAP_SERVER_DOWN || ret == LDAP_UNAVAILABLE) + { + skip("test server can't be reached\n"); + return; + } + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF ); + ok( !ret || broken(ret == LDAP_PARAM_ERROR) /* nt4, win2k */, "ldap_set_optionW failed 0x%08x\n", ret ); + + ret = ldap_set_optionW( ld, LDAP_OPT_REFERRALS, (void *)&oldvalue ); + ok( !ret, "ldap_set_optionW failed 0x%08x\n", ret ); +} + START_TEST (parse) { LDAP *ld; @@ -94,5 +131,7 @@ ok( ld != NULL, "ldap_init failed\n" ); test_ldap_parse_sort_control( ld ); + test_ldap_search_extW( ld ); + test_ldap_set_optionW( ld ); ldap_unbind( ld ); } Modified: trunk/rostests/winetests/wldap32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wldap32/testlis… ============================================================================== --- trunk/rostests/winetests/wldap32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wldap32/testlist.c [iso-8859-1] Sat Sep 28 15:31:01 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_parse(void);

1 0

[akhaldi] 60432: [WLDAP32] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:30:23 2013 New Revision: 60432 URL: http://svn.reactos.org/svn/reactos?rev=60432&view=rev Log: [WLDAP32] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt trunk/reactos/dll/win32/wldap32/init.c trunk/reactos/dll/win32/wldap32/main.c trunk/reactos/dll/win32/wldap32/option.c trunk/reactos/dll/win32/wldap32/parse.c trunk/reactos/dll/win32/wldap32/search.c trunk/reactos/dll/win32/wldap32/wldap32.h trunk/reactos/dll/win32/wldap32/wldap32.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wldap32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -24,11 +24,10 @@ rename.c search.c value.c - wldap32.rc ${CMAKE_CURRENT_BINARY_DIR}/wldap32_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wldap32.def) -add_library(wldap32 SHARED ${SOURCE}) +add_library(wldap32 SHARED ${SOURCE} wldap32.rc) set_module_type(wldap32 win32dll) target_link_libraries(wldap32 wine) add_importlibs(wldap32 user32 msvcrt kernel32 ntdll) Modified: trunk/reactos/dll/win32/wldap32/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/init.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/init.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -19,22 +19,21 @@ */ #include <config.h> - //#include "wine/port.h" -#include <wine/debug.h> - + +//#include <stdio.h> //#include <stdarg.h> - -//#include "windef.h" +#ifdef HAVE_LDAP_H +#include <ldap.h> +#endif + +#include <windef.h> //#include "winbase.h" //#include "winnls.h" -#ifdef HAVE_LDAP_H -#include <ldap.h> -#endif - #include "winldap_private.h" //#include "wldap32.h" +#include <wine/debug.h> #ifdef HAVE_LDAP /* Should eventually be determined by the algorithm documented on MSDN. */ @@ -124,7 +123,7 @@ } /* Flatten an array of hostnames into a space separated string of URLs. - * Prepend a given scheme and append a given portnumber to each hostname + * Prepend a given scheme and append a given port number to each hostname * if necessary. */ static char *join_hostnames( const char *scheme, char **hostnames, ULONG portnumber ) @@ -244,7 +243,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -254,8 +253,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. */ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber ) @@ -352,7 +351,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -362,8 +361,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. The connection will not be made until the first * LDAP function that needs it is called. */ @@ -435,7 +434,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * * RETURNS * Success: Pointer to an LDAP context. @@ -445,8 +444,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. */ WLDAP32_LDAP * CDECL ldap_openW( PWCHAR hostname, ULONG portnumber ) @@ -516,7 +515,7 @@ * * PARAMS * hostname [I] Name of the host to connect to. - * portnumber [I] Portnumber to use. + * portnumber [I] Port number to use. * secure [I] Ask the server to create an SSL connection. * * RETURNS @@ -527,8 +526,8 @@ * The hostname string can be a space separated string of hostnames, * in which case the LDAP runtime will try to connect to the hosts * in order, until a connection can be made. A hostname may have a - * trailing portnumber (separated from the hostname by a ':'), which - * will take precedence over the portnumber supplied as a parameter + * trailing port number (separated from the hostname by a ':'), which + * will take precedence over the port number supplied as a parameter * to this function. The connection will not be made until the first * LDAP function that needs it is called. */ Modified: trunk/reactos/dll/win32/wldap32/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/main.c?r… ============================================================================== --- trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/main.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -40,8 +40,6 @@ hwldap32 = hinst; DisableThreadLibraryCalls( hinst ); break; - case DLL_PROCESS_DETACH: - break; } return TRUE; } Modified: trunk/reactos/dll/win32/wldap32/option.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/option.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/option.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -319,7 +319,7 @@ TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { @@ -422,7 +422,7 @@ TRACE( "(%p, 0x%08x, %p)\n", ld, option, value ); - if (!ld || !value) return WLDAP32_LDAP_PARAM_ERROR; + if (!ld) return WLDAP32_LDAP_PARAM_ERROR; switch (option) { Modified: trunk/reactos/dll/win32/wldap32/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/parse.c?… ============================================================================== --- trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/parse.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -444,7 +444,7 @@ #ifdef HAVE_LDAP_PARSE_VLV_CONTROL if (!(ret = ldap_parse_vlv_control( ld, controlU, &pos, &count, - context, errcode ))) + (struct berval **)context, errcode ))) { *targetpos = pos; *listcount = count; Modified: trunk/reactos/dll/win32/wldap32/search.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/search.c… ============================================================================== --- trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/search.c [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -243,7 +243,7 @@ #ifdef HAVE_LDAP char *baseU = NULL, *filterU = NULL, **attrsU = NULL; LDAPControl **serverctrlsU = NULL, **clientctrlsU = NULL; - struct timeval tv; + struct timeval tv, *tvp = NULL; ret = WLDAP32_LDAP_NO_MEMORY; @@ -274,11 +274,15 @@ if (!clientctrlsU) goto exit; } - tv.tv_sec = timelimit; - tv.tv_usec = 0; + if (timelimit) + { + tv.tv_sec = timelimit; + tv.tv_usec = 0; + tvp = &tv; + } ret = map_error( ldap_search_ext( ld, baseU, scope, filterU, attrsU, attrsonly, - serverctrlsU, clientctrlsU, &tv, sizelimit, (int *)message )); + serverctrlsU, clientctrlsU, tvp, sizelimit, (int *)message )); exit: strfreeU( baseU ); Modified: trunk/reactos/dll/win32/wldap32/wldap32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.h [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -ULONG map_error( int ); +extern HINSTANCE hwldap32 DECLSPEC_HIDDEN; + +ULONG map_error( int ) DECLSPEC_HIDDEN; /* A set of helper functions to convert LDAP data structures * to and from ansi (A), wide character (W) and utf8 (U) encodings. @@ -854,5 +856,4 @@ HeapFree( GetProcessHeap(), 0, sortkeyarray ); } } - #endif /* HAVE_LDAP */ Modified: trunk/reactos/dll/win32/wldap32/wldap32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wldap32/wldap32.… ============================================================================== --- trunk/reactos/dll/win32/wldap32/wldap32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wldap32/wldap32.spec [iso-8859-1] Sat Sep 28 15:30:23 2013 @@ -52,7 +52,7 @@ 62 cdecl ldap_add_extW(ptr wstr ptr ptr ptr ptr) 63 cdecl ldap_add_ext_s(ptr str ptr ptr ptr) ldap_add_ext_sA 64 cdecl ldap_add_ext_sA(ptr str ptr ptr ptr) - 65 cdecl ldap_add_ext_sW(ptr str ptr ptr ptr) + 65 cdecl ldap_add_ext_sW(ptr wstr ptr ptr ptr) 66 cdecl ldap_add_sA(ptr str ptr) 67 cdecl ldap_modrdn2(ptr str ptr long) ldap_modrdn2A 68 cdecl ldap_modrdn2_s(ptr str ptr long) ldap_modrdn2_sA @@ -206,7 +206,7 @@ 216 cdecl ldap_simple_bind_sW(ptr wstr wstr) 217 cdecl ldap_sslinit(str long long) ldap_sslinitA 218 cdecl ldap_sslinitA(str long long) -219 cdecl ldap_sslinitW(str long long) +219 cdecl ldap_sslinitW(wstr long long) 220 cdecl ldap_ufn2dn(str ptr) ldap_ufn2dnA 221 cdecl ldap_ufn2dnA(str ptr) 222 cdecl ldap_ufn2dnW(wstr ptr) 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] Sat Sep 28 15:30:23 2013 @@ -208,7 +208,7 @@ reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 reactos/dll/win32/wintrust # Synced to Wine-1.7.1 -reactos/dll/win32/wldap32 # Autosync +reactos/dll/win32/wldap32 # Synced to Wine-1.7.1 reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4 reactos/dll/win32/wuapi # Synced to Wine-1.5.19

1 0

[akhaldi] 60431: [WINTRUST_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:28:59 2013 New Revision: 60431 URL: http://svn.reactos.org/svn/reactos?rev=60431&view=rev Log: [WINTRUST_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt trunk/rostests/winetests/wintrust/crypt.c trunk/rostests/winetests/wintrust/softpub.c trunk/rostests/winetests/wintrust/testlist.c Modified: trunk/rostests/winetests/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/CMakeL… ============================================================================== --- trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE asn.c @@ -9,7 +7,6 @@ testlist.c) add_executable(wintrust_winetest ${SOURCE}) -target_link_libraries(wintrust_winetest wine) set_module_type(wintrust_winetest win32cui) -add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(wintrust_winetest wintrust crypt32 advapi32 msvcrt kernel32) add_cd_file(TARGET wintrust_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wintrust/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.… ============================================================================== --- trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/crypt.c [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -203,7 +203,7 @@ /* NULL GUID */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); /* All NULL */ @@ -273,23 +273,23 @@ } ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Correct context handle and GUID */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); /* Flags not equal to 0 */ ret = pCryptCATAdminAcquireContext(&hca, &unknown, 1); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); ret = pCryptCATAdminReleaseContext(hca, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); } /* TODO: Check whether SHA-1 is the algorithm that's always used */ @@ -340,7 +340,7 @@ ok(file != INVALID_HANDLE_VALUE, "CreateFile failed %u\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, NULL, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "Expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError()); @@ -354,7 +354,7 @@ hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success %u\n", GetLastError()); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hashsize == 20," Expected a hash size of 20, got %d\n", hashsize); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); @@ -376,7 +376,7 @@ hash = HeapAlloc(GetProcessHeap(), 0, hashsize); SetLastError(0xdeadbeef); ret = pCryptCATAdminCalcHashFromFileHandle(file, &hashsize, hash, 0); - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(hashsize == sizeof(expectedhash) && @@ -526,7 +526,7 @@ ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n"); ok(error == ERROR_INVALID_PARAMETER, "got %u expected ERROR_INVALID_PARAMETER\n", GetLastError()); - MultiByteToWideChar(0, 0, tmpfile, -1, tmpfileW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, tmpfile, -1, tmpfileW, MAX_PATH); SetLastError(0xdeadbeef); hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 0); @@ -558,6 +558,11 @@ /* Unique name will be created */ hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0); + if (!hcatinfo && (GetLastError() == ERROR_ACCESS_DENIED)) + { + win_skip("Not enough rights\n"); + goto cleanup; + } todo_wine ok(hcatinfo != NULL, "CryptCATAdminAddCatalog failed %u\n", GetLastError()); info.cbStruct = sizeof(info); @@ -568,10 +573,10 @@ ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); } - WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); if ((p = strrchr(catfile, '\\'))) p++; memset(catfileW, 0, sizeof(catfileW)); - MultiByteToWideChar(0, 0, p, -1, catfileW, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, p, -1, catfileW, MAX_PATH); /* Set the file attributes so we can check what happens with them during the 'copy' */ attrs = FILE_ATTRIBUTE_READONLY; @@ -596,7 +601,7 @@ ret = pCryptCATCatalogInfoFromContext(hcatinfo, &info, 0); ok(ret, "CryptCATCatalogInfoFromContext failed %u\n", GetLastError()); ok(info.wszCatalogFile[0] != 0, "Expected a filename\n"); - WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, 0, 0); + WideCharToMultiByte(CP_ACP, 0, info.wszCatalogFile, -1, catfile, MAX_PATH, NULL, NULL); if ((p = strrchr(catfile, '\\'))) p++; ok(!lstrcmpA(basename, p), "Expected %s, got %s\n", basename, p); @@ -620,6 +625,7 @@ attrs = GetFileAttributes(catfilepath); ok(attrs == INVALID_FILE_ATTRIBUTES, "Expected %s to be removed\n", catfilepath); +cleanup: ret = pCryptCATAdminReleaseContext(hcatadmin, 0); ok(ret, "CryptCATAdminReleaseContext failed %u\n", GetLastError()); @@ -760,7 +766,7 @@ ret = pCryptCATCDFClose(catcdf); todo_wine { - ok(ret, "Expected success\n"); + ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } Modified: trunk/rostests/winetests/wintrust/softpub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpu… ============================================================================== --- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -274,7 +274,7 @@ /* Workaround missing W-functions for win9x */ GetWindowsDirectoryA(notepadPath, MAX_PATH); lstrcatA(notepadPath, notepad); - MultiByteToWideChar(0, 0, notepadPath, -1, notepadPathW, size); + MultiByteToWideChar(CP_ACP, 0, notepadPath, -1, notepadPathW, size); } /* Creates a test file and returns a handle to it. The file's path is returned @@ -425,29 +425,118 @@ } static const BYTE selfSignedCert[] = { - 0x30, 0x82, 0x01, 0x1f, 0x30, 0x81, 0xce, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, - 0x10, 0xeb, 0x0d, 0x57, 0x2a, 0x9c, 0x09, 0xba, 0xa4, 0x4a, 0xb7, 0x25, 0x49, - 0xd9, 0x3e, 0xb5, 0x73, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, 0x1d, - 0x05, 0x00, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, 0x55, 0x04, 0x03, - 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, 0x67, 0x00, 0x30, - 0x1e, 0x17, 0x0d, 0x30, 0x36, 0x30, 0x36, 0x32, 0x39, 0x30, 0x35, 0x30, 0x30, - 0x34, 0x36, 0x5a, 0x17, 0x0d, 0x30, 0x37, 0x30, 0x36, 0x32, 0x39, 0x31, 0x31, - 0x30, 0x30, 0x34, 0x36, 0x5a, 0x30, 0x15, 0x31, 0x13, 0x30, 0x11, 0x06, 0x03, - 0x55, 0x04, 0x03, 0x13, 0x0a, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x4c, 0x61, 0x6e, - 0x67, 0x00, 0x30, 0x5c, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, - 0x0d, 0x01, 0x01, 0x01, 0x05, 0x00, 0x03, 0x4b, 0x00, 0x30, 0x48, 0x02, 0x41, - 0x00, 0xe2, 0x54, 0x3a, 0xa7, 0x83, 0xb1, 0x27, 0x14, 0x3e, 0x59, 0xbb, 0xb4, - 0x53, 0xe6, 0x1f, 0xe7, 0x5d, 0xf1, 0x21, 0x68, 0xad, 0x85, 0x53, 0xdb, 0x6b, - 0x1e, 0xeb, 0x65, 0x97, 0x03, 0x86, 0x60, 0xde, 0xf3, 0x6c, 0x38, 0x75, 0xe0, - 0x4c, 0x61, 0xbb, 0xbc, 0x62, 0x17, 0xa9, 0xcd, 0x79, 0x3f, 0x21, 0x4e, 0x96, - 0xcb, 0x0e, 0xdc, 0x61, 0x94, 0x30, 0x18, 0x10, 0x6b, 0xd0, 0x1c, 0x10, 0x79, - 0x02, 0x03, 0x01, 0x00, 0x01, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0e, 0x03, 0x02, - 0x1d, 0x05, 0x00, 0x03, 0x41, 0x00, 0x25, 0x90, 0x53, 0x34, 0xd9, 0x56, 0x41, - 0x5e, 0xdb, 0x7e, 0x01, 0x36, 0xec, 0x27, 0x61, 0x5e, 0xb7, 0x4d, 0x90, 0x66, - 0xa2, 0xe1, 0x9d, 0x58, 0x76, 0xd4, 0x9c, 0xba, 0x2c, 0x84, 0xc6, 0x83, 0x7a, - 0x22, 0x0d, 0x03, 0x69, 0x32, 0x1a, 0x6d, 0xcb, 0x0c, 0x15, 0xb3, 0x6b, 0xc7, - 0x0a, 0x8c, 0xb4, 0x5c, 0x34, 0x78, 0xe0, 0x3c, 0x9c, 0xe9, 0xf3, 0x30, 0x9f, - 0xa8, 0x76, 0x57, 0x92, 0x36 }; + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x42, 0x45, 0x47, 0x49, 0x4e, 0x20, 0x43, + 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, 0x2d, 0x2d, + 0x2d, 0x2d, 0x2d, 0x0a, 0x4d, 0x49, 0x49, 0x44, 0x70, 0x7a, 0x43, 0x43, + 0x41, 0x6f, 0x2b, 0x67, 0x41, 0x77, 0x49, 0x42, 0x41, 0x67, 0x49, 0x4a, + 0x41, 0x4c, 0x59, 0x51, 0x67, 0x65, 0x66, 0x7a, 0x51, 0x41, 0x61, 0x43, + 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, 0x33, + 0x44, 0x51, 0x45, 0x42, 0x42, 0x51, 0x55, 0x41, 0x4d, 0x47, 0x6f, 0x78, + 0x43, 0x7a, 0x41, 0x4a, 0x42, 0x67, 0x4e, 0x56, 0x0a, 0x42, 0x41, 0x59, + 0x54, 0x41, 0x6b, 0x46, 0x56, 0x4d, 0x52, 0x4d, 0x77, 0x45, 0x51, 0x59, + 0x44, 0x56, 0x51, 0x51, 0x49, 0x44, 0x41, 0x70, 0x54, 0x62, 0x32, 0x31, + 0x6c, 0x4c, 0x56, 0x4e, 0x30, 0x59, 0x58, 0x52, 0x6c, 0x4d, 0x53, 0x45, + 0x77, 0x48, 0x77, 0x59, 0x44, 0x56, 0x51, 0x51, 0x4b, 0x44, 0x42, 0x68, + 0x4a, 0x62, 0x6e, 0x52, 0x6c, 0x63, 0x6d, 0x35, 0x6c, 0x64, 0x43, 0x42, + 0x58, 0x0a, 0x61, 0x57, 0x52, 0x6e, 0x61, 0x58, 0x52, 0x7a, 0x49, 0x46, + 0x42, 0x30, 0x65, 0x53, 0x42, 0x4d, 0x64, 0x47, 0x51, 0x78, 0x49, 0x7a, + 0x41, 0x68, 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x4d, 0x4d, 0x47, 0x6e, + 0x4e, 0x6c, 0x62, 0x47, 0x5a, 0x7a, 0x61, 0x57, 0x64, 0x75, 0x5a, 0x57, + 0x51, 0x75, 0x64, 0x47, 0x56, 0x7a, 0x64, 0x43, 0x35, 0x33, 0x61, 0x57, + 0x35, 0x6c, 0x61, 0x48, 0x45, 0x75, 0x0a, 0x62, 0x33, 0x4a, 0x6e, 0x4d, + 0x42, 0x34, 0x58, 0x44, 0x54, 0x45, 0x7a, 0x4d, 0x44, 0x59, 0x79, 0x4d, + 0x54, 0x45, 0x78, 0x4d, 0x6a, 0x55, 0x78, 0x4d, 0x46, 0x6f, 0x58, 0x44, + 0x54, 0x49, 0x7a, 0x4d, 0x44, 0x59, 0x78, 0x4f, 0x54, 0x45, 0x78, 0x4d, + 0x6a, 0x55, 0x78, 0x4d, 0x46, 0x6f, 0x77, 0x61, 0x6a, 0x45, 0x4c, 0x4d, + 0x41, 0x6b, 0x47, 0x41, 0x31, 0x55, 0x45, 0x42, 0x68, 0x4d, 0x43, 0x0a, + 0x51, 0x56, 0x55, 0x78, 0x45, 0x7a, 0x41, 0x52, 0x42, 0x67, 0x4e, 0x56, + 0x42, 0x41, 0x67, 0x4d, 0x43, 0x6c, 0x4e, 0x76, 0x62, 0x57, 0x55, 0x74, + 0x55, 0x33, 0x52, 0x68, 0x64, 0x47, 0x55, 0x78, 0x49, 0x54, 0x41, 0x66, + 0x42, 0x67, 0x4e, 0x56, 0x42, 0x41, 0x6f, 0x4d, 0x47, 0x45, 0x6c, 0x75, + 0x64, 0x47, 0x56, 0x79, 0x62, 0x6d, 0x56, 0x30, 0x49, 0x46, 0x64, 0x70, + 0x5a, 0x47, 0x64, 0x70, 0x0a, 0x64, 0x48, 0x4d, 0x67, 0x55, 0x48, 0x52, + 0x35, 0x49, 0x45, 0x78, 0x30, 0x5a, 0x44, 0x45, 0x6a, 0x4d, 0x43, 0x45, + 0x47, 0x41, 0x31, 0x55, 0x45, 0x41, 0x77, 0x77, 0x61, 0x63, 0x32, 0x56, + 0x73, 0x5a, 0x6e, 0x4e, 0x70, 0x5a, 0x32, 0x35, 0x6c, 0x5a, 0x43, 0x35, + 0x30, 0x5a, 0x58, 0x4e, 0x30, 0x4c, 0x6e, 0x64, 0x70, 0x62, 0x6d, 0x56, + 0x6f, 0x63, 0x53, 0x35, 0x76, 0x63, 0x6d, 0x63, 0x77, 0x0a, 0x67, 0x67, + 0x45, 0x69, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, + 0x62, 0x33, 0x44, 0x51, 0x45, 0x42, 0x41, 0x51, 0x55, 0x41, 0x41, 0x34, + 0x49, 0x42, 0x44, 0x77, 0x41, 0x77, 0x67, 0x67, 0x45, 0x4b, 0x41, 0x6f, + 0x49, 0x42, 0x41, 0x51, 0x44, 0x77, 0x4e, 0x6d, 0x2b, 0x46, 0x7a, 0x78, + 0x6e, 0x6b, 0x48, 0x57, 0x2f, 0x4e, 0x70, 0x37, 0x59, 0x48, 0x34, 0x4d, + 0x79, 0x45, 0x0a, 0x77, 0x4d, 0x6c, 0x49, 0x67, 0x71, 0x30, 0x66, 0x45, + 0x77, 0x70, 0x47, 0x6f, 0x41, 0x75, 0x78, 0x44, 0x64, 0x61, 0x46, 0x55, + 0x32, 0x6f, 0x70, 0x76, 0x41, 0x51, 0x56, 0x61, 0x2b, 0x41, 0x43, 0x46, + 0x38, 0x63, 0x6f, 0x38, 0x4d, 0x4a, 0x6c, 0x33, 0x78, 0x77, 0x76, 0x46, + 0x44, 0x2b, 0x67, 0x61, 0x46, 0x45, 0x7a, 0x59, 0x78, 0x53, 0x58, 0x30, + 0x43, 0x47, 0x72, 0x4a, 0x45, 0x4c, 0x63, 0x0a, 0x74, 0x34, 0x4d, 0x69, + 0x30, 0x68, 0x4b, 0x50, 0x76, 0x42, 0x70, 0x65, 0x73, 0x59, 0x6c, 0x46, + 0x4d, 0x51, 0x65, 0x6b, 0x2b, 0x63, 0x70, 0x51, 0x50, 0x33, 0x4b, 0x35, + 0x75, 0x36, 0x71, 0x58, 0x5a, 0x52, 0x49, 0x67, 0x48, 0x75, 0x59, 0x45, + 0x4c, 0x2f, 0x73, 0x55, 0x6f, 0x39, 0x32, 0x70, 0x44, 0x30, 0x7a, 0x4a, + 0x65, 0x4c, 0x47, 0x41, 0x31, 0x49, 0x30, 0x4b, 0x5a, 0x34, 0x73, 0x2f, + 0x0a, 0x51, 0x7a, 0x77, 0x61, 0x4f, 0x38, 0x62, 0x62, 0x4b, 0x6d, 0x37, + 0x42, 0x72, 0x6e, 0x56, 0x77, 0x30, 0x6e, 0x5a, 0x2f, 0x4b, 0x41, 0x5a, + 0x6a, 0x75, 0x78, 0x75, 0x6f, 0x4e, 0x33, 0x52, 0x64, 0x72, 0x69, 0x30, + 0x4a, 0x48, 0x77, 0x7a, 0x6a, 0x41, 0x55, 0x34, 0x2b, 0x71, 0x57, 0x65, + 0x55, 0x63, 0x2f, 0x64, 0x33, 0x45, 0x70, 0x4f, 0x47, 0x78, 0x69, 0x42, + 0x77, 0x5a, 0x4e, 0x61, 0x7a, 0x0a, 0x39, 0x6f, 0x4a, 0x41, 0x37, 0x54, + 0x2f, 0x51, 0x6f, 0x62, 0x75, 0x61, 0x4e, 0x53, 0x6b, 0x65, 0x55, 0x48, + 0x43, 0x61, 0x50, 0x53, 0x6a, 0x44, 0x37, 0x71, 0x7a, 0x6c, 0x43, 0x4f, + 0x52, 0x48, 0x47, 0x68, 0x75, 0x31, 0x76, 0x79, 0x79, 0x35, 0x31, 0x45, + 0x36, 0x79, 0x46, 0x43, 0x4e, 0x47, 0x66, 0x65, 0x7a, 0x71, 0x2f, 0x4d, + 0x59, 0x34, 0x4e, 0x4b, 0x68, 0x77, 0x72, 0x61, 0x59, 0x64, 0x0a, 0x62, + 0x79, 0x49, 0x2f, 0x6c, 0x42, 0x46, 0x62, 0x36, 0x35, 0x6b, 0x5a, 0x45, + 0x66, 0x49, 0x4b, 0x4b, 0x54, 0x7a, 0x79, 0x36, 0x76, 0x30, 0x44, 0x65, + 0x79, 0x50, 0x37, 0x52, 0x6b, 0x34, 0x75, 0x48, 0x44, 0x38, 0x77, 0x62, + 0x49, 0x79, 0x50, 0x32, 0x47, 0x6c, 0x42, 0x30, 0x67, 0x37, 0x2f, 0x69, + 0x79, 0x33, 0x4c, 0x61, 0x74, 0x49, 0x74, 0x49, 0x70, 0x2b, 0x49, 0x35, + 0x53, 0x50, 0x56, 0x0a, 0x41, 0x67, 0x4d, 0x42, 0x41, 0x41, 0x47, 0x6a, + 0x55, 0x44, 0x42, 0x4f, 0x4d, 0x42, 0x30, 0x47, 0x41, 0x31, 0x55, 0x64, + 0x44, 0x67, 0x51, 0x57, 0x42, 0x42, 0x53, 0x36, 0x49, 0x4c, 0x5a, 0x2f, + 0x71, 0x38, 0x66, 0x2f, 0x4b, 0x45, 0x68, 0x4b, 0x76, 0x68, 0x69, 0x2b, + 0x73, 0x6b, 0x59, 0x45, 0x31, 0x79, 0x48, 0x71, 0x39, 0x7a, 0x41, 0x66, + 0x42, 0x67, 0x4e, 0x56, 0x48, 0x53, 0x4d, 0x45, 0x0a, 0x47, 0x44, 0x41, + 0x57, 0x67, 0x42, 0x53, 0x36, 0x49, 0x4c, 0x5a, 0x2f, 0x71, 0x38, 0x66, + 0x2f, 0x4b, 0x45, 0x68, 0x4b, 0x76, 0x68, 0x69, 0x2b, 0x73, 0x6b, 0x59, + 0x45, 0x31, 0x79, 0x48, 0x71, 0x39, 0x7a, 0x41, 0x4d, 0x42, 0x67, 0x4e, + 0x56, 0x48, 0x52, 0x4d, 0x45, 0x42, 0x54, 0x41, 0x44, 0x41, 0x51, 0x48, + 0x2f, 0x4d, 0x41, 0x30, 0x47, 0x43, 0x53, 0x71, 0x47, 0x53, 0x49, 0x62, + 0x33, 0x0a, 0x44, 0x51, 0x45, 0x42, 0x42, 0x51, 0x55, 0x41, 0x41, 0x34, + 0x49, 0x42, 0x41, 0x51, 0x41, 0x79, 0x5a, 0x59, 0x77, 0x47, 0x4b, 0x46, + 0x34, 0x34, 0x43, 0x68, 0x47, 0x51, 0x72, 0x6e, 0x74, 0x57, 0x6c, 0x38, + 0x48, 0x53, 0x4a, 0x30, 0x63, 0x69, 0x55, 0x58, 0x4d, 0x44, 0x4b, 0x32, + 0x46, 0x6c, 0x6f, 0x74, 0x47, 0x49, 0x6a, 0x30, 0x32, 0x6c, 0x4d, 0x39, + 0x38, 0x71, 0x45, 0x49, 0x65, 0x68, 0x0a, 0x56, 0x67, 0x66, 0x41, 0x34, + 0x7a, 0x69, 0x37, 0x4d, 0x45, 0x6c, 0x51, 0x61, 0x76, 0x6b, 0x52, 0x76, + 0x32, 0x54, 0x43, 0x50, 0x50, 0x55, 0x51, 0x62, 0x35, 0x51, 0x64, 0x61, + 0x6f, 0x37, 0x57, 0x78, 0x37, 0x6c, 0x66, 0x61, 0x54, 0x6f, 0x5a, 0x68, + 0x4f, 0x54, 0x2b, 0x4e, 0x52, 0x68, 0x32, 0x6b, 0x35, 0x78, 0x2b, 0x6b, + 0x6a, 0x5a, 0x46, 0x77, 0x38, 0x70, 0x45, 0x48, 0x74, 0x35, 0x51, 0x0a, + 0x69, 0x68, 0x62, 0x46, 0x4c, 0x35, 0x58, 0x2b, 0x57, 0x7a, 0x6f, 0x2b, + 0x42, 0x36, 0x36, 0x59, 0x79, 0x49, 0x76, 0x68, 0x77, 0x54, 0x63, 0x48, + 0x30, 0x46, 0x2b, 0x6e, 0x66, 0x55, 0x71, 0x66, 0x74, 0x38, 0x59, 0x74, + 0x72, 0x2f, 0x38, 0x37, 0x47, 0x45, 0x62, 0x73, 0x41, 0x48, 0x6a, 0x48, + 0x43, 0x36, 0x4c, 0x2b, 0x77, 0x6b, 0x31, 0x76, 0x4e, 0x6e, 0x64, 0x49, + 0x59, 0x47, 0x30, 0x51, 0x0a, 0x79, 0x62, 0x73, 0x7a, 0x78, 0x49, 0x72, + 0x32, 0x6d, 0x46, 0x45, 0x49, 0x4a, 0x6f, 0x69, 0x51, 0x44, 0x44, 0x67, + 0x66, 0x6c, 0x71, 0x67, 0x64, 0x76, 0x4c, 0x54, 0x32, 0x79, 0x64, 0x46, + 0x6d, 0x79, 0x33, 0x73, 0x32, 0x68, 0x49, 0x74, 0x51, 0x6c, 0x49, 0x71, + 0x4b, 0x4c, 0x42, 0x36, 0x49, 0x4a, 0x51, 0x49, 0x75, 0x69, 0x37, 0x72, + 0x37, 0x34, 0x76, 0x64, 0x72, 0x63, 0x58, 0x71, 0x58, 0x0a, 0x44, 0x7a, + 0x68, 0x6d, 0x4c, 0x66, 0x67, 0x6a, 0x67, 0x4c, 0x77, 0x33, 0x2b, 0x55, + 0x79, 0x69, 0x59, 0x74, 0x44, 0x54, 0x76, 0x63, 0x78, 0x65, 0x7a, 0x62, + 0x4c, 0x73, 0x76, 0x51, 0x6f, 0x52, 0x6b, 0x74, 0x77, 0x4b, 0x5a, 0x4c, + 0x44, 0x54, 0x42, 0x42, 0x35, 0x76, 0x59, 0x32, 0x78, 0x4b, 0x36, 0x6b, + 0x4f, 0x4f, 0x44, 0x70, 0x7a, 0x50, 0x48, 0x73, 0x4b, 0x67, 0x30, 0x42, + 0x59, 0x77, 0x0a, 0x4d, 0x6b, 0x48, 0x56, 0x56, 0x54, 0x34, 0x79, 0x2f, + 0x4d, 0x59, 0x36, 0x63, 0x63, 0x4b, 0x51, 0x2f, 0x4c, 0x56, 0x74, 0x32, + 0x66, 0x4a, 0x49, 0x74, 0x69, 0x41, 0x71, 0x49, 0x47, 0x32, 0x38, 0x64, + 0x37, 0x31, 0x53, 0x0a, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x45, 0x4e, 0x44, + 0x20, 0x43, 0x45, 0x52, 0x54, 0x49, 0x46, 0x49, 0x43, 0x41, 0x54, 0x45, + 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x0a +}; static void testCertTrust(SAFE_PROVIDER_FUNCTIONS *funcs, GUID *actionID) { @@ -616,7 +705,7 @@ { 0x31, 0xC0, /* xor eax, eax */ 0xFF, 0x25, EXIT_PROCESS&0xFF, (EXIT_PROCESS>>8)&0xFF, (EXIT_PROCESS>>16)&0xFF, - (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */ + (EXIT_PROCESS>>24)&0xFF, /* jmp ExitProcess */ 0 }, /* .idata section */ @@ -667,7 +756,6 @@ ret = CryptSIPCreateIndirectData_p(&subjinfo, NULL, NULL); ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - file = create_temp_file(temp_file); if (file == INVALID_HANDLE_VALUE) { Modified: trunk/rostests/winetests/wintrust/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/testli… ============================================================================== --- trunk/rostests/winetests/wintrust/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/testlist.c [iso-8859-1] Sat Sep 28 15:28:59 2013 @@ -1,10 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_asn(void); extern void func_crypt(void);

1 0

[akhaldi] 60430: [WINTRUST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:28:15 2013 New Revision: 60430 URL: http://svn.reactos.org/svn/reactos?rev=60430&view=rev Log: [WINTRUST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt trunk/reactos/dll/win32/wintrust/asn.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wintrust/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:28:15 2013 @@ -1,7 +1,6 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(wintrust.dll wintrust.spec ADD_IMPORTLIB) list(APPEND SOURCE @@ -10,16 +9,14 @@ register.c softpub.c wintrust_main.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/wintrust_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/wintrust.def) -add_library(wintrust SHARED ${SOURCE}) +add_library(wintrust SHARED ${SOURCE} version.rc) set_module_type(wintrust win32dll) target_link_libraries(wintrust wine ${PSEH_LIB}) -# FIXME: imagehlp should be delay-imported. See bug 7171 +# FIXME: imagehlp should be delay-imported. See CORE-6504 #add_delay_importlibs(wintrust cryptui imagehlp) add_delay_importlibs(wintrust cryptui) add_importlibs(wintrust imagehlp crypt32 user32 advapi32 msvcrt kernel32 ntdll) - add_cd_file(TARGET wintrust DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/asn.c?r… ============================================================================== --- trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/asn.c [iso-8859-1] Sat Sep 28 15:28:15 2013 @@ -2342,7 +2342,7 @@ else { *pcbStructInfo = sizeof(BOOL); - *(BOOL *)pvStructInfo = pbEncoded[2] ? TRUE : FALSE; + *(BOOL *)pvStructInfo = pbEncoded[2] != 0; ret = TRUE; } TRACE("returning %d (%08x)\n", ret, GetLastError()); 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] Sat Sep 28 15:28:15 2013 @@ -207,7 +207,7 @@ reactos/dll/win32/winmm # Forked at Wine-20050628 reactos/dll/win32/winmm/midimap # Forked at Wine-20050628 reactos/dll/win32/winmm/wavemap # Forked at Wine-20050628 -reactos/dll/win32/wintrust # Synced to Wine-1.5.4 +reactos/dll/win32/wintrust # Synced to Wine-1.7.1 reactos/dll/win32/wldap32 # Autosync reactos/dll/win32/wmi # Synced to Wine-1.5.19 reactos/dll/win32/wtsapi32 # Synced to Wine-1.5.4

1 0

[akhaldi] 60429: [WININET_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:27:08 2013 New Revision: 60429 URL: http://svn.reactos.org/svn/reactos?rev=60429&view=rev Log: [WININET_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/wininet/CMakeLists.txt trunk/rostests/winetests/wininet/generated.c trunk/rostests/winetests/wininet/http.c trunk/rostests/winetests/wininet/testlist.c trunk/rostests/winetests/wininet/url.c trunk/rostests/winetests/wininet/urlcache.c Modified: trunk/rostests/winetests/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/CMakeLi… ============================================================================== --- trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -1,7 +1,3 @@ - -remove_definitions(-DWINVER=0x502 -D_WIN32_IE=0x600 -D_WIN32_WINNT=0x502) - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE ftp.c @@ -13,7 +9,6 @@ testlist.c) add_executable(wininet_winetest ${SOURCE}) -target_link_libraries(wininet_winetest wine) set_module_type(wininet_winetest win32cui) -add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32 ntdll) +add_importlibs(wininet_winetest wininet crypt32 ws2_32 user32 advapi32 msvcrt kernel32) add_cd_file(TARGET wininet_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/wininet/generated.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/generat… ============================================================================== --- trunk/rostests/winetests/wininet/generated.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/generated.c [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -5,9 +5,11 @@ * Unit tests for data structure packing */ +#ifndef __REACTOS__ #define WINVER 0x0501 #define _WIN32_IE 0x0501 #define _WIN32_WINNT 0x0501 +#endif #define WINE_NOWINSOCK Modified: trunk/rostests/winetests/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/http.c?… ============================================================================== --- trunk/rostests/winetests/wininet/http.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/http.c [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -193,8 +193,9 @@ return proxy_enable != 0; } -#define test_status_code(a,b) _test_status_code(__LINE__,a,b) -static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) +#define test_status_code(a,b) _test_status_code(__LINE__,a,b, FALSE) +#define test_status_code_todo(a,b) _test_status_code(__LINE__,a,b, TRUE) +static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL is_todo) { DWORD code, size, index; char exbuf[10], bufa[10]; @@ -205,7 +206,10 @@ size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); ok_(__FILE__,line)(res, "[1] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + if (is_todo) + todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + else + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); code = 0xdeadbeef; @@ -213,8 +217,10 @@ size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + if (is_todo) + todo_wine ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + else + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode); @@ -222,7 +228,10 @@ size = sizeof(bufa); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); ok_(__FILE__,line)(res, "[3] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); + if (is_todo) + todo_wine ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); + else + ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf), "unexpected size %d for \"%s\"\n", size, exbuf); size = 0; @@ -234,7 +243,10 @@ size = sizeof(bufw); res = HttpQueryInfoW(req, HTTP_QUERY_STATUS_CODE, bufw, &size, NULL); ok_(__FILE__,line)(res, "[5] HttpQueryInfoW(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); - ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); + if (is_todo) + todo_wine ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); + else + ok_(__FILE__,line)(!strcmp_wa(bufw, exbuf), "unexpected status code %s, expected %s\n", bufa, exbuf); ok_(__FILE__,line)(size == strlen(exbuf)*sizeof(WCHAR), "unexpected size %d for \"%s\"\n", size, exbuf); size = 0; @@ -618,7 +630,7 @@ res = InternetQueryOptionA(hor,INTERNET_OPTION_URL,buffer,&length); ok(res, "InternetQueryOptionA(INTERNET_OPTION_URL) failed with error %d\n", GetLastError()); - length = sizeof(buffer); + length = sizeof(buffer)-1; res = HttpQueryInfoA(hor,HTTP_QUERY_RAW_HEADERS,buffer,&length,0x0); ok(res, "HttpQueryInfoA(HTTP_QUERY_RAW_HEADERS) failed with error %d\n", GetLastError()); buffer[length]=0; @@ -1752,6 +1764,27 @@ ok(index == 1, "Index was not incremented\n"); ok(strcmp(buffer,"value3")==0, "incorrect string was returned(%s)\n",buffer); + ok(HttpAddRequestHeaders(hRequest, "Authorization: Basic\r\n", -1, HTTP_ADDREQ_FLAG_ADD), + "unable to add header %u\n", GetLastError()); + + index = 0; + buffer[0] = 0; + len = sizeof(buffer); + ok(HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "unable to query header %u\n", GetLastError()); + ok(index == 1, "index was not incremented\n"); + ok(!strcmp(buffer, "Basic"), "incorrect string was returned (%s)\n", buffer); + + ok(HttpAddRequestHeaders(hRequest, "Authorization:\r\n", -1, HTTP_ADDREQ_FLAG_REPLACE), + "unable to remove header %u\n", GetLastError()); + + index = 0; + len = sizeof(buffer); + SetLastError(0xdeadbeef); + ok(!HttpQueryInfo(hRequest, HTTP_QUERY_AUTHORIZATION|HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &len, &index), + "header still present\n"); + ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "got %u\n", GetLastError()); + ok(InternetCloseHandle(hRequest), "Close request handle failed\n"); done: ok(InternetCloseHandle(hConnect), "Close connect handle failed\n"); @@ -1815,15 +1848,30 @@ "<BODY>The quick brown fox jumped over the lazy dog<P></BODY>\r\n" "</HTML>\r\n\r\n"; +static const char ok_with_length[] = +"HTTP/1.1 200 OK\r\n" +"Connection: Keep-Alive\r\n" +"Content-Length: 23\r\n\r\n" +"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; + +static const char ok_with_length2[] = +"HTTP/1.1 210 OK\r\n" +"Connection: Keep-Alive\r\n" +"Content-Length: 24\r\n\r\n" +"abc\r\nHTTP/1.1 211 OK\r\n\r\n"; + struct server_info { HANDLE hEvent; int port; }; +static int test_cache_gzip; +static const char *send_buffer; + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; - int r, c, i, on; + int r, c, i, on, count = 0; SOCKET s; struct sockaddr_in sa; char buffer[0x100]; @@ -1831,6 +1879,7 @@ int last_request = 0; char host_header[22]; static int test_b = 0; + static int test_no_cache = 0; WSAStartup(MAKEWORD(1,1), &wsaData); @@ -2008,6 +2057,21 @@ { send(c, page1, sizeof page1-1, 0); } + + if (strstr(buffer, "GET /testJ")) + { + if (count == 0) + { + count++; + send(c, ok_with_length, sizeof(ok_with_length)-1, 0); + } + else + { + send(c, ok_with_length2, sizeof(ok_with_length2)-1, 0); + count = 0; + } + } + if (strstr(buffer, "GET /test_no_content")) { static const char nocontentmsg[] = "HTTP/1.1 204 No Content\r\nConnection: close\r\n\r\n"; @@ -2023,13 +2087,37 @@ if (strstr(buffer, "GET /test_cache_control_no_cache")) { static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: no-cache\r\n\r\nsome content"; - send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + if(!test_no_cache++) + send(c, no_cache_response, sizeof(no_cache_response)-1, 0); + else + send(c, okmsg, sizeof(okmsg)-1, 0); } if (strstr(buffer, "GET /test_cache_control_no_store")) { - static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: No-StOrE\r\n\r\nsome content"; + static const char no_cache_response[] = "HTTP/1.1 200 OK\r\nCache-Control: junk, \t No-StOrE\r\n\r\nsome content"; send(c, no_cache_response, sizeof(no_cache_response)-1, 0); } + if (strstr(buffer, "GET /test_cache_gzip")) + { + static const char gzip_response[] = "HTTP/1.1 200 OK\r\nContent-Encoding: gzip\r\nContent-Type: text/html\r\n\r\n" + "\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\x03\x4b\xaf\xca\x2c\x50\x28" + "\x49\x2d\x2e\xe1\x02\x00\x62\x92\xc7\x6c\x0a\x00\x00\x00"; + if(!test_cache_gzip++) + send(c, gzip_response, sizeof(gzip_response), 0); + else + send(c, notokmsg, sizeof(notokmsg)-1, 0); + } + if (strstr(buffer, "GET /send_from_buffer")) + send(c, send_buffer, strlen(send_buffer), 0); + if (strstr(buffer, "/test_cache_control_verb")) + { + if (!memcmp(buffer, "GET ", sizeof("GET ")-1) && + !strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); + else if (strstr(buffer, "Cache-Control: no-cache\r\n")) send(c, okmsg, sizeof(okmsg)-1, 0); + send(c, notokmsg, sizeof(notokmsg)-1, 0); + } + if (strstr(buffer, "GET /test_premature_disconnect")) + trace("closing connection\n"); shutdown(c, 2); closesocket(c); @@ -2113,7 +2201,7 @@ ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); @@ -2157,46 +2245,347 @@ static void test_proxy_direct(int port) { HINTERNET hi, hc, hr; - DWORD r, sz; - char buffer[0x40]; + DWORD r, sz, error; + char buffer[0x40], *url; + WCHAR bufferW[0x40]; static CHAR username[] = "mike", - password[] = "1101"; + password[] = "1101", + useragent[] = "winetest", + url_fmt[] = "http://test.winehq.org:%u/test2"; + static WCHAR usernameW[] = {'m','i','k','e',0}, + passwordW[] = {'1','1','0','1',0}, + useragentW[] = {'w','i','n','e','t','e','s','t',0}; + + /* specify proxy type without the proxy and bypass */ + SetLastError(0xdeadbeef); + hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, NULL, NULL, 0); + error = GetLastError(); + ok(error == ERROR_INVALID_PARAMETER || + broken(error == ERROR_SUCCESS) /* WinXPProSP2 */, "got %u\n", error); + ok(hi == NULL || broken(!!hi) /* WinXPProSP2 */, "open should have failed\n"); sprintf(buffer, "localhost:%d\n", port); hi = InternetOpen(NULL, INTERNET_OPEN_TYPE_PROXY, buffer, NULL, 0); ok(hi != NULL, "open failed\n"); /* try connect without authorization */ - hc = InternetConnect(hi, "test.winehq.org/", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + hc = InternetConnect(hi, "test.winehq.org", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(hc != NULL, "connect failed\n"); hr = HttpOpenRequest(hc, NULL, "/test2", NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 1, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(!sz, "got %u\n", sz); + + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, NULL, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == 34, "got %u\n", sz); + + sz = sizeof(buffer); + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, buffer, &sz); + ok(r, "unexpected failure %u\n", GetLastError()); + ok(sz == 33, "got %u\n", sz); + r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + ok(r || broken(!r), "HttpSendRequest failed %u\n", GetLastError()); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } test_status_code(hr, 407); /* set the user + password then try again */ - todo_wine { + r = InternetSetOption(hi, INTERNET_OPTION_PROXY_USERNAME, username, 4); + ok(!r, "unexpected success\n"); + + r = InternetSetOption(hc, INTERNET_OPTION_PROXY_USERNAME, username, 4); + ok(r, "failed to set user\n"); + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_USERNAME, username, 4); ok(r, "failed to set user\n"); + buffer[0] = 0; + sz = 3; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(!r, "unexpected failure %u\n", GetLastError()); + ok(!buffer[0], "got %s\n", buffer); + ok(sz == strlen(username) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(username) + 1, "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PROXY_USERNAME, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (lstrlenW(usernameW) + 1) * sizeof(WCHAR), "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(r, "failed to get username\n"); + ok(!strcmp(buffer, username), "got %s\n", buffer); + ok(sz == strlen(username), "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PROXY_USERNAME, bufferW, &sz); + ok(r, "failed to get username\n"); + ok(!lstrcmpW(bufferW, usernameW), "wrong username\n"); + ok(sz == lstrlenW(usernameW), "got %u\n", sz); + + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_USERNAME, username, 1); + ok(r, "failed to set user\n"); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_USERNAME, buffer, &sz); + ok(r, "failed to get username\n"); + ok(!strcmp(buffer, username), "got %s\n", buffer); + ok(sz == strlen(username), "got %u\n", sz); + + r = InternetSetOption(hi, INTERNET_OPTION_USER_AGENT, useragent, 1); + ok(r, "failed to set useragent\n"); + + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hi, INTERNET_OPTION_USER_AGENT, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(useragent) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hi, INTERNET_OPTION_USER_AGENT, buffer, &sz); + ok(r, "failed to get user agent\n"); + ok(!strcmp(buffer, useragent), "got %s\n", buffer); + ok(sz == strlen(useragent), "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hi, INTERNET_OPTION_USER_AGENT, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (lstrlenW(useragentW) + 1) * sizeof(WCHAR), "got %u\n", sz); + + bufferW[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hi, INTERNET_OPTION_USER_AGENT, bufferW, &sz); + ok(r, "failed to get user agent\n"); + ok(!lstrcmpW(bufferW, useragentW), "wrong user agent\n"); + ok(sz == lstrlenW(useragentW), "got %u\n", sz); + + r = InternetSetOption(hr, INTERNET_OPTION_USERNAME, username, 1); + ok(r, "failed to set user\n"); + + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(username) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_USERNAME, buffer, &sz); + ok(r, "failed to get user\n"); + ok(!strcmp(buffer, username), "got %s\n", buffer); + ok(sz == strlen(username), "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hr, INTERNET_OPTION_USERNAME, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (lstrlenW(usernameW) + 1) * sizeof(WCHAR), "got %u\n", sz); + + bufferW[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hr, INTERNET_OPTION_USERNAME, bufferW, &sz); + ok(r, "failed to get user\n"); + ok(!lstrcmpW(bufferW, usernameW), "wrong user\n"); + ok(sz == lstrlenW(usernameW), "got %u\n", sz); + + r = InternetSetOption(hr, INTERNET_OPTION_PASSWORD, password, 1); + ok(r, "failed to set password\n"); + + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(password) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_PASSWORD, buffer, &sz); + ok(r, "failed to get password\n"); + ok(!strcmp(buffer, password), "got %s\n", buffer); + ok(sz == strlen(password), "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PASSWORD, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (lstrlenW(passwordW) + 1) * sizeof(WCHAR), "got %u\n", sz); + + bufferW[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PASSWORD, bufferW, &sz); + ok(r, "failed to get password\n"); + ok(!lstrcmpW(bufferW, passwordW), "wrong password\n"); + ok(sz == lstrlenW(passwordW), "got %u\n", sz); + + url = HeapAlloc(GetProcessHeap(), 0, strlen(url_fmt) + 11); + sprintf(url, url_fmt, port); + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(url) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_URL, buffer, &sz); + ok(r, "failed to get url\n"); + ok(!strcmp(buffer, url), "got %s\n", buffer); + ok(sz == strlen(url), "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hr, INTERNET_OPTION_URL, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (strlen(url) + 1) * sizeof(WCHAR), "got %u\n", sz); + + bufferW[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hr, INTERNET_OPTION_URL, bufferW, &sz); + ok(r, "failed to get url\n"); + ok(!strcmp_wa(bufferW, url), "wrong url\n"); + ok(sz == strlen(url), "got %u\n", sz); + HeapFree(GetProcessHeap(), 0, url); + r = InternetSetOption(hr, INTERNET_OPTION_PROXY_PASSWORD, password, 4); ok(r, "failed to set password\n"); - } + + buffer[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, buffer, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == strlen(password) + 1, "got %u\n", sz); + + buffer[0] = 0; + sz = sizeof(buffer); + r = InternetQueryOption(hr, INTERNET_OPTION_PROXY_PASSWORD, buffer, &sz); + ok(r, "failed to get password\n"); + ok(!strcmp(buffer, password), "got %s\n", buffer); + ok(sz == strlen(password), "got %u\n", sz); + + bufferW[0] = 0; + sz = 0; + SetLastError(0xdeadbeef); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PROXY_PASSWORD, bufferW, &sz); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %u\n", GetLastError()); + ok(!r, "unexpected success\n"); + ok(sz == (lstrlenW(passwordW) + 1) * sizeof(WCHAR), "got %u\n", sz); + + bufferW[0] = 0; + sz = sizeof(bufferW); + r = InternetQueryOptionW(hr, INTERNET_OPTION_PROXY_PASSWORD, bufferW, &sz); + ok(r, "failed to get password\n"); + ok(!lstrcmpW(bufferW, passwordW), "wrong password\n"); + ok(sz == lstrlenW(passwordW), "got %u\n", sz); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed\n"); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } + ok(r, "HttpSendRequest failed %u\n", GetLastError()); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); ok(r, "HttpQueryInfo failed\n"); - todo_wine { ok(!strcmp(buffer, "200"), "proxy code wrong\n"); - } - - + +done: InternetCloseHandle(hr); InternetCloseHandle(hc); InternetCloseHandle(hi); @@ -2350,6 +2739,129 @@ InternetCloseHandle(con); InternetCloseHandle(ses); } + +static void test_connection_closing(int port) +{ + HINTERNET session, connection, req; + DWORD res; + + hCompleteEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + + session = InternetOpenA("", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, INTERNET_FLAG_ASYNC); + ok(session != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + pInternetSetStatusCallbackA(session, callback); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + connection = InternetConnectA(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0x0, 0xdeadbeef); + ok(connection != NULL,"InternetConnect failed with error %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); + req = HttpOpenRequestA(connection, "GET", "/testJ", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0xdeadbeaf); + ok(req != NULL, "HttpOpenRequest failed: %u\n", GetLastError()); + CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code(req, 200); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + todo_wine CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code_todo(req, 210); + + SET_OPTIONAL(INTERNET_STATUS_COOKIE_SENT); + SET_OPTIONAL(INTERNET_STATUS_DETECTING_PROXY); + SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); + SET_EXPECT(INTERNET_STATUS_SENDING_REQUEST); + SET_WINE_ALLOW(INTERNET_STATUS_SENDING_REQUEST); + SET_EXPECT(INTERNET_STATUS_REQUEST_SENT); + SET_EXPECT(INTERNET_STATUS_RECEIVING_RESPONSE); + SET_EXPECT(INTERNET_STATUS_RESPONSE_RECEIVED); + SET_OPTIONAL(INTERNET_STATUS_CLOSING_CONNECTION); + SET_OPTIONAL(INTERNET_STATUS_CONNECTION_CLOSED); + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + res = HttpSendRequestA(req, NULL, 0, NULL, 0); + ok(!res && (GetLastError() == ERROR_IO_PENDING), + "Asynchronous HttpSendRequest NOT returning 0 with error ERROR_IO_PENDING\n"); + WaitForSingleObject(hCompleteEvent, INFINITE); + ok(req_error == ERROR_SUCCESS, "req_error = %u\n", req_error); + + CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); + CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); + todo_wine CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_SENT); + CHECK_NOTIFIED(INTERNET_STATUS_RECEIVING_RESPONSE); + CHECK_NOTIFIED(INTERNET_STATUS_RESPONSE_RECEIVED); + CLEAR_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + + test_status_code_todo(req, 200); + + SET_WINE_ALLOW(INTERNET_STATUS_CLOSING_CONNECTION); + SET_WINE_ALLOW(INTERNET_STATUS_CONNECTION_CLOSED); + + close_async_handle(session, hCompleteEvent, 2); + CloseHandle(hCompleteEvent); +} + static void test_no_content(int port) { @@ -2526,8 +3038,17 @@ ok(size == 12, "read %d bytes of data\n", size); InternetCloseHandle(req); - ret = DeleteUrlCacheEntry(cache_url); - ok(!ret && GetLastError()==ERROR_FILE_NOT_FOUND, "cache entry should not exist\n"); + req = HttpOpenRequest(con, NULL, cache_control_no_cache, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf, sizeof(buf), &read) && read) + size += read; + ok(size == 0, "read %d bytes of data\n", size); + InternetCloseHandle(req); + DeleteUrlCacheEntry(cache_url); req = HttpOpenRequest(con, NULL, cache_control_no_store, NULL, NULL, NULL, 0, 0); ok(req != NULL, "HttpOpenRequest failed\n"); @@ -2550,6 +3071,133 @@ InternetCloseHandle(ses); } +static void test_cache_read_gzipped(int port) +{ + static const char cache_url_fmt[] = "http://localhost:%d%s"; + static const char get_gzip[] = "/test_cache_gzip"; + static const char content[] = "gzip test\n"; + static const char text_html[] = "text/html"; + static const char raw_header[] = "HTTP/1.1 200 OK\r\nContent-Type: text/html\r\n\r\n"; + + HINTERNET ses, con, req; + DWORD read, size; + char cache_url[256], buf[256]; + BOOL ret; + + trace("Testing reading compressed content from cache\n"); + + ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL,"InternetOpen failed with error %u\n", GetLastError()); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed with error %u\n", GetLastError()); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + if(!ret && GetLastError()==ERROR_INTERNET_INVALID_OPTION) { + win_skip("INTERNET_OPTION_HTTP_DECODING not supported\n"); + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + return; + } + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-size, &read) && read) + size += read; + ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + + size = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_RAW_HEADERS_CRLF, buf, &size, 0); + ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + ok(!strncmp(raw_header, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) + size += read; + todo_wine ok(size == 10, "read %d bytes of data\n", size); + buf[size] = 0; + ok(!strncmp(buf, content, size), "incorrect page content: %s\n", buf); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + ok(!ret && GetLastError()==ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) returned %d, %d\n", + ret, GetLastError()); + + size = sizeof(buf)-1; + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_TYPE, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_TYPE) failed: %d\n", GetLastError()); + buf[size] = 0; + todo_wine ok(!strncmp(text_html, buf, size), "buf = %s\n", buf); + InternetCloseHandle(req); + + /* Decompression doesn't work while reading from cache */ + test_cache_gzip = 0; + sprintf(cache_url, cache_url_fmt, port, get_gzip); + DeleteUrlCacheEntry(cache_url); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) + size += read; + ok(size == 31, "read %d bytes of data\n", size); + InternetCloseHandle(req); + + req = HttpOpenRequest(con, NULL, get_gzip, NULL, NULL, NULL, INTERNET_FLAG_FROM_CACHE, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + ret = TRUE; + ret = InternetSetOption(req, INTERNET_OPTION_HTTP_DECODING, &ret, sizeof(ret)); + ok(ret, "InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %d\n", GetLastError()); + + ret = HttpSendRequest(req, "Accept-Encoding: gzip", -1, NULL, 0); + ok(ret, "HttpSendRequest failed with error %u\n", GetLastError()); + size = 0; + while(InternetReadFile(req, buf+size, sizeof(buf)-1-size, &read) && read) + size += read; + todo_wine ok(size == 31, "read %d bytes of data\n", size); + + size = sizeof(buf); + ret = HttpQueryInfoA(req, HTTP_QUERY_CONTENT_ENCODING, buf, &size, 0); + todo_wine ok(ret, "HttpQueryInfo(HTTP_QUERY_CONTENT_ENCODING) failed: %d\n", GetLastError()); + InternetCloseHandle(req); + + InternetCloseHandle(con); + InternetCloseHandle(ses); + + DeleteUrlCacheEntry(cache_url); +} + static void test_HttpSendRequestW(int port) { static const WCHAR header[] = {'U','A','-','C','P','U',':',' ','x','8','6',0}; @@ -2656,6 +3304,32 @@ InternetCloseHandle(session); } +static void test_premature_disconnect(int port) +{ + HINTERNET session, connect, request; + DWORD err; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, NULL, "/premature_disconnect", NULL, NULL, NULL, INTERNET_FLAG_KEEP_CONNECTION, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + + SetLastError(0xdeadbeef); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + err = GetLastError(); + todo_wine ok(!ret, "HttpSendRequest succeeded\n"); + todo_wine ok(err == ERROR_HTTP_INVALID_SERVER_RESPONSE, "got %u\n", err); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); +} + static void test_invalid_response_headers(int port) { HINTERNET session, connect, request; @@ -2775,6 +3449,10 @@ hr = HttpOpenRequest(hc, NULL, "/testD", NULL, NULL, NULL, 0, 0); ok(hr != NULL, "HttpOpenRequest failed\n"); + size = sizeof(buffer); + ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &size, &index); + ok(!ret && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo failed %u\n", GetLastError()); + ret = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); @@ -2863,6 +3541,7 @@ static void test_options(int port) { + INTERNET_DIAGNOSTIC_SOCKET_INFO idsi; HINTERNET ses, con, req; DWORD size, error; DWORD_PTR ctx; @@ -2963,6 +3642,17 @@ ok(ret, "InternetQueryOption failed %u\n", GetLastError()); ok(ctx == 3, "expected 3 got %lu\n", ctx); + size = sizeof(idsi); + ret = InternetQueryOption(req, INTERNET_OPTION_DIAGNOSTIC_SOCKET_INFO, &idsi, &size); + ok(ret, "InternetQueryOption failed %u\n", GetLastError()); + + size = 0; + SetLastError(0xdeadbeef); + ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); + error = GetLastError(); + ok(!ret, "InternetQueryOption succeeded\n"); + ok(error == ERROR_INTERNET_INVALID_OPERATION, "expected ERROR_INTERNET_INVALID_OPERATION, got %u\n", error); + /* INTERNET_OPTION_PROXY */ SetLastError(0xdeadbeef); ret = InternetQueryOptionA(ses, INTERNET_OPTION_PROXY, NULL, NULL); @@ -2987,6 +3677,124 @@ InternetCloseHandle(req); InternetCloseHandle(con); InternetCloseHandle(ses); +} + +typedef struct { + const char *response_text; + int status_code; + const char *status_text; + const char *raw_headers; +} http_status_test_t; + +static const http_status_test_t http_status_tests[] = { + { + "HTTP/1.1 200 OK\r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "OK" + }, + { + "HTTP/1.1 404 Fail\r\n" + "Content-Length: 1\r\n" + "\r\nx", + 404, + "Fail" + }, + { + "HTTP/1.1 200\r\n" + "Content-Length: 1\r\n" + "\r\nx", + 200, + "" + }, + { + "HTTP/1.1 410 \r\n" + "Content-Length: 1\r\n" + "\r\nx", + 410, + "" + } +}; + +static void test_http_status(int port) +{ + HINTERNET ses, con, req; + char buf[1000]; + DWORD i, size; + BOOL res; + + for(i=0; i < sizeof(http_status_tests)/sizeof(*http_status_tests); i++) { + send_buffer = http_status_tests[i].response_text; + + ses = InternetOpen(NULL, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(ses != NULL, "InternetOpen failed\n"); + + con = InternetConnect(ses, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(con != NULL, "InternetConnect failed\n"); + + req = HttpOpenRequest(con, NULL, "/send_from_buffer", NULL, NULL, NULL, 0, 0); + ok(req != NULL, "HttpOpenRequest failed\n"); + + res = HttpSendRequest(req, NULL, 0, NULL, 0); + ok(res, "HttpSendRequest failed\n"); + + test_status_code(req, http_status_tests[i].status_code); + + size = sizeof(buf); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_TEXT, buf, &size, NULL); + ok(res, "HttpQueryInfo failed: %u\n", GetLastError()); + ok(!strcmp(buf, http_status_tests[i].status_text), "[%u] Unexpected status text \"%s\", expected \"%s\"\n", + i, buf, http_status_tests[i].status_text); + + InternetCloseHandle(req); + InternetCloseHandle(con); + InternetCloseHandle(ses); + } +} + +static void test_cache_control_verb(int port) +{ + HINTERNET session, connect, request; + BOOL ret; + + session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + ok(session != NULL, "InternetOpen failed\n"); + + connect = InternetConnect(session, "localhost", port, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); + ok(connect != NULL, "InternetConnect failed\n"); + + request = HttpOpenRequest(connect, "RPC_OUT_DATA", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "POST", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "HEAD", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + request = HttpOpenRequest(connect, "GET", "/test_cache_control_verb", NULL, NULL, NULL, + INTERNET_FLAG_NO_CACHE_WRITE, 0); + ok(request != NULL, "HttpOpenRequest failed\n"); + ret = HttpSendRequest(request, NULL, 0, NULL, 0); + ok(ret, "HttpSendRequest failed %u\n", GetLastError()); + test_status_code(request, 200); + + InternetCloseHandle(request); + InternetCloseHandle(connect); + InternetCloseHandle(session); } static void test_http_connection(void) @@ -3028,6 +3836,11 @@ test_no_content(si.port); test_conn_close(si.port); test_no_cache(si.port); + test_cache_read_gzipped(si.port); + test_http_status(si.port); + test_premature_disconnect(si.port); + test_connection_closing(si.port); + test_cache_control_verb(si.port); /* send the basic request again to shutdown the server thread */ test_basic_request(si.port, "GET", "/quit"); @@ -3046,26 +3859,43 @@ LocalFree(info->lpszEncryptionAlgName); } -static void test_cert_struct(HINTERNET req) +typedef struct { + const char *ex_subject; + const char *ex_issuer; +} cert_struct_test_t; + +static const cert_struct_test_t test_winehq_org_cert = { + "0mJuv1t-1CFypQkyTZwfvjHHBAbnUndG\r\n" + "GT98380011\r\n" + "See www.rapidssl.com/resources/cps (c)13\r\n" + "Domain Control Validated - RapidSSL(R)\r\n" + "*.winehq.org", + + "US\r\n" + "\"GeoTrust, Inc.\"\r\n" + "RapidSSL CA" +}; + +static const cert_struct_test_t test_winehq_com_cert = { + "US\r\n" + "Minnesota\r\n" + "Saint Paul\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org", + + "US\r\n" + "Minnesota\r\n" + "WineHQ\r\n" + "test.winehq.com\r\n" + "webmaster(a)winehq.org" +}; + +static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) { INTERNET_CERTIFICATE_INFOA info; DWORD size; BOOL res; - - static const char ex_subject[] = - "US\r\n" - "Minnesota\r\n" - "Saint Paul\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; - - static const char ex_issuer[] = - "US\r\n" - "Minnesota\r\n" - "WineHQ\r\n" - "test.winehq.org\r\n" - "webmaster(a)winehq.org"; memset(&info, 0x5, sizeof(info)); @@ -3074,12 +3904,11 @@ ok(res, "InternetQueryOption failed: %u\n", GetLastError()); ok(size == sizeof(info), "size = %u\n", size); - ok(!strcmp(info.lpszSubjectInfo, ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); - ok(!strcmp(info.lpszIssuerInfo, ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); + ok(!strcmp(info.lpszSubjectInfo, test->ex_subject), "lpszSubjectInfo = %s\n", info.lpszSubjectInfo); + ok(!strcmp(info.lpszIssuerInfo, test->ex_issuer), "lpszIssuerInfo = %s\n", info.lpszIssuerInfo); ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); - todo_wine ok(info.dwKeySize == 128, "dwKeySize = %u\n", info.dwKeySize); release_cert_info(&info); @@ -3159,7 +3988,7 @@ pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3183,7 +4012,7 @@ } test_secflags_option(req, 0); - test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION); @@ -3216,8 +4045,8 @@ WaitForSingleObject(hCompleteEvent, INFINITE); ok(req_error == ERROR_SUCCESS, "req_error = %d\n", req_error); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); - todo_wine CHECK_NOT_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); + CHECK_NOTIFIED(INTERNET_STATUS_RESOLVING_NAME); + CHECK_NOTIFIED(INTERNET_STATUS_NAME_RESOLVED); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_SENDING_REQUEST); @@ -3275,7 +4104,7 @@ CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { - win_skip("Unexpected cert errors, skipping security flags tests\n"); + win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, hCompleteEvent, 3); CloseHandle(hCompleteEvent); @@ -3316,7 +4145,7 @@ test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|0x1800000); - test_security_info("https://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); test_secflags_option(req, 0x1800000|SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA @@ -3353,8 +4182,8 @@ test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION |SECURITY_FLAG_STRENGTH_STRONG|0x1800000); - test_cert_struct(req); - test_security_info("https://test.winehq.org/data/some_file.html?q", 0, 0x1800000); + test_cert_struct(req, &test_winehq_com_cert); + test_security_info("https://test.winehq.com/data/some_file.html?q", 0, 0x1800000); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -3374,7 +4203,7 @@ pInternetSetStatusCallbackA(ses, &callback); SET_EXPECT(INTERNET_STATUS_HANDLE_CREATED); - conn = InternetConnectA(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, + conn = InternetConnectA(ses, "test.winehq.com", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0xdeadbeef); ok(conn != NULL, "InternetConnect failed with error %u\n", GetLastError()); CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); @@ -3426,7 +4255,7 @@ CloseHandle(hCompleteEvent); - test_security_info("http://test.winehq.org/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); + test_security_info("http://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("file:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); test_security_info("xxx:///c:/dir/file.txt", ERROR_INTERNET_ITEM_NOT_FOUND, 0); } @@ -3434,9 +4263,9 @@ static void test_secure_connection(void) { static const WCHAR gizmo5[] = {'G','i','z','m','o','5',0}; - static const WCHAR testbot[] = {'t','e','s','t','b','o','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR testsite[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR get[] = {'G','E','T',0}; - static const WCHAR slash[] = {'/',0}; + static const WCHAR testpage[] = {'/','t','e','s','t','s','/','h','e','l','l','o','.','h','t','m','l',0}; HINTERNET ses, con, req; DWORD size, flags; INTERNET_CERTIFICATE_INFOA *certificate_structA = NULL; @@ -3446,12 +4275,12 @@ ses = InternetOpen("Gizmo5", INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnect(ses, "testbot.winehq.org", + con = InternetConnect(ses, "test.winehq.org", INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequest(con, "GET", "/", NULL, NULL, NULL, + req = HttpOpenRequest(con, "GET", "/tests/hello.html", NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); ok(req != NULL, "HttpOpenRequest failed\n"); @@ -3463,32 +4292,14 @@ ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); - ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, - NULL, &size); - ok(ret || GetLastError() == ERROR_INSUFFICIENT_BUFFER, "InternetQueryOption failed: %d\n", GetLastError()); - ok(size == sizeof(INTERNET_CERTIFICATE_INFOA), "size = %d\n", size); - certificate_structA = HeapAlloc(GetProcessHeap(), 0, size); - ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, - certificate_structA, &size); - ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - if (ret) + if (!winetest_interactive) { - ok(certificate_structA->lpszSubjectInfo && - strlen(certificate_structA->lpszSubjectInfo) > 1, - "expected a non-empty subject name\n"); - ok(certificate_structA->lpszIssuerInfo && - strlen(certificate_structA->lpszIssuerInfo) > 1, - "expected a non-empty issuer name\n"); - ok(!certificate_structA->lpszSignatureAlgName, - "unexpected signature algorithm name\n"); - ok(!certificate_structA->lpszEncryptionAlgName, - "unexpected encryption algorithm name\n"); - ok(!certificate_structA->lpszProtocolName, - "unexpected protocol name\n"); - ok(certificate_structA->dwKeySize, "expected a non-zero key size\n"); - release_cert_info(certificate_structA); - } - HeapFree(GetProcessHeap(), 0, certificate_structA); + skip("test_cert_struct(req, &test_winehq_org_cert), ROSTESTS-121\n"); + } + else + { + test_cert_struct(req, &test_winehq_org_cert); + } /* Querying the same option through InternetQueryOptionW still results in * ASCII strings being returned. @@ -3530,13 +4341,13 @@ ses = InternetOpenW(gizmo5, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); ok(ses != NULL, "InternetOpen failed\n"); - con = InternetConnectW(ses, testbot, + con = InternetConnectW(ses, testsite, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, 0, 0); ok(con != NULL, "InternetConnect failed\n"); - req = HttpOpenRequestW(con, get, slash, NULL, NULL, NULL, - INTERNET_FLAG_SECURE, 0); + req = HttpOpenRequestW(con, get, testpage, NULL, NULL, NULL, + INTERNET_FLAG_SECURE|INTERNET_FLAG_RELOAD, 0); ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequest(req, NULL, 0, NULL, 0); @@ -3545,7 +4356,7 @@ size = sizeof(flags); ret = InternetQueryOption(req, INTERNET_OPTION_SECURITY_FLAGS, &flags, &size); ok(ret, "InternetQueryOption failed: %d\n", GetLastError()); - ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set\n"); + ok(flags & SECURITY_FLAG_SECURE, "expected secure flag to be set, got %x\n", flags); ret = InternetQueryOptionA(req, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, NULL, &size); Modified: trunk/rostests/winetests/wininet/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/testlis… ============================================================================== --- trunk/rostests/winetests/wininet/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/testlist.c [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -1,7 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_ftp(void); extern void func_generated(void); Modified: trunk/rostests/winetests/wininet/url.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/url.c?r… ============================================================================== --- trunk/rostests/winetests/wininet/url.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/url.c [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -127,6 +127,9 @@ {"http://www.winehq.org/myscript.php;test=123", 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 22, -1, 0, "http", "www.winehq.org", "", "", "/myscript.php;test=123", ""}, + {"HtTp://www.winehq.org/scheme", + 0, 4, INTERNET_SCHEME_HTTP, 7, 14, 23, 80, -1, 0, -1, 0, 21, 7, -1, 0, + "HtTp", "www.winehq.org", "", "", "/scheme", ""}, {"file:///C:/Program%20Files/Atmel/AVR%20Tools/STK500/STK500.xml", 0, 4, INTERNET_SCHEME_FILE, -1, 0, -1, 0, -1, 0, -1, 0, 7, 55, -1, 0, "file", "", "", "", "C:\\Program Files\\Atmel\\AVR Tools\\STK500\\STK500.xml", ""}, Modified: trunk/rostests/winetests/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wininet/urlcach… ============================================================================== --- trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wininet/urlcache.c [iso-8859-1] Sat Sep 28 15:27:08 2013 @@ -28,6 +28,7 @@ #include <windef.h> #include <winbase.h> +#include <winnls.h> #include <wininet.h> #include <winineti.h> @@ -811,6 +812,164 @@ } } +static void test_urlcacheW(void) +{ + static struct test_data + { + DWORD err; + WCHAR url[128]; + char encoded_url[128]; + WCHAR extension[32]; + WCHAR header_info[128]; + }urls[] = { + { + 0, {'h','t','t','p',':','/','/','T','.','p','l','/','t',0}, + "http://T.pl/t", {0}, {0} + }, + { + 0, {'w','w','w','.','T','.','p','l','/','t',0}, + "www.T.pl/t", {0}, {0} + }, + { + 0, {'h','t','t','p',':','/','/','w','w','w','.','t','e','s','t',0x15b,0x107, + '.','o','r','g','/','t','e','s','t','.','h','t','m','l',0}, + "http://www.xn--test-ota71c.org/test.html", {'t','x','t',0}, {0} + }, + { + 0, {'w','w','w','.','T','e','s','t',0x15b,0x107,'.','o','r','g', + '/','t','e','s','t','.','h','t','m','l',0}, + "www.Test\xc5\x9b\xc4\x87.org/test.html", {'a',0x106,'a',0}, {'b',0x106,'b',0} + }, + { + 0, {'H','t','t','p','s',':','/','/',0x15b,0x15b,0x107,'/','t',0x107,'/', + 't','e','s','t','?','a','=','%','2','0',0x106,0}, + "Https://xn--4da1oa/t\xc4\x87/test?a=%20\xc4\x86", {'a',0x15b,'a',0}, {'b',0x15b,'b',0} + }, + { + 12005, {'h','t','t','p','s',':','/','/','/','/',0x107,'.','o','r','g','/','t','e','s','t',0}, + "", {0}, {0} + }, + { + 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','h','t','t','p', + ':','/','/','t',0x15b,0x107,'.','o','r','g','/',0}, + "Cookie: user@http://t\xc5\x9b\xc4\x87.org/", {0}, {0} + } + }; + static const FILETIME filetime_zero; + + WCHAR bufW[MAX_PATH]; + DWORD i; + BOOL ret; + + if(old_ie) { + win_skip("urlcache unicode functions\n"); + return; + } + + for(i=0; i<sizeof(urls)/sizeof(*urls); i++) { + INTERNET_CACHE_ENTRY_INFOA *entry_infoA; + INTERNET_CACHE_ENTRY_INFOW *entry_infoW; + DWORD size; + + SetLastError(0xdeadbeef); + ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); + if(urls[i].err != 0) { + ok(!ret, "%d) CreateUrlCacheEntryW succeeded\n", i); + ok(urls[i].err == GetLastError(), "%d) GetLastError() = %d\n", i, GetLastError()); + continue; + } + ok(ret, "%d) CreateUrlCacheEntryW failed: %d\n", i, GetLastError()); + + /* dwHeaderSize is ignored, pass 0 to prove it */ + ret = CommitUrlCacheEntryW(urls[i].url, bufW, filetime_zero, filetime_zero, + NORMAL_CACHE_ENTRY, urls[i].header_info, 0, urls[i].extension, NULL); + ok(ret, "%d) CommitUrlCacheEntryW failed: %d\n", i, GetLastError()); + + SetLastError(0xdeadbeef); + size = 0; + ret = GetUrlCacheEntryInfoW(urls[i].url, NULL, &size); + ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, + "%d) GetLastError() = %d\n", i, GetLastError()); + entry_infoW = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetUrlCacheEntryInfoW(urls[i].url, entry_infoW, &size); + ok(ret, "%d) GetUrlCacheEntryInfoW failed: %d\n", i, GetLastError()); + + ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); + ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, + "%d) GetLastError() = %d\n", i, GetLastError()); + if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) { + win_skip("ANSI version of url is incorrect\n"); + continue; + } + entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); + ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); + ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError()); + + ok(entry_infoW->dwStructSize == entry_infoA->dwStructSize, + "%d) entry_infoW->dwStructSize = %d, expected %d\n", + i, entry_infoW->dwStructSize, entry_infoA->dwStructSize); + ok(!lstrcmpW(urls[i].url, entry_infoW->lpszSourceUrlName), + "%d) entry_infoW->lpszSourceUrlName = %s\n", + i, wine_dbgstr_w(entry_infoW->lpszSourceUrlName)); + ok(!lstrcmpA(urls[i].encoded_url, entry_infoA->lpszSourceUrlName), + "%d) entry_infoA->lpszSourceUrlName = %s\n", + i, entry_infoA->lpszSourceUrlName); + ok(entry_infoW->CacheEntryType == entry_infoA->CacheEntryType, + "%d) entry_infoW->CacheEntryType = %x, expected %x\n", + i, entry_infoW->CacheEntryType, entry_infoA->CacheEntryType); + ok(entry_infoW->dwUseCount == entry_infoA->dwUseCount, + "%d) entry_infoW->dwUseCount = %d, expected %d\n", + i, entry_infoW->dwUseCount, entry_infoA->dwUseCount); + ok(entry_infoW->dwHitRate == entry_infoA->dwHitRate, + "%d) entry_infoW->dwHitRate = %d, expected %d\n", + i, entry_infoW->dwHitRate, entry_infoA->dwHitRate); + ok(entry_infoW->dwSizeLow == entry_infoA->dwSizeLow, + "%d) entry_infoW->dwSizeLow = %d, expected %d\n", + i, entry_infoW->dwSizeLow, entry_infoA->dwSizeLow); + ok(entry_infoW->dwSizeHigh == entry_infoA->dwSizeHigh, + "%d) entry_infoW->dwSizeHigh = %d, expected %d\n", + i, entry_infoW->dwSizeHigh, entry_infoA->dwSizeHigh); + ok(!memcmp(&entry_infoW->LastModifiedTime, &entry_infoA->LastModifiedTime, sizeof(FILETIME)), + "%d) entry_infoW->LastModifiedTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->ExpireTime, &entry_infoA->ExpireTime, sizeof(FILETIME)), + "%d) entry_infoW->ExpireTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->LastAccessTime, &entry_infoA->LastAccessTime, sizeof(FILETIME)), + "%d) entry_infoW->LastAccessTime is incorrect\n", i); + ok(!memcmp(&entry_infoW->LastSyncTime, &entry_infoA->LastSyncTime, sizeof(FILETIME)), + "%d) entry_infoW->LastSyncTime is incorrect\n", i); + + MultiByteToWideChar(CP_ACP, 0, entry_infoA->lpszLocalFileName, -1, bufW, MAX_PATH); + ok(!lstrcmpW(entry_infoW->lpszLocalFileName, bufW), + "%d) entry_infoW->lpszLocalFileName = %s, expected %s\n", + i, wine_dbgstr_w(entry_infoW->lpszLocalFileName), wine_dbgstr_w(bufW)); + + if(!urls[i].header_info[0]) { + ok(!entry_infoW->lpHeaderInfo, "entry_infoW->lpHeaderInfo != NULL\n"); + }else { + ok(!lstrcmpW((WCHAR*)entry_infoW->lpHeaderInfo, urls[i].header_info), + "%d) entry_infoW->lpHeaderInfo = %s\n", + i, wine_dbgstr_w((WCHAR*)entry_infoW->lpHeaderInfo)); + } + + if(!urls[i].extension[0]) { + ok(!entry_infoW->lpszFileExtension, "entry_infoW->lpszFileExtension != NULL\n"); + }else { + MultiByteToWideChar(CP_ACP, 0, entry_infoA->lpszFileExtension, -1, bufW, MAX_PATH); + ok(!lstrcmpW(entry_infoW->lpszFileExtension, bufW), + "%d) entry_infoW->lpszFileExtension = %s, expected %s\n", + i, wine_dbgstr_w(entry_infoW->lpszFileExtension), wine_dbgstr_w(bufW)); + } + + HeapFree(GetProcessHeap(), 0, entry_infoW); + HeapFree(GetProcessHeap(), 0, entry_infoA); + + if(pDeleteUrlCacheEntryA) { + ret = pDeleteUrlCacheEntryA(urls[i].encoded_url); + ok(ret, "%d) DeleteUrlCacheEntryW failed: %d\n", i, GetLastError()); + } + } +} + static void test_FindCloseUrlCache(void) { BOOL r; @@ -878,6 +1037,7 @@ pDeleteUrlCacheEntryA = (void*)GetProcAddress(hdll, "DeleteUrlCacheEntryA"); pUnlockUrlCacheEntryFileA = (void*)GetProcAddress(hdll, "UnlockUrlCacheEntryFileA"); test_urlcacheA(); + test_urlcacheW(); test_FindCloseUrlCache(); test_GetDiskInfoA(); }

1 0

[akhaldi] 60428: [WININET] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:25:41 2013 New Revision: 60428 URL: http://svn.reactos.org/svn/reactos?rev=60428&view=rev Log: [WININET] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/rsrc.rc trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/version.rc trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/CMakeLis… Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/rsrc.rc?… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/version.… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 60427: [WINHTTP_WINETEST] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 28 Sep '13

28 Sep '13

Author: akhaldi Date: Sat Sep 28 15:24:24 2013 New Revision: 60427 URL: http://svn.reactos.org/svn/reactos?rev=60427&view=rev Log: [WINHTTP_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/winhttp/CMakeLists.txt trunk/rostests/winetests/winhttp/winhttp.c Modified: trunk/rostests/winetests/winhttp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/CMakeLi… ============================================================================== --- trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/CMakeLists.txt [iso-8859-1] Sat Sep 28 15:24:24 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) list(APPEND SOURCE notification.c @@ -8,7 +6,7 @@ testlist.c) add_executable(winhttp_winetest ${SOURCE}) -target_link_libraries(winhttp_winetest wine uuid) +target_link_libraries(winhttp_winetest uuid) set_module_type(winhttp_winetest win32cui) -add_importlibs(winhttp_winetest winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 msvcrt kernel32 ntdll) +add_importlibs(winhttp_winetest winhttp oleaut32 ole32 crypt32 advapi32 ws2_32 msvcrt kernel32) add_cd_file(TARGET winhttp_winetest DESTINATION reactos/bin FOR all) Modified: trunk/rostests/winetests/winhttp/winhttp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winhttp/winhttp… ============================================================================== --- trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] (original) +++ trunk/rostests/winetests/winhttp/winhttp.c [iso-8859-1] Sat Sep 28 15:24:24 2013 @@ -794,6 +794,26 @@ } +static void CALLBACK cert_error(HINTERNET handle, DWORD_PTR ctx, DWORD status, LPVOID buf, DWORD len) +{ + DWORD flags = *(DWORD *)buf; + + if (!flags) + { + trace("WINHTTP_CALLBACK_STATUS_FLAG_SECURITY_CHANNEL_ERROR\n"); + return; + } +#define X(x) if (flags & x) trace("%s\n", #x); + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REV_FAILED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CERT) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_REVOKED) + X(WINHTTP_CALLBACK_STATUS_FLAG_INVALID_CA) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_CN_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_DATE_INVALID) + X(WINHTTP_CALLBACK_STATUS_FLAG_CERT_WRONG_USAGE) +#undef X +} + static void test_secure_connection(void) { static const WCHAR google[] = {'w','w','w','.','g','o','o','g','l','e','.','c','o','m',0}; @@ -838,6 +858,8 @@ req = WinHttpOpenRequest(con, NULL, NULL, NULL, NULL, NULL, WINHTTP_FLAG_SECURE); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + WinHttpSetStatusCallback(req, cert_error, WINHTTP_CALLBACK_STATUS_SECURE_FAILURE, 0); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); @@ -1864,7 +1886,7 @@ { HINTERNET ses, con, req; char buffer[0x100]; - DWORD count, status, size; + DWORD count, status, size, error, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1886,6 +1908,16 @@ ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 200, "request failed unexpectedly %u\n", status); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + error = GetLastError(); + ok(!ret, "unexpected success\n"); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); count = 0; memset(buffer, 0, sizeof(buffer)); @@ -1905,7 +1937,7 @@ static const WCHAR userW[] = {'u','s','e','r',0}; static const WCHAR passW[] = {'p','w','d',0}; HINTERNET ses, con, req; - DWORD status, size, error; + DWORD status, size, error, supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, 0, NULL, NULL, 0); @@ -1916,6 +1948,55 @@ req = WinHttpOpenRequest(con, NULL, authW, NULL, NULL, NULL, 0); ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + + supported = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + + supported = first = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, &first, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER || error == ERROR_INVALID_OPERATION, "got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + todo_wine ok(error == ERROR_INVALID_OPERATION, "expected ERROR_INVALID_OPERATION, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); + + supported = first = target = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpQueryAuthSchemes(NULL, &supported, &first, &target); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_HANDLE, "expected ERROR_INVALID_HANDLE, got %u\n", error); + ok(supported == 0xdeadbeef, "got %x\n", supported); + ok(first == 0xdeadbeef, "got %x\n", first); + ok(target == 0xdeadbeef, "got %x\n", target); ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); ok(ret, "failed to send request %u\n", GetLastError()); @@ -1927,6 +2008,34 @@ ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, &size, NULL); ok(ret, "failed to query status code %u\n", GetLastError()); ok(status == 401, "request failed unexpectedly %u\n", status); + + supported = first = target = 0xdeadbeef; + ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); + ok(ret, "failed to query authentication schemes %u\n", GetLastError()); + ok(supported == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", supported); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NTLM, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_PASSPORT, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_NEGOTIATE, NULL, NULL, NULL); + ok(ret, "failed to set credentials %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_DIGEST, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); + + SetLastError(0xdeadbeef); + ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, NULL, NULL, NULL); + error = GetLastError(); + ok(!ret, "expected failure\n"); + ok(error == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", error); SetLastError(0xdeadbeef); ret = WinHttpSetCredentials(req, WINHTTP_AUTH_TARGET_SERVER, WINHTTP_AUTH_SCHEME_BASIC, userW, NULL, NULL); @@ -2648,12 +2757,30 @@ ok( !ret, "expected failure\n" ); ok( error == ERROR_INVALID_PARAMETER, "got %u\n", error ); } - url = NULL; + url = (WCHAR *)0xdeadbeef; SetLastError(0xdeadbeef); ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DNS_A, &url ); error = GetLastError(); if (!ret) + { ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } + else + { + trace("%s\n", wine_dbgstr_w(url)); + GlobalFree( url ); + } + + url = (WCHAR *)0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpDetectAutoProxyConfigUrl( WINHTTP_AUTO_DETECT_TYPE_DHCP, &url ); + error = GetLastError(); + if (!ret) + { + ok( error == ERROR_WINHTTP_AUTODETECTION_FAILED, "got %u\n", error ); + ok( url == (WCHAR *)0xdeadbeef, "got %p\n", url ); + } else { trace("%s\n", wine_dbgstr_w(url)); @@ -2795,6 +2922,83 @@ GlobalFree( info.lpszProxyBypass ); } WinHttpCloseHandle( session ); +} + +static void test_chunked_read(void) +{ + static const WCHAR host[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR verb[] = {'/','t','e','s','t','c','h','u','n','k','e','d',0}; + static const WCHAR chunked[] = {'c','h','u','n','k','e','d',0}; + WCHAR header[32]; + DWORD len; + HINTERNET ses, con = NULL, req = NULL; + BOOL ret; + + trace( "starting chunked read test\n" ); + + ses = WinHttpOpen( test_useragent, 0, NULL, NULL, 0 ); + ok( ses != NULL, "WinHttpOpen failed with error %u\n", GetLastError() ); + if (!ses) goto done; + + con = WinHttpConnect( ses, host, 0, 0 ); + ok( con != NULL, "WinHttpConnect failed with error %u\n", GetLastError() ); + if (!con) goto done; + + req = WinHttpOpenRequest( con, NULL, verb, NULL, NULL, NULL, 0 ); + ok( req != NULL, "WinHttpOpenRequest failed with error %u\n", GetLastError() ); + if (!req) goto done; + + ret = WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 ); + ok( ret, "WinHttpSendRequest failed with error %u\n", GetLastError() ); + + ret = WinHttpReceiveResponse( req, NULL ); + ok( ret, "WinHttpReceiveResponse failed with error %u\n", GetLastError() ); + + header[0] = 0; + len = sizeof(header); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_TRANSFER_ENCODING, NULL, header, &len, 0 ); + ok( ret, "failed to get TRANSFER_ENCODING header (error %u)\n", GetLastError() ); + ok( !lstrcmpW( header, chunked ), "wrong transfer encoding %s\n", wine_dbgstr_w(header) ); + trace( "transfer encoding: %s\n", wine_dbgstr_w(header) ); + + header[0] = 0; + len = sizeof(header); + SetLastError( 0xdeadbeef ); + ret = WinHttpQueryHeaders( req, WINHTTP_QUERY_CONTENT_LENGTH, NULL, &header, &len, 0 ); + ok( !ret, "unexpected CONTENT_LENGTH header %s\n", wine_dbgstr_w(header) ); + ok( GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "wrong error %u\n", GetLastError() ); + + trace( "entering query loop\n" ); + for (;;) + { + len = 0xdeadbeef; + ret = WinHttpQueryDataAvailable( req, &len ); + ok( ret, "WinHttpQueryDataAvailable failed with error %u\n", GetLastError() ); + if (ret) ok( len != 0xdeadbeef, "WinHttpQueryDataAvailable return wrong length\n" ); + trace( "got %u available\n", len ); + if (len) + { + DWORD bytes_read; + char *buf = HeapAlloc( GetProcessHeap(), 0, len + 1 ); + + ret = WinHttpReadData( req, buf, len, &bytes_read ); + + buf[bytes_read] = 0; + trace( "WinHttpReadData -> %d %u\n", ret, bytes_read ); + ok( len == bytes_read, "only got %u of %u available\n", bytes_read, len ); + ok( buf[bytes_read - 1] == '\n', "received partial line '%s'\n", buf ); + + HeapFree( GetProcessHeap(), 0, buf ); + if (!bytes_read) break; + } + if (!len) break; + } + trace( "done\n" ); + +done: + if (req) WinHttpCloseHandle( req ); + if (con) WinHttpCloseHandle( con ); + if (ses) WinHttpCloseHandle( ses ); } START_TEST (winhttp) @@ -2822,6 +3026,7 @@ test_WinHttpDetectAutoProxyConfigUrl(); test_WinHttpGetIEProxyConfigForCurrentUser(); test_WinHttpGetProxyForUrl(); + test_chunked_read(); si.event = CreateEvent(NULL, 0, 0, NULL); si.port = 7532;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
56
Older →

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 September 2013