Fix build issues in vhid samples (#1084)

* Fix build issues in vhid samples

* Merge from main branch and remove entries from exclusion.csv.  Still see failure 2087 for hid.hidusbfx2

* Also update hidusbfx2.inf

---------

Co-authored-by: Zac Lockard <[email protected]>
Co-authored-by: Jakob Lichtenberg (170957) <[email protected]>

4 files changed, 0 insertions, 2 deletions

diff --git a/exclusions.csv b/exclusions.csv
index 11330227..ebaea66a 100644
--- a/exclusions.csv
+++ b/exclusions.csv
@@ -7,8 +7,6 @@ general\filehistory,*,,,Deprecated APIs
 general\simplemediasource,Debug|arm64,,,Only Debug|arm64: LNK1181: cannot open input file 'SimpleMediaSource.lib'
 general\winhec 2017 lab\toaster driver,*,,,Needs input from end user
 general\winhec 2017 lab\toaster support app,*,,,Needs input from end user
-hid\hidusbfx2,*,,22621,Only NI: Bug 48374115: NI Serviced version of infverif and NI version of Windows Driver Samples should be compatible
-hid\vhidmini2,*,,22621,Only NI: Bug 48374115: NI Serviced version of infverif and NI version of Windows Driver Samples should be compatible
 network\trans\stmedit,*,,,Invalid Win32 architecture
 network\trans\wfpsampler,*,,,Missing INF section; missing libs
 network\wlan\wdi,*,,,Invalid architecture
diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx
index 22f32303..f45b9708 100644
--- a/hid/hidusbfx2/sys/hidusbfx2.inx
+++ b/hid/hidusbfx2/sys/hidusbfx2.inx
diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx
index 771d664d..e126977f 100644
--- a/hid/vhidmini2/driver/kmdf/vhidmini.inx
+++ b/hid/vhidmini2/driver/kmdf/vhidmini.inx
diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx
index 30855f4a..bc5314b6 100644
--- a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx
+++ b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx