From 15253ef295c29544da97edd7c01e1cc69ea25e7f Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Sun, 15 Jun 2014 11:45:01 +0200
Subject: [PATCH] Code cleanup, removed a lot of FxCop messages and added some
 more disposing.

---
 Greenshot/Configuration/AppConfig.cs          | 227 ------------------
 Greenshot/Drawing/DrawableContainer.cs        |   4 +
 Greenshot/Drawing/StepLabelContainer.cs       |  13 +-
 Greenshot/Forms/MainForm.cs                   |   7 -
 Greenshot/GlobalSuppressions.cs               | Bin 0 -> 12860 bytes
 Greenshot/Greenshot.csproj                    |   2 +-
 Greenshot/Helpers/CaptureHelper.cs            |  64 +++--
 Greenshot/Helpers/MailHelper.cs               |  72 +++---
 .../ExternalCommandDestination.cs             |   4 +-
 GreenshotOfficePlugin/GlobalSuppressions.cs   | Bin 0 -> 3260 bytes
 .../GreenshotOfficePlugin.csproj              |   5 +-
 .../OfficeInterop/OutlookUtils.cs             |  15 +-
 GreenshotPlugin/Controls/HotkeyControl.cs     |   2 +-
 GreenshotPlugin/Core/WindowsHelper.cs         |   2 +-
 GreenshotPlugin/GlobalSuppressions.cs         | Bin 0 -> 112942 bytes
 GreenshotPlugin/GreenshotPlugin.csproj        |   1 +
 GreenshotPlugin/UnmanagedHelpers/GDI32.cs     |  34 +--
 GreenshotPlugin/UnmanagedHelpers/User32.cs    |   2 +-
 18 files changed, 119 insertions(+), 335 deletions(-)
 delete mode 100644 Greenshot/Configuration/AppConfig.cs
 create mode 100644 Greenshot/GlobalSuppressions.cs
 create mode 100644 GreenshotOfficePlugin/GlobalSuppressions.cs
 create mode 100644 GreenshotPlugin/GlobalSuppressions.cs

diff --git a/Greenshot/Configuration/AppConfig.cs b/Greenshot/Configuration/AppConfig.cs
deleted file mode 100644
index de704ee91..000000000
--- a/Greenshot/Configuration/AppConfig.cs
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Greenshot - a free and open source screenshot tool
- * Copyright (C) 2007-2014 Thomas Braun, Jens Klingen, Robin Krom
- * 
- * For more information see: http://getgreenshot.org/
- * The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 1 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-using System;
-using System.Drawing;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text.RegularExpressions;
-using System.Windows.Forms;
-
-using GreenshotPlugin.UnmanagedHelpers;
-using GreenshotPlugin.Core;
-using Greenshot.IniFile;
-using log4net;
-
-namespace Greenshot.Configuration {
-	public enum ScreenshotDestinations {Editor=1, FileDefault=2, FileWithDialog=4, Clipboard=8, Printer=16, EMail=32}
-	
-	/// <summary>
-	/// AppConfig is used for loading and saving the configuration. All public fields
-	/// in this class are serialized with the BinaryFormatter and then saved to the
-	/// config file. After loading the values from file, SetDefaults iterates over
-	/// all public fields an sets fields set to null to the default value.
-	/// </summary>
-	[Serializable]
-	public class AppConfig {
-		private static ILog LOG = LogManager.GetLogger(typeof(AppConfig));
-		private static readonly Regex FIXOLD_REGEXP = new Regex(@"%(?<variable>[\w]+)%", RegexOptions.Compiled);
-		private const string VAR_PREFIX = "${";
-		private const string VAR_POSTFIX = "}";
-
-		//private static string loc = Assembly.GetExecutingAssembly().Location;
-		//private static string oldFilename = Path.Combine(loc.Substring(0,loc.LastIndexOf(@"\")),"config.dat");
-		private const string CONFIG_FILE_NAME = "config.dat";
-		private static string configfilepath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),@"Greenshot\");
-		
-		// the configuration part - all public vars are stored in the config file
-		// don't use "null" and "0" as default value!
-			
-		#region general application config
-		public bool? General_IsFirstLaunch = true;
-		#endregion
-
-		#region capture config
-		public bool? Capture_Mousepointer = true;
-		public bool? Capture_Windows_Interactive = false;
-		public int Capture_Wait_Time = 101;
-		public bool? fixedWaitTime = false;
-		#endregion
-		
-		#region user interface config
-		public string Ui_Language = "";
-		public bool? Ui_Effects_CameraSound = true;
-		#endregion
-		
-		#region output config
-		public ScreenshotDestinations Output_Destinations = ScreenshotDestinations.Editor;
-		
-		
-		public string Output_File_Path = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
-		public string Output_File_FilenamePattern = "${capturetime}_${title}";
-		public string Output_File_Format = ImageFormat.Png.ToString();
-		public bool? Output_File_CopyPathToClipboard = false;
-		public int Output_File_JpegQuality = 80;
-		public bool? Output_File_PromptJpegQuality = false;
-		public int Output_File_IncrementingNumber = 1;
-		
-		public string Output_FileAs_Fullpath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop),"dummy.png");
-		
-		public bool? Output_Print_PromptOptions = true;
-		public bool? Output_Print_AllowRotate = true;
-		public bool? Output_Print_AllowEnlarge = true;
-		public bool? Output_Print_AllowShrink = true;
-		public bool? Output_Print_Center = true;
-		public bool? Output_Print_Timestamp = true;
-		#endregion
-		
-		#region editor config
-		public WindowPlacement Editor_Placement;
-		public Color[] Editor_RecentColors = new Color[12];
-		public Font Editor_Font = null;
-		                                                                                    
-		#endregion
-		
-		/// <summary>
-		/// a private constructor because this is a singleton
-		/// </summary>
-		private AppConfig()	{
-		}
-		
-		/// <summary>
-		/// Remove the old %VAR% syntax
-		/// </summary>
-		/// <param name="oldPattern">String with old syntax %VAR%</param>
-		/// <returns>The fixed pattern</returns>
-		private static string FixFallback(string oldPattern) {
-				return FIXOLD_REGEXP.Replace(oldPattern, delegate(Match m) { return VAR_PREFIX + m.Groups["variable"].Value + VAR_POSTFIX;});
-		}
-
-		/// <summary>
-		/// loads the configuration from the config file
-		/// </summary>
-		/// <returns>an instance of AppConfig with all values set from the config file</returns>
-		private static AppConfig Load() {
-			AppConfig conf = null;
-			if (File.Exists(Path.Combine(Application.StartupPath, CONFIG_FILE_NAME))) {
-				configfilepath = Application.StartupPath;
-			}
-			string configfilename = Path.Combine(configfilepath, CONFIG_FILE_NAME);
-			try {
-				LOG.DebugFormat("Loading configuration from: {0}", configfilename);
-				using (FileStream fileStream = File.Open(configfilename, FileMode.Open, FileAccess.Read)) {
-					BinaryFormatter binaryFormatter = new BinaryFormatter();
-					conf = (AppConfig) binaryFormatter.Deserialize(fileStream);
-				}
-				conf.Output_File_FilenamePattern = FixFallback(conf.Output_File_FilenamePattern);
-				conf.Output_File_Path = FixFallback(conf.Output_File_Path);
-			} catch (Exception e) {
-				LOG.Warn("(ignoring) Problem loading configuration from: " + configfilename, e);
-			}
-			return conf;
-		}
-		
-		public static void UpgradeToIni() {
-			bool normalIni = File.Exists(Path.Combine(configfilepath, CONFIG_FILE_NAME));
-			bool startupIni = File.Exists(Path.Combine(Application.StartupPath, CONFIG_FILE_NAME));
-			if (startupIni || normalIni) {
-				AppConfig appConfig = Load();
-				
-				if (appConfig != null) {
-					LOG.Info("Migrating old configuration");
-					CoreConfiguration coreConfiguration = IniConfig.GetIniSection<CoreConfiguration>();
-					EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();
-					// copy values
-					try {
-						coreConfiguration.OutputFileFilenamePattern = appConfig.Output_File_FilenamePattern;
-						if (appConfig.Output_File_Format != null) {
-							coreConfiguration.OutputFileFormat = (OutputFormat)Enum.Parse(typeof(OutputFormat), appConfig.Output_File_Format.ToLower());
-						}
-						coreConfiguration.OutputFileIncrementingNumber = unchecked((uint)appConfig.Output_File_IncrementingNumber);
-						coreConfiguration.OutputFileJpegQuality = appConfig.Output_File_JpegQuality;
-						coreConfiguration.OutputFilePath = appConfig.Output_File_Path;
-						coreConfiguration.OutputFilePromptQuality = (bool)appConfig.Output_File_PromptJpegQuality;
-						coreConfiguration.Language = appConfig.Ui_Language;
-						coreConfiguration.PlayCameraSound = (bool)appConfig.Ui_Effects_CameraSound;
-						coreConfiguration.CaptureMousepointer = (bool)appConfig.Capture_Mousepointer;
-						coreConfiguration.OutputFileCopyPathToClipboard = (bool)appConfig.Output_File_CopyPathToClipboard;
-						coreConfiguration.OutputPrintAllowEnlarge = (bool)appConfig.Output_Print_AllowEnlarge;
-						coreConfiguration.OutputPrintAllowRotate = (bool)appConfig.Output_Print_AllowRotate;
-						coreConfiguration.OutputPrintAllowShrink = (bool)appConfig.Output_Print_AllowShrink;
-						coreConfiguration.OutputPrintCenter = (bool)appConfig.Output_Print_Center;
-						coreConfiguration.OutputPrintPromptOptions = (bool)appConfig.Output_Print_PromptOptions;
-						coreConfiguration.OutputPrintFooter = (bool)appConfig.Output_Print_Timestamp;
-						int delay = appConfig.Capture_Wait_Time-1;
-						if (delay < 0) {
-							delay = 0;
-						}
-						coreConfiguration.CaptureDelay = delay;
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.Clipboard) == ScreenshotDestinations.Clipboard) {
-							coreConfiguration.OutputDestinations.Add("Clipboard");
-						}
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.Editor) == ScreenshotDestinations.Editor) {
-							coreConfiguration.OutputDestinations.Add("Editor");
-						}
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.EMail) == ScreenshotDestinations.EMail) {
-							coreConfiguration.OutputDestinations.Add("EMail");
-						}
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.Printer) == ScreenshotDestinations.Printer) {
-							coreConfiguration.OutputDestinations.Add("Printer");
-						}
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.FileDefault) == ScreenshotDestinations.FileDefault) {
-							coreConfiguration.OutputDestinations.Add("File");
-						}
-						if ((appConfig.Output_Destinations & ScreenshotDestinations.FileWithDialog) == ScreenshotDestinations.FileWithDialog) {
-							coreConfiguration.OutputDestinations.Add("FileWithDialog");
-						}
-						IniConfig.Save();
-					} catch (Exception e) {
-						LOG.Error(e);
-					}
-				}
-				try {
-					LOG.Info("Deleting old configuration");
-					File.Delete(Path.Combine(configfilepath, CONFIG_FILE_NAME));
-				} catch (Exception e) {
-					LOG.Error(e);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Checks for the existence of a configuration file.
-		/// First in greenshot's Applicationdata folder (where it is stored since 0.6),
-		/// then (if it cannot be found there) in greenshot's program directory (where older 
-		/// versions might have stored it).
-		/// If the latter is the case, the file is moved to the new location, so that a user does not lose
-		/// their configuration after upgrading. 
-		/// If there is no file in both locations, a virgin config file is created.
-		/// </summary>
-		private static void CheckConfigFile() {
-			// check if file is in the same location as started from, if this is the case
-			// we will use this file instead of the ApplicationDate folder
-			// Done for Feature Request #2741508
-			if (File.Exists(Path.Combine(Application.StartupPath, CONFIG_FILE_NAME))) {
-				configfilepath = Application.StartupPath;
-			}
-		}
-	}
-}
diff --git a/Greenshot/Drawing/DrawableContainer.cs b/Greenshot/Drawing/DrawableContainer.cs
index 56698ec2d..2e4b27884 100644
--- a/Greenshot/Drawing/DrawableContainer.cs
+++ b/Greenshot/Drawing/DrawableContainer.cs
@@ -60,6 +60,10 @@ namespace Greenshot.Drawing {
 			}
 		}
 
+		/// <summary>
+		/// The public accessible Dispose
+		/// Will call the GarbageCollector to SuppressFinalize, preventing being cleaned twice
+		/// </summary>
 		public void Dispose() {
 			Dispose(true);
 			GC.SuppressFinalize(this);
diff --git a/Greenshot/Drawing/StepLabelContainer.cs b/Greenshot/Drawing/StepLabelContainer.cs
index acf3f93a6..5405c8cf2 100644
--- a/Greenshot/Drawing/StepLabelContainer.cs
+++ b/Greenshot/Drawing/StepLabelContainer.cs
@@ -21,10 +21,8 @@
 
 using Greenshot.Drawing.Fields;
 using Greenshot.Helpers;
-using Greenshot.Plugin;
 using Greenshot.Plugin.Drawing;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
@@ -133,9 +131,16 @@ namespace Greenshot.Drawing {
 		/// <summary>
 		/// Make sure this element is no longer referenced from the surface
 		/// </summary>
-		public new void Dispose() {
+		protected override void Dispose(bool disposing) {
+			base.Dispose(disposing);
+			if (!disposing) {
+				return;
+			}
 			((Surface)Parent).RemoveStepLabel(this);
-			base.Dispose();
+			if (_stringFormat != null) {
+				_stringFormat.Dispose();
+				_stringFormat = null;
+			}
 		}
 
 		public override bool HandleMouseMove(int x, int y) {
diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs
index 3a4e208bd..5118b3fa0 100644
--- a/Greenshot/Forms/MainForm.cs
+++ b/Greenshot/Forms/MainForm.cs
@@ -76,13 +76,6 @@ namespace Greenshot {
 			// Log the startup
 			LOG.Info("Starting: " + EnvironmentInfo.EnvironmentToString(false));
 
-			// Upgrade if needed
-			try {
-				AppConfig.UpgradeToIni();
-			} catch {
-				LOG.Warn("Couldn't upgrade the config.dat to geenshot.ini.");
-			}
-
 			// Read configuration
 			_conf = IniConfig.GetIniSection<CoreConfiguration>();
 			try {
diff --git a/Greenshot/GlobalSuppressions.cs b/Greenshot/GlobalSuppressions.cs
new file mode 100644
index 0000000000000000000000000000000000000000..c3a0d1715caf7e045730146ab01298ad181b8228
GIT binary patch
literal 12860
zcmeHNSx*~54EA%S{)bg6RUjY~kothshj2Cz6vPHpR8`eB2_Yqy*bORwzU}wfjP}Sv
zK@g5;gu?F5csw2-V|zS*|18V01k#W*=}L^ZQ#^ap#+!YQ(b|?4zJJOU{%^_<U+k~R
zKqA0i0m5Jt^aavKYZraV^)rxA#xla+1;)kr+q-^7(osxr<qfDH9T7$)fa_wmG2RFt
z;CZG!>?aOBiLVDZqs?X}oKeELhVl!&O^mKeI>SM(XGzz33Ai4x#sxaNz%ft?+Q3Wf
zZHx|-8jcCj%N28_7rK@NUqgj)ly)$Zumkj@R7CiSu>#W9Rh~B|@I)9xzQ=$WDlETj
zr5sQ0_kn?UBEYm|QTwkHmhbHCgOjA1-))R;X1I~k)6jK9n2&Q9b$OW?FWmeor=7kK
zKjqc|cM@5`Jd{pT&e3k1GkPe0CwFQ|+M7~yn~s?dje$J@CeAtn?WS*zy2^yc1qGd}
z=t#%mEUhUO6{#zIMeTK**uku{luCx9ft-MvF{o-ON2wpwi2>lUn(8=xv&I!Q+VR=!
zYk)aud$c~&Zqoe?ZRD>>oqg+=J5&p$E%gDr1**w^QWk?Y$|y#=<9X4ls}sD;Tkjm!
zzo%GeaWQ_Uz{+{3nbd~?ASkB_=BUYve2|a$tz*<sE#pA>e2K4f9YbCG0vbshEr;__
zgShX+z|p&2rC|+0zgb5hpLCY2)*DO%BU1Y`s9m&BCbVzjCe5Gm-BatiK&$a&1nzAq
zH4*0KJ~Y4|;i~dZcJY>o?I|OfEAX27!(Q%ai-o>WTdB7lnFnv?<-6_=UWU|^r<7s%
zC^9U{H!FKD-{-W^L&&!e3+G<qE%i0;wzO2nL`4sj_i$OuE4RuuS)JIA^P?W_9Twm%
z_MvYl@E$e9*EQ__4LOt}v^V6v-}9&FxA(zo%JURfU-Z%~L{7{JTz|RGzF9*azsKvs
zG-J4OT{y;0!WhqD`EB`)*zGPhpT)KS`wrz;wqe!Ow|zvdb^Lblwk==1je{%G^ZR><
z#7B@HpUlJZK4AghHSE6iTug6!JSESJfjfhPN<E8VE8i8$Bl-J#j)&9E^||%inTqAq
z_w{$&&3tq^JuTf-P4gM#Y@Y)7405*R>odq%Ij>9oeAa8;-`n4u1-KaDF45%e-oa;(
zjOm`|<To4V`wWt2;l(OQKHi??DnPj|_zd#3S9j73%4d*iRd$v#$RnKaSYDj1K&~R^
zU6D0ZAXy7#^_+Ff2z7E+b6M48b&s{iP%DG1HMe8~tyy?ha}8^LC#<90RU&`j{DWC~
zf-^@}8=s<LnVm0N&!iX2(_f5wHo%9W@_;qYmwGDTWt!HgXGNy|u0U1m5&o{gOTX{o
zPkQ`GPyW0=UwihqdKgJQMV!M5&TZ%F{-lSN>hJjd?~Y%2c5nBD{9OTBb3VWECq4eI
Pz-zn5>rZ;7aaZ6U9^}=n

literal 0
HcmV?d00001

diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index 21b8faef2..61f4cb890 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -30,7 +30,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="Configuration\AppConfig.cs" />
     <Compile Include="Configuration\EditorConfiguration.cs" />
     <Compile Include="Configuration\LanguageKeys.cs" />
     <Compile Include="Configuration\RuntimeConfig.cs" />
@@ -204,6 +203,7 @@
     </Compile>
     <None Include="App.config" />
     <None Include="Helpers\AviHelper.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Helpers\CaptureHelper.cs" />
     <Compile Include="Helpers\Colors.cs" />
     <Compile Include="Helpers\CopyData.cs" />
diff --git a/Greenshot/Helpers/CaptureHelper.cs b/Greenshot/Helpers/CaptureHelper.cs
index 30c25f962..2e9be5c8b 100644
--- a/Greenshot/Helpers/CaptureHelper.cs
+++ b/Greenshot/Helpers/CaptureHelper.cs
@@ -40,7 +40,7 @@ namespace Greenshot.Helpers {
 	/// <summary>
 	/// CaptureHelper contains all the capture logic 
 	/// </summary>
-	public class CaptureHelper {
+	public class CaptureHelper : IDisposable {
 		private static readonly ILog LOG = LogManager.GetLogger(typeof(CaptureHelper));
 		private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
 		// TODO: when we get the screen capture code working correctly, this needs to be enabled
@@ -73,36 +73,48 @@ namespace Greenshot.Helpers {
 			if (disposing) {
 				// Cleanup
 			}
+			// Unfortunately we can't dispose the capture, this might still be used somewhere else.
 			_windows = null;
 			_selectedCaptureWindow = null;
 			_capture = null;
 		}
 		public static void CaptureClipboard() {
-			new CaptureHelper(CaptureMode.Clipboard).MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Clipboard)) {
+				captureHelper.MakeCapture();
+			}
 		}
 		public static void CaptureRegion(bool captureMouse) {
-			new CaptureHelper(CaptureMode.Region, captureMouse).MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Region, captureMouse)) {
+				captureHelper.MakeCapture();
+			}
 		}
 		public static void CaptureRegion(bool captureMouse, IDestination destination) {
-			CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Region, captureMouse, destination);
-			captureHelper.MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Region, captureMouse, destination)) {
+				captureHelper.MakeCapture();			
+			}
 		}
 		public static void CaptureRegion(bool captureMouse, Rectangle region) {
-			new CaptureHelper(CaptureMode.Region, captureMouse).MakeCapture(region);
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Region, captureMouse)) {
+				captureHelper.MakeCapture(region);
+			}
 		}
 		public static void CaptureFullscreen(bool captureMouse, ScreenCaptureMode screenCaptureMode) {
-			CaptureHelper captureHelper = new CaptureHelper(CaptureMode.FullScreen, captureMouse);
-			captureHelper._screenCaptureMode = screenCaptureMode;
-			captureHelper.MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.FullScreen, captureMouse)) {
+				captureHelper._screenCaptureMode = screenCaptureMode;
+				captureHelper.MakeCapture();
+			}
 		}
 		public static void CaptureLastRegion(bool captureMouse) {
-			new CaptureHelper(CaptureMode.LastRegion, captureMouse).MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.LastRegion, captureMouse)) {
+				captureHelper.MakeCapture();
+			}
 		}
 
 		public static void CaptureIE(bool captureMouse, WindowDetails windowToCapture) {
-			CaptureHelper captureHelper = new CaptureHelper(CaptureMode.IE, captureMouse);
-			captureHelper.SelectedCaptureWindow = windowToCapture;
-			captureHelper.MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.IE, captureMouse)) {
+				captureHelper.SelectedCaptureWindow = windowToCapture;
+				captureHelper.MakeCapture();
+			}
 		}
 
 		public static void CaptureWindow(bool captureMouse) {
@@ -110,27 +122,35 @@ namespace Greenshot.Helpers {
 		}
 
 		public static void CaptureWindow(WindowDetails windowToCapture) {
-			CaptureHelper captureHelper = new CaptureHelper(CaptureMode.ActiveWindow);
-			captureHelper.SelectedCaptureWindow = windowToCapture;
-			captureHelper.MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.ActiveWindow)) {
+				captureHelper.SelectedCaptureWindow = windowToCapture;
+				captureHelper.MakeCapture();
+			}
 		}
 
 		public static void CaptureWindowInteractive(bool captureMouse) {
-			new CaptureHelper(CaptureMode.Window, captureMouse).MakeCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.Window)) {
+				captureHelper.MakeCapture();
+			}
 		}
 
 		public static void CaptureFile(string filename) {
-			new CaptureHelper(CaptureMode.File).MakeCapture(filename);
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.File)) {
+				captureHelper.MakeCapture(filename);
+			}
 		}
 
 		public static void CaptureFile(string filename, IDestination destination) {
-			new CaptureHelper(CaptureMode.File).AddDestination(destination).MakeCapture(filename);
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.File)) {
+				captureHelper.AddDestination(destination).MakeCapture(filename);
+			}
 		}
 
 		public static void ImportCapture(ICapture captureToImport) {
-			CaptureHelper captureHelper = new CaptureHelper(CaptureMode.File);
-			captureHelper._capture = captureToImport;
-			captureHelper.HandleCapture();
+			using (CaptureHelper captureHelper = new CaptureHelper(CaptureMode.File)) {
+				captureHelper._capture = captureToImport;
+				captureHelper.HandleCapture();
+			}
 		}
 
 		public CaptureHelper AddDestination(IDestination destination) {
diff --git a/Greenshot/Helpers/MailHelper.cs b/Greenshot/Helpers/MailHelper.cs
index 4c7317545..44ee22a54 100644
--- a/Greenshot/Helpers/MailHelper.cs
+++ b/Greenshot/Helpers/MailHelper.cs
@@ -18,6 +18,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
+using Greenshot.IniFile;
+using Greenshot.Plugin;
+using GreenshotPlugin.Core;
+using log4net;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -26,44 +31,40 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Windows.Forms;
 
-using Greenshot.Plugin;
-using GreenshotPlugin.Core;
-using Greenshot.IniFile;
-/// <summary>
-/// Author: Andrew Baker
-/// Datum: 10.03.2006
-/// Available from: http://www.vbusers.com/codecsharp/codeget.asp?ThreadID=71&PostID=1
-/// </summary>
-using log4net;
-
 namespace Greenshot.Helpers {
+	/// <summary>
+	/// Author: Andrew Baker
+	/// Datum: 10.03.2006
+	/// Available from: http://www.vbusers.com/codecsharp/codeget.asp?ThreadID=71&PostID=1
+	/// </summary>
 	#region Public MapiMailMessage Class
 
 	/// <summary>
 	/// Represents an email message to be sent through MAPI.
 	/// </summary>
-	public class MapiMailMessage {
+	public class MapiMailMessage : IDisposable {
 		private static readonly ILog LOG = LogManager.GetLogger(typeof(MapiMailMessage));
-		private static CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
+		private static readonly CoreConfiguration conf = IniConfig.GetIniSection<CoreConfiguration>();
 
 		/// <summary>
 		/// Helper Method for creating an Email with Attachment
 		/// </summary>
-		/// <param name="fullpath">Path to file</param>
-		/// <param name="captureDetails"></param>
+		/// <param name="fullPath">Path to file</param>
+		/// <param name="title"></param>
 		public static void SendImage(string fullPath, string title) {
-			MapiMailMessage message = new MapiMailMessage(title, null);
-			message.Files.Add(fullPath);
-			if (!string.IsNullOrEmpty(conf.MailApiTo)) {
-				message._recipientCollection.Add(new Recipient(conf.MailApiTo, RecipientType.To));
+			using (MapiMailMessage message = new MapiMailMessage(title, null)) {
+				message.Files.Add(fullPath);
+				if (!string.IsNullOrEmpty(conf.MailApiTo)) {
+					message._recipientCollection.Add(new Recipient(conf.MailApiTo, RecipientType.To));
+				}
+				if (!string.IsNullOrEmpty(conf.MailApiCC)) {
+					message._recipientCollection.Add(new Recipient(conf.MailApiCC, RecipientType.CC));
+				}
+				if (!string.IsNullOrEmpty(conf.MailApiBCC)) {
+					message._recipientCollection.Add(new Recipient(conf.MailApiBCC, RecipientType.BCC));
+				}
+				message.ShowDialog();
 			}
-			if (!string.IsNullOrEmpty(conf.MailApiCC)) {
-				message._recipientCollection.Add(new Recipient(conf.MailApiCC, RecipientType.CC));
-			}
-			if (!string.IsNullOrEmpty(conf.MailApiBCC)) {
-				message._recipientCollection.Add(new Recipient(conf.MailApiBCC, RecipientType.BCC));
-			}
-			message.ShowDialog();
 		}
 
 
@@ -133,8 +134,8 @@ namespace Greenshot.Helpers {
 		private string _subject;
 		private string _body;
 		private RecipientCollection _recipientCollection;
-		private List<string> _files;
-		private ManualResetEvent _manualResetEvent;
+		private readonly List<string> _files;
+		private readonly ManualResetEvent _manualResetEvent;
 
 		#endregion Member Variables
 
@@ -230,10 +231,25 @@ namespace Greenshot.Helpers {
 			_manualResetEvent.Reset();
 		}
 
+		public void Dispose() {
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
 		#endregion Public Methods
 
 		#region Private Methods
 
+		protected virtual void Dispose(bool disposing) {
+			if (!disposing) {
+				return;
+			}
+			if (_manualResetEvent != null) {
+				_manualResetEvent.Close();
+			}
+
+		}
+
 		/// <summary>
 		/// Sends the mail message.
 		/// </summary>
@@ -504,7 +520,7 @@ namespace Greenshot.Helpers {
 				public IntPtr EntryID = IntPtr.Zero;
 			}
 
-			[DllImport("MAPI32.DLL", SetLastError = true, CharSet=CharSet.Unicode)]
+			[DllImport("MAPI32.DLL", SetLastError = true, CharSet=CharSet.Ansi)]
 			public static extern int MAPISendMail(IntPtr session, IntPtr hwnd, MapiMessage message, int flg, int rsv);
 
 			#endregion Structs
diff --git a/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs b/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs
index b8ae93598..773fbee38 100644
--- a/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs
+++ b/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs
@@ -114,7 +114,7 @@ namespace ExternalCommand {
 				} catch {
 					w32ex.Data.Add("commandline", config.commandlines[presetCommand]);
 					w32ex.Data.Add("arguments", config.arguments[presetCommand]);
-					throw w32ex;
+					throw;
 				}
 			} catch (Exception ex) {
 				ex.Data.Add("commandline", config.commandlines[presetCommand]);
@@ -127,7 +127,7 @@ namespace ExternalCommand {
 			string commandline = config.commandlines[commando];
 			string arguments = config.arguments[commando];
 			output = null;
-			if (commandline != null && commandline.Length > 0) {
+			if (!string.IsNullOrEmpty(commandline)) {
 				using (Process p = new Process()) {
 					p.StartInfo.FileName = commandline;
 					p.StartInfo.Arguments = String.Format(arguments, fullPath);
diff --git a/GreenshotOfficePlugin/GlobalSuppressions.cs b/GreenshotOfficePlugin/GlobalSuppressions.cs
new file mode 100644
index 0000000000000000000000000000000000000000..882507f6b2bc153394105cf0e4819544426c8df0
GIT binary patch
literal 3260
zcmeH}OK;Oa6ou~^iT_|33AGY!c}OfOu_&Mx7J*1f76`F0shgT6PE<RU!jFf3=T1g;
z9O#AxSwvN8&)nCUbMBqw_pcK>vBZXUZG~05UGbb+&RbY7+0E^e^><tG|DDZQ$$n;~
zW%#b}2);G8#AfUk*y{B&v4JgZ!QU-$6@R_;GqZ_jdTftCAsiV|HGT!vmb}S7;d$*A
z*_A_2<(uLcu!YL<3rJLJZa=V&i9WWbLVv?@<Y&FZZ%WpxgR>w<=?HT2Dtk_J;%F3;
zVAY9r(px`E&1&vG5$S|T`IcB36d9|E69`}7oR7EiWW<Q~3ZJ?AY86hZc(FetgYsnf
z<o3+%EBDpAtTUJtYOQmk$1OG*JVQT6Mm^OC=r%PAT*Uef)3INaU%E|Tr?w;NNS(3W
zupgKUc%*;SU0u>x8#E8~Sm>c8*=sVX>H_Sc-y*tntK*VR&!rw28E#{3P^9+J@pZd5
zGI35-O-kBgG_fzBS%T`)8C8F%CrbR<of?_`d&hM<I`SOmtE7fzPtzB=Te!cnCw_zK
zvYk?U;1jA@n&JB%)Z$;rDzHhTiv7rWcdC!KxZIrH1J2*`ESk8A&lOo!N1dsDDDjX^
zDK*aQg*~^|d`^j)`(*T;=Q~z69;06T1V&-g<fxuHNcT=fj_LZ8A?pDAVLB3f<5k*S
zAAE*HH1ip}F4&PKns4P6X6Y@Sbdm+@&zwcPYqqq~jWoq3q$A#?zqos1ABefYtHw)O
zhg)W02Oai9g+6|o$W3KN>-w+k<(91-_tXyI^3cBdeX`eFo%O#oAN-@{ZC&@O?!qMZ
zxTAC<ov-hQw@kfm0o@7@P4iy8T~beTrC)6NuG8<3pXj$&Z`Z#?<Lr%Gy+0|~p0azr
Cr#kll

literal 0
HcmV?d00001

diff --git a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj
index 6297f5d4e..7709d4fb3 100644
--- a/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj
+++ b/GreenshotOfficePlugin/GreenshotOfficePlugin.csproj
@@ -54,6 +54,7 @@
     <Compile Include="Destinations\OneNoteDestination.cs" />
     <Compile Include="Destinations\PowerpointDestination.cs" />
     <Compile Include="Destinations\WordDestination.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="OfficeConfiguration.cs" />
     <Compile Include="OfficePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -76,9 +77,7 @@
       <Name>GreenshotPlugin</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Destinations" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
   <PropertyGroup>
     <PostBuildEvent>mkdir "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)"
diff --git a/GreenshotOfficePlugin/OfficeInterop/OutlookUtils.cs b/GreenshotOfficePlugin/OfficeInterop/OutlookUtils.cs
index 9a38daa9b..eeab0638b 100644
--- a/GreenshotOfficePlugin/OfficeInterop/OutlookUtils.cs
+++ b/GreenshotOfficePlugin/OfficeInterop/OutlookUtils.cs
@@ -434,6 +434,8 @@ namespace Greenshot.Interop.Office {
 		PR_REPORTING_MTA_CERTIFICATE = PT.PT_BINARY | 0x1004 << 16,
 	};
 
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Interoperability", "CA1401:PInvokesShouldNotBeVisible")]
+	[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1060:MovePInvokesToNativeMethodsClass")]
 	public class OutlookUtils {
 		private static readonly log4net.ILog LOG = log4net.LogManager.GetLogger(typeof(OutlookUtils));
 		private const uint KEEP_OPEN_READONLY = 0x00000001;
@@ -783,20 +785,13 @@ namespace Greenshot.Interop.Office {
 		}
 
 		#region MAPI DLL Imports
-
-		[DllImport("MAPI32.DLL", CharSet = CharSet.Ansi, EntryPoint = "HrGetOneProp@12")]
-		private static extern void HrGetOneProp(IntPtr pmp, uint ulPropTag, out IntPtr ppProp);
-
-		[DllImport("MAPI32.DLL", CharSet = CharSet.Ansi, EntryPoint = "HrSetOneProp@8")]
+		[DllImport("MAPI32.DLL", EntryPoint = "HrSetOneProp@8")]
 		private static extern void HrSetOneProp(IntPtr pmp, IntPtr pprop);
 
-		[DllImport("MAPI32.DLL", CharSet = CharSet.Ansi, EntryPoint = "MAPIFreeBuffer@4")]
-		private static extern void MAPIFreeBuffer(IntPtr lpBuffer);
-
-		[DllImport("MAPI32.DLL", CharSet = CharSet.Ansi)]
+		[DllImport("MAPI32.DLL")]
 		private static extern int MAPIInitialize(IntPtr lpMapiInit);
 
-		[DllImport("MAPI32.DLL", CharSet = CharSet.Ansi)]
+		[DllImport("MAPI32.DLL")]
 		private static extern void MAPIUninitialize();
 		#endregion
 	}
diff --git a/GreenshotPlugin/Controls/HotkeyControl.cs b/GreenshotPlugin/Controls/HotkeyControl.cs
index 2086e9360..00731f9e0 100644
--- a/GreenshotPlugin/Controls/HotkeyControl.cs
+++ b/GreenshotPlugin/Controls/HotkeyControl.cs
@@ -79,7 +79,7 @@ namespace GreenshotPlugin.Controls {
 
 		[DllImport("user32.dll", SetLastError = true)]
 		private static extern uint MapVirtualKey(uint uCode, uint uMapType);
-		[DllImport("user32.dll", EntryPoint = "GetKeyNameTextA", SetLastError = true)]
+		[DllImport("user32.dll", EntryPoint = "GetKeyNameTextW", SetLastError = true, CharSet = CharSet.Unicode)]
 		private static extern int GetKeyNameText(uint lParam, [Out] StringBuilder lpString, int nSize);
 
 		// These variables store the current hotkey and modifier(s)
diff --git a/GreenshotPlugin/Core/WindowsHelper.cs b/GreenshotPlugin/Core/WindowsHelper.cs
index 305131c4b..a63a0dc8f 100644
--- a/GreenshotPlugin/Core/WindowsHelper.cs
+++ b/GreenshotPlugin/Core/WindowsHelper.cs
@@ -1366,7 +1366,7 @@ namespace GreenshotPlugin.Core  {
 				}
 				returnImage = new Bitmap(windowRect.Width, windowRect.Height, pixelFormat);
 				using (Graphics graphics = Graphics.FromImage(returnImage)) {
-					using (SafeDeviceContextHandle graphicsDC = graphics.getSafeDeviceContext()) {
+					using (SafeDeviceContextHandle graphicsDC = graphics.GetSafeDeviceContext()) {
 						bool printSucceeded = User32.PrintWindow(Handle, graphicsDC.DangerousGetHandle(), 0x0);
 						if (!printSucceeded) {
 							// something went wrong, most likely a "0x80004005" (Acess Denied) when using UAC
diff --git a/GreenshotPlugin/GlobalSuppressions.cs b/GreenshotPlugin/GlobalSuppressions.cs
new file mode 100644
index 0000000000000000000000000000000000000000..691d5bdece11f0918b96cf2f03101a372ba9fb84
GIT binary patch
literal 112942
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
VhxM?VLm%4Z6yrzuIS4F){{b(9sMG)e

literal 0
HcmV?d00001

diff --git a/GreenshotPlugin/GreenshotPlugin.csproj b/GreenshotPlugin/GreenshotPlugin.csproj
index b5274de11..c1bb819dc 100644
--- a/GreenshotPlugin/GreenshotPlugin.csproj
+++ b/GreenshotPlugin/GreenshotPlugin.csproj
@@ -35,6 +35,7 @@
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Core\FastBitmap.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="IEInterop\IHTMLBodyElement.cs" />
     <Compile Include="IEInterop\IHTMLCurrentStyle.cs" />
     <Compile Include="IEInterop\IHTMLDocument.cs" />
diff --git a/GreenshotPlugin/UnmanagedHelpers/GDI32.cs b/GreenshotPlugin/UnmanagedHelpers/GDI32.cs
index cfd7eda62..e6d7c9ba0 100644
--- a/GreenshotPlugin/UnmanagedHelpers/GDI32.cs
+++ b/GreenshotPlugin/UnmanagedHelpers/GDI32.cs
@@ -18,6 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
@@ -51,7 +52,7 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 		/// </summary>
 		/// <param name="graphics"></param>
 		/// <returns>SafeDeviceContextHandle</returns>
-		public static SafeDeviceContextHandle getSafeDeviceContext(this Graphics graphics) {
+		public static SafeDeviceContextHandle GetSafeDeviceContext(this Graphics graphics) {
 			return SafeDeviceContextHandle.fromGraphics(graphics);
 		}
 	}
@@ -75,10 +76,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 	/// A hbitmap SafeHandle implementation
 	/// </summary>
 	public class SafeHBitmapHandle : SafeObjectHandle {
-		[SecurityCritical]
-		private SafeHBitmapHandle() : base(true) {
-		}
-
 		[SecurityCritical]
 		public SafeHBitmapHandle(IntPtr preexistingHandle) : base(true) {
 			SetHandle(preexistingHandle);
@@ -89,10 +86,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 	/// A hRegion SafeHandle implementation
 	/// </summary>
 	public class SafeRegionHandle : SafeObjectHandle {
-		[SecurityCritical]
-		private SafeRegionHandle() : base(true) {
-		}
-
 		[SecurityCritical]
 		public SafeRegionHandle(IntPtr preexistingHandle) : base(true) {
 			SetHandle(preexistingHandle);
@@ -103,10 +96,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 	/// A dibsection SafeHandle implementation
 	/// </summary>
 	public class SafeDibSectionHandle : SafeObjectHandle {
-		[SecurityCritical]
-		private SafeDibSectionHandle() : base(true) {
-		}
-
 		[SecurityCritical]
 		public SafeDibSectionHandle(IntPtr preexistingHandle) : base(true) {
 			SetHandle(preexistingHandle);
@@ -123,10 +112,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 
 		private SafeHandle hdc;
 
-		[SecurityCritical]
-		private SafeSelectObjectHandle() : base(true) {
-		}
-
 		[SecurityCritical]
 		public SafeSelectObjectHandle(SafeDCHandle hdc, SafeHandle newHandle) : base(true) {
 			this.hdc = hdc;
@@ -150,10 +135,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 		[DllImport("gdi32", SetLastError = true)]
 		private static extern bool DeleteDC(IntPtr hDC);
 
-		[SecurityCritical]
-		private SafeCompatibleDCHandle() : base(true) {
-		}
-
 		[SecurityCritical]
 		public SafeCompatibleDCHandle(IntPtr preexistingHandle) : base(true) {
 			SetHandle(preexistingHandle);
@@ -173,9 +154,6 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 	/// </summary>
 	public class SafeDeviceContextHandle : SafeDCHandle {
 		private Graphics graphics = null;
-		[SecurityCritical]
-		private SafeDeviceContextHandle() : base(true) {
-		}
 
 		[SecurityCritical]
 		public SafeDeviceContextHandle(Graphics graphics, IntPtr preexistingHandle) : base(true) {
@@ -225,10 +203,10 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 		/// <param name="target"></param>
 		/// <param name="source"></param>
 		public static void StretchBlt(this Graphics target, Bitmap sourceBitmap, Rectangle source, Rectangle destination) {
-			using (SafeDeviceContextHandle targetDC = target.getSafeDeviceContext()) {
+			using (SafeDeviceContextHandle targetDC = target.GetSafeDeviceContext()) {
 				using (SafeCompatibleDCHandle safeCompatibleDCHandle = CreateCompatibleDC(targetDC)) {
 					using (SafeHBitmapHandle hBitmapHandle = new SafeHBitmapHandle(sourceBitmap.GetHbitmap())) {
-						using (SafeSelectObjectHandle selectObject = safeCompatibleDCHandle.SelectObject(hBitmapHandle)) {
+						using (safeCompatibleDCHandle.SelectObject(hBitmapHandle)) {
 							StretchBlt(targetDC, destination.X, destination.Y, destination.Width, destination.Height, safeCompatibleDCHandle, source.Left, source.Top, source.Width, source.Height, CopyPixelOperation.SourceCopy);
 						}
 					}
@@ -242,10 +220,10 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 		/// <param name="target"></param>
 		/// <param name="source"></param>
 		public static void BitBlt(this Graphics target, Bitmap sourceBitmap, Rectangle source, Point destination, CopyPixelOperation rop) {
-			using (SafeDeviceContextHandle targetDC = target.getSafeDeviceContext()) {
+			using (SafeDeviceContextHandle targetDC = target.GetSafeDeviceContext()) {
 				using (SafeCompatibleDCHandle safeCompatibleDCHandle = CreateCompatibleDC(targetDC)) {
 					using (SafeHBitmapHandle hBitmapHandle = new SafeHBitmapHandle(sourceBitmap.GetHbitmap())) {
-						using (SafeSelectObjectHandle selectObject = safeCompatibleDCHandle.SelectObject(hBitmapHandle)) {
+						using (safeCompatibleDCHandle.SelectObject(hBitmapHandle)) {
 							BitBlt(targetDC, destination.X, destination.Y, source.Width, source.Height, safeCompatibleDCHandle, source.Left, source.Top, rop);
 						}
 					}
diff --git a/GreenshotPlugin/UnmanagedHelpers/User32.cs b/GreenshotPlugin/UnmanagedHelpers/User32.cs
index ac4447ed3..5730b9db9 100644
--- a/GreenshotPlugin/UnmanagedHelpers/User32.cs
+++ b/GreenshotPlugin/UnmanagedHelpers/User32.cs
@@ -116,7 +116,7 @@ namespace GreenshotPlugin.UnmanagedHelpers {
 		public extern static IntPtr GetWindowLongPtr(IntPtr hwnd, int nIndex);
 		[DllImport("user32", SetLastError = true)]
 		public static extern int SetWindowLong(IntPtr hWnd, int index, int styleFlags);
-		[DllImport("user32", SetLastError = true)]
+		[DllImport("user32", SetLastError = true, EntryPoint = "SetWindowLongPtr")]
 		public static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int index, IntPtr styleFlags);
 		[DllImport("user32", SetLastError = true)]
 		public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);