github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo of some cleanup which causes issues,

Browse source
This commit is contained in:
Robin 2016-04-26 23:13:37 +02:00
commit 5c04af1684
2 changed files with 63 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

47
GreenshotPlugin/UnmanagedHelpers/GDI32.cs
View file

@ -77,6 +77,16 @@ namespace GreenshotPlugin.UnmanagedHelpers {
/// A hbitmap SafeHandle implementation
/// </summary>
public class SafeHBitmapHandle : SafeObjectHandle {
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeHBitmapHandle() : base(true)
{
}
[SecurityCritical]
public SafeHBitmapHandle(IntPtr preexistingHandle) : base(true) {
SetHandle(preexistingHandle);
@ -87,8 +97,12 @@ namespace GreenshotPlugin.UnmanagedHelpers {
/// A hRegion SafeHandle implementation
/// </summary>
public class SafeRegionHandle : SafeObjectHandle {
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
private SafeRegionHandle() : base(true) {
public SafeRegionHandle() : base(true)
{
}
[SecurityCritical]
@ -101,6 +115,14 @@ namespace GreenshotPlugin.UnmanagedHelpers {
/// A dibsection SafeHandle implementation
/// </summary>
public class SafeDibSectionHandle : SafeObjectHandle {
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeDibSectionHandle() : base(true)
{
}
[SecurityCritical]
public SafeDibSectionHandle(IntPtr preexistingHandle) : base(true) {
SetHandle(preexistingHandle);
@ -116,6 +138,13 @@ namespace GreenshotPlugin.UnmanagedHelpers {
private static extern IntPtr SelectObject(IntPtr hDC, IntPtr hObject);
private readonly SafeHandle _hdc;
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeSelectObjectHandle() : base(true)
{
}
[SecurityCritical]
public SafeSelectObjectHandle(SafeDCHandle hdc, SafeHandle newHandle) : base(true) {
@ -141,6 +170,14 @@ namespace GreenshotPlugin.UnmanagedHelpers {
[return: MarshalAs(UnmanagedType.Bool)]
private static extern bool DeleteDC(IntPtr hDC);
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeCompatibleDCHandle() : base(true)
{
}
[SecurityCritical]
public SafeCompatibleDCHandle(IntPtr preexistingHandle) : base(true) {
SetHandle(preexistingHandle);
@ -161,6 +198,14 @@ namespace GreenshotPlugin.UnmanagedHelpers {
public class SafeDeviceContextHandle : SafeDCHandle {
private readonly Graphics _graphics;
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeDeviceContextHandle() : base(true)
{
}
[SecurityCritical]
public SafeDeviceContextHandle(Graphics graphics, IntPtr preexistingHandle) : base(true) {
_graphics = graphics;

17
GreenshotPlugin/UnmanagedHelpers/User32.cs
View file

@ -359,6 +359,16 @@ namespace GreenshotPlugin.UnmanagedHelpers {
/// A SafeHandle class implementation for the hIcon
/// </summary>
public class SafeIconHandle : SafeHandleZeroOrMinusOneIsInvalid {
/// <summary>
/// Needed for marshalling return values
/// </summary>
[SecurityCritical]
public SafeIconHandle() : base(true)
{
}
public SafeIconHandle(IntPtr hIcon) : base(true) {
SetHandle(hIcon);
}
@ -380,6 +390,13 @@ namespace GreenshotPlugin.UnmanagedHelpers {
private readonly IntPtr _hWnd;
/// <summary>
/// Needed for marshalling return values
/// </summary>
public SafeWindowDCHandle() : base(true)
{
}
[SecurityCritical]
public SafeWindowDCHandle(IntPtr hWnd, IntPtr preexistingHandle) : base(true) {
_hWnd = hWnd;