From 285ca1b285b6e49782cfb16c2b55ae42b5f116bc Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Tue, 9 Oct 2018 17:18:54 -0400
Subject: [PATCH] fix webusb nullinstall and re-sign

---
 .../adafruit_circuit_playground_express.cat   | Bin 7155 -> 7277 bytes
 .../adafruit_circuit_playground_express.inf   |  19 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/prewin10/adafruit_circuit_playground_express.cat b/drivers/prewin10/adafruit_circuit_playground_express.cat
index 1a54878e4b9e9f5de3e5ce440ec98f0e219502ab..557b627941667b7824f58d289414b7a02e1c8bfd 100644
GIT binary patch
delta 985
zcmext{??-2ph+f^jZ>@5qwPB{BRkWACYdOpP#6;<qan8eCmX9aA2X8_D}zB3D=!<T
zHX9=gW0N@-<ANrZe+Eq~zYKWTxS)bOjEpP-dtT(tUB~a_Hmm!Bj{f45*W$c}7KR1}
zmPUq#CZ=Xl27E}$nLwu2Gl?2BF$uB+88a9Gp$UTvgBuVVFqi|O8-p2xC4&=#DNx1<
zEDuuS2vh}9X#o^71gbD)a0Rnn7@UD@7odzAP!|J(VH4v{gG9K6OpGjs!3Kc_I!Gdt
zi=5;dWEgC~(4QfRp_n0`A%`KAp#+HSK+r%DDG*phj8yJlDE~G)Xp@qblgGx?7kiIh
z`MFtzF_MvW9?%=JCO0uXWHg<uz@jy|kJ)%~GPB|2Pt3ZL4>D^{_F^%fEYD&%c^wPS
zWG80D&9yA`!XnRDUb>WMYIuq-aLSZk@NJ5La@6d}0ur|MC0uF3;vD_I-3-JOK0a*T
zX(uLiN%@zQ%H+SRcGvIhwm!2UEYG)how#8C&La+=cGabqr%N5pSDn7zInVzvM~M7s
zr^Q!_ZIjh*1ur=nXfSJ&g-zpm>kFr>KUS{gebprw#-6b5tkjdNm<-idfhp(SOuVm`
zcw(z;_&kZLvD@x6->ILVFyY_cC6hKUX!Dsm$s^F)CMB~e&~asYPu=m4#Z#B$z7xCn
z`xp!V$y4{!uB?9;w$Gi9dv4m~?|YtK+-A{MlbjovWACEWb)+ax<LiU2ja`ywj(Jc1
z(io{3B**mp(4`4pj!$OvJ=2f;_vUQMLxo7!n6E)=_LlDCPq?Zc7Mc~hoGB!0vajS}
z18CAQHL#2_P==>cP8LHk77?wyy;poBDt)Jl-23M;HM(+_p=;7)2dT~VTqe%uSL8z<
z9Q|Bm@oQyMb0eSX=><wJWv87=Q}67bIcc+)P->F?^Q*k?mAXt**GRkx+IxBHg~nZ-
z<{s1k=l>RF@VB+~63E~6PvQD!p>{F5fO&_Ujh;+?sJcevLF1--?{^pRICdHHSg6YO
zX?~qCVedyv!S@OU7yBaji5W8QoK~;5^)=Jtf1e&~->?5$)99TahdO8ArMIblA$RXD
z$gVG5S3G^eT;b!5vS+irq<EI@@~E$0cJ<xwh$T+i<%ano!L#pvcJ$*}^m}S>Qmw#R
z_T;iXcm6!l`8vf<y-!Vu{jS8Uo<C(51%3rQVJ`3$TO9uFjC)tnzS)aq-yJx-_UV!t
Il1%nd033I2S^xk5

delta 943
zcmaEB@!7oIph@~Y8>d#AN85K^Ms}tJP0|m5LU))L84bA&IN4aW`IwocSQ!kOSSGV^
zYO^u2FgBTUF)nCgX#ol~81S%hK?Qjj8Ce7>{G7dKWUTj{&++DdcBq%AIIp3Ffw{4P
zk%5u1sacc(ACht=kg4^IKMk4~zp@0mF&HrzGB^WC10Zd|U<PCxFc<?_jtr&@mO!2(
zgA-83mB9o^8vy0qz$z?(Y7D??%z<(cSrChX!LW&Ou7NAuLMBEQLvsUD0|6uv$wg{R
z4Gac~NFHSo`6Qztk;B{-d1~X64fzKqbA`Y2uG{Ru7|F=$V9>;5GkG4<!^wA<4JU74
z)}3t4qCJ^|#dz{e7Q@LoEV`S&v(yWVgsfca!CW+};sc-eBE6qt&5Aj79+SHyZ0o14
zN~zRXH{-sEu4<qJ!>08QXQ;-%_}A|wcdNUl=!|3UuM1@zJfiX<r}Fal@U~ps^P%LQ
zYgK20nT*@|pL6yYpHmeq`TJUbYTka{Eqb|$8doo9%N5)_7^Eg(rae#E|4l)}tj{Zo
zmRu+h`)kzJez88|K+5$-n{~>IWpi>_GiTe>FF%|7WLxnx&nw;n#YuMi?rjfepZC@J
z``yhK-88)Y{I&$Gv^{Y-Q|C(H^#5lYI<IzjE54V%-nr{>P~mU)-w|17=bufwF0%N<
zhbW$T52sA}E?w$fwnC}e{zK}iy7_C5XlE_t*tGVM%U{u$O^gZU_af}x%sKozE-*Pt
z^~%%<FQZzRPF<UPT=K91G(nh}8b=u@!_yuoi=h~ch)H9(!-LZ52cK4UM{x8klQ0VX
z(lB|K)aH5{-}|$deJJLOQ2+mPmRyHa;KL`0n|96q*Xz<gvERfvzFlZ#VpA-?OWC~x
zfBTnwx%xusreF8n`4Y8r4PAG29Jp~*^Oi~UMTVc7xfZ)mjXYGmtVn6QMalk~*&AM^
zH0spFJ#bgKDeJ?0FMaYP9{-M`jNcxbAHDf`H^0#Izj3pEiPkGd_!piGyV5Xs=P_%Q
zBkxr#|6OVQwd1QxKeNZZ+5EHaIprR>^>)SKMXq=2-L}3lEqNBVV2=8(p!JrUws<XY
zQ8D@8=Qw8$XTEdg<>GIC;%d<m`CsmL9R3u1A@n>OpY(>w8Z%to*41_Q`=>ta^R=+8
XPhk8lETE&Vp(7=JvEKbIljvapE&*+T

diff --git a/drivers/prewin10/adafruit_circuit_playground_express.inf b/drivers/prewin10/adafruit_circuit_playground_express.inf
index 248caec0..110b9b73 100644
--- a/drivers/prewin10/adafruit_circuit_playground_express.inf
+++ b/drivers/prewin10/adafruit_circuit_playground_express.inf
@@ -46,6 +46,14 @@ StartType=3
 ErrorControl=1
 ServiceBinary=%12%\%DRIVERFILENAME%.sys
 
+[NullInstall.nt]
+; nothing to do for a null driver
+
+[NullInstall.nt.Services]
+; null driver has no service and no service name
+AddService=, 0x00000002
+
+
 ;------------------------------------------------------------------------------
 ;  Vista-64bit Sections
 ;------------------------------------------------------------------------------
@@ -73,6 +81,13 @@ StartType=3
 ErrorControl=1
 ServiceBinary=%12%\%DRIVERFILENAME%.sys
 
+[NullInstall.NTamd64]
+; nothing to do for a null driver
+
+[NullInstall.NTamd64.Services]
+; null driver has no service and no service name
+AddService=, 0x00000002
+
 
 ;------------------------------------------------------------------------------
 ;  Vendor and Product ID Definitions
@@ -87,14 +102,14 @@ ServiceBinary=%12%\%DRIVERFILENAME%.sys
 [SourceDisksNames]
 [DeviceList]
 "%DESCRIPTION% UF2 Bootloader (0018:00) BSP"=DriverInstall, USB\VID_239A&PID_0018&MI_00
-"%DESCRIPTION% UF2 WebUSB dummy (0018:04) BSP"=DriverInstall, USB\VID_239A&PID_0018&MI_00
+"%DESCRIPTION% UF2 WebUSB dummy (0018:04) BSP"=NullInstall, USB\VID_239A&PID_0018&MI_04
 "%DESCRIPTION% (0019:00) BSP"=DriverInstall, USB\VID_239A&PID_0019&MI_00
 "%DESCRIPTION% Arduino (8018:00) BSP"=DriverInstall, USB\VID_239A&PID_8018&MI_00
 "%DESCRIPTION% CircuitPython (8019:00) BSP"=DriverInstall, USB\VID_239A&PID_8019&MI_00
 
 [DeviceList.NTamd64]
 "%DESCRIPTION% UF2 Bootloader (0018:00) BSP"=DriverInstall, USB\VID_239A&PID_0018&MI_00
-"%DESCRIPTION% UF2 WebUSB dummy (0018:04) BSP"=DriverInstall, USB\VID_239A&PID_0018&MI_00
+"%DESCRIPTION% UF2 WebUSB dummy (0018:04) BSP"=NullInstall, USB\VID_239A&PID_0018&MI_04
 "%DESCRIPTION% (0019:00) BSP"=DriverInstall, USB\VID_239A&PID_0019&MI_00
 "%DESCRIPTION% Arduino (8018:00) BSP"=DriverInstall, USB\VID_239A&PID_8018&MI_00
 "%DESCRIPTION% CircuitPython (8019:00) BSP"=DriverInstall, USB\VID_239A&PID_8019&MI_00