v2.1.1.29520 - import fixing from sf

.gitignore

@@ -2,13 +2,19 @@
 # This .gitignore file was automatically created by Microsoft(R) Visual Studio.
 ################################################################################
 
+/.vs/OpenMcdf/v14
+/bin/Debug
+/sources/OpenMcdf/obj/Debug
+/Performance Test/obj/Debug
+/OpenMcdfExtensionsTest/obj/Debug
+/OpenMcdf.Extensions/obj/Debug
+/Memory Test/obj/Debug
+/sources/OpenMcdf.Extensions/obj/Debug
+/sources/Structured Storage Explorer/obj/Debug
 /Unit Test/obj/Debug
-/Unit Test/bin/Debug
 /TestResults
 /Structured Storage Explorer/obj/Debug
-/Structured Storage Explorer/bin/Debug
 /src/obj/Debug
-/src/bin/Debug
 /sources/Test/OpenMcdf.Test/obj/Debug
 /sources/Test/OpenMcdf.Test/bin/Debug
 /sources/Test/OpenMcdf.PerfTest/obj/Debug
@@ -17,16 +23,24 @@
 /sources/Test/OpenMcdf.MemTest/bin/Debug
 /sources/Test/OpenMcdf.Extensions.Test/obj/Debug
 /sources/Test/OpenMcdf.Extensions.Test/bin/Debug
-/sources/Structured Storage Explorer/obj/Debug
-/sources/OpenMcdf.Extensions/obj/Debug
-/sources/OpenMcdf/obj/Debug
-/Performance Test/obj/Debug
+/Unit Test/bin/Debug
+/Structured Storage Explorer/bin/Debug
+/src/bin/Debug
+/sources/Test/OpenMcdf.Test/obj/Release
+/sources/Test/OpenMcdf.Test/bin/Release
+/sources/Test/OpenMcdf.PerfTest/obj/Release
+/sources/Test/OpenMcdf.PerfTest/bin/Release
+/sources/Test/OpenMcdf.MemTest/obj/Release
+/sources/Test/OpenMcdf.MemTest/bin/Release
+/sources/Test/OpenMcdf.Extensions.Test/obj/Release
+/sources/Test/OpenMcdf.Extensions.Test/bin/Release
+/sources/Structured Storage Explorer/obj/Release
+/sources/OpenMcdf.Extensions/obj/Release
+/sources/OpenMcdf/obj/Release
 /Performance Test/bin/Debug
-/OpenMcdfExtensionsTest/obj/Debug
 /OpenMcdfExtensionsTest/bin/Debug
-/OpenMcdf.Extensions/obj/Debug
 /OpenMcdf.Extensions/bin/Debug
-/Memory Test/obj/Debug
 /Memory Test/bin/Debug
-/bin/Debug
-/.vs/OpenMcdf/v14
+/bin/Release/StructuredStorageXplorer
+/bin/Release/OpenMcdf.Extensions
+/bin/Release

LocalTestRun.testrunconfig

@@ -2,7 +2,7 @@
 <TestSettings name="Local Test Run" id="1b8d15cb-d73c-4828-8dff-c85f0b7c02af" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
   <Description>This is a default test run configuration for a local test run.</Description>
   <Deployment>
-    <DeploymentItem filename="TestFiles\" />
+    <DeploymentItem filename="sources\Test\TestFiles\" />
   </Deployment>
   <Execution hostProcessPlatform="MSIL">
     <TestTypeSpecific>

MakeRelease.cmd

@@ -1,5 +1 @@
-msbuild OpenMcdf.sln /property:Configuration=Release
-robocopy ./src NEW_RELEASE/src /MIR /xd bin obj
-robocopy ./src/bin/Release NEW_RELEASE *.*
-robocopy "./Structured Storage Explorer\bin\Release" NEW_RELEASE\StructuredStorageExplorer\ StucturedStorageExplorer.exe Be.Windows.Forms.HexBox.dll OpenMcdf.dll 
-robocopy ./ NEW_RELEASE "PRE_RELEASE_note.txt" "Release notes.txt" "Support.txt" "License.txt"
+msbuild OpenMcdf.sln /property:Configuration=Release

OpenMcdf.sln

@@ -7,37 +7,42 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
 		OpenMcdf.vsmdi = OpenMcdf.vsmdi
-		OpenMcdf2.vsmdi = OpenMcdf2.vsmdi
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFiles", "TestFiles", "{AC082D72-85BB-4FE8-AE0A-DB12A5729317}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFiles", "TestFiles", "{8DC8730A-F254-4848-B272-BDFFCB5FDC00}"
 	ProjectSection(SolutionItems) = preProject
-		TestFiles\2_MB-W.ppt = TestFiles\2_MB-W.ppt
-		TestFiles\BUG_16_.xls = TestFiles\BUG_16_.xls
-		TestFiles\CorruptedDoc_bug3547815.doc = TestFiles\CorruptedDoc_bug3547815.doc
-		TestFiles\CorruptedDoc_bug3547815_B.doc = TestFiles\CorruptedDoc_bug3547815_B.doc
-		TestFiles\CyclicFAT.cfs = TestFiles\CyclicFAT.cfs
-		TestFiles\MultipleStorage.cfs = TestFiles\MultipleStorage.cfs
-		TestFiles\MultipleStorage2.cfs = TestFiles\MultipleStorage2.cfs
-		TestFiles\MultipleStorage3.cfs = TestFiles\MultipleStorage3.cfs
-		TestFiles\MultipleStorage4.cfs = TestFiles\MultipleStorage4.cfs
-		TestFiles\report.xls = TestFiles\report.xls
-		TestFiles\report_name_fix.xls = TestFiles\report_name_fix.xls
+		sources\TestFiles\2_MB-W.ppt = sources\TestFiles\2_MB-W.ppt
+		sources\TestFiles\_thumbs_bug_24.db = sources\TestFiles\_thumbs_bug_24.db
+		sources\TestFiles\BUG_16_.xls = sources\TestFiles\BUG_16_.xls
+		sources\TestFiles\CorruptedDoc_bug3547815.doc = sources\TestFiles\CorruptedDoc_bug3547815.doc
+		sources\TestFiles\CorruptedDoc_bug3547815_B.doc = sources\TestFiles\CorruptedDoc_bug3547815_B.doc
+		sources\Test\TestFiles\CorruptedDoc_bug36.doc = sources\Test\TestFiles\CorruptedDoc_bug36.doc
+		sources\TestFiles\CyclicFAT.cfs = sources\TestFiles\CyclicFAT.cfs
+		sources\TestFiles\MultipleStorage.cfs = sources\TestFiles\MultipleStorage.cfs
+		sources\TestFiles\MultipleStorage2.cfs = sources\TestFiles\MultipleStorage2.cfs
+		sources\TestFiles\MultipleStorage3.cfs = sources\TestFiles\MultipleStorage3.cfs
+		sources\TestFiles\MultipleStorage4.cfs = sources\TestFiles\MultipleStorage4.cfs
+		sources\TestFiles\report.xls = sources\TestFiles\report.xls
+		sources\TestFiles\report_name_fix.xls = sources\TestFiles\report_name_fix.xls
+		sources\TestFiles\reportREAD.xls = sources\TestFiles\reportREAD.xls
+		sources\TestFiles\testbad.ole = sources\TestFiles\testbad.ole
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf", "src\OpenMcdf.csproj", "{56E15D4A-8A37-4C7C-BB44-FD59AFF220C1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf", "sources\OpenMcdf\OpenMcdf.csproj", "{56E15D4A-8A37-4C7C-BB44-FD59AFF220C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdfMemTest", "Memory Test\OpenMcdfMemTest.csproj", "{E2BAD82D-3040-462B-BAA2-6E608A9054F4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.Extensions", "sources\OpenMcdf.Extensions\OpenMcdf.Extensions.csproj", "{DB748C1D-D71C-442B-832D-2E33BE816CBB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdfPerfTest", "Performance Test\OpenMcdfPerfTest.csproj", "{7077508F-B313-4DF6-8855-4764911BE161}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructuredStorageExplorer", "sources\Structured Storage Explorer\StructuredStorageExplorer.csproj", "{4F6323A8-9C06-4D94-808F-EBD69B8370D7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdfTest", "Unit Test\OpenMcdfTest.csproj", "{FD339266-8842-40B4-9230-F8E84FC42AC2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{73814657-FC73-4066-AABD-86062F2A132E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructuredStorageExplorer", "Structured Storage Explorer\StructuredStorageExplorer.csproj", "{4F6323A8-9C06-4D94-808F-EBD69B8370D7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.Extensions.Test", "sources\Test\OpenMcdf.Extensions.Test\OpenMcdf.Extensions.Test.csproj", "{B9CB103F-0AA3-486D-9C9C-672924B6169C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.Extensions", "OpenMcdf.Extensions\OpenMcdf.Extensions.csproj", "{DB748C1D-D71C-442B-832D-2E33BE816CBB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.MemTest", "sources\Test\OpenMcdf.MemTest\OpenMcdf.MemTest.csproj", "{E2BAD82D-3040-462B-BAA2-6E608A9054F4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdfExtensionsTest", "OpenMcdfExtensionsTest\OpenMcdfExtensionsTest.csproj", "{B9CB103F-0AA3-486D-9C9C-672924B6169C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.PerfTest", "sources\Test\OpenMcdf.PerfTest\OpenMcdf.PerfTest.csproj", "{7077508F-B313-4DF6-8855-4764911BE161}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenMcdf.Test", "sources\Test\OpenMcdf.Test\OpenMcdf.Test.csproj", "{FD339266-8842-40B4-9230-F8E84FC42AC2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -49,6 +54,18 @@ Global
 		{56E15D4A-8A37-4C7C-BB44-FD59AFF220C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56E15D4A-8A37-4C7C-BB44-FD59AFF220C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56E15D4A-8A37-4C7C-BB44-FD59AFF220C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E2BAD82D-3040-462B-BAA2-6E608A9054F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E2BAD82D-3040-462B-BAA2-6E608A9054F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2BAD82D-3040-462B-BAA2-6E608A9054F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -61,24 +78,16 @@ Global
 		{FD339266-8842-40B4-9230-F8E84FC42AC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD339266-8842-40B4-9230-F8E84FC42AC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD339266-8842-40B4-9230-F8E84FC42AC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4F6323A8-9C06-4D94-808F-EBD69B8370D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB748C1D-D71C-442B-832D-2E33BE816CBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9CB103F-0AA3-486D-9C9C-672924B6169C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{AC082D72-85BB-4FE8-AE0A-DB12A5729317} = {6C619B4F-100F-4D60-BEF1-60B770D24E5E}
+		{8DC8730A-F254-4848-B272-BDFFCB5FDC00} = {73814657-FC73-4066-AABD-86062F2A132E}
+		{B9CB103F-0AA3-486D-9C9C-672924B6169C} = {73814657-FC73-4066-AABD-86062F2A132E}
+		{E2BAD82D-3040-462B-BAA2-6E608A9054F4} = {73814657-FC73-4066-AABD-86062F2A132E}
+		{7077508F-B313-4DF6-8855-4764911BE161} = {73814657-FC73-4066-AABD-86062F2A132E}
+		{FD339266-8842-40B4-9230-F8E84FC42AC2} = {73814657-FC73-4066-AABD-86062F2A132E}
 	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = OpenMcdf2.vsmdi

Html Help/OpenMcdfHelp.shfbproj → sources/Html Help/OpenMcdfHelp.shfbproj

@@ -1,29 +1,30 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
   <PropertyGroup>
-    <!-- The configuration and platform will be used to determine which
-         assemblies to include from solution and project documentation
+    <!-- The configuration and platform will be used to determine which
+         assemblies to include from solution and project documentation
          sources -->
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{6b2e0fe5-8246-4f87-9663-d72ebadfc53f}</ProjectGuid>
-    <SHFBSchemaVersion>1.8.0.0</SHFBSchemaVersion>
-    <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
+    <SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
+    <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
     <RootNamespace>Documentation</RootNamespace>
     <Name>Documentation</Name>
     <!-- SHFB properties -->
     <OutputPath>.\Help\</OutputPath>
     <HtmlHelpName>OpenMCDF</HtmlHelpName>
-    <CopyrightText>Copyright 2010 - 2012 &amp;#169%3b Federico Blaseotto</CopyrightText>
+    <CopyrightText>Copyright 2010 - 2016 &amp;#169%3b Federico Blaseotto</CopyrightText>
     <FooterText>Open MCDF</FooterText>
     <HeaderText>Open MCDF</HeaderText>
     <HelpTitle>Open MCDF</HelpTitle>
     <MissingTags>Summary, AutoDocumentCtors</MissingTags>
     <DocumentationSources>
-      <DocumentationSource sourceFile="..\OLECompoundFileStorage\bin\Release\OpenMcdf.dll" />
-<DocumentationSource sourceFile="..\OLECompoundFileStorage\bin\Release\OpenMcdf.XML" /></DocumentationSources>
+      <DocumentationSource sourceFile="..\..\bin\Release\OpenMcdf\OpenMcdf 2.1.0.33051\OpenMcdf.dll" />
+<DocumentationSource sourceFile="..\..\bin\Release\OpenMcdf\OpenMcdf 2.1.0.33051\OpenMcdf.xml" /></DocumentationSources>
     <FeedbackEMailAddress>ironfede%40users.sourceforge.net</FeedbackEMailAddress>
     <BuildLogFile>
     </BuildLogFile>
@@ -35,26 +36,40 @@
     </SandcastlePath>
     <WorkingPath>
     </WorkingPath>
-    <PresentationStyle>Prototype</PresentationStyle>
+    <PresentationStyle>VS2013</PresentationStyle>
     <Language>en-US</Language>
     <NamespaceSummaries>
       <NamespaceSummaryItem name="BinaryTrees" isDocumented="False" xmlns="" />
       <NamespaceSummaryItem name="RBTree" isDocumented="False" xmlns="" />
     </NamespaceSummaries>
     <VisibleItems>InheritedMembers, InheritedFrameworkMembers</VisibleItems>
     <ApiFilter>
-      <Filter entryType="Namespace" fullName="BinaryTrees" isExposed="False" />
       <Filter entryType="Namespace" fullName="OpenMcdf" isExposed="True">
-        <Filter entryType="Enumeration" fullName="OpenMcdf.StgColor" filterName="StgColor" isExposed="False" />
-        <Filter entryType="Enumeration" fullName="OpenMcdf.StgType" filterName="StgType" isExposed="False" />
-        <Filter entryType="Delegate" fullName="OpenMcdf.Ver3SizeLimitReached" filterName="Ver3SizeLimitReached" isExposed="False" />
-      </Filter>
-      <Filter entryType="Namespace" fullName="RBTree" isExposed="False" />
-    </ApiFilter>
-    <HelpFileVersion>1.5.4.0</HelpFileVersion>
+  <Filter entryType="Enumeration" fullName="OpenMcdf.StgColor" filterName="StgColor" isExposed="False" />
+  <Filter entryType="Enumeration" fullName="OpenMcdf.StgType" filterName="StgType" isExposed="False" />
+  <Filter entryType="Delegate" fullName="OpenMcdf.Ver3SizeLimitReached" filterName="Ver3SizeLimitReached" isExposed="False" />
+</Filter>
+<Filter entryType="Namespace" fullName="RedBlackTree" isExposed="False" /></ApiFilter>
+    <HelpFileVersion>2.1</HelpFileVersion>
     <CollectionTocStyle>Hierarchical</CollectionTocStyle>
+    <MaximumGroupParts>2</MaximumGroupParts>
+    <NamespaceGrouping>False</NamespaceGrouping>
+    <SyntaxFilters>C#</SyntaxFilters>
+    <SdkLinkTarget>Blank</SdkLinkTarget>
+    <RootNamespaceContainer>False</RootNamespaceContainer>
+    <Preliminary>False</Preliminary>
+    <NamingMethod>Guid</NamingMethod>
+    <ContentPlacement>AboveNamespaces</ContentPlacement>
+    <BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
+    <HelpFileFormat>HtmlHelp1</HelpFileFormat>
+    <IndentHtml>False</IndentHtml>
+    <FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
+    <KeepLogFile>True</KeepLogFile>
+    <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
+    <CppCommentsFixup>False</CppCommentsFixup>
+    <CleanIntermediates>True</CleanIntermediates>
   </PropertyGroup>
-  <!-- There are no properties for these two groups but they need to appear in
+  <!-- There are no properties for these two groups but they need to appear in
        order for Visual Studio to perform the build. -->
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>