Merged 1.2 into master

Greenshot/Drawing/TextContainer.cs

@@ -247,7 +247,7 @@ namespace Greenshot.Drawing {
 			rect = GuiRectangle.GetGuiRectangle(Left, Top, Width, Height);
 
 			int pixelsAfter = rect.Width * rect.Height;
-			float factor = pixelsAfter / pixelsBefore;
+			float factor = pixelsAfter / (float)pixelsBefore;
 
 			float fontSize = GetFieldValueAsFloat(FieldType.FONT_SIZE);
 			fontSize *= factor;

Greenshot/releases/additional_files/readme.txt.template

@@ -9,6 +9,14 @@ All details to our tickets can be found here: https://greenshot.atlassian.net
 
 @DETAILVERSION@
 
+Bugs Resolved:
+* BUG-1655: Greenshot uses the default proxy, even if the "use default proxy" check-box is not checked.
+* BUG-1730: File type in the Save-As dialog doesn't default to configured output format.
+* BUG-1735: Editor crashed when trying to scale down a screenshot with text element
+
+
+1.2.4.10-RELEASE-94d66e09eb89
+
 Bugs Resolved:
 * BUG-1724: Error when using "Alt + PrintScreen" after clicking system tray
 

GreenshotPlugin/Controls/SaveImageFileDialog.cs

@@ -90,10 +90,12 @@ namespace GreenshotPlugin.Controls {
 			prepareFilterOptions();
 			string fdf = "";
 			int preselect = 0;
+            var outputFileFormatAsString = Enum.GetName(typeof(OutputFormat), conf.OutputFileFormat);
 			for(int i=0; i<filterOptions.Length; i++){
 				FilterOption fo = filterOptions[i];
 				fdf +=  fo.Label + "|*." + fo.Extension + "|";
-				if(conf.OutputFileAsFullpath.EndsWith(fo.Extension, StringComparison.CurrentCultureIgnoreCase)) preselect = i;
+                if(outputFileFormatAsString == fo.Extension)
+				    preselect = i;
 			}
 			fdf = fdf.Substring(0, fdf.Length-1);
 			saveFileDialog.Filter = fdf;

GreenshotPlugin/Core/NetworkHelper.cs

@@ -128,7 +128,9 @@ namespace GreenshotPlugin.Core {
 			HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri);
 			if (Config.UseProxy) {
 				webRequest.Proxy = CreateProxy(uri);
-				//webRequest.Proxy.Credentials = CredentialCache.DefaultCredentials;
+			} else {
+				// BUG-1655: Fix that Greenshot always uses the default proxy even if the "use default proxy" checkbox is unset
+				webRequest.Proxy = null;
 			}
 			webRequest.AllowAutoRedirect = true;
 			// Set default timeouts

GreenshotPlugin/GreenshotPlugin.csproj

@@ -64,6 +64,7 @@
     <Compile Include="Interop\ComProgIdAttribute.cs" />
     <Compile Include="Interop\COMWrapper.cs" />
     <Compile Include="Interop\IAppVisibility.cs" />
+    <Compile Include="Interop\IUnknown.cs" />
     <Compile Include="Interop\IDispatch.cs" />
     <Compile Include="Interop\IOleWindow.cs" />
     <Compile Include="Interop\IOleCommandTarget.cs" />

GreenshotPlugin/Interop/COMWrapper.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.Reflection;
 using System.Runtime.InteropServices;
@@ -49,17 +50,17 @@ namespace Greenshot.Interop {
 		/// <summary>
 		/// Type of the COM object, set on constructor after getting the COM reference
 		/// </summary>
-		private Type _COMType;
+		private readonly Type _COMType;
 
 		/// <summary>
 		/// The type of which method calls are intercepted and executed on the COM object.
 		/// </summary>
-		private Type _InterceptType;
+		private readonly Type _InterceptType;
 
 		/// <summary>
 		/// The humanly readable target name
 		/// </summary>
-		private string _TargetName;
+		private readonly string _TargetName;
 
 		#endregion
 		[DllImport("ole32.dll")]
@@ -73,7 +74,7 @@ namespace Greenshot.Interop {
 		/// <summary>
 		/// Gets a COM object and returns the transparent proxy which intercepts all calls to the object
 		/// </summary>
-		/// <param name="type">Interface which defines the method and properties to intercept</param>
+		/// <param name="T">Interface which defines the method and properties to intercept</param>
 		/// <returns>Transparent proxy to the real proxy for the object</returns>
 		/// <remarks>The <paramref name="type"/> must be an interface decorated with the <see cref="ComProgIdAttribute"/>attribute.</remarks>
 		public static T GetInstance<T>() {
@@ -183,6 +184,7 @@ namespace Greenshot.Interop {
 					}
 				} catch (Exception e) {
 					LOG.WarnFormat("Error {1} creating object for {0}", progId, e.Message);
+					throw;
 				}
 			}
 			if (comObject != null) {
@@ -290,6 +292,25 @@ namespace Greenshot.Interop {
 			return default(T);
 		}
 
+		/// <summary>
+		/// Wrap a com object as COMWrapper
+		/// </summary>
+		/// <param name="comObject">An object to intercept</param>
+		/// <param name="T">Interface which defines the method and properties to intercept</param>
+		/// <returns>Transparent proxy to the real proxy for the object</returns>
+		public static T Wrap<T>(object comObject) {
+			Type type = typeof (T);
+			if (null == comObject) {
+				throw new ArgumentNullException("comObject");
+			}
+			if (null == type) {
+				throw new ArgumentNullException("type");
+			}
+
+			COMWrapper wrapper = new COMWrapper(comObject, type, type.FullName);
+			return (T)wrapper.GetTransparentProxy();
+		}
+
 		/// <summary>
 		/// Wrap an object and return the transparent proxy which intercepts all calls to the object
 		/// </summary>

GreenshotPlugin/Interop/IDispatch.cs

@@ -1,14 +1,44 @@
-using System;
+/*
-using System.Collections.Generic;
+ * Greenshot - a free and open source screenshot tool
-using System.Text;
+ * 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.Runtime.InteropServices;
 using System.Runtime.InteropServices.CustomMarshalers;
 
+
 namespace Greenshot.Interop {
-	[ComImport, Guid("00020400-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	[ComImport, Guid("00020400-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsDual)]
-	public interface IDispatch {
+	public interface IDispatch : IUnknown {
-		void Reserved();
 		[PreserveSig]
-		int GetTypeInfo(uint nInfo, int lcid, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(TypeToTypeInfoMarshaler))] out Type typeInfo);
+		int GetTypeInfoCount(out int count);
+
+		[PreserveSig]
+		int GetTypeInfo([MarshalAs(UnmanagedType.U4)] int iTInfo, [MarshalAs(UnmanagedType.U4)] int lcid, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(TypeToTypeInfoMarshaler))] out Type typeInfo);
+
+		[PreserveSig]
+		int GetIDsOfNames(ref Guid riid, [MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.LPWStr)]
+            string[] rgsNames, int cNames, int lcid, [MarshalAs(UnmanagedType.LPArray)] int[] rgDispId);
+
+		[PreserveSig]
+		int Invoke(int dispIdMember, ref Guid riid, uint lcid, ushort wFlags, ref System.Runtime.InteropServices.ComTypes.DISPPARAMS pDispParams,
+				out object pVarResult, ref System.Runtime.InteropServices.ComTypes.EXCEPINFO pExcepInfo, IntPtr[] pArgErr);
 	}
 }

GreenshotPlugin/Interop/IOleWindow.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.Runtime.InteropServices;
 

GreenshotPlugin/Interop/IUnknown.cs

@@ -0,0 +1,36 @@
+/*
+ * 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.Runtime.InteropServices;
+
+namespace Greenshot.Interop {
+	[ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("00000000-0000-0000-C000-000000000046")]
+	public interface IUnknown {
+		IntPtr QueryInterface(ref Guid riid);
+
+		[PreserveSig]
+		UInt32 AddRef();
+
+		[PreserveSig]
+		UInt32 Release();
+	}
+}