From 66123ff99f94cab467a2e6b558e04f76c0055c55 Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Fri, 13 Jan 2023 11:50:48 -0800
Subject: [PATCH 1/5] [DirID-13] echo, pcidrv, plx9x5x, vhidmini, serial,
 virtualserial2, usbsamp, usb/ucm

Change INF files with the following:
 - Use Driver Store DirID = 13 which are available starting Windows 10 1809
 - Remove WDF coinstaller
 - Add PnpLockdown = 1
---
 general/PLX9x5x/sys/pci9x5x.inx               | Bin 5078 -> 5280 bytes
 general/echo/kmdf/driver/AutoSync/echo.inx    | Bin 4842 -> 4084 bytes
 .../echo/kmdf/driver/DriverSync/echo_2.inx    | Bin 4998 -> 4218 bytes
 general/echo/umdf2/driver/AutoSync/echoum.inx | Bin 3924 -> 4030 bytes
 general/pcidrv/kmdf/genpci.inx                | Bin 7198 -> 6244 bytes
 hid/vhidmini2/driver/kmdf/vhidmini.inx        | Bin 4784 -> 4814 bytes
 hid/vhidmini2/driver/umdf2/VhidminiUm.inx     | Bin 5402 -> 5552 bytes
 .../ComPort/virtualserial2um.inx              | Bin 4160 -> 4392 bytes
 .../VirtualSerial2/FakeModem/fakemodem2um.inx | Bin 16566 -> 16596 bytes
 serial/serial/serial.inx                      | Bin 6212 -> 5574 bytes
 usb/UcmCxUcsi/UcmCxUcsi.inf                   | Bin 2700 -> 3888 bytes
 .../UcmTcpciCxClientSample.inf                | Bin 3024 -> 3300 bytes
 usb/usbsamp/sys/driver/usbsamp.inx            | Bin 6444 -> 5766 bytes
 13 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/general/PLX9x5x/sys/pci9x5x.inx b/general/PLX9x5x/sys/pci9x5x.inx
index 675a2a2ca68e4432d6f3d2fcebfd3c24b38ee3ab..2446271e3b3b46679490ad151912888bd29960a8 100644
GIT binary patch
delta 307
zcmX|6%?bfw6g?VKh%9ZSPmw60+4$K?jfDlu#%7rDQy4MEQh9}0D_%fq-o-Omdje-Z
z(pTr+d(J)Q_B{*N;-jma1az#ig^e8?7}yY-NFat5#QzPkz!H1TI(q1^ny~1yxNl0{
zW+yNsV=&>sG)wX`nJmaH$OyElEa9@>aT=T`1gF1}jy?~xrST|FPKkn%-wlICgZ341
zLJVAcCIq@eeuFugk?c(79%WJuRkAhISsTBvl~G0s75IJS9SUjQC7Sh|=-JCea=xp+
V6h9qvRaHYCWA7GE`S)Zl`~hTBImiG2

delta 72
zcmZ3Wc};zT7xQKZmS2pFMw>6PNwQ3KW1AuG#*oiY#Gt?s!4Lo>6B+UtQh;<0kX6Ev
X%22fVF;^`sP<^6+Jqrsj0~Z4T*qRY{

diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx
index bfb3b3560124d995a6de462d158ba3a403e39f34..970462a3ae18e43b34e3ada650007550cee4102b 100644
GIT binary patch
delta 347
zcmaE*`bB<28zZB_<W|PHiJlC(3<V7N3`Gnj42cYRK+=kVmw}7Hnn3{yLl`m`G8u}2
zJWmEc1~(v`!jKBolL}Ow0v68)vJ@E7fFg-N{iQ&&Qo-VBAaf`4GfLJ61I0mhqyp8s
z0L=*kVi&NQa<J*iKvDsy8=@kSp$y2*WXJ)MNk9^$s~GG)kSjBRwxt6_!ojQ*pt<E>
zlMERQfTD&B7C_n(>IaBVbT=zAbu!8Z05ujc_y9E|Gh_pu4$=s6xGhNA<mJr4jK-61
zvnozr!P+)CfaL@yEC3WHi?dd4{=xQ(iBVzmM^0`aHTgI9TvlTSRfd?!`ka!Jckn;j
JJWs%b2>^8WM&bYf

delta 870
zcmb_aO-n*i5Is+QCZbfEOe%bSEdmuaf<Rn|6-1_xQL6|`D=96~$X4zoS_QN92egSI
zSFOTTZR{8H3v$~JXzqP2?BlhHVeWm*oHui3&VBd11@Br4T`29&r1?^zXG>O%!wEa}
zY_8cYq;Z5LR8d161st-KZ~{GkjB_laEMqljNV3NeqX)G|SJnpA)p43rTg?p=v1?E%
zfMu*;p6jHM<4#%Rv4#{fYztV$x;*oo$#E`#2-gxUlH5r{g1y4L4w#k398Z~>_^M-H
z-c^oNeAt$xb!Z(sGARh3F?j*i$g6tqhfHQANL^>R6Su!AG~#G0ak_C#4JX7txK~)3
zCN?vn$$82@Hlv|T1;st8WA#)1O;0v|IAXAc8a8E*6i-*=sY}>HQuGNLD=>hizRgW9
zwy|krw9s)tFM4$NJ;rERn{KVH=I{E~FoQTkh@!zREcSUvIjX^jf6_ekMfA|0Wqs6j
hc$>yUeOm!P7k%mfL{(>M)!!#m>36Q38Iwhb{{h=#sCobZ

diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx
index ea524f85b8ee7d3c337bdcfc27b8734fc4177f74..bb73b4851aa3027652defcdf8bedf24e923da709 100644
GIT binary patch
delta 355
zcmXYs&q@MO6vn?9GeruN*2Qs?APi(}vJgTf7zl|JbS0WI=1@A~-=!|X7r3v{BAA!(
zCB$uup1@V#y~*XCbMEh)@4K9JZZF?Wd+B0;5kibHMF&I1JDehgd&uF`(MNy@UoNV6
zWcJ`w<8#_GJY*&4k#wk^(aSfyXMBaMPa>$W6JXAI%vX&(T$*9sa`D1jF~WuUvdbv6
z)OI@0c>{bfzA|byp@r^G$%l9&X_(66#|z_Bz!hl$x6H-EV*l$oaF9pTvOlf!XR1ed
zqN<B`E~V9arIOaFZLDV9sLXLzNg}0w;;U$V^k7BTiLW^M?j)=B$qOavjrvWOEs2~=
J&Q|TS%Rd-PMQZ>6

delta 820
zcmb_aO-lk%6g^r~O=tx|lZ5m}w1`X`TZ#)Qg{ZW$Pbj3)N>ZaVYUi$n%kH0O8BF_r
zN!zy3wgkKLl&DDC$mPu&-aYT!bMAfb;&$p`$8N6n)NEAmO)6nHF-VO8&7HwK&asFR
z%BbJ~1&$mpks)1msRB_57%<E?C2pg8WsC|+t-6gYj@w-HVF@c(K!WorCQc%a4aBg_
z5yv{V<TuTk6z6;hGM7~}%4Gy1yoxO2j712Rbj4DvzY0#}UgDFY7l%?~6I#KMOqLmT
zjl6^k+EjEi*#D@oRX_IVLiG$sEYn<JR)(<bYeKrn|F%z0>bOg^kWIY2OAUvA=I@4;
zu`l^!>?g}Ub2vfNs^M?jV(!WpmOQHaP95z$52`!F#6NWO+^1FBNt{C%0fcbF%L=2l
yhxk;$i!Kc|@ME%pj<jC-aOj<F?>0NzC2`-iaqU-naVE^*(4?JTdn;&dWcm{cbDWU?

diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx
index cae8b45fef73382f83a5cbbae866a67918dfec01..ccfe6a7ea05197f44543452434ed469aed06adf8 100644
GIT binary patch
delta 327
zcmXYs&1wQM6ot>sXtAQcL2E>G?cl~A>`Dp)QbY?~t2650&xpSZg|01KnHOmZZhe5R
z-SlCEo`e!|@6C75JxQ*Qm+aS*{qA9g1tKi5Mh|nw8q!Fj4)MQUF-C|LPaa<I%<LoJ
zOhC17c*IIzNYdl{hF*c;L*pyR#v}qwc0z1fFL~;cM^hu#Ee{>;rWxFsD+i2%mfB9|
zEq911W1ms86)kjsO+Lqn<jqt*FWwm^7bQ{`73QjP?W6V3rgVW8B?C<O11;6>Z)l-B
qJ6)?RZ}FV`iGNr^e#i3a6cd)}+<n?IlPIe8{lRg{D5&4m-u?sVLO|94

delta 222
zcmdlde?@MC9n)qr<{HMyS6KX5jTm?txF+XwN_yHd7%~_!=rDvb_%gUKxG^X&SOak~
zLq0<RLnV+^0%R#Lq%agQWHOX7qyp(;h8VbNpeZ1eKzb$%vMF!=#HzqJxq($;vI}e1
zW)b!-CT|^}**Xjc3>82OfhJH|0cw{sgFiz6LnP2{9|m`Zcm_`fKOh;(5X|5Tq=SH@
bAA=*%b*`J|axP}(HDXXjIAF6gZ#5GDMsX+f

diff --git a/general/pcidrv/kmdf/genpci.inx b/general/pcidrv/kmdf/genpci.inx
index 1ccf8ca9e7650ed8616b69c8350fcb4352e0a0cc..db6e5c553e5fee79a3fd0f143ce1c3d40574aa5e 100644
GIT binary patch
delta 359
zcmX|+!AiqG6h&_uh6*h;C8FD@u7#8qNf&~Pq7<r#3a(?DnqX~8t7fO*FTA~9AR^>9
z-1rOP&VMMqGXV*_xpUsVZ(iQQ-{7<BHZ=yg#~c|JctC`id{_JzjVmNbv4rWL;h5(b
zF?}&+REB3%8WWO;$w%g6%O`f0CQC>(`s}25qF(TJNp9XMI|E#Be&6PD`{IaI4>_{5
zL<~lZPg!qRO>AiwHS4Ba;g;musxb%Wc2pYyX&WKWUa{}~IeX`{&M~BAgggF$v6}tM
z@6g!ASEp60(2=ZmqDq?8TJljpDBjhVDt_vrE6GknR-0RL<n2;>5;Qi7XYaM*bj0yn
J|7f+X)f$OIN$&sv

delta 837
zcmcIi%}PQ+7(HfQDGRSi=*F1LEJI2yM2HCK2P0F^$VG%$nn`NlHEQQ0M9el^);73L
z(kcjA2tGsWz8Q^#yahpg%$;G*nRCzg(+#y_Ppf8qakOjVQ6(|QunvYWBACQDHgSnv
z)S;n?0;&`xG?3>V`;@iE3+o>1i-o@`ZvLS7TZ|ry=z&5aha%1lgnZb;KDMw!c$$8c
zLKX*zBT2E13=ZWtOGuh9AC^c<nE2FZSfg`|tX+^X1}%mw@+Xc>oXfpVH#M9{-#uy*
zrxMeMb&ZN-GJdPL#!@6yBc{fmm7M-Q5jFD#HKAA4_J}FMZO$3)x85)3q+upgs(h;r
zBgMgb75JU)kvG)o!0=jXIF^-;Q))#@xr8!zxLvcu*?B6?7w^qJ?=s+Vhw3rJI(8>d
zsY>fVS|eI6){#NW2Qp}(+)qA1bC5xhVt6_lR%jrD2;qj7h;V-o(Jh1bPgAz>+n5D^
Ol=bqm8qkwYx8(!N$(&RG

diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx
index 3e709ef665d104b3859ecb38e1661f3af6b4816a..9d78ad342f06eb71fb5b9ca1c42579ae4bc5f701 100644
GIT binary patch
delta 38
rcmdm>dQNr2F=ojChCGG>1|NoehGd3ph7=%O4ivFvFx-5Q`8^*1*k1~)

delta 12
UcmX@7x<PfrG3L!rm|yV$04Ht*)Bpeg

diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx
index 73bf251cae24cb76aff69e9cbd1d1dbbe1d76b84..50ddab0b1cf905f1b881f1e0d2fb046968bf9978 100644
GIT binary patch
delta 379
zcmX|6u}Z^G6g_DKK@lwurBvu!x>y857PWQ@g@6>Xf{V+uN!n0tOPd<Ec65JRhpw)L
z4Bf<Ua1y`9^InPs?!E8ad(O#Op04Zbg{8iaPt?--nhW@N!5AY<kU(O{dW8e*p#ky#
z-J_2fQ@(w)(P9q}k`?kkF!+d*Ktx1RVMevk;E_=l#QH=8JZ@sVa-Q(jnRB77^OcV~
z8hD178p|%Lpk#g_NtC2Nvp%tE)|3i*pAa9SN94gw0d-TO<lvmBgA4Y{ZL~b#8M4R1
zn^n0bbBr4@x)?B!X6iUi2-PV%HIGgaU1s!5_<uT@?y(8ME2_Kd<7kup*zdcRo5}t1
Tj_snRs)dqT9e!rN#cTTySENYT

delta 244
zcmdm>Jxgmt1LNc-##@^sn5!5!e`D=oXEkC_Wr&%q$R)ga7B3SEFPO^^%HYf3!r(Sp
zkx6`Vju6M>eS+J(br?X<fT042A<zU$D=;W9SOc*$gFiz6LnMP6gAao{Lp*~ggCCF#
zWe8?)1=2x4(vQIrXtL|%g{+E`Q&^`>{=uR)`2&Z9yDftugAvelsJ&40k{R+D3K%MZ
zyb>Twfgy#Vh#`}qj3E_B7c;~#lrrQ3#nKpf8MwgMdUB&s_2dacESvubZ2|fPC=38c
CJu(>p

diff --git a/serial/VirtualSerial2/ComPort/virtualserial2um.inx b/serial/VirtualSerial2/ComPort/virtualserial2um.inx
index 6d95d79573de9ad3975e837cd1df719b53bccf40..6caf77737151752ce04be21b405b4c3233952560 100644
GIT binary patch
delta 400
zcmXX?%Sr=55Uh>sgT)Pa@Fc=S%-toIsCW>TKtM!P^q`kDJ8K4G63k?CjGthbe-Q8E
z2lx?QJ$UvfteFi1-96P^Rnzk&KK9<;%^=*^QW&B@j0ne7G{5!T#rNlYd4)h1&lqEb
z7ieT0*Em`d1iRI_Mjr|jKYfl4a}G(C<b3Y&5i3C}NezuD)uhJ@uPli5i3p_ZD3s=>
zzCOPq>U=A_i%Y&G^{koq>oE%IRTCLX)(Qj02S&%5P{H*z@gW|G-1;h~?#wGCI3Sv!
z&3x$ha-VUB8%VndvS8<e#4*lD=;4XWIHFtS1j7E+P6PA0x!+9bR?ulmU(GkV-CS1m
c_M>!Y*+#g%w%S4y_ofjiwv3{h4deF8KjC#s5C8xG

delta 143
zcmZ3XbU<OkGGRT2Oolv$GzMM<E(U7|Iq~56%{@$6jGHA`tQa>hW94FFHDXX@h?y+Q
zDmht(PigZrZZ4+DL98m1Kk!P}+A<h27%}KDgfjRtxG=aeC;*L7U`S@jXDDE(1hPti
eECq%Xh9aOvWell6x|ksbrh4;JUT0<&klg?_;T|pk

diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx
index 35bbc3c55463e586a85ee80b5312e38e009d3c1f..0e5ad80b305d656133dfc6d0e9008daf49181b0e 100644
GIT binary patch
delta 45
ycmdni$atlZaYGohcmP8lLji*iLq0<?LpDPSkS+&`*lzY`UdzU4u=y|NPBQ=|91QFL

delta 27
jcmcc8$hfVMaYGpM<`U**Y|KUsI+Fvrv^RTj^_T$whm8oY

diff --git a/serial/serial/serial.inx b/serial/serial/serial.inx
index 3322653b0b413c748edc9ca86c2b52be6b1a711d..2a2cdc66a9950607be8c9cc3a1fede96b63923ce 100644
GIT binary patch
delta 309
zcmX9(u}Z^G6g_E7GdYMj3a>*am&7a;?G^%oQc7!aj!9}lwGD}y(bfHZgS+t7j^gep
zNJr^s^t{*Q-uuoy=iKwYyzh(88~a2c#uF;6QR5j2R`REF`X+FT0wo&g{TLB@hMc?{
zD^40;a}rn(NvM3GJ~#NncnM+!5rL4K60e+VzGlSrt-~h9l>VX7wdP{VDn_(CP!b9g
z${$(pS+%S&L3P}c5gv%#nJJ@jYpi^DM12g{uhg|2Tjvu}D~w1<vE&alRp%dSqU^hK
iE0Dk4p8R(%<+eLf??;iPHtx=`0`+n1J1RT->+Av8YCtCd

delta 885
zcmb_aJx>Bb6daJlNJ3*{WwIijNI0}HNJ0DvB0>TN3S$Tg>P0?`hf%BRY%I6)SD0L7
zZ}fLq7+d)V&Mq1ya>jzZyxYrrZ|7#_-qXTk;(m3)jRmqk_a>P0$#)~?RMEf@*3iWk
zI<V109W6!^=ZIn(J6Oji`$hH(C}S5H<QW?%p`xE<c8csp5hs?qn}!L26thjVQ(_4s
zUl38f^>Cuk4lC^l4)mu6qdgqzrp>WSSb9{*zA-aZAW)l=wtO?@WF@#P?~MFP5@Ccq
z$k%lJ4A-P@X+a7#%`{=U&y#(_mvkS(rcq5{@sALwY72zMvwoQ*i2l>KI$2w^vm-O1
zc_;3{&c?pxo}pz8TG_-gxsCn}HCp~X^`&@Nna5o}YVtNT>v#dH`Y_Od)|j`#(QBcY
ztK9pS&H<4uSFnT_W3&VtOGvVtz!g)4`FSQ-6^QWfHP9XRhQ~Cl7iz?PnSS*Ll-3Xa
C7obM~

diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf
index 9e8769468b604ffd192a1a71e949be0065e9799f..e5b7ae7b1ef298d217162f0bd4b8e262184db572 100644
GIT binary patch
literal 3888
zcmcJSeNQ7*6vofrCVqzrfkX{73su=&tO?sL>t>;l4ze+5nlkNT!_tzrSc&ngtH0--
z-cF~Tvb#nz>Ac)~?sMK>`uAT4_PKp#2bNgfhIVHUHnP55+pjiZ?F-B7OP(jJW$X-X
z%<o;;6a9!2x_4OV^ER*w)Q9$-D_KAqhp!%|d#wJ(y$hvtj{IL+(~h8Pf_4kV^QHZS
zJzYN{$t}|U9^S_At?(NlRT1yduHZKb(q%l?;YGghf+k78(z#C1Lde%}onVn(;GWtG
zp3;86)kB)e?Boe&2K=sB9YHe=n%se-lNrxGZv*HP^p~Aw2~j%lXo+0Yx~2Bob~rmk
z=R5FZ=c^gw7;j0^9(&^wd+LO|BVEKbS|H*lc8*qk&L(hi>vuuB3sQE&y0nyhy}<h(
zG<h*foZF>Q&?kkPI7{ya*e!mIaBdnnX514HouY#sI>_;!d#;<Lmh903Z^K&`+-X4C
zwI^Wg+Ebp-7JM%&UfKn`N6>jx{u1_6zOI9ZCgz&dY{NF~ZP319r@W<LHnGblJ3^`l
zsm37Hh_^bKP+WZlQXg;D><>78i=}pvyTd)hZ~J^#(P_uN=Gy0dhp#;-p9Zf!W39`3
z2kL#!bnP2x{tP_Mkbj6}gf3lbwgq>2@*Y&3h+2&1IkPpBPI0369is0M2#P?-znVE2
zbdwps0iHkROlCLml%3`KTClRTcFQ)vQq;*WdEPhpmc8B5qLGaEaGv0KKjAbHu^RA%
zd0=1t=a=Iut_ML{&*lXGdd7NO{GZ(2TI)RKcKR5P){xmVxQj(ccxHPRp@-yE-F_fe
z#mo6E(^gh!Bj>Vckf#)J8Bh0GM%0x>PCM*J+HGRw5LwQ!_s_(cYGj?f)K%O&L!L8M
z>(DEI)p^dzJZ0Z=-qjiU=$lX>rsRmCUsYzv{Wip#*Nz8Pl*6i|xy;^E+!Cw$6=inI
zxHV$$i@Bm~U#w_j(^*A$Zt3!U$6MuHAqrKk<M{)0TYq_+s#Cfzmb+4(cb}qbB}9LY
z8ng8f8+MoWJWE&g*d`uQJeX2p>!EI@_^*vOQ?66iQhP~UUa(i^Z7cYH6{iiIs#?^r
zJ<rtKLdhc*+QIXysLOp-HA=NAX20eS)lJWS_r_%j&U)$Gzlw!1)lwbnVP1V>Usc82
zDnXU~Wwi!&NqKs;F52N7JoVp2tljxnTrED8Lq)5%?M?7PllyUqU3K7#uqOL@l~8wG
z<|kyyU;P(6rPm3O&_qL7@SOJ+cX51)uhq{+=&hMTbJ-C4xhCFYidrpym1(I+YY}xV
z_%*{*{Eq|2qFrC$G4-nv_KiAj(Q&JIK^1GYGv@iKN*HG%&2Jf4J_SXj{CtewOZ4{&
z<+W7ta>Fl9w=wss%msVQ4Q};mkTRcfGV=06h<VNWQ0<AHb&ff1F1_9~GnG}!3e!=S
zuI^mkP>uCfw6b$3%S?5FGCtFQ67%wLnToVUIgXL~3h%myi_@P=wMkB#5Sd4_JkVr)
zia(aSr{;3a{Lw?7QtcGSPxxozoiE<^f)CeC0x=>qi+*Q6&7#J;UD>RcggDker0+SQ
z4!YPsTOn3emlSsiJyhLP({|o5)khykmLI&v-OMA_t+-L*#pNk0?@pTjJ@S2;UX6eX
h6nX!SGsk1RQl!^E8~<0eczQjLV%`0C^kQ^x*grs}Q4RnA

literal 2700
zcmb7G>u%yk82yjLJB(0}+7%!iF3B!+CC4_qDBNU|L{+y!jy(`7zG*xpi>f|ZfAo?1
z3OzFn#t?Ru`Uk=@-)+8gzBB&!?|%l>%7B<@wq@b^iIboFpUEWjS(>LSj&+u$%;RC2
zw1^Q!L>lFU(VVgu8noan{72IvnR+q(q}~ahJ3ltR-T8Ug3X_#uHy(4&JfD~CgzqY4
zBusMdMNycn34fyG&b>kUB%waX=EO_9HDx6C;w+-Xk3yPo60q<Ei|`gj$fTw_YWiuM
zq2@;z=G&apIN#M-t^9sZS&qZ}QLVV)I`R01QN4EYFq&Gk2bWA27d2Js5J?eR80REo
zAzpb(9>OF@Uvr|h_nSn!Zg(1FlgqOcGxG9WNA02@`SN)a2Kt|!{?Pnr_uEag+wV0s
z%^Wtb+r56X+wJyxonE(%=dW|AS1gUcmzJQY$m5i~$!|_h^4tBPW*C~;yc%|HkoBt5
zyt%Zmo94$W>)J4{G^^Ly<yR*V5lZ#H(|^v=moT7AuLH2n3P_{DOfaL4a31hY*TXQP
z`hgt2$Ey`f0ts+*G9ZhYHTy(z%1N;dauBd1&Ojxgk!F<fEy+NMyjqzj**Nu|0Zc-4
zqE#!v*`hfQfiK{*LY4z>i>|y)#Ki_ygyChiQk1c@=u7C+rJ0U)G^7mwv#lsL7sfK|
z;KO?#(S8+)xS%lVz|woYKgctbTZjX^ZK>{ZF9|#rG(cR#F~3|$zx`@!zbc%IleTsz
zMIZe70S0yc1~JU}=qvbZf{^NMKApEsqg^0FgOHP_*Jc=qk%&F+Kap*^VI+_}#H;~;
zBA<$kVo*lWQhf()z62IKz$63YJM0SY76w@C51L00dddV|d(n_UpU>J-rh)@T5bPcG
zgFZFt?%cgMM^ksPG+cLPy0&vaGVOZfV6#+yO984Zh#VEvJeclPN$DAgEaAs7N=+$;
zLt$2!XOXuRgCbN+Cnda4nq|8t21q$Awwbchq~;xd21J#<ytSRFJziSQ=-zhV$vwvR
zej<M7;3WSYJS}@-Os%E6Fq}oTVl$R9$S`MV1VaqMcO7lVnK{ep%$XSDqShM>A=}Cm
zX_xh{C%9TPqe(y$Kg5s;Be^fzyMz4DRYfCQ397Hqef3X*ui${2q*IaTK)+ULwiOv1
zx_&bPM-l+Sz^2UG)4)gO1-;MKaAdlR4CueyI*mrTw9aLt{SDKni94Y|Y7fDxw0&_q
zv4-YMkkuHEK~&puN3-cgD~O`Tu_>;yBhLLu;!w!3^N;e#xGpB%ry%ZgE@&${+UZ{Q
z0phE=B>mvjP^#(wN~LR%o!EQEO^%yHei$U1_z~bs-2rW0L;gfgi#bscL3q@5wjU6t
z7LJapZsTBekcR{H$};d8ti(K@L{h6N#yEUrAiet3KyKN~Jy60Gu(+JzOGk9=y!hxu
zl0a|(_f+{R5Z%^mzx*Z?H!j_>B*Dh7H8R-UpALnhKp|y+q&&Ydmb&vSMMo#Kg4z3v
jYd2Q{VKAxKE!`hDTFJ}ZeVXl9cI2TH?5w$JIPCuei_k!)

diff --git a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf
index 9fbeeeec726a18325d7e41f46e5aa8fa101e5f7c..51dc78c4a253cbcd848ae27655c807a585230bff 100644
GIT binary patch
delta 294
zcmXv}I|{;35S;ia6s$#1cz6QE#!nlBG!`maSVa>*;E!lbXRaWmvGfKC@f21b!ZTPq
zZ-YFTU1oM>-@c2V(&J);9Vl4XV2>R<9ARTiY@>iYwDx~PEV05trhDkJI&kT7IqwL+
zW2Z1DV>7{Lnk)QVk`=in83mKd3Mcj+REPluy*iOB^!XiAjDf725fvko37bZn_BC-z
z)UE>)w0<PN#e&ROI)}M|B-K$PTSt?%C8z20CKw^U8ZRTdrK-_0U5?J_uhEG8Oe@QB
H&s9=C^(r@P

delta 51
zcmV-30L=g78PFH7kO8xX0@4AK%mf^hmIU?zGP8{ZIRynW03`rilOYB#lYR*bvjhv^
J0R#;I3IN?G4-WtU

diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx
index 5b16de788db7f72a622e08011ef4ff404cb0e4e9..8a1b49971b638a33486505f2e36e0ab1f6991aad 100644
GIT binary patch
delta 351
zcmX|+K}!Nr6ot<;OoCwrEn1}y!4~0A<|d7HA`C=C6SQeF&5S9PijECLG`nysZ`)6h
zDBgc)*-vrVy7Qh95AM77-20u&ogcosA76GR;Nby73@}210DZ<L3drLa;{RQuiyp?T
zJ)EJ<KSE3@=6q!I0W*OPm4FTty2VEC7-vDPOGTi?P7jaFN38se4ZV8V@^HZgEd!=z
zWymOKxts_H2E^|fZx}T-ri1P$)cd%la%HlJzNvAl;eculNBkRqr@3&khkdAT`^DNh
zCpp9^i4b=@NR#@U6V1uls&CchY~xdwb5-^16fL!zd$(nCt*CzTixsDi3a({ob6b_y
LpDgvZHFbUg5=%rF

delta 888
zcmb`GOG^S#6vzLjX@w6YP(p*rj5a1d7A?euR6;MMjD%FQ(sC*-8hhEoO}LKk*Ju&U
zwzjQXMBBbW&^PGZs|BTF5OFzkhjY&T&+nXbr#W>Sx_i{C_lBlUEtnEIRyHn7hhV`F
zW^jmkRH2}TO&riF;TU=0Kf(p#kcCfygeX~%<xFAqWuU2N1&f0{nayh5{MI)azyz{L
z(Fv|pLIq)j$TLf7GERl6f-H-foa&XWu48VKgFPFs8)+1=qk-YYB9=)aPVppRCg=le
zh+&D=99FR|o+*kXDdvTrw0H?o1PL`lR-vNy>EjY%oe&CttD!9RDtRg%YzekjY7N^W
z$g4dgZk{T!2jkcv?-jQQd$*5{OGpbWNr1~8{gWWGm0@SQMb>2ZE-T0h%@|=9shkpa
z3B7x6p345pVwdKThE^W;f1lhZdqz{c^Gu7Z$8a{N-+!CVuQ=@0=4$vfU=?w(d<fv2
rjIUsO55Pxb^U!Gi;YRs?Tq$2qSr5xtT=X+oRkwYw|Hff3@FG6|+$^Vt


From 43abc35b1ce93067cb0dbfbe7f26c2f01974f78a Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Fri, 13 Jan 2023 12:58:53 -0800
Subject: [PATCH 2/5] [DirID-13] toaster sample drivers

Change INF files with the following:
 - Use Driver Store DirID = 13 which are available starting Windows 10 1809
 - Remove WDF coinstaller
 - Add PnpLockdown = 1
---
 .../toastDrv/kmdf/bus/dynamic/dynambus.inx    | Bin 5754 -> 4740 bytes
 .../toastDrv/kmdf/bus/static/statbus.inx      | Bin 5658 -> 4684 bytes
 .../toaster/toastDrv/kmdf/filter/filter.inx   | Bin 7318 -> 6208 bytes
 .../kmdf/func/featured/wdffeatured.inx        | Bin 5870 -> 5022 bytes
 .../toastDrv/kmdf/func/simple/wdfsimple.inx   | Bin 6838 -> 6020 bytes
 .../toastDrv/kmdf/toastmon/wdftoastmon.inx    | Bin 4598 -> 3910 bytes
 general/toaster/toastpkg/inf/toastpkg.inf     |  38 ++++++++++--------
 general/toaster/toastpkg/toastcd/toastpkg.inf |  38 ++++++++++--------
 .../toaster/umdf2/filter/generic/filterum.inx | Bin 4904 -> 5060 bytes
 .../umdf2/func/featured/wdffeaturedum.inx     | Bin 4924 -> 5092 bytes
 .../toaster/umdf2/func/simple/wdfsimpleum.inx | Bin 4796 -> 4964 bytes
 11 files changed, 42 insertions(+), 34 deletions(-)

diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx
index c51e1e9ba32cb5bc3d029f4d2609a6f35e745fa0..912596fd3442c16ca8001efd4397b2cefbf49b5f 100644
GIT binary patch
delta 329
zcmXX>u}T9$5Pg@EU^GU8Y3#NMSXkt=Ni<r8z=4Q~LOLPlF6KybIWFg=wDAYRf|X!r
ztFV5Df8dW;`F50L-^{*w^Jezv@TvZBTX<CPF-L+0Qe+q+CZ1piTR4UKKR1{l!jdl^
zm*_GE2-y=-9SFZ*rZ6TmWd8%bLgB~atH@2rD0EnfkTXyDx<(d@;IHJP&jB52T*=50
zQPI-c*_iW2m=W)YmRriwcJ+uW+>;qd7SMMkP97R$Jv13xrdL=y`&X1ExS(W&DSu$4
yG0x!WZ+GAv>(`BUQ!8e!ey&!`SLw|$`F7jYpOqIDd%Jbrt{&<0@}}wU9k{=m#zMIO

delta 869
zcmb_aOG`pQ6#i~E?Uty8iwY@5Qz+2zK`W6ED~KL~M!LwPhn18jX;do-T(>#Ph^Su>
z-2OnT{*w@NW^Nm$+bRxcW;oC9d~>?tUgT|m$Smnyje5g*M*?n)k>7|fRglFc*3m!<
zZ5-f&rHU(9_9pJIhMKaqAdqH_BTg@l05u#Bog$8LVpAc64QyeB^Rvithiw$FgA6uV
zR*}c9It%Q{u`h&0t|hytxr0E8wa$3X8I53U*NjQN+Bj2pgDv$S4i#7{w2dR>lt6D7
zv<wwgbOdxc?6b3MmYh>My}D=V%{|UKW;RFPHBFdvuC%TRs(7BX1bunJK2Bf+))|Eq
zA=#P~YS!8yTlDDi`-F<KqN7$W&3Kn5f9JPFpT=s+p8X87am*}LajI&`Dt*5}A0x>H
z`}~1;@*3%B+h{r%o$1)%L=p)^5W_92l=#mbW2-<A|Fi><z9oqKSvE)$Myg{wj{2lN
YvQSne{u5LSsngn5x;L`so_AjV210J5zyJUM

diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx
index a28b314442254190aac33404653232ab9e02c125..7a7053ae849b468a00dd355d0c4dc97c772993e5 100644
GIT binary patch
delta 309
zcmbQGb4F!D1e2fwgC|2SLjglRLlHv>Ln1@oWJX5e`VfW;hD?TH29T^DgBy@eVMqn4
zN@d6cvOwbbK$ZeS8c-w=sIL^LI~6RR1~y3nD3$>fQDATZ%49N>0og@BUNBG`WD`Wj
zlOYIbz6)4iIoQTzAgRER=mk}h2-KJe)Sd$*lYk^hTQS&~Ajf6`osbR`2?w)MfCiU?
zjWT2~0E!wiSO96u&E8BC8Knb&N(&f#fJ%}XvVlGTDa~WB1u2_+ojI7%cyd3>+RaRC
j1<adQac*JUoWQNcJh_K&4p2gqUwQHuZj;SS!V=5?P-Q<b

delta 895
zcmbVKO-n*S6g@9{@if$2w6LJYk4<QzFT{mBM64((1&wSIk*Ou6MbD^KLbPlV%&MUO
z5WN0EyZ%Cdp=Imt%xhuV3yRB~8Sb4q_uMo0HTn>L+8(jWt{a7aj22ZLUU+!O9ZT<`
zfD^2u0~1~B;h3y}GuZJ{Twxh488g9Pkf)I1_iBhY)!SYbbu=9iqFBQQ7U_KfC8|(F
z1)IoYoooqZY{|7knG)rqND!8&Zcqh=EP0#w91$Bv+|G%UICXI-_YOtcVbmm9`)U{a
zGAW2&5NUCh@sb*{-qo&)Uwdcxop*xVW7XWxio&eP@t8|tJm-5<bpGax__IP6sy#1_
z356mIRoMlTeYS>_VrcPPAQ-UU*sDb0vsxyYa8SqOFIvuURzFW_)JdfV4kRb>OW%LP
z5bWlh5e8oHpqA-5-|nxsBP*`Z|CJFZ`*}i4EI_Ah5|`w{QeS(Lq6}fuZD2ZTeFOI2
o@rVz@_MwLPw3hy*%>hwpu<T}ssP<w0ndz84$wVb<>HaC#Czw~H-v9sr

diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx
index d579ff7ea4a9ffa5694c627018fcbd52213a49bf..7958ef4d8be5b50568448869023c7179d6dbb049 100644
GIT binary patch
delta 350
zcmXX>yGjE=6g`s|NH8jf#3h9=iuMU<j3`)yz=DXFLI`Qr>_!*OgFHL^1>uU7SX-nJ
z<^!}8e3TaY75W99+1Q-9=W)->+?JmUk6$XM;i8Qmy69sF4;|vRv{nAf#R00&@Db1t
z==d0rcR6XasCdkdxEDlvE9%hH&ZuZq=!6(^?vvH1+dF2CizD7!iS{PUhiDQt8)pd*
z<2{lP7sL~yT^q2%28Pr-IHhtNO+Je!QB@HIszq$^ESq=rs#Xsf?O~shCeHZ-8@2D>
zwLy`1O_k(3vnCIjH*+&LjmvL##nh7xCDYuZc}b;X@;Toz)wEXTe&J3fO4vk0o|1WU
Xy|f<tr$3G(AIn*}Ol_DQr=Iu&p%+fP

delta 986
zcmb_aO-mb56g?9=X`)PQlURvSc!Z=uOeBfADB>d63PnxCh;CBKptgwC6h}o@S^5Jm
zbW^(MA1KP`vcVrvcdp!3+_}-68`1mTL`;Zr6&~-tnfrOpz4tiv<K6z5W}mt$8XdmK
z1u`(ujyaTI!ont&u|ccuP#3=#XYF_FVgf5zV~a(<^?;t15p?Ydk9<}hAF-|?P4<yq
z8*ub>kq{W;n?~Bc)DPO)1cd$5Yia7k=m@(sL2;v`WIt7m8#?zz=*kz=gni`urRf>O
zP^3LQE|q-!_S&nruBzG$cGDk!khVL9lakITmnty$Ee5m5kOaO|DF}Yo`LD#5Z!qcP
zWtIj#9xCd+6xIKg7qG-uNxYF(6qA_7dv3=#@@&s>jX7j7#peTNF|TBSEqS&@G03@O
zOCG38WDYt<CLxcgZ9d(4I>SQMmpJ7>9^1;;>F=A+YbVZ;Dii(pCS#3wEqqe-vW#Pi
z@h#&kncX3pF?vRukFLgBMK><NK`<b53^dQt7*q1bLQVbYuD!4Pbk8jeA%g@`*x@Tr
wy85PAD-c18CYGohS>oBW5n?*!rgYT!>bKt+M2nz0NZrnMF_Z!O!e7+y0mUoAy#N3J

diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx
index 73a1a1ea04a9c5bc399079b1e1d68e3c805bb343..4b7f091f2e8a049aafbb642d7e27814faed0a03b 100644
GIT binary patch
delta 331
zcmXX>J!`^H6g?3GwV;Euh38N@1q?2>(k&DMYD*QeNFg<`3H?x_MsN}TLbJPc>>>pG
zS&ki?dfrtY?|z(n&$;&=tnJP2udr5d@rfxWNHB+wFWNhlafvq6`3(>u#*CSZ9v<ie
zgye+m4g{YtQWz8Q$zM<_6nreYidaNM!C@sv$~a-x$9ydfr;>|j4se9Hl#wG^MM*8E
zeaau>gZ7nHV>4M=uO4%SHzJ-y0d<$6WTQdUMvMOTeAwwc3l{QYVQ*YLkvm0)oDtr6
nlIH4z?lm*}EqX>Xd#u#6TID-`F;^F66W17Kn^O1ZP%Zugz??pa

delta 921
zcmbVKO-n*S6g_4=;)zK`w1{93Lkul7T8WUDQIts<wTjZTl2W5*REzK@w3vPCmW8{Z
ze^7rVYSX&&<|#aU85Ea0Gu(UU+;czfgYS{YuYvZ5``IO5hw`qtd>R{<2l~k3KGJAl
z4Rsi3qKGp}1sAaF=eWTNs>)_SAW4lO)_&7k!vx9tB63!HXzikmqdq_ZtRstM!laR7
zqD>UAjTAO08RW5}&H_C-`U03EmPsPXL;?wFjkHclN|53ushO`PPSjnerRGOTakfI6
zI8;uP?-jY5p+eqjlX6MZr@YY7)r5K_5K$uJmOh;ks*I|mAA(5s9u<jOW#{V5V*R&H
z6FVVa^!XWQPYvv;j475_X6Y3i%TMown_V??XZz2>_Cq0<GwYp=Ad{|i5JUYDdl2NP
zC)Da6ZO?Dju*$LK5vKgSKL!>Mr#FggswuI~9i>&k569A!Z0q;mtqD6}ZK!^E=L!B&
ZW=~VNZ&tAmsy56&Gu5mGZ#R7NgWugLrilOm

diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx
index 69fbea751a903835fdf69e16c47ceaa5f9e4fe15..22ef93015ffef2ef247411d2573ce7ba8eff03bd 100644
GIT binary patch
delta 303
zcmdmH+M>TffK5<=!IL4Ep@1Qup@^Y`A(0_(;z!~75QYqfOon0xkfa}j8<0+6NChfN
zWyk}vK;rp8mI6Z>P$UtktrVy^6)c_xHb?;|mH`w|U~mD-WHOWi*+oEJFi;$15k$t5
zAqZ%`3s_${*v4caslbrv1yzy=)R+j=o&zM4fFwv;G1!$Lw`KyJkPZ|H2eVRu2A6}4
zGGs6SiW)Ll0BOt3%xqH`Wdndp3mANWN|G6}fj$5!1-aiAq;T?N_FzWi$!CQWC(ja^
bu-S=2f(yuv7SfztBPKJ6pJTI+cos7NXjDA2

delta 850
zcmb_a(MkeQ5Iq`cyC5u-34(YLB|=lz@M-ZutRO0djC_a)O*11c+M;@rpoboV`G7v5
z!ssvh82_NTcO??ro@AK2mzmi!XU^Qm%xC`1@C|hTlZQU$%Ck8Hpi|U{<d0Co1vb%x
zjce3#&ep;eocJZ~v4M_?*$^nOn=l8jT15Bc=xctN8rmYowdaExnmBO*i(?BrSYxOX
zD%`A$D)vysHrqOOv9Hc5XDXbFBh6TnNP(LPSTytoO~Ld|nVMj#H|V0FXbQg7IdiOX
zlHx7Xm6d|(S}0NGY?mu-Iq;8L>Skd@nUF#R1Zs+*kTcM`H<;{<i6XmnSgIcPaQ<^n
ziEGh=9;CDpPD~1E<4|=g@=Q&hwS_iCjA+7L_}`U&BcF7yl&c$C5e<!{sC&IarWZZb
z|9j~+R*^#rS=_NpGe_SnM+IW6(Nwma8e4PfU)Y!&s_#D3ga{+Sr$p6Z>T_NsQ^^d%
H3uiOmhccVu

diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx
index cfee1b1199a451be30a58286e6cb780b71f916cf..2986b5e456d23d213f10cef238a1c64635ee9be3 100644
GIT binary patch
delta 341
zcmXv}Jx{_=6g?CKLPB&kG0jVeI}Hw~acfK(4I!3T2bW6AN5n!X+Oex~eKQL)14(}Y
zi~qqtz`ze+_Phry=iYbDJ?Fl=tNog*7bC5rf?EhU_`n2XOfiFxh<JmeCa4Q^Fu)M8
zo^9ctH9$yD$mu}yV|D^PGCuvE%nCK%)477&fQ*1mWr#2K)09t_f?B+n96a$ewl*eu
zWtS)zxu5W9^l2Xv--yZ;GePMy@)7!EJlzG%O>~llI#~-%*6YJz>b&gP_|BcT>6+k?
z(_Ost80Cs^2TT6t-CRS?i=JE*FXX6nmHiY<LvG8JY+2gnPa3$yt6Y~Kva{2T@ec#N
BLYx2q

delta 787
zcmX>m_f2_21k>gS<~GL3e^~rjjTm?txF*MPNSnqpI5XrkcrxTM6f=}CBr@axVJbrr
z14O)lp_0LkArmZC%%H$v3&e&DhMQlqsxwVq!74U6ht(`NoFRoF4Tmu*4BiaB3@$)J
zoEiLq*7z|5GlVcWGWY<YD?<=N7?=zO%J>82R2cMtW&xcrc_wS*W<Cxk7Dl7Vf;`&%
z)*$yXSTpE?p#sR|t_ol)GcjDQ0CX?1ZxVt2$^`l`59oG?eh3LRak4L`t|s;nC}xNS
z+v*5(QVP(isSN3pqd8<%afcYP%KaRglk+&ZByp;q{E|Z#q@o_D3Scn7ZHBtV0~nk^
z3_3uF%gx3NMnG8uh6*4CK|?5Q02EbVP-4J{tR$pJCo{HyMq?O@WU3M{kX7+`6XX@t
Yga!$Cd}fmDQZ{J90><~|1fFM10MH(h{Qv*}

diff --git a/general/toaster/toastpkg/inf/toastpkg.inf b/general/toaster/toastpkg/inf/toastpkg.inf
index 04ac61036..a2a1982c9 100644
--- a/general/toaster/toastpkg/inf/toastpkg.inf
+++ b/general/toaster/toastpkg/inf/toastpkg.inf
@@ -18,6 +18,9 @@
 ;    This is a mutlios INF file. Same INF file cab be used on
 ;    x86, ia64 and amd64 platforms.
 ;
+; Important:
+;    This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809
+;
 ;--*/
 [Version]
 Signature="$WINDOWS NT$"
@@ -28,15 +31,29 @@ DriverVer=09/21/2006,6.0.5736.1
 CatalogFile.NTx86  = tostx86.cat
 CatalogFile.NTIA64 = tostia64.cat
 CatalogFile.NTAMD64 = tstamd64.cat
+PnpLockdown = 1
 
 [DestinationDirs]
-DefaultDestDir = 12
+DefaultDestDir = 13
 CoInstaller_CopyFiles = 11
 
+[SourceDisksNames.x86]
+1 = %DiskId1%, toastpkg.tag,,\i386
+
+[SourceDisksNames.ia64]
+1 = %DiskId1%, toastpkg.tag,,\ia64
+
+[SourceDisksNames.amd64]
+1 = %DiskId1%, toastpkg.tag,,\amd64
+
+[SourceDisksFiles]
+toaster.sys  = 1,,
+tostrco2.dll = 1,,
+
 ; ================= Class section =====================
 
 [ClassInstall32]
-Addreg=ToasterClassReg     
+Addreg=ToasterClassReg
 CopyFiles=ToasterClassInstallerCopyFiles
 
 [ToasterClassReg]
@@ -82,9 +99,9 @@ AddService = toaster, %SPSVCINST_ASSOCSERVICE%, toaster_Service_Inst
 [toaster_Service_Inst]
 DisplayName    = %toaster.SVCDESC%
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START 
+StartType      = 3               ; SERVICE_DEMAND_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\toaster.sys
+ServiceBinary  = %13%\toaster.sys
 
 ;-------------- Coinstaller installation
 
@@ -103,19 +120,6 @@ HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller"
 ; located (so it can launch value-added setup programs).
 OriginalInfSourcePath = %1%
 
-[SourceDisksNames.x86]
-1 = %DiskId1%, toastpkg.tag,,\i386
-
-[SourceDisksNames.ia64]
-1 = %DiskId1%, toastpkg.tag,,\ia64
-
-[SourceDisksNames.amd64]
-1 = %DiskId1%, toastpkg.tag,,\amd64
-
-[SourceDisksFiles]
-toaster.sys  = 1,,
-tostrco2.dll = 1,,
-
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
 ProviderName = "TODO-Set-Provider"
diff --git a/general/toaster/toastpkg/toastcd/toastpkg.inf b/general/toaster/toastpkg/toastcd/toastpkg.inf
index 04ac61036..a2a1982c9 100644
--- a/general/toaster/toastpkg/toastcd/toastpkg.inf
+++ b/general/toaster/toastpkg/toastcd/toastpkg.inf
@@ -18,6 +18,9 @@
 ;    This is a mutlios INF file. Same INF file cab be used on
 ;    x86, ia64 and amd64 platforms.
 ;
+; Important:
+;    This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809
+;
 ;--*/
 [Version]
 Signature="$WINDOWS NT$"
@@ -28,15 +31,29 @@ DriverVer=09/21/2006,6.0.5736.1
 CatalogFile.NTx86  = tostx86.cat
 CatalogFile.NTIA64 = tostia64.cat
 CatalogFile.NTAMD64 = tstamd64.cat
+PnpLockdown = 1
 
 [DestinationDirs]
-DefaultDestDir = 12
+DefaultDestDir = 13
 CoInstaller_CopyFiles = 11
 
+[SourceDisksNames.x86]
+1 = %DiskId1%, toastpkg.tag,,\i386
+
+[SourceDisksNames.ia64]
+1 = %DiskId1%, toastpkg.tag,,\ia64
+
+[SourceDisksNames.amd64]
+1 = %DiskId1%, toastpkg.tag,,\amd64
+
+[SourceDisksFiles]
+toaster.sys  = 1,,
+tostrco2.dll = 1,,
+
 ; ================= Class section =====================
 
 [ClassInstall32]
-Addreg=ToasterClassReg     
+Addreg=ToasterClassReg
 CopyFiles=ToasterClassInstallerCopyFiles
 
 [ToasterClassReg]
@@ -82,9 +99,9 @@ AddService = toaster, %SPSVCINST_ASSOCSERVICE%, toaster_Service_Inst
 [toaster_Service_Inst]
 DisplayName    = %toaster.SVCDESC%
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START 
+StartType      = 3               ; SERVICE_DEMAND_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
-ServiceBinary  = %12%\toaster.sys
+ServiceBinary  = %13%\toaster.sys
 
 ;-------------- Coinstaller installation
 
@@ -103,19 +120,6 @@ HKR,,CoInstallers32,0x00010000,"tostrco2.dll,ToasterCoInstaller"
 ; located (so it can launch value-added setup programs).
 OriginalInfSourcePath = %1%
 
-[SourceDisksNames.x86]
-1 = %DiskId1%, toastpkg.tag,,\i386
-
-[SourceDisksNames.ia64]
-1 = %DiskId1%, toastpkg.tag,,\ia64
-
-[SourceDisksNames.amd64]
-1 = %DiskId1%, toastpkg.tag,,\amd64
-
-[SourceDisksFiles]
-toaster.sys  = 1,,
-tostrco2.dll = 1,,
-
 [Strings]
 SPSVCINST_ASSOCSERVICE= 0x00000002
 ProviderName = "TODO-Set-Provider"
diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx
index 0efeb0d3ae26275b4c972e728bd4e8958fc83e2f..03dda4fffeed48c1b279e774230b80c65a1bf25d 100644
GIT binary patch
delta 344
zcmXX>O-lk%6g|$kkddfmx_U0smC)d(Mx>1h10kV-+a_nsp;A#(aU=E%g7+tcR_b4v
zA7ju@Xwi9BdA$2^?mg$;yD286ufs~g$2&$CVvH#Q3}`)^!9f-3^d8Yij0rOzO*H63
zMC3&54h0`FQs@y0$p4^LBzRAB6|p`Mg*q!SW{k(o+L*4S;aKv~;()pk=Q6TOt0-yY
zjGytxc%yx$HP}R!Hmk>6;e|*?qL8|CQF3uj)Wr?`?dh=Nd1aKb{avPV52TK8Pf8cB
zyvR@osKM2N)lOCPw^PsyC((I3(VyANUHZ@7WuC0Pm-W(i1y_1~zBPV-ckyHW11I1^
A`2YX_

delta 177
zcmX@2zCvxni_MQ1>li23G5fI^G4L{QP5#IwX=}@1$Y8{v!w|~g%izM`#-PAp4aCU|
z`3waNl|WVrkfp$o!cfGJ$xz0S3Z#n}^chMSa)DxLlb5rc=Trd7gW+UD9?8vptbdp{
yw{fO0P1a(OnEa0U$mTcP7A*Wm45|z<a7$t)2eQad_7IqWA>PO$x%r#GIVJ$9Y$|C0

diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index bb8af311f4156eef2e6623350d21da1050085cdb..4444f23c8d9cc527816fe36b5b4dbd6a2c4c837d 100644
GIT binary patch
delta 345
zcmXX>yJ`Ya5It8TSqy;?QY3|NEqpXW7Mnb<6Ja5Q5CsXOG4ARv8WlAPX#{`ac4D16
zuqjhmq{)BS=NEGBD3?2rGjq<&eCM}?&y_N3^|jFO@QM+J7-NbS2DCRgMjE%!``18-
z2oq)=?op%n5s(wG+ZTMuNTWlfMgAML0>L|?tBHj~G^(sbm@ytRt7E#5hF!_SBL`H4
zIG2%aT1`nSXZ?&nLZ9}9)?yP`+O8gPg)Wh%L_T%rqU7R|sEaH5>-}N7^GYZoZY18-
z#RIt`+>z5pk0)8~02R3AH(6I@^W<br-dUUF!H+pTI*-HDM<U)h#lut?IXs&`m5I+z
GiphUwQA05R

delta 145
zcmaE&zDI4tEJj9!$uk+ZZuVfVW1Rei#gEm9ftP`6vNn&Ttu2EggAs!cLnwnUgA0Qj
zg93v!5GOO_GZZjX0$C+MmI6ZxLlHwJLm5LVkS=D3VJKzD1&XCje#&~DQvoOshMPCD
i?Pr=ifmLF12<x29C7f#PyhaSFK-EyQH_sJtX9fVZd?6(O

diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 3187b27f95fc49c3ce3f409fc90b0b9c8e425c1d..4bc7c4e49387ce4a9e143eb8487a8605c2dc7307 100644
GIT binary patch
delta 341
zcmXX>J!=9%5Pf?Zlt8dG-GZ1-$YB!=NhN^;5s87+#=DD0;+^;jHvWk1f`wS57OqJk
zO$vWTNRuCux8t$we7u?WX6CE<cd>s{W~26N4G$xXkzj%u`iN<pIKwHfp|kgZAtFqf
zdFbGd-bX-Az;0jggpo!_q)+~wT7lr9=xSm^A{s4LA}knBnDsDQOT)3`;hqCpLR`wo
z0j;K_m9u`qAK{huiPmCMS=z21afN3hj}rORU5b*6OQJ5W=o{H#$Mb5aA?-RVb>1a+
zj5av~yznH;jd26l9CAHXH>&ulwE50g%r3t*x21CGpS(NiN3mSU)lp4<O25uOQprOy

delta 155
zcmaE&wnuftEJj9!$uk)@Zgyd=W1Ree#gEm9ftP`6G9!<qtu2EggAs!cLnwnUgA0Qj
zg93v!5GOO_GZZjX0$C+MmI6ZxLlHwJLm5LVkS=D3VJKzD1&XCjzRP-^QvoOshLhj(
rOHQ7{Cb0Pm+cc)h7OWdK=WvR#^BXa!0(HR5kD2VqBfoi>z&<7b1mh$~


From 51fed2a629bc5b15e6bdc43e6eeeb2be74c28870 Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Fri, 13 Jan 2023 21:35:44 -0800
Subject: [PATCH 3/5] [DirID-13] hid, input, pofx, serial, spb, wmi

Change INF files with the following:
 - Use Driver Store DirID = 13 which are available starting Windows 10 1809
 - Remove WDF coinstaller
 - Add PnpLockdown = 1
---
 hid/firefly/driver/firefly.inx                | Bin 7280 -> 6500 bytes
 hid/hidusbfx2/sys/hidusbfx2.inx               | Bin 12214 -> 10346 bytes
 hid/vhidmini2/driver/kmdf/vhidmini.inx        | Bin 4814 -> 5066 bytes
 hid/vhidmini2/driver/umdf2/VhidminiUm.inx     | Bin 5552 -> 5556 bytes
 input/kbfiltr/sys/kbfiltr.inx                 | Bin 5714 -> 4924 bytes
 input/moufiltr/moufiltr.inx                   | Bin 5704 -> 4900 bytes
 .../SingleComponentSingleStateUm.inx          | Bin 4472 -> 4646 bytes
 .../Driver/MultiComp/driver/WdfMultiComp.inx  | Bin 3898 -> 3560 bytes
 .../SingleComponentFStateSample.inx           | Bin 6220 -> 5212 bytes
 .../VirtualSerial2/FakeModem/fakemodem2um.inx | Bin 16596 -> 16766 bytes
 spb/SkeletonI2C/skeletoni2c.inx               | Bin 3874 -> 4032 bytes
 spb/SpbTestTool/sys/spbtesttool.inx           | Bin 4688 -> 4964 bytes
 wmi/wmisamp/wmisamp.inx                       | Bin 6046 -> 5160 bytes
 13 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/hid/firefly/driver/firefly.inx b/hid/firefly/driver/firefly.inx
index da7c841cb48369445c6aa5474fcfeb88358c15ac..deff99190214631c6f8bdfd8ba1a6cf425bb6ab0 100644
GIT binary patch
delta 550
zcmY+BO-=$q5Jo>uOpHI#L=Vs#6O{m>8<drin6Q9_8eQlHnL#GOfiNI(HHTp71>73$
zU_6Ki@C53s9%3Y&?yml-`c+l;SNZcW{rRq_sD0%a>snD|wmO}ur@o#wP^1TSG?de>
zTH0f;qqXq#lrY=gXYm7W*xE#iuwoU6b~;s;;r_7_e+p9oA@UPzK=6DCbr69@Tn!0t
zfPKU|`76=Tj`R_PkiAQ}1x_*cJgLUbth6DNnDR18TJZ?OT+w4hIZicFowEl(`^*^2
zbnC~`g}%R$PilJG_w0an@Htg|pVrcV(<QpSN#?2P0)Ex=#_FV`Y;nzj%tD&HMH98l
zdOzzt0bzc7)R@n3y75*3c<fOn9iWy}W<Q?mJ+D09TlAW}$*rz^VF`qu-ZtMCmX6Fh
Z$!)w$8;jd(9Cvg#$*-PHKek?%e*ql%Tt@%^

delta 900
zcmbVKT}uK%6g_5AR13a@gb$5d(nA)yy#(RIl0{M)Xe41FYg$QZq(;5@8*KU~{*HR7
zpU`vk3#v1_M&=hGmzmkQ_wKo8&b@EO$NJdUXY1Yd>IxbV*x-sGjucl6IWF~eh%KIJ
zXqb|gHs{M>6W8=tP(vLSu4qM6Wk8#q5Qq{Z(#nqeXFLXiIF_b1?^nQS{&b5fPMIu_
z;9fupmb~#a<+J;-k>UNUKQtDx%Rge+W_+KelSDg!i9MPk_d_wxXp-5h#8R}Ph_IHb
zUMA5?yK>EDp*YlWVS6g{ly&5JskT$=q^W{6-tS0Lr3(4v4)~~oQi7n)z5-=JDU%S$
z*d&Ghj8eBk#QN*Ah+Cp86-FE!XSb1MR$E%`t29}i*wsxwv%u#UagL~B5FF4O_Oc^a
zn$td)oj<IX^1-V&{)N|Ov%@B(5TXrYy#|BPFz&gOMcQYWUICrzb&Wv&cf3ZPflx1O
b2dXZc-i2W@963_=Q0u@LaXMQ~@5|&jK#Zc)

diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx
index 43a55fb02833cf207d5e67e9958a5bf7bad52eea..22f323036b7333b66b65c9bb9622bee744d4bd01 100644
GIT binary patch
delta 771
zcmY*WO-~b16g}-g(WW(_0TjZ=17WCjIt9C-q6T9_f(gVR5f&y|J5$>P2htXa#-xd1
z;mXb38-D_164(9&S1gUXaKTQ0K=r&=($KuTd+*$j^Uk^R<=NSz*1z^La>(E&PZDt~
zpIe0o*uy^FppF_|qKYOI(kSBw{W^1HR`$@~t(cnbuX94%5;HYM0bF(~+{Z4Dx`5R%
zU;YXKe5PO1dTj2cuucdM2ORa;zCqYmjBa-+5?X#<8E(0JEFg{E={0tD=rlPQkW$Yi
z5w|F-Mg|INL|>)%h`-MpFw%J~K@r(Ek`Bn!H~ET@sfbyH-(pMAXwx$4{CdoS-h-xH
zB={z8(F`7%C(E>oke!Ya<(Eigm-fZE*ai`FUGFjA{uQ=O<PrDKAT45n*+nctEuhe&
zJ&P=VY0l*IPEMl75qTf8=Za)hA+BC&lZ><&?Q4ehU4xgGshBUB*ob_M#--giBeVVK
z0bMJg5S9j}W8qQq%#y#?R^{I4lSn>HrnarHGVJzUzJ)nF<=PuEn3@W|kIq;Uo!Dfn
zE$=2A`8Am7&+8UBxq4l;=8xn!l?XphdX~hKcKFtwjfS7oI}wYd<<F(*a5D3o#GN4-
zbJE7|7=MTHh@3jMw4D``|CUY2^Xzyx{?v^-bGkm}j?0p}As^g_Qq3jghkN=TMA)Md

delta 2001
zcmcIlOKVe65T2O$y56Rms@2-slae$ohH8BvB0-9+TD7KCv51vgP5Pj1TAEgIRb7eV
zMrY$jaN!RSE{Ho{J3&+sQFkJ^DEO!gm)39Q-n2Jh#D#LXCv(m`&Ntu8+{|>|?_D(a
z)A=5_7vN_RtId$1cFJKLqY27T7OSC2><mp&9(&OrpcDAbKsQ9^)h16#wHp)*?g~|M
zIAl#5^*9IrAw-a<qZ(xr(g@D-&`5OkqB62*H}>*mR69%!uxZ5pocd2vAI@|74&b!l
zS&YQMDu)PWS-}8+qJIg-58?uV4dLoRA0UI!Q%K{iM@<%&xfcDf9Z`Z@y2Qc-J`PQG
zS`b0VW9>&aQ!Yl$tI5mVfB8NyoY=d}yZ*vrA6|dX5;v!8_5s2O^b3sV03!=)<nPBN
z1P|a9O2y?OLgw{M9OSAokG%=HfOEI>et@N~97Rlt*N<P}qzST_relgkkdJ{fAu$Wo
z0$>4c7Upu5P%phF6v{;lwQi+WI)uIG2H-1QDi+cYet5<F<f%;ZEwoM(e-1`@FqGs6
zp_P0mR1J0vrSR^;BVoD`wx9L_YCF87QC*${R15$*0AnBYY3Pq2wd2%6hw-%0Q4EKy
z$Dm0=7eoFT<v69$jW)S(G_2|6LB+&&6$|}b++t!nsZEvz5ToS~%lSFuFTo7o4aWGU
z9a~XIq?xwz?5YZ`jzlWt%y%vc^5qpZJ9<kb=$?<Gi2g1VdYY-(c^Zl?2^fAHsc?Q+
zZ-Wq@hi~(@wM(4w@}t-~k0YByi7gbT9*}TR$;+bJ+h{9JT0!8#SEGl!R<Gep<zaqr
zuXUO#Z3%ZOoZvH6Ne!G}yDGw+^)|n(3gcu?`6jvQ#*@{2J+v$+nbexA9A0TVk2Yk2
z++eQl?AF>CO|H00-OpL^*?jwP*Yd0U#$LyltjMO{S3XatwL4l+(F|%VEtnE2<E5$e
z*`gqo0kv-|Z7(<bsOJ}UEf87jOL}leWzB|CctJX+%GRU5>;6kmC;u3=PT7(oy|Ynf
z%bG5kg;vX#H`>PK`kzjs<&9#JlKf#~MMpDj@n%EDQpUNHPNM4%(|+p3@TRe*y@BpV
z!P_zDZSZK&Z@Bz7%EvK>&K{;ler4B4^Ed}<V~a2cqtTOr#rjp^*`-lurtVV!9sDAe
x(sd1+c!MYP%uBaadKhnkW-cz4bMYwm)K`1bt$FFSN?+^K(4-QFuwF@g`~`lvjKlx{

diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx
index 9d78ad342f06eb71fb5b9ca1c42579ae4bc5f701..771d664df270fe96f233018481b3f6046a192b6a 100644
GIT binary patch
delta 311
zcmX@7dP;qR4->y9LoP!BLq0<hLkUA7L*B%X!u25x84Q^W#S97zo(z5rZa_MPAr+`7
zl_3wv0*U7XSqcnkK#@eCwo;(xRIqp&*dPU<SO!o;fx!hRlgUs9WETN>!9a14MGzTJ
zh9IE%E?|A-U>lQxqyj^t7gR|iP-7xcdk&CH0+JwY#b8&0+?ok=LOM_+9L!1q8e9%G
z%8<bTC~C-H0i-QA+cT|XoSeX~rsx9Ho(43i6lhQh&{mLpL3Ae2GFzZ><H>vZ7H@vR
mEXT=e%%I8;Gr5pmc(WYu3Pwij$s75rCm-Nv*{mb5hzS5=x<ID@

delta 52
zcmV-40L%Z%C(b3XOaik+1DpY~$^{+?ldug2lL846vJa>MlQ0FEli&m<lQIby1w8;U
K05Y?m5Gw=Gx(}@Y

diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx
index 50ddab0b1cf905f1b881f1e0d2fb046968bf9978..30855f4ad20f315bd8d3acbc5b8d46d0596c63ba 100644
GIT binary patch
delta 27
icmdm>y+wON6ECX~gDOMJWJNCF&9ivLI9PZYxEKI!n+6sD

delta 22
dcmdm@y+M0J6ECYVgDOMJWJNCF&9ivLH~>#>1^fU2

diff --git a/input/kbfiltr/sys/kbfiltr.inx b/input/kbfiltr/sys/kbfiltr.inx
index d5788b5596046ffadff3ba0276cabc3526eedc93..190d458bf347cd29479b6f9a1ab5e8ac3e6beae0 100644
GIT binary patch
delta 568
zcmZ8eT}uK%6g``jkXb|#MFjH{_F=a8Qc9pDhLF)0`E0wZF4gX~x=K&`8)V;li+(})
z+OOzG^x8kD&WsTm!<~EQ+<VWRGxN6fx)y$Y=8?e$Ho20RLjGqLID`ui5Ab25i55B#
zNWs85eU+HOjEgp{p>nd`XNTPDL~KS5wplGu#4VTj!_`(Nt3U#aaF@Hu;?XNqNns*j
ztHtsY(%v!3{a%sO(Nki+zqqhk#5JipYPLZ?T67;@=^uDuh5f?|cF5)YFXN0$3bjcj
zP~p5Xy~&9l&0!>QDN0bXr9=iCXeqp*gbQ-EhzOLFSgFhB>4LZ$s$!X{;G9-cjXgEe
z;4Vlh>7?({YznVa*HFGxC-d@U9sY<wO+_XL_Y{+k9ilpR>GwvSGL1C<Sj)V89BEM@
zmRmk0g@<Fd8n~e{N#S50dKAQJS~faMK1WyanL%p&eNxK~W)s?2^cY_nl;@@=z5&)(
BWdr~K

delta 1048
zcmcIiO-mb56g^RsNJyk%5UXMx#TtbuCS9dN5NWl9`T<%MK^bB)Q8CR(CMtp;LbqL%
zyH@D3OUYK~PZ0b8g>L#Y)brj*OVwm2mwE5rckes*-1Fvg_&V8odt-h3nULf5m+~sG
zmmNU?qcHIfF7|MQDt54iZPa*{LPnd3Ii41nbK&tTF&je!R{d+shro%&(q&Xw;NmmQ
zp|7sj2;*=s@w`lPaY&d7;Y~)$Q`tjZRiSspihb_e$m2lg@{A4`sp=yA0{xnfU5!%W
zc{#$;ai5P|M2t+14gZ1dld)>EN$@SgdyQb=h#l%P6h%c=(avjsT&`LtCE2zZNJ~C$
zblY019O--aWXkMNg)QI1M%YA_cT;luqO(2`{1XbM@fzzg+1_7&8~qjNw|u6oS<>TH
zIg~Gw>g$LVOvsnE^R-nDTx!s12p{<(?=i#t0&<uq)+bD1mNtz=tmt)#nFZ#Cs7~>I
zCUPS)V{8n{Ozct@Eg~nWGFE?qdYJzvQ@X_c8~&=_UQ*EkTh%{S!o!B1a*BP6<l|8J
z?1NqnRpcChZ^>CW(Oho{MS8lPW?{>ZSYPkcIS+4;mfx}N6BC1Y4y}_-Q3tg?)KN0g
Uc=HL@d@Y}Wqk6&mL`O7u2Rd`clmGw#

diff --git a/input/moufiltr/moufiltr.inx b/input/moufiltr/moufiltr.inx
index 406de846f927e05be0699ccce6abfd40125e8325..4268a83afa2d68042913061ae95b1a2411c66bde 100644
GIT binary patch
delta 562
zcmZ8eOG*Pl5Pd_Ui$DZF3tcFU3o+3cLqIf9WHbl^M#KoN<IKbi>LgAk39jY<uEJbF
z4<NaOhj8N&ynyjlN5n`|UDdCuUiIsK+k9S&Mqg#*k;MjA8Yz^2c7<cK(8ePIc(_3m
zAr#hOBST*$W;4@5ht|+JsSns8d!2~K$j26|6-?Z5sXtsDeR7XT;1cd}cUU}mg(@i=
zblK{%{EW2sj7q;(6lxWJB<BZ<3(F?1NfzqqHvL4|AoCPi>>gh)B$NNYgj|=D>5)Xi
z;<OWbhx6JrpON4qNl~z?C3ZQ?)p$e8R^)6FQK)FCqAK92M!Xg2Vo6!JpjC8ZUyro8
zD^d!b_#Vxp>^e1##fvh@%e(sg4}~ioIUL;AOa*KcEnt^^Z{i_y$nl4b{OhM_#QTZT
w(m5&GIAyDiTPhO@9|tJJ4~d#lj1SW<@y^`La5ecpZ4`&2)W{fSXIG}a0k8{XYybcN

delta 1119
zcmcIi(MlUp5Ixas)DSBr_z;S84aT~V+L}_RgtUaT#l<#KqxPktq{${0Vzwkv5rlj|
zA4<7Dpx__m1NvGJf1rQiqc7^Yvk6A*`XI=#yL0c%o;h=7j%NQRhcC|4zyDYPTa`jF
z6%RBrb11`ti5y(~z#f|Tjv6-6=3NTUX|L#g<ZYQT7cD+jM#m9Gy8CM=8|b8&u#N^3
zTx`)C`ug`aVH|#|ysy(->=LFyc#|jX>FBOxHR$azW1HVil&~YQ5>Gok>Ff&qGX1uk
zT|uexz8+@kyvIi!hNFu%3toY3ld&%Ijo>xHxBOt>sA6a;swrx+ns!P2d38MeM$HBD
zc1o&j2~8<YGEICH?QFKw>XECnV*g%i`d)AxshuJ6LU+<Q4H+pU@I@_*PIr@$e}Tto
zuLs5pQlZIqJ^3^vN4+$jsQutU;WMSE`qZ4kGH3Oc6?0gDjXbf|ki`euJFH?u-UUWh
z7@MJP72U0xFk;W1LYv6}>M>mP=k10b*R}q%S`WQ{ytizGIvsnYUPnePy-znaX`v`x
zW?8pFJ`QT?a3q@W*KjcN=ZIzbXZAO^r?#4oOnvgt9>DE!TB3HVNYebczd%ZzjK?}A
t;<$$?u<~uFaZ!#ctFy7m&i^@j{a)WWPx0H3@31vNS)1OlyXJ$SaS6Sa(hdLs

diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
index 7eab5b7008dc390d035f99ddfb499a32ac86c491..697ccda52f492d55125b6432f4488e0df139416b 100644
GIT binary patch
delta 344
zcmXYsv1$TA5QhH~?*u{d1p=#>Mi3%4CZZ4!;UGv*!Nx|tQ;(=8YEC;JVjmz~N)fKJ
zw6w_!q!u5+(tlT3c4qdQ`Tu3EncwXGY{-jo-P)L94j&7w(8G-J4GF|ihIpJd#_+J@
z%SHorW(O`cE~g#MeO3ZPk{<Qn^l~*HYF|M%CK0Hy;~`+Z;HyRMZ}qTh*=X|Cv~aDz
z954!6Dm#?}UJnz-KBHnwTB!bte1;K8M^_F%UTdcUUPuclF~2?*yRVl=9yx^PNMJmD
zQa#59RRer+DWz5`Rg_kCqAjB+f2_2eSO=LhkMiH#gd$drnMFLKEB~zbaF;wqZf*2L
AwEzGB

delta 194
zcmZ3c@<VCEGe$;*$xj)7ZobA`!#KHw)i2$MftP`cA(X+F!G)oSA(NquAr(kFGvqTA
zFjO+wG8i%#G3Y?$-53-YtbsTgDyzUy0%R#Lq#)@mW{6=ZWyl4JrGZTbnGV!5`5~L~
z<U?%pI2C~E!Ekasd*x&WHi^kkSa(g%;0W7n!tscW--tmKXaK}HZVWM#1Nkf`H?VPR
Jj^RJW1OOGAEEE6$

diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx
index 3a02e75f105233e3fe24f6f35e3555dc86ce7d7e..c00074d592dfcd9448174ab74510eeb470b26e0b 100644
GIT binary patch
delta 565
zcmZ8e%}N4M7(F&fQMRyFBE(%Jlwmr!DWydufshgvw28o+F^6mv9hFw|0IlM_K--of
zwdfh5=V;ptROh?S!s2p&=DX*d@0>etYoF=j&vzMlWU<Auj75~A^#EP;aECrTT%(Nu
z3L9u*6H0%@S3?Cs^ofzR!F!J<AKSz!?4!e>X4nJs<zfJr)e%>R*x8OX@*NDxbBV1}
z^OmPlgb`I4=ft#7)2T%AVSObmqe|G+L_ms9BmXI9wC}O8BDRi0?hb`}oIX!d7vqYu
zt_d=vK`|;738$#pW<{Z50*QI4o+1bhV0u->2^&-laco*PxhhJEoa`e`kNFz7ic$_J
zE%)+zKHpjL$;qMa*eKa3uxew6`|h9j${`0Ui~O@4#?r?m^>9R56E_iEGVSqqJ;m%y
zg%(<DCC?ksq~w#`Gf9YIi=w`td(p3n!sOk$jK_<};6f)8DP6D@^y7SK^0CyhegTju
BWkUb}

delta 794
zcmaDMy-SYs|37O6UIs1(>&Xkbq$gez+Wd~Oig9umv)1G^7KzCb93u6$42BFw3<?a^
zK%C5w&rrZn31pQ3Sqcm(3`Go?3}p<dK)M)gjx$i)lOYetD`7}v$N@r-Ts#9v9Hi3?
zs2(I%4AgB4#D+kK&E#UBT96s3Yz(;!#tcT2Z!&KU4+mP91~v-Q3Ka%#244mjpasqh
z{y-=AF$6P&FgP;!0HG^G5JMQ43<k>h1Lag0^nhl8oCoyY<cF-LoA<HAv9cO5s4~P%
zF64;z$L^0}hFGvK9f6utfQF_rqyr7Wt~MTMIb7A`kL;55xYS{W4JbxHIGPx<p>Fa3
z20##l4iI9ur??&zjzDPxh6*4CK|?5Q02EbVP-37(`0Bt-t;d!!l)(PP?^n$5fy4rd
P&Q&2MJ#2R5TFwjrn_Q99

diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx
index 2a15c660682b88985cfd504f8b2d7eff817fc699..ca9dfc6b49cf0ee41a3c55f91168663edc5aa925 100644
GIT binary patch
delta 363
zcmXYsy-Nc@5XIl-!;hc@!B*H(#6W@;QAu|QhazGE+Q!@^In-Rpr(Mv}N|@Hpe?U11
zR@N3aDbo2j*eM~6zTJdnXJ&sh?=AD0{n~sPDtS|rfr}e75u$|-%4jg|V-+bJK+jJJ
zbp&Yh<>CZ~%pQDdd`^3ohpaTJBxUNm^ztpQT3=08C(&@&3D9HR;;Tp=4(zaLxj5r>
ztgvsttT1X?8atDFyaBEmFBuJM)57#S<PFqF&TZxK<GyvuAxoM=o_TM+*lfKFGT1^i
zj5%uKl<FpqsjA?LOBuCUsbIA76ECVA`Ad%FJ@Fxr$y+HcT|~c&59;}TIj(ecxAGd3
W-SiWuM(HD&uI1%BwGip`?ZiLcUrkg1

delta 907
zcmb_aOD{uF5dKc9Zu*KxA`OYSY1%}*+FQY*xr?SqP;ETIO2k`HL@RVvv9gs}v$Q5R
zZ2bU4Sld|p1r`!>&h3J5tz>c@ne&~QZ@!tA_WStdjSxCri+Ah7Ju0ZtlNAYi^%!*I
z^7YLljU9|&8%30`fGxHa?7{Z$qKskWm9GdLCNBd98MO~yo$t!%qqa;Np8Luyma*y(
zFM=_QW00ezk>h+>Oko-+WY~r<i5ay|@k@^1BIw~*l8edtbR>BdnB69G)0yc$GnBUy
z*44Sqo<bOlin<LgVM#qo+6P>Mgz9wb33;;|sKCggRnXpq(5+doaEmCNHgsDjfnyho
z<*hq&ClI9xSBx_LmS7S=_?ShvG<wvM4N|rISJfyLY@%}!Xi^v(S^dR->B>LU`Mc6Z
z%qd)oD_&+LR<H(>p0t6eb8o(2>CV?o&su-X87=dE@1)JhY;*pjGEl1)syMOkMFL%j
z<B*p$qk6{Kt0Rnmnuhqdap?LpY*-4(Qkxa$!hVWj%l}VwZMMGZ^j14>CF(nBJ^>&#
Bu4n)N

diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx
index 0e5ad80b305d656133dfc6d0e9008daf49181b0e..4e550c87c798e9d6f416fcede63bd9062d2e211d 100644
GIT binary patch
delta 405
zcmX|6!Ab&A6uqx>63HQOGmC;};2>#{34^7D3kljtR1idqCTA+cQna!~P`2m??hmwx
zRw2RLw&)9@Mc-f$5q?2*<_Rt4-gD1A=iE0RUGaM>p1(!4KrxC^fh4Wb2{oxfEjlBY
zPEnWscM^L^TXaM<YHMwUR?$83;qjsNG~WP{bO6SM{~TF9wYh7>ugkzSy1?9mViVio
zk`G+Q<qdpgozT%Ys;CkfLxl^U3wIrLA2o2b^(%w7)^PI>%(g}zayvRHOY>l}lt*7Q
zhQFdd1q;rbC6VK)a6)~Bib7qE?g+MxJJmDR$HF;E(k>^)<19@}y_h3W^=d_8ER%UI
z6(;#T9bwyE!5rd#%2D_BgTUaZtJI?g+$+v#)!Ra#axfcQUvBbXZkh+l34Tf+Yrc}%
N)BR>PqJA>{_#a_!V9Edh

delta 222
zcmey@#CWBVal;$N&2O0c7&l9?MKDg5V3pW>hsB0*auItQqr&Fz?1AjOMhvP9F$|#$
zz6>r5Zj-(FbthM`I9M7n=)lAn6d0_5IGG`zp@5+h$SMJ{6c|z%iWo8(${13CbTPt&
z&AI%%TtKrcB{_K+6(%>T&1O|#;AP+fvdlM!sV`v!3z}~>&|C&$8fw{2j<Z#n9H7ZD
h*-qOIDzZa62h6gb9H)~8(J=X!P6C9rd4ldcVF19sIx_$O

diff --git a/spb/SkeletonI2C/skeletoni2c.inx b/spb/SkeletonI2C/skeletoni2c.inx
index 1a911e9df46b20c3ab7f60c233b114a4c177ceb6..4c42c7db1f769245159b0f384e316ddeaf6a6b4f 100644
GIT binary patch
delta 341
zcmZ1^cR+r_F2>1w7`N4XGUPH8Fyu27F_bVQGUNeCD+XQ$E(U7`1t<(*$Y981C<gL8
z8T=UBfOHB&Do{@<P<0AeJRitXU`PXsBm(u90?kSVi>HCjRRD@*07VoST!1o}3}rxe
z5s()Q6wj{*D+Wn<G6Vs!3s_@0*ve!esQ@$*WE_Yt1L91E93YtlBtc@uKqEl%B|z~!
zhIF7vIGB|Jw748>k|BcuP}GpY0!UjzJqGcfE`u(E7Q^NWrVd8g0HE#y1|OiVWQJ^@
zr$D+vUa|%0o&1|Qn9+E$B&*`)XDl&Hn_bu^u}r?fJ%`npL6sq9vLcuG<_SELm;hy&
BLDv8P

delta 165
zcmX>gzesMwE=ER$$vYXhZ_Z%uW1K9(>St}lz{|h|#?}l947LQJ0)sO{4nrbCF+=g>
yiR{9fgmpkwOy13^xVeKhhKW&O^JDhOEI@~p^2}v5Vo+s>nS78-e6t?!Bqjhlq98;7

diff --git a/spb/SpbTestTool/sys/spbtesttool.inx b/spb/SpbTestTool/sys/spbtesttool.inx
index ae1a4fe46b331e10b6666b44e88fa55d87afbafe..bf337b3e34e05727feaa68c3127844480ad2a300 100644
GIT binary patch
delta 338
zcmXYs&q@MO6vn?>CJ~rVAl-!o1p`iQ(r7mX10te9+vcA+XpT7Mw41H_X%#(0aKS~j
z^Z|MWp$GB1H@Vz%&i$S9eV6lF|2zNu62*^L=PsTxLxMRL@Gxa;qk<FMK<>{yMu?H}
z<)Vu_<`5Az5vN1L6IK#K5|8>9dPRm0jjtpdkw`e~#8|SP^EDt(ax<)3F8aKV5oYGg
zfKk#?+v&XIjWJ>L88u63q5BK+DV|6kOcnCu%sAO-klMIrZtWNQU(bStOQ_d_wW#%|
wo}oikfH9ZSYQ55}))p6~foK-nqi?k;`9i&yH$pugUzLlu(+|;9cJ=IV2Q}D23IG5A

delta 74
zcmaE&c0pysE=ER$$vYXhZ_Z%e!#LTE)sN9=vnyLJ<K$1Q5|g*F&f2_%{SZ*e=2A{$
eHlWJo{Bv227*rWzCNC6{oSecfw7Ep!0}}w_3K-S^

diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx
index 800fda274b7d4de34368c95d8dcea5d53c0dcbc6..c4c4807064c6b9091c4e4b1119f8fd724afdd5b1 100644
GIT binary patch
delta 302
zcmX|+I}5@v6oro#5rsk#agMlj5VW}XSVeFVQNcOd)(XDxIl4QzWN>qK6bj-G@Zb0+
zJWW9YH#gt8=OnpT9`>_foLgu?po=9oSYwMlBv!0Vn8;F#)Od{$V2+)h?xDlog-4gi
zc~|o_I{}|WGU329Pjg=<3$lPjpiO0tBm3={$03F2>R9Sxz~{8J@uaVuvI<7V6Ou+r
z`+{}C8o72%i1a=A3Nw<i?p)@cbdrNAse?NA#{X+3!n{#VCTi-NDynztqFz=m?4<h{
PqMKDxpNt(^`K$2*yB#=l

delta 798
zcmb_aO-n*i5Iv>5d@p@SMj{#9%qU3Gr?d<cD~L)XqgEl7R#IB1QEif18<ew+S_MH6
zfxn<X7R`ORNa_he4EKXMbLXBjGtZL`;kO|hT{@JO-yZDkiPF2`p<7j-$s&nkETN1l
zYRKV;t$+%?{3p1;B8sN33V~T(1`J9lFPSamv1jo*h-Iu|p5G>s=IkkCuz>_t*cPyk
zO>@sMl4dN3Y0kwz)14k`_S=&sCUVF$1d}>tGV)f#fq9nMQ^Jl(Qt&Ou$gYV=f@e%t
zMhbdVynQJ~ODNEl)7Sb?)>PJ=c8^iRsne@Vm->f=si62nzd(`V9xqiK15MpcbK0Qy
z_d-?4rNzgs%a~wkd6rzjK0T?UbglZQtfS>09Yv?CHsQ03ryFggZovyNL=i#+=e(pD
y?K8q&fdKxgfuZjm<ka2L2Be(2r5v*t9rCda7qqT9|2%6-d)TsCxOMMt*ggTSteepQ


From 8b17742dda77e6ae08fb8bbda9b97943f2efd454 Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Fri, 13 Jan 2023 22:12:38 -0800
Subject: [PATCH 4/5] [DirID-13] usb

Change INF files with the following:
 - Use Driver Store DirID = 13 which are available starting Windows 10 1809
 - Remove WDF coinstaller
 - Add PnpLockdown = 1
---
 .../UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf   |  13 ++++++++-----
 usb/ufxclientsample/UfxClientSample.inx       | Bin 4136 -> 4418 bytes
 usb/umdf2_fx2/driver/osrusbfx2um.inx          | Bin 6348 -> 6498 bytes
 usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx   | Bin 5540 -> 4992 bytes
 usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx   | Bin 5540 -> 4992 bytes
 usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx   | Bin 5540 -> 4992 bytes
 usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx   | Bin 5540 -> 4992 bytes
 usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx   | Bin 5540 -> 4992 bytes
 8 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf
index 04be1394d..acd7fd492 100644
--- a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf
+++ b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf
@@ -9,15 +9,21 @@
 ;
 ;     INF for installing the UCM-UCSI ACPI client driver.
 ;
+; Important:
+;    This INF depends on features for the Driver Store DIRIDs which are available starting Windows 10 1809
+;
 
 [Version]
 Signature = "$WINDOWS NT$"
 Class = UCM
 ClassGuid = {e6f1aa1c-7f3b-4473-b2e8-c97d8ac71d53}
 Provider = %ProviderName%
-PnpLockdown = 1
 DriverVer = 06/21/2006,10.0.17741.1000
 CatalogFile = UcmUcsiAcpiSample.cat
+PnpLockdown = 1
+
+[DestinationDirs]
+DefaultDestDir = 13
 
 [SourceDisksNames]
 3426 = windows cd
@@ -25,9 +31,6 @@ CatalogFile = UcmUcsiAcpiSample.cat
 [SourceDisksFiles]
 UcmUcsiAcpiSample.sys = 3426
 
-[DestinationDirs]
-DefaultDestDir = 12
-
 [Manufacturer]
 %ProviderName% = UcmUcsiAcpiSample, NT$ARCH$
 
@@ -49,7 +52,7 @@ DisplayName = %UcmUcsiAcpiSample.ServiceName%
 ServiceType = 1
 StartType = 3
 ErrorControl = 1
-ServiceBinary = %12%\UcmUcsiAcpiSample.sys
+ServiceBinary = %13%\UcmUcsiAcpiSample.sys
 Dependencies = UcmUcsiCx
 
 [Strings]
diff --git a/usb/ufxclientsample/UfxClientSample.inx b/usb/ufxclientsample/UfxClientSample.inx
index 51525cc852400f9dc84666ea0dfca1a6d35ff564..098e442ea3b6a9519b053c40b6820e82dc1b45fc 100644
GIT binary patch
delta 316
zcmXYs&k6xi6vn?XvA`_tZ<b1tlt0@^O-VvgR+zzr88Ijuc>x<`!3$Wbc?0Doyo6Wq
z-AlK7&bhyHzVCMK;+cK~`oY2iOZZqJzyKa&1qR}%Li|q$Q@B|3Wubu@vkiwDhtsy=
zJ}ZGS$$<I|y&T2I%2$w0Nd!!GTx?md_-d2;2Q@5P7FxWf67JNOBSt|>X(#iR*TtN1
z$SB#G7P23Zdzg@PRb}(zopQ<}N18{8x%^-3w_X-mWDxH4x0Y&By+oa=5oTOUs=ag3
X=xc@ZG5HF6(MycwCvgj}#wqdztj9cf

delta 46
zcmV+}0MY-#BB&s+bOW<&1mFR)eg~Qc1u_6709=z%3L%p|4tA5q2E3DU21)@kv#So5
E0(T-0bN~PV

diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx
index f7f8f16cccc70253b54e8a29d024f7b92feeca97..18e3328209f0207c60f6514c1969afc7fc3615fb 100644
GIT binary patch
delta 330
zcmX?O_{eBO4RfR?LoP!BLq0<hLkUA7LmrT{V&G-qVz6dVfWi=l42DdGVj$0x!H>ZW
zNT)EQ0`;T<Ri}W(^MNb{hBTl^B2a%R(5zI3;>iy=h2vd->`aC-AioHxA{ZzOvMCkF
zb^)3e1jH_26UxDMBm+qWpcxPqi9mgcK;1b&G6_h6bQObL336*D(9ZP9h5W+2h71Nk
z8AApOAZ@uhpSh7yG5{!9z~BS4ESVu2=*WDAa-fJUgW+UVUT;R@$<x^tC#SJb+x&$k
zifOVIpW0*r4wlVo939Ne#tf>PcXO9AZhpoq!L&)hjB&GtpabLNC4wT8`-G$>uM!HG
Uyg*O_$d;J=Mo4J0i*N@k0Hz;ErT_o{

delta 220
zcmaE4bjEN)4fEy_mJ-HI>~Tz!SFlM;&SRUlIgWD^GrtjoDnkrID1$G93xgX&%;Z`&
z`OPN0A&irG*c`Hr7<AxL3Jlf^3Jl2%`3waNl|WVrkfp$o!cfGJ$xz0S3Z#pHhNLj0
zG4L{QF*pNdJsI+VVkHcT3^_muQ4tT80h!<i)CUqRX0T;2WH8)Z%cso5sIYmyfH@<O
nx+>_%$hcs#qmbz24Z;%4u?z~6orOc$6~Kmr#W!yd-oy$3_1-Zq

diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx
index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644
GIT binary patch
delta 338
zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN
z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU
zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA<Y)65L(R)98d!w6UA%ORtn
zrMA;~$s6OHalokAoEEyjAWtwRc{NqYk5|UYN0rpaEpt6z?6jT-4`rwqdu?5|sGj1P
ysv+LElvXErfG_vXUTq71w)!p}&I&bLqbEPzEA?~kSn}U(S~a;Tdg}3F;2Z&ty+Nt~

delta 781
zcmZorU!uJsfO)eAOB>_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH>
zLmGoKLq3BiLmophLkUA7Lk<w8G88eWFnBZgGPp3f0p<OH@_r1#3?U4T3_d{U$`Hg5
z1}1}nGX6k06$U+^SwOv$r}9NR8!_-QaN#gF9xPtKPzf|S6Kq#8(3!SCYzTxPeIRT-
znNdL2Qh^~H>;eU_o=glkDgaGDc6TDs2bn<M<bizZkKJFz46$Gv9D(jl0s14AAsuKt
zcD3<9|H4&G?&g%N$E6M=j_N0vPoi;}jj0FXGCZ+TPj0lp0~WV)kh}^FA`f5^2x8Cy
zLYTMfQPW5<gE4~<P}+c@0*FD-5K0>WMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr

diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx
index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644
GIT binary patch
delta 338
zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN
z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU
zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA<Y)65L(R)98d!w6UA%ORtn
zrMA;~$s6OHalokAoEEyjAWtwRc{NqYk5|UYN0rpaEpt6z?6jT-4`rwqdu?5|sGj1P
ysv+LElvXErfG_vXUTq71w)!p}&I&bLqbEPzEA?~kSn}U(S~a;Tdg}3F;2Z&ty+Nt~

delta 781
zcmZorU!uJsfO)eAOB>_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH>
zLmGoKLq3BiLmophLkUA7Lk<w8G88eWFnBZgGPp3f0p<OH@_r1#3?U4T3_d{U$`Hg5
z1}1}nGX6k06$U+^SwOv$r}9NR8!_-QaN#gF9xPtKPzf|S6Kq#8(3!SCYzTxPeIRT-
znNdL2Qh^~H>;eU_o=glkDgaGDc6TDs2bn<M<bizZkKJFz46$Gv9D(jl0s14AAsuKt
zcD3<9|H4&G?&g%N$E6M=j_N0vPoi;}jj0FXGCZ+TPj0lp0~WV)kh}^FA`f5^2x8Cy
zLYTMfQPW5<gE4~<P}+c@0*FD-5K0>WMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr

diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx
index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644
GIT binary patch
delta 338
zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN
z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU
zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA<Y)65L(R)98d!w6UA%ORtn
zrMA;~$s6OHalokAoEEyjAWtwRc{NqYk5|UYN0rpaEpt6z?6jT-4`rwqdu?5|sGj1P
ysv+LElvXErfG_vXUTq71w)!p}&I&bLqbEPzEA?~kSn}U(S~a;Tdg}3F;2Z&ty+Nt~

delta 781
zcmZorU!uJsfO)eAOB>_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH>
zLmGoKLq3BiLmophLkUA7Lk<w8G88eWFnBZgGPp3f0p<OH@_r1#3?U4T3_d{U$`Hg5
z1}1}nGX6k06$U+^SwOv$r}9NR8!_-QaN#gF9xPtKPzf|S6Kq#8(3!SCYzTxPeIRT-
znNdL2Qh^~H>;eU_o=glkDgaGDc6TDs2bn<M<bizZkKJFz46$Gv9D(jl0s14AAsuKt
zcD3<9|H4&G?&g%N$E6M=j_N0vPoi;}jj0FXGCZ+TPj0lp0~WV)kh}^FA`f5^2x8Cy
zLYTMfQPW5<gE4~<P}+c@0*FD-5K0>WMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr

diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx
index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644
GIT binary patch
delta 338
zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN
z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU
zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA<Y)65L(R)98d!w6UA%ORtn
zrMA;~$s6OHalokAoEEyjAWtwRc{NqYk5|UYN0rpaEpt6z?6jT-4`rwqdu?5|sGj1P
ysv+LElvXErfG_vXUTq71w)!p}&I&bLqbEPzEA?~kSn}U(S~a;Tdg}3F;2Z&ty+Nt~

delta 781
zcmZorU!uJsfO)eAOB>_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH>
zLmGoKLq3BiLmophLkUA7Lk<w8G88eWFnBZgGPp3f0p<OH@_r1#3?U4T3_d{U$`Hg5
z1}1}nGX6k06$U+^SwOv$r}9NR8!_-QaN#gF9xPtKPzf|S6Kq#8(3!SCYzTxPeIRT-
znNdL2Qh^~H>;eU_o=glkDgaGDc6TDs2bn<M<bizZkKJFz46$Gv9D(jl0s14AAsuKt
zcD3<9|H4&G?&g%N$E6M=j_N0vPoi;}jj0FXGCZ+TPj0lp0~WV)kh}^FA`f5^2x8Cy
zLYTMfQPW5<gE4~<P}+c@0*FD-5K0>WMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr

diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx
index c8678d1e302b65e15cf0ec9e4c232b6bf3cef26b..ddd17e82afe77751aac9aa019fa64d33aed8ba5e 100644
GIT binary patch
delta 338
zcmXYs!D_-l5QhIW@t`z^9!oEKDFr29@KRfPDN+a&5ta7hMNQPuHnD2;7+=9|AE8GN
z!aj+wAbp4){dWz^&dh!@|G&&{Wqq@2*;#-OOp#)S1^P%B@8F_@dx-pWF+q$uUjdqU
zVh#~e6LC5;JY^*?BI#5AMX$*4k?|E|6B2<2J2955XMA<Y)65L(R)98d!w6UA%ORtn
zrMA;~$s6OHalokAoEEyjAWtwRc{NqYk5|UYN0rpaEpt6z?6jT-4`rwqdu?5|sGj1P
ysv+LElvXErfG_vXUTq71w)!p}&I&bLqbEPzEA?~kSn}U(S~a;Tdg}3F;2Z&ty+Nt~

delta 781
zcmZorU!uJsfO)eAOB>_lH>_tk6&Rp!^LDnU%!~??Kl15rKEbt(iP30tJ+Crja5zH>
zLmGoKLq3BiLmophLkUA7Lk<w8G88eWFnBZgGPp3f0p<OH@_r1#3?U4T3_d{U$`Hg5
z1}1}nGX6k06$U+^SwOv$r}9NR8!_-QaN#gF9xPtKPzf|S6Kq#8(3!SCYzTxPeIRT-
znNdL2Qh^~H>;eU_o=glkDgaGDc6TDs2bn<M<bizZkKJFz46$Gv9D(jl0s14AAsuKt
zcD3<9|H4&G?&g%N$E6M=j_N0vPoi;}jj0FXGCZ+TPj0lp0~WV)kh}^FA`f5^2x8Cy
zLYTMfQPW5<gE4~<P}+c@0*FD-5K0>WMHLv7fbmDw6s7`Bo;rAqRoeWKub%|~`3jCr


From 217e46c9844145bf0bee397a916ddc5bffe26d02 Mon Sep 17 00:00:00 2001
From: Wei Mao <weimao1@gmail.com>
Date: Sun, 15 Jan 2023 14:54:25 -0800
Subject: [PATCH 5/5] Fix: Invalid flag 0x4000, cannot be used with DIRID 13

---
 .../toaster/umdf2/filter/generic/filterum.inx | Bin 5060 -> 4908 bytes
 .../umdf2/func/featured/wdffeaturedum.inx     | Bin 5092 -> 5012 bytes
 .../toaster/umdf2/func/simple/wdfsimpleum.inx | Bin 4964 -> 4888 bytes
 .../SingleComponentSingleStateUm.inx          | Bin 4646 -> 4554 bytes
 .../sys/kmdf_enumswitches.inx                 | Bin 5984 -> 5276 bytes
 usb/kmdf_fx2/driver/osrusbfx2.inx             | Bin 7628 -> 6938 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx
index 03dda4fffeed48c1b279e774230b80c65a1bf25d..db5e7a28fe59425df1d9908426e3029239959805 100644
GIT binary patch
delta 16
YcmX@2zD8|>9{1!r7MabDxF4|t05@p{VE_OC

delta 168
zcmZ3Zc0_%H9=Ep+0|**0Q~)sqnm}m<1_cIdAa-W(X9!@3WN>5fVQ^=NXYge31CpT(
f!3?fIItWPmF*q{#GPq8zWs#+(d7C}CAF~4hZ><^6

diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx
index 4444f23c8d9cc527816fe36b5b4dbd6a2c4c837d..2c251ffdfa82bf0ef6057257b21eb098012b878f 100644
GIT binary patch
delta 15
XcmaE&K1F>)4$tIEd>V_N@UQ~_HR1*&

delta 95
zcmbQD{zQF44v)VM0|**0Q~)sqnm}m<1_cIdAa-W(X9!@3WN>5fVQ^=NXYge31CpT(
e!3?fIItWPmF*q{#0%=|buE~vjnv19Kumb@5D-WUo

diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx
index 4bc7c4e49387ce4a9e143eb8487a8605c2dc7307..8f28fbaa9d27362146e2fb4b3fb0d84d390ebc3d 100644
GIT binary patch
delta 16
YcmaE&HbZSg0?*__d>Wgt@JwI>06azpnE(I)

delta 88
zcmbQC_C#$%0*|*20|**0Q~)sqnm}m<1_cIdAa-W(X9!@3WN>5fVQ^=NXYge31CpT(
Y!3?fIItWPmF*q{#GPrJz=h?{y0F(p{#Q*>R

diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx
index 697ccda52f492d55125b6432f4488e0df139416b..27a79e162975e72a945cf814c90618ae91968e88 100644
GIT binary patch
delta 30
mcmZ3ca!Pr^r^x~QY@1ma4{%P7;pbqqo_vv0ezOhtD>eYGQVMGT

delta 105
zcmX@5yi8@nC(dAoM21|30*0K8?@x02>o9<z0Ye24L!b$iR$x$Ium)mh27iVChDZiC
o1|J4@hIj@~20tJf$`H)p3Z#R8q#uJLgD;TgW#HPpolBS<0HvQ3UH||9

diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx
index 7336000f5adcc7f36fc1b05ffd204cbb21f5495b..384d83fcd806becea966e2f508fb0385b0e76d6d 100644
GIT binary patch
delta 353
zcmXYs!Ab&A6o!A9X24)7+O@k2g^G+OH<bh~Bp3)8Qf%W!oiT@MM%2`uzQftH@Cl+t
zFysRSy+@DGBlO>!T<$sNe&_uE<@}tkjy?iw;o})Yq!?j>4id&IxY$MoYIB+xAjX(4
zA9dU?hlr?&I2{_EvQp@ibf|x!S7dnK_$smii9(H?7*p0Gz8d7|!VK${k2~I)5zfq)
zJw`=KZKv~;H^viVmr=7ZEp&fEp5TGx-c%t!o*5?(XQUo3m@hYr{jXO-3CGA<)-rbx
zP(8#gRXsd%DXmU$4Noe&ja*qi-ES#4C*s&EdAH};q4R2GU-@&(E~ALHczZ>ux=RV%
Ng8b%pvbX*9)*rkIMX3M)

delta 927
zcmb_b%}N4M6#h&b(|(jTZ70(t7|gL%iVG>l=*Q5=MTS^fT50Ckj}^?W2k35F^az2Q
z=mpyJ5G`5+K~K=4bFYS3N(FH^bBFWuo$s7`?$yMj=VsYhkD4wF>`i*G$Y=_?H`gxB
zN<H6KHX3AhW(}}%zmE;s$Ll)-*FA18Tu32-8Z=aqLlIN(k!2PY6mUeA3VBlOz~W-B
zlEnPBQx=i#^dz#_!VLB?hmy$6V2^~yJ28(%LWqz*M*bzjUqJ{9Bw@s{D!vKw#K`A_
zhp>2V5Gv6QkQR}_E@8=pd`O7=uZp}lOJpfJupvq{LaW#mPL0Bji8c?FSy&on&%N<!
z9|mFVLNzVyWokb{d7M7S2$HH$*^AvhCL<|Ykws+TTeC6>Y;t&nom>67r%M$L>w-gw
z8qLxGa@eLCorjmELA9bjn71?RlB=UrI~;=RTGxV{NPB?>-M`+k{+mnwna=0_8$_bC
wP;n?EooA+rrB!rzaYD*PZJu6AlHs6B{QrGbzM$Ip6KXvJ2Y+q#C)=&*9XlSZ-2eap

diff --git a/usb/kmdf_fx2/driver/osrusbfx2.inx b/usb/kmdf_fx2/driver/osrusbfx2.inx
index 68e0ff487f756ff059faf6a169f7b9bc7225f4b2..9d7263ce1fef76354376ff665a7933be2906b849 100644
GIT binary patch
delta 384
zcmXX>yG{a86rAgd5waT<0;mO93#~A5B_S%9s39gKhM;JyEO;!BsDJ{J*hph-aVjnR
z0t@5%5f+sGf<Iy9?8V&NIp@xunUgclyrkcYMk9}FbkV^r`Y5AK+<}D<GO+*8DVk`Z
z$5$Q&9J1En(&JKH(|m`WjXIe!{R3vXny>3zn_N?z<;X*coj=K?I>)pV-keqr^^7Xf
zX2wKO#vS_>u80+)@9HtZ|L>D;qe13ecQxh?b&`V(vJSRbxBoYp?6dA28;@$KNMjdA
zG*ofP1$<*0yKv+=Qc@|oiLS^f7Lqk9EBDcYRIH>o6Btd)o0*X2tSO1$rhLU?-fyrw
xWu&kwPv*d@Ti?pd&ZU*tpWjn*5KgKK`B^wKINRF~D<z+1Oxs`M^^e7I;15R^QK|p{

delta 941
zcmbVKO;1xn6g^K%NoshaZDULf8ERPx^}U+ZkH(M&Xi7wjEzpG@q<$1o9~xdkSQR&J
zSl%5g7KAm)+Ypv6h$j93e*!BP{sB2NGz8NY6LNDquXpY_bLX7d%>2ymPF@TOp|6(w
zww>Tc_j<@uG8?%S99-JFFyLSS&r!x2eAMw49_}E`$|#nwfE8Aj;L8_#Sw_PzgFp5!
z%TmFQ-n)AFdnIRCTQVHIO-3&|-L24r2y|sgcB5A%6#FLM<9#<3DkRK9VFVvZyJ!xp
z;sZk;ps*mh%h%+vt8_nYICS55OW&-)f8wxtvS_SN>_estSKsMr%5=0MeY`NdIlN(%
zh@2y?(<!IAWFvCD(Wy_@|D8tPU+1%q+^v}7$ts+y)*f{aNj$=1BjE^&6y^yXn?eo~
zj4@tk#{8DKQ{-L}DUwlK$%gx7Kb&ctL4ICt%I8w}EYm|3?<uLG9m}*+f7LN>)<ssl
z1YYrv_F1>q@!D)^?>^H<-Ku0P+~4@WdZ(OeI$EGKB@8m!yX2b(JqQP@OdW1>b%;?&
m@NG7gf7j;8ol|*IpU}2pP3Xrehq0RM*fDt!?+sSs+g(QygtcV=