commit b3569e7015ed486bbbd01db8aa9a5ccad6d58364
author Dmitry Timoshkov <dmitry@codeweavers.com> Fri Jun 25 02:55:37 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Jun 25 02:55:37 2004 +0000
tree e9d8e5cce03f10f55c83d18ff8e42af75ac52842
parent 0377462460c9548043faedafa4a91bf51682fa41

Add a test case for clipboard functionality and fix some bugs revealed
by it.

dlls/x11drv/clipboard.c

diff --git a/dlls/x11drv/clipboard.c b/dlls/x11drv/clipboard.c
index 5dbb9e1..c43ccd9 100644
--- a/dlls/x11drv/clipboard.c
+++ b/dlls/x11drv/clipboard.c
@@ -2038,24 +2038,30 @@
  */
 INT X11DRV_GetClipboardFormatName(UINT wFormat, LPSTR retStr, INT maxlen)
 {
-    INT len = 0;
-    LPWINE_CLIPFORMAT lpFormat = X11DRV_CLIPBOARD_LookupFormat(wFormat);
+    INT len;
+    LPWINE_CLIPFORMAT lpFormat;
 
     TRACE("(%04X, %p, %d) !\n", wFormat, retStr, maxlen);
 
+    if (wFormat < 0xc000)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+
+    lpFormat = X11DRV_CLIPBOARD_LookupFormat(wFormat);
+
     if (!lpFormat || (lpFormat->wFlags & CF_FLAG_BUILTINFMT))
     {
         TRACE("Unknown format 0x%08x!\n", wFormat);
-        SetLastError(ERROR_INVALID_PARAMETER);
-    }
-    else
-    {
-        strncpy(retStr, lpFormat->Name, maxlen - 1);
-        retStr[maxlen - 1] = 0;
-
-        len = strlen(retStr);
+        SetLastError(ERROR_INVALID_HANDLE);
+        return 0;
     }
 
+    strncpy(retStr, lpFormat->Name, maxlen - 1);
+    retStr[maxlen - 1] = 0;
+
+    len = strlen(retStr);
     return len;
 }