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

mshtml: Fixed tests on recent IEs.

This commit is contained in:
Jacek Caban 2014-11-13 12:50:01 +01:00 committed by Alexandre Julliard
parent 949ecc5123
commit ffd313543f
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/mshtml/tests/protocol.c
View File

@ -137,13 +137,16 @@ static HRESULT WINAPI ProtocolSink_ReportResult(IInternetProtocolSink *iface, HR
{ {
CHECK_EXPECT(ReportResult); CHECK_EXPECT(ReportResult);
if(expect_hr_win32err) if(expect_hr_win32err) {
ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult, ok((hrResult&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || expect_hrResult,
"expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult); "expected win32 err or %08x got: %08x\n", expect_hrResult, hrResult);
else }else {
ok(hrResult == expect_hrResult || ((expect_hrResult == E_INVALIDARG || ok(hrResult == expect_hrResult || (expect_hrResult == E_INVALIDARG && hrResult == MK_E_SYNTAX)
expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && || (expect_hrResult == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND) &&
hrResult == MK_E_SYNTAX), "expected: %08x got: %08x\n", expect_hrResult, hrResult); (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(dwError == 0, "dwError = %d\n", dwError);
ok(!szResult, "szResult != NULL\n"); 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, ok((hres&0xffff0000) == ((FACILITY_WIN32 << 16)|0x80000000) || hres == expect_hrResult,
"expected win32 err or %08x got: %08x\n", expected_hres, hres); "expected win32 err or %08x got: %08x\n", expected_hres, hres);
else else
ok(hres == expected_hres || ((expected_hres == E_INVALIDARG || ok(hres == expect_hrResult, "expected: %08x got: %08x\n", expect_hrResult, hres);
expected_hres == HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND)) && hres == MK_E_SYNTAX),
"expected: %08x got: %08x\n", expected_hres, hres);
CHECK_CALLED(GetBindInfo); CHECK_CALLED(GetBindInfo);
CHECK_CALLED(ReportResult); CHECK_CALLED(ReportResult);