Reorged source tree.

NTwain.sln

@@ -1,28 +1,30 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30324.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain", "NTwain\NTwain.csproj", "{0C5A6FB1-0282-4D61-8354-68DEB1515001}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain", "src\NTwain\NTwain.csproj", "{0C5A6FB1-0282-4D61-8354-68DEB1515001}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain.Tests", "Tests\NTwain.Tests\NTwain.Tests.csproj", "{6B034C50-A397-435F-8DDF-677B403FEBAA}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2F906640-1664-4960-93D2-A054AC6E66A3}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{2F906640-1664-4960-93D2-A054AC6E66A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester.Winform", "Tests\Tester.Winform\Tester.Winform.csproj", "{4FC243F1-318E-4FA9-9EBD-2CA3A8F35425}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Winform", "samples\Sample.Winform\Sample.Winform.csproj", "{4FC243F1-318E-4FA9-9EBD-2CA3A8F35425}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester.WPF", "Tests\Tester.WPF\Tester.WPF.csproj", "{1715C2B7-5C35-4F8B-9D9B-8D68A3D5284D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.WPF", "samples\Sample.WPF\Sample.WPF.csproj", "{1715C2B7-5C35-4F8B-9D9B-8D68A3D5284D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Others", "Others", "{4CE0B9ED-2CD1-440F-B4EC-35ECA6D61EFE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{4CE0B9ED-2CD1-440F-B4EC-35ECA6D61EFE}"
 	ProjectSection(SolutionItems) = preProject
 		LICENSE.txt = LICENSE.txt
 		README.md = README.md
 		Spec\twain2.3.h = Spec\twain2.3.h
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester.Console", "Tests\Tester.Console\Tester.Console.csproj", "{12D761EF-68DF-41CE-92EF-0C7AE81857A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample.Console", "samples\Sample.Console\Sample.Console.csproj", "{12D761EF-68DF-41CE-92EF-0C7AE81857A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain.Net35", "NTwain.Net35\NTwain.Net35.csproj", "{2E965494-94B0-4EC7-960C-24E5D7D04278}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTwain.Net35", "src\NTwain.Net35\NTwain.Net35.csproj", "{2E965494-94B0-4EC7-960C-24E5D7D04278}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B77C17FE-FD84-4FF4-9A1C-D49DB1749C9C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -98,7 +100,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6B034C50-A397-435F-8DDF-677B403FEBAA} = {2F906640-1664-4960-93D2-A054AC6E66A3}
+		{6B034C50-A397-435F-8DDF-677B403FEBAA} = {B77C17FE-FD84-4FF4-9A1C-D49DB1749C9C}
 		{4FC243F1-318E-4FA9-9EBD-2CA3A8F35425} = {2F906640-1664-4960-93D2-A054AC6E66A3}
 		{1715C2B7-5C35-4F8B-9D9B-8D68A3D5284D} = {2F906640-1664-4960-93D2-A054AC6E66A3}
 		{12D761EF-68DF-41CE-92EF-0C7AE81857A3} = {2F906640-1664-4960-93D2-A054AC6E66A3}

Tests/NTwain.Tests/NTwain.Tests.csproj

@@ -72,7 +72,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NTwain\NTwain.csproj">
+    <ProjectReference Include="..\..\src\NTwain\NTwain.csproj">
       <Project>{0C5A6FB1-0282-4D61-8354-68DEB1515001}</Project>
       <Name>NTwain</Name>
     </ProjectReference>

samples/Sample.Console/Program.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading;
 
-namespace Tester
+namespace Sample
 {
     class Program
     {

samples/Sample.Console/Sample.Console.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{12D761EF-68DF-41CE-92EF-0C7AE81857A3}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tester</RootNamespace>
+    <RootNamespace>Sample</RootNamespace>
-    <AssemblyName>Tester.Console</AssemblyName>
+    <AssemblyName>Sample.Console</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -46,7 +46,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NTwain\NTwain.csproj">
+    <ProjectReference Include="..\..\src\NTwain\NTwain.csproj">
       <Project>{0c5a6fb1-0282-4d61-8354-68deb1515001}</Project>
       <Name>NTwain</Name>
     </ProjectReference>

samples/Sample.WPF/App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Tester.WPF.App"
+<Application x:Class="Sample.WPF.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              StartupUri="Launcher.xaml">

samples/Sample.WPF/App.xaml.cs

@@ -1,7 +1,7 @@
 using ModernWPF;
 using System.Windows;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
 	/// <summary>
 	/// Interaction logic for App.xaml

samples/Sample.WPF/Launcher.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Tester.WPF.Launcher"
+<Window x:Class="Sample.WPF.Launcher"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Scan Launcher" Height="200" Width="250"

samples/Sample.WPF/Launcher.xaml.cs

@@ -11,7 +11,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
     /// <summary>
     /// Interaction logic for Launcher.xaml

samples/Sample.WPF/MainWindow.xaml

@@ -1,8 +1,8 @@
-<Window x:Class="Tester.WPF.MainWindow"
+<Window x:Class="Sample.WPF.MainWindow"
 		xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 		xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
         xmlns:modern="http://modernwpf"
-        xmlns:proj="clr-namespace:Tester.WPF"
+        xmlns:proj="clr-namespace:Sample.WPF"
 		Title="{Binding AppTitle}" 
         Height="600" Width="900" ResizeMode="CanResizeWithGrip"
         x:Name="theWindow"

samples/Sample.WPF/MainWindow.xaml.cs

@@ -14,7 +14,7 @@ using System.Windows.Controls;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

samples/Sample.WPF/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Windows;
 // 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("Tester.WPF")]
+[assembly: AssemblyTitle("Sample.WPF")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Yin-Chun Wang")]
-[assembly: AssemblyProduct("Tester.WPF")]
+[assembly: AssemblyProduct("Sample.WPF")]
 [assembly: AssemblyCopyright("Copyright © Yin-Chun Wang 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

samples/Sample.WPF/Properties/Resources.Designer.cs

@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18034
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tester.WPF.Properties
+namespace Sample.WPF.Properties {
-{
+    using System;
-
+    
-
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -39,7 +39,7 @@ namespace Tester.WPF.Properties
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tester.WPF.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Sample.WPF.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

samples/Sample.WPF/Properties/Settings.Designer.cs

@@ -1,18 +1,18 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18034
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tester.WPF.Properties {
+namespace Sample.WPF.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

samples/Sample.WPF/Sample.WPF.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{1715C2B7-5C35-4F8B-9D9B-8D68A3D5284D}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tester.WPF</RootNamespace>
+    <RootNamespace>Sample.WPF</RootNamespace>
-    <AssemblyName>Tester.WPF</AssemblyName>
+    <AssemblyName>Sample.WPF</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -149,7 +149,7 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NTwain\NTwain.csproj">
+    <ProjectReference Include="..\..\src\NTwain\NTwain.csproj">
       <Project>{0c5a6fb1-0282-4d61-8354-68deb1515001}</Project>
       <Name>NTwain</Name>
     </ProjectReference>

samples/Sample.WPF/ViewModels/CapVM.cs

@@ -4,7 +4,7 @@ using System.Collections;
 using System.Linq;
 using System.Reflection;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
     /// <summary>
     /// Wraps a capability as a view model.

samples/Sample.WPF/ViewModels/DataSourceVM.cs

@@ -7,7 +7,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Windows.Data;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
     /// <summary>
     /// Wraps a data source as view model.

samples/Sample.WPF/ViewModels/TwainVM.cs

@@ -16,7 +16,7 @@ using GalaSoft.MvvmLight.Command;
 using ModernWPF;
 using ModernWPF.Messages;
 
-namespace Tester.WPF
+namespace Sample.WPF
 {
     /// <summary>
     /// Wraps the twain session as a view model for databinding.

samples/Sample.Winform/Program.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace Tester.Winform
+namespace Sample.Winform
 {
     static class Program
     {

samples/Sample.Winform/Properties/AssemblyInfo.cs

@@ -4,11 +4,11 @@ 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("Tester.Winform")]
+[assembly: AssemblyTitle("Sample.Winform")]
 [assembly: AssemblyDescription("Winform app for quick testing implementations in the TWAIN lib.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Yin-Chun Wang")]
-[assembly: AssemblyProduct("Tester.Winform")]
+[assembly: AssemblyProduct("Sample.Winform")]
 [assembly: AssemblyCopyright("Copyright © Yin-Chun Wang 2014")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

samples/Sample.Winform/Properties/Resources.Designer.cs

@@ -1,17 +1,17 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18034
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tester.Winform.Properties
+namespace Sample.Winform.Properties {
-{
+    using System;
-
+    
-
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -39,7 +39,7 @@ namespace Tester.Winform.Properties
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tester.Winform.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Sample.Winform.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

samples/Sample.Winform/Properties/Settings.Designer.cs

@@ -1,18 +1,18 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18034
+//     Runtime Version:4.0.30319.0
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Tester.Winform.Properties {
+namespace Sample.Winform.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

samples/Sample.Winform/Sample.Winform.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{4FC243F1-318E-4FA9-9EBD-2CA3A8F35425}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Tester.Winform</RootNamespace>
+    <RootNamespace>Sample.Winform</RootNamespace>
-    <AssemblyName>Tester.Winform</AssemblyName>
+    <AssemblyName>Sample.Winform</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
@@ -77,7 +77,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\NTwain.Net35\NTwain.Net35.csproj">
+    <ProjectReference Include="..\..\src\NTwain.Net35\NTwain.Net35.csproj">
       <Project>{2e965494-94b0-4ec7-960c-24e5d7d04278}</Project>
       <Name>NTwain.Net35</Name>
     </ProjectReference>

samples/Sample.Winform/TestForm.Designer.cs

@@ -1,4 +1,4 @@
-namespace Tester.Winform
+namespace Sample.Winform
 {
 	partial class TestForm
 	{

samples/Sample.Winform/TestForm.cs

@@ -9,7 +9,7 @@ using System.Reflection;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace Tester.Winform
+namespace Sample.Winform
 {
     sealed partial class TestForm : Form
     {