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

mshtml: Compile tests with __WINESRC__ define.

This commit is contained in:
Jacek Caban 2013-10-10 12:53:34 +02:00 committed by Alexandre Julliard
parent 33b92a8cf4
commit 5b52334f6d
8 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/mshtml/tests/Makefile.in
View File

@ -1,7 +1,5 @@
TESTDLL = mshtml.dll
IMPORTS = ole32 oleaut32 wininet user32 urlmon gdi32 advapi32
EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS
C_SRCS = \
activex.c \
dom.c \

10
dlls/mshtml/tests/activex.c
View File

@ -283,7 +283,7 @@ static LRESULT WINAPI plugin_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
}
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
static void create_plugin_window(HWND parent, const RECT *rect)
@ -2334,9 +2334,9 @@ static IHTMLDocument2 *create_doc(const char *str)
doc_load_string(doc, str);
do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
return doc;
@ -2591,7 +2591,7 @@ static void test_nooleobj_ax(void)
static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
static HWND create_container_window(void)
@ -2639,7 +2639,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
DWORD res;
if(!init) {
RegDeleteKey(HKEY_CLASSES_ROOT, key_name);
RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
return TRUE;
}

4
dlls/mshtml/tests/dom.c
View File

@ -7542,9 +7542,9 @@ static void run_domtest(const char *str, domtest_t test)
do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
test(doc);

10
dlls/mshtml/tests/events.c
View File

@ -1398,12 +1398,12 @@ static void pump_msgs(BOOL *b)
if(b) {
while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
}else {
while(!b && PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
}
}
@ -2722,9 +2722,9 @@ static void run_test(const char *str, testfunc_t test)
doc_load_string(doc, str);
do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
while(!doc_complete && GetMessageA(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageA(&msg);
}
hres = IHTMLDocument2_get_body(doc, &body);
@ -2751,7 +2751,7 @@ static void run_test(const char *str, testfunc_t test)
static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProcA(hwnd, msg, wParam, lParam);
}
static HWND create_container_window(void)

12
dlls/mshtml/tests/htmldoc.c
View File

@ -368,9 +368,9 @@ static void test_timer(DWORD flags)
if(flags & EXPECT_SETTITLE)
SET_EXPECT(Exec_SETTITLE);
while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) {
while(!*b && GetMessageA(&msg, doc_hwnd, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageA(&msg);
}
if(flags & EXPECT_UPDATEUI) {
@ -1243,7 +1243,7 @@ static HRESULT WINAPI Binding_Abort(IBinding *iface)
{
CHECK_EXPECT(Abort);
if(asynchronous_binding)
PeekMessage(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
PeekMessageA(NULL, container_hwnd, WM_CONTINUE_BINDING, WM_CONTINUE_BINDING, PM_REMOVE);
return S_OK;
}
@ -5225,7 +5225,7 @@ static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
continue_binding(callback);
}
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProcW(hwnd, msg, wParam, lParam);
}
static void test_doscroll(IUnknown *unk)
@ -5680,9 +5680,9 @@ static void test_download(DWORD flags)
}
expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */
while(!*b && GetMessage(&msg, NULL, 0, 0)) {
while(!*b && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageA(&msg);
}
if(flags & DWL_REFRESH) {

4
dlls/mshtml/tests/mshtml_test.h
View File

@ -24,10 +24,10 @@ static BOOL is_ie_hardened(void)
DWORD ie_harden, type, size;
ie_harden = 0;
if(RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap",
if(RegOpenKeyExA(HKEY_CURRENT_USER, "Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings\\ZoneMap",
0, KEY_QUERY_VALUE, &zone_map) == ERROR_SUCCESS) {
size = sizeof(DWORD);
if (RegQueryValueEx(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS ||
if (RegQueryValueExA(zone_map, "IEHarden", NULL, &type, (LPBYTE) &ie_harden, &size) != ERROR_SUCCESS ||
type != REG_DWORD) {
ie_harden = 0;
}

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

@ -201,7 +201,7 @@ static BOOL init_key(const char *key_name, const char *def_value, BOOL init)
DWORD res;
if(!init) {
RegDeleteKey(HKEY_CLASSES_ROOT, key_name);
RegDeleteKeyA(HKEY_CLASSES_ROOT, key_name);
return TRUE;
}
@ -1285,9 +1285,9 @@ static void load_doc(IHTMLDocument2 *doc, const char *str)
load_string(doc, str);
do_advise(doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
hres = IHTMLDocument2_get_body(doc, &body);
@ -2826,9 +2826,9 @@ static void run_js_script(const char *test_name)
SET_EXPECT(external_success);
while(!called_external_success && GetMessage(&msg, NULL, 0, 0)) {
while(!called_external_success && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
CHECK_CALLED(external_success);
@ -2873,7 +2873,7 @@ static BOOL register_script_engine(void)
static LRESULT WINAPI wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
return DefWindowProc(hwnd, msg, wParam, lParam);
return DefWindowProcA(hwnd, msg, wParam, lParam);
}
static HWND create_container_window(void)

4
dlls/mshtml/tests/style.c
View File

@ -2686,9 +2686,9 @@ static void run_test(const char *str, style_test_t test)
do_advise((IUnknown*)doc, &IID_IPropertyNotifySink, (IUnknown*)&PropertyNotifySink);
while(!doc_complete && GetMessage(&msg, NULL, 0, 0)) {
while(!doc_complete && GetMessageW(&msg, NULL, 0, 0)) {
TranslateMessage(&msg);
DispatchMessage(&msg);
DispatchMessageW(&msg);
}
test(doc);