ChangeLogTag:Tue Jan 25 15:17:58 UTC 2011 Steve Huston <shuston@riverace.com>

5 files changed, 46 insertions, 4 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index b099b1d6727..98c3e48f150 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Tue Jan 25 15:17:58 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/acemfcexe.mpb: The SubSystem value
+          for "Windows" on VC10 is "Windows", not "2" as it is for VC8-9.
+
+        * tests/ACE_Init_Test.ico: Reverted changes from
+          Fri Jan 21 00:15:19 UTC 2011  Steve Huston  <shuston@riverace.com>
+          The VC8 resource compiler had problems with the new .ico file.
+          Although it's an issue with the VC8 resource compiler that can be
+          worked around, the test builds and works fine with the older
+          ico file, so I just put it back.
+
+        * tests/ACE_Init_Test_Resource.h: Fixed fuzz errors.
+
+        * tests/ACE_Init_Test.rc: Replaced #include afxres.h with winres.h.
+          Although VS generates it that way, afxres.h isn't needed unless
+          MFC is used and won't be present when MFC components aren't installed.
+
 Tue Jan 25 10:52:53 UTC 2010  Martin Corino  <mcorino@remedy.nl>
 
         * ace/Object_Manager.cpp:
diff --git a/ACE/bin/MakeProjectCreator/config/acemfcexe.mpb b/ACE/bin/MakeProjectCreator/config/acemfcexe.mpb
index 4b136caa59e..c7bf95454f0 100644
--- a/ACE/bin/MakeProjectCreator/config/acemfcexe.mpb
+++ b/ACE/bin/MakeProjectCreator/config/acemfcexe.mpb
@@ -3,7 +3,12 @@
 
 project: aceexe, ace_mfc {
   specific(vc8, vc9, vc10) {
-    SubSystem = 2
     common_defines -= _CONSOLE
   }
+  specific(vc8, vc9) {
+    SubSystem = 2
+  }
+  specific(vc10) {
+    SubSystem = Windows
+  }
 }
diff --git a/ACE/tests/ACE_Init_Test.ico b/ACE/tests/ACE_Init_Test.ico
index eaa46bb9bff..7eef0bcbe65 100644
--- a/ACE/tests/ACE_Init_Test.ico
+++ b/ACE/tests/ACE_Init_Test.ico
diff --git a/ACE/tests/ACE_Init_Test.rc b/ACE/tests/ACE_Init_Test.rc
index d47fb193ba6..1ca781b69c9 100644
--- a/ACE/tests/ACE_Init_Test.rc
+++ b/ACE/tests/ACE_Init_Test.rc
@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -34,7 +34,7 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxres.h""\r\n"
+    "#include ""winres.h""\r\n"
     "\0"
 END
 
diff --git a/ACE/tests/ACE_Init_Test_Resource.h b/ACE/tests/ACE_Init_Test_Resource.h
index 158cfd08dd2..830d123178d 100644
--- a/ACE/tests/ACE_Init_Test_Resource.h
+++ b/ACE/tests/ACE_Init_Test_Resource.h
@@ -1,3 +1,22 @@
+/* -*- C++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    ACE_Init_Test_Resource.h
+//
+// = DESCRIPTION
+//   Header file for the ACE_INIT_TEST application.
+//
+// = AUTHOR
+//    Steve Huston <shuston@riverace.com>
+//
+// ============================================================================
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by ACE_Init_Test.rc
@@ -504,7 +523,7 @@
 #define SPVERSION_MASK                  0x0000FF00
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        130