diff --git a/PolyImp/PolyImport.vcxproj b/PolyImp/PolyImport.vcxproj
index 689ea075..43e55fe7 100644
--- a/PolyImp/PolyImport.vcxproj
+++ b/PolyImp/PolyImport.vcxproj
@@ -1,517 +1,761 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ DebugInterpreted
+ ARM64
+
+
+ Debug
+ ARM64
+
Debug
Win32
DebugInterpreted
Win32
DebugInterpreted
x64
+
+ Release32in64
+ ARM64
+
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ ReleaseInterpreted
+ ARM64
+
ReleaseInterpreted
Win32
ReleaseInterpreted
x64
Release32in64
Win32
Release32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}
PolyImport
10.0
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ MultiThreadedDebug
+
+
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ MultiThreadedDebug
+
+
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ MultiThreadedDebug
+
+
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
MultiThreadedDebug
true
true
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ MultiThreadedDebug
+
+
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ MultiThreaded
+
+
+ true
+ true
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ MultiThreaded
+
+
+ true
+ true
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ MultiThreaded
+
+
+ true
+ true
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
MultiThreaded
true
true
true
true
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ MultiThreaded
+
+
+ true
+ true
+ true
+ true
+ Windows
+ 6.0
+ false
+
+
{0ba5d5b5-f85b-4c49-8a27-67186fa68922}
\ No newline at end of file
diff --git a/PolyML.sln b/PolyML.sln
index 46e0ad7d..f0950c7e 100644
--- a/PolyML.sln
+++ b/PolyML.sln
@@ -1,223 +1,335 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28922.388
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolyLib", "libpolyml\PolyLib.vcxproj", "{0BA5D5B5-F85B-4C49-8A27-67186FA68922}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolyML", "PolyML\PolyML.vcxproj", "{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolyMainLib", "libpolymain\PolyMainLib.vcxproj", "{0326C47A-00AF-42CB-B87D-0369A241B570}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolyPerf", "PolyPerf\PolyPerf.vcxproj", "{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}"
EndProject
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wininstall", "wininstall\wininstall.wixproj", "{788BA1C9-699E-4F92-9FAF-C7437A419042}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "polyicon", "wininstall\polyicon\polyicon.vcxproj", "{D4DF6521-6183-4E24-A327-55C72519836E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PolyImport", "PolyImp\PolyImport.vcxproj", "{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Debug32in64|ARM64 = Debug32in64|ARM64
Debug32in64|x64 = Debug32in64|x64
Debug32in64|x86 = Debug32in64|x86
+ DebugInt32in64|ARM64 = DebugInt32in64|ARM64
DebugInt32in64|x64 = DebugInt32in64|x64
DebugInt32in64|x86 = DebugInt32in64|x86
+ DebugInterpreted|ARM64 = DebugInterpreted|ARM64
DebugInterpreted|x64 = DebugInterpreted|x64
DebugInterpreted|x86 = DebugInterpreted|x86
+ Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
+ Release32in64|ARM64 = Release32in64|ARM64
Release32in64|x64 = Release32in64|x64
Release32in64|x86 = Release32in64|x86
+ ReleaseInt32in64|ARM64 = ReleaseInt32in64|ARM64
ReleaseInt32in64|x64 = ReleaseInt32in64|x64
ReleaseInt32in64|x86 = ReleaseInt32in64|x86
+ ReleaseInterpreted|ARM64 = ReleaseInterpreted|ARM64
ReleaseInterpreted|x64 = ReleaseInterpreted|x64
ReleaseInterpreted|x86 = ReleaseInterpreted|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|ARM64.Build.0 = Debug|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|x64.ActiveCfg = Debug|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|x64.Build.0 = Debug|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|x86.ActiveCfg = Debug|Win32
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug|x86.Build.0 = Debug|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug32in64|x64.Build.0 = Debug32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInt32in64|x64.Build.0 = DebugInt32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|ARM64.ActiveCfg = DebugInterpreted|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|ARM64.Build.0 = DebugInterpreted|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|x64.ActiveCfg = DebugInterpreted|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|x64.Build.0 = DebugInterpreted|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|x86.ActiveCfg = DebugInterpreted|Win32
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.DebugInterpreted|x86.Build.0 = DebugInterpreted|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|ARM64.ActiveCfg = Release|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|ARM64.Build.0 = Release|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|x64.ActiveCfg = Release|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|x64.Build.0 = Release|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|x86.ActiveCfg = Release|Win32
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release|x86.Build.0 = Release|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release32in64|x64.ActiveCfg = Release32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release32in64|x64.Build.0 = Release32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInt32in64|x64.Build.0 = ReleaseInt32in64|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInterpreted|ARM64
+ {0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInterpreted|ARM64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|x64.ActiveCfg = ReleaseInterpreted|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|x64.Build.0 = ReleaseInterpreted|x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|x86.ActiveCfg = ReleaseInterpreted|Win32
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}.ReleaseInterpreted|x86.Build.0 = ReleaseInterpreted|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|ARM64.Build.0 = Debug|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|x64.ActiveCfg = Debug|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|x64.Build.0 = Debug|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|x86.ActiveCfg = Debug|Win32
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug|x86.Build.0 = Debug|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug32in64|x64.Build.0 = Debug32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInt32in64|x64.Build.0 = DebugInt32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|ARM64.ActiveCfg = DebugInterpreted|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|ARM64.Build.0 = DebugInterpreted|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|x64.ActiveCfg = DebugInterpreted|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|x64.Build.0 = DebugInterpreted|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|x86.ActiveCfg = DebugInterpreted|Win32
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.DebugInterpreted|x86.Build.0 = DebugInterpreted|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|ARM64.ActiveCfg = Release|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|ARM64.Build.0 = Release|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|x64.ActiveCfg = Release|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|x64.Build.0 = Release|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|x86.ActiveCfg = Release|Win32
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release|x86.Build.0 = Release|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release32in64|x64.ActiveCfg = Release32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release32in64|x64.Build.0 = Release32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInt32in64|x64.Build.0 = ReleaseInt32in64|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInterpreted|ARM64
+ {DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInterpreted|ARM64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|x64.ActiveCfg = ReleaseInterpreted|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|x64.Build.0 = ReleaseInterpreted|x64
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|x86.ActiveCfg = ReleaseInterpreted|Win32
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}.ReleaseInterpreted|x86.Build.0 = ReleaseInterpreted|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|ARM64.Build.0 = Debug|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|x64.ActiveCfg = Debug|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|x64.Build.0 = Debug|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|x86.ActiveCfg = Debug|Win32
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug|x86.Build.0 = Debug|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug32in64|x64.Build.0 = Debug32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInt32in64|x64.Build.0 = DebugInt32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|ARM64.ActiveCfg = DebugInterpreted|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|ARM64.Build.0 = DebugInterpreted|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|x64.ActiveCfg = DebugInterpreted|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|x64.Build.0 = DebugInterpreted|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|x86.ActiveCfg = DebugInterpreted|Win32
{0326C47A-00AF-42CB-B87D-0369A241B570}.DebugInterpreted|x86.Build.0 = DebugInterpreted|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Release|ARM64.ActiveCfg = Release|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Release|ARM64.Build.0 = Release|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release|x64.ActiveCfg = Release|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release|x64.Build.0 = Release|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release|x86.ActiveCfg = Release|Win32
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release|x86.Build.0 = Release|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release32in64|x64.ActiveCfg = Release32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release32in64|x64.Build.0 = Release32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInt32in64|x64.Build.0 = ReleaseInt32in64|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInterpreted|ARM64
+ {0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInterpreted|ARM64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|x64.ActiveCfg = ReleaseInterpreted|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|x64.Build.0 = ReleaseInterpreted|x64
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|x86.ActiveCfg = ReleaseInterpreted|Win32
{0326C47A-00AF-42CB-B87D-0369A241B570}.ReleaseInterpreted|x86.Build.0 = ReleaseInterpreted|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|ARM64.Build.0 = Debug|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|x64.ActiveCfg = Debug|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|x64.Build.0 = Debug|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|x86.ActiveCfg = Debug|Win32
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug|x86.Build.0 = Debug|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInterpreted|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInterpreted|ARM64.Build.0 = DebugInt32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInterpreted|x64.ActiveCfg = Debug|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInterpreted|x86.ActiveCfg = Debug|Win32
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.DebugInterpreted|x86.Build.0 = Debug|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|ARM64.Build.0 = Release|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|x64.ActiveCfg = Release|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|x64.Build.0 = Release|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|x86.ActiveCfg = Release|Win32
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release|x86.Build.0 = Release|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release32in64|x64.ActiveCfg = Release32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release32in64|x64.Build.0 = Release32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInt32in64|x64.Build.0 = ReleaseInt32in64|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInt32in64|ARM64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|x64.ActiveCfg = Release|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|x64.Build.0 = Release|x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|x86.ActiveCfg = Release|Win32
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}.ReleaseInterpreted|x86.Build.0 = Release|Win32
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug|ARM64.ActiveCfg = Debug|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug|x64.ActiveCfg = Debug|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug|x86.ActiveCfg = Debug|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug32in64|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug32in64|x64.ActiveCfg = Debug|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Debug32in64|x86.ActiveCfg = Debug|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInt32in64|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInt32in64|x64.ActiveCfg = Debug|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInt32in64|x86.ActiveCfg = Debug|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInterpreted|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInterpreted|x64.ActiveCfg = Release|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.DebugInterpreted|x86.ActiveCfg = Debug|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.Release|ARM64.ActiveCfg = Release|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release|x64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release|x64.Build.0 = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release|x86.ActiveCfg = Release|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release|x86.Build.0 = Release|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.Release32in64|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release32in64|x64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release32in64|x64.Build.0 = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.Release32in64|x86.ActiveCfg = Release|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInt32in64|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInt32in64|x64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInt32in64|x86.ActiveCfg = Release|x86
+ {788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInterpreted|ARM64.ActiveCfg = Release|x64
{788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInterpreted|x64.ActiveCfg = Release|x86
{788BA1C9-699E-4F92-9FAF-C7437A419042}.ReleaseInterpreted|x86.ActiveCfg = Release|x86
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Debug|ARM64.ActiveCfg = Int32In64Release|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Debug|ARM64.Build.0 = Int32In64Release|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.Debug|x64.ActiveCfg = Debug|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Debug|x86.ActiveCfg = Debug|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.DebugInterpreted|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.DebugInterpreted|ARM64.Build.0 = DebugInt32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.DebugInterpreted|x64.ActiveCfg = Debug|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.DebugInterpreted|x86.ActiveCfg = Debug|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Release|ARM64.ActiveCfg = Release|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Release|ARM64.Build.0 = Release|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release|x64.ActiveCfg = Release|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release|x64.Build.0 = Release|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release|x86.ActiveCfg = Release|Win32
{D4DF6521-6183-4E24-A327-55C72519836E}.Release|x86.Build.0 = Release|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release32in64|x64.ActiveCfg = Release32in64|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release32in64|x64.Build.0 = Release32in64|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInt32in64|ARM64
{D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInterpreted|x64.ActiveCfg = Release|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInterpreted|x64.Build.0 = Release|x64
{D4DF6521-6183-4E24-A327-55C72519836E}.ReleaseInterpreted|x86.ActiveCfg = Release|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|ARM64.Build.0 = Debug|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|x64.ActiveCfg = Debug|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|x64.Build.0 = Debug|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|x86.ActiveCfg = Debug|Win32
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug|x86.Build.0 = Debug|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug32in64|ARM64.ActiveCfg = Debug32in64|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug32in64|ARM64.Build.0 = Debug32in64|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug32in64|x64.ActiveCfg = Debug32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug32in64|x64.Build.0 = Debug32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Debug32in64|x86.ActiveCfg = Debug32in64|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInt32in64|ARM64.ActiveCfg = DebugInt32in64|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInt32in64|ARM64.Build.0 = DebugInt32in64|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInt32in64|x64.ActiveCfg = DebugInt32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInt32in64|x64.Build.0 = DebugInt32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInt32in64|x86.ActiveCfg = DebugInt32in64|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|ARM64.ActiveCfg = DebugInterpreted|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|ARM64.Build.0 = DebugInterpreted|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|x64.ActiveCfg = DebugInterpreted|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|x64.Build.0 = DebugInterpreted|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|x86.ActiveCfg = DebugInterpreted|Win32
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.DebugInterpreted|x86.Build.0 = DebugInterpreted|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|ARM64.ActiveCfg = Release|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|ARM64.Build.0 = Release|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|x64.ActiveCfg = Release|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|x64.Build.0 = Release|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|x86.ActiveCfg = Release|Win32
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release|x86.Build.0 = Release|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release32in64|ARM64.ActiveCfg = Release32in64|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release32in64|ARM64.Build.0 = Release32in64|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release32in64|x64.ActiveCfg = Release32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release32in64|x64.Build.0 = Release32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.Release32in64|x86.ActiveCfg = Release32in64|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInt32in64|ARM64.ActiveCfg = ReleaseInt32in64|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInt32in64|ARM64.Build.0 = ReleaseInt32in64|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInt32in64|x64.ActiveCfg = ReleaseInt32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInt32in64|x64.Build.0 = ReleaseInt32in64|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInt32in64|x86.ActiveCfg = ReleaseInt32in64|Win32
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|ARM64.ActiveCfg = ReleaseInterpreted|ARM64
+ {1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|ARM64.Build.0 = ReleaseInterpreted|ARM64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|x64.ActiveCfg = ReleaseInterpreted|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|x64.Build.0 = ReleaseInterpreted|x64
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|x86.ActiveCfg = ReleaseInterpreted|Win32
{1BA3E7A2-D64F-4CE3-9FE5-7846B855C19F}.ReleaseInterpreted|x86.Build.0 = ReleaseInterpreted|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6A887FEB-7CBC-45F3-B955-CE757AE81106}
EndGlobalSection
EndGlobal
diff --git a/PolyML/PolyML.vcxproj b/PolyML/PolyML.vcxproj
index d161beb6..68ca4e5f 100644
--- a/PolyML/PolyML.vcxproj
+++ b/PolyML/PolyML.vcxproj
@@ -1,783 +1,1163 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ DebugInterpreted
+ ARM64
+
+
+ Debug
+ ARM64
+
Debug
Win32
DebugInterpreted
Win32
DebugInterpreted
x64
+
+ Release32in64
+ ARM64
+
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ ReleaseInterpreted
+ ARM64
+
ReleaseInterpreted
Win32
ReleaseInterpreted
x64
Release32in64
Win32
Release32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{0326c47a-00af-42cb-b87d-0369a241b570}
{0ba5d5b5-f85b-4c49-8a27-67186fa68922}
{1ba3e7a2-d64f-4ce3-9fe5-7846b855c19f}
false
false
false
false
false
false
false
false
true
+ true
false
+ false
false
+ false
false
+ false
true
+ true
true
+ true
false
+ false
true
+ true
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
true
true
true
true
true
true
true
true
false
+ false
true
+ true
true
+ true
true
+ true
false
+ false
false
+ false
true
+ true
false
+ false
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
cd ..
+$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
+ cd ..
$(OutDir)PolyImport.exe -H 32 "%(FullPath)" -o PolyML\$(IntDir)polyexport.obj < bootstrap\Stage1.sml
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
$(IntDir)polyexport.obj
+ $(IntDir)polyexport.obj
{DF3B373E-67DF-4AB4-8B1E-F54C5810E2CF}
Win32Proj
PolyML
10.0
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
true
true
true
true
+
+ true
+
true
+
+ true
+
true
+
+ true
+
true
+
+ true
+
false
false
false
false
false
+
+ false
+
false
+
+ false
+
false
+
+ false
+
false
+
+ false
+
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ libcmtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ true
+ true
+ libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ true
+ true
+ libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ true
+ true
+ libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
true
6.0
false
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+
+
+
+
+ Windows
+ true
+ true
+ true
+ libcmt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ true
+
+
+ false
+
+
\ No newline at end of file
diff --git a/PolyPerf/PolyPerf.vcxproj b/PolyPerf/PolyPerf.vcxproj
index f69aa2c5..35738326 100644
--- a/PolyPerf/PolyPerf.vcxproj
+++ b/PolyPerf/PolyPerf.vcxproj
@@ -1,369 +1,540 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ Debug
+ ARM64
+
Debug
Win32
+
+ Release32in64
+ ARM64
+
Release32in64
Win32
Release32in64
x64
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{D9F58E8D-5FCD-4401-8D88-0C28732BD77B}
PolyPerf
10.0
DynamicLibrary
true
v142
MultiByte
DynamicLibrary
true
v142
MultiByte
DynamicLibrary
true
v142
MultiByte
DynamicLibrary
false
v142
true
MultiByte
DynamicLibrary
false
v142
true
MultiByte
DynamicLibrary
false
v142
true
MultiByte
DynamicLibrary
true
v142
MultiByte
+
+ DynamicLibrary
+ true
+ v142
+ MultiByte
+
DynamicLibrary
true
v142
MultiByte
+
+ DynamicLibrary
+ true
+ v142
+ MultiByte
+
DynamicLibrary
true
v142
MultiByte
+
+ DynamicLibrary
+ true
+ v142
+ MultiByte
+
DynamicLibrary
false
v142
true
MultiByte
+
+ DynamicLibrary
+ false
+ v142
+ true
+ MultiByte
+
DynamicLibrary
false
v142
true
MultiByte
+
+ DynamicLibrary
+ false
+ v142
+ true
+ MultiByte
+
DynamicLibrary
false
v142
true
MultiByte
+
+ DynamicLibrary
+ false
+ v142
+ true
+ MultiByte
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ Disabled
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ Disabled
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
Level3
Disabled
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ Disabled
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
Level3
MaxSpeed
true
true
true
_CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
true
true
true
psapi.lib;%(AdditionalDependencies)
Windows
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ _CRT_SECURE_NO_WARNINGS;POLYPERF_EXPORTS;%(PreprocessorDefinitions)
+
+
+ true
+ true
+ true
+ psapi.lib;%(AdditionalDependencies)
+ Windows
+
+
\ No newline at end of file
diff --git a/libpolymain/PolyMainLib.vcxproj b/libpolymain/PolyMainLib.vcxproj
index 71c9a70d..02de97f9 100644
--- a/libpolymain/PolyMainLib.vcxproj
+++ b/libpolymain/PolyMainLib.vcxproj
@@ -1,464 +1,684 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ DebugInterpreted
+ ARM64
+
+
+ Debug
+ ARM64
+
Debug
Win32
DebugInterpreted
Win32
DebugInterpreted
x64
+
+ Release32in64
+ ARM64
+
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ ReleaseInterpreted
+ ARM64
+
ReleaseInterpreted
Win32
ReleaseInterpreted
x64
Release32in64
Win32
Release32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{0326C47A-00AF-42CB-B87D-0369A241B570}
PolyMainLib
10.0
StaticLibrary
true
v142
Unicode
StaticLibrary
true
v142
Unicode
StaticLibrary
true
v142
Unicode
StaticLibrary
true
v142
Unicode
StaticLibrary
false
v142
true
Unicode
StaticLibrary
false
v142
true
Unicode
StaticLibrary
false
v142
true
Unicode
StaticLibrary
false
v142
true
Unicode
StaticLibrary
true
v142
Unicode
+
+ StaticLibrary
+ true
+ v142
+ Unicode
+
StaticLibrary
true
v142
Unicode
+
+ StaticLibrary
+ true
+ v142
+ Unicode
+
StaticLibrary
true
v142
Unicode
+
+ StaticLibrary
+ true
+ v142
+ Unicode
+
StaticLibrary
true
v142
Unicode
+
+ StaticLibrary
+ true
+ v142
+ Unicode
+
StaticLibrary
false
v142
true
Unicode
+
+ StaticLibrary
+ false
+ v142
+ true
+ Unicode
+
StaticLibrary
false
v142
true
Unicode
+
+ StaticLibrary
+ false
+ v142
+ true
+ Unicode
+
StaticLibrary
false
v142
true
Unicode
+
+ StaticLibrary
+ false
+ v142
+ true
+ Unicode
+
StaticLibrary
false
v142
true
Unicode
+
+ StaticLibrary
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
+
+
+ Level3
+ Disabled
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+
+
+ true
+
+
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
+
+
+ Level3
+ Disabled
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+
+
+ true
+
+
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
+
+
+ Level3
+ Disabled
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+
+
+ true
+
+
Level3
Disabled
true
..;%(AdditionalIncludeDirectories)
MultiThreadedDebug
true
+
+
+ Level3
+ Disabled
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreadedDebug
+
+
+ true
+
+
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreaded
+
+
+ true
+ true
+ true
+
+
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreaded
+
+
+ true
+ true
+ true
+
+
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreaded
+
+
+ true
+ true
+ true
+
+
Level3
MaxSpeed
true
true
true
..;%(AdditionalIncludeDirectories)
MultiThreaded
true
true
true
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;%(AdditionalIncludeDirectories)
+ MultiThreaded
+
+
+ true
+ true
+ true
+
+
\ No newline at end of file
diff --git a/libpolyml/PolyLib.vcxproj b/libpolyml/PolyLib.vcxproj
index d52e95f6..a59be12b 100644
--- a/libpolyml/PolyLib.vcxproj
+++ b/libpolyml/PolyLib.vcxproj
@@ -1,885 +1,1253 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ DebugInterpreted
+ ARM64
+
+
+ Debug
+ ARM64
+
Debug
Win32
DebugInterpreted
Win32
DebugInterpreted
x64
+
+ Release32in64
+ ARM64
+
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ ReleaseInterpreted
+ ARM64
+
ReleaseInterpreted
Win32
ReleaseInterpreted
x64
Release32in64
Win32
Release32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{0BA5D5B5-F85B-4C49-8A27-67186FA68922}
PolyLib
10.0
DynamicLibrary
true
v142
Unicode
DynamicLibrary
true
v142
Unicode
DynamicLibrary
true
v142
Unicode
DynamicLibrary
true
v142
Unicode
DynamicLibrary
false
v142
true
Unicode
DynamicLibrary
false
v142
true
Unicode
DynamicLibrary
false
v142
true
Unicode
DynamicLibrary
false
v142
true
Unicode
DynamicLibrary
true
v142
Unicode
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
DynamicLibrary
true
v142
Unicode
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
DynamicLibrary
true
v142
Unicode
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
DynamicLibrary
true
v142
Unicode
+
+ DynamicLibrary
+ true
+ v142
+ Unicode
+
DynamicLibrary
false
v142
true
Unicode
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
DynamicLibrary
false
v142
true
Unicode
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
DynamicLibrary
false
v142
true
Unicode
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
DynamicLibrary
false
v142
true
Unicode
+
+ DynamicLibrary
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
.dll
.dll
.dll
.dll
.dll
.dll
.dll
.dll
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
.dll
+
+ .dll
+
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
POLYML32IN64;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ POLYML32IN64;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
Disabled
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
POLYML32IN64;CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreadedDebug
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ Disabled
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ POLYML32IN64;CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreadedDebug
+
+
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ _CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ true
+ true
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
POLYML32IN64;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ POLYML32IN64;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ true
+ true
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ true
+ true
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
Level3
MaxSpeed
true
true
true
..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
POLYML32IN64;CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_X86_64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
MultiThreaded
true
true
true
ws2_32.lib;%(AdditionalDependencies)
Windows
6.0
false
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ true
+ ..;libffi\include;libffi\msvc32include;libffi\src\x86;%(AdditionalIncludeDirectories)
+ POLYML32IN64;CODEISNOTEXECUTABLE;_CRT_SECURE_NO_WARNINGS;POLYLIB_EXPORTS;HOSTARCHITECTURE_AARCH64;LONG_LONG_MAX=_I64_MAX;%(PreprocessorDefinitions)
+ MultiThreaded
+
+
+ true
+ true
+ true
+ ws2_32.lib;%(AdditionalDependencies)
+ Windows
+ 6.0
+ false
+
+
true
true
true
true
true
true
true
true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
true
true
true
true
+ true
true
+ true
true
+ true
true
+ true
true
true
true
true
true
true
true
true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
true
true
true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
true
+ true
false
false
true
true
false
false
true
true
true
+ true
true
+ true
true
+ true
true
+ true
Document
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml /nologo /DWINDOWS /Fo $(IntDir)%(Filename).obj /c /coff "$(IntDir)%(Filename).asm"
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
true
true
true
true
true
true
true
true
true
+ true
true
+ true
true
+ true
true
+ true
Document
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER /DPOLYML32IN64 "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER /DPOLYML32IN64 "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER /DPOLYML32IN64 "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER /DPOLYML32IN64 "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
+ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
+ cl /nologo /EP /I. /D_MSC_VER "%(FullPath)" > $(IntDir)%(Filename).asm
ml64 /nologo /Fo $(IntDir)%(Filename).obj /c $(IntDir)%(Filename).asm
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
$(IntDir)%(Filename).obj
+ $(IntDir)%(Filename).obj
\ No newline at end of file
diff --git a/libpolyml/pecoffexport.cpp b/libpolyml/pecoffexport.cpp
index 9c21f799..7198471a 100644
--- a/libpolyml/pecoffexport.cpp
+++ b/libpolyml/pecoffexport.cpp
@@ -1,411 +1,415 @@
/*
Title: Export memory as a PE/COFF object
Author: David C. J. Matthews.
Copyright (c) 2006, 2011, 2016-18 David C. J. Matthews
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR H PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#elif defined(_WIN32)
#include "winconfig.h"
#else
#error "No configuration file"
#endif
#include
#include
#ifdef HAVE_STDDEF_H
#include
#endif
#ifdef HAVE_STRING_H
#include
#endif
#ifdef HAVE_ERRNO_H
#include
#endif
#ifdef HAVE_ASSERT_H
#include
#endif
#include
#include "globals.h"
#include "pecoffexport.h"
#include "machine_dep.h"
#include "scanaddrs.h"
#include "run_time.h"
#include "../polyexports.h"
#include "version.h"
#include "polystring.h"
#include "timing.h"
#ifdef _DEBUG
/* MS C defines _DEBUG for debug builds. */
#define DEBUG
#endif
#ifdef DEBUG
#define ASSERT(x) assert(x)
#else
#define ASSERT(x)
#endif
-#if (SIZEOF_VOIDP == 8)
+#if (defined(HOSTARCHITECTURE_X86))
+#define DIRECT_WORD_RELOCATION IMAGE_REL_I386_DIR32
+#define RELATIVE_32BIT_RELOCATION IMAGE_REL_I386_REL32
+#define IMAGE_MACHINE_TYPE IMAGE_FILE_MACHINE_I386
+#elif (defined(HOSTARCHITECTURE_X86_64))
#define DIRECT_WORD_RELOCATION IMAGE_REL_AMD64_ADDR64
#define RELATIVE_32BIT_RELOCATION IMAGE_REL_AMD64_REL32
+#define IMAGE_MACHINE_TYPE IMAGE_FILE_MACHINE_AMD64
+#elif (defined(HOSTARCHITECTURE_AARCH64))
+#define DIRECT_WORD_RELOCATION IMAGE_REL_ARM64_ADDR64
+#define RELATIVE_32BIT_RELOCATION IMAGE_REL_AMD64_REL32 // Leave for the moment
+#define IMAGE_MACHINE_TYPE IMAGE_FILE_MACHINE_ARM64
#else
-#define DIRECT_WORD_RELOCATION IMAGE_REL_I386_DIR32
-#define RELATIVE_32BIT_RELOCATION IMAGE_REL_I386_REL32
+#error "Unknown architecture: unable to configure exporter for PECOFF"
#endif
void PECOFFExport::writeRelocation(const IMAGE_RELOCATION* reloc)
{
fwrite(reloc, sizeof(*reloc), 1, exportFile);
if (relocationCount == 0)
firstRelocation = *reloc;
relocationCount++;
}
void PECOFFExport::addExternalReference(void *relocAddr, const char *name, bool/* isFuncPtr*/)
{
externTable.makeEntry(name);
IMAGE_RELOCATION reloc;
// Set the offset within the section we're scanning.
setRelocationAddress(relocAddr, &reloc.VirtualAddress);
reloc.SymbolTableIndex = symbolNum++;
reloc.Type = DIRECT_WORD_RELOCATION;
writeRelocation(&reloc);
}
// Generate the address relative to the start of the segment.
void PECOFFExport::setRelocationAddress(void *p, DWORD *reloc)
{
unsigned area = findArea(p);
DWORD offset = (DWORD)((char*)p - (char*)memTable[area].mtOriginalAddr);
*reloc = offset;
}
// Create a relocation entry for an address at a given location.
PolyWord PECOFFExport::createRelocation(PolyWord p, void *relocAddr)
{
IMAGE_RELOCATION reloc;
// Set the offset within the section we're scanning.
setRelocationAddress(relocAddr, &reloc.VirtualAddress);
void *addr = p.AsAddress();
unsigned addrArea = findArea(addr);
POLYUNSIGNED offset = (POLYUNSIGNED)((char*)addr - (char*)memTable[addrArea].mtOriginalAddr);
reloc.SymbolTableIndex = addrArea;
reloc.Type = DIRECT_WORD_RELOCATION;
writeRelocation(&reloc);
return PolyWord::FromUnsigned(offset);
}
#ifdef SYMBOLS_REQUIRE_UNDERSCORE
#define POLY_PREFIX_STRING "_"
#else
#define POLY_PREFIX_STRING ""
#endif
void PECOFFExport::writeSymbol(const char *symbolName, __int32 value, int section, bool isExtern, int symType)
{
// On X86/32 we have to add an underscore to external symbols
TempCString fullSymbol;
fullSymbol = (char*)malloc(strlen(POLY_PREFIX_STRING) + strlen(symbolName) + 1);
if (fullSymbol == 0) throw MemoryException();
sprintf(fullSymbol, "%s%s", POLY_PREFIX_STRING, symbolName);
IMAGE_SYMBOL symbol;
memset(&symbol, 0, sizeof(symbol)); // Zero the unused part of the string
// Short symbol names go in the entry, longer ones go in the string table.
if (strlen(fullSymbol) <= 8)
strcat((char*)symbol.N.ShortName, fullSymbol);
else {
symbol.N.Name.Short = 0;
// We have to add 4 bytes because the first word written to the file is a length word.
symbol.N.Name.Long = stringTable.makeEntry(fullSymbol) + sizeof(unsigned);
}
symbol.Value = value;
symbol.SectionNumber = section;
symbol.Type = symType;
symbol.StorageClass = isExtern ? IMAGE_SYM_CLASS_EXTERNAL : IMAGE_SYM_CLASS_STATIC;
fwrite(&symbol, sizeof(symbol), 1, exportFile);
}
/* This is called for each constant within the code.
Print a relocation entry for the word and return a value that means
that the offset is saved in original word. */
void PECOFFExport::ScanConstant(PolyObject *base, byte *addr, ScanRelocationKind code)
{
#ifndef POLYML32IN64
IMAGE_RELOCATION reloc;
PolyObject *p = GetConstantValue(addr, code);
if (p == 0)
return;
void *a = p;
unsigned aArea = findArea(a);
// We don't need a relocation if this is relative to the current segment
// since the relative address will already be right.
if (code == PROCESS_RELOC_I386RELATIVE && aArea == findArea(addr))
return;
setRelocationAddress(addr, &reloc.VirtualAddress);
// Set the value at the address to the offset relative to the symbol.
uintptr_t offset = (char*)a - (char*)memTable[aArea].mtOriginalAddr;
reloc.SymbolTableIndex = aArea;
// The value we store here is the offset whichever relocation method
// we're using.
unsigned maxSize = code == PROCESS_RELOC_I386RELATIVE ? 4: sizeof(PolyWord);
for (unsigned i = 0; i < maxSize; i++)
{
addr[i] = (byte)(offset & 0xff);
offset >>= 8;
}
if (code == PROCESS_RELOC_I386RELATIVE)
reloc.Type = RELATIVE_32BIT_RELOCATION;
else
reloc.Type = DIRECT_WORD_RELOCATION;
writeRelocation(&reloc);
#endif
}
// Set the file alignment.
void PECOFFExport::alignFile(int align)
{
char pad[32] = {0}; // Maximum alignment
int offset = ftell(exportFile);
if ((offset % align) == 0) return;
fwrite(&pad, align - (offset % align), 1, exportFile);
}
void PECOFFExport::exportStore(void)
{
PolyWord *p;
IMAGE_FILE_HEADER fhdr;
IMAGE_SECTION_HEADER *sections = 0;
IMAGE_RELOCATION reloc;
unsigned i;
// These are written out as the description of the data.
exportDescription exports;
time_t now = getBuildTime();
sections = new IMAGE_SECTION_HEADER [memTableEntries+1]; // Plus one for the tables.
// Write out initial values for the headers. These are overwritten at the end.
// File header
memset(&fhdr, 0, sizeof(fhdr));
-#if (SIZEOF_VOIDP == 8)
- fhdr.Machine = IMAGE_FILE_MACHINE_AMD64; // x86-64
-#else
- fhdr.Machine = IMAGE_FILE_MACHINE_I386; // i386
-#endif
+ fhdr.Machine = IMAGE_MACHINE_TYPE; // x86-64
fhdr.NumberOfSections = memTableEntries+1; // One for each area plus one for the tables.
fhdr.TimeDateStamp = (DWORD)now;
//fhdr.NumberOfSymbols = memTableEntries+1; // One for each area plus "poly_exports"
fwrite(&fhdr, sizeof(fhdr), 1, exportFile); // Write it for the moment.
// External symbols are added after the memory table entries and "poly_exports".
symbolNum = memTableEntries+1; // The first external symbol
// Section headers.
for (i = 0; i < memTableEntries; i++)
{
memset(§ions[i], 0, sizeof(IMAGE_SECTION_HEADER));
sections[i].SizeOfRawData = (DWORD)memTable[i].mtLength;
sections[i].Characteristics = IMAGE_SCN_MEM_READ | IMAGE_SCN_ALIGN_8BYTES;
if (memTable[i].mtFlags & MTF_WRITEABLE)
{
// Mutable data
ASSERT(!(memTable[i].mtFlags & MTF_EXECUTABLE)); // Executable areas can't be writable.
strcpy((char*)sections[i].Name, ".data");
sections[i].Characteristics |= IMAGE_SCN_MEM_WRITE | IMAGE_SCN_CNT_INITIALIZED_DATA;
}
#ifndef CODEISNOTEXECUTABLE
// Not if we're building the interpreted version.
else if (memTable[i].mtFlags & MTF_EXECUTABLE)
{
// Immutable data areas are marked as executable.
strcpy((char*)sections[i].Name, ".text");
sections[i].Characteristics |= IMAGE_SCN_MEM_EXECUTE | IMAGE_SCN_CNT_CODE;
}
#endif
else
{
// Immutable data areas are marked as executable.
strcpy((char*)sections[i].Name, ".rdata");
sections[i].Characteristics |= IMAGE_SCN_CNT_INITIALIZED_DATA;
}
}
// Extra section for the tables.
memset(§ions[memTableEntries], 0, sizeof(IMAGE_SECTION_HEADER));
sprintf((char*)sections[memTableEntries].Name, ".data");
sections[memTableEntries].SizeOfRawData = sizeof(exports) + (memTableEntries+1)*sizeof(memoryTableEntry);
// Don't need write access here but keep it for consistency with other .data sections
sections[memTableEntries].Characteristics =
IMAGE_SCN_MEM_READ | IMAGE_SCN_ALIGN_8BYTES | IMAGE_SCN_MEM_WRITE | IMAGE_SCN_CNT_INITIALIZED_DATA;
fwrite(sections, sizeof(IMAGE_SECTION_HEADER), memTableEntries+1, exportFile); // Write it for the moment.
for (i = 0; i < memTableEntries; i++)
{
sections[i].PointerToRelocations = ftell(exportFile);
relocationCount = 0;
// Create the relocation table and turn all addresses into offsets.
char *start = (char*)memTable[i].mtOriginalAddr;
char *end = start + memTable[i].mtLength;
for (p = (PolyWord*)start; p < (PolyWord*)end; )
{
p++;
PolyObject *obj = (PolyObject*)p;
POLYUNSIGNED length = obj->Length();
// Update any constants before processing the object
// We need that for relative jumps/calls in X86/64.
if (length != 0 && obj->IsCodeObject())
machineDependent->ScanConstantsWithinCode(obj, this);
relocateObject(obj);
p += length;
}
// If there are more than 64k relocations set this bit and set the value to 64k-1.
if (relocationCount >= 65535) {
// We're going to overwrite the first relocation so we have to write the
// copy we saved here.
writeRelocation(&firstRelocation); // Increments relocationCount
sections[i].NumberOfRelocations = 65535;
sections[i].Characteristics |= IMAGE_SCN_LNK_NRELOC_OVFL;
// We have to go back and patch up the first (dummy) relocation entry
// which contains the count.
fseek(exportFile, sections[i].PointerToRelocations, SEEK_SET);
memset(&reloc, 0, sizeof(reloc));
reloc.RelocCount = relocationCount;
fwrite(&reloc, sizeof(reloc), 1, exportFile);
fseek(exportFile, 0, SEEK_END); // Return to the end of the file.
}
else sections[i].NumberOfRelocations = relocationCount;
}
// We don't need to handle relocation overflow here.
sections[memTableEntries].PointerToRelocations = ftell(exportFile);
relocationCount = 0;
// Relocations for "exports" and "memTable";
// Address of "memTable" within "exports". We can't use createRelocation because
// the position of the relocation is not in either the mutable or the immutable area.
reloc.Type = DIRECT_WORD_RELOCATION;
reloc.SymbolTableIndex = memTableEntries; // Relative to poly_exports
reloc.VirtualAddress = offsetof(exportDescription, memTable);
fwrite(&reloc, sizeof(reloc), 1, exportFile);
relocationCount++;
// Address of "rootFunction" within "exports"
reloc.Type = DIRECT_WORD_RELOCATION;
unsigned rootAddrArea = findArea(rootFunction);
reloc.SymbolTableIndex = rootAddrArea;
reloc.VirtualAddress = offsetof(exportDescription, rootFunction);
fwrite(&reloc, sizeof(reloc), 1, exportFile);
relocationCount++;
for (i = 0; i < memTableEntries; i++)
{
reloc.Type = DIRECT_WORD_RELOCATION;
reloc.SymbolTableIndex = i; // Relative to base symbol
reloc.VirtualAddress =
sizeof(exportDescription) + i * sizeof(memoryTableEntry) + offsetof(memoryTableEntry, mtCurrentAddr);
fwrite(&reloc, sizeof(reloc), 1, exportFile);
relocationCount++;
}
ASSERT(relocationCount < 65535); // Shouldn't get overflow!!
sections[memTableEntries].NumberOfRelocations = relocationCount;
// Now the binary data.
for (i = 0; i < memTableEntries; i++)
{
sections[i].PointerToRawData = ftell(exportFile);
fwrite(memTable[i].mtOriginalAddr, 1, memTable[i].mtLength, exportFile);
}
sections[memTableEntries].PointerToRawData = ftell(exportFile);
memset(&exports, 0, sizeof(exports));
exports.structLength = sizeof(exportDescription);
exports.memTableSize = sizeof(memoryTableEntry);
exports.memTableEntries = memTableEntries;
exports.memTable = (memoryTableEntry *)sizeof(exports); // It follows immediately after this.
exports.rootFunction = (void*)((char*)rootFunction - (char*)memTable[rootAddrArea].mtOriginalAddr);
exports.timeStamp = now;
exports.architecture = machineDependent->MachineArchitecture();
exports.rtsVersion = POLY_version_number;
#ifdef POLYML32IN64
exports.originalBaseAddr = globalHeapBase;
#else
exports.originalBaseAddr = 0;
#endif
// Set the address values to zero before we write. They will always
// be relative to their base symbol.
for (i = 0; i < memTableEntries; i++)
memTable[i].mtCurrentAddr = 0;
fwrite(&exports, sizeof(exports), 1, exportFile);
fwrite(memTable, sizeof(memoryTableEntry), memTableEntries, exportFile);
// First the symbol table. We have one entry for the exports and an additional
// entry for each of the sections.
fhdr.PointerToSymbolTable = ftell(exportFile);
// The section numbers are one-based. Zero indicates the "common" area.
// First write symbols for each section and for poly_exports.
for (i = 0; i < memTableEntries; i++)
{
char buff[50];
sprintf(buff, "area%0d", i);
writeSymbol(buff, 0, i+1, false);
}
// Exported symbol for table.
writeSymbol("poly_exports", 0, memTableEntries+1, true);
// External references.
for (unsigned i = 0; i < externTable.stringSize; i += (unsigned)strlen(externTable.strings+i) + 1)
writeSymbol(externTable.strings+i, 0, 0, true, 0x20);
fhdr.NumberOfSymbols = symbolNum;
// The string table is written immediately after the symbols.
// The length is included as the first word.
unsigned strSize = stringTable.stringSize + sizeof(unsigned);
fwrite(&strSize, sizeof(strSize), 1, exportFile);
fwrite(stringTable.strings, stringTable.stringSize, 1, exportFile);
// Rewind to rewrite the headers.
fseek(exportFile, 0, SEEK_SET);
fwrite(&fhdr, sizeof(fhdr), 1, exportFile);
fwrite(sections, sizeof(IMAGE_SECTION_HEADER), memTableEntries+1, exportFile);
fclose(exportFile); exportFile = NULL;
delete[](sections);
}
diff --git a/libpolyml/winguiconsole.cpp b/libpolyml/winguiconsole.cpp
index dd0d75be..b6378376 100644
--- a/libpolyml/winguiconsole.cpp
+++ b/libpolyml/winguiconsole.cpp
@@ -1,691 +1,691 @@
/*
Title: Poly/ML Console Window.
Copyright (c) 2000, 2015, 2018, 2019 David C. J. Matthews
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License version 2.1 as published by the Free Software Foundation.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#elif defined(_WIN32)
#include "winconfig.h"
#else
#error "No configuration file"
#endif
#ifdef HAVE_STDIO_H
#include
#endif
#ifdef HAVE_WINDOWS_H
#include // Include first to avoid conflicts
#include
#endif
#ifdef HAVE_TCHAR_H
#include
#endif
#ifdef HAVE_IO_H
#include
#endif
#ifdef HAVE_FCNTL_H
#include
#endif
#ifdef HAVE_ERRNO_H
#include
#endif
#ifdef HAVE_ASSERT_H
#include
#define ASSERT(x) assert(x)
#else
#define ASSERT(x)
#endif
#include "../resource.h"
#include "sighandler.h" // For RequestConsoleInterrupt
#include "processes.h"
#include "polystring.h" // For codepage
#include "io_internal.h"
#include "locking.h"
#include "winguiconsole.h"
/*
This module takes the place of the Windows console which
has a number of problems, apart from not being a pleasant
user interface. It creates a main window containing an edit
control, which it has to sub-class so that we can receive all
the characters as they are typed.
I've written this in C using the direct Windows calls to make
it fairly independent of the compiler. It would definitely be
simpler and cleaner written in C++ using MFC.
DCJM 30/5/2000.
*/
HWND hMainWindow = NULL; // Main window - exported.
extern HINSTANCE hApplicationInstance; // Application instance (exported)
static HANDLE hReadFromML; // Handles to pipe from ML thread
static WNDPROC wpOrigEditProc; // Saved window proc.
static bool fAtEnd; // True if we are at the end of the window
static HWND hEditWnd; // Edit sub-window
static CHAR *pchInputBuffer; // Buffer to text read.
static int nBuffLen; // Length of input buffer.
static int nNextPosn; // Position to add input. (<= nBuffLen)
static int nAvailable; // Position of "committed" input (<= nNextPosn)
static int nReadPosn; // Position of last read (<= nAvailable)
static PLock iOInterlock;
static HANDLE hInputEvent; // Signalled when input is available.
static int nInitialShow; // Value of nCmdShow passed in.
static bool isActive = false;
#ifdef UNICODE
#define DDECODEPAGE CP_WINUNICODE
#else
#define DDECODEPAGE CP_WINANSI
#endif
/* All addition is made at the end of the text so this function is
called to find out if we're there. */
static void MoveToEnd(void)
{
if (! fAtEnd)
{
// Make sure any text we add goes at the end.
LRESULT dwEnd = SendMessage(hEditWnd, WM_GETTEXTLENGTH, 0, 0);
SendMessage(hEditWnd, EM_SETSEL, dwEnd, dwEnd);
fAtEnd = true;
}
}
// Remove lines at the beginning until we have enough space.
static void CheckForScreenSpace(size_t nChars)
{
DWORD dwRemoved = 0;
// TODO: We could avoid these calls by remembering this information.
size_t limit = SendMessage(hEditWnd, EM_GETLIMITTEXT, 0, 0);
size_t size = SendMessage(hEditWnd, WM_GETTEXTLENGTH, 0, 0);
if (nChars > limit)
{
SetWindowText(hEditWnd, _T(""));
SendMessage(hEditWnd, EM_SETSEL, 1, 1); // Clear selection.
}
else if (nChars + size >= limit)
{
// We need to remove sufficient lines to make enough space. Find the index of
// the line that will create enough space and then delete to the start of the
// next line.
LRESULT lineNo = SendMessage(hEditWnd, EM_LINEFROMCHAR, nChars + size - limit, 0);
LRESULT firstCh = SendMessage(hEditWnd, EM_LINEINDEX, lineNo + 1, 0);
// Select the text we're going to remove
SendMessage(hEditWnd, EM_SETSEL, 0, firstCh);
// Use EM_REPLACESEL rather than WM_CLEAR since we don't want to undo.
SendMessage(hEditWnd, EM_REPLACESEL, FALSE, (LPARAM)_T(""));
fAtEnd = false; // Move the display to the end
MoveToEnd();
}
}
// Expand the buffer if necessary to allow room for
// additional characters.
static void CheckForBufferSpace(int nChars)
{
BOOL fOverflow;
if (nNextPosn >= nReadPosn)
fOverflow = nNextPosn+nChars >= nReadPosn+nBuffLen;
else fOverflow = nNextPosn+nChars >= nReadPosn;
if (fOverflow)
{
int nOldLen = nBuffLen;
// Need more space.
nBuffLen = nBuffLen + nChars + nBuffLen/2;
char *newBuffer = (char*)realloc(pchInputBuffer, nBuffLen);
if (newBuffer == 0) return; // Not sure what to do here.
pchInputBuffer = newBuffer;
// Have to copy any data that has wrapped round to the
// new area.
if (nNextPosn < nReadPosn)
{
int nExtra = nBuffLen-nOldLen;
if (nExtra >= nNextPosn)
{
// All the space before will fit in the new area.
memcpy(pchInputBuffer+nOldLen, pchInputBuffer, nNextPosn);
}
else
{
// Some of the space before will fit but not all.
memcpy(pchInputBuffer+nOldLen, pchInputBuffer, nExtra);
memmove(pchInputBuffer, pchInputBuffer+nExtra, nNextPosn-nExtra);
}
// Adjust these pointers modulo the old and new lengths.
if (nAvailable < nNextPosn) nAvailable += nOldLen;
if (nAvailable >= nBuffLen) nAvailable -= nBuffLen;
nNextPosn += nOldLen;
if (nNextPosn >= nBuffLen) nNextPosn -= nBuffLen;
}
}
ASSERT(nBuffLen >= 0 && nAvailable >= 0 && nNextPosn >= 0 && nAvailable < nBuffLen && nReadPosn < nBuffLen);
if (nNextPosn > nReadPosn)
ASSERT(nAvailable >= nReadPosn && nAvailable <= nNextPosn);
else ASSERT((nNextPosn != nReadPosn &&
nAvailable <= nNextPosn) || nAvailable >= nReadPosn);
}
/* In order to be able to handle all the keys we need to
sub-class the edit control. */
static LRESULT APIENTRY EditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_GETDLGCODE:
return DLGC_WANTALLKEYS | DLGC_WANTCHARS;
case WM_KEYDOWN:
switch(wParam)
{
case VK_DELETE: // Ignore the delete key. Beep perhaps?
return 0;
case VK_LEFT: // If we move the cursor we are probably not
case VK_RIGHT: // at the end.
case VK_UP:
case VK_DOWN:
fAtEnd = false;
default:
return CallWindowProc(wpOrigEditProc, hwnd, uMsg, wParam, lParam);
}
case WM_CHAR:
{
LPARAM nRpt = lParam & 0xffff;
PLocker locker(&iOInterlock);
if (wParam == '\b')
{
// Delete the previous character(s).
if (nNextPosn != nAvailable)
{
int nCanRemove = 0;
while (nRpt-- > 0 && nNextPosn != nAvailable)
{
nCanRemove++;
if (nNextPosn == 0) nNextPosn = nBuffLen;
nNextPosn--;
}
lParam = (lParam & 0xffff0000) | nCanRemove;
return CallWindowProc(wpOrigEditProc, hwnd, uMsg, wParam, lParam);
}
}
else if (wParam == 22) // Control-V
{
// Generate a Paste command.
SendMessage(hMainWindow, WM_COMMAND, ID_EDIT_PASTE, 0);
}
else if (wParam == 3) // Control-C
{
// In Windows this has the effect of Copy but we also
// want it to generate an interrupt. I've chosen to
// make it copy if there is any selection, otherwise to
// generate an interrupt. We'll have to see how this works.
DWORD dwStart, dwEnd;
SendMessage(hwnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd);
if (dwStart != dwEnd)
{
SendMessage(hwnd, WM_COPY, 0, 0);
}
else {
// Discard any type-ahead.
nNextPosn = nAvailable = nReadPosn = 0;
RequestConsoleInterrupt();
}
}
else if (wParam >= ' ' || wParam == '\r' || wParam == '\t' ||
wParam == 4 /* ctrl-D */ || wParam == 26 /* ctrl-Z */)
{
CheckForBufferSpace((int)nRpt);
CheckForScreenSpace(nRpt); // Make sure we have space on the screen.
// Add the character(s) to the buffer.
while (nRpt-- > 0)
{
if (wParam == '\r')
{
pchInputBuffer[nNextPosn++] = '\n';
nAvailable = nNextPosn;
SetEvent(hInputEvent);
}
else if (wParam == 4 || wParam == 26)
{
// Treat either of these as EOF chars.
pchInputBuffer[nNextPosn++] = (CHAR)wParam;
nAvailable = nNextPosn;
SetEvent(hInputEvent);
wParam = 4;
}
else pchInputBuffer[nNextPosn++] = (CHAR)wParam;
if (nNextPosn == nBuffLen) nNextPosn = 0;
if (nAvailable == nBuffLen) nAvailable = 0;
}
MoveToEnd();
// Add this to the window except if it's ctrl-Z or ctrl-D.
if (wParam == 4 || wParam == 26) return 0;
return CallWindowProc(wpOrigEditProc, hwnd, uMsg, wParam, lParam);
}
return 0;
}
case WM_DESTROY:
{
HFONT hFount;
// Switch back to the old window proc just in case.
-#ifdef _M_AMD64
+#ifdef _WIN64
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (INT_PTR)wpOrigEditProc);
SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
#else
SetWindowLong(hwnd, GWL_WNDPROC, (LONG)wpOrigEditProc);
SetWindowLong(hwnd, GWL_USERDATA, 0);
#endif
// Get the fount and delete it if it's not the default.
hFount = (HFONT)SendMessage(hwnd, WM_GETFONT, 0, 0);
if (hFount != NULL)
{
SendMessage(hwnd, WM_SETFONT, (WPARAM)NULL, FALSE);
DeleteObject(hFount);
}
// Call the original to finish off.
return CallWindowProc(wpOrigEditProc, hwnd, uMsg, wParam, lParam);
}
case WM_LBUTTONDOWN:
case WM_RBUTTONDOWN:
case WM_LBUTTONUP:
case WM_RBUTTONUP:
case EM_SETSEL:
// Need to record that we may no longer be at the end of the text.
fAtEnd = false;
// Drop through to default.
default:
return CallWindowProc(wpOrigEditProc, hwnd, uMsg, wParam, lParam);
}
}
/* This function is only used when the "About Poly/ML" dialogue box is
being displayed. */
static BOOL CALLBACK AboutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_INITDIALOG: return 1;
case WM_COMMAND:
if (wParam == IDOK)
{
EndDialog(hwndDlg, IDOK);
return 1;
}
case WM_CLOSE:
EndDialog(hwndDlg, IDOK);
return 1;
default: return 0;
}
}
#ifdef UNICODE
#define CF_TEXTFORMAT CF_UNICODETEXT
#else
#define CF_TEXTFORMAT CF_TEXT
#endif
/* Messages interpreted by the main window thread. */
#define WM_ADDTEXT WM_APP
/* This is the main window procedure. */
LRESULT CALLBACK WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
switch (uMsg)
{
case WM_CREATE:
{
hEditWnd = CreateWindow(_T("EDIT"), NULL,
WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_HSCROLL |
ES_LEFT | ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL,
0, 0, 0, 0,
hwnd, 0, hApplicationInstance, NULL);
if (hEditWnd == NULL) return -1; /* Failed */
// Sub-class this so that we get the keys that are pressed.
// Save the old window proc.
-#ifdef _M_AMD64
+#ifdef _WIN64
wpOrigEditProc =
(WNDPROC)GetWindowLongPtr(hEditWnd, GWLP_WNDPROC);
// Set our new window proc.
SetWindowLongPtr(hEditWnd, GWLP_WNDPROC, (INT_PTR)EditSubclassProc);
#else
wpOrigEditProc =
(WNDPROC)GetWindowLong(hEditWnd, GWL_WNDPROC);
// Set our new window proc.
SetWindowLong(hEditWnd, GWL_WNDPROC, (LONG)EditSubclassProc);
#endif
fAtEnd = true;
// Get a 10 point Courier fount.
HDC hDC = GetDC(hEditWnd);
int nHeight = -MulDiv(10, GetDeviceCaps(hDC, LOGPIXELSY), 72);
ReleaseDC(hEditWnd, hDC);
HFONT hFont = CreateFont(nHeight, 0, 0, 0, FW_DONTCARE,
FALSE, FALSE, FALSE, ANSI_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
DEFAULT_QUALITY, FIXED_PITCH | FF_MODERN,
_T("Courier"));
if (hFont) SendMessage(hEditWnd, WM_SETFONT, (WPARAM)hFont, 0);
SetWindowText(hEditWnd, _T(""));
return 0; /* Succeeded */
}
case WM_SETFOCUS:
/* When the focus arrives at the parent set the focus on
the edit window. */
SetFocus(hEditWnd);
return 0;
case WM_SIZE:
{
LONG offset = 0;
// Make the edit control the size of the window's client area.
MoveWindow(hEditWnd, 0, offset, LOWORD(lParam), HIWORD(lParam)-offset, TRUE);
}
return 0;
case WM_DESTROY:
PostQuitMessage(0);
return 0;
case WM_COMMAND:
switch(wParam)
{
case ID_EDIT_COPY:
SendMessage(hEditWnd, WM_COPY, 0, 0);
return 0;
case ID_EDIT_PASTE:
if (IsClipboardFormatAvailable(CF_TEXTFORMAT))
{
// We need to check that we have enough space BEFORE we try pasting.
OpenClipboard(hEditWnd);
HANDLE hClip = GetClipboardData(CF_TEXTFORMAT);
if (hClip == NULL) return 0;
LPCTSTR lpszText = (LPCTSTR)GlobalLock(hClip);
if (lpszText == NULL) return 0;
CheckForScreenSpace(lstrlen(lpszText));
MoveToEnd();
// Add it to the screen.
SendMessage(hEditWnd, EM_REPLACESEL, FALSE, (LPARAM)lpszText);
// Add to the type-ahead.
PLocker locker(&iOInterlock);
// Check there's enough space. This may be an
// over-estimate since we replace CRNL by NL.
CheckForBufferSpace(lstrlen(lpszText));
while (*lpszText)
{
// The data we're pasting contains CRNL as
// line separators.
if (lpszText[0] == '\r' && lpszText[1] == '\n')
{
pchInputBuffer[nNextPosn++] = '\n';
if (nNextPosn == nBuffLen) nNextPosn = 0;
nAvailable = nNextPosn;
lpszText += 2;
}
else {
pchInputBuffer[nNextPosn++] = (char)*lpszText++;
if (nNextPosn == nBuffLen) nNextPosn = 0;
if (lpszText[0] == 4 || lpszText[0] == 26)
nAvailable = nNextPosn; // EOF characters.
}
}
if (nAvailable != nReadPosn) SetEvent(hInputEvent);
GlobalUnlock(hClip);
CloseClipboard();
}
return 0;
case ID_HELP_ABOUT:
DialogBox(hApplicationInstance, MAKEINTRESOURCE(IDD_ABOUT_POLYML),
hwnd, (DLGPROC)AboutProc);
return 0;
case ID_FILE_QUIT:
if (MessageBox(hwnd, _T("Are you sure you want to quit?"),
_T("Confirm Quit"), MB_OKCANCEL) == IDOK)
processes->RequestProcessExit(0);
return 0;
case ID_RUN_INTERRUPT:
// Discard any type-ahead.
nNextPosn = nAvailable = nReadPosn = 0;
RequestConsoleInterrupt();
return 0;
default: return DefWindowProc(hwnd, uMsg, wParam, lParam);
}
case WM_CLOSE:
if (MessageBox(hwnd, _T("Are you sure you want to quit?"),
_T("Confirm Quit"), MB_OKCANCEL) == IDOK)
processes->RequestProcessExit(0);
return 0;
case WM_ADDTEXT:
// Request from the input thread to add some text.
{
// Remember the old selection and the original length.
DWORD lrStart, lrEnd;
SendMessage(hEditWnd, EM_GETSEL, (WPARAM)&lrStart, (LPARAM)&lrEnd);
LRESULT lrLength = SendMessage(hEditWnd, WM_GETTEXTLENGTH, 0, 0);
CheckForScreenSpace(lstrlen((TCHAR*)lParam));
MoveToEnd();
SendMessage(hEditWnd, EM_REPLACESEL, 0, lParam);
return 0;
}
default:
return DefWindowProc(hwnd, uMsg, wParam, lParam);
}
}
static DWORD WINAPI InThrdProc(LPVOID lpParameter)
// This thread deals with input from the ML process.
{
while (1)
{
CHAR buff[4096];
DWORD dwRead;
if (!ReadFile(hReadFromML, buff, sizeof(buff) - 1, &dwRead, NULL))
return 0;
buff[dwRead] = 0;
if (! isActive) { ShowWindow(hMainWindow, nInitialShow); isActive = true; }
#ifdef UNICODE
// We need to write Unicode here. Convert it using the current code-page.
int wlen = MultiByteToWideChar(codePage, 0, buff, -1, NULL, 0);
if (wlen == 0) continue;
WCHAR *wBuff = new WCHAR[wlen];
wlen = MultiByteToWideChar(codePage, 0, buff, -1, wBuff, wlen);
SendMessage(hMainWindow, WM_ADDTEXT, 0, (LPARAM)wBuff);
delete[] wBuff;
#else
SendMessage(hMainWindow, WM_ADDTEXT, 0, (LPARAM)buff);
#endif
}
}
class WinGuiConsoleStream : public WinStream
{
public:
WinGuiConsoleStream() {}
virtual bool testForInput(TaskData *taskData, unsigned waitMilliSecs);
virtual bool testForOutput(TaskData *taskData, unsigned waitMilliSecs) {
unimplemented(taskData);
return false;
}
virtual size_t readStream(TaskData *taskData, byte *base, size_t length);
virtual int fileKind() {
return FILEKIND_TTY; // Treat it as a TTY i.e. an interactive input
}
virtual void closeEntry(TaskData *taskData) { } // Not closed
virtual bool canOutput(TaskData *taskData) {
return false;
}
virtual size_t writeStream(TaskData *taskData, byte *base, size_t length) {
unimplemented(taskData);
return 0;
}
};
bool WinGuiConsoleStream::testForInput(TaskData *taskData, unsigned waitMilliSecs)
{
if (!isActive) { ShowWindow(hMainWindow, nInitialShow); isActive = true; }
{
PLocker locker(&iOInterlock);
if (nAvailable != nReadPosn) return true;
}
if (waitMilliSecs != 0)
{
WaitHandle waiter(hInputEvent, waitMilliSecs); // Global event
processes->ThreadPauseForIO(taskData, &waiter);
}
return false; // It may actually be ready now.
}
size_t WinGuiConsoleStream::readStream(TaskData *taskData, byte *base, size_t length)
/* Read characters from the input. Only returns zero on EOF. */
{
unsigned nRes = 0;
if (!isActive) { ShowWindow(hMainWindow, nInitialShow); isActive = true; }
PLocker locker(&iOInterlock);
// Copy the available characters into the buffer.
while (nReadPosn != nAvailable && length-- > 0)
{
char ch;
ch = pchInputBuffer[nReadPosn];
if (ch == 4 || ch == 26)
{
// EOF character. We have to return this as
// a separate buffer of size zero so if we've
// already returned some characters we leave it till
// next time.
if (nRes == 0) if (++nReadPosn == nBuffLen) nReadPosn = 0;
break;
}
base[nRes++] = ch;
if (++nReadPosn == nBuffLen) nReadPosn = 0;
}
if (nAvailable == nReadPosn) ResetEvent(hInputEvent);
return nRes;
}
HANDLE createConsoleWindow(int nCmdShow)
{
WNDCLASSEX wndClass;
ATOM atClass;
// Allocate initial buffer space to maintain the invariants.
hInputEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
nBuffLen = 80;
pchInputBuffer = (char*)malloc(nBuffLen);
TCHAR pipeName[MAX_PATH];
newPipeName(pipeName);
hReadFromML =
CreateNamedPipe(pipeName, PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE,
PIPE_READMODE_BYTE | PIPE_WAIT | PIPE_REJECT_REMOTE_CLIENTS, 1, 4096, 4096, 0, NULL);
if (hReadFromML == INVALID_HANDLE_VALUE)
return INVALID_HANDLE_VALUE;
// We want to be able to inherit this handle.
SECURITY_ATTRIBUTES secure;
secure.nLength = sizeof(SECURITY_ATTRIBUTES);
secure.lpSecurityDescriptor = NULL;
secure.bInheritHandle = TRUE;
HANDLE hWriteToScreen =
CreateFile(pipeName, GENERIC_WRITE, 0, &secure, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
if (hWriteToScreen == INVALID_HANDLE_VALUE)
return INVALID_HANDLE_VALUE;
// Create a thread to manage the output from ML.
DWORD dwInId;
HANDLE hInThread = CreateThread(NULL, 0, InThrdProc, 0, 0, &dwInId);
if (hInThread == NULL)
return INVALID_HANDLE_VALUE;
CloseHandle(hInThread);
wndClass.cbSize = sizeof(wndClass);
wndClass.style = 0;
wndClass.lpfnWndProc = WndProc;
wndClass.cbClsExtra = 0;
wndClass.cbWndExtra = 0;
wndClass.hInstance = hApplicationInstance;
wndClass.hIcon = LoadIcon(hApplicationInstance, MAKEINTRESOURCE(IDI_ICON));
wndClass.hCursor = NULL; // For the moment
wndClass.hbrBackground = NULL; // For the moment
wndClass.lpszClassName = _T("PolyMLWindowClass");
wndClass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU);
wndClass.hIconSm = NULL; // For the moment
DWORD dwStyle = WS_OVERLAPPEDWINDOW;
if ((atClass = RegisterClassEx(&wndClass)) == 0)
return INVALID_HANDLE_VALUE;
// Initially created invisible.
hMainWindow = CreateWindow(
(LPTSTR)(intptr_t)atClass,
_T("Poly/ML"),
dwStyle,
CW_USEDEFAULT,
CW_USEDEFAULT,
CW_USEDEFAULT,
CW_USEDEFAULT,
NULL,
NULL, // handle to menu or child-window identifier
hApplicationInstance,
NULL // pointer to window-creation data
);
if (hMainWindow == NULL)
return INVALID_HANDLE_VALUE;
// Save this setting and only apply it when we actually
// read from or write to the main window. That way if we are
// actually using another window this will never get displayed.
nInitialShow = nCmdShow;
return hWriteToScreen;
}
WinStream *createConsoleStream()
{
return new WinGuiConsoleStream();
}
void closeConsole()
{
if (hInputEvent) CloseHandle(hInputEvent);
}
diff --git a/wininstall/polyicon/polyicon.vcxproj b/wininstall/polyicon/polyicon.vcxproj
index ea040674..fdfe35d7 100644
--- a/wininstall/polyicon/polyicon.vcxproj
+++ b/wininstall/polyicon/polyicon.vcxproj
@@ -1,521 +1,765 @@
+
+ Debug32in64
+ ARM64
+
Debug32in64
Win32
Debug32in64
x64
+
+ DebugInt32in64
+ ARM64
+
DebugInt32in64
Win32
DebugInt32in64
x64
+
+ Debug
+ ARM64
+
Debug
Win32
+
+ Int32in64Debug
+ ARM64
+
Int32in64Debug
Win32
Int32in64Debug
x64
+
+ Int32In64Release
+ ARM64
+
Int32In64Release
Win32
Int32In64Release
x64
+
+ Release32in64
+ ARM64
+
Release32in64
Win32
Release32in64
x64
+
+ ReleaseInt32in64
+ ARM64
+
ReleaseInt32in64
Win32
ReleaseInt32in64
x64
+
+ Release
+ ARM64
+
Release
Win32
Debug
x64
Release
x64
{D4DF6521-6183-4E24-A327-55C72519836E}
Win32Proj
polyicon
10.0
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
true
v142
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
false
v142
true
Unicode
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
true
v142
Unicode
+
+ Application
+ true
+ v142
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
Application
false
v142
true
Unicode
+
+ Application
+ false
+ v142
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
true
true
true
true
true
+
+ true
+
true
+
+ true
+
true
+
+ true
+
true
+
+ true
+
false
false
false
false
false
+
+ false
+
false
+
+ false
+
false
+
+ false
+
false
+
+ false
+
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
NotUsing
Level3
Disabled
WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+
+
NotUsing
Level3
Disabled
_DEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
+
+
+ NotUsing
+ Level3
+ Disabled
+ _DEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+
+
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
Level3
NotUsing
MaxSpeed
true
true
WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+ true
+ true
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+ true
+ true
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+ true
+ true
+
+
Level3
NotUsing
MaxSpeed
true
true
NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
Windows
true
true
true
+
+
+ Level3
+ NotUsing
+ MaxSpeed
+ true
+ true
+ NDEBUG;_WINDOWS;%(PreprocessorDefinitions)
+
+
+ Windows
+ true
+ true
+ true
+
+
\ No newline at end of file