From 099ba26381af19f5f65fcb2b659d96bc9eea71e2 Mon Sep 17 00:00:00 2001 From: Christopher Boyd Date: Thu, 28 Jun 2018 08:19:37 -0400 Subject: [PATCH] fix(WinCE): fixes build issues for Windows CE remove sdf dll references (only needed for unused P2PQueueTrace classes); re-add BitVectorExtensions; remove old source control bindings --- BitVectorExtensions.cs | 49 ++++++++++++++++++++++++++++++ OpenNETCF.Extensions.CF.csproj | 27 ++++++---------- SafeCollections/SafeList.cs | 4 +++ StringExtensions.cs | 4 +++ Validation/ValidationExtensions.cs | 3 +- 5 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 BitVectorExtensions.cs diff --git a/BitVectorExtensions.cs b/BitVectorExtensions.cs new file mode 100644 index 0000000..9d5476b --- /dev/null +++ b/BitVectorExtensions.cs @@ -0,0 +1,49 @@ +// ------------------------------------------------------------------------------------------------------- +// LICENSE INFORMATION +// +// - This software is licensed under the MIT shared source license. +// - The "official" source code for this project is maintained at http://oncfext.codeplex.com +// +// Copyright (c) 2010 OpenNETCF Consulting +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +// associated documentation files (the "Software"), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial +// portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT +// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// ------------------------------------------------------------------------------------------------------- +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections.Specialized; + +namespace OpenNETCF +{ + public static class BitVectorExtensions + { + public static bool Channel(this BitVector8 data, int channel) + { + return ((data & (1 << channel)) == (uint)(1 << channel)); + } + + public static bool Channel(this BitVector16 data, int channel) + { + return ((data.Data & (1 << channel)) == (uint)(1 << channel)); + } + + public static bool Channel(this BitVector32 data, int channel) + { + return ((data.Data & (1 << channel)) == (uint)(1 << channel)); + } + } +} \ No newline at end of file diff --git a/OpenNETCF.Extensions.CF.csproj b/OpenNETCF.Extensions.CF.csproj index 64e44a9..366b59a 100644 --- a/OpenNETCF.Extensions.CF.csproj +++ b/OpenNETCF.Extensions.CF.csproj @@ -18,10 +18,14 @@ Windows CE - SAK - SAK - SAK - SAK + + + + + + + + \ @@ -51,14 +55,6 @@ - - False - ..\..\..\thirdparty\OpenNETCF\CF\OpenNETCF.Net.dll - - - False - ..\..\..\thirdparty\OpenNETCF\CF\OpenNETCF.WindowsCE.Messaging.dll - @@ -84,7 +80,7 @@ - + @@ -94,16 +90,13 @@ - + - - - diff --git a/SafeCollections/SafeList.cs b/SafeCollections/SafeList.cs index 0dc5dd5..bd499ff 100644 --- a/SafeCollections/SafeList.cs +++ b/SafeCollections/SafeList.cs @@ -144,7 +144,11 @@ public int Count { get { +#if WindowsCE + if (Monitor.TryEnter(m_syncRoot)) +#else if( Monitor.TryEnter(m_syncRoot,5000)) +#endif { try { diff --git a/StringExtensions.cs b/StringExtensions.cs index d332ea0..23d92d4 100644 --- a/StringExtensions.cs +++ b/StringExtensions.cs @@ -41,7 +41,11 @@ public static bool IsNullOrEmpty(this string s) public static bool IsNullOrWhiteSpace(this string s) { +#if WindowsCE + return s == null || string.IsNullOrEmpty(s.Trim()); +#else return string.IsNullOrWhiteSpace(s); +#endif } public static bool Matches(this string s, string compareTo) diff --git a/Validation/ValidationExtensions.cs b/Validation/ValidationExtensions.cs index 4088c9f..e230700 100644 --- a/Validation/ValidationExtensions.cs +++ b/Validation/ValidationExtensions.cs @@ -1,4 +1,4 @@ -// ------------------------------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------------------------------- // LICENSE INFORMATION // // - This software is licensed under the MIT shared source license. @@ -29,7 +29,6 @@ using System.IO; using System.Diagnostics; using System.Reflection; -using System.Linq.Expressions; namespace OpenNETCF {