Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
5b52334f
Commit
5b52334f
authored
Oct 10, 2013
by
Jacek Caban
Committed by
Alexandre Julliard
Oct 10, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Compile tests with __WINESRC__ define.
parent
33b92a8c
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
28 additions
and
30 deletions
+28
-30
Makefile.in
dlls/mshtml/tests/Makefile.in
+0
-2
activex.c
dlls/mshtml/tests/activex.c
+5
-5
dom.c
dlls/mshtml/tests/dom.c
+2
-2
events.c
dlls/mshtml/tests/events.c
+5
-5
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+6
-6
mshtml_test.h
dlls/mshtml/tests/mshtml_test.h
+2
-2
script.c
dlls/mshtml/tests/script.c
+6
-6
style.c
dlls/mshtml/tests/style.c
+2
-2
No files found.
dlls/mshtml/tests/Makefile.in
View file @
5b52334f
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
\
...
...
dlls/mshtml/tests/activex.c
View file @
5b52334f
...
...
@@ -283,7 +283,7 @@ static LRESULT WINAPI plugin_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
}
}
return
DefWindowProc
(
hwnd
,
msg
,
wParam
,
lParam
);
return
DefWindowProc
W
(
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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
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
DefWindowProc
W
(
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
);
RegDeleteKey
A
(
HKEY_CLASSES_ROOT
,
key_name
);
return
TRUE
;
}
...
...
dlls/mshtml/tests/dom.c
View file @
5b52334f
...
...
@@ -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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
msg
);
}
test
(
doc
);
...
...
dlls/mshtml/tests/events.c
View file @
5b52334f
...
...
@@ -1398,12 +1398,12 @@ static void pump_msgs(BOOL *b)
if
(
b
)
{
while
(
!*
b
&&
GetMessageW
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
msg
);
}
}
else
{
while
(
!
b
&&
PeekMessageW
(
&
msg
,
NULL
,
0
,
0
,
PM_REMOVE
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
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
&&
GetMessage
A
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
A
(
&
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
DefWindowProc
A
(
hwnd
,
msg
,
wParam
,
lParam
);
}
static
HWND
create_container_window
(
void
)
...
...
dlls/mshtml/tests/htmldoc.c
View file @
5b52334f
...
...
@@ -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
&&
GetMessage
A
(
&
msg
,
doc_hwnd
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
A
(
&
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
);
PeekMessage
A
(
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
DefWindowProc
W
(
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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
A
(
&
msg
);
}
if
(
flags
&
DWL_REFRESH
)
{
...
...
dlls/mshtml/tests/mshtml_test.h
View file @
5b52334f
...
...
@@ -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
(
RegOpenKeyEx
A
(
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
(
RegQueryValueEx
A
(
zone_map
,
"IEHarden"
,
NULL
,
&
type
,
(
LPBYTE
)
&
ie_harden
,
&
size
)
!=
ERROR_SUCCESS
||
type
!=
REG_DWORD
)
{
ie_harden
=
0
;
}
...
...
dlls/mshtml/tests/script.c
View file @
5b52334f
...
...
@@ -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
);
RegDeleteKey
A
(
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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
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
DefWindowProc
A
(
hwnd
,
msg
,
wParam
,
lParam
);
}
static
HWND
create_container_window
(
void
)
...
...
dlls/mshtml/tests/style.c
View file @
5b52334f
...
...
@@ -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
&&
GetMessage
W
(
&
msg
,
NULL
,
0
,
0
))
{
TranslateMessage
(
&
msg
);
DispatchMessage
(
&
msg
);
DispatchMessage
W
(
&
msg
);
}
test
(
doc
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment