Alexandre Julliard : user32: Clear last error in EnumClipboardFormats.

Alexandre Julliard julliard at winehq.org
Fri Sep 9 10:09:03 CDT 2016


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Sep  9 22:48:32 2016 +0900

user32: Clear last error in EnumClipboardFormats.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/user32/clipboard.c       |  1 +
 dlls/user32/tests/clipboard.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c
index d11dd23..326ea03 100644
--- a/dlls/user32/clipboard.c
+++ b/dlls/user32/clipboard.c
@@ -738,6 +738,7 @@ UINT WINAPI EnumClipboardFormats(UINT wFormat)
         SetLastError(ERROR_CLIPBOARD_NOT_OPEN);
         return 0;
     }
+    SetLastError( 0 );
     return USER_Driver->pEnumClipboardFormats(wFormat);
 }
 
diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c
index da2163b..4211ae4 100644
--- a/dlls/user32/tests/clipboard.c
+++ b/dlls/user32/tests/clipboard.c
@@ -680,16 +680,30 @@ static void test_synthesized(void)
 
     r = OpenClipboard( NULL );
     ok(r, "gle %d\n", GetLastError());
+    SetLastError( 0xdeadbeef );
     cf = EnumClipboardFormats(0);
     ok( cf == CF_UNICODETEXT, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
+    SetLastError( 0xdeadbeef );
     cf = EnumClipboardFormats(cf);
     ok( cf == CF_TEXT, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
+    SetLastError( 0xdeadbeef );
     cf = EnumClipboardFormats(cf);
     ok( cf == CF_OEMTEXT, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
+    SetLastError( 0xdeadbeef );
     cf = EnumClipboardFormats(cf);
     ok( cf == CF_LOCALE, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
+    SetLastError( 0xdeadbeef );
     cf = EnumClipboardFormats( cf );
     ok( cf == 0, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
+    SetLastError( 0xdeadbeef );
+    cf = EnumClipboardFormats( 0xdead );
+    ok( cf == 0, "cf %08x\n", cf );
+    ok( GetLastError() == ERROR_SUCCESS, "wrong error %u\n", GetLastError() );
 
     r = EmptyClipboard();
     ok(r, "gle %d\n", GetLastError());




More information about the wine-cvs mailing list