Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
ffd31354
Commit
ffd31354
authored
Nov 13, 2014
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 13, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Fixed tests on recent IEs.
parent
949ecc51
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
protocol.c
dlls/mshtml/tests/protocol.c
+9
-8
No files found.
dlls/mshtml/tests/protocol.c
View file @
ffd31354
...
...
@@ -137,13 +137,16 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR
{
CHECK_EXPECT
(
ReportResult
);
if
(
expect_hr_win32err
)
if
(
expect_hr_win32err
)
{
ok
((
hrResult
&
0xffff0000
)
==
((
FACILITY_WIN32
<<
16
)
|
0x80000000
)
||
expect_hrResult
,
"expected win32 err or %08x got: %08x
\n
"
,
expect_hrResult
,
hrResult
);
else
ok
(
hrResult
==
expect_hrResult
||
((
expect_hrResult
==
E_INVALIDARG
||
expect_hrResult
==
HRESULT_FROM_WIN32
(
ERROR_RESOURCE_TYPE_NOT_FOUND
))
&&
hrResult
==
MK_E_SYNTAX
),
"expected: %08x got: %08x
\n
"
,
expect_hrResult
,
hrResult
);
}
else
{
ok
(
hrResult
==
expect_hrResult
||
(
expect_hrResult
==
E_INVALIDARG
&&
hrResult
==
MK_E_SYNTAX
)
||
(
expect_hrResult
==
HRESULT_FROM_WIN32
(
ERROR_RESOURCE_TYPE_NOT_FOUND
)
&&
(
hrResult
==
MK_E_SYNTAX
||
hrResult
==
HRESULT_FROM_WIN32
(
ERROR_DLL_NOT_FOUND
))),
"expected: %08x got: %08x
\n
"
,
expect_hrResult
,
hrResult
);
expect_hrResult
=
hrResult
;
}
ok
(
dwError
==
0
,
"dwError = %d
\n
"
,
dwError
);
ok
(
!
szResult
,
"szResult != NULL
\n
"
);
...
...
@@ -232,9 +235,7 @@ static void test_protocol_fail(IInternetProtocol *protocol, LPCWSTR url, HRESULT
ok
((
hres
&
0xffff0000
)
==
((
FACILITY_WIN32
<<
16
)
|
0x80000000
)
||
hres
==
expect_hrResult
,
"expected win32 err or %08x got: %08x
\n
"
,
expected_hres
,
hres
);
else
ok
(
hres
==
expected_hres
||
((
expected_hres
==
E_INVALIDARG
||
expected_hres
==
HRESULT_FROM_WIN32
(
ERROR_RESOURCE_TYPE_NOT_FOUND
))
&&
hres
==
MK_E_SYNTAX
),
"expected: %08x got: %08x
\n
"
,
expected_hres
,
hres
);
ok
(
hres
==
expect_hrResult
,
"expected: %08x got: %08x
\n
"
,
expect_hrResult
,
hres
);
CHECK_CALLED
(
GetBindInfo
);
CHECK_CALLED
(
ReportResult
);
...
...
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