More FluentSharp fixes

Author: DinisCruz

.gitignore

@@ -5,3 +5,7 @@ bin
 *.csproj
 *.user
 _VisualStudio_Projects
+
+*.suo
+
+*.ncrunchsolution

3rdParty/Chrome/API_Chrome_Hijack.cs

@@ -1,5 +1,6 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
 using System;
+using System.Management;
 using System.Windows.Forms;
 using System.Reflection;
 using System.Diagnostics;
@@ -104,7 +105,7 @@ public static API_Chrome_Hijack hijack_Chrome(this API_Chrome_Hijack chromeHijac
 								 var targetWindow = mainWindowHandle.child_Windows().second();								
 								 return targetWindow;
 
-								return mainWindowHandle;  // for now hijack the whole thing
+								//return mainWindowHandle;  // for now hijack the whole thing
 								});
 
 				}

3rdParty/Chrome/CefSharp_Installer.cs

@@ -30,8 +30,7 @@ public CefSharp_Installer(bool installNow)
 		public bool install()
 		{
 			"Installing {0}".info(ToolName);
-			return installFromZip_Web(); 						
-			return false;
+			return installFromZip_Web(); 									
 		}
 
 		public Process start()

3rdParty/HawkEye/API_HawkEye.cs

@@ -1,7 +1,9 @@
 using System;
 using System.Windows.Forms;
-using O2.Kernel;
-using O2.DotNetWrappers.ExtensionMethods; 
+using FluentSharp.CoreLib;
+using FluentSharp.REPL;
+using FluentSharp.WinForms;
+
 //O2File:WindowFinder.cs
 
 namespace O2.XRules.Database.APIs

3rdParty/HawkEye/Ctrl_ProcessFinder.cs

@@ -1,10 +1,10 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
 using System;
-using System.Linq;
 using System.Diagnostics;
 using System.Windows.Forms;
-using System.Collections.Generic; 
-using O2.DotNetWrappers.ExtensionMethods;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+
 //O2File:WindowFinder.cs
 
 namespace O2.XRules.Database.APIs

3rdParty/HawkEye/WindowFinder.cs

@@ -1,15 +1,12 @@
 //based on the code from HawkEye
 using System;
-using System.IO;
-using System.Text;
 using System.Drawing;   
 using System.Diagnostics;
 using System.Windows.Forms;
-using System.ComponentModel; 
-using System.Runtime.InteropServices;
-using System.Runtime.CompilerServices; 
-using O2.XRules.Database.Utils;
-using O2.DotNetWrappers.ExtensionMethods; 
+using System.ComponentModel;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
+using FluentSharp.WinForms.Utils;
 
 
 //O2File:API_WinAPI.cs
@@ -90,7 +87,7 @@ public WindowFinder()
 				this.pink();*/
 			base.Name = "WindowFinder";
 			base.Size = new Size(32, 32);
-			this.BackgroundImage = O2.Platform.BCL.O2_Views_ASCX.FormImages.target.ToBitmap();
+			this.BackgroundImage = FormImages.target.ToBitmap();
 			this.BackgroundImageLayout = ImageLayout.Stretch;
 
 		}
@@ -108,7 +105,7 @@ public void StartSearch()
 			//	Cursor.Current = new Cursor("Eye.cur".local());
 			//else
 			//	Cursor.Current	= Cursors.Cross;
-			Cursor.Current = new Cursor(new System.IO.MemoryStream(O2.Platform.BCL.O2_Views_ASCX.FormImages.Eye));
+			Cursor.Current = new Cursor(new System.IO.MemoryStream(FormImages.Eye));
 			base.Capture = true;
 			base.MouseMove += new MouseEventHandler(this.WindowFinder_MouseMove);
 			base.MouseUp += new MouseEventHandler(this.WindowFinder_MouseUp);

APIs/Windows/API_RDP.cs

@@ -1,14 +1,8 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System;
-using System.Windows.Forms;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.DotNetWrappers.Windows;
-using O2.Views.ASCX;
-using O2.XRules.Database.Utils;
+
+using FluentSharp.CoreLib;
+using FluentSharp.CoreLib.API;
+using FluentSharp.GuiAutomation;
 
 //O2File:API_GuiAutomation.cs
 //O2Ref:White.Core.dll

APIs/Windows/API_WindowsMediaPlayer.cs

@@ -1,17 +1,7 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
-using System;
 using System.Windows.Forms;
-using System.Drawing;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using O2.Interfaces.O2Core;
-using O2.Kernel;
-using O2.Kernel.ExtensionMethods;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Views.ASCX;
-using O2.XRules.Database.Utils;
+using FluentSharp.CoreLib;
+using FluentSharp.WinForms;
 using AxWMPLib;
 //O2Ref:Interop.WMPLib.dll
 //O2Ref:AxInterop.WMPLib.dll

APIs/Windows/CLR/API_CLR.cs

@@ -1,15 +1,11 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
 using System;
 using System.Diagnostics;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
 using System.Text;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
-using O2.DotNetWrappers.ExtensionMethods;
-using O2.Kernel;
+using FluentSharp.CoreLib;
 
 namespace O2.XRules.Database.APIs
 {

APIs/Windows/CLR/API_Mscoree.cs

@@ -1,11 +1,9 @@
 // This file is part of the OWASP O2 Platform (http://www.owasp.org/index.php/OWASP_O2_Platform) and is released under the Apache 2.0 License (http://www.apache.org/licenses/LICENSE-2.0)
 using System;
-using System.Diagnostics;
-using System.Collections;
 using System.Collections.Generic;
-using O2.DotNetWrappers.ExtensionMethods;
-using System.Runtime.InteropServices;      
-using mscoree;   
+using FluentSharp.CoreLib;
+using System.Runtime.InteropServices;
+using mscoree;
 
 //O2Ref:mscoree_v4.0.dll