Commit 5e68c071 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard

mshtml/tests: Fix test failures on Win9x/WinME.

parent 094b6688
...@@ -105,9 +105,9 @@ static const char *debugstr_guid(REFIID riid) ...@@ -105,9 +105,9 @@ static const char *debugstr_guid(REFIID riid)
static int strcmp_wa(LPCWSTR strw, const char *stra) static int strcmp_wa(LPCWSTR strw, const char *stra)
{ {
WCHAR buf[512]; CHAR buf[512];
MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR)); WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
return lstrcmpW(strw, buf); return lstrcmpA(stra, buf);
} }
static BSTR a2bstr(const char *str) static BSTR a2bstr(const char *str)
...@@ -1357,12 +1357,10 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D ...@@ -1357,12 +1357,10 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
BSTR state; BSTR state;
HRESULT hres; HRESULT hres;
static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0};
hres = IHTMLDocument2_get_readyState(notif_doc, &state); hres = IHTMLDocument2_get_readyState(notif_doc, &state);
ok(hres == S_OK, "get_readyState failed: %08x\n", hres); ok(hres == S_OK, "get_readyState failed: %08x\n", hres);
if(!lstrcmpW(state, completeW)) if(!strcmp_wa(state, "complete"))
doc_complete = TRUE; doc_complete = TRUE;
SysFreeString(state); SysFreeString(state);
...@@ -1524,19 +1522,18 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ...@@ -1524,19 +1522,18 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
static HWND create_container_window(void) static HWND create_container_window(void)
{ {
static const WCHAR wszHTMLDocumentTest[] = static const CHAR szHTMLDocumentTest[] = "HTMLDocumentTest";
{'H','T','M','L','D','o','c','u','m','e','n','t','T','e','s','t',0}; static WNDCLASSEXA wndclass = {
static WNDCLASSEXW wndclass = { sizeof(WNDCLASSEXA),
sizeof(WNDCLASSEXW),
0, 0,
wnd_proc, wnd_proc,
0, 0, NULL, NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL,
wszHTMLDocumentTest, szHTMLDocumentTest,
NULL NULL
}; };
RegisterClassExW(&wndclass); RegisterClassExA(&wndclass);
return CreateWindowW(wszHTMLDocumentTest, wszHTMLDocumentTest, return CreateWindowA(szHTMLDocumentTest, szHTMLDocumentTest,
WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
300, 300, NULL, NULL, NULL, NULL); 300, 300, NULL, NULL, NULL, NULL);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment