Only restore the DC attributes on the next GetDC, and add support for

dlls/user/tests/.cvsignore

 Makefile
 class.ok
 clipboard.ok
+dce.ok
 dde.ok
 dialog.ok
 edit.ok

dlls/user/tests/Makefile.in

@@ -8,6 +8,7 @@ IMPORTS   = user32 gdi32 advapi32
 CTESTS = \
 	class.c \
 	clipboard.c \
+	dce.c \
 	dde.c \
 	dialog.c \
 	edit.c \

dlls/user/tests/dce.c

+/*
+ * Unit tests for DCE support
+ *
+ * Copyright 2005 Alexandre Julliard
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <assert.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+
+#include "wine/test.h"
+
+static HWND hwnd_cache, hwnd_owndc, hwnd_classdc, hwnd_classdc2;
+
+/* test behavior of DC attributes with various GetDC/ReleaseDC combinations */
+static void test_dc_attributes(void)
+{
+    HDC hdc, old_hdc;
+    INT rop, def_rop;
+
+    /* test cache DC */
+
+    hdc = GetDC( hwnd_cache );
+    def_rop = GetROP2( hdc );
+
+    SetROP2( hdc, R2_WHITE );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop );
+
+    ReleaseDC( hwnd_cache, hdc );
+    hdc = GetDC( hwnd_cache );
+    rop = GetROP2( hdc );
+    ok( rop == def_rop, "wrong ROP2 %d after release\n", rop );
+    SetROP2( hdc, R2_WHITE );
+    ReleaseDC( hwnd_cache, hdc );
+
+    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
+    rop = GetROP2( hdc );
+    /* Win9x seems to silently ignore DCX_NORESETATTRS */
+    ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d\n", rop );
+
+    SetROP2( hdc, R2_WHITE );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop );
+
+    ReleaseDC( hwnd_cache, hdc );
+    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE | DCX_NORESETATTRS );
+    rop = GetROP2( hdc );
+    ok( rop == def_rop || rop == R2_WHITE, "wrong ROP2 %d after release\n", rop );
+    ReleaseDC( hwnd_cache, hdc );
+
+    hdc = GetDCEx( hwnd_cache, 0, DCX_USESTYLE );
+    rop = GetROP2( hdc );
+    ok( rop == def_rop, "wrong ROP2 %d after release\n", rop );
+    ReleaseDC( hwnd_cache, hdc );
+
+    /* test own DC */
+
+    hdc = GetDC( hwnd_owndc );
+    SetROP2( hdc, R2_WHITE );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop );
+
+    old_hdc = hdc;
+    ReleaseDC( hwnd_owndc, hdc );
+    hdc = GetDC( hwnd_owndc );
+    ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop );
+    ReleaseDC( hwnd_owndc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop );
+
+    /* test class DC */
+
+    hdc = GetDC( hwnd_classdc );
+    SetROP2( hdc, R2_WHITE );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop );
+
+    old_hdc = hdc;
+    ReleaseDC( hwnd_classdc, hdc );
+    hdc = GetDC( hwnd_classdc );
+    ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d after release\n", rop );
+    ReleaseDC( hwnd_classdc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_WHITE, "wrong ROP2 %d after second release\n", rop );
+
+    /* test class DC with 2 windows */
+
+    old_hdc = GetDC( hwnd_classdc );
+    SetROP2( old_hdc, R2_BLACK );
+    hdc = GetDC( hwnd_classdc2 );
+    ok( old_hdc == hdc, "didn't get same DC %p/%p\n", old_hdc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_BLACK, "wrong ROP2 %d for other window\n", rop );
+    ReleaseDC( hwnd_classdc, old_hdc );
+    ReleaseDC( hwnd_classdc, hdc );
+    rop = GetROP2( hdc );
+    ok( rop == R2_BLACK, "wrong ROP2 %d after release\n", rop );
+}
+
+
+/* test behavior with various invalid parameters */
+static void test_parameters(void)
+{
+    HDC hdc;
+
+    hdc = GetDC( hwnd_cache );
+    ok( ReleaseDC( hwnd_owndc, hdc ), "ReleaseDC with wrong window should succeed\n" );
+
+    hdc = GetDC( hwnd_cache );
+    ok( !ReleaseDC( hwnd_cache, 0 ), "ReleaseDC with wrong HDC should fail\n" );
+    ok( ReleaseDC( hwnd_cache, hdc ), "correct ReleaseDC should succeed\n" );
+    ok( !ReleaseDC( hwnd_cache, hdc ), "second ReleaseDC should fail\n" );
+
+    hdc = GetDC( hwnd_owndc );
+    ok( ReleaseDC( hwnd_cache, hdc ), "ReleaseDC with wrong window should succeed\n" );
+    hdc = GetDC( hwnd_owndc );
+    ok( ReleaseDC( hwnd_owndc, hdc ), "correct ReleaseDC should succeed\n" );
+    ok( ReleaseDC( hwnd_owndc, hdc ), "second ReleaseDC should succeed\n" );
+
+    hdc = GetDC( hwnd_classdc );
+    ok( ReleaseDC( hwnd_cache, hdc ), "ReleaseDC with wrong window should succeed\n" );
+    hdc = GetDC( hwnd_classdc );
+    ok( ReleaseDC( hwnd_classdc, hdc ), "correct ReleaseDC should succeed\n" );
+    ok( ReleaseDC( hwnd_classdc, hdc ), "second ReleaseDC should succeed\n" );
+}
+
+
+START_TEST(dce)
+{
+    WNDCLASSA cls;
+
+    cls.style = CS_DBLCLKS;
+    cls.lpfnWndProc = DefWindowProcA;
+    cls.cbClsExtra = 0;
+    cls.cbWndExtra = 0;
+    cls.hInstance = GetModuleHandleA(0);
+    cls.hIcon = 0;
+    cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW);
+    cls.hbrBackground = GetStockObject(WHITE_BRUSH);
+    cls.lpszMenuName = NULL;
+    cls.lpszClassName = "cache_class";
+    RegisterClassA(&cls);
+    cls.style = CS_DBLCLKS | CS_OWNDC;
+    cls.lpszClassName = "owndc_class";
+    RegisterClassA(&cls);
+    cls.style = CS_DBLCLKS | CS_CLASSDC;
+    cls.lpszClassName = "classdc_class";
+    RegisterClassA(&cls);
+
+    hwnd_cache = CreateWindowA("cache_class", NULL, WS_OVERLAPPED | WS_VISIBLE,
+                               0, 0, 100, 100,
+                               0, 0, GetModuleHandleA(0), NULL );
+    hwnd_owndc = CreateWindowA("owndc_class", NULL, WS_OVERLAPPED | WS_VISIBLE,
+                               0, 200, 100, 100,
+                               0, 0, GetModuleHandleA(0), NULL );
+    hwnd_classdc = CreateWindowA("classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE,
+                                 200, 0, 100, 100,
+                                 0, 0, GetModuleHandleA(0), NULL );
+    hwnd_classdc2 = CreateWindowA("classdc_class", NULL, WS_OVERLAPPED | WS_VISIBLE,
+                                  200, 200, 100, 100,
+                                  0, 0, GetModuleHandleA(0), NULL );
+    test_dc_attributes();
+    test_parameters();
+}