Huw Davies : user32/tests: BITMAPCOREINFO icons are no longer supported on Win 8.

Alexandre Julliard julliard at winehq.org
Mon Sep 19 10:32:13 CDT 2016


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Mon Sep 19 12:38:49 2016 +0100

user32/tests: BITMAPCOREINFO icons are no longer supported on Win 8.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/tests/cursoricon.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
index 4b79d46..61b32e0 100644
--- a/dlls/user32/tests/cursoricon.c
+++ b/dlls/user32/tests/cursoricon.c
@@ -2622,7 +2622,9 @@ static void test_monochrome_icon(void)
         CloseHandle(handle);
 
         handle = LoadImageA(NULL, "icon.ico", IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-        ok(handle != NULL, "LoadImage() failed with %u.\n", GetLastError());
+        ok(handle != NULL ||
+           broken(use_core_info && handle == NULL), /* Win 8, 10 */
+           "LoadImage() failed with %u.\n", GetLastError());
         if (handle == NULL)
         {
             skip("Icon failed to load: %s, %s\n",




More information about the wine-cvs mailing list