include: winres.h no longer exists in PSDK, fix winresrc.h includes.

include/Makefile.in

@@ -378,7 +378,6 @@ SRCDIR_INCLUDES = \
 	winnt.h \
 	winperf.h \
 	winreg.h \
-	winres.h \
 	winresrc.h \
 	winscard.h \
 	winsmcrd.h \

include/winres.h

-/*
- * Copyright (C) 2000 Francois Gouget
- *
- * 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 <winresrc.h>
-
-#ifdef IDC_STATIC
-#undef IDC_STATIC
-#endif
-#define IDC_STATIC      (-1)
-

include/winresrc.h

@@ -35,10 +35,10 @@
 #define _WIN32_WINNT 0x0500
 #endif
 
-#include <winuser.h>
-#include <commctrl.h>
-#include <dde.h>
-#include <winnt.h>
+/* FIXME: #include <winuser.rh> */
+/* FIXME: #include <commctrl.rh> */
+/* FIXME: #include <dde.rh> */
+/* FIXME: #include <winnt.rh> */
 #include <dlgs.h>
 #include <winver.h>
 

programs/clock/rsrc.rc

@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
 
 #include "clock_res.h"
 

programs/cmd/wcmdrc.rc

@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+#include <winuser.h>
+
 #include "wcmd.h"
 
 #include "Cs.rc"

programs/cmdlgtst/cmdlgr.rc

@@ -18,7 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+#include <dlgs.h>
+
 #include "cmdlgtst.h"
 
 #include "Cs.rc"

programs/net/rsrc.rc

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "resources.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

programs/oleview/rsrc.rc

@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 #include "De.rc"

programs/progman/rsrc.rc

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "progman.h"
 #include "accel.rc"
 

programs/regedit/rsrc.rc

@@ -18,7 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "windows.h"
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 /* define language neutral resources */

programs/start/rsrc.rc

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "resources.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

programs/taskmgr/taskmgr.rc

@@ -19,7 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
 #include "resource.h"
 
 /* Language resources */

programs/uninstaller/rsrc.rc

@@ -22,7 +22,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 #include "Bg.rc"
 #include "Cs.rc"

programs/view/viewrc.rc

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "resource.h"
 
 #include "Cs.rc"

programs/winecfg/winecfg.rc

@@ -20,12 +20,12 @@
  *
  */
 
-#include "config.h"
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
 #include "winnls.h"
-#include "winresrc.h"
+#include "winuser.h"
+#include "commctrl.h"
 #include "resource.h"
 
 #include "Bg.rc"

programs/winefile/rsrc.rc

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 /* define language neutral resources */

programs/winemine/rsrc.rc

@@ -19,7 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 #include "Cs.rc"

programs/winetest/resource.h

@@ -24,6 +24,8 @@
 #define IDD_ABOUT  101
 #define IDD_TAG    102
 
+#define IDC_STATIC -1
+
 #define IDC_ST0 1000
 #define IDC_PB0 1001
 #define IDC_ST1 1002

programs/winetest/winetest.rc

@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
-#include <winres.h>
+#include <windef.h>
+#include <winuser.h>
+#include <commctrl.h>
+
 #include "resource.h"
 
 IDD_TAG DIALOG 0, 0, 150, 65

programs/winhelp/rsrc.rc

@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "winhelp.h"
 #include "winhelp_res.h"
 

programs/wordpad/rsrc.rc

@@ -16,7 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+#include <winuser.h>
+
 #include "resource.h"
 
 MAINACCELTABLE ACCELERATORS

programs/write/rsrc.rc

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "resources.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

programs/xcopy/rsrc.rc

@@ -16,7 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windows.h>
+#include <windef.h>
+
 #include "xcopy.h"
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL