2 files changed, 83 insertions, 0 deletions
diff --git a/tests/libXrender/Makefile.am b/tests/libXrender/Makefile.am
index 3865a5c..d5a98b4 100644
--- a/tests/libXrender/Makefile.am
+++ b/tests/libXrender/Makefile.am
@@ -22,6 +22,7 @@
 #
 
 noinst_PROGRAMS  = XRenderQueryFilters
+noinst_PROGRAMS += XRenderQueryFormats
 
 noinst_HEADERS = xhiv-Xrender.h
 
diff --git a/tests/libXrender/XRenderQueryFormats.c b/tests/libXrender/XRenderQueryFormats.c
new file mode 100644
index 0000000..abe6195
--- /dev/null
+++ b/tests/libXrender/XRenderQueryFormats.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+/* Subpixels were added to XRenderQueryFormats in XRender 0.6 */
+#define MY_XRENDER_MAJOR_VERSION 0
+#define MY_XRENDER_MINOR_VERSION 6
+
+#include "xhiv.h"
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include "xhiv-Xrender.h"
+#include <assert.h>
+#include <stdio.h>
+#include <limits.h>
+
+static void
+testOverflowFields(void)
+{
+    const xRenderQueryPictFormatsReply rep1 = {
+        .type           = X_Reply,
+        .length         = 256,
+        .numFormats     = 16,
+        .numScreens     = 0,
+        .numDepths      = 0,
+        .numVisuals     = 0,
+        .numSubpixel    = (UINT_MAX / 4) - (3 * sizeof (XRenderPictFormat)),
+    };
+    xhiv_response response1 = {
+        .next = &xrender_vers_response,
+        .reqType = MY_XRENDER_EXT_CODE,
+        .reqMinor = X_RenderQueryPictFormats,
+        .sequence = XHIV_SEQ_IGNORE,
+        .length = (sizeof(rep1) >> 2) + rep1.length,
+        .response_data = &rep1,
+        .response_datalen = sizeof(rep1)
+    };
+    Display *dpy = XhivOpenDisplay(&response1);
+    int major = MY_XRENDER_MAJOR_VERSION;
+    int minor = MY_XRENDER_MINOR_VERSION;
+    int status;
+
+    /* Skips XRenderQueryVersion, since that calls XRenderQueryFormats
+       and caches the result so later calls just read the cache */
+    
+    printf("XRenderQueryFormats: overflow number of subpixels test: 0x%lx\n",
+           (unsigned long) rep1.numSubpixel);
+    status = XRenderQueryFormats(dpy);
+    assert(status == 0);
+
+    XhivCloseDisplay(dpy);
+}
+
+int
+main(int argc, char **argv)
+{
+    testOverflowFields();
+    printf("XRenderQueryFormats: all tests passed\n");
+    return 0;
+}