Module: wine Branch: master Commit: dcfd901c83a8ac413bf913ada38211d2e60183c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcfd901c83a8ac413bf913ada3...
Author: Huw Davies huw@codeweavers.com Date: Thu May 1 11:12:56 2014 +0100
ole32/tests: Fix win8 test failures.
---
dlls/ole32/tests/hglobalstream.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index b509fb5..cf9fedf 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -261,14 +261,17 @@ static void test_streamonhglobal(IStream *pStream) ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart);
- /* IStream_Seek -- seek wraps position/size on integer overflow */ + /* IStream_Seek -- seek wraps position/size on integer overflow, but not on win8 */ ull.u.HighPart = 0xCAFECAFE; ull.u.LowPart = 0xCAFECAFE; ll.u.HighPart = 0; ll.u.LowPart = 0x7FFFFFFF; hr = IStream_Seek(pStream, ll, STREAM_SEEK_CUR, &ull); - ok_ole_success(hr, "IStream_Seek"); - ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + ok(hr == S_OK || hr == STG_E_SEEKERROR /* win8 */, "IStream_Seek"); + if (SUCCEEDED(hr)) + ok(ull.u.LowPart == 0x00000007, "should have set LowPart to 0x00000007 instead of %08x\n", ull.u.LowPart); + else + ok(ull.u.LowPart == 0x80000008, "should have set LowPart to 0x80000008 instead of %08x\n", ull.u.LowPart); ok(ull.u.HighPart == 0, "should have set HighPart to 0 instead of %d\n", ull.u.HighPart);
hr = IStream_Commit(pStream, STGC_DEFAULT);