github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a NullReference and changed the way we read the icon for the windows in the List.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2419 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-01-08 11:13:18 +00:00
parent 5ce65ab191
commit 8a3fd911bf
3 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

43
GreenshotPlugin/Core/WindowsHelper.cs
View file

@ -282,6 +282,16 @@ namespace GreenshotPlugin.Core {
/// </summary>
public Image DisplayIcon {
get {
try {
using (Icon appIcon = GetAppIcon(this.Handle)) {
if (appIcon != null) {
return appIcon.ToBitmap();
}
}
} catch (Exception ex) {
LOG.WarnFormat("Couldn't get icon for window {0} due to: {1}", Text, ex.Message);
LOG.Warn(ex);
}
if (isMetroApp) {
// No method yet to get the metro icon
return null;
@ -304,7 +314,38 @@ namespace GreenshotPlugin.Core {
}
return null;
}
}
}
/// <summary>
/// Get the icon for a hWnd
/// </summary>
/// <param name="hwnd"></param>
/// <returns></returns>
private static Icon GetAppIcon(IntPtr hwnd) {
const int GCL_HICONSM = -34;
const int GCL_HICON = -14;
const int ICON_SMALL = 0;
const int ICON_BIG = 1;
const int ICON_SMALL2 = 2;
IntPtr iconHandle = User32.SendMessage(hwnd, (int)WindowsMessages.WM_GETICON, ICON_SMALL2, 0);
if (iconHandle == IntPtr.Zero)
iconHandle = User32.SendMessage(hwnd, (int)WindowsMessages.WM_GETICON, ICON_SMALL, 0);
if (iconHandle == IntPtr.Zero)
iconHandle = User32.SendMessage(hwnd, (int)WindowsMessages.WM_GETICON, ICON_BIG, 0);
if (iconHandle == IntPtr.Zero)
iconHandle = User32.GetClassLongWrapper(hwnd, GCL_HICON);
if (iconHandle == IntPtr.Zero)
iconHandle = User32.GetClassLongWrapper(hwnd, GCL_HICONSM);
if (iconHandle == IntPtr.Zero)
return null;
Icon icon = Icon.FromHandle(iconHandle);
return icon;
}
/// <summary>
/// Use this to make remove internal windows, like the mainform and the captureforms, invisible
/// </summary>