Module: wine Branch: master Commit: 28e1b942bd0329c18a1f8d5c600b54e531dcf315 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28e1b942bd0329c18a1f8d5c60...
Author: Austin English austinenglish@gmail.com Date: Thu Feb 24 15:55:45 2011 -0800
oleaut32/tests: Remove win9x hacks.
---
dlls/oleaut32/tests/olepicture.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 52dbb73..3422e79 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -798,9 +798,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, NULL, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -809,9 +808,8 @@ static void test_OleLoadPicturePath(void) hres = OleLoadPicturePath(emptyW, NULL, 0, 0, &IID_IPicture, (void **)&pic); todo_wine ok(hres == INET_E_UNKNOWN_PROTOCOL || /* XP/Vista+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL || /* Win95 OSR2 */ - hres == E_OUTOFMEMORY, /* Win98/Win2k/Win2k3 */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_OUTOFMEMORY), /* Win2k/Win2k3 */ "Expected OleLoadPicturePath to return INET_E_UNKNOWN_PROTOCOL, got 0x%08x\n", hres); ok(pic == NULL, "Expected the output interface pointer to be NULL, got %p\n", pic); @@ -829,7 +827,7 @@ static void test_OleLoadPicturePath(void) /* Try a normal DOS path. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -837,7 +835,7 @@ static void test_OleLoadPicturePath(void) /* Try a DOS path with tacked on "file:". */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -846,15 +844,15 @@ static void test_OleLoadPicturePath(void)
/* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /*Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres);
hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres);
file = CreateFileA(temp_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, @@ -873,7 +871,7 @@ static void test_OleLoadPicturePath(void)
hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); ok(hres == S_OK || - broken(hres == E_UNEXPECTED), /* NT4/Win95 */ + broken(hres == E_UNEXPECTED), /* NT4 */ "Expected OleLoadPicturePath to return S_OK, got 0x%08x\n", hres); if (pic) IPicture_Release(pic); @@ -882,9 +880,9 @@ static void test_OleLoadPicturePath(void)
/* Try with a nonexistent file. */ hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); - ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ - hres == E_UNEXPECTED || /* NT4/Win95 */ - hres == E_FAIL, /* Win9x/Win2k */ + todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */ + broken(hres == E_UNEXPECTED) || /* NT4 */ + broken(hres == E_FAIL), /* Win2k */ "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); }