user32: static controls should have a clipping region set while
sending the WM_CTLCOLORSTATIC (with testcase, fixes bug #9195)
Mikolaj Zalewski
mikolajz at google.com
Wed Aug 22 17:03:29 CDT 2007
Photoshop ImageReady depends on it.
-------------- next part --------------
From fe38b255361f17a69d21cad57962bff89d477c85 Mon Sep 17 00:00:00 2001
From: Mikolaj Zalewski <mikolaj at zalewski.pl>
Date: Wed, 22 Aug 2007 14:59:31 -0700
Subject: [PATCH] user32: static controls should have a clipping region set while sending the WM_CTLCOLORSTATIC (with testcase, fixes bug #9195)
---
dlls/user32/static.c | 9 +++
dlls/user32/tests/Makefile.in | 1
dlls/user32/tests/static.c | 109 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 119 insertions(+), 0 deletions(-)
diff --git a/dlls/user32/static.c b/dlls/user32/static.c
index 8afaca1..0f2bba8 100644
--- a/dlls/user32/static.c
+++ b/dlls/user32/static.c
@@ -622,8 +622,17 @@ static void STATIC_PaintTextfn( HWND hwn
WORD wFormat;
INT len, buf_size;
WCHAR *text;
+ HRGN hrgn;
GetClientRect( hwnd, &rc);
+
+ /* Native control has always a clipping region set when sending
+ * the WM_CTLCOLORSTATIC and an application depends on it
+ */
+ hrgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom);
+ if (GetClipRgn(hdc, hrgn) == 0)
+ SelectClipRgn(hdc, hrgn);
+ DeleteObject(hrgn);
switch (style & SS_TYPEMASK)
{
diff --git a/dlls/user32/tests/Makefile.in b/dlls/user32/tests/Makefile.in
index 505d62d..40fec5b 100644
--- a/dlls/user32/tests/Makefile.in
+++ b/dlls/user32/tests/Makefile.in
@@ -21,6 +21,7 @@ CTESTS = \
monitor.c \
msg.c \
resource.c \
+ static.c \
sysparams.c \
text.c \
win.c \
diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c
new file mode 100644
index 0000000..d717984
--- /dev/null
+++ b/dlls/user32/tests/static.c
@@ -0,0 +1,109 @@
+/* Unit test suite for static controls.
+ *
+ * Copyright 2007 Google (Mikolaj Zalewski)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define STRICT
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+#include "wine/test.h"
+
+#define CTRL_ID 1995
+
+static HWND hMainWnd;
+
+#define expect_eq(expr, value, type, fmt); { type val = expr; ok(val == (value), #expr " expected " #fmt " got " #fmt "\n", (value), val); }
+#define expect_rect(r, _left, _top, _right, _bottom) ok(r.left == _left && r.top == _top && \
+ r.bottom == _bottom && r.right == _right, "Invalid rect (%d,%d) (%d,%d) vs (%d,%d) (%d,%d)\n", \
+ r.left, r.top, r.right, r.bottom, _left, _top, _right, _bottom);
+
+int g_nReceivedColorStatic = 0;
+
+static HWND build_static(DWORD style)
+{
+ return CreateWindow("static", "Test", WS_VISIBLE|WS_CHILD|style, 5, 5, 100, 100, hMainWnd, (HMENU)CTRL_ID, NULL, 0);
+}
+
+static LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam)
+{
+ switch (msg)
+ {
+ case WM_CTLCOLORSTATIC:
+ {
+ HDC hdc = (HDC)wparam;
+ HRGN hrgn = CreateRectRgn(0, 0, 1, 1);
+ ok(GetClipRgn(hdc, hrgn) == 1, "Static controls during a WM_CTLCOLORSTATIC must have a clipping region\n");
+ DeleteObject(hrgn);
+ g_nReceivedColorStatic++;
+ }
+ break;
+ }
+
+ return DefWindowProc(hwnd, msg, wparam, lparam);
+}
+
+void test_updates()
+{
+ RECT r1 = {20, 20, 30, 30};
+ HWND hStatic = build_static(0);
+
+ /* during each update parent WndProc will test the WM_CTLCOLORSTATIC message */
+ InvalidateRect(hMainWnd, NULL, FALSE);
+ UpdateWindow(hMainWnd);
+ InvalidateRect(hMainWnd, &r1, FALSE);
+ UpdateWindow(hMainWnd);
+ InvalidateRect(hStatic, &r1, FALSE);
+ UpdateWindow(hStatic);
+ InvalidateRect(hStatic, NULL, FALSE);
+ UpdateWindow(hStatic);
+
+ expect_eq(g_nReceivedColorStatic, 4, int, "%d");
+ DestroyWindow(hStatic);
+}
+
+START_TEST(static)
+{
+ static char szClassName[] = "testclass";
+ WNDCLASSEX wndclass;
+
+ wndclass.cbSize = sizeof(wndclass);
+ wndclass.style = CS_HREDRAW | CS_VREDRAW;
+ wndclass.lpfnWndProc = WndProc;
+ wndclass.cbClsExtra = 0;
+ wndclass.cbWndExtra = 0;
+ wndclass.hInstance = GetModuleHandle(NULL);
+ wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+ wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION);
+ wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
+ wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+ wndclass.lpszClassName = szClassName;
+ wndclass.lpszMenuName = NULL;
+ RegisterClassEx(&wndclass);
+
+ hMainWnd = CreateWindow(szClassName, "Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL);
+ ShowWindow(hMainWnd, SW_SHOW);
+ UpdateWindow(hMainWnd);
+
+ test_updates();
+
+ DestroyWindow(hMainWnd);
+}
--
1.4.1
More information about the wine-patches
mailing list