Nikolay Sivov : user32/tests: Fix a test failure on Win8/Win10.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Sat Aug 22 12:19:56 2015 +0300

user32/tests: Fix a test failure on Win8/Win10.

---

 dlls/user32/tests/win.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 9f6c224..10aa545 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -6436,10 +6436,12 @@ static void test_layered_window(void)
         ret = pUpdateLayeredWindowIndirect( hwnd, &info );
         ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" );
         sz.cx--;
+        SetLastError(0);
         ret = pUpdateLayeredWindowIndirect( hwnd, &info );
         ok( !ret, "UpdateLayeredWindowIndirect should fail\n" );
-        ok( GetLastError() == ERROR_INCORRECT_SIZE || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND),
-            "wrong error %u\n", GetLastError() );
+        /* particular error code differs from version to version, could be ERROR_INCORRECT_SIZE,
+           ERROR_MR_MID_NOT_FOUND or ERROR_GEN_FAILURE (Win8/Win10) */
+        ok( GetLastError() != 0, "wrong error %u\n", GetLastError() );
         info.dwFlags  = ULW_OPAQUE;
         ret = pUpdateLayeredWindowIndirect( hwnd, &info );
         ok( ret, "UpdateLayeredWindowIndirect should succeed on layered window\n" );