[sword-svn] r110 - in trunk/source: allinone common data extra/uconv i18n io layout layoutex stubdata test/cintltst test/intltest test/iotest test/letest tools/ctestfw tools/genbidi tools/genbrk tools/gencase tools/genccode tools/gencmn tools/gencnval tools/genctd tools/gennames tools/gennorm tools/genpname tools/genprops tools/genrb tools/gensprep tools/gentest tools/genuca tools/icupkg tools/icuswap tools/makeconv tools/pkgdata tools/toolutil

chrislit at www.crosswire.org chrislit at www.crosswire.org
Sat Sep 9 22:16:35 MST 2006 

Author: chrislit
Date: 2006-09-09 22:16:11 -0700 (Sat, 09 Sep 2006)
New Revision: 110

Modified:
   trunk/source/allinone/allinone.sln
   trunk/source/common/common.vcproj
   trunk/source/data/makedata.vcproj
   trunk/source/extra/uconv/uconv.vcproj
   trunk/source/i18n/i18n.vcproj
   trunk/source/io/io.vcproj
   trunk/source/layout/layout.vcproj
   trunk/source/layoutex/layoutex.vcproj
   trunk/source/stubdata/stubdata.vcproj
   trunk/source/test/cintltst/cintltst.vcproj
   trunk/source/test/intltest/intltest.vcproj
   trunk/source/test/iotest/iotest.vcproj
   trunk/source/test/letest/letest.vcproj
   trunk/source/tools/ctestfw/ctestfw.vcproj
   trunk/source/tools/genbidi/genbidi.vcproj
   trunk/source/tools/genbrk/genbrk.vcproj
   trunk/source/tools/gencase/gencase.vcproj
   trunk/source/tools/genccode/genccode.vcproj
   trunk/source/tools/gencmn/gencmn.vcproj
   trunk/source/tools/gencnval/gencnval.vcproj
   trunk/source/tools/genctd/genctd.vcproj
   trunk/source/tools/gennames/gennames.vcproj
   trunk/source/tools/gennorm/gennorm.vcproj
   trunk/source/tools/genpname/genpname.vcproj
   trunk/source/tools/genprops/genprops.vcproj
   trunk/source/tools/genrb/derb.vcproj
   trunk/source/tools/genrb/genrb.vcproj
   trunk/source/tools/gensprep/gensprep.vcproj
   trunk/source/tools/gentest/gentest.vcproj
   trunk/source/tools/genuca/genuca.vcproj
   trunk/source/tools/icupkg/icupkg.vcproj
   trunk/source/tools/icuswap/icuswap.vcproj
   trunk/source/tools/makeconv/makeconv.vcproj
   trunk/source/tools/pkgdata/pkgdata.vcproj
   trunk/source/tools/toolutil/toolutil.vcproj
Log:
VC8 project update

Modified: trunk/source/allinone/allinone.sln
===================================================================
--- trunk/source/allinone/allinone.sln	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/allinone/allinone.sln	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cintltst", "..\test\cintltst\cintltst.vcproj", "{3D1246AE-1B32-479B-BECA-AEFA97BE2321}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0178B127-6269-407D-B112-93877BB62776} = {0178B127-6269-407D-B112-93877BB62776}
@@ -157,8 +158,6 @@
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stubdata", "..\stubdata\stubdata.vcproj", "{203EC78A-0531-43F0-A636-285439BDE025}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolutil", "..\tools\toolutil\toolutil.vcproj", "{6B231032-3CB5-4EED-9210-810D666A23A0}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -234,150 +233,149 @@
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug.ActiveCfg = Debug|Win32
-		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug.Build.0 = Debug|Win32
-		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release.ActiveCfg = Release|Win32
-		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release.Build.0 = Release|Win32
-		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug.ActiveCfg = Debug|Win32
-		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug.Build.0 = Debug|Win32
-		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release.ActiveCfg = Release|Win32
-		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release.Build.0 = Release|Win32
-		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug.ActiveCfg = Debug|Win32
-		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug.Build.0 = Debug|Win32
-		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release.ActiveCfg = Release|Win32
-		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release.Build.0 = Release|Win32
-		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug.ActiveCfg = Debug|Win32
-		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug.Build.0 = Debug|Win32
-		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release.ActiveCfg = Release|Win32
-		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release.Build.0 = Release|Win32
-		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug.ActiveCfg = Debug|Win32
-		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug.Build.0 = Debug|Win32
-		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release.ActiveCfg = Release|Win32
-		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release.Build.0 = Release|Win32
-		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug.ActiveCfg = Debug|Win32
-		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug.Build.0 = Debug|Win32
-		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release.ActiveCfg = Release|Win32
-		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release.Build.0 = Release|Win32
-		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug.ActiveCfg = Debug|Win32
-		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug.Build.0 = Debug|Win32
-		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release.ActiveCfg = Release|Win32
-		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release.Build.0 = Release|Win32
-		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug.ActiveCfg = Debug|Win32
-		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug.Build.0 = Debug|Win32
-		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release.ActiveCfg = Release|Win32
-		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release.Build.0 = Release|Win32
-		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug.ActiveCfg = Debug|Win32
-		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug.Build.0 = Debug|Win32
-		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release.ActiveCfg = Release|Win32
-		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release.Build.0 = Release|Win32
-		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug.ActiveCfg = Debug|Win32
-		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug.Build.0 = Debug|Win32
-		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release.ActiveCfg = Release|Win32
-		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release.Build.0 = Release|Win32
-		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug.ActiveCfg = Debug|Win32
-		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug.Build.0 = Debug|Win32
-		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release.ActiveCfg = Release|Win32
-		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release.Build.0 = Release|Win32
-		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug.ActiveCfg = Debug|Win32
-		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug.Build.0 = Debug|Win32
-		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Release.ActiveCfg = Release|Win32
-		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Release.Build.0 = Release|Win32
-		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug.ActiveCfg = Debug|Win32
-		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug.Build.0 = Debug|Win32
-		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release.ActiveCfg = Release|Win32
-		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release.Build.0 = Release|Win32
-		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug.ActiveCfg = Debug|Win32
-		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug.Build.0 = Debug|Win32
-		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release.ActiveCfg = Release|Win32
-		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release.Build.0 = Release|Win32
-		{86829694-A375-4C58-B4EA-96EF514E3225}.Debug.ActiveCfg = Debug|Win32
-		{86829694-A375-4C58-B4EA-96EF514E3225}.Debug.Build.0 = Debug|Win32
-		{86829694-A375-4C58-B4EA-96EF514E3225}.Release.ActiveCfg = Release|Win32
-		{86829694-A375-4C58-B4EA-96EF514E3225}.Release.Build.0 = Release|Win32
-		{0178B127-6269-407D-B112-93877BB62776}.Debug.ActiveCfg = Debug|Win32
-		{0178B127-6269-407D-B112-93877BB62776}.Debug.Build.0 = Debug|Win32
-		{0178B127-6269-407D-B112-93877BB62776}.Release.ActiveCfg = Release|Win32
-		{0178B127-6269-407D-B112-93877BB62776}.Release.Build.0 = Release|Win32
-		{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug.ActiveCfg = Debug|Win32
-		{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug.Build.0 = Debug|Win32
-		{73632960-B3A6-464D-83A3-4B43365F19B8}.Release.ActiveCfg = Release|Win32
-		{73632960-B3A6-464D-83A3-4B43365F19B8}.Release.Build.0 = Release|Win32
-		{C920062A-0647-4553-A3B2-37C58065664B}.Debug.ActiveCfg = Debug|Win32
-		{C920062A-0647-4553-A3B2-37C58065664B}.Debug.Build.0 = Debug|Win32
-		{C920062A-0647-4553-A3B2-37C58065664B}.Release.ActiveCfg = Release|Win32
-		{C920062A-0647-4553-A3B2-37C58065664B}.Release.Build.0 = Release|Win32
-		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug.ActiveCfg = Debug|Win32
-		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug.Build.0 = Debug|Win32
-		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Release.ActiveCfg = Release|Win32
-		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Release.Build.0 = Release|Win32
-		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug.ActiveCfg = Debug|Win32
-		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug.Build.0 = Debug|Win32
-		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release.ActiveCfg = Release|Win32
-		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release.Build.0 = Release|Win32
-		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug.ActiveCfg = Debug|Win32
-		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug.Build.0 = Debug|Win32
-		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release.ActiveCfg = Release|Win32
-		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release.Build.0 = Release|Win32
-		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug.ActiveCfg = Debug|Win32
-		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug.Build.0 = Debug|Win32
-		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release.ActiveCfg = Release|Win32
-		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release.Build.0 = Release|Win32
-		{203EC78A-0531-43F0-A636-285439BDE025}.Debug.ActiveCfg = Debug|Win32
-		{203EC78A-0531-43F0-A636-285439BDE025}.Debug.Build.0 = Debug|Win32
-		{203EC78A-0531-43F0-A636-285439BDE025}.Release.ActiveCfg = Release|Win32
-		{203EC78A-0531-43F0-A636-285439BDE025}.Release.Build.0 = Release|Win32
-		{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug.ActiveCfg = Debug|Win32
-		{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug.Build.0 = Debug|Win32
-		{6B231032-3CB5-4EED-9210-810D666A23A0}.Release.ActiveCfg = Release|Win32
-		{6B231032-3CB5-4EED-9210-810D666A23A0}.Release.Build.0 = Release|Win32
-		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug.ActiveCfg = Debug|Win32
-		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug.Build.0 = Debug|Win32
-		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release.ActiveCfg = Release|Win32
-		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release.Build.0 = Release|Win32
-		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug.ActiveCfg = Debug|Win32
-		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug.Build.0 = Debug|Win32
-		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release.ActiveCfg = Release|Win32
-		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release.Build.0 = Release|Win32
-		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug.ActiveCfg = Debug|Win32
-		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug.Build.0 = Debug|Win32
-		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release.ActiveCfg = Release|Win32
-		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release.Build.0 = Release|Win32
-		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug.ActiveCfg = Debug|Win32
-		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug.Build.0 = Debug|Win32
-		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release.ActiveCfg = Release|Win32
-		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release.Build.0 = Release|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Debug.ActiveCfg = Debug|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Debug.Build.0 = Debug|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Release.ActiveCfg = Release|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Release.Build.0 = Release|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Debug.ActiveCfg = Debug|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Debug.Build.0 = Debug|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Release.ActiveCfg = Release|Win32
-		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Release.Build.0 = Release|Win32
-		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug.ActiveCfg = Debug|Win32
-		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug.Build.0 = Debug|Win32
-		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release.ActiveCfg = Release|Win32
-		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release.Build.0 = Release|Win32
-		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug.ActiveCfg = Debug|Win32
-		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug.Build.0 = Debug|Win32
-		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release.ActiveCfg = Release|Win32
-		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release.Build.0 = Release|Win32
-		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Debug.ActiveCfg = Debug|Win32
-		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Debug.Build.0 = Debug|Win32
-		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Release.ActiveCfg = Release|Win32
-		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Release.Build.0 = Release|Win32
-		{39690C2A-AD89-45E4-893A-899496B85785}.Debug.ActiveCfg = Debug|Win32
-		{39690C2A-AD89-45E4-893A-899496B85785}.Debug.Build.0 = Debug|Win32
-		{39690C2A-AD89-45E4-893A-899496B85785}.Release.ActiveCfg = Release|Win32
-		{39690C2A-AD89-45E4-893A-899496B85785}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Debug|Win32.Build.0 = Debug|Win32
+		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.ActiveCfg = Release|Win32
+		{3D1246AE-1B32-479B-BECA-AEFA97BE2321}.Release|Win32.Build.0 = Release|Win32
+		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Debug|Win32.Build.0 = Debug|Win32
+		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.ActiveCfg = Release|Win32
+		{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}.Release|Win32.Build.0 = Release|Win32
+		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Debug|Win32.Build.0 = Debug|Win32
+		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.ActiveCfg = Release|Win32
+		{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}.Release|Win32.Build.0 = Release|Win32
+		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Debug|Win32.Build.0 = Debug|Win32
+		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.ActiveCfg = Release|Win32
+		{D3065ADB-8820-4CC7-9B6C-9510833961A3}.Release|Win32.Build.0 = Release|Win32
+		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Debug|Win32.Build.0 = Debug|Win32
+		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.ActiveCfg = Release|Win32
+		{C2BE5000-7501-4E87-9724-B8D82494FAE6}.Release|Win32.Build.0 = Release|Win32
+		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Debug|Win32.Build.0 = Debug|Win32
+		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.ActiveCfg = Release|Win32
+		{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}.Release|Win32.Build.0 = Release|Win32
+		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Debug|Win32.Build.0 = Debug|Win32
+		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.ActiveCfg = Release|Win32
+		{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}.Release|Win32.Build.0 = Release|Win32
+		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Debug|Win32.Build.0 = Debug|Win32
+		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.ActiveCfg = Release|Win32
+		{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}.Release|Win32.Build.0 = Release|Win32
+		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Debug|Win32.Build.0 = Debug|Win32
+		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|Win32.ActiveCfg = Release|Win32
+		{F5281B04-A9E0-4680-BBA8-1D7F7D115458}.Release|Win32.Build.0 = Release|Win32
+		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Debug|Win32.Build.0 = Debug|Win32
+		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|Win32.ActiveCfg = Release|Win32
+		{F5213103-6CBE-46E6-B4CC-2570B6837D86}.Release|Win32.Build.0 = Release|Win32
+		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Debug|Win32.Build.0 = Debug|Win32
+		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|Win32.ActiveCfg = Release|Win32
+		{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}.Release|Win32.Build.0 = Release|Win32
+		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Debug|Win32.Build.0 = Debug|Win32
+		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|Win32.ActiveCfg = Release|Win32
+		{6F744648-D15F-478A-90C6-58E353B5DDB3}.Release|Win32.Build.0 = Release|Win32
+		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Debug|Win32.Build.0 = Debug|Win32
+		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.ActiveCfg = Release|Win32
+		{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}.Release|Win32.Build.0 = Release|Win32
+		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.ActiveCfg = Debug|Win32
+		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Debug|Win32.Build.0 = Debug|Win32
+		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.ActiveCfg = Release|Win32
+		{77C78066-746F-4EA6-B3FE-B8C8A4A97891}.Release|Win32.Build.0 = Release|Win32
+		{86829694-A375-4C58-B4EA-96EF514E3225}.Debug|Win32.ActiveCfg = Debug|Win32
+		{86829694-A375-4C58-B4EA-96EF514E3225}.Debug|Win32.Build.0 = Debug|Win32
+		{86829694-A375-4C58-B4EA-96EF514E3225}.Release|Win32.ActiveCfg = Release|Win32
+		{86829694-A375-4C58-B4EA-96EF514E3225}.Release|Win32.Build.0 = Release|Win32
+		{0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0178B127-6269-407D-B112-93877BB62776}.Debug|Win32.Build.0 = Debug|Win32
+		{0178B127-6269-407D-B112-93877BB62776}.Release|Win32.ActiveCfg = Release|Win32
+		{0178B127-6269-407D-B112-93877BB62776}.Release|Win32.Build.0 = Release|Win32
+		{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73632960-B3A6-464D-83A3-4B43365F19B8}.Debug|Win32.Build.0 = Debug|Win32
+		{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.ActiveCfg = Release|Win32
+		{73632960-B3A6-464D-83A3-4B43365F19B8}.Release|Win32.Build.0 = Release|Win32
+		{C920062A-0647-4553-A3B2-37C58065664B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C920062A-0647-4553-A3B2-37C58065664B}.Debug|Win32.Build.0 = Debug|Win32
+		{C920062A-0647-4553-A3B2-37C58065664B}.Release|Win32.ActiveCfg = Release|Win32
+		{C920062A-0647-4553-A3B2-37C58065664B}.Release|Win32.Build.0 = Release|Win32
+		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Debug|Win32.Build.0 = Debug|Win32
+		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|Win32.ActiveCfg = Release|Win32
+		{37FC2C7F-1904-4811-8955-2F478830EAD1}.Release|Win32.Build.0 = Release|Win32
+		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Debug|Win32.Build.0 = Debug|Win32
+		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.ActiveCfg = Release|Win32
+		{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}.Release|Win32.Build.0 = Release|Win32
+		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Debug|Win32.Build.0 = Debug|Win32
+		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.ActiveCfg = Release|Win32
+		{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}.Release|Win32.Build.0 = Release|Win32
+		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Debug|Win32.Build.0 = Debug|Win32
+		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.ActiveCfg = Release|Win32
+		{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}.Release|Win32.Build.0 = Release|Win32
+		{203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.ActiveCfg = Debug|Win32
+		{203EC78A-0531-43F0-A636-285439BDE025}.Debug|Win32.Build.0 = Debug|Win32
+		{203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.ActiveCfg = Release|Win32
+		{203EC78A-0531-43F0-A636-285439BDE025}.Release|Win32.Build.0 = Release|Win32
+		{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6B231032-3CB5-4EED-9210-810D666A23A0}.Debug|Win32.Build.0 = Debug|Win32
+		{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.ActiveCfg = Release|Win32
+		{6B231032-3CB5-4EED-9210-810D666A23A0}.Release|Win32.Build.0 = Release|Win32
+		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Debug|Win32.Build.0 = Debug|Win32
+		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.ActiveCfg = Release|Win32
+		{DBA4088D-F6F9-4F8F-8820-082A4765C16C}.Release|Win32.Build.0 = Release|Win32
+		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Debug|Win32.Build.0 = Debug|Win32
+		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.ActiveCfg = Release|Win32
+		{C2B04507-2521-4801-BF0D-5FD79D6D518C}.Release|Win32.Build.0 = Release|Win32
+		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Debug|Win32.Build.0 = Debug|Win32
+		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.ActiveCfg = Release|Win32
+		{631C23CE-6C1D-4875-88F0-85E0A42B36EA}.Release|Win32.Build.0 = Release|Win32
+		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Debug|Win32.Build.0 = Debug|Win32
+		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.ActiveCfg = Release|Win32
+		{E4993E82-D68A-46CA-BAE0-9D35E172E46F}.Release|Win32.Build.0 = Release|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Debug|Win32.Build.0 = Debug|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Release|Win32.ActiveCfg = Release|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF62}.Release|Win32.Build.0 = Release|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Debug|Win32.Build.0 = Debug|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Release|Win32.ActiveCfg = Release|Win32
+		{DB312A49-12A9-4E07-9E96-451DC2D8FF61}.Release|Win32.Build.0 = Release|Win32
+		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Debug|Win32.Build.0 = Debug|Win32
+		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|Win32.ActiveCfg = Release|Win32
+		{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}.Release|Win32.Build.0 = Release|Win32
+		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Debug|Win32.Build.0 = Debug|Win32
+		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|Win32.ActiveCfg = Release|Win32
+		{9D4211F7-2C77-439C-82F0-30A4E43BA569}.Release|Win32.Build.0 = Release|Win32
+		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Debug|Win32.Build.0 = Debug|Win32
+		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Release|Win32.ActiveCfg = Release|Win32
+		{67351485-4D18-4245-BE39-A7EF0675ACD2}.Release|Win32.Build.0 = Release|Win32
+		{39690C2A-AD89-45E4-893A-899496B85785}.Debug|Win32.ActiveCfg = Debug|Win32
+		{39690C2A-AD89-45E4-893A-899496B85785}.Debug|Win32.Build.0 = Debug|Win32
+		{39690C2A-AD89-45E4-893A-899496B85785}.Release|Win32.ActiveCfg = Release|Win32
+		{39690C2A-AD89-45E4-893A-899496B85785}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
 EndGlobal

Modified: trunk/source/common/common.vcproj
===================================================================
--- trunk/source/common/common.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/common/common.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,143 +1,203 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="common"
-	ProjectGUID="{F0C3266C-B49D-4097-BDBD-EEB592017672}"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{73C0A65B-D1F2-4DE1-B3A6-15DAD2C23F3D}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuuc.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_COMMON_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/common.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuuc36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\lib\icuuc36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4a800000"
-				ImportLibrary="..\..\lib\icuuc.lib"/>
+				ImportLibrary="..\..\lib\icuuc.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuuc.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuucd.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_COMMON_IMPLEMENTATION;RBBI_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/common.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuuc36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\lib\icuuc36d.pdb"
 				BaseAddress="0x4a800000"
-				ImportLibrary="..\..\lib\icuucd.lib"/>
+				ImportLibrary="..\..\lib\icuucd.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuucd.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -145,1954 +205,2368 @@
 	<Files>
 		<Filter
 			Name="bidi"
-			Filter="">
+			>
 			<File
-				RelativePath=".\ubidi.c">
+				RelativePath=".\ubidi.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ubidi.h">
+				RelativePath=".\unicode\ubidi.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ubidi_props.c">
+				RelativePath=".\ubidi_props.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ubidi_props.h">
+				RelativePath=".\ubidi_props.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ubidiimp.h">
+				RelativePath=".\ubidiimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ubidiln.c">
+				RelativePath=".\ubidiln.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ubidiwrt.c">
+				RelativePath=".\ubidiwrt.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ushape.c">
+				RelativePath=".\ushape.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ushape.h">
+				RelativePath=".\unicode\ushape.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="break iteration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\brkeng.cpp">
+				RelativePath=".\brkeng.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\brkeng.h">
+				RelativePath=".\brkeng.h"
+				>
 			</File>
 			<File
-				RelativePath=".\brkiter.cpp">
+				RelativePath=".\brkiter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\brkiter.h">
+				RelativePath=".\unicode\brkiter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\dbbi.h">
+				RelativePath=".\unicode\dbbi.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\dictbe.cpp">
+				RelativePath=".\dictbe.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dictbe.h">
+				RelativePath=".\dictbe.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbi.cpp">
+				RelativePath=".\rbbi.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\rbbi.h">
+				RelativePath=".\unicode\rbbi.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\rbbidata.cpp">
+				RelativePath=".\rbbidata.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbidata.h">
+				RelativePath=".\rbbidata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbinode.cpp">
+				RelativePath=".\rbbinode.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbinode.h">
+				RelativePath=".\rbbinode.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbirb.cpp">
+				RelativePath=".\rbbirb.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbirb.h">
+				RelativePath=".\rbbirb.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbirpt.h">
+				RelativePath=".\rbbirpt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbiscan.cpp">
+				RelativePath=".\rbbiscan.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbiscan.h">
+				RelativePath=".\rbbiscan.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbisetb.cpp">
+				RelativePath=".\rbbisetb.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbisetb.h">
+				RelativePath=".\rbbisetb.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbistbl.cpp">
+				RelativePath=".\rbbistbl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbitblb.cpp">
+				RelativePath=".\rbbitblb.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbitblb.h">
+				RelativePath=".\rbbitblb.h"
+				>
 			</File>
 			<File
-				RelativePath=".\triedict.cpp">
+				RelativePath=".\triedict.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\triedict.h">
+				RelativePath=".\triedict.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ubrk.cpp">
+				RelativePath=".\ubrk.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ubrk.h">
+				RelativePath=".\unicode\ubrk.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ubrkimpl.h">
+				RelativePath=".\ubrkimpl.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collation"
-			Filter="">
+			>
 			<File
-				RelativePath=".\ucol_swp.c">
+				RelativePath=".\ucol_swp.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\i18n"/>
+						AdditionalIncludeDirectories="..\i18n"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories="..\i18n"/>
+						AdditionalIncludeDirectories="..\i18n"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucol_swp.h">
+				RelativePath=".\ucol_swp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collections"
-			Filter="">
+			>
 			<File
-				RelativePath=".\hash.h">
+				RelativePath=".\hash.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\strenum.h">
+				RelativePath=".\unicode\strenum.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uarrsort.c">
+				RelativePath=".\uarrsort.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uarrsort.h">
+				RelativePath=".\uarrsort.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uenum.c">
+				RelativePath=".\uenum.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uenum.h">
+				RelativePath=".\unicode\uenum.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uenumimp.h">
+				RelativePath=".\uenumimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uhash.c">
+				RelativePath=".\uhash.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uhash.h">
+				RelativePath=".\uhash.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uhash_us.cpp">
+				RelativePath=".\uhash_us.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ustack.cpp">
+				RelativePath=".\ustack.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ustrenum.cpp">
+				RelativePath=".\ustrenum.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ustrenum.h">
+				RelativePath=".\ustrenum.h"
+				>
 			</File>
 			<File
-				RelativePath=".\utrie.c">
+				RelativePath=".\utrie.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utrie.h">
+				RelativePath=".\utrie.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uvector.cpp">
+				RelativePath=".\uvector.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uvector.h">
+				RelativePath=".\uvector.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uvectr32.cpp">
+				RelativePath=".\uvectr32.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uvectr32.h">
+				RelativePath=".\uvectr32.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="configuration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\common.rc">
+				RelativePath=".\common.rc"
+				>
 			</File>
 			<File
-				RelativePath=".\cpputils.h">
+				RelativePath=".\cpputils.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\docmain.h">
+				RelativePath=".\unicode\docmain.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\locmap.c">
+				RelativePath=".\locmap.c"
+				>
 			</File>
 			<File
-				RelativePath=".\locmap.h">
+				RelativePath=".\locmap.h"
+				>
 			</File>
 			<File
-				RelativePath=".\mutex.h">
+				RelativePath=".\mutex.h"
+				>
 			</File>
 			<File
-				RelativePath=".\putil.c">
+				RelativePath=".\putil.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\putil.h">
+				RelativePath=".\unicode\putil.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\putilimp.h">
+				RelativePath=".\putilimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\pwin32.h">
+				RelativePath=".\unicode\pwin32.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uassert.h">
+				RelativePath=".\uassert.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uconfig.h">
+				RelativePath=".\unicode\uconfig.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\udeprctd.h">
+				RelativePath=".\unicode\udeprctd.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\udraft.h">
+				RelativePath=".\unicode\udraft.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\uintrnal.h">
+				RelativePath=".\unicode\uintrnal.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\umachine.h">
+				RelativePath=".\unicode\umachine.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\umath.c">
+				RelativePath=".\umath.c"
+				>
 			</File>
 			<File
-				RelativePath=".\umutex.c">
+				RelativePath=".\umutex.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\umutex.h">
+				RelativePath=".\umutex.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uobslete.h">
+				RelativePath=".\unicode\uobslete.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\urename.h">
+				RelativePath=".\unicode\urename.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\usystem.h">
+				RelativePath=".\unicode\usystem.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\utrace.c">
+				RelativePath=".\utrace.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utrace.h">
+				RelativePath=".\unicode\utrace.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\utracimp.h">
+				RelativePath=".\utracimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\utypes.c">
+				RelativePath=".\utypes.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utypes.h">
+				RelativePath=".\unicode\utypes.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\uversion.h">
+				RelativePath=".\unicode\uversion.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\wintz.c">
+				RelativePath=".\wintz.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\wintz.h">
+				RelativePath=".\wintz.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="conversion"
-			Filter="">
+			>
 			<File
-				RelativePath=".\ucnv.c">
+				RelativePath=".\ucnv.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucnv.h">
+				RelativePath=".\unicode\ucnv.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucnv2022.c">
+				RelativePath=".\ucnv2022.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_bld.c">
+				RelativePath=".\ucnv_bld.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_bld.h">
+				RelativePath=".\ucnv_bld.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_cb.c">
+				RelativePath=".\ucnv_cb.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucnv_cb.h">
+				RelativePath=".\unicode\ucnv_cb.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucnv_cnv.c">
+				RelativePath=".\ucnv_cnv.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_cnv.h">
+				RelativePath=".\ucnv_cnv.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_err.c">
+				RelativePath=".\ucnv_err.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucnv_err.h">
+				RelativePath=".\unicode\ucnv_err.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucnv_ext.c">
+				RelativePath=".\ucnv_ext.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_ext.h">
+				RelativePath=".\ucnv_ext.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_imp.h">
+				RelativePath=".\ucnv_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_io.c">
+				RelativePath=".\ucnv_io.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_io.h">
+				RelativePath=".\ucnv_io.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_lmb.c">
+				RelativePath=".\ucnv_lmb.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_set.c">
+				RelativePath=".\ucnv_set.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_u16.c">
+				RelativePath=".\ucnv_u16.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_u32.c">
+				RelativePath=".\ucnv_u32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_u7.c">
+				RelativePath=".\ucnv_u7.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnv_u8.c">
+				RelativePath=".\ucnv_u8.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvbocu.c">
+				RelativePath=".\ucnvbocu.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvdisp.c">
+				RelativePath=".\ucnvdisp.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvhz.c">
+				RelativePath=".\ucnvhz.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvisci.c">
+				RelativePath=".\ucnvisci.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvlat1.c">
+				RelativePath=".\ucnvlat1.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvmbcs.c">
+				RelativePath=".\ucnvmbcs.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvmbcs.h">
+				RelativePath=".\ucnvmbcs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvscsu.c">
+				RelativePath=".\ucnvscsu.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="data &amp; memory"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cmemory.c">
+				RelativePath=".\cmemory.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cmemory.h">
+				RelativePath=".\cmemory.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uclean.h">
+				RelativePath=".\unicode\uclean.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucln.h">
+				RelativePath=".\ucln.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_cmn.c">
+				RelativePath=".\ucln_cmn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_cmn.h">
+				RelativePath=".\ucln_cmn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucmndata.c">
+				RelativePath=".\ucmndata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucmndata.h">
+				RelativePath=".\ucmndata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\udata.c">
+				RelativePath=".\udata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\udata.h">
+				RelativePath=".\unicode\udata.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\udatamem.c">
+				RelativePath=".\udatamem.c"
+				>
 			</File>
 			<File
-				RelativePath=".\udatamem.h">
+				RelativePath=".\udatamem.h"
+				>
 			</File>
 			<File
-				RelativePath=".\udataswp.c">
+				RelativePath=".\udataswp.c"
+				>
 			</File>
 			<File
-				RelativePath=".\udataswp.h">
+				RelativePath=".\udataswp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uinit.c">
+				RelativePath=".\uinit.c"
+				>
 			</File>
 			<File
-				RelativePath=".\umapfile.c">
+				RelativePath=".\umapfile.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\umapfile.h">
+				RelativePath=".\umapfile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uobject.cpp">
+				RelativePath=".\uobject.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uobject.h">
+				RelativePath=".\unicode\uobject.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="formatting"
-			Filter="">
+			>
 			<File
-				RelativePath=".\unicode\parseerr.h">
+				RelativePath=".\unicode\parseerr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\parsepos.cpp">
+				RelativePath=".\parsepos.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\parsepos.h">
+				RelativePath=".\unicode\parsepos.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\umisc.h">
+				RelativePath=".\unicode\umisc.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ustrfmt.c">
+				RelativePath=".\ustrfmt.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustrfmt.h">
+				RelativePath=".\ustrfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\util.cpp">
+				RelativePath=".\util.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\util.h">
+				RelativePath=".\util.h"
+				>
 			</File>
 			<File
-				RelativePath=".\util_props.cpp">
+				RelativePath=".\util_props.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="idna"
-			Filter="*.c,*.h">
+			Filter="*.c,*.h"
+			>
 			<File
-				RelativePath=".\punycode.c">
+				RelativePath=".\punycode.c"
+				>
 			</File>
 			<File
-				RelativePath=".\punycode.h">
+				RelativePath=".\punycode.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uidna.cpp">
+				RelativePath=".\uidna.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uidna.h">
+				RelativePath=".\unicode\uidna.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="locales &amp; resources"
-			Filter="">
+			>
 			<File
-				RelativePath=".\locbased.cpp">
+				RelativePath=".\locbased.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\locbased.h">
+				RelativePath=".\locbased.h"
+				>
 			</File>
 			<File
-				RelativePath=".\locid.cpp">
+				RelativePath=".\locid.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\locid.h">
+				RelativePath=".\unicode\locid.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\locutil.cpp">
+				RelativePath=".\locutil.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\locutil.h">
+				RelativePath=".\locutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\resbund.cpp">
+				RelativePath=".\resbund.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\resbund.h">
+				RelativePath=".\unicode\resbund.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\resbund_cnv.cpp">
+				RelativePath=".\resbund_cnv.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucat.c">
+				RelativePath=".\ucat.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucat.h">
+				RelativePath=".\unicode\ucat.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uloc.c">
+				RelativePath=".\uloc.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uloc.h">
+				RelativePath=".\unicode\uloc.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ulocimp.h">
+				RelativePath=".\ulocimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ures.h">
+				RelativePath=".\unicode\ures.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ures_cnv.c">
+				RelativePath=".\ures_cnv.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uresbund.c">
+				RelativePath=".\uresbund.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uresdata.c">
+				RelativePath=".\uresdata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uresdata.h">
+				RelativePath=".\uresdata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uresimp.h">
+				RelativePath=".\uresimp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="normalization"
-			Filter="">
+			>
 			<File
-				RelativePath=".\caniter.cpp">
+				RelativePath=".\caniter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\caniter.h">
+				RelativePath=".\unicode\caniter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\normlzr.cpp">
+				RelativePath=".\normlzr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\normlzr.h">
+				RelativePath=".\unicode\normlzr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unorm.cpp">
+				RelativePath=".\unorm.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unorm.h">
+				RelativePath=".\unicode\unorm.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unorm_it.c">
+				RelativePath=".\unorm_it.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unorm_it.h">
+				RelativePath=".\unorm_it.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unormcmp.cpp">
+				RelativePath=".\unormcmp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unormimp.h">
+				RelativePath=".\unormimp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="properties &amp; sets"
-			Filter="">
+			>
 			<File
-				RelativePath=".\propname.cpp">
+				RelativePath=".\propname.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\propname.h">
+				RelativePath=".\propname.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ruleiter.cpp">
+				RelativePath=".\ruleiter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ruleiter.h">
+				RelativePath=".\ruleiter.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\symtable.h">
+				RelativePath=".\unicode\symtable.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucase.c">
+				RelativePath=".\ucase.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucase.h">
+				RelativePath=".\ucase.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uchar.c">
+				RelativePath=".\uchar.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uchar.h">
+				RelativePath=".\unicode\uchar.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unames.c">
+				RelativePath=".\unames.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unifilt.cpp">
+				RelativePath=".\unifilt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unifilt.h">
+				RelativePath=".\unicode\unifilt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unifunct.cpp">
+				RelativePath=".\unifunct.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unifunct.h">
+				RelativePath=".\unicode\unifunct.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\unimatch.h">
+				RelativePath=".\unicode\unimatch.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uniset.cpp">
+				RelativePath=".\uniset.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uniset.h">
+				RelativePath=".\unicode\uniset.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uniset_props.cpp">
+				RelativePath=".\uniset_props.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uprops.c">
+				RelativePath=".\uprops.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uprops.h">
+				RelativePath=".\uprops.h"
+				>
 			</File>
 			<File
-				RelativePath=".\usc_impl.c">
+				RelativePath=".\usc_impl.c"
+				>
 			</File>
 			<File
-				RelativePath=".\usc_impl.h">
+				RelativePath=".\usc_impl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uscript.c">
+				RelativePath=".\uscript.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uscript.h">
+				RelativePath=".\unicode\uscript.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uset.cpp">
+				RelativePath=".\uset.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uset.h">
+				RelativePath=".\unicode\uset.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uset_imp.h">
+				RelativePath=".\uset_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uset_props.cpp">
+				RelativePath=".\uset_props.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\usetiter.cpp">
+				RelativePath=".\usetiter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\usetiter.h">
+				RelativePath=".\unicode\usetiter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="registration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\serv.cpp">
+				RelativePath=".\serv.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\serv.h">
+				RelativePath=".\serv.h"
+				>
 			</File>
 			<File
-				RelativePath=".\servlk.cpp">
+				RelativePath=".\servlk.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\servlkf.cpp">
+				RelativePath=".\servlkf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\servloc.h">
+				RelativePath=".\servloc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\servls.cpp">
+				RelativePath=".\servls.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\servnotf.cpp">
+				RelativePath=".\servnotf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\servnotf.h">
+				RelativePath=".\servnotf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\servrbf.cpp">
+				RelativePath=".\servrbf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\servslkf.cpp">
+				RelativePath=".\servslkf.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="sprep"
-			Filter="">
+			>
 			<File
-				RelativePath=".\sprpimpl.h">
+				RelativePath=".\sprpimpl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\usprep.cpp">
+				RelativePath=".\usprep.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\usprep.h">
+				RelativePath=".\unicode\usprep.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="strings"
-			Filter="">
+			>
 			<File
-				RelativePath=".\chariter.cpp">
+				RelativePath=".\chariter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\chariter.h">
+				RelativePath=".\unicode\chariter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\charstr.h">
+				RelativePath=".\charstr.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cstring.c">
+				RelativePath=".\cstring.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cstring.h">
+				RelativePath=".\cstring.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cwchar.c">
+				RelativePath=".\cwchar.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cwchar.h">
+				RelativePath=".\cwchar.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\rep.h">
+				RelativePath=".\unicode\rep.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\schriter.cpp">
+				RelativePath=".\schriter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\schriter.h">
+				RelativePath=".\unicode\schriter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucasemap.c">
+				RelativePath=".\ucasemap.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucasemap.h">
+				RelativePath=".\unicode\ucasemap.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uchriter.cpp">
+				RelativePath=".\uchriter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uchriter.h">
+				RelativePath=".\unicode\uchriter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uinvchar.c">
+				RelativePath=".\uinvchar.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uinvchar.h">
+				RelativePath=".\uinvchar.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uiter.cpp">
+				RelativePath=".\uiter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uiter.h">
+				RelativePath=".\unicode\uiter.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unistr.cpp">
+				RelativePath=".\unistr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unistr.h">
+				RelativePath=".\unicode\unistr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unistr_case.cpp">
+				RelativePath=".\unistr_case.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unistr_cnv.cpp">
+				RelativePath=".\unistr_cnv.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unistr_props.cpp">
+				RelativePath=".\unistr_props.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\urep.h">
+				RelativePath=".\unicode\urep.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ustr_cnv.c">
+				RelativePath=".\ustr_cnv.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustr_cnv.h">
+				RelativePath=".\ustr_cnv.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ustr_imp.h">
+				RelativePath=".\ustr_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ustr_wcs.c">
+				RelativePath=".\ustr_wcs.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustrcase.c">
+				RelativePath=".\ustrcase.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustring.c">
+				RelativePath=".\ustring.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ustring.h">
+				RelativePath=".\unicode\ustring.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ustrtrns.c">
+				RelativePath=".\ustrtrns.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utext.cpp">
+				RelativePath=".\utext.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utext.h">
+				RelativePath=".\unicode\utext.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\utf.h">
+				RelativePath=".\unicode\utf.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\utf16.h">
+				RelativePath=".\unicode\utf16.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\utf32.h">
+				RelativePath=".\unicode\utf32.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\utf8.h">
+				RelativePath=".\unicode\utf8.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\utf_impl.c">
+				RelativePath=".\utf_impl.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utf_old.h">
+				RelativePath=".\unicode\utf_old.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>

Modified: trunk/source/data/makedata.vcproj
===================================================================
--- trunk/source/data/makedata.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/data/makedata.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,41 +1,64 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="makedata"
-	SccProjectName=""
-	SccLocalPath=""
-	Keyword="MakeFileProj">
+	ProjectGUID="{D9DF7F2F-93B7-4810-B5CD-96F4F33C079B}"
+	Keyword="MakeFileProj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="0"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=release"
 				ReBuildCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=release clean all"
-				CleanCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=release clean"/>
+				CleanCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=release clean"
+				Output=""
+				PreprocessorDefinitions=""
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="0"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
 			<Tool
 				Name="VCNMakeTool"
 				BuildCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=debug"
 				ReBuildCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=debug clean all"
-				CleanCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=debug clean"/>
+				CleanCommandLine="NMAKE /f makedata.mak ICUMAKE=&quot;$(ProjectDir)\&quot; CFG=debug clean"
+				Output=""
+				PreprocessorDefinitions=""
+				IncludeSearchPath=""
+				ForcedIncludes=""
+				AssemblySearchPath=""
+				ForcedUsingAssemblies=""
+				CompileAsManaged=""
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -43,49 +66,64 @@
 	<Files>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 		<Filter
 			Name="Make Files"
-			Filter="mak;mk">
+			Filter="mak;mk"
+			>
 			<File
-				RelativePath=".\brkitr\brkfiles.mk">
+				RelativePath=".\brkitr\brkfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\brkitr\brsfiles.mk">
+				RelativePath=".\brkitr\brsfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\coll\colfiles.mk">
+				RelativePath=".\coll\colfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\brkitr\ctdfiles.mk">
+				RelativePath=".\brkitr\ctdfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\makedata.mak">
+				RelativePath=".\makedata.mak"
+				>
 			</File>
 			<File
-				RelativePath=".\misc\miscfiles.mk">
+				RelativePath=".\misc\miscfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\rbnf\rbnffiles.mk">
+				RelativePath=".\rbnf\rbnffiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\locales\resfiles.mk">
+				RelativePath=".\locales\resfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath="..\test\testdata\testdata.mak">
+				RelativePath="..\test\testdata\testdata.mak"
+				>
 			</File>
 			<File
-				RelativePath=".\translit\trnsfiles.mk">
+				RelativePath=".\translit\trnsfiles.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\mappings\ucmcore.mk">
+				RelativePath=".\mappings\ucmcore.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\mappings\ucmebcdic.mk">
+				RelativePath=".\mappings\ucmebcdic.mk"
+				>
 			</File>
 			<File
-				RelativePath=".\mappings\ucmfiles.mk">
+				RelativePath=".\mappings\ucmfiles.mk"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/extra/uconv/uconv.vcproj
===================================================================
--- trunk/source/extra/uconv/uconv.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/extra/uconv/uconv.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,143 +1,202 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="uconv"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{DBA4088D-F6F9-4F8F-8820-082A4765C16C}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/uconv.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;UCONVMSG_LINK"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/uconv.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="uconvmsg.lib"
 				OutputFile=".\Release/uconv.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Release"
 				ProgramDatabaseFile=".\Release/uconv.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/uconv.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/uconv.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;UCONVMSG_LINK"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/uconv.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="$(ProjectDir)..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="uconvmsg.lib"
 				OutputFile=".\Debug/uconv.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="Debug"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/uconv.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/uconv.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -145,55 +204,68 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\uconv.cpp">
+				RelativePath=".\uconv.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uwmsg.c">
+				RelativePath=".\uwmsg.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\unicode\uwmsg.h">
+				RelativePath=".\unicode\uwmsg.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Bundles"
-			Filter="txt">
+			Filter="txt"
+			>
 			<File
-				RelativePath=".\resources\fr.txt">
+				RelativePath=".\resources\fr.txt"
+				>
 			</File>
 			<File
-				RelativePath=".\resources\root.txt">
+				RelativePath=".\resources\root.txt"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Build Scripts"
-			Filter="mak;mk;bat">
+			Filter="mak;mk;bat"
+			>
 			<File
-				RelativePath=".\makedata.mak">
+				RelativePath=".\makedata.mak"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nmake /nologo /f $(InputName).mak icup=&quot;$(ProjectDir)..\..\..&quot; CFG=Release
-"
-						Outputs="Release/uconvmsg.lib"/>
+						CommandLine="nmake /nologo /f $(InputName).mak icup=&quot;$(ProjectDir)..\..\..&quot; CFG=Release&#x0D;&#x0A;"
+						Outputs="Release/uconvmsg.lib"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="nmake /nologo /f $(InputName).mak icup=&quot;$(ProjectDir)..\..\..&quot; CFG=Debug
-"
-						Outputs="Debug/uconvmsg.lib"/>
+						CommandLine="nmake /nologo /f $(InputName).mak icup=&quot;$(ProjectDir)..\..\..&quot; CFG=Debug&#x0D;&#x0A;"
+						Outputs="Debug/uconvmsg.lib"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\resfiles.mk">
+				RelativePath=".\resfiles.mk"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/i18n/i18n.vcproj
===================================================================
--- trunk/source/i18n/i18n.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/i18n/i18n.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,148 +1,209 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="i18n"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{0178B127-6269-407D-B112-93877BB62776}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuin.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_I18N_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/i18n.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="../common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuin36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\lib\icuin36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4a900000"
-				ImportLibrary="..\..\lib\icuin.lib"/>
+				ImportLibrary="..\..\lib\icuin.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuin.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="../common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuind.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_I18N_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/i18n.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="../common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuin36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\lib\icuin36d.pdb"
 				BaseAddress="0x4a900000"
-				ImportLibrary="..\..\lib\icuind.lib"/>
+				ImportLibrary="..\..\lib\icuind.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuind.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="../common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -150,1353 +211,1654 @@
 	<Files>
 		<Filter
 			Name="collation"
-			Filter="">
+			>
 			<File
-				RelativePath=".\bocsu.c">
+				RelativePath=".\bocsu.c"
+				>
 			</File>
 			<File
-				RelativePath=".\bocsu.h">
+				RelativePath=".\bocsu.h"
+				>
 			</File>
 			<File
-				RelativePath=".\coleitr.cpp">
+				RelativePath=".\coleitr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\coleitr.h">
+				RelativePath=".\unicode\coleitr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\coll.cpp">
+				RelativePath=".\coll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\coll.h">
+				RelativePath=".\unicode\coll.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\search.cpp">
+				RelativePath=".\search.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\search.h">
+				RelativePath=".\unicode\search.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\sortkey.cpp">
+				RelativePath=".\sortkey.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\sortkey.h">
+				RelativePath=".\unicode\sortkey.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\stsearch.cpp">
+				RelativePath=".\stsearch.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\stsearch.h">
+				RelativePath=".\unicode\stsearch.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\tblcoll.cpp">
+				RelativePath=".\tblcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\tblcoll.h">
+				RelativePath=".\unicode\tblcoll.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucol.cpp">
+				RelativePath=".\ucol.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucol.h">
+				RelativePath=".\unicode\ucol.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucol_bld.cpp">
+				RelativePath=".\ucol_bld.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_bld.h">
+				RelativePath=".\ucol_bld.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_cnt.cpp">
+				RelativePath=".\ucol_cnt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_cnt.h">
+				RelativePath=".\ucol_cnt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_elm.cpp">
+				RelativePath=".\ucol_elm.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_elm.h">
+				RelativePath=".\ucol_elm.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_imp.h">
+				RelativePath=".\ucol_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_res.cpp">
+				RelativePath=".\ucol_res.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_sit.cpp">
+				RelativePath=".\ucol_sit.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_tok.cpp">
+				RelativePath=".\ucol_tok.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_tok.h">
+				RelativePath=".\ucol_tok.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_wgt.c">
+				RelativePath=".\ucol_wgt.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucol_wgt.h">
+				RelativePath=".\ucol_wgt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucoleitr.cpp">
+				RelativePath=".\ucoleitr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucoleitr.h">
+				RelativePath=".\unicode\ucoleitr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\usearch.cpp">
+				RelativePath=".\usearch.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\usearch.h">
+				RelativePath=".\unicode\usearch.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\usrchimp.h">
+				RelativePath=".\usrchimp.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="formatting"
-			Filter="">
+			>
 			<File
-				RelativePath=".\astro.cpp">
+				RelativePath=".\astro.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\astro.h">
+				RelativePath=".\astro.h"
+				>
 			</File>
 			<File
-				RelativePath=".\buddhcal.cpp">
+				RelativePath=".\buddhcal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\buddhcal.h">
+				RelativePath=".\buddhcal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\calendar.cpp">
+				RelativePath=".\calendar.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\calendar.h">
+				RelativePath=".\unicode\calendar.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\choicfmt.cpp">
+				RelativePath=".\choicfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\choicfmt.h">
+				RelativePath=".\unicode\choicfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\curramt.cpp">
+				RelativePath=".\curramt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\curramt.h">
+				RelativePath=".\unicode\curramt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\currfmt.cpp">
+				RelativePath=".\currfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\currfmt.h">
+				RelativePath=".\currfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\currunit.cpp">
+				RelativePath=".\currunit.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\currunit.h">
+				RelativePath=".\unicode\currunit.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\datefmt.cpp">
+				RelativePath=".\datefmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\datefmt.h">
+				RelativePath=".\unicode\datefmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\dcfmtsym.cpp">
+				RelativePath=".\dcfmtsym.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\dcfmtsym.h">
+				RelativePath=".\unicode\dcfmtsym.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\decimfmt.cpp">
+				RelativePath=".\decimfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\decimfmt.h">
+				RelativePath=".\unicode\decimfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\digitlst.cpp">
+				RelativePath=".\digitlst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\digitlst.h">
+				RelativePath=".\digitlst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmtsym.cpp">
+				RelativePath=".\dtfmtsym.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\dtfmtsym.h">
+				RelativePath=".\unicode\dtfmtsym.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\fieldpos.h">
+				RelativePath=".\unicode\fieldpos.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\fmtable.cpp">
+				RelativePath=".\fmtable.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\fmtable.h">
+				RelativePath=".\unicode\fmtable.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\fmtable_cnv.cpp">
+				RelativePath=".\fmtable_cnv.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\format.cpp">
+				RelativePath=".\format.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\format.h">
+				RelativePath=".\unicode\format.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gregocal.cpp">
+				RelativePath=".\gregocal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\gregocal.h">
+				RelativePath=".\unicode\gregocal.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\gregoimp.cpp">
+				RelativePath=".\gregoimp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\gregoimp.h">
+				RelativePath=".\gregoimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\hebrwcal.cpp">
+				RelativePath=".\hebrwcal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\hebrwcal.h">
+				RelativePath=".\hebrwcal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\islamcal.cpp">
+				RelativePath=".\islamcal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\islamcal.h">
+				RelativePath=".\islamcal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\japancal.cpp">
+				RelativePath=".\japancal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\japancal.h">
+				RelativePath=".\japancal.h"
+				>
 			</File>
 			<File
-				RelativePath=".\measfmt.cpp">
+				RelativePath=".\measfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\measfmt.h">
+				RelativePath=".\unicode\measfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\measunit.h">
+				RelativePath=".\unicode\measunit.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\measure.cpp">
+				RelativePath=".\measure.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\measure.h">
+				RelativePath=".\unicode\measure.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\msgfmt.cpp">
+				RelativePath=".\msgfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\msgfmt.h">
+				RelativePath=".\unicode\msgfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\nfrlist.h">
+				RelativePath=".\nfrlist.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nfrs.cpp">
+				RelativePath=".\nfrs.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nfrs.h">
+				RelativePath=".\nfrs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nfrule.cpp">
+				RelativePath=".\nfrule.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nfrule.h">
+				RelativePath=".\nfrule.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nfsubs.cpp">
+				RelativePath=".\nfsubs.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nfsubs.h">
+				RelativePath=".\nfsubs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\numfmt.cpp">
+				RelativePath=".\numfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\numfmt.h">
+				RelativePath=".\unicode\numfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\olsontz.cpp">
+				RelativePath=".\olsontz.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\olsontz.h">
+				RelativePath=".\olsontz.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbnf.cpp">
+				RelativePath=".\rbnf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\rbnf.h">
+				RelativePath=".\unicode\rbnf.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\simpletz.cpp">
+				RelativePath=".\simpletz.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\simpletz.h">
+				RelativePath=".\unicode\simpletz.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\smpdtfmt.cpp">
+				RelativePath=".\smpdtfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\smpdtfmt.h">
+				RelativePath=".\unicode\smpdtfmt.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\timezone.cpp">
+				RelativePath=".\timezone.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\timezone.h">
+				RelativePath=".\unicode\timezone.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucal.cpp">
+				RelativePath=".\ucal.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucal.h">
+				RelativePath=".\unicode\ucal.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucurr.cpp">
+				RelativePath=".\ucurr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucurr.h">
+				RelativePath=".\unicode\ucurr.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucurrimp.h">
+				RelativePath=".\ucurrimp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\udat.cpp">
+				RelativePath=".\udat.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\udat.h">
+				RelativePath=".\unicode\udat.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ulocdata.c">
+				RelativePath=".\ulocdata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ulocdata.h">
+				RelativePath=".\unicode\ulocdata.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\umsg.cpp">
+				RelativePath=".\umsg.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\umsg.h">
+				RelativePath=".\unicode\umsg.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\umsg_imp.h">
+				RelativePath=".\umsg_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unum.cpp">
+				RelativePath=".\unum.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unum.h">
+				RelativePath=".\unicode\unum.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\utmscale.c">
+				RelativePath=".\utmscale.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utmscale.h">
+				RelativePath=".\unicode\utmscale.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\windtfmt.cpp">
+				RelativePath=".\windtfmt.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\windtfmt.h">
+				RelativePath=".\windtfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\winnmfmt.cpp">
+				RelativePath=".\winnmfmt.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\winnmfmt.h">
+				RelativePath=".\winnmfmt.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="misc"
-			Filter="">
+			>
 			<File
-				RelativePath=".\i18n.rc">
+				RelativePath=".\i18n.rc"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_in.c">
+				RelativePath=".\ucln_in.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_in.h">
+				RelativePath=".\ucln_in.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="regex"
-			Filter="">
+			>
 			<File
-				RelativePath=".\unicode\regex.h">
+				RelativePath=".\unicode\regex.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\regexcmp.cpp">
+				RelativePath=".\regexcmp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\regexcmp.h">
+				RelativePath=".\regexcmp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\regexcst.h">
+				RelativePath=".\regexcst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\regeximp.h">
+				RelativePath=".\regeximp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\regexst.cpp">
+				RelativePath=".\regexst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\regexst.h">
+				RelativePath=".\regexst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rematch.cpp">
+				RelativePath=".\rematch.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\repattrn.cpp">
+				RelativePath=".\repattrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uregex.cpp">
+				RelativePath=".\uregex.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uregex.h">
+				RelativePath=".\unicode\uregex.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\uregexc.cpp">
+				RelativePath=".\uregexc.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="transforms"
-			Filter="">
+			>
 			<File
-				RelativePath=".\anytrans.cpp">
+				RelativePath=".\anytrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\anytrans.h">
+				RelativePath=".\anytrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\casetrn.cpp">
+				RelativePath=".\casetrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\casetrn.h">
+				RelativePath=".\casetrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cpdtrans.cpp">
+				RelativePath=".\cpdtrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\cpdtrans.h">
+				RelativePath=".\cpdtrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\esctrn.cpp">
+				RelativePath=".\esctrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\esctrn.h">
+				RelativePath=".\esctrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\funcrepl.cpp">
+				RelativePath=".\funcrepl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\funcrepl.h">
+				RelativePath=".\funcrepl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\name2uni.cpp">
+				RelativePath=".\name2uni.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\name2uni.h">
+				RelativePath=".\name2uni.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nortrans.cpp">
+				RelativePath=".\nortrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nortrans.h">
+				RelativePath=".\nortrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nultrans.cpp">
+				RelativePath=".\nultrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nultrans.h">
+				RelativePath=".\nultrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\quant.cpp">
+				RelativePath=".\quant.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\quant.h">
+				RelativePath=".\quant.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt.cpp">
+				RelativePath=".\rbt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt.h">
+				RelativePath=".\rbt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_data.cpp">
+				RelativePath=".\rbt_data.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_data.h">
+				RelativePath=".\rbt_data.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_pars.cpp">
+				RelativePath=".\rbt_pars.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_pars.h">
+				RelativePath=".\rbt_pars.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_rule.cpp">
+				RelativePath=".\rbt_rule.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_rule.h">
+				RelativePath=".\rbt_rule.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_set.cpp">
+				RelativePath=".\rbt_set.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbt_set.h">
+				RelativePath=".\rbt_set.h"
+				>
 			</File>
 			<File
-				RelativePath=".\remtrans.cpp">
+				RelativePath=".\remtrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\remtrans.h">
+				RelativePath=".\remtrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\strmatch.cpp">
+				RelativePath=".\strmatch.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\strmatch.h">
+				RelativePath=".\strmatch.h"
+				>
 			</File>
 			<File
-				RelativePath=".\strrepl.cpp">
+				RelativePath=".\strrepl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\strrepl.h">
+				RelativePath=".\strrepl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\titletrn.cpp">
+				RelativePath=".\titletrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\titletrn.h">
+				RelativePath=".\titletrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tolowtrn.cpp">
+				RelativePath=".\tolowtrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tolowtrn.h">
+				RelativePath=".\tolowtrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\toupptrn.cpp">
+				RelativePath=".\toupptrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\toupptrn.h">
+				RelativePath=".\toupptrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\translit.cpp">
+				RelativePath=".\translit.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\translit.h">
+				RelativePath=".\unicode\translit.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\transreg.cpp">
+				RelativePath=".\transreg.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\transreg.h">
+				RelativePath=".\transreg.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tridpars.cpp">
+				RelativePath=".\tridpars.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tridpars.h">
+				RelativePath=".\tridpars.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unesctrn.cpp">
+				RelativePath=".\unesctrn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unesctrn.h">
+				RelativePath=".\unesctrn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uni2name.cpp">
+				RelativePath=".\uni2name.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uni2name.h">
+				RelativePath=".\uni2name.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\unirepl.h">
+				RelativePath=".\unicode\unirepl.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\utrans.cpp">
+				RelativePath=".\utrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utrans.h">
+				RelativePath=".\unicode\utrans.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="charset detect"
-			Filter="">
+			>
 			<File
-				RelativePath=".\csdetect.cpp">
+				RelativePath=".\csdetect.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csdetect.h">
+				RelativePath=".\csdetect.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csmatch.cpp">
+				RelativePath=".\csmatch.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csmatch.h">
+				RelativePath=".\csmatch.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csr2022.cpp">
+				RelativePath=".\csr2022.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csr2022.h">
+				RelativePath=".\csr2022.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csrecog.cpp">
+				RelativePath=".\csrecog.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csrecog.h">
+				RelativePath=".\csrecog.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csrmbcs.cpp">
+				RelativePath=".\csrmbcs.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csrmbcs.h">
+				RelativePath=".\csrmbcs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csrsbcs.cpp">
+				RelativePath=".\csrsbcs.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csrsbcs.h">
+				RelativePath=".\csrsbcs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csrucode.cpp">
+				RelativePath=".\csrucode.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csrucode.h">
+				RelativePath=".\csrucode.h"
+				>
 			</File>
 			<File
-				RelativePath=".\csrutf8.cpp">
+				RelativePath=".\csrutf8.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csrutf8.h">
+				RelativePath=".\csrutf8.h"
+				>
 			</File>
 			<File
-				RelativePath=".\inputext.cpp">
+				RelativePath=".\inputext.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\inputext.h">
+				RelativePath=".\inputext.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucsdet.cpp">
+				RelativePath=".\ucsdet.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ucsdet.h">
+				RelativePath=".\unicode\ucsdet.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>

Modified: trunk/source/io/io.vcproj
===================================================================
--- trunk/source/io/io.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/io/io.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,148 +1,209 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="io"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{C2B04507-2521-4801-BF0D-5FD79D6D518C}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuio.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_IO_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/icuio.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuio36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\lib\icuio36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4ab00000"
-				ImportLibrary="..\..\lib\icuio.lib"/>
+				ImportLibrary="..\..\lib\icuio.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuio.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icuio.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_IO_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/icuio.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icuio36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\lib\icuio36d.pdb"
 				BaseAddress="0x4ab00000"
-				ImportLibrary="..\..\lib\icuiod.lib"/>
+				ImportLibrary="..\..\lib\icuiod.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icuio.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -150,121 +211,153 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\locbund.c">
+				RelativePath=".\locbund.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sprintf.c">
+				RelativePath=".\sprintf.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sscanf.c">
+				RelativePath=".\sscanf.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_io.c">
+				RelativePath=".\ucln_io.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ufile.c">
+				RelativePath=".\ufile.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ufmt_cmn.c">
+				RelativePath=".\ufmt_cmn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uprintf.c">
+				RelativePath=".\uprintf.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uprntf_p.c">
+				RelativePath=".\uprntf_p.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uscanf.c">
+				RelativePath=".\uscanf.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uscanf_p.c">
+				RelativePath=".\uscanf_p.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustdio.c">
+				RelativePath=".\ustdio.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustream.cpp">
+				RelativePath=".\ustream.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\locbund.h">
+				RelativePath=".\locbund.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucln_io.h">
+				RelativePath=".\ucln_io.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ufile.h">
+				RelativePath=".\ufile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ufmt_cmn.h">
+				RelativePath=".\ufmt_cmn.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uprintf.h">
+				RelativePath=".\uprintf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uscanf.h">
+				RelativePath=".\uscanf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\ustdio.h">
+				RelativePath=".\unicode\ustdio.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\unicode\ustream.h">
+				RelativePath=".\unicode\ustream.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode
-"
-						Outputs="..\..\include\unicode\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\unicode&#x0D;&#x0A;"
+						Outputs="..\..\include\unicode\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath=".\io.rc">
+				RelativePath=".\io.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/layout/layout.vcproj
===================================================================
--- trunk/source/layout/layout.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/layout/layout.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,147 +1,208 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="layout"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{C920062A-0647-4553-A3B2-37C58065664B}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\iculed.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_LAYOUT_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/layout.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icule36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\lib\icule36d.pdb"
 				BaseAddress="0x4ac00000"
-				ImportLibrary="..\..\lib\iculed.lib"/>
+				ImportLibrary="..\..\lib\iculed.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\iculed.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\icule.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_LAYOUT_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/layout.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+				AdditionalIncludeDirectories="..\common"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icule36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\lib\icule36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4ac00000"
-				ImportLibrary="..\..\lib\icule.lib"/>
+				ImportLibrary="..\..\lib\icule.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\icule.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="..\common"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -149,635 +210,815 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\AlternateSubstSubtables.cpp">
+				RelativePath=".\AlternateSubstSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\AnchorTables.cpp">
+				RelativePath=".\AnchorTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ArabicLayoutEngine.cpp">
+				RelativePath=".\ArabicLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ArabicShaping.cpp">
+				RelativePath=".\ArabicShaping.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\CanonData.cpp">
+				RelativePath=".\CanonData.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\CanonShaping.cpp">
+				RelativePath=".\CanonShaping.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ClassDefinitionTables.cpp">
+				RelativePath=".\ClassDefinitionTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualGlyphSubstProc.cpp">
+				RelativePath=".\ContextualGlyphSubstProc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualSubstSubtables.cpp">
+				RelativePath=".\ContextualSubstSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\CoverageTables.cpp">
+				RelativePath=".\CoverageTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\CursiveAttachmentSubtables.cpp">
+				RelativePath=".\CursiveAttachmentSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\DeviceTables.cpp">
+				RelativePath=".\DeviceTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ExtensionSubtables.cpp">
+				RelativePath=".\ExtensionSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\Features.cpp">
+				RelativePath=".\Features.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GDEFMarkFilter.cpp">
+				RelativePath=".\GDEFMarkFilter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphDefinitionTables.cpp">
+				RelativePath=".\GlyphDefinitionTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphIterator.cpp">
+				RelativePath=".\GlyphIterator.cpp"
+				>
 			</File>
 			<File
-				RelativePath="GlyphLookupTables.cpp">
+				RelativePath="GlyphLookupTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPositionAdjustments.cpp">
+				RelativePath=".\GlyphPositionAdjustments.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPositioningTables.cpp">
+				RelativePath=".\GlyphPositioningTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPosnLookupProc.cpp">
+				RelativePath=".\GlyphPosnLookupProc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphSubstitutionTables.cpp">
+				RelativePath=".\GlyphSubstitutionTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphSubstLookupProc.cpp">
+				RelativePath=".\GlyphSubstLookupProc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\GXLayoutEngine.cpp">
+				RelativePath=".\GXLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\HangulLayoutEngine.cpp">
+				RelativePath=".\HangulLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\HanLayoutEngine.cpp">
+				RelativePath=".\HanLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicClassTables.cpp">
+				RelativePath=".\IndicClassTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicLayoutEngine.cpp">
+				RelativePath=".\IndicLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicRearrangementProcessor.cpp">
+				RelativePath=".\IndicRearrangementProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicReordering.cpp">
+				RelativePath=".\IndicReordering.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\KernTable.cpp">
+				RelativePath=".\KernTable.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\KhmerLayoutEngine.cpp">
+				RelativePath=".\KhmerLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\KhmerReordering.cpp">
+				RelativePath=".\KhmerReordering.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LayoutEngine.cpp">
+				RelativePath=".\LayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LEFontInstance.cpp">
+				RelativePath=".\LEFontInstance.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LEGlyphStorage.cpp">
+				RelativePath=".\LEGlyphStorage.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LEInsertionList.cpp">
+				RelativePath=".\LEInsertionList.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LigatureSubstProc.cpp">
+				RelativePath=".\LigatureSubstProc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LigatureSubstSubtables.cpp">
+				RelativePath=".\LigatureSubstSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LookupProcessor.cpp">
+				RelativePath=".\LookupProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\Lookups.cpp">
+				RelativePath=".\Lookups.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\LookupTables.cpp">
+				RelativePath=".\LookupTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkArrays.cpp">
+				RelativePath=".\MarkArrays.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToBasePosnSubtables.cpp">
+				RelativePath=".\MarkToBasePosnSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToLigaturePosnSubtables.cpp">
+				RelativePath=".\MarkToLigaturePosnSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToMarkPosnSubtables.cpp">
+				RelativePath=".\MarkToMarkPosnSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MirroredCharData.cpp">
+				RelativePath=".\MirroredCharData.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MorphTables.cpp">
+				RelativePath=".\MorphTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MPreFixups.cpp">
+				RelativePath=".\MPreFixups.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\MultipleSubstSubtables.cpp">
+				RelativePath=".\MultipleSubstSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\NonContextualGlyphSubstProc.cpp">
+				RelativePath=".\NonContextualGlyphSubstProc.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\OpenTypeLayoutEngine.cpp">
+				RelativePath=".\OpenTypeLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\OpenTypeUtilities.cpp">
+				RelativePath=".\OpenTypeUtilities.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\PairPositioningSubtables.cpp">
+				RelativePath=".\PairPositioningSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ScriptAndLanguage.cpp">
+				RelativePath=".\ScriptAndLanguage.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ScriptAndLanguageTags.cpp">
+				RelativePath=".\ScriptAndLanguageTags.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SegmentArrayProcessor.cpp">
+				RelativePath=".\SegmentArrayProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SegmentSingleProcessor.cpp">
+				RelativePath=".\SegmentSingleProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ShapingTypeData.cpp">
+				RelativePath=".\ShapingTypeData.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SimpleArrayProcessor.cpp">
+				RelativePath=".\SimpleArrayProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SinglePositioningSubtables.cpp">
+				RelativePath=".\SinglePositioningSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SingleSubstitutionSubtables.cpp">
+				RelativePath=".\SingleSubstitutionSubtables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SingleTableProcessor.cpp">
+				RelativePath=".\SingleTableProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\StateTableProcessor.cpp">
+				RelativePath=".\StateTableProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SubstitutionLookups.cpp">
+				RelativePath=".\SubstitutionLookups.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SubtableProcessor.cpp">
+				RelativePath=".\SubtableProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ThaiLayoutEngine.cpp">
+				RelativePath=".\ThaiLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ThaiShaping.cpp">
+				RelativePath=".\ThaiShaping.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ThaiStateTables.cpp">
+				RelativePath=".\ThaiStateTables.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\TibetanLayoutEngine.cpp">
+				RelativePath=".\TibetanLayoutEngine.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\TibetanReordering.cpp">
+				RelativePath=".\TibetanReordering.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\TrimmedArrayProcessor.cpp">
+				RelativePath=".\TrimmedArrayProcessor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ValueRecords.cpp">
+				RelativePath=".\ValueRecords.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\AlternateSubstSubtables.h">
+				RelativePath=".\AlternateSubstSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\AnchorTables.h">
+				RelativePath=".\AnchorTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ArabicLayoutEngine.h">
+				RelativePath=".\ArabicLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ArabicShaping.h">
+				RelativePath=".\ArabicShaping.h"
+				>
 			</File>
 			<File
-				RelativePath=".\AttachmentPosnSubtables.h">
+				RelativePath=".\AttachmentPosnSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\CanonShaping.h">
+				RelativePath=".\CanonShaping.h"
+				>
 			</File>
 			<File
-				RelativePath=".\CharSubstitutionFilter.h">
+				RelativePath=".\CharSubstitutionFilter.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ClassDefinitionTables.h">
+				RelativePath=".\ClassDefinitionTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualGlyphInsertion.h">
+				RelativePath=".\ContextualGlyphInsertion.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualGlyphSubstitution.h">
+				RelativePath=".\ContextualGlyphSubstitution.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualGlyphSubstProc.h">
+				RelativePath=".\ContextualGlyphSubstProc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ContextualSubstSubtables.h">
+				RelativePath=".\ContextualSubstSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\CoverageTables.h">
+				RelativePath=".\CoverageTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\CursiveAttachmentSubtables.h">
+				RelativePath=".\CursiveAttachmentSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\DefaultCharMapper.h">
+				RelativePath=".\DefaultCharMapper.h"
+				>
 			</File>
 			<File
-				RelativePath=".\DeviceTables.h">
+				RelativePath=".\DeviceTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ExtensionSubtables.h">
+				RelativePath=".\ExtensionSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Features.h">
+				RelativePath=".\Features.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GDEFMarkFilter.h">
+				RelativePath=".\GDEFMarkFilter.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphDefinitionTables.h">
+				RelativePath=".\GlyphDefinitionTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphIterator.h">
+				RelativePath=".\GlyphIterator.h"
+				>
 			</File>
 			<File
-				RelativePath="GlyphLookupTables.h">
+				RelativePath="GlyphLookupTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPositionAdjustments.h">
+				RelativePath=".\GlyphPositionAdjustments.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPositioningTables.h">
+				RelativePath=".\GlyphPositioningTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphPosnLookupProc.h">
+				RelativePath=".\GlyphPosnLookupProc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphSubstitutionTables.h">
+				RelativePath=".\GlyphSubstitutionTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GlyphSubstLookupProc.h">
+				RelativePath=".\GlyphSubstLookupProc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\GXLayoutEngine.h">
+				RelativePath=".\GXLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\HangulLayoutEngine.h">
+				RelativePath=".\HangulLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\HanLayoutEngine.h">
+				RelativePath=".\HanLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicLayoutEngine.h">
+				RelativePath=".\IndicLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicRearrangement.h">
+				RelativePath=".\IndicRearrangement.h"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicRearrangementProcessor.h">
+				RelativePath=".\IndicRearrangementProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\IndicReordering.h">
+				RelativePath=".\IndicReordering.h"
+				>
 			</File>
 			<File
-				RelativePath=".\KernTable.h">
+				RelativePath=".\KernTable.h"
+				>
 			</File>
 			<File
-				RelativePath=".\KhmerLayoutEngine.h">
+				RelativePath=".\KhmerLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\KhmerReordering.h">
+				RelativePath=".\KhmerReordering.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LayoutEngine.h">
+				RelativePath=".\LayoutEngine.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LayoutTables.h">
+				RelativePath=".\LayoutTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LEFontInstance.h">
+				RelativePath=".\LEFontInstance.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LEGlyphFilter.h">
+				RelativePath=".\LEGlyphFilter.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LEGlyphStorage.h">
+				RelativePath=".\LEGlyphStorage.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LEInsertionList.h">
+				RelativePath=".\LEInsertionList.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LELanguages.h">
+				RelativePath=".\LELanguages.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LEScripts.h">
+				RelativePath=".\LEScripts.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LESwaps.h">
+				RelativePath=".\LESwaps.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LETypes.h">
+				RelativePath=".\LETypes.h"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\LigatureSubstitution.h">
+				RelativePath=".\LigatureSubstitution.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LigatureSubstProc.h">
+				RelativePath=".\LigatureSubstProc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LigatureSubstSubtables.h">
+				RelativePath=".\LigatureSubstSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LookupProcessor.h">
+				RelativePath=".\LookupProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Lookups.h">
+				RelativePath=".\Lookups.h"
+				>
 			</File>
 			<File
-				RelativePath=".\LookupTables.h">
+				RelativePath=".\LookupTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkArrays.h">
+				RelativePath=".\MarkArrays.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToBasePosnSubtables.h">
+				RelativePath=".\MarkToBasePosnSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToLigaturePosnSubtables.h">
+				RelativePath=".\MarkToLigaturePosnSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MarkToMarkPosnSubtables.h">
+				RelativePath=".\MarkToMarkPosnSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MorphStateTables.h">
+				RelativePath=".\MorphStateTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MorphTables.h">
+				RelativePath=".\MorphTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MPreFixups.h">
+				RelativePath=".\MPreFixups.h"
+				>
 			</File>
 			<File
-				RelativePath=".\MultipleSubstSubtables.h">
+				RelativePath=".\MultipleSubstSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\NonContextualGlyphSubst.h">
+				RelativePath=".\NonContextualGlyphSubst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\NonContextualGlyphSubstProc.h">
+				RelativePath=".\NonContextualGlyphSubstProc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\OpenTypeLayoutEngine.h">
+				RelativePath=".\OpenTypeLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\OpenTypeTables.h">
+				RelativePath=".\OpenTypeTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\OpenTypeUtilities.h">
+				RelativePath=".\OpenTypeUtilities.h"
+				>
 			</File>
 			<File
-				RelativePath=".\PairPositioningSubtables.h">
+				RelativePath=".\PairPositioningSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ScriptAndLanguage.h">
+				RelativePath=".\ScriptAndLanguage.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ScriptAndLanguageTags.h">
+				RelativePath=".\ScriptAndLanguageTags.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SegmentArrayProcessor.h">
+				RelativePath=".\SegmentArrayProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SegmentSingleProcessor.h">
+				RelativePath=".\SegmentSingleProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SimpleArrayProcessor.h">
+				RelativePath=".\SimpleArrayProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SinglePositioningSubtables.h">
+				RelativePath=".\SinglePositioningSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SingleSubstitutionSubtables.h">
+				RelativePath=".\SingleSubstitutionSubtables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SingleTableProcessor.h">
+				RelativePath=".\SingleTableProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\StateTableProcessor.h">
+				RelativePath=".\StateTableProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\StateTables.h">
+				RelativePath=".\StateTables.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SubstitutionLookups.h">
+				RelativePath=".\SubstitutionLookups.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SubtableProcessor.h">
+				RelativePath=".\SubtableProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ThaiLayoutEngine.h">
+				RelativePath=".\ThaiLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ThaiShaping.h">
+				RelativePath=".\ThaiShaping.h"
+				>
 			</File>
 			<File
-				RelativePath=".\TibetanLayoutEngine.h">
+				RelativePath=".\TibetanLayoutEngine.h"
+				>
 			</File>
 			<File
-				RelativePath=".\TibetanReordering.h">
+				RelativePath=".\TibetanReordering.h"
+				>
 			</File>
 			<File
-				RelativePath=".\TrimmedArrayProcessor.h">
+				RelativePath=".\TrimmedArrayProcessor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ValueRecords.h">
+				RelativePath=".\ValueRecords.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath=".\layout.rc">
+				RelativePath=".\layout.rc"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/layoutex/layoutex.vcproj
===================================================================
--- trunk/source/layoutex/layoutex.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/layoutex/layoutex.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,145 +1,206 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="layoutex"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{37FC2C7F-1904-4811-8955-2F478830EAD1}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\iculx.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_LAYOUTEX_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/layoutex.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\iculx36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\lib\iculx36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4ac80000"
-				ImportLibrary="..\..\lib\iculx.lib"/>
+				ImportLibrary="..\..\lib\iculx.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\iculx.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\lib\iculxd.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\include;..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_LAYOUTEX_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/layoutex.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\iculx36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\lib\iculx36d.pdb"
 				BaseAddress="0x4ac80000"
-				ImportLibrary="..\..\lib\iculxd.lib"/>
+				ImportLibrary="..\..\lib\iculxd.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\lib\iculxd.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -147,78 +208,96 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath="LXUtilities.cpp">
+				RelativePath="LXUtilities.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ParagraphLayout.cpp">
+				RelativePath=".\ParagraphLayout.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\RunArrays.cpp">
+				RelativePath=".\RunArrays.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="LXUtilities.h">
+				RelativePath="LXUtilities.h"
+				>
 			</File>
 			<File
-				RelativePath=".\layout\ParagraphLayout.h">
+				RelativePath=".\layout\ParagraphLayout.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\layout\RunArrays.h">
+				RelativePath=".\layout\RunArrays.h"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCustomBuildTool"
-						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout
-"
-						Outputs="..\..\include\layout\$(InputFileName)"/>
+						CommandLine="copy &quot;$(InputPath)&quot; ..\..\include\layout&#x0D;&#x0A;"
+						Outputs="..\..\include\layout\$(InputFileName)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 			<File
-				RelativePath=".\layoutex.rc">
+				RelativePath=".\layoutex.rc"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\common;$(NoInherit)"/>
+						AdditionalIncludeDirectories="..\common;$(NoInherit)"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="..\common;$(NoInherit)"/>
+						AdditionalIncludeDirectories="..\common;$(NoInherit)"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>

Modified: trunk/source/stubdata/stubdata.vcproj
===================================================================
--- trunk/source/stubdata/stubdata.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/stubdata/stubdata.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,142 +1,203 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="stubdata"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{203EC78A-0531-43F0-A636-285439BDE025}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/icudt.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/stubdata.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="echo &quot;File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one.&quot; &gt; &quot;$(ProjectDir)stubdatabuilt.txt&quot;"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icudt36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/icudt36.pdb"
-				ResourceOnlyDLL="TRUE"
-				ImportLibrary="..\..\lib\icudt.lib"/>
+				ResourceOnlyDLL="true"
+				ImportLibrary="..\..\lib\icudt.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/icudt.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="echo &quot;File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one.&quot; &gt; &quot;$(ProjectDir)stubdatabuilt.txt&quot;"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/icudt.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/stubdata.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+				CommandLine="echo &quot;File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one.&quot; &gt; &quot;$(ProjectDir)stubdatabuilt.txt&quot;"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\bin\icudt36.dll"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Debug/icudt36.pdb"
-				ResourceOnlyDLL="TRUE"
-				ImportLibrary="..\..\lib\icudt.lib"/>
+				ResourceOnlyDLL="true"
+				ImportLibrary="..\..\lib\icudt.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/icudt.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"
-				CommandLine="echo &quot;File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one.&quot; &gt; &quot;$(ProjectDir)stubdatabuilt.txt&quot;"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -144,18 +205,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\stubdata.c">
+				RelativePath=".\stubdata.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/test/cintltst/cintltst.vcproj
===================================================================
--- trunk/source/test/cintltst/cintltst.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/test/cintltst/cintltst.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,137 +1,198 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="cintltst"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{3D1246AE-1B32-479B-BECA-AEFA97BE2321}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/cintltst.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil"
 				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/cintltst.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/cintltst.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/cintltst.pdb"
 				SubSystem="1"
-				FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/cintltst.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/cintltst.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil"
 				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/cintltst.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/cintltst.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/cintltst.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/cintltst.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -139,404 +200,518 @@
 	<Files>
 		<Filter
 			Name="bidi"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cbididat.c">
+				RelativePath=".\cbididat.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cbiditst.c">
+				RelativePath=".\cbiditst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cbiditst.h">
+				RelativePath=".\cbiditst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="break iteration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cbiapts.c">
+				RelativePath=".\cbiapts.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cbiapts.h">
+				RelativePath=".\cbiapts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cbkittst.c">
+				RelativePath=".\cbkittst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collation"
-			Filter="">
+			>
 			<File
-				RelativePath=".\callcoll.c">
+				RelativePath=".\callcoll.c"
+				>
 			</File>
 			<File
-				RelativePath=".\callcoll.h">
+				RelativePath=".\callcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\capitst.c">
+				RelativePath=".\capitst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\capitst.h">
+				RelativePath=".\capitst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ccolltst.c">
+				RelativePath=".\ccolltst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ccolltst.h">
+				RelativePath=".\ccolltst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ccurrtst.c">
+				RelativePath=".\ccurrtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ccurrtst.h">
+				RelativePath=".\ccurrtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cdetst.c">
+				RelativePath=".\cdetst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cdetst.h">
+				RelativePath=".\cdetst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cestst.c">
+				RelativePath=".\cestst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cestst.h">
+				RelativePath=".\cestst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cfintst.c">
+				RelativePath=".\cfintst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cfintst.h">
+				RelativePath=".\cfintst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cfrtst.c">
+				RelativePath=".\cfrtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cfrtst.h">
+				RelativePath=".\cfrtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cg7coll.c">
+				RelativePath=".\cg7coll.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cg7coll.h">
+				RelativePath=".\cg7coll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\citertst.c">
+				RelativePath=".\citertst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\citertst.h">
+				RelativePath=".\citertst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cjaptst.c">
+				RelativePath=".\cjaptst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cjaptst.h">
+				RelativePath=".\cjaptst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cmsccoll.c">
+				RelativePath=".\cmsccoll.c"
+				>
 			</File>
 			<File
-				RelativePath=".\colutil.c">
+				RelativePath=".\colutil.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cturtst.c">
+				RelativePath=".\cturtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cturtst.h">
+				RelativePath=".\cturtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\encoll.c">
+				RelativePath=".\encoll.c"
+				>
 			</File>
 			<File
-				RelativePath=".\encoll.h">
+				RelativePath=".\encoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\usrchdat.c">
+				RelativePath=".\usrchdat.c"
+				>
 			</File>
 			<File
-				RelativePath=".\usrchtst.c">
+				RelativePath=".\usrchtst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collections"
-			Filter="">
+			>
 			<File
-				RelativePath=".\chashtst.c">
+				RelativePath=".\chashtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sorttest.c">
+				RelativePath=".\sorttest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\trietest.c">
+				RelativePath=".\trietest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uenumtst.c">
+				RelativePath=".\uenumtst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="conversion"
-			Filter="">
+			>
 			<File
-				RelativePath=".\bocu1tst.c">
+				RelativePath=".\bocu1tst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ccapitst.c">
+				RelativePath=".\ccapitst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ccapitst.h">
+				RelativePath=".\ccapitst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cconvtst.c">
+				RelativePath=".\cconvtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cctest.c">
+				RelativePath=".\cctest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\eurocreg.c">
+				RelativePath=".\eurocreg.c"
+				>
 			</File>
 			<File
-				RelativePath=".\nccbtst.c">
+				RelativePath=".\nccbtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\nccbtst.h">
+				RelativePath=".\nccbtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ncnvfbts.c">
+				RelativePath=".\ncnvfbts.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ncnvfbts.h">
+				RelativePath=".\ncnvfbts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ncnvtst.c">
+				RelativePath=".\ncnvtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\nucnvtst.c">
+				RelativePath=".\nucnvtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\nucnvtst.h">
+				RelativePath=".\nucnvtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\stdnmtst.c">
+				RelativePath=".\stdnmtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucsdetst.c">
+				RelativePath=".\ucsdetst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="data &amp; memory"
-			Filter="">
+			>
 			<File
-				RelativePath=".\udatatst.c">
+				RelativePath=".\udatatst.c"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="formatting"
-			Filter="">
+			>
 			<File
-				RelativePath=".\ccaltst.c">
+				RelativePath=".\ccaltst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ccaltst.h">
+				RelativePath=".\ccaltst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cdattst.c">
+				RelativePath=".\cdattst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cdattst.h">
+				RelativePath=".\cdattst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cdtdptst.c">
+				RelativePath=".\cdtdptst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cdtdptst.h">
+				RelativePath=".\cdtdptst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cdtrgtst.c">
+				RelativePath=".\cdtrgtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cdtrgtst.h">
+				RelativePath=".\cdtrgtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cformtst.c">
+				RelativePath=".\cformtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cformtst.h">
+				RelativePath=".\cformtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cmsgtst.c">
+				RelativePath=".\cmsgtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cmsgtst.h">
+				RelativePath=".\cmsgtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cnmdptst.c">
+				RelativePath=".\cnmdptst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cnmdptst.h">
+				RelativePath=".\cnmdptst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cnumtst.c">
+				RelativePath=".\cnumtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cnumtst.h">
+				RelativePath=".\cnumtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\currtest.c">
+				RelativePath=".\currtest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utmstest.c">
+				RelativePath=".\utmstest.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="locales &amp; resources"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cldrtest.c">
+				RelativePath=".\cldrtest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cloctst.c">
+				RelativePath=".\cloctst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cloctst.h">
+				RelativePath=".\cloctst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cposxtst.c">
+				RelativePath=".\cposxtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\crestst.c">
+				RelativePath=".\crestst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\crestst.h">
+				RelativePath=".\crestst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\creststn.c">
+				RelativePath=".\creststn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\creststn.h">
+				RelativePath=".\creststn.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="misc"
-			Filter="">
+			>
 			<File
-				RelativePath=".\calltest.c">
+				RelativePath=".\calltest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cintltst.c">
+				RelativePath=".\cintltst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cintltst.h">
+				RelativePath=".\cintltst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ctstdep.c">
+				RelativePath=".\ctstdep.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cutiltst.c">
+				RelativePath=".\cutiltst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\hpmufn.c">
+				RelativePath=".\hpmufn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\putiltst.c">
+				RelativePath=".\putiltst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\tracetst.c">
+				RelativePath=".\tracetst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="normalization"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cnormtst.c">
+				RelativePath=".\cnormtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cnormtst.h">
+				RelativePath=".\cnormtst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="properties &amp; sets"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cucdapi.c">
+				RelativePath=".\cucdapi.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cucdapi.h">
+				RelativePath=".\cucdapi.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cucdtst.c">
+				RelativePath=".\cucdtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\usettest.c">
+				RelativePath=".\usettest.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="strings"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cstrcase.c">
+				RelativePath=".\cstrcase.c"
+				>
 			</File>
 			<File
-				RelativePath=".\cstrtest.c">
+				RelativePath=".\cstrtest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\custrtrn.c">
+				RelativePath=".\custrtrn.c"
+				>
 			</File>
 			<File
-				RelativePath=".\custrtst.c">
+				RelativePath=".\custrtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utexttst.c">
+				RelativePath=".\utexttst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utf16tst.c">
+				RelativePath=".\utf16tst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\utf8tst.c">
+				RelativePath=".\utf8tst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="transforms"
-			Filter="">
+			>
 			<File
-				RelativePath=".\utransts.c">
+				RelativePath=".\utransts.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="regex"
-			Filter="">
+			>
 			<File
-				RelativePath=".\reapits.c">
+				RelativePath=".\reapits.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="sprep &amp; idna"
-			Filter="">
+			>
 			<File
-				RelativePath="idnatest.c">
+				RelativePath="idnatest.c"
+				>
 			</File>
 			<File
-				RelativePath="nfsprep.c">
+				RelativePath="nfsprep.c"
+				>
 			</File>
 			<File
-				RelativePath="nfsprep.h">
+				RelativePath="nfsprep.h"
+				>
 			</File>
 			<File
-				RelativePath="spreptst.c">
+				RelativePath="spreptst.c"
+				>
 			</File>
 			<File
-				RelativePath="sprpdata.c">
+				RelativePath="sprpdata.c"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/test/intltest/intltest.vcproj
===================================================================
--- trunk/source/test/intltest/intltest.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/test/intltest/intltest.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,135 +1,196 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="intltest"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{73632960-B3A6-464D-83A3-4B43365F19B8}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/intltest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/intltest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/intltest.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/intltest.pdb"
 				SubSystem="1"
-				FixedBaseAddress="1"/>
+				FixedBaseAddress="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/intltest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/intltest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="0"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/intltest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/intltest.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Release/intltest.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/intltest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -137,787 +198,1027 @@
 	<Files>
 		<Filter
 			Name="break iteration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\itrbbi.cpp">
+				RelativePath=".\itrbbi.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbbi.h">
+				RelativePath=".\itrbbi.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbiapts.cpp">
+				RelativePath=".\rbbiapts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbiapts.h">
+				RelativePath=".\rbbiapts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbitst.cpp">
+				RelativePath=".\rbbitst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbbitst.h">
+				RelativePath=".\rbbitst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collation"
-			Filter="">
+			>
 			<File
-				RelativePath=".\allcoll.cpp">
+				RelativePath=".\allcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\allcoll.h">
+				RelativePath=".\allcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\apicoll.cpp">
+				RelativePath=".\apicoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\apicoll.h">
+				RelativePath=".\apicoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\cntabcol.cpp">
+				RelativePath=".\cntabcol.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\cntabcol.h">
+				RelativePath=".\cntabcol.h"
+				>
 			</File>
 			<File
-				RelativePath=".\currcoll.cpp">
+				RelativePath=".\currcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\currcoll.h">
+				RelativePath=".\currcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dadrcoll.cpp">
+				RelativePath=".\dadrcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dadrcoll.h">
+				RelativePath=".\dadrcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\decoll.cpp">
+				RelativePath=".\decoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\decoll.h">
+				RelativePath=".\decoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\encoll.cpp">
+				RelativePath=".\encoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\encoll.h">
+				RelativePath=".\encoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\escoll.cpp">
+				RelativePath=".\escoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\escoll.h">
+				RelativePath=".\escoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ficoll.cpp">
+				RelativePath=".\ficoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ficoll.h">
+				RelativePath=".\ficoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\frcoll.cpp">
+				RelativePath=".\frcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\frcoll.h">
+				RelativePath=".\frcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\g7coll.cpp">
+				RelativePath=".\g7coll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\g7coll.h">
+				RelativePath=".\g7coll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itercoll.cpp">
+				RelativePath=".\itercoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itercoll.h">
+				RelativePath=".\itercoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\jacoll.cpp">
+				RelativePath=".\jacoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\jacoll.h">
+				RelativePath=".\jacoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\lcukocol.cpp">
+				RelativePath=".\lcukocol.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\lcukocol.h">
+				RelativePath=".\lcukocol.h"
+				>
 			</File>
 			<File
-				RelativePath=".\mnkytst.cpp">
+				RelativePath=".\mnkytst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\mnkytst.h">
+				RelativePath=".\mnkytst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\regcoll.cpp">
+				RelativePath=".\regcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\regcoll.h">
+				RelativePath=".\regcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rndmcoll.cpp">
+				RelativePath=".\rndmcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rndmcoll.h">
+				RelativePath=".\rndmcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\srchtest.cpp">
+				RelativePath=".\srchtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\srchtest.h">
+				RelativePath=".\srchtest.h"
+				>
 			</File>
 			<File
-				RelativePath="svccoll.cpp">
+				RelativePath="svccoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath="svccoll.h">
+				RelativePath="svccoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\thcoll.cpp">
+				RelativePath=".\thcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\thcoll.h">
+				RelativePath=".\thcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\trcoll.cpp">
+				RelativePath=".\trcoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\trcoll.h">
+				RelativePath=".\trcoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tscoll.cpp">
+				RelativePath=".\tscoll.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tscoll.h">
+				RelativePath=".\tscoll.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucaconf.cpp">
+				RelativePath=".\ucaconf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucaconf.h">
+				RelativePath=".\ucaconf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\wbnf.cpp">
+				RelativePath=".\wbnf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\wbnf.h">
+				RelativePath=".\wbnf.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="collections"
-			Filter="">
+			>
 			<File
-				RelativePath=".\uvectest.cpp">
+				RelativePath=".\uvectest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uvectest.h">
+				RelativePath=".\uvectest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\v32test.cpp">
+				RelativePath=".\v32test.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\v32test.h">
+				RelativePath=".\v32test.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="configuration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\strtest.cpp">
+				RelativePath=".\strtest.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\strtest.h">
+				RelativePath=".\strtest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsmthred.cpp">
+				RelativePath=".\tsmthred.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\tsmthred.h">
+				RelativePath=".\tsmthred.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsputil.cpp">
+				RelativePath=".\tsputil.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tsputil.h">
+				RelativePath=".\tsputil.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="data &amp; memory"
-			Filter="">
+			>
 			<File
-				RelativePath=".\uobjtest.cpp">
+				RelativePath=".\uobjtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uobjtest.h">
+				RelativePath=".\uobjtest.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="formatting"
-			Filter="">
+			>
 			<File
-				RelativePath=".\astrotst.cpp">
+				RelativePath=".\astrotst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\astrotst.h">
+				RelativePath=".\astrotst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\calcasts.cpp">
+				RelativePath=".\calcasts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\calcasts.h">
+				RelativePath=".\calcasts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\callimts.cpp">
+				RelativePath=".\callimts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\callimts.h">
+				RelativePath=".\callimts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\calregts.cpp">
+				RelativePath=".\calregts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\calregts.h">
+				RelativePath=".\calregts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\caltest.cpp">
+				RelativePath=".\caltest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\caltest.h">
+				RelativePath=".\caltest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\caltztst.cpp">
+				RelativePath=".\caltztst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\caltztst.h">
+				RelativePath=".\caltztst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dcfmapts.cpp">
+				RelativePath=".\dcfmapts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dcfmapts.h">
+				RelativePath=".\dcfmapts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmapts.cpp">
+				RelativePath=".\dtfmapts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmapts.h">
+				RelativePath=".\dtfmapts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmrgts.cpp">
+				RelativePath=".\dtfmrgts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmrgts.h">
+				RelativePath=".\dtfmrgts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmtrtts.cpp">
+				RelativePath=".\dtfmtrtts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmtrtts.h">
+				RelativePath=".\dtfmtrtts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmttst.cpp">
+				RelativePath=".\dtfmttst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\dtfmttst.h">
+				RelativePath=".\dtfmttst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\incaltst.cpp">
+				RelativePath=".\incaltst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\incaltst.h">
+				RelativePath=".\incaltst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itformat.cpp">
+				RelativePath=".\itformat.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itformat.h">
+				RelativePath=".\itformat.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnf.cpp">
+				RelativePath=".\itrbnf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnf.h">
+				RelativePath=".\itrbnf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnfp.cpp">
+				RelativePath=".\itrbnfp.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnfp.h">
+				RelativePath=".\itrbnfp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnfrt.cpp">
+				RelativePath=".\itrbnfrt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itrbnfrt.h">
+				RelativePath=".\itrbnfrt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\miscdtfm.cpp">
+				RelativePath=".\miscdtfm.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\miscdtfm.h">
+				RelativePath=".\miscdtfm.h"
+				>
 			</File>
 			<File
-				RelativePath=".\msfmrgts.cpp">
+				RelativePath=".\msfmrgts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\msfmrgts.h">
+				RelativePath=".\msfmrgts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nmfmapts.cpp">
+				RelativePath=".\nmfmapts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nmfmapts.h">
+				RelativePath=".\nmfmapts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nmfmtrt.cpp">
+				RelativePath=".\nmfmtrt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nmfmtrt.h">
+				RelativePath=".\nmfmtrt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\numfmtst.cpp">
+				RelativePath=".\numfmtst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\numfmtst.h">
+				RelativePath=".\numfmtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\numrgts.cpp">
+				RelativePath=".\numrgts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\numrgts.h">
+				RelativePath=".\numrgts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pptest.cpp">
+				RelativePath=".\pptest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\pptest.h">
+				RelativePath=".\pptest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sdtfmtts.cpp">
+				RelativePath=".\sdtfmtts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\sdtfmtts.h">
+				RelativePath=".\sdtfmtts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tchcfmt.cpp">
+				RelativePath=".\tchcfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tchcfmt.h">
+				RelativePath=".\tchcfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tfsmalls.cpp">
+				RelativePath=".\tfsmalls.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tfsmalls.h">
+				RelativePath=".\tfsmalls.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tmsgfmt.cpp">
+				RelativePath=".\tmsgfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tmsgfmt.h">
+				RelativePath=".\tmsgfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdate.cpp">
+				RelativePath=".\tsdate.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdate.h">
+				RelativePath=".\tsdate.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdcfmsy.cpp">
+				RelativePath=".\tsdcfmsy.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdcfmsy.h">
+				RelativePath=".\tsdcfmsy.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdtfmsy.cpp">
+				RelativePath=".\tsdtfmsy.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tsdtfmsy.h">
+				RelativePath=".\tsdtfmsy.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tsnmfmt.cpp">
+				RelativePath=".\tsnmfmt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tsnmfmt.h">
+				RelativePath=".\tsnmfmt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tzbdtest.cpp">
+				RelativePath=".\tzbdtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tzbdtest.h">
+				RelativePath=".\tzbdtest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tzregts.cpp">
+				RelativePath=".\tzregts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tzregts.h">
+				RelativePath=".\tzregts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tztest.cpp">
+				RelativePath=".\tztest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tztest.h">
+				RelativePath=".\tztest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\windttst.cpp">
+				RelativePath=".\windttst.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\windttst.h">
+				RelativePath=".\windttst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\winnmtst.cpp">
+				RelativePath=".\winnmtst.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\winnmtst.h">
+				RelativePath=".\winnmtst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="idna"
-			Filter="*.c,*.h">
+			Filter="*.c,*.h"
+			>
 			<File
-				RelativePath=".\idnaconf.cpp">
+				RelativePath=".\idnaconf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\idnaconf.h">
+				RelativePath=".\idnaconf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\idnaref.cpp">
+				RelativePath=".\idnaref.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\idnaref.h">
+				RelativePath=".\idnaref.h"
+				>
 			</File>
 			<File
-				RelativePath=".\nptrans.cpp">
+				RelativePath=".\nptrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\nptrans.h">
+				RelativePath=".\nptrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\punyref.c">
+				RelativePath=".\punyref.c"
+				>
 			</File>
 			<File
-				RelativePath=".\punyref.h">
+				RelativePath=".\punyref.h"
+				>
 			</File>
 			<File
-				RelativePath=".\testidn.cpp">
+				RelativePath=".\testidn.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\testidna.cpp">
+				RelativePath=".\testidna.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\testidna.h">
+				RelativePath=".\testidna.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="locales &amp; resources"
-			Filter="">
+			>
 			<File
-				RelativePath=".\aliastst.cpp">
+				RelativePath=".\aliastst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\aliastst.h">
+				RelativePath=".\aliastst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\loctest.cpp">
+				RelativePath=".\loctest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\loctest.h">
+				RelativePath=".\loctest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\restest.cpp">
+				RelativePath=".\restest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\restest.h">
+				RelativePath=".\restest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\restsnew.cpp">
+				RelativePath=".\restsnew.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\restsnew.h">
+				RelativePath=".\restsnew.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="misc"
-			Filter="">
+			>
 			<File
-				RelativePath=".\intltest.cpp">
+				RelativePath=".\intltest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\intltest.h">
+				RelativePath=".\intltest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itmajor.cpp">
+				RelativePath=".\itmajor.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itmajor.h">
+				RelativePath=".\itmajor.h"
+				>
 			</File>
 			<File
-				RelativePath=".\itutil.cpp">
+				RelativePath=".\itutil.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\itutil.h">
+				RelativePath=".\itutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\testutil.cpp">
+				RelativePath=".\testutil.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\testutil.h">
+				RelativePath=".\testutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\textfile.cpp">
+				RelativePath=".\textfile.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\textfile.h">
+				RelativePath=".\textfile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tokiter.cpp">
+				RelativePath=".\tokiter.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tokiter.h">
+				RelativePath=".\tokiter.h"
+				>
 			</File>
 			<File
-				RelativePath=".\winutil.cpp">
+				RelativePath=".\winutil.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\winutil.h">
+				RelativePath=".\winutil.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="normalization"
-			Filter="">
+			>
 			<File
-				RelativePath=".\canittst.cpp">
+				RelativePath=".\canittst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\canittst.h">
+				RelativePath=".\canittst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\normconf.cpp">
+				RelativePath=".\normconf.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\normconf.h">
+				RelativePath=".\normconf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tstnorm.cpp">
+				RelativePath=".\tstnorm.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tstnorm.h">
+				RelativePath=".\tstnorm.h"
+				>
 			</File>
 			<File
-				RelativePath=".\tstnrapi.cpp">
+				RelativePath=".\tstnrapi.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="properties &amp; sets"
-			Filter="">
+			>
 			<File
-				RelativePath=".\ucdtest.cpp">
+				RelativePath=".\ucdtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ucdtest.h">
+				RelativePath=".\ucdtest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\usettest.cpp">
+				RelativePath=".\usettest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\usettest.h">
+				RelativePath=".\usettest.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="regex"
-			Filter="">
+			>
 			<File
-				RelativePath=".\regextst.cpp">
+				RelativePath=".\regextst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\regextst.h">
+				RelativePath=".\regextst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="registration"
-			Filter="">
+			>
 			<File
-				RelativePath=".\icusvtst.cpp">
+				RelativePath=".\icusvtst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\icusvtst.h">
+				RelativePath=".\icusvtst.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="strings"
-			Filter="">
+			>
 			<File
-				RelativePath=".\citrtest.cpp">
+				RelativePath=".\citrtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\citrtest.h">
+				RelativePath=".\citrtest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\reptest.cpp">
+				RelativePath=".\reptest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\reptest.h">
+				RelativePath=".\reptest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sfwdchit.cpp">
+				RelativePath=".\sfwdchit.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\sfwdchit.h">
+				RelativePath=".\sfwdchit.h"
+				>
 			</File>
 			<File
-				RelativePath=".\strcase.cpp">
+				RelativePath=".\strcase.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ustrtest.cpp">
+				RelativePath=".\ustrtest.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ustrtest.h">
+				RelativePath=".\ustrtest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\utxttest.cpp">
+				RelativePath=".\utxttest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\utxttest.h">
+				RelativePath=".\utxttest.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="transforms"
-			Filter="">
+			>
 			<File
-				RelativePath=".\cpdtrtst.cpp">
+				RelativePath=".\cpdtrtst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\cpdtrtst.h">
+				RelativePath=".\cpdtrtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ittrans.cpp">
+				RelativePath=".\ittrans.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\ittrans.h">
+				RelativePath=".\ittrans.h"
+				>
 			</File>
 			<File
-				RelativePath=".\jamotest.cpp">
+				RelativePath=".\jamotest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\jamotest.h">
+				RelativePath=".\jamotest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\transapi.cpp">
+				RelativePath=".\transapi.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\transapi.h">
+				RelativePath=".\transapi.h"
+				>
 			</File>
 			<File
-				RelativePath=".\transrt.cpp">
+				RelativePath=".\transrt.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\transrt.h">
+				RelativePath=".\transrt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\transtst.cpp">
+				RelativePath=".\transtst.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\transtst.h">
+				RelativePath=".\transtst.h"
+				>
 			</File>
 			<File
-				RelativePath=".\trnserr.cpp">
+				RelativePath=".\trnserr.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\trnserr.h">
+				RelativePath=".\trnserr.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="conversion"
-			Filter="">
+			>
 			<File
-				RelativePath=".\convtest.cpp">
+				RelativePath=".\convtest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\convtest.h">
+				RelativePath=".\convtest.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="charset detection"
-			Filter="">
+			>
 			<File
-				RelativePath=".\csdetest.cpp">
+				RelativePath=".\csdetest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\csdetest.h">
+				RelativePath=".\csdetest.h"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/test/iotest/iotest.vcproj
===================================================================
--- trunk/source/test/iotest/iotest.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/test/iotest/iotest.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,137 +1,197 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="iotest"
 	ProjectGUID="{E4993E82-D68A-46CA-BAE0-9D35E172E46F}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/iotest.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\tools\ctestfw;..\..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/iotest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/iotest.exe"
 				LinkIncremental="0"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/iotest.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/iotest.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/iotest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\tools\ctestfw;..\..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/iotest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/iotest.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/iotest.pdb"
 				SubSystem="1"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/iotest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -139,40 +199,52 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx">
+			Filter="cpp;c;cxx"
+			>
 			<File
-				RelativePath=".\filetst.c">
+				RelativePath=".\filetst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\iotest.cpp">
+				RelativePath=".\iotest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\stream.cpp">
+				RelativePath=".\stream.cpp"
+				>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\strtst.c">
+				RelativePath=".\strtst.c"
+				>
 			</File>
 			<File
-				RelativePath=".\trnstst.c">
+				RelativePath=".\trnstst.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx">
+			Filter="h;hpp;hxx"
+			>
 			<File
-				RelativePath=".\iotest.h">
+				RelativePath=".\iotest.h"
+				>
 			</File>
 		</Filter>
 	</Files>

Modified: trunk/source/test/letest/letest.vcproj
===================================================================
--- trunk/source/test/letest/letest.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/test/letest/letest.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,136 +1,198 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="letest"
 	ProjectGUID="{67351485-4D18-4245-BE39-A7EF0675ACD2}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/letest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\include\layout;..\..\..\include;..\..\common;..\..\tools\ctestfw;..\..\tools\toolutil;..\..\layout"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
-				UsePrecompiledHeader="2"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/letest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="../../../lib/icule.lib ../../../lib/icuuc.lib odbc32.lib odbccp32.lib"
 				OutputFile=".\Release/letest.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/letest.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/letest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/letest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\..\include\layout;..\..\..\include;..\..\common;..\..\tools\ctestfw;..\..\tools\toolutil;..\..\layout"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				TreatWChar_tAsBuiltInType="TRUE"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				TreatWChar_tAsBuiltInType="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/letest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile=".\Debug/letest.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=""
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/letest.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/letest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -138,54 +200,70 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\cmaps.cpp">
+				RelativePath=".\cmaps.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\FontTableCache.cpp">
+				RelativePath=".\FontTableCache.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\letest.cpp">
+				RelativePath=".\letest.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\letsutil.cpp">
+				RelativePath=".\letsutil.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\PortableFontInstance.cpp">
+				RelativePath=".\PortableFontInstance.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\SimpleFontInstance.cpp">
+				RelativePath=".\SimpleFontInstance.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\cmaps.h">
+				RelativePath=".\cmaps.h"
+				>
 			</File>
 			<File
-				RelativePath=".\FontTableCache.h">
+				RelativePath=".\FontTableCache.h"
+				>
 			</File>
 			<File
-				RelativePath=".\letest.h">
+				RelativePath=".\letest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\letsutil.h">
+				RelativePath=".\letsutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\PortableFontInstance.h">
+				RelativePath=".\PortableFontInstance.h"
+				>
 			</File>
 			<File
-				RelativePath=".\sfnt.h">
+				RelativePath=".\sfnt.h"
+				>
 			</File>
 			<File
-				RelativePath=".\SimpleFontInstance.h">
+				RelativePath=".\SimpleFontInstance.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/ctestfw/ctestfw.vcproj
===================================================================
--- trunk/source/tools/ctestfw/ctestfw.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/ctestfw/ctestfw.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,144 +1,204 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="ctestfw"
-	ProjectGUID="{E7D9BA19-6ED3-4325-8D0D-D724F6D29C65}"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{ECA6B435-B4FA-4F9F-BF95-F451D078FC47}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\lib\icutest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;T_CTEST_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/icutest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\bin\icutest.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\..\..\..\lib\icutest.pdb"
 				EnableCOMDATFolding="2"
-				ImportLibrary=".\..\..\..\lib\icutest.lib"/>
+				ImportLibrary=".\..\..\..\lib\icutest.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\lib\icutest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\lib\icutestd.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;T_CTEST_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/icutest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\bin\icutestd.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\..\lib\icutestd.pdb"
-				ImportLibrary=".\..\..\..\lib\icutestd.lib"/>
+				ImportLibrary=".\..\..\..\lib\icutestd.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\lib\icutestd.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -146,66 +206,86 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\ctest.c">
+				RelativePath=".\ctest.c"
+				>
 			</File>
 			<File
-				RelativePath=".\datamap.cpp">
+				RelativePath=".\datamap.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\testdata.cpp">
+				RelativePath=".\testdata.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\tstdtmod.cpp">
+				RelativePath=".\tstdtmod.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\uperf.cpp">
+				RelativePath=".\uperf.cpp"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\unicode\ctest.h">
+				RelativePath=".\unicode\ctest.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\datamap.h">
+				RelativePath=".\unicode\datamap.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\testdata.h">
+				RelativePath=".\unicode\testdata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\testlog.h">
+				RelativePath=".\unicode\testlog.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\testtype.h">
+				RelativePath=".\unicode\testtype.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\tstdtmod.h">
+				RelativePath=".\unicode\tstdtmod.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\uperf.h">
+				RelativePath=".\unicode\uperf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unicode\utimer.h">
+				RelativePath=".\unicode\utimer.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genbidi/genbidi.vcproj
===================================================================
--- trunk/source/tools/genbidi/genbidi.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genbidi/genbidi.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,141 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genbidi"
 	ProjectGUID="{DB312A49-12A9-4E07-9E96-451DC2D8FF62}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genbidi.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genbidi.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genbidi.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genbidi.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genbidi.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genbidi.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genbidi.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genbidi.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genbidi.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genbidi.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -143,24 +201,30 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="c;cpp;rc">
+			Filter="c;cpp;rc"
+			>
 			<File
-				RelativePath=".\genbidi.c">
+				RelativePath=".\genbidi.c"
+				>
 			</File>
 			<File
-				RelativePath=".\store.c">
+				RelativePath=".\store.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h">
+			Filter="h"
+			>
 			<File
-				RelativePath=".\genbidi.h">
+				RelativePath=".\genbidi.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genbrk/genbrk.vcproj
===================================================================
--- trunk/source/tools/genbrk/genbrk.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genbrk/genbrk.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genbrk"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{C2BE5000-7501-4E87-9724-B8D82494FAE6}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genbrk.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genbrk.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genbrk.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genbrk.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genbrk.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genbrk.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genbrk.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genbrk.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genbrk.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genbrk.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,18 +201,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genbrk.cpp">
+				RelativePath=".\genbrk.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gencase/gencase.vcproj
===================================================================
--- trunk/source/tools/gencase/gencase.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gencase/gencase.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,141 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gencase"
 	ProjectGUID="{DB312A49-12A9-4E07-9E96-451DC2D8FF61}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gencase.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gencase.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gencase.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gencase.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gencase.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gencase.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gencase.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gencase.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gencase.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gencase.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -143,24 +201,30 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="c;cpp;rc">
+			Filter="c;cpp;rc"
+			>
 			<File
-				RelativePath=".\gencase.c">
+				RelativePath=".\gencase.c"
+				>
 			</File>
 			<File
-				RelativePath=".\store.c">
+				RelativePath=".\store.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h">
+			Filter="h"
+			>
 			<File
-				RelativePath=".\gencase.h">
+				RelativePath=".\gencase.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genccode/genccode.vcproj
===================================================================
--- trunk/source/tools/genccode/genccode.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genccode/genccode.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,138 +1,197 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genccode"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{FDD3C4F2-9805-44EB-9A77-BC1C1C95B547}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genccode.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genccode.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genccode.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genccode.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genccode.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genccode.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genccode.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genccode.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genccode.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genccode.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -140,18 +199,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genccode.c">
+				RelativePath=".\genccode.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gencmn/gencmn.vcproj
===================================================================
--- trunk/source/tools/gencmn/gencmn.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gencmn/gencmn.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gencmn"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{A8D36F8D-09E6-4174-91C3-7BEAA9C3F04F}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gencmn.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gencmn.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gencmn.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gencmn.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gencmn.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gencmn.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gencmn.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gencmn.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gencmn.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gencmn.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,18 +201,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\gencmn.c">
+				RelativePath=".\gencmn.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gencnval/gencnval.vcproj
===================================================================
--- trunk/source/tools/gencnval/gencnval.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gencnval/gencnval.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gencnval"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{8B41752B-5A52-41E4-B7E0-07921C0CC6BF}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gencnval.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gencnval.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gencnval.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gencnval.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gencnval.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gencnval.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gencnval.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gencnval.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gencnval.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gencnval.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,18 +201,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\gencnval.c">
+				RelativePath=".\gencnval.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genctd/genctd.vcproj
===================================================================
--- trunk/source/tools/genctd/genctd.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genctd/genctd.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,141 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genctd"
 	ProjectGUID="{9D4211F7-2C77-439C-82F0-30A4E43BA569}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genctd.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genctd.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genctd.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genctd.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genctd.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genctd.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genctd.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genctd.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genctd.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genctd.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -143,18 +201,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genctd.cpp">
+				RelativePath=".\genctd.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gennames/gennames.vcproj
===================================================================
--- trunk/source/tools/gennames/gennames.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gennames/gennames.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gennames"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{F5281B04-A9E0-4680-BBA8-1D7F7D115458}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gennames.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gennames.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gennames.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gennames.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gennames.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gennames.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gennames.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gennames.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gennames.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gennames.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,18 +201,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\gennames.c">
+				RelativePath=".\gennames.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gennorm/gennorm.vcproj
===================================================================
--- trunk/source/tools/gennorm/gennorm.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gennorm/gennorm.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gennorm"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{F5213103-6CBE-46E6-B4CC-2570B6837D86}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gennorm.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gennorm.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gennorm.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gennorm.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gennorm.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gennorm.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gennorm.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gennorm.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gennorm.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gennorm.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,24 +201,30 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="c;cpp;rc">
+			Filter="c;cpp;rc"
+			>
 			<File
-				RelativePath=".\gennorm.c">
+				RelativePath=".\gennorm.c"
+				>
 			</File>
 			<File
-				RelativePath=".\store.c">
+				RelativePath=".\store.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h">
+			Filter="h"
+			>
 			<File
-				RelativePath=".\gennorm.h">
+				RelativePath=".\gennorm.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genpname/genpname.vcproj
===================================================================
--- trunk/source/tools/genpname/genpname.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genpname/genpname.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genpname"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{DBC0AF0B-B9FF-4B23-905B-4D4CDC2A91CB}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genpname.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genpname.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genpname.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genpname.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genpname.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genpname.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genpname.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genpname.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genpname.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genpname.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,21 +201,26 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genpname.cpp">
+				RelativePath=".\genpname.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\data.h">
+				RelativePath=".\data.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genprops/genprops.vcproj
===================================================================
--- trunk/source/tools/genprops/genprops.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genprops/genprops.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genprops"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{6F744648-D15F-478A-90C6-58E353B5DDB3}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genprops.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genprops.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genprops.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genprops.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genprops.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genprops.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genprops.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genprops.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genprops.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genprops.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,27 +201,34 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="c;cpp;rc">
+			Filter="c;cpp;rc"
+			>
 			<File
-				RelativePath=".\genprops.c">
+				RelativePath=".\genprops.c"
+				>
 			</File>
 			<File
-				RelativePath=".\props2.c">
+				RelativePath=".\props2.c"
+				>
 			</File>
 			<File
-				RelativePath=".\store.c">
+				RelativePath=".\store.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h">
+			Filter="h"
+			>
 			<File
-				RelativePath=".\genprops.h">
+				RelativePath=".\genprops.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genrb/derb.vcproj
===================================================================
--- trunk/source/tools/genrb/derb.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genrb/derb.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,147 +1,206 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="derb"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{D3065ADB-8820-4CC7-9B6C-9510833961A3}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\derb_Win32_Release"
 			IntermediateDirectory=".\derb_Win32_Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\derb_Win32_Release/derb.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\derb_Win32_Release/derb.pch"
 				AssemblerListingLocation=".\derb_Win32_Release/"
 				ObjectFile=".\derb_Win32_Release/"
 				ProgramDataBaseFileName=".\derb_Win32_Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\derb_Win32_Release/derb.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\derb_Win32_Release/derb.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\derb_Win32_Release/derb.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\derb_Win32_Debug"
 			IntermediateDirectory=".\derb_Win32_Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\derb_Win32_Debug/derb.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\derb_Win32_Debug/derb.pch"
 				AssemblerListingLocation=".\derb_Win32_Debug/"
 				ObjectFile=".\derb_Win32_Debug/"
 				ProgramDataBaseFileName=".\derb_Win32_Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\derb_Win32_Debug/derb.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\derb_Win32_Debug/derb.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\derb_Win32_Debug/derb.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -149,18 +208,22 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\derb.c">
+				RelativePath=".\derb.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genrb/genrb.vcproj
===================================================================
--- trunk/source/tools/genrb/genrb.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genrb/genrb.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,139 +1,198 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genrb"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{97521D06-EC47-45D4-8BD0-9E16B3F93B2A}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genrb.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil;..\..\i18n"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genrb.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genrb.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genrb.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genrb.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genrb.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil;..\..\i18n"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genrb.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genrb.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genrb.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genrb.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -141,75 +200,98 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\errmsg.c">
+				RelativePath=".\errmsg.c"
+				>
 			</File>
 			<File
-				RelativePath=".\genrb.c">
+				RelativePath=".\genrb.c"
+				>
 			</File>
 			<File
-				RelativePath=".\parse.c">
+				RelativePath=".\parse.c"
+				>
 			</File>
 			<File
-				RelativePath=".\prscmnts.cpp">
+				RelativePath=".\prscmnts.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\rbutil.c">
+				RelativePath=".\rbutil.c"
+				>
 			</File>
 			<File
-				RelativePath=".\read.c">
+				RelativePath=".\read.c"
+				>
 			</File>
 			<File
-				RelativePath=".\reslist.c">
+				RelativePath=".\reslist.c"
+				>
 			</File>
 			<File
-				RelativePath=".\rle.c">
+				RelativePath=".\rle.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ustr.c">
+				RelativePath=".\ustr.c"
+				>
 			</File>
 			<File
-				RelativePath=".\wrtjava.c">
+				RelativePath=".\wrtjava.c"
+				>
 			</File>
 			<File
-				RelativePath=".\wrtxml.c">
+				RelativePath=".\wrtxml.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\errmsg.h">
+				RelativePath=".\errmsg.h"
+				>
 			</File>
 			<File
-				RelativePath=".\genrb.h">
+				RelativePath=".\genrb.h"
+				>
 			</File>
 			<File
-				RelativePath=".\parse.h">
+				RelativePath=".\parse.h"
+				>
 			</File>
 			<File
-				RelativePath=".\prscmnts.h">
+				RelativePath=".\prscmnts.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rbutil.h">
+				RelativePath=".\rbutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\read.h">
+				RelativePath=".\read.h"
+				>
 			</File>
 			<File
-				RelativePath=".\reslist.h">
+				RelativePath=".\reslist.h"
+				>
 			</File>
 			<File
-				RelativePath=".\rle.h">
+				RelativePath=".\rle.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ustr.h">
+				RelativePath=".\ustr.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gensprep/gensprep.vcproj
===================================================================
--- trunk/source/tools/gensprep/gensprep.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gensprep/gensprep.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,139 +1,198 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gensprep"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{631C23CE-6C1D-4875-88F0-85E0A42B36EA}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gensprep.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gensprep.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gensprep.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gensprep.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gensprep.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gensprep.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gensprep.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gensprep.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gensprep.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gensprep.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -141,24 +200,30 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\gensprep.c">
+				RelativePath=".\gensprep.c"
+				>
 			</File>
 			<File
-				RelativePath=".\store.c">
+				RelativePath=".\store.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\gensprep.h">
+				RelativePath=".\gensprep.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/gentest/gentest.vcproj
===================================================================
--- trunk/source/tools/gentest/gentest.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/gentest/gentest.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,134 +1,195 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="gentest"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{77C78066-746F-4EA6-B3FE-B8C8A4A97891}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/gentest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/gentest.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/gentest.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/gentest.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/gentest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/gentest.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/gentest.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/gentest.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/gentest.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/gentest.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -136,24 +197,30 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genres32.c">
+				RelativePath=".\genres32.c"
+				>
 			</File>
 			<File
-				RelativePath=".\gentest.c">
+				RelativePath=".\gentest.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\gentest.h">
+				RelativePath=".\gentest.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/genuca/genuca.vcproj
===================================================================
--- trunk/source/tools/genuca/genuca.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/genuca/genuca.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="genuca"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{86829694-A375-4C58-B4EA-96EF514E3225}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/genuca.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\..\i18n;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/genuca.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/genuca.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/genuca.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/genuca.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/genuca.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\..\i18n;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/genuca.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/genuca.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/genuca.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/genuca.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,21 +201,26 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\genuca.cpp">
+				RelativePath=".\genuca.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\genuca.h">
+				RelativePath=".\genuca.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/icupkg/icupkg.vcproj
===================================================================
--- trunk/source/tools/icupkg/icupkg.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/icupkg/icupkg.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,143 +1,204 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="icupkg"
 	ProjectGUID="{62D4B15D-7A90-4ECB-BA19-5E021D6A21BC}"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="Release"
 			IntermediateDirectory="Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="Release/icupkg.pch"
 				AssemblerListingLocation="Release/"
 				ObjectFile="Release/"
 				ProgramDataBaseFileName="Release/"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/icupkg.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile="Release/icupkg.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory="Debug"
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile="Debug/icupkg.pch"
 				AssemblerListingLocation="Debug/"
 				ObjectFile="Debug/"
 				ProgramDataBaseFileName="Debug/"
 				BrowseInformation="1"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="$(OutDir)/icupkg.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/icupkg.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<File
-			RelativePath="icupkg.cpp">
+			RelativePath="icupkg.cpp"
+			>
 		</File>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/icuswap/icuswap.vcproj
===================================================================
--- trunk/source/tools/icuswap/icuswap.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/icuswap/icuswap.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,146 +1,205 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="icuswap"
 	ProjectGUID="{39690C2A-AD89-45E4-893A-899496B85785}"
-	SccProjectName=""
-	SccLocalPath="">
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/icuswap.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile=".\Release/icuswap.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/icuswap.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/icuswap.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/icuswap.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/icuswap.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
 				PrecompiledHeaderFile=".\Debug/icuswap.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="4"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/icuswap.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/icuswap.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/icuswap.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
 	</References>
 	<Files>
 		<File
-			RelativePath=".\icuswap.cpp">
+			RelativePath=".\icuswap.cpp"
+			>
 		</File>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/makeconv/makeconv.vcproj
===================================================================
--- trunk/source/tools/makeconv/makeconv.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/makeconv/makeconv.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,139 +1,198 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="makeconv"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{F5AD9738-1A3D-4906-B9C4-A7D9CE33DC2C}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/makeconv.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/makeconv.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/makeconv.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/makeconv.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/makeconv.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/makeconv.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include;..\..\common;..\toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/makeconv.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/makeconv.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/makeconv.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/makeconv.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -141,33 +200,42 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\gencnvex.c">
+				RelativePath=".\gencnvex.c"
+				>
 			</File>
 			<File
-				RelativePath=".\genmbcs.c">
+				RelativePath=".\genmbcs.c"
+				>
 			</File>
 			<File
-				RelativePath=".\makeconv.c">
+				RelativePath=".\makeconv.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucnvstat.c">
+				RelativePath=".\ucnvstat.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\genmbcs.h">
+				RelativePath=".\genmbcs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\makeconv.h">
+				RelativePath=".\makeconv.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/pkgdata/pkgdata.vcproj
===================================================================
--- trunk/source/tools/pkgdata/pkgdata.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/pkgdata/pkgdata.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,140 +1,199 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="pkgdata"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{4C8454FE-81D3-4CA3-9927-29BA96F03DAC}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/pkgdata.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../../../include;../../common;../toolutil"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/pkgdata.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				BrowseInformation="1"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1041"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/pkgdata.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/pkgdata.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/pkgdata.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1041"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin&#x0D;&#x0A;"
+				Outputs="..\..\..\bin\$(TargetFileName)"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/pkgdata.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="../../../include;../../common;../toolutil"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/pkgdata.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; ..\..\..\bin
-"
-				Outputs="..\..\..\bin\$(TargetFileName)"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1041"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Release/pkgdata.exe"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/pkgdata.pdb"
-				SubSystem="1"/>
+				SubSystem="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/pkgdata.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1041"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -142,39 +201,50 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\filemode.c">
+				RelativePath=".\filemode.c"
+				>
 			</File>
 			<File
-				RelativePath=".\make.c">
+				RelativePath=".\make.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pkgdata.c">
+				RelativePath=".\pkgdata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\pkgtypes.c">
+				RelativePath=".\pkgtypes.c"
+				>
 			</File>
 			<File
-				RelativePath=".\sttcmode.c">
+				RelativePath=".\sttcmode.c"
+				>
 			</File>
 			<File
-				RelativePath=".\winmode.c">
+				RelativePath=".\winmode.c"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\makefile.h">
+				RelativePath=".\makefile.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pkgtypes.h">
+				RelativePath=".\pkgtypes.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

Modified: trunk/source/tools/toolutil/toolutil.vcproj
===================================================================
--- trunk/source/tools/toolutil/toolutil.vcproj	2006-09-09 08:33:44 UTC (rev 109)
+++ trunk/source/tools/toolutil/toolutil.vcproj	2006-09-10 05:16:11 UTC (rev 110)
@@ -1,146 +1,207 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="toolutil"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{6B231032-3CB5-4EED-9210-810D666A23A0}"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\..\..\..\lib"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\lib\icutu.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include,..\..\common"
 				PreprocessorDefinitions="WIN32;NDEBUG;U_TOOLUTIL_IMPLEMENTATION"
-				StringPooling="TRUE"
+				StringPooling="true"
 				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				EnableFunctionLevelLinking="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Release/toolutil.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\bin\icutu36.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\lib"
 				ProgramDatabaseFile=".\..\..\..\lib\icutu36.pdb"
 				EnableCOMDATFolding="2"
 				BaseAddress="0x4ac00000"
-				ImportLibrary="..\..\..\lib\icutu.lib"/>
+				ImportLibrary="..\..\..\lib\icutu.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\lib\icutu.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\..\..\..\lib"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
 			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\..\..\..\lib\icutud.tlb"
+			/>
+			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
 				AdditionalIncludeDirectories="..\..\..\include,..\..\common"
 				PreprocessorDefinitions="WIN32;_DEBUG;U_TOOLUTIL_IMPLEMENTATION"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				BufferSecurityCheck="TRUE"
-				DisableLanguageExtensions="TRUE"
-				TreatWChar_tAsBuiltInType="TRUE"
+				BufferSecurityCheck="true"
+				DisableLanguageExtensions="true"
+				TreatWChar_tAsBuiltInType="true"
 				PrecompiledHeaderFile=".\Debug/toolutil.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="4"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
 				Name="VCLinkerTool"
 				OutputFile="..\..\..\bin\icutu36d.dll"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\..\lib"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\..\..\..\lib\icutu36d.pdb"
 				BaseAddress="0x4ac00000"
-				ImportLibrary="..\..\..\lib\icutud.lib"/>
+				ImportLibrary="..\..\..\lib\icutud.lib"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\..\..\..\lib\icutud.tlb"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -148,108 +209,142 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\filestrm.c">
+				RelativePath=".\filestrm.c"
+				>
 			</File>
 			<File
-				RelativePath=".\package.cpp">
+				RelativePath=".\package.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\pkgitems.cpp">
+				RelativePath=".\pkgitems.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\propsvec.c">
+				RelativePath=".\propsvec.c"
+				>
 			</File>
 			<File
-				RelativePath=".\swapimpl.cpp">
+				RelativePath=".\swapimpl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\toolutil.c">
+				RelativePath=".\toolutil.c"
+				>
 				<FileConfiguration
-					Name="Release|Win32">
+					Name="Release|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|Win32">
+					Name="Debug|Win32"
+					>
 					<Tool
 						Name="VCCLCompilerTool"
-						DisableLanguageExtensions="FALSE"/>
+						DisableLanguageExtensions="false"
+					/>
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\ucbuf.c">
+				RelativePath=".\ucbuf.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucm.c">
+				RelativePath=".\ucm.c"
+				>
 			</File>
 			<File
-				RelativePath=".\ucmstate.c">
+				RelativePath=".\ucmstate.c"
+				>
 			</File>
 			<File
-				RelativePath=".\unewdata.c">
+				RelativePath=".\unewdata.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uoptions.c">
+				RelativePath=".\uoptions.c"
+				>
 			</File>
 			<File
-				RelativePath=".\uparse.c">
+				RelativePath=".\uparse.c"
+				>
 			</File>
 			<File
-				RelativePath=".\writesrc.c">
+				RelativePath=".\writesrc.c"
+				>
 			</File>
 			<File
-				RelativePath=".\xmlparser.cpp">
+				RelativePath=".\xmlparser.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\filestrm.h">
+				RelativePath=".\filestrm.h"
+				>
 			</File>
 			<File
-				RelativePath=".\package.h">
+				RelativePath=".\package.h"
+				>
 			</File>
 			<File
-				RelativePath=".\pkg_imp.h">
+				RelativePath=".\pkg_imp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\propsvec.h">
+				RelativePath=".\propsvec.h"
+				>
 			</File>
 			<File
-				RelativePath=".\swapimpl.h">
+				RelativePath=".\swapimpl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\toolutil.h">
+				RelativePath=".\toolutil.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucbuf.h">
+				RelativePath=".\ucbuf.h"
+				>
 			</File>
 			<File
-				RelativePath=".\ucm.h">
+				RelativePath=".\ucm.h"
+				>
 			</File>
 			<File
-				RelativePath=".\unewdata.h">
+				RelativePath=".\unewdata.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uoptions.h">
+				RelativePath=".\uoptions.h"
+				>
 			</File>
 			<File
-				RelativePath=".\uparse.h">
+				RelativePath=".\uparse.h"
+				>
 			</File>
 			<File
-				RelativePath=".\writesrc.h">
+				RelativePath=".\writesrc.h"
+				>
 			</File>
 			<File
-				RelativePath=".\xmlparser.h">
+				RelativePath=".\xmlparser.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 	</Files>
 	<Globals>

More information about the sword-cvs mailing list