Final little fixes

src/Cfix.Addin/Cfix.Addin.Test/Cfix.Addin.Test.csproj

@@ -30,7 +30,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\..\bin\chk\i386\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BETA</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;INTELINSPECTOR_</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\..\bin\fre\i386\</OutputPath>
-    <DefineConstants>TRACE;BETA</DefineConstants>
+    <DefineConstants>TRACE;INTELINSPECTOR_</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>

src/Cfix.Addin/Cfix.Addin.Test/TestInspectorResultFile.cs

@@ -9,6 +9,7 @@
 
 namespace Cfix.Addin.Test
 {
+#if INTELINSPECTOR
 	[TestFixture]
 	public class TestInspectorResultFile
 	{
@@ -298,4 +299,5 @@ public void TestGetDescriptionFromCode()
 				InspectorResult.GetDescriptionFromCode( "pdr_xs_ay" ) );
 		}
 	}
+#endif
 }

src/Cfix.Addin/Cfix.Addin.Test/TestResultFilter.cs

@@ -7,6 +7,7 @@
 
 namespace Cfix.Addin.Test
 {
+#if INTELINSPECTOR
 	[TestFixture]
 	public class TestResultFilter
 	{
@@ -43,4 +44,5 @@ public void TestFilter()
 		}
 
 	}
+#endif
 }

src/Cfix.Addin/Cfix.Addin/Cfix.Addin.100.csproj

@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\..\bin\fre\i386\</OutputPath>
-    <DefineConstants>TRACE;FREEWARE, VS100, INTELINSPECTOR</DefineConstants>
+    <DefineConstants>TRACE;FREEWARE, VS100, INTELINSPECTOR_</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
@@ -44,7 +44,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\..\bin\chk\i386\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FREEWARE, VS100, INTELINSPECTOR</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FREEWARE, VS100, INTELINSPECTOR_</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

src/Cfix.Addin/Cfix.Addin/Cfix.Addin.80.csproj

@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\..\bin\fre\i386\</OutputPath>
-    <DefineConstants>TRACE;FREEWARE, VS80, INTELINSPECTOR</DefineConstants>
+    <DefineConstants>TRACE;FREEWARE, VS80, INTELINSPECTOR_</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
@@ -44,7 +44,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\..\bin\chk\i386\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FREEWARE, VS80, INTELINSPECTOR</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FREEWARE, VS80, INTELINSPECTOR_</DefineConstants>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>
     <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>

src/Cfix.Addin/Cfix.Addin/Cfix.Addin.90.csproj

@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\..\bin\fre\i386\</OutputPath>
-    <DefineConstants>TRACE;FREEWARE, VS90, INTELINSPECTOR</DefineConstants>
+    <DefineConstants>TRACE;FREEWARE, VS90, INTELINSPECTOR_</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleAssemblies>C:\Program Files (x86)\Microsoft Visual Studio 8\Team Tools\Static Analysis Tools\FxCop\\rules</CodeAnalysisRuleAssemblies>

src/Cfix.Addin/Cfix.Addin/Windows/OptionsPageGeneral.cs

@@ -108,7 +108,10 @@ public void OnOK()
 		{
 			Debug.Assert( this.configuration != null );
 
-			EnvironmentOptions envOpts = EnvironmentOptions.ComNeutralThreading;
+			EnvironmentOptions envOpts = this.configuration.EnvironmentOptions;
+
+			envOpts |= EnvironmentOptions.ComNeutralThreading;
+
 			if ( this.autoAdjustCwd.Checked )
 			{
 				envOpts |= EnvironmentOptions.AutoAdjustCurrentDirectory;
@@ -152,34 +155,30 @@ private void dllTextBox_TextChanged( object sender, EventArgs e )
 		{
 			EventDllData data = ( EventDllData ) this.archComboBox.SelectedItem;
 
-			if ( this.dllTextBox.Text.Trim().Length == 0 &&
+			data.eventDll = new EventDll(
+				this.dllTextBox.Text,
+				data.eventDll != null ? data.eventDll.Options : null );
+
+			if ( String.IsNullOrEmpty( data.eventDll.Path ) &&
 				 String.IsNullOrEmpty( data.eventDll.Options ) )
 			{
 				data.eventDll = null;
 			}
-			else
-			{
-				data.eventDll = new EventDll(
-					this.dllTextBox.Text,
-					data.eventDll != null ? data.eventDll.Options : null );
-			}
 		}
 
 		private void optionsTextBox_TextChanged( object sender, EventArgs e )
 		{
 			EventDllData data = ( EventDllData ) this.archComboBox.SelectedItem;
 
+			data.eventDll = new EventDll(
+				data.eventDll != null ? data.eventDll.Path : null,
+				this.optionsTextBox.Text );
+
 			if ( String.IsNullOrEmpty( data.eventDll.Path ) &&
-				 this.optionsTextBox.Text.Trim().Length == 0 )
+				 String.IsNullOrEmpty( data.eventDll.Options ) )
 			{
 				data.eventDll = null;
 			}
-			else
-			{
-				data.eventDll = new EventDll(
-					data.eventDll != null ? data.eventDll.Path : null,
-					this.optionsTextBox.Text );
-			}
 		}
 	}
 }

src/Cfix.Control/Cfix.Control/RunControl/Task.cs

@@ -181,7 +181,21 @@ private void ForceComplete()
 					//
 					IResultItemCollection parentResult = 
 						( IResultItemCollection ) action.Result;
-					IResultItem testCaseResult = parentResult.GetItem( action.Item.Ordinal );
+					IResultItem testCaseResult;
+
+					if ( action.Item.Ordinal < parentResult.ItemCount )
+					{
+						testCaseResult = parentResult.GetItem( action.Item.Ordinal );
+					}
+					else
+					{
+						//
+						// Partial result.
+						//
+						Debug.Assert( parentResult.ItemCount == 1 );
+						testCaseResult = parentResult.GetItem( 0 );
+					}
+
 					testCaseResult.ForceCompletion( false, ExecutionStatus.Failed );
 				}
 				else

src/cfixctl/cfixctl/cfixctl.rc

@@ -54,7 +54,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 1, 0, 3759
+ FILEVERSION 1, 1, 0, 3780
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -71,9 +71,9 @@ BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
-            VALUE "FileDescription", "Cfix Control Library"
-            VALUE "FileVersion", "1, 1, 0, 3759\0"
-            VALUE "InternalName", "Cfix Control Library"
+            VALUE "FileDescription", "Visual Assert/cfix Control Library"
+            VALUE "FileVersion", "1, 1, 0, 3780\0"
+            VALUE "InternalName", "Visual Assert/cfix Control Library"
             VALUE "LegalCopyright", "Copyright (C) 2008 Johannes Passing"
             VALUE "OriginalFilename", "Cfixctl"
             VALUE "ProductName", "Cfix"
@@ -422,6 +422,10 @@ END
 
 
 
+
+
+
+
 
 
 

src/cfixctl/cfixctl/comutil.h

@@ -220,7 +220,7 @@ struct ComClassFactory : public IClassFactory
 		}
 
 		ComObjectBase* NewObject = new T( this );
-		if ( Object == NULL )
+		if ( NewObject == NULL )
 		{
 			*Object = NULL;
 			return E_OUTOFMEMORY;

src/cfixctl/cfixhost/cfixhost.rc

@@ -53,7 +53,7 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1, 1, 0, 3759
+ FILEVERSION 1, 1, 0, 3780
  PRODUCTVERSION 1,1,0,1
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "CompanyName", "Johannes Passing"
-            VALUE "FileDescription", "CfixHost"
-            VALUE "FileVersion", "1, 1, 0, 3759\0"
-            VALUE "InternalName", "Cfix"
+            VALUE "FileDescription", "Visual Assert/cfix host process"
+            VALUE "FileVersion", "1, 1, 0, 3780\0"
+            VALUE "InternalName", "Visual Assert/cfix host process"
             VALUE "LegalCopyright", "Copyright (C) 2009 Johannes Passing"
-            VALUE "OriginalFilename", "Cfix"
-            VALUE "ProductName", "Cfix"
+            VALUE "OriginalFilename", "cfixhost"
+            VALUE "ProductName", "Visual Assert/cfix"
             VALUE "ProductVersion", "1, 1, 0, 1"
         END
     END
@@ -425,6 +425,10 @@ IDI_ICON1               ICON                    "icon.ico"
 
 
 
+
+
+
+