ChangeLogTag:Fri Jan 21 00:15:19 UTC 2011 Steve Huston <shuston@riverace.com>

6 files changed, 595 insertions, 31 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fb8d98e34f..2e982dcc095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Fri Jan 21 00:15:19 UTC 2011  Steve Huston  <shuston@riverace.com>
+
+        * bin/MakeProjectCreator/config/acemfcexe.mpb: New base project
+          that sets the proper subsystem and macros for an MFC app.
+
+        * tests/ACE_Init_Test.ico:
+        * tests/ACE_Init_Test.rc:
+        * tests/ACE_Init_Test_Resource.h: Modernized resource defs to let
+          ACE_Init_Test build and run properly.
+
+        * tests/tests.mpc: Added the rest of the needed files for ACE_Init_Test
+          and made it require mfc; base it off acemfcexe (new, above).
+
 Mon Jan 17 20:47:01 UTC 2011  Steve Huston  <shuston@riverace.com>
 
         * ace/Asynch_Acceptor.cpp (handle_accept): If the new handler has
diff --git a/bin/MakeProjectCreator/config/acemfcexe.mpb b/bin/MakeProjectCreator/config/acemfcexe.mpb
new file mode 100644
index 00000000000..4b136caa59e
--- /dev/null
+++ b/bin/MakeProjectCreator/config/acemfcexe.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project: aceexe, ace_mfc {
+  specific(vc8, vc9, vc10) {
+    SubSystem = 2
+    common_defines -= _CONSOLE
+  }
+}
diff --git a/tests/ACE_Init_Test.ico b/tests/ACE_Init_Test.ico
index 7eef0bcbe65..eaa46bb9bff 100644
--- a/tests/ACE_Init_Test.ico
+++ b/tests/ACE_Init_Test.ico
diff --git a/tests/ACE_Init_Test.rc b/tests/ACE_Init_Test.rc
index 647f04a1ba6..d47fb193ba6 100644
--- a/tests/ACE_Init_Test.rc
+++ b/tests/ACE_Init_Test.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "ACE_Init_Test_Resource.h"
 
@@ -7,6 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
+#include "afxres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -15,6 +16,10 @@
 // English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -22,18 +27,18 @@
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE
+3 TEXTINCLUDE 
 BEGIN
     "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
     "#define _AFX_NO_OLE_RESOURCES\r\n"
@@ -45,7 +50,7 @@ BEGIN
     "LANGUAGE 9, 1\r\n"
     "#pragma code_page(1252)\r\n"
     "#endif\r\n"
-    "#include ""res\\ACE_Init_Test.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
+    "#include ""ACE_Init_Test.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
     "#endif\0"
 END
 
@@ -59,29 +64,25 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "ACE_Init_Test.ico"
+IDR_MAINFRAME           ICON                    "ACE_Init_Test.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-#ifdef APSTUDIO_INVOKED
 IDD_ACE_INIT_TEST_DIALOG DIALOGEX 0, 0, 185, 92
-STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
 CAPTION "ACE_Init_Test"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,128,7,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,128,23,50,14
-    LTEXT           "This box will auto-dismiss.",IDC_STATIC,13,7,113,
-                    8
+    LTEXT           "This box will auto-dismiss.",IDC_STATIC,13,7,113,8
 END
-#endif    // APSTUDIO_INVOKED
 
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -104,15 +105,13 @@ BEGIN
     BEGIN
         BLOCK "040904B0"
         BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "ACE_Init_Test MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "ACE_Init_Test\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "ACE_Init_Test.EXE\0"
-            VALUE "ProductName", "ACE_Init_Test Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
+            VALUE "FileDescription", "ACE_Init_Test MFC Application"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "ACE_Init_Test"
+            VALUE "LegalCopyright", "Copyright (C) 1999"
+            VALUE "OriginalFilename", "ACE_Init_Test.EXE"
+            VALUE "ProductName", "ACE_Init_Test Application"
+            VALUE "ProductVersion", "1, 0, 0, 1"
         END
     END
     BLOCK "VarFileInfo"
@@ -121,7 +120,37 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
+IDR_VERSION2 VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "ACE_Init Application"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "ACE_Init"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
+            VALUE "OriginalFilename", "ACE_Init.exe"
+            VALUE "ProductName", "ACE_Init Application"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -130,7 +159,7 @@ END
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE
+GUIDELINES DESIGNINFO 
 BEGIN
     IDD_ACE_INIT_TEST_DIALOG, DIALOG
     BEGIN
diff --git a/tests/ACE_Init_Test_Resource.h b/tests/ACE_Init_Test_Resource.h
index 102cdab13e3..158cfd08dd2 100644
--- a/tests/ACE_Init_Test_Resource.h
+++ b/tests/ACE_Init_Test_Resource.h
@@ -1,17 +1,513 @@
-// $Id$
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by ACE_INIT_TEST.RC
+// Used by ACE_Init_Test.rc
 //
-#define IDR_MAINFRAME                   128
+#define ID_SEPARATOR                    0
+#define VS_VERSION_INFO                 1
+#define AFX_IDC_LISTBOX                 100
+#define AFX_IDC_CHANGE                  101
 #define IDD_ACE_INIT_TEST_DIALOG        102
+#define AFX_IDC_BROWSER                 102
+#define IDR_MAINFRAME                   128
+#define IDR_VERSION2                    129
+#define AFX_IDC_PRINT_DOCNAME           201
+#define AFX_IDC_PRINT_PRINTERNAME       202
+#define AFX_IDC_PRINT_PORTNAME          203
+#define AFX_IDC_PRINT_PAGENUM           204
+#define SUBVERSION_MASK                 0x000000FF
+#define _WIN32_IE_IE20                  0x0200
+#define _WIN32_IE_IE30                  0x0300
+#define _WIN32_IE_IE302                 0x0302
+#define ID_MFCLOC_MANIFEST              1000
+#define AFX_IDC_FONTPROP                1000
+#define AFX_IDC_FONTNAMES               1001
+#define AFX_IDC_FONTSTYLES              1002
+#define AFX_IDC_FONTSIZES               1003
+#define AFX_IDC_STRIKEOUT               1004
+#define AFX_IDC_UNDERLINE               1005
+#define AFX_IDC_SAMPLEBOX               1006
+#define _WIN32_WINNT_NT4                0x0400
+#define _WIN32_IE_IE40                  0x0400
+#define _WIN32_IE_IE401                 0x0401
+#define AFX_IDC_COLOR_BLACK             1100
+#define AFX_IDC_COLOR_WHITE             1101
+#define AFX_IDC_COLOR_RED               1102
+#define AFX_IDC_COLOR_GREEN             1103
+#define AFX_IDC_COLOR_BLUE              1104
+#define AFX_IDC_COLOR_YELLOW            1105
+#define AFX_IDC_COLOR_MAGENTA           1106
+#define AFX_IDC_COLOR_CYAN              1107
+#define AFX_IDC_COLOR_GRAY              1108
+#define AFX_IDC_COLOR_LIGHTGRAY         1109
+#define AFX_IDC_COLOR_DARKRED           1110
+#define AFX_IDC_COLOR_DARKGREEN         1111
+#define AFX_IDC_COLOR_DARKBLUE          1112
+#define AFX_IDC_COLOR_LIGHTBROWN        1113
+#define AFX_IDC_COLOR_DARKMAGENTA       1114
+#define AFX_IDC_COLOR_DARKCYAN          1115
+#define AFX_IDC_COLORPROP               1116
+#define AFX_IDC_SYSTEMCOLORS            1117
+#define AFX_IDC_PROPNAME                1201
+#define AFX_IDC_PICTURE                 1202
+#define AFX_IDC_BROWSE                  1203
+#define AFX_IDC_CLEAR                   1204
+#define _WIN32_WINNT_WIN2K              0x0500
+#define _WIN32_IE_IE50                  0x0500
+#define _WIN32_WINNT_WINXP              0x0501
+#define _WIN32_IE_IE501                 0x0501
+#define _WIN32_WINNT_WS03               0x0502
+#define _WIN32_IE_IE55                  0x0550
+#define _WIN32_WINNT_LONGHORN           0x0600
+#define _WIN32_IE_IE60                  0x0600
+#define _WIN32_IE_IE60SP1               0x0601
+#define _WIN32_IE_WS03                  0x0602
+#define _WIN32_IE_IE60SP2               0x0603
+#define _WIN32_IE_IE70                  0x0700
+#define AFX_IDC_TAB_CONTROL             0x3020
+#define ID_APPLY_NOW                    0x3021
+#define ID_WIZBACK                      0x3023
+#define ID_WIZNEXT                      0x3024
+#define ID_WIZFINISH                    0x3025
+#define AFX_IDD_NEWTYPEDLG              30721
+#define AFX_IDD_PRINTDLG                30722
+#define AFX_IDD_PREVIEW_TOOLBAR         30723
+#define AFX_IDD_INSERTOBJECT            30724
+#define AFX_IDD_CHANGEICON              30725
+#define AFX_IDD_CONVERT                 30726
+#define AFX_IDD_PASTESPECIAL            30727
+#define AFX_IDD_EDITLINKS               30728
+#define AFX_IDD_FILEBROWSE              30729
+#define AFX_IDD_BUSY                    30730
+#define AFX_IDD_OBJECTPROPERTIES        30732
+#define AFX_IDD_CHANGESOURCE            30733
+#define AFX_IDD_EMPTYDIALOG             30734
+#define AFX_IDC_CONTEXTHELP             30977
+#define AFX_IDC_MAGNIFY                 30978
+#define AFX_IDC_SMALLARROWS             30979
+#define AFX_IDC_HSPLITBAR               30980
+#define AFX_IDC_VSPLITBAR               30981
+#define AFX_IDC_NODROPCRSR              30982
+#define AFX_IDC_TRACKNWSE               30983
+#define AFX_IDC_TRACKNESW               30984
+#define AFX_IDC_TRACKNS                 30985
+#define AFX_IDC_TRACKWE                 30986
+#define AFX_IDC_TRACK4WAY               30987
+#define AFX_IDC_MOVE4WAY                30988
+#define AFX_IDB_MINIFRAME_MENU          30994
+#define AFX_IDB_CHECKLISTBOX_95         30996
+#define AFX_IDR_PREVIEW_ACCEL           30997
+#define AFX_IDC_MOUSE_PAN_NW            30998
+#define AFX_IDC_MOUSE_PAN_N             30999
+#define AFX_IDC_MOUSE_PAN_NE            31000
+#define AFX_IDC_MOUSE_PAN_W             31001
+#define AFX_IDC_MOUSE_PAN_HV            31002
+#define AFX_IDC_MOUSE_PAN_E             31003
+#define AFX_IDC_MOUSE_PAN_SW            31004
+#define AFX_IDC_MOUSE_PAN_S             31005
+#define AFX_IDC_MOUSE_PAN_SE            31006
+#define AFX_IDC_MOUSE_PAN_HORZ          31007
+#define AFX_IDC_MOUSE_PAN_VERT          31008
+#define AFX_IDC_MOUSE_ORG_HORZ          31009
+#define AFX_IDC_MOUSE_ORG_VERT          31010
+#define AFX_IDC_MOUSE_ORG_HV            31011
+#define AFX_IDC_MOUSE_MASK              31012
+#define AFX_IDI_STD_MDIFRAME            31233
+#define AFX_IDI_STD_FRAME               31234
+#define AFX_IDD_PROPPAGE_COLOR          32257
+#define AFX_IDD_PROPPAGE_FONT           32258
+#define AFX_IDD_PROPPAGE_PICTURE        32259
+#define AFX_IDB_TRUETYPE                32384
+#define AFX_IDS_APP_TITLE               0xE000
+#define AFX_IDS_IDLEMESSAGE             0xE001
+#define AFX_IDS_HELPMODEMESSAGE         0xE002
+#define AFX_IDS_APP_TITLE_EMBEDDING     0xE003
+#define AFX_IDS_COMPANY_NAME            0xE004
+#define AFX_IDS_OBJ_TITLE_INPLACE       0xE005
+#define ID_FILE_NEW                     0xE100
+#define ID_FILE_OPEN                    0xE101
+#define ID_FILE_CLOSE                   0xE102
+#define ID_FILE_SAVE                    0xE103
+#define ID_FILE_SAVE_AS                 0xE104
+#define ID_FILE_PAGE_SETUP              0xE105
+#define ID_FILE_PRINT_SETUP             0xE106
+#define ID_FILE_PRINT                   0xE107
+#define ID_FILE_PRINT_DIRECT            0xE108
+#define ID_FILE_PRINT_PREVIEW           0xE109
+#define ID_FILE_UPDATE                  0xE10A
+#define ID_FILE_SAVE_COPY_AS            0xE10B
+#define ID_FILE_SEND_MAIL               0xE10C
+#define ID_FILE_NEW_FRAME               0xE10D
+#define ID_FILE_MRU_FIRST               0xE110
+#define ID_FILE_MRU_FILE1               0xE110
+#define ID_FILE_MRU_FILE2               0xE111
+#define ID_FILE_MRU_FILE3               0xE112
+#define ID_FILE_MRU_FILE4               0xE113
+#define ID_FILE_MRU_FILE5               0xE114
+#define ID_FILE_MRU_FILE6               0xE115
+#define ID_FILE_MRU_FILE7               0xE116
+#define ID_FILE_MRU_FILE8               0xE117
+#define ID_FILE_MRU_FILE9               0xE118
+#define ID_FILE_MRU_FILE10              0xE119
+#define ID_FILE_MRU_FILE11              0xE11A
+#define ID_FILE_MRU_FILE12              0xE11B
+#define ID_FILE_MRU_FILE13              0xE11C
+#define ID_FILE_MRU_FILE14              0xE11D
+#define ID_FILE_MRU_FILE15              0xE11E
+#define ID_FILE_MRU_FILE16              0xE11F
+#define ID_FILE_MRU_LAST                0xE11F
+#define ID_EDIT_CLEAR                   0xE120
+#define ID_EDIT_CLEAR_ALL               0xE121
+#define ID_EDIT_COPY                    0xE122
+#define ID_EDIT_CUT                     0xE123
+#define ID_EDIT_FIND                    0xE124
+#define ID_EDIT_PASTE                   0xE125
+#define ID_EDIT_PASTE_LINK              0xE126
+#define ID_EDIT_PASTE_SPECIAL           0xE127
+#define ID_EDIT_REPEAT                  0xE128
+#define ID_EDIT_REPLACE                 0xE129
+#define ID_EDIT_SELECT_ALL              0xE12A
+#define ID_EDIT_UNDO                    0xE12B
+#define ID_EDIT_REDO                    0xE12C
+#define ID_WINDOW_NEW                   0xE130
+#define ID_WINDOW_ARRANGE               0xE131
+#define ID_WINDOW_CASCADE               0xE132
+#define ID_WINDOW_TILE_HORZ             0xE133
+#define ID_WINDOW_TILE_VERT             0xE134
+#define ID_WINDOW_SPLIT                 0xE135
+#define ID_APP_ABOUT                    0xE140
+#define ID_APP_EXIT                     0xE141
+#define ID_HELP_INDEX                   0xE142
+#define ID_HELP_FINDER                  0xE143
+#define ID_HELP_USING                   0xE144
+#define ID_CONTEXT_HELP                 0xE145
+#define ID_HELP                         0xE146
+#define ID_DEFAULT_HELP                 0xE147
+#define ID_NEXT_PANE                    0xE150
+#define ID_PREV_PANE                    0xE151
+#define ID_FORMAT_FONT                  0xE160
+#define ID_OLE_INSERT_NEW               0xE200
+#define ID_OLE_EDIT_LINKS               0xE201
+#define ID_OLE_EDIT_CONVERT             0xE202
+#define ID_OLE_EDIT_CHANGE_ICON         0xE203
+#define ID_OLE_EDIT_PROPERTIES          0xE204
+#define ID_OLE_VERB_FIRST               0xE210
+#define AFX_ID_PREVIEW_CLOSE            0xE300
+#define AFX_ID_PREVIEW_NUMPAGE          0xE301
+#define AFX_ID_PREVIEW_NEXT             0xE302
+#define AFX_ID_PREVIEW_PREV             0xE303
+#define AFX_ID_PREVIEW_PRINT            0xE304
+#define AFX_ID_PREVIEW_ZOOMIN           0xE305
+#define AFX_ID_PREVIEW_ZOOMOUT          0xE306
+#define ID_INDICATOR_EXT                0xE700
+#define ID_INDICATOR_CAPS               0xE701
+#define ID_INDICATOR_NUM                0xE702
+#define ID_INDICATOR_SCRL               0xE703
+#define ID_INDICATOR_OVR                0xE704
+#define ID_INDICATOR_REC                0xE705
+#define ID_INDICATOR_KANA               0xE706
+#define ID_VIEW_TOOLBAR                 0xE800
+#define ID_VIEW_STATUS_BAR              0xE801
+#define ID_VIEW_REBAR                   0xE804
+#define ID_VIEW_AUTOARRANGE             0xE805
+#define ID_VIEW_SMALLICON               0xE810
+#define ID_VIEW_LARGEICON               0xE811
+#define ID_VIEW_LIST                    0xE812
+#define ID_VIEW_DETAILS                 0xE813
+#define ID_VIEW_LINEUP                  0xE814
+#define ID_VIEW_BYNAME                  0xE815
+#define ID_RECORD_FIRST                 0xE900
+#define ID_RECORD_LAST                  0xE901
+#define ID_RECORD_NEXT                  0xE902
+#define ID_RECORD_PREV                  0xE903
+#define AFX_IDS_SCSIZE                  0xEF00
+#define AFX_IDS_SCMOVE                  0xEF01
+#define AFX_IDS_SCMINIMIZE              0xEF02
+#define AFX_IDS_SCMAXIMIZE              0xEF03
+#define AFX_IDS_SCNEXTWINDOW            0xEF04
+#define AFX_IDS_SCPREVWINDOW            0xEF05
+#define AFX_IDS_SCCLOSE                 0xEF06
+#define AFX_IDS_SCRESTORE               0xEF12
+#define AFX_IDS_SCTASKLIST              0xEF13
+#define AFX_IDS_MDICHILD                0xEF1F
+#define AFX_IDS_DESKACCESSORY           0xEFDA
+#define AFX_IDS_OPENFILE                0xF000
+#define AFX_IDS_SAVEFILE                0xF001
+#define AFX_IDS_ALLFILTER               0xF002
+#define AFX_IDS_UNTITLED                0xF003
+#define AFX_IDS_SAVEFILECOPY            0xF004
+#define AFX_IDS_PREVIEW_CLOSE           0xF005
+#define AFX_IDS_UNNAMED_FILE            0xF006
+#define AFX_IDS_HIDE                    0xF011
+#define AFX_IDP_NO_ERROR_AVAILABLE      0xF020
+#define AFX_IDS_NOT_SUPPORTED_EXCEPTION 0xF021
+#define AFX_IDS_RESOURCE_EXCEPTION      0xF022
+#define AFX_IDS_MEMORY_EXCEPTION        0xF023
+#define AFX_IDS_USER_EXCEPTION          0xF024
+#define AFX_IDS_INVALID_ARG_EXCEPTION   0xF025
+#define AFX_IDS_PRINTONPORT             0xF040
+#define AFX_IDS_ONEPAGE                 0xF041
+#define AFX_IDS_TWOPAGE                 0xF042
+#define AFX_IDS_PRINTPAGENUM            0xF043
+#define AFX_IDS_PREVIEWPAGEDESC         0xF044
+#define AFX_IDS_PRINTDEFAULTEXT         0xF045
+#define AFX_IDS_PRINTDEFAULT            0xF046
+#define AFX_IDS_PRINTFILTER             0xF047
+#define AFX_IDS_PRINTCAPTION            0xF048
+#define AFX_IDS_PRINTTOFILE             0xF049
+#define AFX_IDS_OBJECT_MENUITEM         0xF080
+#define AFX_IDS_EDIT_VERB               0xF081
+#define AFX_IDS_ACTIVATE_VERB           0xF082
+#define AFX_IDS_CHANGE_LINK             0xF083
+#define AFX_IDS_AUTO                    0xF084
+#define AFX_IDS_MANUAL                  0xF085
+#define AFX_IDS_FROZEN                  0xF086
+#define AFX_IDS_ALL_FILES               0xF087
+#define AFX_IDS_SAVE_MENU               0xF088
+#define AFX_IDS_UPDATE_MENU             0xF089
+#define AFX_IDS_SAVE_AS_MENU            0xF08A
+#define AFX_IDS_SAVE_COPY_AS_MENU       0xF08B
+#define AFX_IDS_EXIT_MENU               0xF08C
+#define AFX_IDS_UPDATING_ITEMS          0xF08D
+#define AFX_IDS_METAFILE_FORMAT         0xF08E
+#define AFX_IDS_DIB_FORMAT              0xF08F
+#define AFX_IDS_BITMAP_FORMAT           0xF090
+#define AFX_IDS_LINKSOURCE_FORMAT       0xF091
+#define AFX_IDS_EMBED_FORMAT            0xF092
+#define AFX_IDS_PASTELINKEDTYPE         0xF094
+#define AFX_IDS_UNKNOWNTYPE             0xF095
+#define AFX_IDS_RTF_FORMAT              0xF096
+#define AFX_IDS_TEXT_FORMAT             0xF097
+#define AFX_IDS_INVALID_CURRENCY        0xF098
+#define AFX_IDS_INVALID_DATETIME        0xF099
+#define AFX_IDS_INVALID_DATETIMESPAN    0xF09A
+#define AFX_IDP_INVALID_FILENAME        0xF100
+#define AFX_IDP_FAILED_TO_OPEN_DOC      0xF101
+#define AFX_IDP_FAILED_TO_SAVE_DOC      0xF102
+#define AFX_IDP_ASK_TO_SAVE             0xF103
+#define AFX_IDP_FAILED_TO_CREATE_DOC    0xF104
+#define AFX_IDP_FILE_TOO_LARGE          0xF105
+#define AFX_IDP_FAILED_TO_START_PRINT   0xF106
+#define AFX_IDP_FAILED_TO_LAUNCH_HELP   0xF107
+#define AFX_IDP_INTERNAL_FAILURE        0xF108
+#define AFX_IDP_COMMAND_FAILURE         0xF109
+#define AFX_IDP_FAILED_MEMORY_ALLOC     0xF10A
+#define AFX_IDP_UNREG_DONE              0xF10B
+#define AFX_IDP_UNREG_FAILURE           0xF10C
+#define AFX_IDP_DLL_LOAD_FAILED         0xF10D
+#define AFX_IDP_DLL_BAD_VERSION         0xF10E
+#define AFX_IDP_PARSE_INT               0xF110
+#define AFX_IDP_PARSE_REAL              0xF111
+#define AFX_IDP_PARSE_INT_RANGE         0xF112
+#define AFX_IDP_PARSE_REAL_RANGE        0xF113
+#define AFX_IDP_PARSE_STRING_SIZE       0xF114
+#define AFX_IDP_PARSE_RADIO_BUTTON      0xF115
+#define AFX_IDP_PARSE_BYTE              0xF116
+#define AFX_IDP_PARSE_UINT              0xF117
+#define AFX_IDP_PARSE_DATETIME          0xF118
+#define AFX_IDP_PARSE_CURRENCY          0xF119
+#define AFX_IDP_PARSE_GUID              0xF11A
+#define AFX_IDP_PARSE_TIME              0xF11B
+#define AFX_IDP_PARSE_DATE              0xF11C
+#define AFX_IDP_FAILED_INVALID_FORMAT   0xF120
+#define AFX_IDP_FAILED_INVALID_PATH     0xF121
+#define AFX_IDP_FAILED_DISK_FULL        0xF122
+#define AFX_IDP_FAILED_ACCESS_READ      0xF123
+#define AFX_IDP_FAILED_ACCESS_WRITE     0xF124
+#define AFX_IDP_FAILED_IO_ERROR_READ    0xF125
+#define AFX_IDP_FAILED_IO_ERROR_WRITE   0xF126
+#define AFX_IDP_SCRIPT_ERROR            0xF130
+#define AFX_IDP_SCRIPT_DISPATCH_EXCEPTION 0xF131
+#define AFX_IDP_STATIC_OBJECT           0xF180
+#define AFX_IDP_FAILED_TO_CONNECT       0xF181
+#define AFX_IDP_SERVER_BUSY             0xF182
+#define AFX_IDP_BAD_VERB                0xF183
+#define AFX_IDS_NOT_DOCOBJECT           0xF184
+#define AFX_IDP_FAILED_TO_NOTIFY        0xF185
+#define AFX_IDP_FAILED_TO_LAUNCH        0xF186
+#define AFX_IDP_ASK_TO_UPDATE           0xF187
+#define AFX_IDP_FAILED_TO_UPDATE        0xF188
+#define AFX_IDP_FAILED_TO_REGISTER      0xF189
+#define AFX_IDP_FAILED_TO_AUTO_REGISTER 0xF18A
+#define AFX_IDP_FAILED_TO_CONVERT       0xF18B
+#define AFX_IDP_GET_NOT_SUPPORTED       0xF18C
+#define AFX_IDP_SET_NOT_SUPPORTED       0xF18D
+#define AFX_IDP_ASK_TO_DISCARD          0xF18E
+#define AFX_IDP_FAILED_TO_CREATE        0xF18F
+#define AFX_IDP_FAILED_MAPI_LOAD        0xF190
+#define AFX_IDP_INVALID_MAPI_DLL        0xF191
+#define AFX_IDP_FAILED_MAPI_SEND        0xF192
+#define AFX_IDP_FILE_NONE               0xF1A0
+#define AFX_IDP_FILE_GENERIC            0xF1A1
+#define AFX_IDP_FILE_NOT_FOUND          0xF1A2
+#define AFX_IDP_FILE_BAD_PATH           0xF1A3
+#define AFX_IDP_FILE_TOO_MANY_OPEN      0xF1A4
+#define AFX_IDP_FILE_ACCESS_DENIED      0xF1A5
+#define AFX_IDP_FILE_INVALID_FILE       0xF1A6
+#define AFX_IDP_FILE_REMOVE_CURRENT     0xF1A7
+#define AFX_IDP_FILE_DIR_FULL           0xF1A8
+#define AFX_IDP_FILE_BAD_SEEK           0xF1A9
+#define AFX_IDP_FILE_HARD_IO            0xF1AA
+#define AFX_IDP_FILE_SHARING            0xF1AB
+#define AFX_IDP_FILE_LOCKING            0xF1AC
+#define AFX_IDP_FILE_DISKFULL           0xF1AD
+#define AFX_IDP_FILE_EOF                0xF1AE
+#define AFX_IDP_ARCH_NONE               0xF1B0
+#define AFX_IDP_ARCH_GENERIC            0xF1B1
+#define AFX_IDP_ARCH_READONLY           0xF1B2
+#define AFX_IDP_ARCH_ENDOFFILE          0xF1B3
+#define AFX_IDP_ARCH_WRITEONLY          0xF1B4
+#define AFX_IDP_ARCH_BADINDEX           0xF1B5
+#define AFX_IDP_ARCH_BADCLASS           0xF1B6
+#define AFX_IDP_ARCH_BADSCHEMA          0xF1B7
+#define AFX_IDS_OCC_SCALEUNITS_PIXELS   0xF1C0
+#define AFX_IDS_STATUS_FONT             0xF230
+#define AFX_IDS_TOOLTIP_FONT            0xF231
+#define AFX_IDS_UNICODE_FONT            0xF232
+#define AFX_IDS_MINI_FONT               0xF233
+#define AFX_IDP_SQL_CONNECT_FAIL        0xF281
+#define AFX_IDP_SQL_RECORDSET_FORWARD_ONLY 0xF282
+#define AFX_IDP_SQL_EMPTY_COLUMN_LIST   0xF283
+#define AFX_IDP_SQL_FIELD_SCHEMA_MISMATCH 0xF284
+#define AFX_IDP_SQL_ILLEGAL_MODE        0xF285
+#define AFX_IDP_SQL_MULTIPLE_ROWS_AFFECTED 0xF286
+#define AFX_IDP_SQL_NO_CURRENT_RECORD   0xF287
+#define AFX_IDP_SQL_NO_ROWS_AFFECTED    0xF288
+#define AFX_IDP_SQL_RECORDSET_READONLY  0xF289
+#define AFX_IDP_SQL_SQL_NO_TOTAL        0xF28A
+#define AFX_IDP_SQL_ODBC_LOAD_FAILED    0xF28B
+#define AFX_IDP_SQL_DYNASET_NOT_SUPPORTED 0xF28C
+#define AFX_IDP_SQL_SNAPSHOT_NOT_SUPPORTED 0xF28D
+#define AFX_IDP_SQL_API_CONFORMANCE     0xF28E
+#define AFX_IDP_SQL_SQL_CONFORMANCE     0xF28F
+#define AFX_IDP_SQL_NO_DATA_FOUND       0xF290
+#define AFX_IDP_SQL_ROW_UPDATE_NOT_SUPPORTED 0xF291
+#define AFX_IDP_SQL_ODBC_V2_REQUIRED    0xF292
+#define AFX_IDP_SQL_NO_POSITIONED_UPDATES 0xF293
+#define AFX_IDP_SQL_LOCK_MODE_NOT_SUPPORTED 0xF294
+#define AFX_IDP_SQL_DATA_TRUNCATED      0xF295
+#define AFX_IDP_SQL_ROW_FETCH           0xF296
+#define AFX_IDP_SQL_INCORRECT_ODBC      0xF297
+#define AFX_IDP_SQL_UPDATE_DELETE_FAILED 0xF298
+#define AFX_IDP_SQL_DYNAMIC_CURSOR_NOT_SUPPORTED 0xF299
+#define AFX_IDP_SQL_FIELD_NOT_FOUND     0xF29A
+#define AFX_IDP_SQL_BOOKMARKS_NOT_SUPPORTED 0xF29B
+#define AFX_IDP_SQL_BOOKMARKS_NOT_ENABLED 0xF29C
+#define AFX_IDS_DELETED                 0xF29D
+#define AFX_IDP_DAO_ENGINE_INITIALIZATION 0xF2B0
+#define AFX_IDP_DAO_DFX_BIND            0xF2B1
+#define AFX_IDP_DAO_OBJECT_NOT_OPEN     0xF2B2
+#define AFX_IDP_DAO_ROWTOOSHORT         0xF2B3
+#define AFX_IDP_DAO_BADBINDINFO         0xF2B4
+#define AFX_IDP_DAO_COLUMNUNAVAILABLE   0xF2B5
+#define AFX_IDS_HTTP_TITLE              0xF2D1
+#define AFX_IDS_HTTP_NO_TEXT            0xF2D2
+#define AFX_IDS_HTTP_BAD_REQUEST        0xF2D3
+#define AFX_IDS_HTTP_AUTH_REQUIRED      0xF2D4
+#define AFX_IDS_HTTP_FORBIDDEN          0xF2D5
+#define AFX_IDS_HTTP_NOT_FOUND          0xF2D6
+#define AFX_IDS_HTTP_SERVER_ERROR       0xF2D7
+#define AFX_IDS_HTTP_NOT_IMPLEMENTED    0xF2D8
+#define AFX_IDS_CHECKLISTBOX_UNCHECK    0xF2E1
+#define AFX_IDS_CHECKLISTBOX_CHECK      0xF2E2
+#define AFX_IDS_CHECKLISTBOX_MIXED      0xF2E3
+#define AFX_IDS_PROPPAGE_UNKNOWN        0xFE01
+#define AFX_IDS_COLOR_DESKTOP           0xFE04
+#define AFX_IDS_COLOR_APPWORKSPACE      0xFE05
+#define AFX_IDS_COLOR_WNDBACKGND        0xFE06
+#define AFX_IDS_COLOR_WNDTEXT           0xFE07
+#define AFX_IDS_COLOR_MENUBAR           0xFE08
+#define AFX_IDS_COLOR_MENUTEXT          0xFE09
+#define AFX_IDS_COLOR_ACTIVEBAR         0xFE0A
+#define AFX_IDS_COLOR_INACTIVEBAR       0xFE0B
+#define AFX_IDS_COLOR_ACTIVETEXT        0xFE0C
+#define AFX_IDS_COLOR_INACTIVETEXT      0xFE0D
+#define AFX_IDS_COLOR_ACTIVEBORDER      0xFE0E
+#define AFX_IDS_COLOR_INACTIVEBORDER    0xFE0F
+#define AFX_IDS_COLOR_WNDFRAME          0xFE10
+#define AFX_IDS_COLOR_SCROLLBARS        0xFE11
+#define AFX_IDS_COLOR_BTNFACE           0xFE12
+#define AFX_IDS_COLOR_BTNSHADOW         0xFE13
+#define AFX_IDS_COLOR_BTNTEXT           0xFE14
+#define AFX_IDS_COLOR_BTNHIGHLIGHT      0xFE15
+#define AFX_IDS_COLOR_DISABLEDTEXT      0xFE16
+#define AFX_IDS_COLOR_HIGHLIGHT         0xFE17
+#define AFX_IDS_COLOR_HIGHLIGHTTEXT     0xFE18
+#define AFX_IDS_REGULAR                 0xFE19
+#define AFX_IDS_BOLD                    0xFE1A
+#define AFX_IDS_ITALIC                  0xFE1B
+#define AFX_IDS_BOLDITALIC              0xFE1C
+#define AFX_IDS_SAMPLETEXT              0xFE1D
+#define AFX_IDS_DISPLAYSTRING_FONT      0xFE1E
+#define AFX_IDS_DISPLAYSTRING_COLOR     0xFE1F
+#define AFX_IDS_DISPLAYSTRING_PICTURE   0xFE20
+#define AFX_IDS_PICTUREFILTER           0xFE21
+#define AFX_IDS_PICTYPE_UNKNOWN         0xFE22
+#define AFX_IDS_PICTYPE_NONE            0xFE23
+#define AFX_IDS_PICTYPE_BITMAP          0xFE24
+#define AFX_IDS_PICTYPE_METAFILE        0xFE25
+#define AFX_IDS_PICTYPE_ICON            0xFE26
+#define AFX_IDS_COLOR_PPG               0xFE28
+#define AFX_IDS_COLOR_PPG_CAPTION       0xFE29
+#define AFX_IDS_FONT_PPG                0xFE2A
+#define AFX_IDS_FONT_PPG_CAPTION        0xFE2B
+#define AFX_IDS_PICTURE_PPG             0xFE2C
+#define AFX_IDS_PICTURE_PPG_CAPTION     0xFE2D
+#define AFX_IDS_PICTUREBROWSETITLE      0xFE30
+#define AFX_IDS_BORDERSTYLE_0           0xFE31
+#define AFX_IDS_BORDERSTYLE_1           0xFE32
+#define AFX_IDS_VERB_EDIT               0xFE40
+#define AFX_IDS_VERB_PROPERTIES         0xFE41
+#define AFX_IDP_PICTURECANTOPEN         0xFE83
+#define AFX_IDP_PICTURECANTLOAD         0xFE84
+#define AFX_IDP_PICTURETOOLARGE         0xFE85
+#define AFX_IDP_PICTUREREADFAILED       0xFE86
+#define AFX_IDP_E_ILLEGALFUNCTIONCALL   0xFEA0
+#define AFX_IDP_E_OVERFLOW              0xFEA1
+#define AFX_IDP_E_OUTOFMEMORY           0xFEA2
+#define AFX_IDP_E_DIVISIONBYZERO        0xFEA3
+#define AFX_IDP_E_OUTOFSTRINGSPACE      0xFEA4
+#define AFX_IDP_E_OUTOFSTACKSPACE       0xFEA5
+#define AFX_IDP_E_BADFILENAMEORNUMBER   0xFEA6
+#define AFX_IDP_E_FILENOTFOUND          0xFEA7
+#define AFX_IDP_E_BADFILEMODE           0xFEA8
+#define AFX_IDP_E_FILEALREADYOPEN       0xFEA9
+#define AFX_IDP_E_DEVICEIOERROR         0xFEAA
+#define AFX_IDP_E_FILEALREADYEXISTS     0xFEAB
+#define AFX_IDP_E_BADRECORDLENGTH       0xFEAC
+#define AFX_IDP_E_DISKFULL              0xFEAD
+#define AFX_IDP_E_BADRECORDNUMBER       0xFEAE
+#define AFX_IDP_E_BADFILENAME           0xFEAF
+#define AFX_IDP_E_TOOMANYFILES          0xFEB0
+#define AFX_IDP_E_DEVICEUNAVAILABLE     0xFEB1
+#define AFX_IDP_E_PERMISSIONDENIED      0xFEB2
+#define AFX_IDP_E_DISKNOTREADY          0xFEB3
+#define AFX_IDP_E_PATHFILEACCESSERROR   0xFEB4
+#define AFX_IDP_E_PATHNOTFOUND          0xFEB5
+#define AFX_IDP_E_INVALIDPATTERNSTRING  0xFEB6
+#define AFX_IDP_E_INVALIDUSEOFNULL      0xFEB7
+#define AFX_IDP_E_INVALIDFILEFORMAT     0xFEB8
+#define AFX_IDP_E_INVALIDPROPERTYVALUE  0xFEB9
+#define AFX_IDP_E_INVALIDPROPERTYARRAYINDEX 0xFEBA
+#define AFX_IDP_E_SETNOTSUPPORTEDATRUNTIME 0xFEBB
+#define AFX_IDP_E_SETNOTSUPPORTED       0xFEBC
+#define AFX_IDP_E_NEEDPROPERTYARRAYINDEX 0xFEBD
+#define AFX_IDP_E_SETNOTPERMITTED       0xFEBE
+#define AFX_IDP_E_GETNOTSUPPORTEDATRUNTIME 0xFEBF
+#define AFX_IDP_E_GETNOTSUPPORTED       0xFEC0
+#define AFX_IDP_E_PROPERTYNOTFOUND      0xFEC1
+#define AFX_IDP_E_INVALIDCLIPBOARDFORMAT 0xFEC2
+#define AFX_IDP_E_INVALIDPICTURE        0xFEC3
+#define AFX_IDP_E_PRINTERERROR          0xFEC4
+#define AFX_IDP_E_CANTSAVEFILETOTEMP    0xFEC5
+#define AFX_IDP_E_SEARCHTEXTNOTFOUND    0xFEC6
+#define AFX_IDP_E_REPLACEMENTSTOOLONG   0xFEC7
+#define SPVERSION_MASK                  0x0000FF00
 
 // Next default values for new objects
-//
+// 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-
-#define _APS_NEXT_RESOURCE_VALUE        129
+#define _APS_NEXT_RESOURCE_VALUE        130
 #define _APS_NEXT_COMMAND_VALUE         32771
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           101
diff --git a/tests/tests.mpc b/tests/tests.mpc
index 817710bdd92..a621c152148 100644
--- a/tests/tests.mpc
+++ b/tests/tests.mpc
@@ -106,15 +106,32 @@ project(Service Config DLL) : acelib {
   }
 }
 
-project(ACE Init Test) : acetest {
+project(ACE Init Test) : acemfcexe {
+  requires += mfc
+  macros += _AFXDLL
+
+  after += Test_Output
+  libs  += Test_Output
+
   exename = ACE_Init_Test
   Source_Files {
     ACE_Init_Test.cpp
     ACE_Init_TestDlg.cpp
   }
+  Header_Files {
+    ACE_Init_Test.h
+    ACE_Init_Test_Resource.h
+    ACE_Init_TestDlg.h
+    ACE_Init_TestStdAfx.h
+  }
   Resource_Files {
+    ACE_Init_Test.ico
     ACE_Init_Test.rc
   }
+  Build_Files {
+    tests.mpc
+    tests.mwc
+  }
 }
 
 project(ACE Test) : acetest {