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

2007-08-07 15:30:43 +09:00 · 2007-08-07 15:30:43 +09:00 · 197f4059ab
parent a15b9fb860
commit 197f4059ab
23 changed files with 58 additions and 50 deletions
--- a/include/Makefile.in
+++ b/include/Makefile.in
@ -378,7 +378,6 @@ SRCDIR_INCLUDES = \
 	winnt.h \
 	winperf.h \
 	winreg.h \
-	winres.h \
 	winresrc.h \
 	winscard.h \
 	winsmcrd.h \
--- a/include/winres.h
+++ b/include/winres.h
@ -1,25 +0,0 @@
-/*
- * 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)
-
--- a/include/winresrc.h
+++ b/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>

--- a/programs/clock/rsrc.rc
+++ b/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"

--- a/programs/cmd/wcmdrc.rc
+++ b/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"
--- a/programs/cmdlgtst/cmdlgr.rc
+++ b/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"
--- a/programs/net/rsrc.rc
+++ b/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
--- a/programs/oleview/rsrc.rc
+++ b/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"
--- a/programs/progman/rsrc.rc
+++ b/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"

--- a/programs/regedit/rsrc.rc
+++ b/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 */
--- a/programs/start/rsrc.rc
+++ b/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
--- a/programs/taskmgr/taskmgr.rc
+++ b/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 */
--- a/programs/uninstaller/rsrc.rc
+++ b/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"
--- a/programs/view/viewrc.rc
+++ b/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"
--- a/programs/winecfg/winecfg.rc
+++ b/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"
--- a/programs/winefile/rsrc.rc
+++ b/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 */
--- a/programs/winemine/rsrc.rc
+++ b/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"
--- a/programs/winetest/resource.h
+++ b/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
--- a/programs/winetest/winetest.rc
+++ b/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
--- a/programs/winhelp/rsrc.rc
+++ b/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"

--- a/programs/wordpad/rsrc.rc
+++ b/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
--- a/programs/write/rsrc.rc
+++ b/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
--- a/programs/xcopy/rsrc.rc
+++ b/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