include: winres.h does not exist in PSDK, fix winresrc.h includes
Dmitry Timoshkov
dmitry at codeweavers.com
Tue Aug 7 01:30:43 CDT 2007
Hello,
Changelog:
include: winres.h does not exist in PSDK, fix winresrc.h includes.
---
include/winres.h | 25 -------------------------
include/winresrc.h | 8 ++++----
programs/clock/rsrc.rc | 3 ++-
programs/cmd/wcmdrc.rc | 3 +++
programs/cmdlgtst/cmdlgr.rc | 5 ++++-
programs/net/rsrc.rc | 3 ++-
programs/oleview/rsrc.rc | 4 +++-
programs/progman/rsrc.rc | 4 +++-
programs/regedit/rsrc.rc | 4 +++-
programs/start/rsrc.rc | 3 ++-
programs/taskmgr/taskmgr.rc | 5 ++++-
programs/uninstaller/rsrc.rc | 4 +++-
programs/view/viewrc.rc | 3 ++-
programs/winecfg/winecfg.rc | 4 ++--
programs/winefile/rsrc.rc | 4 +++-
programs/winemine/rsrc.rc | 4 +++-
programs/winetest/resource.h | 2 ++
programs/winetest/winetest.rc | 6 ++++--
programs/winhelp/rsrc.rc | 3 ++-
programs/wordpad/rsrc.rc | 4 +++-
programs/write/rsrc.rc | 3 ++-
programs/xcopy/rsrc.rc | 3 ++-
22 files changed, 58 insertions(+), 49 deletions(-)
delete mode 100644 include/winres.h
diff --git a/include/winres.h b/include/winres.h
deleted file mode 100644
index 19012da..0000000
--- a/include/winres.h
+++ /dev/null
@@ -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)
-
diff --git a/include/winresrc.h b/include/winresrc.h
index 49325e0..51ab5bc 100644
--- 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>
diff --git a/programs/clock/rsrc.rc b/programs/clock/rsrc.rc
index 8275028..092293f 100644
--- 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"
diff --git a/programs/cmd/wcmdrc.rc b/programs/cmd/wcmdrc.rc
index c449f58..93194d7 100644
--- 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"
diff --git a/programs/cmdlgtst/cmdlgr.rc b/programs/cmdlgtst/cmdlgr.rc
index 949bd2a..e4164b9 100644
--- 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"
diff --git a/programs/net/rsrc.rc b/programs/net/rsrc.rc
index 0f4b1da..3125252 100644
--- 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
diff --git a/programs/oleview/rsrc.rc b/programs/oleview/rsrc.rc
index a00ab6b..6cf7fb3 100644
--- 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"
diff --git a/programs/progman/rsrc.rc b/programs/progman/rsrc.rc
index 5b052e3..91d38c1 100644
--- 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"
diff --git a/programs/regedit/rsrc.rc b/programs/regedit/rsrc.rc
index 3601930..da9d068 100644
--- 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 */
diff --git a/programs/start/rsrc.rc b/programs/start/rsrc.rc
index cc8666f..9f59c76 100644
--- 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
diff --git a/programs/taskmgr/taskmgr.rc b/programs/taskmgr/taskmgr.rc
index a89d666..41bc1dc 100644
--- 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 */
diff --git a/programs/uninstaller/rsrc.rc b/programs/uninstaller/rsrc.rc
index 5e64715..701e031 100644
--- 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"
diff --git a/programs/view/viewrc.rc b/programs/view/viewrc.rc
index 93a2d01..0473067 100644
--- 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"
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 34ed703..974cf9b 100644
--- 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"
diff --git a/programs/winefile/rsrc.rc b/programs/winefile/rsrc.rc
index f7e14a9..5259936 100644
--- 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 */
diff --git a/programs/winemine/rsrc.rc b/programs/winemine/rsrc.rc
index 6a9ed32..0490d85 100644
--- 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"
diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h
index 6941796..61fe35c 100644
--- 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
diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc
index 4cf35a9..ff6e2c2 100644
--- 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
diff --git a/programs/winhelp/rsrc.rc b/programs/winhelp/rsrc.rc
index ebf5e34..7a1f5e2 100644
--- 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"
diff --git a/programs/wordpad/rsrc.rc b/programs/wordpad/rsrc.rc
index 0ef3ff5..89fb4f2 100644
--- 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
diff --git a/programs/write/rsrc.rc b/programs/write/rsrc.rc
index 06e4040..1a356e6 100644
--- 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
diff --git a/programs/xcopy/rsrc.rc b/programs/xcopy/rsrc.rc
index 23f778c..234a4cb 100644
--- 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
--
1.5.2.3
More information about the wine-patches
mailing list