Skip to content

W
wine-winehq
Commit af0c2177 authored by Austin English's avatar Austin English Committed by Alexandre Julliard
Browse files
Options

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

parent 28e1b942
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/oleaut32/olepicture.c
View file @ af0c2177
...@@ -2299,7 +2299,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, ...@@ -2299,7 +2299,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING, hFile = CreateFileW(file_candidate, GENERIC_READ, 0, NULL, OPEN_EXISTING,
0, NULL); 0, NULL);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
return E_UNEXPECTED; return INET_E_RESOURCE_NOT_FOUND;
dwFileSize = GetFileSize(hFile, NULL); dwFileSize = GetFileSize(hFile, NULL);
if (dwFileSize != INVALID_FILE_SIZE ) if (dwFileSize != INVALID_FILE_SIZE )
...@@ -2318,7 +2318,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller, ...@@ -2318,7 +2318,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
CloseHandle(hFile); CloseHandle(hFile);
if (!hGlobal) if (!hGlobal)
return E_UNEXPECTED; return INET_E_RESOURCE_NOT_FOUND;
hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream); hRes = CreateStreamOnHGlobal(hGlobal, TRUE, &stream);
if (FAILED(hRes)) if (FAILED(hRes))
......
dlls/oleaut32/tests/olepicture.c
View file @ af0c2177
...@@ -844,13 +844,13 @@ static void test_OleLoadPicturePath(void) ...@@ -844,13 +844,13 @@ static void test_OleLoadPicturePath(void)
/* Try with a nonexistent file. */ /* Try with a nonexistent file. */
hres = OleLoadPicturePath(temp_fileW + 8, NULL, 0, 0, &IID_IPicture, (void **)&pic); 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_UNEXPECTED) || /* NT4 */
broken(hres == E_FAIL), /*Win2k */ broken(hres == E_FAIL), /*Win2k */
"Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); "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); 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_UNEXPECTED) || /* NT4 */
broken(hres == E_FAIL), /* Win2k */ broken(hres == E_FAIL), /* Win2k */
"Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres);
...@@ -880,7 +880,7 @@ static void test_OleLoadPicturePath(void) ...@@ -880,7 +880,7 @@ static void test_OleLoadPicturePath(void)
/* Try with a nonexistent file. */ /* Try with a nonexistent file. */
hres = OleLoadPicturePath(temp_fileW, NULL, 0, 0, &IID_IPicture, (void **)&pic); 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_UNEXPECTED) || /* NT4 */
broken(hres == E_FAIL), /* Win2k */ broken(hres == E_FAIL), /* Win2k */
"Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres); "Expected OleLoadPicturePath to return INET_E_RESOURCE_NOT_FOUND, got 0x%08x\n", hres);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment