commit d3e22d9d55a4397096c92ab340e41bc494a1e7cb
author Jeremy White <jwhite@codeweavers.com> Thu Feb 10 19:03:02 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Feb 10 19:03:02 2000 +0000
tree 81977b27206072910f78832dcf1dee5b746b59c2
parent 923685ac9533a8a78928c759e14acb05abcfc2e9

Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).

windows/win.c

diff --git a/windows/win.c b/windows/win.c
index be2f0c0..bb266b2 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -6,6 +6,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "options.h"
@@ -1040,9 +1042,7 @@
 
     if (!(classAtom = GlobalFindAtomA( className )))
     {
-        fprintf( stderr, "CreateWindowEx16: bad class name " );
-        if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) );
-        else fprintf( stderr, "'%s'\n", className );
+        ERR( "bad class name %s\n", debugres_a(className) );
         return 0;
     }
 
@@ -1096,9 +1096,7 @@
 
     if (!(classAtom = GlobalFindAtomA( className )))
     {
-        fprintf( stderr, "CreateWindowEx32A: bad class name " );
-        if (!HIWORD(className)) fprintf( stderr, "%04x\n", LOWORD(className) );
-        else fprintf( stderr, "'%s'\n", className );
+        ERR( "bad class name %s\n", debugres_a(className) );
         return 0;
     }
 
@@ -1150,14 +1148,7 @@
 
     if (!(classAtom = GlobalFindAtomW( className )))
     {
-    	if (HIWORD(className))
-        {
-            LPSTR cn = HEAP_strdupWtoA( GetProcessHeap(), 0, className );
-            WARN("Bad class name '%s'\n",cn);
-            HeapFree( GetProcessHeap(), 0, cn );
-	}
-        else
-            WARN("Bad class name %p\n", className );
+        ERR( "bad class name %s\n", debugres_w(className) );
         return 0;
     }