Author: pschweitzer Date: Sat May 17 17:29:12 2008 New Revision: 33564
URL: http://svn.reactos.org/svn/reactos?rev=33564&view=rev Log: Forgot to commit urlmon.dll tests synced with Wine HEAD
Modified: trunk/rostests/winetests/urlmon/protocol.c trunk/rostests/winetests/urlmon/urlmon.rbuild
Modified: trunk/rostests/winetests/urlmon/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/protocol.... ============================================================================== --- trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/protocol.c [iso-8859-1] Sat May 17 17:29:12 2008 @@ -27,6 +27,7 @@ #include "winbase.h" #include "ole2.h" #include "urlmon.h" +#include "wininet.h"
#include "initguid.h"
@@ -1383,11 +1384,21 @@ CHECK_CALLED(ReportProgress_SENDINGREQUEST); CHECK_CALLED(ReportResult);
+ SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, NULL, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + + SET_EXPECT(GetBindInfo); + hres = IInternetProtocol_Start(protocol, emptyW, &protocol_sink, &bind_info, 0, 0); + ok(hres == E_INVALIDARG, "Start failed: %08x, expected E_INVALIDARG\n", hres); + CHECK_CALLED(GetBindInfo); + IInternetProtocol_Release(protocol); }
static void test_file_protocol(void) { - WCHAR buf[MAX_PATH]; + WCHAR buf[INTERNET_MAX_URL_LENGTH], file_name_buf[MAX_PATH]; DWORD size; ULONG len; HANDLE file; @@ -1429,15 +1440,17 @@ test_file_protocol_url(buf);
memcpy(buf, wszFile2, sizeof(wszFile2)); - len = sizeof(wszFile2)/sizeof(WCHAR)-1; - len += GetCurrentDirectoryW(sizeof(buf)/sizeof(WCHAR)-len, buf+len); - buf[len++] = '\'; - memcpy(buf+len, wszIndexHtml, sizeof(wszIndexHtml)); - - file_name = buf + sizeof(wszFile2)/sizeof(WCHAR)-1; + len = GetCurrentDirectoryW(sizeof(file_name_buf)/sizeof(WCHAR), file_name_buf); + file_name_buf[len++] = '\'; + memcpy(file_name_buf+len, wszIndexHtml, sizeof(wszIndexHtml)); + lstrcpyW(buf+sizeof(wszFile2)/sizeof(WCHAR)-1, file_name_buf); + file_name = file_name_buf; bindf = 0; test_file_protocol_url(buf); bindf = BINDF_FROMURLMON; + test_file_protocol_url(buf); + + buf[sizeof(wszFile2)/sizeof(WCHAR)] = '|'; test_file_protocol_url(buf);
memcpy(buf, wszFile3, sizeof(wszFile3));
Modified: trunk/rostests/winetests/urlmon/urlmon.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/urlmon.rb... ============================================================================== --- trunk/rostests/winetests/urlmon/urlmon.rbuild [iso-8859-1] (original) +++ trunk/rostests/winetests/urlmon/urlmon.rbuild [iso-8859-1] Sat May 17 17:29:12 2008 @@ -12,12 +12,12 @@ <file>url.c</file> <file>testlist.c</file> <library>wine</library> + <library>uuid</library> <library>urlmon</library> <library>ole32</library> <library>user32</library> <library>advapi32</library> <library>kernel32</library> - <library>uuid</library> <library>ntdll</library> </module> </group>