lsm/ntwain
1
0
Fork 0
mirror of https://github.com/soukoku/ntwain.git synced 2025-06-28 04:52:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#81 TWIdentity flag properties not set correctly

Browse Source
This commit is contained in:
Eugene 2017-04-24 10:06:23 -04:00
parent a11add856d
commit 89a87dea36
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Tests/NTwain.Tests/Data/TWIdentityTest.cs
View File

@ -49,5 +49,27 @@ namespace NTwain.Tests.Data
string badString = new String('a', overLength); string badString = new String('a', overLength);
target.ProductName = badString; target.ProductName = badString;
} }
[TestMethod]
public void Setting_and_Unsetting_the_Shared_Flag_Properties_Works()
{
TWIdentity id = new TWIdentity();
// these 2 flag properties are store in same int value so needs to test together
id.DataFunctionalities = DataFunctionalities.App2;
id.DataGroup = DataGroups.Audio;
Assert.AreEqual(DataFunctionalities.App2, id.DataFunctionalities);
Assert.AreEqual(DataGroups.Audio, id.DataGroup);
// clear needs to be tested
id.DataFunctionalities = DataFunctionalities.None;
Assert.AreEqual(DataFunctionalities.None, id.DataFunctionalities);
Assert.AreEqual(DataGroups.Audio, id.DataGroup, "Cleared incorrectly.");
id.DataGroup = DataGroups.None;
Assert.AreEqual(DataGroups.None, id.DataGroup);
}
} }
} }

6
src/NTwain/Data/TwainTypesExtended.cs
View File

@ -87,7 +87,7 @@ namespace NTwain.Data
Buffer.BlockCopy(part, 0, array, 2, 2); Buffer.BlockCopy(part, 0, array, 2, 2);
var converted = BitConverter.ToUInt32(array, 0); var converted = BitConverter.ToUInt32(array, 0);
return new TWOneValue return new TWOneValue
{ {
ItemType = ItemType.Fix32, ItemType = ItemType.Fix32,
@ -1685,7 +1685,7 @@ namespace NTwain.Data
public DataGroups DataGroup public DataGroups DataGroup
{ {
get { return (DataGroups)(_supportedGroups & 0xffff); } get { return (DataGroups)(_supportedGroups & 0xffff); }
set { _supportedGroups |= (uint)value; } set { _supportedGroups = ((uint)value & 0xffff) | (0xffff0000 & _supportedGroups); }
} }
/// <summary> /// <summary>
@ -1710,7 +1710,7 @@ namespace NTwain.Data
public DataFunctionalities DataFunctionalities public DataFunctionalities DataFunctionalities
{ {
get { return (DataFunctionalities)(_supportedGroups & 0xffff0000); } get { return (DataFunctionalities)(_supportedGroups & 0xffff0000); }
set { _supportedGroups |= (uint)value; } set { _supportedGroups = ((uint)value & 0xffff0000) | (0x0000ffff & _supportedGroups); }
} }
/// <summary> /// <summary>