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

mshtml/tests: Fix timeouts on Win9x/WinMe by using more A-functions.

This commit is contained in:
Paul Vriens 2010-01-06 11:37:28 +01:00 committed by Alexandre Julliard
parent a2c41b72f8
commit 051fc3458c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/tests/script.c
View File

@ -2221,14 +2221,14 @@ static void test_simple_script(void)
static void run_js_script(const char *test_name) static void run_js_script(const char *test_name)
{ {
WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR url[INTERNET_MAX_URL_LENGTH];
char urlA[INTERNET_MAX_URL_LENGTH];
IPersistMoniker *persist; IPersistMoniker *persist;
IHTMLDocument2 *doc; IHTMLDocument2 *doc;
IMoniker *mon; IMoniker *mon;
WCHAR *ptr;
MSG msg; MSG msg;
HRESULT hres; HRESULT hres;
static const WCHAR resW[] = {'r','e','s',':','/','/'}; static const char res[] = "res://";
trace("running %s...\n", test_name); trace("running %s...\n", test_name);
@ -2239,12 +2239,11 @@ static void run_js_script(const char *test_name)
set_client_site(doc, TRUE); set_client_site(doc, TRUE);
do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink); do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
memcpy(url, resW, sizeof(resW)); lstrcpyA(urlA, res);
ptr = url + sizeof(resW)/sizeof(WCHAR); GetModuleFileNameA(NULL, urlA + lstrlenA(res), sizeof(urlA) - lstrlenA(res));
GetModuleFileNameW(NULL, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url)); lstrcatA(urlA, "/");
ptr += lstrlenW(ptr); lstrcatA(urlA, test_name);
*ptr++ = '/'; MultiByteToWideChar(CP_ACP, 0, urlA, -1, url, sizeof(url)/sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, test_name, -1, ptr, sizeof(url)/sizeof(WCHAR) - (ptr-url));
hres = CreateURLMoniker(NULL, url, &mon); hres = CreateURLMoniker(NULL, url, &mon);
ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres); ok(hres == S_OK, "CreateURLMoniker failed: %08x\n", hres);