sean-m
/
Vanara
mirror of https://github.com/dahall/Vanara.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bugs in the storage and reading of integer resource identifiers.

pull/119/head
dahall 2020-02-20 13:55:34 -07:00
parent 3553f76034
commit fd97276a2c
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PInvoke/Shared/ResourceId.cs
View File

@ -331,11 +331,7 @@ namespace Vanara.PInvoke
/// <summary>Initializes a new instance of the <see cref="SafeResourceId"/> class.</summary>
/// <param name="resId">The resource identifier.</param>
public SafeResourceId(int resId)
{
if (resId > ushort.MaxValue || resId <= 0) throw new ArgumentOutOfRangeException(nameof(resId));
SetHandle((IntPtr)(ushort)resId);
}
public SafeResourceId(int resId) => id = resId;
/// <summary>Initializes a new instance of the <see cref="SafeResourceId"/> class.</summary>
/// <param name="resType">Type of the resource.</param>
@ -371,9 +367,9 @@ namespace Vanara.PInvoke
get => IsIntResource ? (ushort)handle.ToInt32() : 0;
set
{
if (value > ushort.MaxValue || value <= 0) throw new ArgumentOutOfRangeException(nameof(id));
if (value > short.MaxValue || value < short.MinValue) throw new ArgumentOutOfRangeException(nameof(id));
InternalCloseMethod(handle);
SetHandle((IntPtr)(ushort)value);
SetHandle((IntPtr)unchecked((ushort)value));
}
}

2
PInvoke/Shared/WinUser/Macros.cs
View File

@ -29,7 +29,7 @@ namespace Vanara.PInvoke
/// <param name="ptr">The pointer to be tested whether it contains an integer resource identifier.</param>
/// <returns>If the value is a resource identifier, the return value is TRUE. Otherwise, the return value is FALSE.</returns>
[PInvokeData("WinBase.h", MSDNShortId = "ms648028")]
public static bool IS_INTRESOURCE(IntPtr ptr) => ptr.ToInt64() >> 16 == 0;
public static bool IS_INTRESOURCE(IntPtr ptr) => unchecked((ulong)ptr.ToInt64()) >> 16 == 0;
/// <summary>Retrieves the low-order byte from the given 16-bit value.</summary>
/// <param name="wValue">The value to be converted.</param>