ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Code clean up.

This commit is contained in:
Jacek Caban 2010-01-24 21:39:30 +01:00 committed by Alexandre Julliard
parent e54062d6c7
commit cc169bc8ac
1 changed files with 71 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
dlls/mshtml/tests/htmllocation.c
View File

@ -22,10 +22,11 @@
#include <wine/test.h> #include <wine/test.h>
#include "mshtml.h" #include "mshtml.h"
#include "wininet.h"
struct location_test { struct location_test {
const char *name; const char *name;
const WCHAR *url; const char *url;
const char *href; const char *href;
const char *protocol; const char *protocol;
@ -37,75 +38,68 @@ struct location_test {
const char *hash; const char *hash;
}; };
static const WCHAR http_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','?','s','e','a','r','c','h','#','h','a','s','h',0}; static const struct location_test location_tests[] = {
static const struct location_test http_test = { {
"HTTP", "HTTP",
http_url, "http://www.winehq.org?search#hash",
"http://www.winehq.org/?search#hash", "http://www.winehq.org/?search#hash",
"http:", "http:",
"www.winehq.org:80", "www.winehq.org:80",
"www.winehq.org", "www.winehq.org",
"80", "80",
"", "",
"?search", "?search",
"#hash" "#hash"
}; },
{
static const WCHAR http_file_url[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e','?','s','e','a','r','c','h','#','h','a','s','h',0}; "HTTP with file",
static const struct location_test http_file_test = { "http://www.winehq.org/file?search#hash",
"HTTP with file", "http://www.winehq.org/file?search#hash",
http_file_url, "http:",
"http://www.winehq.org/file?search#hash", "www.winehq.org:80",
"http:", "www.winehq.org",
"www.winehq.org:80", "80",
"www.winehq.org", "file",
"80", "?search",
"file", "#hash"
"?search", },
"#hash" {
}; "FTP",
"ftp://ftp.winehq.org/",
static const WCHAR ftp_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/',0}; "ftp://ftp.winehq.org/",
static const struct location_test ftp_test = { "ftp:",
"FTP", "ftp.winehq.org:21",
ftp_url, "ftp.winehq.org",
"ftp://ftp.winehq.org/", "21",
"ftp:", "",
"ftp.winehq.org:21", NULL,
"ftp.winehq.org", NULL
"21", },
"", {
NULL, "FTP with file",
NULL "ftp://ftp.winehq.org/file",
}; "ftp://ftp.winehq.org/file",
"ftp:",
static const WCHAR ftp_file_url[] = {'f','t','p',':','/','/','f','t','p','.','w','i','n','e','h','q','.','o','r','g','/','f','i','l','e',0}; "ftp.winehq.org:21",
static const struct location_test ftp_file_test = { "ftp.winehq.org",
"FTP with file", "21",
ftp_file_url, "file",
"ftp://ftp.winehq.org/file", NULL,
"ftp:", NULL
"ftp.winehq.org:21", },
"ftp.winehq.org", {
"21", "FILE",
"file", "file://C:\\windows\\win.ini",
NULL, "file:///C:/windows/win.ini",
NULL "file:",
}; NULL,
NULL,
static const WCHAR file_url[] = {'f','i','l','e',':','/','/','C',':','\\','w','i','n','d','o','w','s','\\','w','i','n','.','i','n','i',0}; "",
static const struct location_test file_test = { "C:\\windows\\win.ini",
"FILE", NULL,
file_url, NULL
"file:///C:/windows/win.ini", }
"file:", };
NULL,
NULL,
"",
"C:\\windows\\win.ini",
NULL,
NULL
};
static int str_eq_wa(LPCWSTR strw, const char *stra) static int str_eq_wa(LPCWSTR strw, const char *stra)
{ {
@ -267,6 +261,7 @@ static void test_hash(IHTMLLocation *loc, const struct location_test *test)
static void perform_test(const struct location_test* test) static void perform_test(const struct location_test* test)
{ {
WCHAR url[INTERNET_MAX_URL_LENGTH];
HRESULT hres; HRESULT hres;
IBindCtx *bc; IBindCtx *bc;
IMoniker *url_mon; IMoniker *url_mon;
@ -280,7 +275,8 @@ static void perform_test(const struct location_test* test)
if(FAILED(hres)) if(FAILED(hres))
return; return;
hres = CreateURLMoniker(NULL, test->url, &url_mon); MultiByteToWideChar(CP_ACP, 0, test->url, -1, url, sizeof(url)/sizeof(WCHAR));
hres = CreateURLMoniker(NULL, url, &url_mon);
ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres); ok(hres == S_OK, "%s: CreateURLMoniker failed: 0x%08x\n", test->name, hres);
if(FAILED(hres)){ if(FAILED(hres)){
IBindCtx_Release(bc); IBindCtx_Release(bc);
@ -356,13 +352,12 @@ static void perform_test(const struct location_test* test)
START_TEST(htmllocation) START_TEST(htmllocation)
{ {
int i;
CoInitialize(NULL); CoInitialize(NULL);
perform_test(&http_test); for(i=0; i < sizeof(location_tests)/sizeof(*location_tests); i++)
perform_test(&http_file_test); perform_test(location_tests+i);
perform_test(&ftp_test);
perform_test(&ftp_file_test);
perform_test(&file_test);
CoUninitialize(); CoUninitialize();
} }