[ros-diffs] [navaraf] 15968: Do NOT include defines.h in .rc files.

Do NOT include defines.h in .rc files.
Modified: trunk/reactos/lib/acledit/acledit.rc
Modified: trunk/reactos/lib/aclui/aclui.rc
Modified: trunk/reactos/lib/aclui/aclui_De.rc
Modified: trunk/reactos/lib/aclui/aclui_En.rc
Modified: trunk/reactos/lib/aclui/aclui_Sv.rc
Modified: trunk/reactos/lib/advapi32/advapi32.rc
Modified: trunk/reactos/lib/advpack/advpack.rc
Modified: trunk/reactos/lib/cpl/access/access.rc
Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc
Modified: trunk/reactos/lib/cpl/control/control.rc
Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc
Modified: trunk/reactos/lib/cpl/intl/intl.rc
Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc
Modified: trunk/reactos/lib/cpl/main/main.rc
Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc
Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc
Modified: trunk/reactos/lib/cpl/timedate/timedate.rc
Modified: trunk/reactos/lib/devmgr/devmgr.rc
Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc
Modified: trunk/reactos/lib/msgina/msgina.rc
Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc
Modified: trunk/reactos/lib/shellext/slayer/slayer.rc
Modified: trunk/reactos/lib/user32/user32.rc
Modified: trunk/reactos/subsys/system/explorer/explorer.rc
Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.rc
Modified: trunk/reactos/subsys/system/reactos/reactos.rc
Modified: trunk/reactos/subsys/system/regedit/regedit.rc
Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc
Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc
Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc
Modified: trunk/reactos/subsys/system/welcome/welcome.rc
Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc
  _____  

Modified: trunk/reactos/lib/acledit/acledit.rc
--- trunk/reactos/lib/acledit/acledit.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/acledit/acledit.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/aclui/aclui.rc
--- trunk/reactos/lib/aclui/aclui.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/aclui/aclui.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,4 +1,5 @@

-#include <defines.h>
+#include <windows.h>
+#include <reactos/resource.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/aclui/aclui_De.rc
--- trunk/reactos/lib/aclui/aclui_De.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/aclui/aclui_De.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,7 +1,3 @@

-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 
 IDD_SECPAGE DIALOGEX 0, 0, 227, 215
  _____  

Modified: trunk/reactos/lib/aclui/aclui_En.rc
--- trunk/reactos/lib/aclui/aclui_En.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/aclui/aclui_En.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,7 +1,3 @@

-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 IDD_SECPAGE DIALOGEX 0, 0, 227, 215
  _____  

Modified: trunk/reactos/lib/aclui/aclui_Sv.rc
--- trunk/reactos/lib/aclui/aclui_Sv.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/aclui/aclui_Sv.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -16,10 +16,6 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
 
-#include <reactos/resource.h>
-#include <defines.h>
-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 
 IDD_SECPAGE DIALOGEX 0, 0, 227, 215
  _____  

Modified: trunk/reactos/lib/advapi32/advapi32.rc
--- trunk/reactos/lib/advapi32/advapi32.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/advapi32/advapi32.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"Advanced W32 Base API\0"
  _____  

Modified: trunk/reactos/lib/advpack/advpack.rc
--- trunk/reactos/lib/advpack/advpack.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/advpack/advpack.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Advpack User Library\0"
  _____  

Modified: trunk/reactos/lib/cpl/access/access.rc
--- trunk/reactos/lib/cpl/access/access.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/access/access.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/cpl/appwiz/appwiz.rc
--- trunk/reactos/lib/cpl/appwiz/appwiz.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/appwiz/appwiz.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,9 +1,5 @@

 #include "resource.h"
-#ifdef _MSC_VER
-#include <../../../include/defines.h>
-#else
-#include <defines.h>
-#endif
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Software Control
Panel\0"
  _____  

Modified: trunk/reactos/lib/cpl/control/control.rc
--- trunk/reactos/lib/cpl/control/control.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/control/control.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,12 +1,8 @@

 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
-#ifndef MS_COMPILER
 #include <reactos/resource.h>
-#include <defines.h>
-#else
-#include <../../../include/defines.h>
-#endif
+#include <windows.h>
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS System Control Panel\0"
 #define REACTOS_STR_INTERNAL_NAME	"control\0"
  _____  

Modified: trunk/reactos/lib/cpl/cplsample/cplsample.rc
--- trunk/reactos/lib/cpl/cplsample/cplsample.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/lib/cpl/cplsample/cplsample.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/cpl/intl/intl.rc
--- trunk/reactos/lib/cpl/intl/intl.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/cpl/intl/intl.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/cpl/liccpa/liccpa.rc
--- trunk/reactos/lib/cpl/liccpa/liccpa.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/liccpa/liccpa.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,6 +1,6 @@

 /* $Id: cplsample.rc 12852 2005-01-06 13:58:04Z mf $ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/cpl/main/main.rc
--- trunk/reactos/lib/cpl/main/main.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/cpl/main/main.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/cpl/ncpa/ncpa.rc
--- trunk/reactos/lib/cpl/ncpa/ncpa.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/cpl/ncpa/ncpa.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,11 +1,7 @@

 /* $Id$ */
 
 #include "resource.h"
-#ifdef _MSC_VER
-#include <../../../include/defines.h>
-#else
-#include <defines.h>
-#endif
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Network Control
Panel\0"
  _____  

Modified: trunk/reactos/lib/cpl/sysdm/sysdm.rc
--- trunk/reactos/lib/cpl/sysdm/sysdm.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/sysdm/sysdm.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -2,7 +2,6 @@

 #include "resource.h"
 #include "windows.h"
 
-#include <defines.h>
 #include <commctrl.h>
 #include "resource.h"
 
  _____  

Modified: trunk/reactos/lib/cpl/timedate/timedate.rc
--- trunk/reactos/lib/cpl/timedate/timedate.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/cpl/timedate/timedate.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,6 +1,5 @@

 #include <windows.h>
 #include <commctrl.h>
-#include <defines.h>
 
 #include "resource.h"
 
  _____  

Modified: trunk/reactos/lib/devmgr/devmgr.rc
--- trunk/reactos/lib/devmgr/devmgr.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/devmgr/devmgr.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/dhcpcapi/dhcpcapi.rc
--- trunk/reactos/lib/dhcpcapi/dhcpcapi.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/dhcpcapi/dhcpcapi.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"DHCP Client API\0"
  _____  

Modified: trunk/reactos/lib/msgina/msgina.rc
--- trunk/reactos/lib/msgina/msgina.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/msgina/msgina.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,4 +1,4 @@

-#include "defines.h"
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/rpcrt4/rpcrt4.rc
--- trunk/reactos/lib/rpcrt4/rpcrt4.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/rpcrt4/rpcrt4.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS RPC server API\0"
  _____  

Modified: trunk/reactos/lib/shellext/slayer/slayer.rc
--- trunk/reactos/lib/shellext/slayer/slayer.rc	2005-06-17 11:22:47 UTC
(rev 15967)
+++ trunk/reactos/lib/shellext/slayer/slayer.rc	2005-06-17 11:28:23 UTC
(rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_VERSION_DLL
  _____  

Modified: trunk/reactos/lib/user32/user32.rc
--- trunk/reactos/lib/user32/user32.rc	2005-06-17 11:22:47 UTC (rev
15967)
+++ trunk/reactos/lib/user32/user32.rc	2005-06-17 11:28:23 UTC (rev
15968)
@@ -1,7 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
-#include <winuser.h>
+#include <windows.h>
 
 #include <resource.h>
 
  _____  

Modified: trunk/reactos/subsys/system/explorer/explorer.rc
--- trunk/reactos/subsys/system/explorer/explorer.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/explorer/explorer.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 
 #include "explorer_intres.rc"
 
  _____  

Modified: trunk/reactos/subsys/system/ibrowser/ibrowser.rc
--- trunk/reactos/subsys/system/ibrowser/ibrowser.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/ibrowser/ibrowser.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id: ibrowser.rc 12752 2005-01-03 11:25:40Z mf $ */
 
-#include <defines.h>
+#include <windows.h>
 
 #include "ibrowser_intres.rc"
 
  _____  

Modified: trunk/reactos/subsys/system/reactos/reactos.rc
--- trunk/reactos/subsys/system/reactos/reactos.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/reactos/reactos.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Setup\0"
  _____  

Modified: trunk/reactos/subsys/system/regedit/regedit.rc
--- trunk/reactos/subsys/system/regedit/regedit.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/regedit/regedit.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -19,7 +19,7 @@

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
USA
  */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Registry Explorer\0"
  _____  

Modified: trunk/reactos/subsys/system/reporterror/reporterror.rc
--- trunk/reactos/subsys/system/reporterror/reporterror.rc
2005-06-17 11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/reporterror/reporterror.rc
2005-06-17 11:28:23 UTC (rev 15968)
@@ -1,4 +1,4 @@

-#include <defines.h>
+#include <windows.h>
 #include "reporterror.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Error Reporting
Assistant\0"
  _____  

Modified: trunk/reactos/subsys/system/sndvol32/sndvol32.rc
--- trunk/reactos/subsys/system/sndvol32/sndvol32.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/sndvol32/sndvol32.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resources.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Sound Volume Control\0"
  _____  

Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc
--- trunk/reactos/subsys/system/vmwinst/vmwinst.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/vmwinst/vmwinst.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "vmwinst.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS VMware(r) driver
installation utility\0"
  _____  

Modified: trunk/reactos/subsys/system/welcome/welcome.rc
--- trunk/reactos/subsys/system/welcome/welcome.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/welcome/welcome.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS-Welcome\0"
  _____  

Modified: trunk/reactos/subsys/system/winlogon/winlogon.rc
--- trunk/reactos/subsys/system/winlogon/winlogon.rc	2005-06-17
11:22:47 UTC (rev 15967)
+++ trunk/reactos/subsys/system/winlogon/winlogon.rc	2005-06-17
11:28:23 UTC (rev 15968)
@@ -1,6 +1,6 @@

 /* $Id$ */
 
-#include <defines.h>
+#include <windows.h>
 #include "resource.h"
 
 #define REACTOS_STR_FILE_DESCRIPTION	"ReactOS Logon Application\0"