+ + + + + + True + + + + diff -Nru openmcdf-1.5.2/sample structured storage eXplorer/Readme.txt openmcdf-1.5.4/sample structured storage eXplorer/Readme.txt --- openmcdf-1.5.2/sample structured storage eXplorer/Readme.txt 2011-04-09 12:49:34.000000000 +0000 +++ openmcdf-1.5.4/sample structured storage eXplorer/Readme.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -Sample Structured Storage explorer source code is located in main src directory of the distribution as TESTOpenMCDF subdirectory. - --- -This application has to be considered ONLY a sample and NOT a production tool. \ No newline at end of file diff -Nru openmcdf-1.5.2/src/Html Help/OpenMcdfHelp.shfbproj openmcdf-1.5.4/src/Html Help/OpenMcdfHelp.shfbproj --- openmcdf-1.5.2/src/Html Help/OpenMcdfHelp.shfbproj 2011-04-09 12:55:10.000000000 +0000 +++ openmcdf-1.5.4/src/Html Help/OpenMcdfHelp.shfbproj 2012-10-24 21:24:56.000000000 +0000 @@ -16,7 +16,7 @@ .\Help\ OpenMCDF - Copyright 2010 - 2011 &#169%3b Federico Blaseotto + Copyright 2010 - 2012 &#169%3b Federico Blaseotto Open MCDF Open MCDF Open MCDF @@ -45,13 +45,14 @@ InheritedMembers, InheritedFrameworkMembers - - - - - - - 1.5.1.0 + + + + + + + + 1.5.3.0 Hierarchical + \ No newline at end of file diff -Nru openmcdf-1.5.2/src/OpenMcdfPerfTest/Program.cs openmcdf-1.5.4/src/OpenMcdfPerfTest/Program.cs --- openmcdf-1.5.2/src/OpenMcdfPerfTest/Program.cs 1970-01-01 00:00:00.000000000 +0000 +++ openmcdf-1.5.4/src/OpenMcdfPerfTest/Program.cs 2012-10-24 21:22:36.000000000 +0000 @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Text; +using OpenMcdf; +using System.IO; + +namespace OpenMcdfPerfTest +{ + class Program + { + static int MAX_STREAM_COUNT = 1000; + static String fileName = "PerfLoad.cfs"; + + static void Main(string[] args) + { + File.Delete(fileName); + if (!File.Exists(fileName)) + { + CreateFile(fileName); + } + + CompoundFile cf = new CompoundFile(fileName); + DateTime dt = DateTime.Now; + CFStream s = cf.RootStorage.GetStream("Test1"); + TimeSpan ts = DateTime.Now.Subtract(dt); + Console.WriteLine(ts.TotalMilliseconds.ToString()); + Console.Read(); + } + + private static void CreateFile(String fn) + { + CompoundFile cf = new CompoundFile(); + for (int i = 0; i < MAX_STREAM_COUNT; i++) + { + cf.RootStorage.AddStream("Test" + i.ToString()).SetData(Helpers.GetBuffer(300)); + } + cf.Save(fileName); + cf.Close(); + } + } +} diff -Nru openmcdf-1.5.2/src/OpenMcdfPerfTest/Properties/AssemblyInfo.cs openmcdf-1.5.4/src/OpenMcdfPerfTest/Properties/AssemblyInfo.cs --- openmcdf-1.5.2/src/OpenMcdfPerfTest/Properties/AssemblyInfo.cs 1970-01-01 00:00:00.000000000 +0000 +++ openmcdf-1.5.4/src/OpenMcdfPerfTest/Properties/AssemblyInfo.cs 2012-10-24 21:22:38.000000000 +0000 @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("OpenMcdfPerfTest")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("-")] +[assembly: AssemblyProduct("OpenMcdfPerfTest")] +[assembly: AssemblyCopyright("Copyright © - 2012")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("c3a84d86-d1be-4fdc-8294-169e1f6747d8")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.Designer.cs openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.Designer.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.Designer.cs 2011-04-09 12:33:20.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.Designer.cs 2012-10-24 21:24:34.000000000 +0000 @@ -29,9 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.btnOpenFile = new System.Windows.Forms.Button(); this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog(); - this.tbFileName = new System.Windows.Forms.TextBox(); this.treeView1 = new System.Windows.Forms.TreeView(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.importDataStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -42,54 +40,46 @@ this.saveFileDialog1 = new System.Windows.Forms.SaveFileDialog(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.openFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.closeStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.updateCurrentFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tmCommitEnabled = new System.Windows.Forms.ToolStripMenuItem(); + this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openDataFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.newStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.fileNameLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.propertyGrid1 = new System.Windows.Forms.PropertyGrid(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.hexEditor = new Be.Windows.Forms.HexBox(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); + this.statusStrip1.SuspendLayout(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); this.SuspendLayout(); // - // btnOpenFile - // - this.btnOpenFile.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOpenFile.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnOpenFile.Location = new System.Drawing.Point(495, 38); - this.btnOpenFile.Name = "btnOpenFile"; - this.btnOpenFile.Size = new System.Drawing.Size(75, 23); - this.btnOpenFile.TabIndex = 0; - this.btnOpenFile.Text = "Open file..."; - this.btnOpenFile.UseVisualStyleBackColor = true; - this.btnOpenFile.Click += new System.EventHandler(this.btnOpenFile_Click); - // // openFileDialog1 // this.openFileDialog1.Filter = "Office files (*.xls *.doc *.ppt)|*.xls;*.doc;*.ppt|Thumbs db files (Thumbs.db)|*." + "db|MSI Setup files (*.msi)|*.msi|All files (*.*)|*.*"; this.openFileDialog1.Title = "Open OLE Structured Storae file"; // - // tbFileName - // - this.tbFileName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tbFileName.Enabled = false; - this.tbFileName.Location = new System.Drawing.Point(12, 40); - this.tbFileName.Name = "tbFileName"; - this.tbFileName.Size = new System.Drawing.Size(477, 20); - this.tbFileName.TabIndex = 2; - // // treeView1 // - this.treeView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.treeView1.ContextMenuStrip = this.contextMenuStrip1; - this.treeView1.Location = new System.Drawing.Point(12, 67); + this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; + this.treeView1.HideSelection = false; + this.treeView1.Location = new System.Drawing.Point(0, 0); this.treeView1.Name = "treeView1"; - this.treeView1.Size = new System.Drawing.Size(558, 274); + this.treeView1.Size = new System.Drawing.Size(241, 240); this.treeView1.TabIndex = 4; + this.treeView1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.treeView1_MouseUp); // // contextMenuStrip1 // @@ -141,7 +131,7 @@ // saveFileDialog1 // this.saveFileDialog1.DefaultExt = "*.bin"; - this.saveFileDialog1.Filter = "Exported data files (*.bin) | *.bin|All files (*.*)|*.*"; + this.saveFileDialog1.Filter = "Exported data files (*.bin)|*.bin|All files (*.*)|*.*"; // // menuStrip1 // @@ -149,66 +139,150 @@ this.fileToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(582, 24); + this.menuStrip1.Size = new System.Drawing.Size(729, 24); this.menuStrip1.TabIndex = 5; this.menuStrip1.Text = "menuStrip1"; // // fileToolStripMenuItem // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.openFileMenuItem, this.newStripMenuItem1, - this.tmCommitEnabled, + this.closeStripMenuItem1, + this.toolStripSeparator2, this.updateCurrentFileToolStripMenuItem, - this.toolStripSeparator1, this.saveAsToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); this.fileToolStripMenuItem.Text = "File"; // + // openFileMenuItem + // + this.openFileMenuItem.Image = global::StructuredStorageExplorer.Properties.Resources.folder; + this.openFileMenuItem.Name = "openFileMenuItem"; + this.openFileMenuItem.Size = new System.Drawing.Size(179, 22); + this.openFileMenuItem.Text = "Open..."; + this.openFileMenuItem.Click += new System.EventHandler(this.openFileMenuItem_Click); + // + // newStripMenuItem1 + // + this.newStripMenuItem1.Image = global::StructuredStorageExplorer.Properties.Resources.page_white; + this.newStripMenuItem1.Name = "newStripMenuItem1"; + this.newStripMenuItem1.Size = new System.Drawing.Size(179, 22); + this.newStripMenuItem1.Text = "New Compound File"; + this.newStripMenuItem1.Click += new System.EventHandler(this.newStripMenuItem1_Click); + // + // closeStripMenuItem1 + // + this.closeStripMenuItem1.Name = "closeStripMenuItem1"; + this.closeStripMenuItem1.Size = new System.Drawing.Size(179, 22); + this.closeStripMenuItem1.Text = "Close file"; + this.closeStripMenuItem1.Click += new System.EventHandler(this.closeStripMenuItem1_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(176, 6); + // + // updateCurrentFileToolStripMenuItem + // + this.updateCurrentFileToolStripMenuItem.Image = global::StructuredStorageExplorer.Properties.Resources.disk; + this.updateCurrentFileToolStripMenuItem.Name = "updateCurrentFileToolStripMenuItem"; + this.updateCurrentFileToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.updateCurrentFileToolStripMenuItem.Text = "Save"; + this.updateCurrentFileToolStripMenuItem.Click += new System.EventHandler(this.updateCurrentFileToolStripMenuItem_Click); + // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(190, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(179, 22); this.saveAsToolStripMenuItem.Text = "Save As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // - // toolStripSeparator1 + // statusStrip1 // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(187, 6); + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileNameLabel}); + this.statusStrip1.Location = new System.Drawing.Point(0, 509); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(729, 22); + this.statusStrip1.TabIndex = 6; + this.statusStrip1.Text = "statusStrip1"; // - // updateCurrentFileToolStripMenuItem + // fileNameLabel // - this.updateCurrentFileToolStripMenuItem.Enabled = false; - this.updateCurrentFileToolStripMenuItem.Name = "updateCurrentFileToolStripMenuItem"; - this.updateCurrentFileToolStripMenuItem.Size = new System.Drawing.Size(190, 22); - this.updateCurrentFileToolStripMenuItem.Text = "Update current file"; - this.updateCurrentFileToolStripMenuItem.Click += new System.EventHandler(this.updateCurrentFileToolStripMenuItem_Click); + this.fileNameLabel.Name = "fileNameLabel"; + this.fileNameLabel.Size = new System.Drawing.Size(0, 17); // - // tmCommitEnabled + // splitContainer1 // - this.tmCommitEnabled.CheckOnClick = true; - this.tmCommitEnabled.Name = "tmCommitEnabled"; - this.tmCommitEnabled.Size = new System.Drawing.Size(190, 22); - this.tmCommitEnabled.Text = "Update mode enabled"; - this.tmCommitEnabled.Click += new System.EventHandler(this.tmCommitEnabled_Click); + this.splitContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // - // newStripMenuItem1 + // splitContainer1.Panel1 // - this.newStripMenuItem1.Name = "newStripMenuItem1"; - this.newStripMenuItem1.Size = new System.Drawing.Size(190, 22); - this.newStripMenuItem1.Text = "New Compound File"; - this.newStripMenuItem1.Click += new System.EventHandler(this.newStripMenuItem1_Click); + this.splitContainer1.Panel1.Controls.Add(this.treeView1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.propertyGrid1); + this.splitContainer1.Size = new System.Drawing.Size(243, 485); + this.splitContainer1.SplitterDistance = 242; + this.splitContainer1.TabIndex = 5; + // + // propertyGrid1 + // + this.propertyGrid1.Dock = System.Windows.Forms.DockStyle.Fill; + this.propertyGrid1.Location = new System.Drawing.Point(0, 0); + this.propertyGrid1.Name = "propertyGrid1"; + this.propertyGrid1.Size = new System.Drawing.Size(241, 237); + this.propertyGrid1.TabIndex = 0; + this.propertyGrid1.ToolbarVisible = false; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.Location = new System.Drawing.Point(0, 24); + this.splitContainer2.Name = "splitContainer2"; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer1); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.hexEditor); + this.splitContainer2.Size = new System.Drawing.Size(729, 485); + this.splitContainer2.SplitterDistance = 243; + this.splitContainer2.TabIndex = 7; + // + // hexEditor + // + this.hexEditor.BackColor = System.Drawing.Color.WhiteSmoke; + this.hexEditor.Dock = System.Windows.Forms.DockStyle.Fill; + this.hexEditor.Font = new System.Drawing.Font("Courier New", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.hexEditor.LineInfoForeColor = System.Drawing.Color.Empty; + this.hexEditor.LineInfoVisible = true; + this.hexEditor.Location = new System.Drawing.Point(0, 0); + this.hexEditor.Name = "hexEditor"; + this.hexEditor.ShadowSelectionColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(60)))), ((int)(((byte)(188)))), ((int)(((byte)(255))))); + this.hexEditor.Size = new System.Drawing.Size(482, 485); + this.hexEditor.StringViewVisible = true; + this.hexEditor.TabIndex = 0; + this.hexEditor.UseFixedBytesPerLine = true; + this.hexEditor.VScrollBarVisible = true; // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(582, 382); + this.ClientSize = new System.Drawing.Size(729, 531); + this.Controls.Add(this.splitContainer2); + this.Controls.Add(this.statusStrip1); this.Controls.Add(this.menuStrip1); - this.Controls.Add(this.treeView1); - this.Controls.Add(this.tbFileName); - this.Controls.Add(this.btnOpenFile); this.MainMenuStrip = this.menuStrip1; this.Name = "MainForm"; this.Text = "Structured Storage eXplorer"; @@ -216,6 +290,14 @@ this.contextMenuStrip1.ResumeLayout(false); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel2.ResumeLayout(false); + this.splitContainer2.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -223,9 +305,7 @@ #endregion - private System.Windows.Forms.Button btnOpenFile; private System.Windows.Forms.OpenFileDialog openFileDialog1; - private System.Windows.Forms.TextBox tbFileName; private System.Windows.Forms.TreeView treeView1; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; private System.Windows.Forms.ToolStripMenuItem exportDataToolStripMenuItem; @@ -234,14 +314,21 @@ private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveAsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem tmCommitEnabled; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripMenuItem updateCurrentFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem addStreamToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importDataStripMenuItem1; private System.Windows.Forms.OpenFileDialog openDataFileDialog; private System.Windows.Forms.ToolStripMenuItem addStorageStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem newStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem openFileMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel fileNameLabel; + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.PropertyGrid propertyGrid1; + private System.Windows.Forms.SplitContainer splitContainer2; + private Be.Windows.Forms.HexBox hexEditor; + private System.Windows.Forms.ToolStripMenuItem closeStripMenuItem1; } } diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.cs openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.cs 2011-04-09 12:33:20.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.cs 2012-10-24 21:24:38.000000000 +0000 @@ -10,15 +10,22 @@ using System.Resources; using System.Globalization; using StructuredStorageExplorer.Properties; +using Be.Windows.Forms; // Author Federico Blaseotto namespace StructuredStorageExplorer { - // Sample Structured Storage viewer to - // demonstrate use of OpenMCDF + + ///

+ /// Sample Structured Storage viewer to + /// demonstrate use of OpenMCDF + ///

public partial class MainForm : Form { + private CompoundFile cf; + private FileStream fs; + public MainForm() { InitializeComponent(); @@ -32,47 +39,28 @@ treeView1.ImageList.Images.Add(streamImage); saveAsToolStripMenuItem.Enabled = false; - } + updateCurrentFileToolStripMenuItem.Enabled = false; - private CompoundFile cf; - private FileStream fs; + } - private void btnOpenFile_Click(object sender, EventArgs e) - { - if (openFileDialog1.ShowDialog() == DialogResult.OK) - { - try - { - OpenFile(); - } - catch - { - } - } - } private void OpenFile() { if (!String.IsNullOrEmpty(openFileDialog1.FileName)) { - if (cf != null) - cf.Close(); - - if (fs != null) - fs.Close(); + CloseCurrentFile(); treeView1.Nodes.Clear(); - tbFileName.Text = openFileDialog1.FileName; - LoadFile(openFileDialog1.FileName, tmCommitEnabled.Checked); + fileNameLabel.Text = openFileDialog1.FileName; + LoadFile(openFileDialog1.FileName, true); canUpdate = true; saveAsToolStripMenuItem.Enabled = true; + updateCurrentFileToolStripMenuItem.Enabled = true; } } - private bool canUpdate = false; - - private void CreateNewFile() + private void CloseCurrentFile() { if (cf != null) cf.Close(); @@ -80,13 +68,25 @@ if (fs != null) fs.Close(); - tbFileName.Text = String.Empty; + treeView1.Nodes.Clear(); + fileNameLabel.Text = String.Empty; + saveAsToolStripMenuItem.Enabled = false ; + updateCurrentFileToolStripMenuItem.Enabled = false; + + propertyGrid1.SelectedObject = null; + hexEditor.ByteProvider = null; + } + + private bool canUpdate = false; + + private void CreateNewFile() + { + CloseCurrentFile(); cf = new CompoundFile(); canUpdate = false; saveAsToolStripMenuItem.Enabled = true; - tmCommitEnabled.Enabled = false; updateCurrentFileToolStripMenuItem.Enabled = false; RefreshTree(); @@ -99,6 +99,7 @@ TreeNode root = null; root = treeView1.Nodes.Add("Root Entry", "Root"); root.ImageIndex = 0; + root.Tag = cf.RootStorage; //Recursive function to get all storage and streams AddNodes(root, cf.RootStorage); @@ -126,12 +127,11 @@ //Load file if (enableCommit) { - cf = new CompoundFile(fs, UpdateMode.Update, true, true); + cf = new CompoundFile(fs, UpdateMode.Update, true, true, false); } else { cf = new CompoundFile(fs); - } RefreshTree(); @@ -139,6 +139,7 @@ catch (Exception ex) { treeView1.Nodes.Clear(); + fileNameLabel.Text = String.Empty; MessageBox.Show("Internal error: " + ex.Message, "ERROR", MessageBoxButtons.OK, MessageBoxIcon.Error); } } @@ -152,13 +153,21 @@ { VisitedEntryAction va = delegate(CFItem target) { - TreeNode temp = node.Nodes.Add(target.Name, target.Name + (target is CFStorage ? "" : " (" + target.Size + " bytes )")); - - //Stream - temp.ImageIndex = 1; - temp.SelectedImageIndex = 1; + TreeNode temp = node.Nodes.Add( + target.Name, + target.Name + (target.IsStream ? " (" + target.Size + " bytes )" : "") + ); + + temp.Tag = target; + + if (target.IsStream) + { + //Stream + temp.ImageIndex = 1; + temp.SelectedImageIndex = 1; - if (target is CFStorage) + } + else { //Storage temp.ImageIndex = 0; @@ -178,27 +187,21 @@ private void exportDataToolStripMenuItem_Click(object sender, EventArgs e) { //No export if storage - if (treeView1.SelectedNode == null || treeView1.SelectedNode.ImageIndex < 1) + if (treeView1.SelectedNode == null || !((CFItem)treeView1.SelectedNode.Tag).IsStream) { MessageBox.Show("Only stream data can be exported", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); return; } - //Remove size indicator from node path - int index = treeView1.SelectedNode.FullPath.IndexOf(" (", 0); - string path = treeView1.SelectedNode.FullPath.Remove(index); - - // Get the parts to navigate - string[] pathParts = path.Split('\\'); - + CFStream target = (CFStream)treeView1.SelectedNode.Tag; // A lot of stream and storage have only non-printable characters. // We need to sanitize filename. String sanitizedFileName = String.Empty; - foreach (char c in pathParts[pathParts.Length - 1]) + foreach (char c in target.Name) { if ( Char.GetUnicodeCategory(c) == UnicodeCategory.LetterNumber @@ -218,25 +221,12 @@ if (saveFileDialog1.ShowDialog() == DialogResult.OK) { + FileStream fs = null; - CompoundFile cf = null; - BinaryWriter bw = null; try { - cf = new CompoundFile(openFileDialog1.FileName); - CFStorage r = cf.RootStorage; - - //Navigate into the storage, following path parts - for (int i = 1; i < pathParts.Length - 1; i++) - { - r = r.GetStorage(pathParts[i]); - } - - CFStream st = r.GetStream(pathParts[pathParts.Length - 1]); - bw = new BinaryWriter(new FileStream(saveFileDialog1.FileName, FileMode.Create, FileAccess.Write, FileShare.None)); - bw.Write(st.GetData()); - - + fs = new FileStream(saveFileDialog1.FileName, FileMode.CreateNew, FileAccess.ReadWrite); + fs.Write(target.GetData(), 0, (int)target.Size); } catch (Exception ex) { @@ -245,179 +235,41 @@ } finally { - if (bw != null) + if (fs != null) { - bw.Flush(); - bw.Close(); + fs.Flush(); + fs.Close(); + fs = null; } - - if (cf != null) - cf.Close(); } } } - private String SelectedItemName() - { - //Remove size indicator from node path - string path = treeView1.SelectedNode.FullPath; - int index = treeView1.SelectedNode.FullPath.IndexOf(" (", 0); - - if (index != -1) - path = path.Remove(index); - - // Get the parts to navigate - string[] pathParts = path.Split('\\'); - return pathParts[pathParts.Length - 1]; - - } - - - private CFStorage SelectedStorage(bool getSelectedParent) - { - CFStorage result = null; - - //Remove size indicator from node path - string path = treeView1.SelectedNode.FullPath; - int index = treeView1.SelectedNode.FullPath.IndexOf(" (", 0); - - if (index != -1) - path = path.Remove(index); - - // Get the parts to navigate - string[] pathParts = path.Split('\\'); - - try - { - result = cf.RootStorage; - - int navTo = getSelectedParent ? pathParts.Length - 1 : pathParts.Length; - - //Navigate into the storage, following path parts - for (int i = 1; i < navTo; i++) - { - if (result.IsStorage || result.IsRoot) - result = result.GetStorage(pathParts[i]); - } - } - catch - { - MessageBox.Show("Please, select a node"); - - result = null; - } - - return result; - } - - private CFItem SelectedStream(bool getParent) - { - CFItem result = null; - CFStorage strg = null; - - //Remove size indicator from node path - string path = treeView1.SelectedNode.FullPath; - int index = treeView1.SelectedNode.FullPath.IndexOf(" (", 0); - - if (index != -1) - path = path.Remove(index); - - // Get the parts to navigate - string[] pathParts = path.Split('\\'); - - try - { - strg = cf.RootStorage; - int navTo = getParent ? pathParts.Length - 1 : pathParts.Length; - - //Navigate into the storage, following path parts - for (int i = 1; i < navTo; i++) - { - if (strg.IsStorage || strg.IsRoot) - strg = strg.GetStorage(pathParts[i]); - } - - if (getParent) - result = strg; - else - result = strg.GetStream(pathParts[pathParts.Length - 1]); - } - catch (Exception ex) - { - result = null; - } - - return result; - } - - private CFItem SelectedItem(bool getParent) - { - if (treeView1.SelectedNode == null) return null; - - if (treeView1.SelectedNode.ImageIndex == 0) - return SelectedStorage(getParent); - else - return SelectedStream(getParent); - } - private void removeToolStripMenuItem_Click(object sender, EventArgs e) { - if (!tmCommitEnabled.Checked) - { - MessageBox.Show("Removal is supported only in update mode", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return; - } - - CFStorage selectedItem = SelectedItem(true) as CFStorage; - - if (selectedItem != null && (selectedItem.IsStorage || selectedItem.IsRoot)) - selectedItem.Delete(SelectedItemName()); + TreeNode n = treeView1.SelectedNode; + ((CFStorage)n.Parent.Tag).Delete(n.Name); RefreshTree(); - - } private void saveAsToolStripMenuItem_Click(object sender, EventArgs e) { + saveFileDialog1.FilterIndex = 2; if (saveFileDialog1.ShowDialog() == DialogResult.OK) { cf.Save(saveFileDialog1.FileName); } } - private bool firstTimeChecked = true; - - private void tmCommitEnabled_Click(object sender, EventArgs e) - { - firstTimeChecked = Properties.Settings.Default.CommitEnabled; - - if (firstTimeChecked) - { - if (MessageBox.Show("Enabling update mode could lead to unwanted loss of data. Are you sure to continue ?", "Update mode is going to be enabled", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes) - { - - Settings.Default.CommitEnabled = false; - Settings.Default.Save(); - - } - else - { - - tmCommitEnabled.CheckState = CheckState.Unchecked; - return; - } - } - - this.updateCurrentFileToolStripMenuItem.Enabled = tmCommitEnabled.Checked; - - OpenFile(); - } - private void updateCurrentFileToolStripMenuItem_Click(object sender, EventArgs e) { if (canUpdate) + { + if (hexEditor.ByteProvider != null && hexEditor.ByteProvider.HasChanges()) + hexEditor.ByteProvider.ApplyChanges(); cf.Commit(); + } else MessageBox.Show("Cannot update a compound document that is not based on a stream or on a file", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -426,9 +278,10 @@ private void addStreamToolStripMenuItem_Click(object sender, EventArgs e) { string streamName = String.Empty; + if (Utils.InputBox("Add stream", "Insert stream name", ref streamName) == DialogResult.OK) { - CFItem cfs = SelectedItem(false); + CFItem cfs = treeView1.SelectedNode.Tag as CFItem; if (cfs != null && (cfs.IsStorage || cfs.IsRoot)) { @@ -450,9 +303,11 @@ private void addStorageStripMenuItem1_Click(object sender, EventArgs e) { string storage = String.Empty; + if (Utils.InputBox("Add storage", "Insert storage name", ref storage) == DialogResult.OK) { - CFItem cfs = SelectedItem(true); + CFItem cfs = treeView1.SelectedNode.Tag as CFItem; + if (cfs != null && (cfs.IsStorage || cfs.IsRoot)) { try @@ -475,21 +330,16 @@ if (openDataFileDialog.ShowDialog() == DialogResult.OK) { - CFStorage cfs = SelectedItem(true) as CFStorage; + CFStream s = treeView1.SelectedNode.Tag as CFStream; - if (cfs != null) + if (s != null) { - CFStream s = cfs.GetStream(SelectedItemName()); - - if (cfs != null && s != null) - { - FileStream f = new FileStream(openDataFileDialog.FileName, FileMode.Open, FileAccess.Read, FileShare.Read); - byte[] data = new byte[f.Length]; - f.Read(data, 0, (int)f.Length); - f.Flush(); - f.Close(); - s.SetData(data); - } + FileStream f = new FileStream(openDataFileDialog.FileName, FileMode.Open, FileAccess.Read, FileShare.Read); + byte[] data = new byte[f.Length]; + f.Read(data, 0, (int)f.Length); + f.Flush(); + f.Close(); + s.SetData(data); RefreshTree(); } @@ -504,33 +354,104 @@ private void contextMenuStrip1_Opening(object sender, CancelEventArgs e) { - CFItem s = SelectedItem(false); - if (s is CFStorage) - { - addStorageStripMenuItem1.Enabled = true; - addStreamToolStripMenuItem.Enabled = true; - importDataStripMenuItem1.Enabled = false; - exportDataToolStripMenuItem.Enabled = false; - } - else - { - addStorageStripMenuItem1.Enabled = false; - addStreamToolStripMenuItem.Enabled = false; - importDataStripMenuItem1.Enabled = true; - exportDataToolStripMenuItem.Enabled = true; - } } private void newStripMenuItem1_Click(object sender, EventArgs e) { + CreateNewFile(); } + private void openFileMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog1.ShowDialog() == DialogResult.OK) + { + try + { + OpenFile(); + } + catch + { + + } + } + } + + + private void treeView1_MouseUp(object sender, MouseEventArgs e) + { + // Get the node under the mouse cursor. + // We intercept both left and right mouse clicks + // and set the selected treenode according. + + TreeNode n = treeView1.GetNodeAt(e.X, e.Y); + + if (n != null) + { + if (this.hexEditor.ByteProvider != null && this.hexEditor.ByteProvider.HasChanges()) + { + if (MessageBox.Show("Do you want to save pending changes ?", "Save changes", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) + { + this.hexEditor.ByteProvider.ApplyChanges(); + } + } + + treeView1.SelectedNode = n; + + + // The tag property contains the underlying CFItem. + CFItem target = (CFItem)n.Tag; + + if (target.IsStream) + { + addStorageStripMenuItem1.Enabled = false; + addStreamToolStripMenuItem.Enabled = false; + importDataStripMenuItem1.Enabled = true; + exportDataToolStripMenuItem.Enabled = true; + } + else + { + addStorageStripMenuItem1.Enabled = true; + addStreamToolStripMenuItem.Enabled = true; + importDataStripMenuItem1.Enabled = false; + exportDataToolStripMenuItem.Enabled = false; + } + propertyGrid1.SelectedObject = n.Tag; + CFStream targetStream = n.Tag as CFStream; + if (targetStream != null) + { + this.hexEditor.ByteProvider = new StreamDataProvider(targetStream); + } + else + { + this.hexEditor.ByteProvider = null; + } + } + } + + void hexEditor_ByteProviderChanged(object sender, EventArgs e) + { + + } + + private void closeStripMenuItem1_Click(object sender, EventArgs e) + { + if (this.hexEditor.ByteProvider != null && this.hexEditor.ByteProvider.HasChanges()) + { + if (MessageBox.Show("Do you want to save pending changes ?", "Save changes", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.Yes) + { + this.hexEditor.ByteProvider.ApplyChanges(); + } + } + + CloseCurrentFile(); + } + } } diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.resx openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.resx --- openmcdf-1.5.2/src/TESTOpenMCDF/MainForm.resx 2011-04-03 23:09:38.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/MainForm.resx 2012-09-23 15:43:24.000000000 +0000 @@ -132,4 +132,10 @@ 529, 17 + + 676, 17 + + + 42 + \ No newline at end of file diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/Properties/AssemblyInfo.cs openmcdf-1.5.4/src/TESTOpenMCDF/Properties/AssemblyInfo.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/Properties/AssemblyInfo.cs 2011-04-04 20:28:36.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/Properties/AssemblyInfo.cs 2011-07-31 08:42:28.000000000 +0000 @@ -32,4 +32,4 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.5.1.*")] +[assembly: AssemblyVersion("1.5.3.*")] diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/Properties/Resources.Designer.cs openmcdf-1.5.4/src/TESTOpenMCDF/Properties/Resources.Designer.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/Properties/Resources.Designer.cs 2011-04-03 22:28:36.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/Properties/Resources.Designer.cs 2012-10-24 21:24:48.000000000 +0000 @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3615 +// Runtime Version:2.0.50727.3634 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -60,6 +60,34 @@ } } + internal static System.Drawing.Bitmap disk { + get { + object obj = ResourceManager.GetObject("disk", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap door_out { + get { + object obj = ResourceManager.GetObject("door_out", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap folder { + get { + object obj = ResourceManager.GetObject("folder", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap page_white { + get { + object obj = ResourceManager.GetObject("page_white", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap storage { get { object obj = ResourceManager.GetObject("storage", resourceCulture); diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/Properties/Resources.resx openmcdf-1.5.4/src/TESTOpenMCDF/Properties/Resources.resx --- openmcdf-1.5.2/src/TESTOpenMCDF/Properties/Resources.resx 2011-04-03 22:28:36.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/Properties/Resources.resx 2012-10-24 21:24:44.000000000 +0000 @@ -118,6 +118,18 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\img\disk.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\img\door_out.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\img\folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\img\page_white.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\img\storage.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/StreamDataProvider.cs openmcdf-1.5.4/src/TESTOpenMCDF/StreamDataProvider.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/StreamDataProvider.cs 1970-01-01 00:00:00.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/StreamDataProvider.cs 2011-07-31 08:41:58.000000000 +0000 @@ -0,0 +1,178 @@ +using System; +using System.Collections.Generic; +using System.Text; +using Be.Windows.Forms; +using OpenMcdf; + +namespace StructuredStorageExplorer +{ + public class StreamDataProvider : IByteProvider + { + ///

+ /// Modifying stream + ///

+ CFStream _modifiedStream; + + ///

+ /// Contains information about changes. + ///

+ bool _hasChanges; + + ///

+ /// Contains a byte collection. + ///

+ ByteCollection _bytes; + + + ///

+ /// Initializes a new instance of the DynamicByteProvider class. + ///

+ /// + public StreamDataProvider(CFStream modifiedStream) + { + _bytes = new ByteCollection(modifiedStream.GetData()); + _modifiedStream = modifiedStream; + } + + ///

+ /// Raises the Changed event. + ///

+ void OnChanged(EventArgs e) + { + _hasChanges = true; + + if (Changed != null) + Changed(this, e); + } + + ///

+ /// Raises the LengthChanged event. + ///

+ void OnLengthChanged(EventArgs e) + { + if (LengthChanged != null) + LengthChanged(this, e); + } + + ///

+ /// Gets the byte collection. + ///

+ public ByteCollection Bytes + { + get { return _bytes; } + } + + #region IByteProvider Members + ///

+ /// True, when changes are done. + ///

+ public bool HasChanges() + { + return _hasChanges; + } + + ///

+ /// Applies changes. + ///

+ public void ApplyChanges() + { + _hasChanges = false; + + _modifiedStream.SetData(this._bytes.ToArray()); + } + + ///

+ /// Occurs, when the write buffer contains new changes. + ///

+ public event EventHandler Changed; + + ///

+ /// Occurs, when InsertBytes or DeleteBytes method is called. + ///

+ public event EventHandler LengthChanged; + + + ///

+ /// Reads a byte from the byte collection. + ///

+ /// the index of the byte to read + /// the byte + public byte ReadByte(long index) + { return _bytes[(int)index]; } + + ///

+ /// Write a byte into the byte collection. + ///

+ /// the index of the byte to write. + /// the byte + public void WriteByte(long index, byte value) + { + _bytes[(int)index] = value; + OnChanged(EventArgs.Empty); + } + + ///

+ /// Deletes bytes from the byte collection. + ///

+ /// the start index of the bytes to delete. + /// the length of bytes to delete. + public void DeleteBytes(long index, long length) + { + int internal_index = (int)Math.Max(0, index); + int internal_length = (int)Math.Min((int)Length, length); + _bytes.RemoveRange(internal_index, internal_length); + + OnLengthChanged(EventArgs.Empty); + OnChanged(EventArgs.Empty); + } + + ///

+ /// Inserts byte into the byte collection. + ///

+ /// the start index of the bytes in the byte collection + /// the byte array to insert + public void InsertBytes(long index, byte[] bs) + { + _bytes.InsertRange((int)index, bs); + + OnLengthChanged(EventArgs.Empty); + OnChanged(EventArgs.Empty); + } + + ///

+ /// Gets the length of the bytes in the byte collection. + ///

+ public long Length + { + get + { + return _bytes.Count; + } + } + + ///

+ /// Returns true + ///

+ public bool SupportsWriteByte() + { + return true; + } + + ///

+ /// Returns true + ///

+ public bool SupportsInsertBytes() + { + return true; + } + + ///

+ /// Returns true + ///

+ public bool SupportsDeleteBytes() + { + return true; + } + #endregion + } +} diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/StructuredStorageExplorer.csproj openmcdf-1.5.4/src/TESTOpenMCDF/StructuredStorageExplorer.csproj --- openmcdf-1.5.2/src/TESTOpenMCDF/StructuredStorageExplorer.csproj 2011-04-03 23:09:42.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/StructuredStorageExplorer.csproj 2012-12-09 11:31:12.000000000 +0000 @@ -33,6 +33,7 @@ 4 + @@ -41,7 +42,8 @@ - + + Form @@ -75,8 +77,12 @@ + + + + diff -Nru openmcdf-1.5.2/src/TESTOpenMCDF/Utils.cs openmcdf-1.5.4/src/TESTOpenMCDF/Utils.cs --- openmcdf-1.5.2/src/TESTOpenMCDF/Utils.cs 1970-01-01 00:00:00.000000000 +0000 +++ openmcdf-1.5.4/src/TESTOpenMCDF/Utils.cs 2011-07-31 08:42:00.000000000 +0000 @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Windows.Forms; +using System.Drawing; +using OpenMcdf; + +namespace StructuredStorageExplorer +{ + class Utils + { + public static DialogResult InputBox(string title, string promptText, ref string value) + { + Form form = new Form(); + Label label = new Label(); + TextBox textBox = new TextBox(); + Button buttonOk = new Button(); + Button buttonCancel = new Button(); + + form.Text = title; + label.Text = promptText; + textBox.Text = value; + + buttonOk.Text = "OK"; + buttonCancel.Text = "Cancel"; + buttonOk.DialogResult = DialogResult.OK; + buttonCancel.DialogResult = DialogResult.Cancel; + + label.SetBounds(9, 20, 372, 13); + textBox.SetBounds(12, 36, 372, 20); + buttonOk.SetBounds(228, 72, 75, 23); + buttonCancel.SetBounds(309, 72, 75, 23); + + label.AutoSize = true; + textBox.Anchor = textBox.Anchor | AnchorStyles.Right; + buttonOk.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonCancel.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + + form.ClientSize = new Size(396, 107); + form.Controls.AddRange(new Control[] { label, textBox, buttonOk, buttonCancel }); + form.ClientSize = new Size(Math.Max(300, label.Right + 10), form.ClientSize.Height); + form.FormBorderStyle = FormBorderStyle.FixedDialog; + form.StartPosition = FormStartPosition.CenterScreen; + form.MinimizeBox = false; + form.MaximizeBox = false; + form.AcceptButton = buttonOk; + form.CancelButton = buttonCancel; + + DialogResult dialogResult = form.ShowDialog(); + value = textBox.Text; + return dialogResult; + } + + public static bool IsStreamTreeNode(TreeNode node) + { + return ((CFItem)node.Tag).IsStream; + } + } + + + + +} Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TESTOpenMCDF/img/disk.png and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TESTOpenMCDF/img/disk.png differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TESTOpenMCDF/img/door_out.png and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TESTOpenMCDF/img/door_out.png differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TESTOpenMCDF/img/folder.png and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TESTOpenMCDF/img/folder.png differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TESTOpenMCDF/img/page_white.png and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TESTOpenMCDF/img/page_white.png differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/CorruptedDoc_bug3547815.doc and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/CorruptedDoc_bug3547815.doc differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/CorruptedDoc_bug3547815_B.doc and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/CorruptedDoc_bug3547815_B.doc differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/CyclicFAT.cfs and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/CyclicFAT.cfs differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/MultipleStorage4.cfs and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/MultipleStorage4.cfs differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/reportREAD.xls and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/reportREAD.xls differ Binary files /tmp/uktgiiviLC/openmcdf-1.5.2/src/TestFiles/report_name_fix.xls and /tmp/nyEZQEVt6N/openmcdf-1.5.4/src/TestFiles/report_name_fix.xls differ