XlsFile2 bug 21744

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63912 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeXlsFile/ASCOfficeXlsFile_2005.sln

@@ -2,13 +2,13 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeXlsFile", "ASCXlsFile\ASCXlsFile_2005.vcproj", "{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{210CA046-BD12-4711-95E6-AF4F35AB3E61} = {210CA046-BD12-4711-95E6-AF4F35AB3E61}
+	EndProjectSection
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
-	ProjectSection(ProjectDependencies) = postProject
-		{210CA046-BD12-4711-95E6-AF4F35AB3E61} = {210CA046-BD12-4711-95E6-AF4F35AB3E61}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "ASCWorksheetConverter\source\main\EWSCore_2005.vcproj", "{210CA046-BD12-4711-95E6-AF4F35AB3E61}"
 	ProjectSection(WebsiteProperties) = preProject
@@ -16,25 +16,50 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EWSCore", "ASCWorksheetConv
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeXlsFileTest", "ASCOfficeXlsFileTest\ASCOfficeXlsFileTest.vcproj", "{C2882DDD-07E6-4314-AD4B-48F43F38D722}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D} = {E83B5FA5-ACDD-46F5-8E35-B19F398C806D}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 		ReleaseASC|Win32 = ReleaseASC|Win32
+		ReleaseASC|x64 = ReleaseASC|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Debug|Win32.Build.0 = Debug|Win32
+		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Debug|x64.ActiveCfg = Debug|Win32
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Release|Win32.ActiveCfg = Release|Win32
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Release|Win32.Build.0 = Release|Win32
+		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.Release|x64.ActiveCfg = Release|Win32
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
 		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
+		{E83B5FA5-ACDD-46F5-8E35-B19F398C806D}.ReleaseASC|x64.ActiveCfg = ReleaseASC|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Debug|Win32.ActiveCfg = Debug|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Debug|Win32.Build.0 = Debug|Win32
+		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Debug|x64.ActiveCfg = Debug|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Release|Win32.ActiveCfg = Release|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Release|Win32.Build.0 = Release|Win32
+		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.Release|x64.ActiveCfg = Release|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
 		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
+		{210CA046-BD12-4711-95E6-AF4F35AB3E61}.ReleaseASC|x64.ActiveCfg = ReleaseASC|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|Win32.Build.0 = Debug|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.ActiveCfg = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Debug|x64.Build.0 = Debug|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.ActiveCfg = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|Win32.Build.0 = Release|Win32
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.ActiveCfg = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.Release|x64.Build.0 = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.ReleaseASC|Win32.ActiveCfg = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.ReleaseASC|x64.ActiveCfg = Release|x64
+		{C2882DDD-07E6-4314-AD4B-48F43F38D722}.ReleaseASC|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ASCOfficeXlsFile/ASCWorksheetConverter/source/XLS_logic/Biff_structures/PtgFuncVar.cpp

@@ -57,6 +57,8 @@ void PtgFuncVar::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, MSXML
 	{
 		--nparams;
 	}
+	int sz = ptg_stack.size();
+
 	if(nparams)
 	{
 		arguments += ptg_stack.top();

ASCOfficeXlsFile/ASCWorksheetConverter/source/XLS_logic/Biff_structures/URLMoniker.cpp

@@ -51,7 +51,8 @@ void URLMoniker::store(XLS::CFRecord& record)
 void URLMoniker::load(XLS::CFRecord& record)
 {
 	DWORD length;
-	record >> length >> url;
+	record >> length;
+	record >> url;
 
 	if(!record.isEOF())
 	{

ASCOfficeXlsFile/ASCWorksheetConverter/source/main/EWSCore_2005.vcproj

@@ -46,10 +46,10 @@
 				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories=""$(SolutionDir)ASCWorksheetConverter\source""
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_AFXDLL"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				StructMemberAlignment="0"
 				TreatWChar_tAsBuiltInType="true"
 				UsePrecompiledHeader="2"
@@ -125,7 +125,7 @@
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories=""$(SolutionDir)ASCWorksheetConverter\source""
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"

ASCOfficeXlsFile/ASCXlsFile/ASCXlsFile_2005.vcproj

@@ -56,7 +56,7 @@
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				WarnAsError="true"
@@ -78,7 +78,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				AdditionalDependencies="uafxcwd.lib LIBCMTD.lib EWSCore.res"
+				AdditionalDependencies="EWSCore.res"
 				OutputFile="$(OutDir)/$(ProjectName).dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../ASCWorksheetConverter/lib/$(ConfigurationName)&quot;"
@@ -158,7 +158,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="..\ASCWorksheetConverter\source\Document"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="0"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
 				WarnAsError="true"