don't use WPARAM in the header (build fix after r59336)

[wxWidgets.git] / tests / test_vc7_test.vcproj

diff --git a/tests/test_vc7_test.vcproj b/tests/test_vc7_test.vcproj
index 0332add3813f0ccb5d65b8c378b0f14eae73c73d..aa0bfc57a56f218190754f317ca944d49676347e 100644 (file)
--- a/tests/test_vc7_test.vcproj
+++ b/tests/test_vc7_test.vcproj
@@ -1,8 +1,8 @@
-<?xml version="1.0" ?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r

 <!--\r
 \r
   This makefile was generated by\r
 <!--\r
 \r
   This makefile was generated by\r

-  Bakefile 0.2.3 (http://www.bakefile.org)\r
+  Bakefile 0.2.5 (http://www.bakefile.org)\r

   Do not modify, all changes will be overwritten!\r
 \r
 -->\r
   Do not modify, all changes will be overwritten!\r
 \r
 -->\r


@@ -22,32 +22,16 @@
                        IntermediateDirectory="vc_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivudll\testprec_test.pch"\r


@@ -55,44 +39,46 @@
                                ObjectFile="vc_mswunivudll\test\"\r
                                ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivudll\test\"\r
                                ProgramDataBaseFileName="vc_mswunivudll\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivudll\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r
                                ProgramDatabaseFile="vc_mswunivudll\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivudll\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivu;.\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Universal Debug|Win32"\r


@@ -100,32 +86,19 @@
                        IntermediateDirectory="vc_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivuddll\testprec_test.pch"\r


@@ -133,44 +106,46 @@
                                ObjectFile="vc_mswunivuddll\test\"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivuddll\test\"\r
                                ProgramDataBaseFileName="vc_mswunivuddll\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivuddll\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r
                                ProgramDatabaseFile="vc_mswunivuddll\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivuddll\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswunivud;.\..\include;."/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Release|Win32"\r


@@ -178,32 +153,16 @@
                        IntermediateDirectory="vc_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswudll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswudll\testprec_test.pch"\r


@@ -211,44 +170,46 @@
                                ObjectFile="vc_mswudll\test\"\r
                                ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswudll\test\"\r
                                ProgramDataBaseFileName="vc_mswudll\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswudll\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswudll\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r
                                ProgramDatabaseFile="vc_mswudll\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswudll\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswu;.\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="DLL Debug|Win32"\r


@@ -256,32 +217,19 @@
                        IntermediateDirectory="vc_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswuddll\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswuddll\testprec_test.pch"\r


@@ -289,44 +237,46 @@
                                ObjectFile="vc_mswuddll\test\"\r
                                ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswuddll\test\"\r
                                ProgramDataBaseFileName="vc_mswuddll\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswuddll\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswuddll\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_dll"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswuddll\test.pdb"\r
                                ProgramDatabaseFile="vc_mswuddll\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswuddll\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;WXUSINGDLL;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_dll\mswud;.\..\include;."/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Release|Win32"\r


@@ -334,32 +284,16 @@
                        IntermediateDirectory="vc_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivu\testprec_test.pch"\r


@@ -367,44 +301,46 @@
                                ObjectFile="vc_mswunivu\test\"\r
                                ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivu\test\"\r
                                ProgramDataBaseFileName="vc_mswunivu\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswunivu\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivu\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r
                                ProgramDatabaseFile="vc_mswunivu\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivu\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;__WXUNIVERSAL__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivu;.\..\include;."/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Universal Debug|Win32"\r


@@ -412,32 +348,19 @@
                        IntermediateDirectory="vc_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswunivud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswunivud\testprec_test.pch"\r


@@ -445,44 +368,46 @@
                                ObjectFile="vc_mswunivud\test\"\r
                                ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswunivud\test\"\r
                                ProgramDataBaseFileName="vc_mswunivud\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswunivud\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswunivud\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswunivud\test.pdb"\r
                                ProgramDatabaseFile="vc_mswunivud\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswunivud\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXUNIVERSAL__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswunivud;.\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r


@@ -490,32 +415,16 @@
                        IntermediateDirectory="vc_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswu\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r

-                               MinimalRebuild="false"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="2"\r

                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

-                               BasicRuntimeChecks="3"\r
-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               ExceptionHandling="TRUE"\r
+                               RuntimeLibrary="2"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswu\testprec_test.pch"\r


@@ -523,44 +432,46 @@
                                ObjectFile="vc_mswu\test\"\r
                                ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswu\test\"\r
                                ProgramDataBaseFileName="vc_mswu\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."\r
-                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29u_net.lib  wxbase29u.lib  wxbase29u_xml.lib   wxzlib.lib wxregexu.lib wxexpat.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswu\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswu\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswu\test.pdb"\r
                                ProgramDatabaseFile="vc_mswu\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswu\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="__WXMSW__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswu;.\..\include;."/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r


@@ -568,32 +479,19 @@
                        IntermediateDirectory="vc_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r
                        IntermediateDirectory="vc_mswud\test"\r
                        ConfigurationType="1"\r
                        UseOfMFC="0"\r

-                       ATLMinimizesCRunTimeLibraryUsage="false"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r

                        CharacterSet="1">\r
                        CharacterSet="1">\r

-                       <Tool\r
-                               Name="VCPreBuildEventTool"/>\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"/>\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"/>\r
-                       <Tool\r
-                               Name="VCIDLTool"/>\r

                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r

-                               InlineFunctionExpansion="1"\r

                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
                                AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r

-                               MinimalRebuild="true"\r
-                               ExceptionHandling="1"\r
-                               AdditionalOptions=""\r
-                               RuntimeLibrary="3"\r

                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
                                PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r

+                               MinimalRebuild="TRUE"\r
+                               ExceptionHandling="TRUE"\r

                                BasicRuntimeChecks="3"\r
                                BasicRuntimeChecks="3"\r

-                               DebugInformationFormat="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               RuntimeTypeInfo="true"\r
+                               RuntimeLibrary="3"\r
+                               BufferSecurityCheck="TRUE"\r
+                               RuntimeTypeInfo="TRUE"\r

                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r
                                UsePrecompiledHeader="3"\r
                                PrecompiledHeaderThrough="testprec.h"\r
                                PrecompiledHeaderFile="vc_mswud\testprec_test.pch"\r


@@ -601,44 +499,46 @@
                                ObjectFile="vc_mswud\test\"\r
                                ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                WarningLevel="4"\r
                                ObjectFile="vc_mswud\test\"\r
                                ProgramDataBaseFileName="vc_mswud\test.pdb"\r
                                WarningLevel="4"\r

-                               SuppressStartupBanner="true"/>\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"/>\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                               Culture="1033"\r
-                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."\r
-                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"/>\r
+                               SuppressStartupBanner="TRUE"\r
+                               Detect64BitPortabilityProblems="TRUE"\r
+                               DebugInformationFormat="3"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCPreLinkEventTool"/>\r
+                               Name="VCCustomBuildTool"/>\r

                        <Tool\r
                                Name="VCLinkerTool"\r
                        <Tool\r
                                Name="VCLinkerTool"\r

-                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib"\r

                                AdditionalOptions=""\r
                                AdditionalOptions=""\r

+                               AdditionalDependencies="wxbase29ud_net.lib  wxbase29ud.lib  wxbase29ud_xml.lib   wxzlibd.lib wxregexud.lib wxexpatd.lib    kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib"\r

                                OutputFile="vc_mswud\test.exe"\r
                                LinkIncremental="2"\r
                                OutputFile="vc_mswud\test.exe"\r
                                LinkIncremental="2"\r

-                               SubSystem="1"\r
-                               SuppressStartupBanner="true"\r
+                               SuppressStartupBanner="TRUE"\r

                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r
                                AdditionalLibraryDirectories=".\..\lib\vc_lib"\r

-                               GenerateDebugInformation="true"\r
+                               GenerateDebugInformation="TRUE"\r

                                ProgramDatabaseFile="vc_mswud\test.pdb"\r
                                ProgramDatabaseFile="vc_mswud\test.pdb"\r

+                               SubSystem="1"\r

                                TargetMachine="1"/>\r
                        <Tool\r
                                TargetMachine="1"/>\r
                        <Tool\r

-                               Name="VCALinkTool"/>\r
+                               Name="VCMIDLTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCXDCMakeTool"/>\r
+                               Name="VCPostBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCBscMakeTool"\r
-                               OutputFile="vc_mswud\test_vc7_test.bsc"\r
-                               SuppressStartupBanner="true"/>\r
+                               Name="VCPreBuildEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCFxCopTool"/>\r
+                               Name="VCPreLinkEventTool"/>\r

                        <Tool\r
                        <Tool\r

-                               Name="VCAppVerifierTool"/>\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG;__WXMSW__;__WXDEBUG__;_UNICODE;_CONSOLE;wxUSE_GUI=0"\r
+                               Culture="1033"\r
+                               AdditionalIncludeDirectories=".\..\lib\vc_lib\mswud;.\..\include;."/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r

                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r
                        <Tool\r
                                Name="VCWebDeploymentTool"/>\r
                        <Tool\r

-                               Name="VCPostBuildEventTool"/>\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r

                </Configuration>\r
        </Configurations>\r
        <References>\r
                </Configuration>\r
        </Configurations>\r
        <References>\r


@@ -647,28 +547,38 @@
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r

-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">\r

                        <File\r
                        <File\r

-                               RelativePath=".\archive\archivetest.cpp"/>\r
+                               RelativePath=".\archive\archivetest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\arrays\arrays.cpp"/>\r
+                               RelativePath=".\arrays\arrays.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\thread\atomic.cpp"/>\r
+                               RelativePath=".\thread\atomic.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\base64\base64.cpp"/>\r
+                               RelativePath=".\base64\base64.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\bstream.cpp"/>\r
+                               RelativePath=".\streams\bstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\cmdline\cmdlinetest.cpp"/>\r
+                               RelativePath=".\cmdline\cmdlinetest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\mbconv\convautotest.cpp"/>\r
+                               RelativePath=".\mbconv\convautotest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\crt.cpp"/>\r
+                               RelativePath=".\strings\crt.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\datastreamtest.cpp"/>\r
+                               RelativePath=".\streams\datastreamtest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\datetime\datetimetest.cpp"/>\r
+                               RelativePath=".\datetime\datetimetest.cpp">\r
+                       </File>\r

                        <File\r
                                RelativePath=".\dummy.cpp">\r
                                <FileConfiguration\r
                        <File\r
                                RelativePath=".\dummy.cpp">\r
                                <FileConfiguration\r


@@ -721,89 +631,155 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
                                </FileConfiguration>\r
                        </File>\r
                        <File\r

-                               RelativePath=".\weakref\evtconnection.cpp"/>\r
+                               RelativePath=".\weakref\evtconnection.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\events\evthandler.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\streams\ffilestream.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\streams\fileback.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\config\fileconf.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\filekind\filekind.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\filename\filenametest.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\streams\filestream.cpp">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\filesys\filesystest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\ffilestream.cpp"/>\r
+                               RelativePath=".\fontmap\fontmaptest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\fileback.cpp"/>\r
+                               RelativePath=".\formatconverter\formatconvertertest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\config\fileconf.cpp"/>\r
+                               RelativePath=".\hashes\hashes.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\filekind\filekind.cpp"/>\r
+                               RelativePath=".\intl\intltest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\filename\filenametest.cpp"/>\r
+                               RelativePath=".\strings\iostream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\filestream.cpp"/>\r
+                               RelativePath=".\streams\iostreams.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\filesys\filesystest.cpp"/>\r
+                               RelativePath=".\net\ipc.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\fontmap\fontmaptest.cpp"/>\r
+                               RelativePath=".\streams\largefile.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\formatconverter\formatconvertertest.cpp"/>\r
+                               RelativePath=".\lists\lists.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\hashes\hashes.cpp"/>\r
+                               RelativePath=".\longlong\longlongtest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\intl\intltest.cpp"/>\r
+                               RelativePath=".\mbconv\mbconvtest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\iostream.cpp"/>\r
+                               RelativePath=".\streams\memstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\largefile.cpp"/>\r
+                               RelativePath=".\misc\misctests.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\lists\lists.cpp"/>\r
+                               RelativePath=".\thread\queue.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\longlong\longlongtest.cpp"/>\r
+                               RelativePath=".\regex\regextest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\mbconv\mbconvtest.cpp"/>\r
+                               RelativePath=".\scopeguard\scopeguardtest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\memstream.cpp"/>\r
+                               RelativePath=".\net\socket.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\thread\queue.cpp"/>\r
+                               RelativePath=".\streams\socketstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\regex\regextest.cpp"/>\r
+                               RelativePath=".\streams\sstream.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\scopeguard\scopeguardtest.cpp"/>\r
+                               RelativePath=".\strings\stdstrings.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\sstream.cpp"/>\r
+                               RelativePath=".\strings\strings.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\stdstrings.cpp"/>\r
+                               RelativePath=".\archive\tartest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\strings.cpp"/>\r
+                               RelativePath=".\streams\tempfile.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\archive\tartest.cpp"/>\r
+                               RelativePath=".\test.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\tempfile.cpp"/>\r
+                               RelativePath=".\textfile\textfiletest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\test.cpp"/>\r
+                               RelativePath=".\streams\textstreamtest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\textfile\textfiletest.cpp"/>\r
+                               RelativePath=".\events\timertest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\textstreamtest.cpp"/>\r
+                               RelativePath=".\thread\tls.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\tokenizer.cpp"/>\r
+                               RelativePath=".\strings\tokenizer.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\unichar.cpp"/>\r
+                               RelativePath=".\strings\unichar.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\unicode.cpp"/>\r
+                               RelativePath=".\strings\unicode.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\uris\uris.cpp"/>\r
+                               RelativePath=".\uris\uris.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\vararg.cpp"/>\r
+                               RelativePath=".\strings\vararg.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\vectors\vectors.cpp"/>\r
+                               RelativePath=".\vectors\vectors.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\strings\vsnprintf.cpp"/>\r
+                               RelativePath=".\strings\vsnprintf.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\weakref\weakref.cpp"/>\r
+                               RelativePath=".\weakref\weakref.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\regex\wxregextest.cpp"/>\r
+                               RelativePath=".\regex\wxregextest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\xlocale\xlocale.cpp"/>\r
+                               RelativePath=".\xlocale\xlocale.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\xml\xmltest.cpp"/>\r
+                               RelativePath=".\xml\xmltest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\archive\ziptest.cpp"/>\r
+                               RelativePath=".\archive\ziptest.cpp">\r
+                       </File>\r

                        <File\r
                        <File\r

-                               RelativePath=".\streams\zlibstream.cpp"/>\r
+                               RelativePath=".\streams\zlibstream.cpp">\r
+                       </File>\r

                </Filter>\r
        </Files>\r
        <Globals>\r
                </Filter>\r
        </Files>\r
        <Globals>\r