Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions

View file

@ -59,6 +59,7 @@ namespace GreenshotPlugin.Core {
/// <summary>Encapsulates dialog functionality from the Credential Management API.</summary>
public sealed class CredentialsDialog {
[DllImport("gdi32.dll", SetLastError=true)]
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool DeleteObject(IntPtr hObject);
/// <summary>The only valid bitmap height (in pixels) of a user-defined banner.</summary>
@ -101,7 +102,7 @@ namespace GreenshotPlugin.Core {
Banner = banner;
}
private bool _alwaysDisplay = false;
private bool _alwaysDisplay;
/// <summary>
/// Gets or sets if the dialog will be shown even if the credentials
/// can be returned from an existing credential in the credential manager.
@ -137,7 +138,7 @@ namespace GreenshotPlugin.Core {
}
}
private bool _incorrectPassword = false;
private bool _incorrectPassword;
/// <summary>Gets or sets if the incorrect password balloontip needs to be shown. Introduced AFTER Windows XP</summary>Gets></summary>
public bool IncorrectPassword {
get {
@ -148,7 +149,7 @@ namespace GreenshotPlugin.Core {
}
}
private bool _keepName = false;
private bool _keepName;
/// <summary>Gets or sets if the name is read-only.</summary>
public bool KeepName {
get {
@ -199,7 +200,7 @@ namespace GreenshotPlugin.Core {
}
}
private bool _saveChecked = false;
private bool _saveChecked;
/// <summary>Gets or sets if the save checkbox status.</summary>
public bool SaveChecked {
get {
@ -284,7 +285,7 @@ namespace GreenshotPlugin.Core {
}
}
private Image _banner = null;
private Image _banner;
/// <summary>Gets or sets the image to display on the dialog.</summary>
/// <remarks>A null value will cause a system default image to be used.</remarks>
public Image Banner {
@ -602,6 +603,6 @@ namespace GreenshotPlugin.Core {
/// http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/security/creduiconfirmcredentials.asp
/// </summary>
[DllImport("credui.dll", CharSet=CharSet.Unicode)]
public static extern ReturnCodes CredUIConfirmCredentials(string targetName, bool confirm);
public static extern ReturnCodes CredUIConfirmCredentials(string targetName, [MarshalAs(UnmanagedType.Bool)] bool confirm);
}
}