[PATCH] user32/tests: Update clipboard test expectations on w1064v1809.

[Rémi Bernon]

It looks like Windows is not freeing objects right away anymore.

  https://testbot.winehq.org/JobDetails.pl?Key=60030

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
---
 dlls/user32/tests/clipboard.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c
index 4436ece70d9..a358fc11247 100644
--- a/dlls/user32/tests/clipboard.c
+++ b/dlls/user32/tests/clipboard.c
@@ -1350,7 +1350,7 @@ static void test_handles( HWND hwnd )
     BOOL r;
     HANDLE data;
     HBITMAP bitmap_temp;
-    DWORD process;
+    DWORD process, type;
     BOOL is_owner = (GetWindowThreadProcessId( hwnd, &process ) && process == GetCurrentProcessId());
 
     trace( "hwnd %p\n", hwnd );
@@ -1397,7 +1397,8 @@ static void test_handles( HWND hwnd )
     h = SetClipboardData( CF_BITMAP, bitmap );
     ok( h == bitmap, "got %p\n", h );
     ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h );
-    ok( !GetObjectType( bitmap_temp ), "expected free object %p\n", bitmap_temp );
+    type = GetObjectType( bitmap_temp );
+    ok( !type || broken( type == OBJ_BITMAP ) /* w1064v1809 */, "expected free object %p, was %u\n", bitmap_temp, type );
     h = SetClipboardData( CF_DSPBITMAP, bitmap2 );
     ok( h == bitmap2, "got %p\n", h );
     ok( GetObjectType( h ) == OBJ_BITMAP, "expected bitmap %p\n", h );
@@ -1605,9 +1606,12 @@ static void test_handles( HWND hwnd )
     ok( is_freed( hmoveable ) || broken( !is_freed( hmoveable )), "expected freed mem %p\n", hmoveable );
     ok( is_fixed( empty_fixed ), "expected fixed mem %p\n", empty_fixed );
     ok( is_fixed( hfixed ), "expected fixed mem %p\n", hfixed );
-    ok( !GetObjectType( bitmap ), "expected freed handle %p\n", bitmap );
-    ok( !GetObjectType( bitmap2 ), "expected freed handle %p\n", bitmap2 );
-    ok( !GetObjectType( palette ), "expected freed handle %p\n", palette );
+    type = GetObjectType( bitmap );
+    ok( !type || broken( type == OBJ_BITMAP ) /* w1064v1809 */, "expected freed handle %p, was %u\n", bitmap, type );
+    type = GetObjectType( bitmap2 );
+    ok( !type || broken( type == OBJ_BITMAP ) /* w1064v1809 */, "expected freed handle %p, was %u\n", bitmap2, type );
+    type = GetObjectType( palette );
+    ok( !type || broken( type == OBJ_PAL ) /* w1064v1809 */, "expected freed handle %p, was %u\n", palette, type );
 
     r = CloseClipboard();
     ok( r, "gle %d\n", GetLastError() );
@@ -1786,6 +1790,7 @@ static void test_data_handles(void)
     HANDLE h, text;
     HWND hwnd = CreateWindowA( "static", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL );
     BITMAPINFO bmi;
+    DWORD type;
     void *bits;
 
     ok( hwnd != 0, "window creation failed\n" );
@@ -1896,7 +1901,8 @@ static void test_data_handles(void)
     ok( GetObjectType( bitmap ) == OBJ_BITMAP, "expected bitmap %p\n", bitmap );
     r = EmptyClipboard();
     ok( r, "gle %d\n", GetLastError() );
-    ok( !GetObjectType( bitmap ), "expected deleted %p\n", bitmap );
+    type = GetObjectType( bitmap );
+    ok( !type || broken( type == OBJ_BITMAP ) /* w1064v1809 */, "expected deleted %p, was %u\n", bitmap, type );
     r = CloseClipboard();
     ok( r, "gle %d\n", GetLastError() );
 
-- 
2.24.0.rc2

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=60034

Your paranoid android.


=== w8adm (32 bit report) ===

user32:
clipboard.c:402: Test failed: GlobalGetAtomNameA should fail
clipboard.c:403: Test failed: err -559038737