Austin English : oleaut32/tests: Fix a couple of todo_wine's.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: af0c217752b0148a528c744a771bdb0f114ac03b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=af0c217752b0148a528c744a77...

Author: Austin English 
Date:   Thu Feb 24 16:08:34 2011 -0800

oleaut32/tests: Fix a couple of todo_wine's.

---

dlls/oleaut32/olepicture.c       |    4 ++--
 dlls/oleaut32/tests/olepicture.c |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 6d264d1..8081785 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -2299,7 +2299,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
       hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING,
                           0, NULL);
       if (hFile == INVALID_HANDLE_VALUE)
-          return E_UNEXPECTED;
+          return INET_E_RESOURCE_NOT_FOUND;

dwFileSize = GetFileSize(hFile, NULL);
       if (dwFileSize != INVALID_FILE_SIZE )
@@ -2318,7 +2318,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
       CloseHandle(hFile);

if (!hGlobal)
-	  return E_UNEXPECTED;
+	  return INET_E_RESOURCE_NOT_FOUND;

hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream);
       if (FAILED(hRes)) 
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 3422e79..5cc078c 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -844,13 +844,13 @@ static void test_OleLoadPicturePath(void)

/* Try with a nonexistent file. */
     hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic);
-    todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
+    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);
-    todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
+    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);
@@ -880,7 +880,7 @@ static void test_OleLoadPicturePath(void)

/* Try with a nonexistent file. */
     hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic);
-    todo_wine ok(hres == INET_E_RESOURCE_NOT_FOUND || /* XP+ */
+    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);