Paul Vriens : mshtml/tests: Fix test failures on Win9x/WinME.
Alexandre Julliard
julliard at winehq.org
Thu Sep 10 09:07:56 CDT 2009
Module: wine
Branch: master
Commit: 5e68c0718236d8bef4649d8735716d0525e7e8d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e68c0718236d8bef4649d8735716d0525e7e8d1
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Thu Sep 10 08:00:14 2009 +0200
mshtml/tests: Fix test failures on Win9x/WinME.
---
dlls/mshtml/tests/events.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c
index f78e56b..d0ddadb 100644
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
@@ -105,9 +105,9 @@ static const char *debugstr_guid(REFIID riid)
static int strcmp_wa(LPCWSTR strw, const char *stra)
{
- WCHAR buf[512];
- MultiByteToWideChar(CP_ACP, 0, stra, -1, buf, sizeof(buf)/sizeof(WCHAR));
- return lstrcmpW(strw, buf);
+ CHAR buf[512];
+ WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
+ return lstrcmpA(stra, buf);
}
static BSTR a2bstr(const char *str)
@@ -1357,12 +1357,10 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
BSTR state;
HRESULT hres;
- static const WCHAR completeW[] = {'c','o','m','p','l','e','t','e',0};
-
hres = IHTMLDocument2_get_readyState(notif_doc, &state);
ok(hres == S_OK, "get_readyState failed: %08x\n", hres);
- if(!lstrcmpW(state, completeW))
+ if(!strcmp_wa(state, "complete"))
doc_complete = TRUE;
SysFreeString(state);
@@ -1524,19 +1522,18 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
static HWND create_container_window(void)
{
- static const WCHAR wszHTMLDocumentTest[] =
- {'H','T','M','L','D','o','c','u','m','e','n','t','T','e','s','t',0};
- static WNDCLASSEXW wndclass = {
- sizeof(WNDCLASSEXW),
+ static const CHAR szHTMLDocumentTest[] = "HTMLDocumentTest";
+ static WNDCLASSEXA wndclass = {
+ sizeof(WNDCLASSEXA),
0,
wnd_proc,
0, 0, NULL, NULL, NULL, NULL, NULL,
- wszHTMLDocumentTest,
+ szHTMLDocumentTest,
NULL
};
- RegisterClassExW(&wndclass);
- return CreateWindowW(wszHTMLDocumentTest, wszHTMLDocumentTest,
+ RegisterClassExA(&wndclass);
+ return CreateWindowA(szHTMLDocumentTest, szHTMLDocumentTest,
WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT,
300, 300, NULL, NULL, NULL, NULL);
}
More information about the wine-cvs
mailing list