From 5fcd9bafcbe5bd5fab5a986353d78c4e57097492 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 18:59:13 -0500 Subject: [PATCH 1/6] Add README and gitignore --- .gitignore | 1 + README.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitignore create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0a34381 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.vs \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..adf8651 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# A GUI DISM Utility From dcfd0fc72c6d8227195ab096cc17cb8e962d8709 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 19:00:04 -0500 Subject: [PATCH 2/6] Update 4.0 to 4.8 Framework --- 4.0/DISM GUI/DISM GUI.vbproj | 9 ++++++--- 4.0/DISM GUI/My Project/Application.Designer.vb | 2 +- 4.0/DISM GUI/My Project/Resources.Designer.vb | 4 ++-- 4.0/DISM GUI/My Project/Settings.Designer.vb | 6 +++--- 4.0/DISM GUI/app.config | 2 +- ...TFramework,Version=v4.8.AssemblyAttributes.vb | 7 +++++++ .../DISM GUI.vbproj.AssemblyReference.cache | Bin 0 -> 5110 bytes ...esignTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 6944 bytes .../TempPE/My Project.Resources.Designer.vb.dll | Bin 0 -> 6144 bytes ...TFramework,Version=v4.8.AssemblyAttributes.vb | 7 +++++++ .../DISM GUI.vbproj.AssemblyReference.cache | Bin 0 -> 5110 bytes 11 files changed, 27 insertions(+), 10 deletions(-) create mode 100644 4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb create mode 100644 4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache create mode 100644 4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 4.0/DISM GUI/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll create mode 100644 4.0/DISM GUI/obj/x86/Release/.NETFramework,Version=v4.8.AssemblyAttributes.vb create mode 100644 4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache diff --git a/4.0/DISM GUI/DISM GUI.vbproj b/4.0/DISM GUI/DISM GUI.vbproj index c367ad6..3e9a3d3 100644 --- a/4.0/DISM GUI/DISM GUI.vbproj +++ b/4.0/DISM GUI/DISM GUI.vbproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -13,7 +13,7 @@ DISM GUI 512 WindowsForms - v4.0 + v4.8 false SAK SAK @@ -33,7 +33,8 @@ 3.0.0.%2a false true - Client + + x86 @@ -44,6 +45,7 @@ bin\Debug\ DISM GUI.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false x86 @@ -54,6 +56,7 @@ bin\Release\ DISM GUI.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + false On diff --git a/4.0/DISM GUI/My Project/Application.Designer.vb b/4.0/DISM GUI/My Project/Application.Designer.vb index 1af3be2..ba3c298 100644 --- a/4.0/DISM GUI/My Project/Application.Designer.vb +++ b/4.0/DISM GUI/My Project/Application.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.18063 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. diff --git a/4.0/DISM GUI/My Project/Resources.Designer.vb b/4.0/DISM GUI/My Project/Resources.Designer.vb index 02c602f..42502e1 100644 --- a/4.0/DISM GUI/My Project/Resources.Designer.vb +++ b/4.0/DISM GUI/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.18063 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' A strongly-typed resource class, for looking up localized strings, etc. ''' - _ diff --git a/4.0/DISM GUI/My Project/Settings.Designer.vb b/4.0/DISM GUI/My Project/Settings.Designer.vb index 676f128..e68acdd 100644 --- a/4.0/DISM GUI/My Project/Settings.Designer.vb +++ b/4.0/DISM GUI/My Project/Settings.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.18063 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase @@ -29,7 +29,7 @@ Namespace My Private Shared addedHandlerLockObject As New Object _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) If My.Application.SaveMySettingsOnExit Then My.Settings.Save() End If diff --git a/4.0/DISM GUI/app.config b/4.0/DISM GUI/app.config index 1c7e609..25b5d3f 100644 --- a/4.0/DISM GUI/app.config +++ b/4.0/DISM GUI/app.config @@ -20,4 +20,4 @@ - + diff --git a/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb b/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb new file mode 100644 index 0000000..e7dcac5 --- /dev/null +++ b/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb @@ -0,0 +1,7 @@ +' + Option Strict Off + Option Explicit On + + Imports System + Imports System.Reflection + diff --git a/4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache b/4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache new file mode 100644 index 0000000000000000000000000000000000000000..4f64ab6099c994afe1abaefe7931beeb4f0da42e GIT binary patch literal 5110 zcmeHLO=}ZD7~VlGHKI}#q39t;1z9RBQVSv_O-@>*8`Q&!Otx>*p}RBb%%o|0>DhlH zc<`6#+27zVaA!NCY<3ZrdDoLU1U8#I^X7S<=l$3fayYOv;s4V7D#c{wxE@5N3@N$5&w_=+xt+g7VU&OxyEjKGfGZ(kvio zJszX}-EpZjgMD<8`t2h4TT(S=<92iQit&@0#9hNo9M*P%A%KT}GhZXKEssM;lUh{) zx;+IH`>lD4K=;oyaAh{W8a<#I*)e4f_M#j^5H1+cb*-AV79UHPSZk7mYFZ3#v5fEL PCzPiM4h&&ctR(#xm7!o1 literal 0 HcmV?d00001 diff --git a/4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000000000000000000000000000000000000..3df1bc7fdc6645b9dd40de5fe32a2957cece8583 GIT binary patch literal 6944 zcmeHMZBH9V5VpZ=FoYD-ln`jrOPjW7>R#;t0V1J_V4PYF5waapiL=Q1Zf!Q)-MYJb z7#Hzd`U|T5#CGQV!fPmsd=ejg$m8|y?L4!yvvj+=Lx@%+ejPROe!w?)$Ed)!N0Vz9=JM?Y}IFhmefrfTS3+3_HV3J z7W>R!t!CzHi?yX%HtQ^A=sX=k$mNe9y$rbPAYQ@OOp3-kNgE9&%_5ZrzY%D4A12?Y zt}B|%SyPI6RkyWqsF{yesR_7yUHCO#&vTbe+thcsLpAH(iM?vB7PxL+Qjax--0u#R zX%)uqo*Byv*Mapu#LhC6b*6jMN2qf0xMa2#k~1~ga5R-AMy0*CMfIMVte@)`Z%9!C58NbM1*+QrJu> zA=kiqu3=3Oa-Av6DF(jg9_vgwuc_@NH4`XSWHlz4532G~c%bwHXu2c2y`fvk5E&*U z78?dR6pzOVd_cyA{u(K@lx7};C+x4SG2qNs%x99@=4)`)`|Qrn6}P~N*rsm4wkVhH zpY?7nY03S1+VGSuq|2)(XKdlxM{H?{F4~LFvn%rpEVH~)Nnd5h4K+0iKUDhb)*G%a z9v_5g6j9VWO;ISn;W5?c12hQGC}L<3p#6GrR^rHmlfxj!k_l{%pa41$OWpzjU!y3J zD8^8XgBT;XLB_}gh?hsj4s&`@0wUd{l36{nYng90$~_L5K3Fi9(_I4EA)6bA$K(#^ z*z<$w{ol+)Ilm>nq^=^MW%#% z(4)R5)W@``y~mQDp~aIRX3rYcW%y_uNx}FOjvGCz4eXzS{zQ1k=g=Akd~z2WW6+f` z=QH!!mE;%jJ2sX=SK^0EqcEG?_Z)H$+6mKfT{084*da@yx6y$FDgLwTt{w=#X@`uT z%)-21t~+nDWpwDDg(^Ji^BT}+G6za>pP*!|(SW3fA}KVz7N{g&exjxl(;5h&G9kYR z8{`3Ks)9{ma2?VXBg|rqC*brStlqX7oj3xfe=6R3yLLA6EZjP)$5kZ@_u?Vo=;&~A zR8tcLtnegd3z5Hyc7-7_Mw(TWLOHRX~<~K5h z8EAeJQz$&mM*@=5SU#ly2wC(~IFFk}HJ# zaeXzCqNZ2DP5KHzpqBl(X6vLrZA6+Vze$$AjNZZAX6L|t5C?pw+vfTxgfRIVfc!Y- zymIM>0vXcN$WUjpGe(MZa3!f9E@QP^`gZguObxLpv=J?$NB=LZf!tjSs81Y60PJg# ze)ZBc7PPZIP$%3gxiius{q96G(wpL61^GSf0gn4~H}{LMN;&R>8#3!N-Rrx%dca^s z9pK$acKf|VZ=v18bgt~##R;D+dJ#|>ZTqeqO@ihvqJ7J*!7SQC;BQA6wf8&j7ck1d;-SmOz=5G)Qkhwvg<+qN)lKT+iq-*iQ4c8X0gPag1Ec?JU`;+@Fw?rFN z_Qe%6uG|%i(^n)uFHUPq=sCDZ(*0smOVXhDKuOZ;z!bHKL@Y%QYroLq)UBM>Qlu(7 zAX%x5!;covT(f>m zyB^$=A$PxeBeCh4gr`}5pK{>#hFnbS0auV*FrGq( zB^N}d&{4@P*O$fj<6L|+>~}84+$qVusQfMV7_$0m$epDpkk!9P?g;&Z@6=U@HJRL92S%vW(xrlsM5V$ea z(bJm1=gpa20Zh_5U<364m(ypZd_2?2|YsagoHO5?dv% z3FRE$QeteCxJIH)e~R5f_t6`4C-A!XA$k_}_t0y;Oz{O1y9r1re@b6$>eUivvN?Nz}Ms$v^`Td5O!X`9+ECG8?d z7nB)E&tRi_1s^b5lESnhX+zSzlJ1rC0g2NRPlU+5&PaMDM3&r4!!$zs5y??{fF7ii z^fWz#D*7e%PJx<>VfRYlpN_iXo%3PskRUpt-UB?UeF^w4?W@2&+Hv3t@pZ=dL%`q1 z7$2o?;Y-m_^?aYf@g)5z@K^_0$J!~N7Gta=P{F$dm_q$3*j1V-gZ*U_vh^IjO6Td% zq)j7;c~1kXADhzb^B(P!^n6*cKk`8qJwl92Qb+GP>7fDV_y))t=qlL~Dr^I7rkC*k zHRv|r7Wt~U+jJ_{fi4=J^enTGGsms%W1qM3lV=@_f;hpLadS9-|>U@43D^Ue4^c{fg=Io4%c=T(y{=^xUF-*eZnG zBY!kul}EQ&^s2}WB@e{ul#e%e_nmhCBPxLUHdn#F=+v6i`;Ja=lo zL=G?jj}^}%AA?1-XZdc$%UcoOS1LJn-Yna05m8%I!{@AWna_JE-(0ZEuGjCmclqX+ zW97<71`W7VCEKyQEmqO;ASm>eaYY!bK(*C!O53dJU9MLnoVDZW%-LqGvC71R<=yHQ zclnmLkdnuo>u^ypa|#566|m zUJF-RW~iF8yn}Y$@-u@dcduwVs6M}JO=WmYw`dj1n5yN_P}M-mbLD4thLzxFvX*a8 zU`NNPi=8=Q%F&qu^js~Val+r;HpB82E0m>%KMbaX;!`9PA7|ur#ovFh97z1*)FJ$N|3UHxuH?~en2VD z6($9rBK9CIUSG~J+LSQCSrT<%c^0&DOf&q2rFOu$p#xP3L`ur zYD16~eZFr^jXBktk>CIx%T*jLYqK;+IU1r-+CsZPXJ{v3t0k8zri)AM_K zAME|wPd=Sma^J7lk!A>?s|JY}h{nd4p@>vU(kl{%20E2u6NMoaU)HonG%X4mJ!pD@ z#?TVbXa-JPrgVlL1|yMBn?{tT5ggr0Yb!46O?{0P44dpY57uO})jpO_HBB+yq9!mN ziPlyOsCfCa`o+fAlGn32PcCfruIT87bAg5G1;mmT)d@K9sjgydmKNfg@1BE`iGuE;5YZBttE@6%AE~t*MfO<52JF!mn!lBkB{> z9eos0(PxHT*YPvh+1=uVQ{{ua5bZ1d72CnJMDMyT@-QN3+r?jBu3RbDZYDSm;VC?@ zXZQ0+ki#eBSU2Gl3{PMeo@Hbl8=}Xr5 + Option Strict Off + Option Explicit On + + Imports System + Imports System.Reflection + diff --git a/4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache b/4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache new file mode 100644 index 0000000000000000000000000000000000000000..4f64ab6099c994afe1abaefe7931beeb4f0da42e GIT binary patch literal 5110 zcmeHLO=}ZD7~VlGHKI}#q39t;1z9RBQVSv_O-@>*8`Q&!Otx>*p}RBb%%o|0>DhlH zc<`6#+27zVaA!NCY<3ZrdDoLU1U8#I^X7S<=l$3fayYOv;s4V7D#c{wxE@5N3@N$5&w_=+xt+g7VU&OxyEjKGfGZ(kvio zJszX}-EpZjgMD<8`t2h4TT(S=<92iQit&@0#9hNo9M*P%A%KT}GhZXKEssM;lUh{) zx;+IH`>lD4K=;oyaAh{W8a<#I*)e4f_M#j^5H1+cb*-AV79UHPSZk7mYFZ3#v5fEL PCzPiM4h&&ctR(#xm7!o1 literal 0 HcmV?d00001 From 309262faab10e2d7736160378be7d9f11f6ebc05 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 19:14:01 -0500 Subject: [PATCH 3/6] Updated gitignore renamed 4.0 to 4.8 --- .gitignore | 11 +++++++- ...amework,Version=v4.8.AssemblyAttributes.vb | 7 ----- .../DISM GUI.vbproj.AssemblyReference.cache | Bin 5110 -> 0 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6944 -> 0 bytes .../My Project.Resources.Designer.vb.dll | Bin 6144 -> 0 bytes ...amework,Version=v4.8.AssemblyAttributes.vb | 7 ----- .../DISM GUI.vbproj.AssemblyReference.cache | Bin 5110 -> 0 bytes {4.0 => 4.8}/DISM GUI.sln | 24 ++++++++++-------- {4.0 => 4.8}/DISM GUI.vssscc | 0 {4.0 => 4.8}/DISM GUI/DISM GUI.vbproj | 20 +++++++++++++++ {4.0 => 4.8}/DISM GUI/DISM GUI.vbproj.vspscc | 0 .../My Project/Application.Designer.vb | 0 .../DISM GUI/My Project/Application.myapp | 0 .../DISM GUI/My Project/AssemblyInfo.vb | 0 .../DISM GUI/My Project/Resources.Designer.vb | 0 .../DISM GUI/My Project/Resources.resx | 0 .../DISM GUI/My Project/Settings.Designer.vb | 0 .../DISM GUI/My Project/Settings.settings | 0 {4.0 => 4.8}/DISM GUI/My Project/app.manifest | 0 {4.0 => 4.8}/DISM GUI/app.config | 0 {4.0 => 4.8}/DISM GUI/frmAbout.Designer.vb | 0 {4.0 => 4.8}/DISM GUI/frmAbout.resx | 0 {4.0 => 4.8}/DISM GUI/frmAbout.vb | 0 {4.0 => 4.8}/DISM GUI/frmMain.Designer.vb | 0 {4.0 => 4.8}/DISM GUI/frmMain.resx | 0 {4.0 => 4.8}/DISM GUI/frmMain.vb | 0 {4.0 => 4.8}/DISM GUI/frmProgress.Designer.vb | 0 {4.0 => 4.8}/DISM GUI/frmProgress.resx | 0 {4.0 => 4.8}/DISM GUI/frmProgress.vb | 0 29 files changed, 43 insertions(+), 26 deletions(-) delete mode 100644 4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb delete mode 100644 4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache delete mode 100644 4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache delete mode 100644 4.0/DISM GUI/obj/x86/Debug/TempPE/My Project.Resources.Designer.vb.dll delete mode 100644 4.0/DISM GUI/obj/x86/Release/.NETFramework,Version=v4.8.AssemblyAttributes.vb delete mode 100644 4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache rename {4.0 => 4.8}/DISM GUI.sln (55%) rename {4.0 => 4.8}/DISM GUI.vssscc (100%) rename {4.0 => 4.8}/DISM GUI/DISM GUI.vbproj (89%) rename {4.0 => 4.8}/DISM GUI/DISM GUI.vbproj.vspscc (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Application.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Application.myapp (100%) rename {4.0 => 4.8}/DISM GUI/My Project/AssemblyInfo.vb (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Resources.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Resources.resx (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Settings.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/My Project/Settings.settings (100%) rename {4.0 => 4.8}/DISM GUI/My Project/app.manifest (100%) rename {4.0 => 4.8}/DISM GUI/app.config (100%) rename {4.0 => 4.8}/DISM GUI/frmAbout.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/frmAbout.resx (100%) rename {4.0 => 4.8}/DISM GUI/frmAbout.vb (100%) rename {4.0 => 4.8}/DISM GUI/frmMain.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/frmMain.resx (100%) rename {4.0 => 4.8}/DISM GUI/frmMain.vb (100%) rename {4.0 => 4.8}/DISM GUI/frmProgress.Designer.vb (100%) rename {4.0 => 4.8}/DISM GUI/frmProgress.resx (100%) rename {4.0 => 4.8}/DISM GUI/frmProgress.vb (100%) diff --git a/.gitignore b/.gitignore index 0a34381..311ec61 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,10 @@ -.vs \ No newline at end of file +.vs +/4.8/DISM GUI/bin/** +/4.8/DISM GUI/obj/** +/4.8/DISM GUI/x64/** +/3.1.1/DISM GUI/bin/** +/3.1.1/DISM GUI/obj/** +/3.1.1/DISM GUI/x64/** +/3.5/DISM GUI/bin/** +/3.5/DISM GUI/obj/** +/3.5/DISM GUI/x64/** \ No newline at end of file diff --git a/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb b/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb deleted file mode 100644 index e7dcac5..0000000 --- a/4.0/DISM GUI/obj/x86/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.vb +++ /dev/null @@ -1,7 +0,0 @@ -' - Option Strict Off - Option Explicit On - - Imports System - Imports System.Reflection - diff --git a/4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache b/4.0/DISM GUI/obj/x86/Debug/DISM GUI.vbproj.AssemblyReference.cache deleted file mode 100644 index 4f64ab6099c994afe1abaefe7931beeb4f0da42e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5110 zcmeHLO=}ZD7~VlGHKI}#q39t;1z9RBQVSv_O-@>*8`Q&!Otx>*p}RBb%%o|0>DhlH zc<`6#+27zVaA!NCY<3ZrdDoLU1U8#I^X7S<=l$3fayYOv;s4V7D#c{wxE@5N3@N$5&w_=+xt+g7VU&OxyEjKGfGZ(kvio zJszX}-EpZjgMD<8`t2h4TT(S=<92iQit&@0#9hNo9M*P%A%KT}GhZXKEssM;lUh{) zx;+IH`>lD4K=;oyaAh{W8a<#I*)e4f_M#j^5H1+cb*-AV79UHPSZk7mYFZ3#v5fEL PCzPiM4h&&ctR(#xm7!o1 diff --git a/4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/4.0/DISM GUI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index 3df1bc7fdc6645b9dd40de5fe32a2957cece8583..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6944 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 - Option Strict Off - Option Explicit On - - Imports System - Imports System.Reflection - diff --git a/4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache b/4.0/DISM GUI/obj/x86/Release/DISM GUI.vbproj.AssemblyReference.cache deleted file mode 100644 index 4f64ab6099c994afe1abaefe7931beeb4f0da42e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5110 zcmeHLO=}ZD7~VlGHKI}#q39t;1z9RBQVSv_O-@>*8`Q&!Otx>*p}RBb%%o|0>DhlH zc<`6#+27zVaA!NCY<3ZrdDoLU1U8#I^X7S<=l$3fayYOv;s4V7D#c{wxE@5N3@N$5&w_=+xt+g7VU&OxyEjKGfGZ(kvio zJszX}-EpZjgMD<8`t2h4TT(S=<92iQit&@0#9hNo9M*P%A%KT}GhZXKEssM;lUh{) zx;+IH`>lD4K=;oyaAh{W8a<#I*)e4f_M#j^5H1+cb*-AV79UHPSZk7mYFZ3#v5fEL PCzPiM4h&&ctR(#xm7!o1 diff --git a/4.0/DISM GUI.sln b/4.8/DISM GUI.sln similarity index 55% rename from 4.0/DISM GUI.sln rename to 4.8/DISM GUI.sln index 4e75f48..4015a4b 100644 --- a/4.0/DISM GUI.sln +++ b/4.8/DISM GUI.sln @@ -1,29 +1,31 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISM GUI", "DISM GUI\DISM GUI.vbproj", "{D3E5BCD3-DED9-48F3-B457-70F561E54A1A}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://us-mertfs02:8080/tfs/defaultcollection - SccLocalPath0 = . - SccProjectUniqueName1 = DISM\u0020GUI\\DISM\u0020GUI.vbproj - SccProjectName1 = DISM\u0020GUI - SccLocalPath1 = DISM\u0020GUI - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x64.ActiveCfg = Debug|x64 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x64.Build.0 = Debug|x64 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x86.ActiveCfg = Debug|x86 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x86.Build.0 = Debug|x86 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x64.ActiveCfg = Release|x64 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x64.Build.0 = Release|x64 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x86.ActiveCfg = Release|x86 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {4DBC5D64-6A83-437F-9A5E-CBB69E92E596} + EndGlobalSection EndGlobal diff --git a/4.0/DISM GUI.vssscc b/4.8/DISM GUI.vssscc similarity index 100% rename from 4.0/DISM GUI.vssscc rename to 4.8/DISM GUI.vssscc diff --git a/4.0/DISM GUI/DISM GUI.vbproj b/4.8/DISM GUI/DISM GUI.vbproj similarity index 89% rename from 4.0/DISM GUI/DISM GUI.vbproj rename to 4.8/DISM GUI/DISM GUI.vbproj index 3e9a3d3..9369be7 100644 --- a/4.0/DISM GUI/DISM GUI.vbproj +++ b/4.8/DISM GUI/DISM GUI.vbproj @@ -73,6 +73,25 @@ My Project\app.manifest + + true + true + true + bin\x64\Debug\ + DISM GUI.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + full + x64 + + + true + bin\x64\Release\ + DISM GUI.xml + true + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + pdbonly + x64 + @@ -120,6 +139,7 @@ True Application.myapp + True True diff --git a/4.0/DISM GUI/DISM GUI.vbproj.vspscc b/4.8/DISM GUI/DISM GUI.vbproj.vspscc similarity index 100% rename from 4.0/DISM GUI/DISM GUI.vbproj.vspscc rename to 4.8/DISM GUI/DISM GUI.vbproj.vspscc diff --git a/4.0/DISM GUI/My Project/Application.Designer.vb b/4.8/DISM GUI/My Project/Application.Designer.vb similarity index 100% rename from 4.0/DISM GUI/My Project/Application.Designer.vb rename to 4.8/DISM GUI/My Project/Application.Designer.vb diff --git a/4.0/DISM GUI/My Project/Application.myapp b/4.8/DISM GUI/My Project/Application.myapp similarity index 100% rename from 4.0/DISM GUI/My Project/Application.myapp rename to 4.8/DISM GUI/My Project/Application.myapp diff --git a/4.0/DISM GUI/My Project/AssemblyInfo.vb b/4.8/DISM GUI/My Project/AssemblyInfo.vb similarity index 100% rename from 4.0/DISM GUI/My Project/AssemblyInfo.vb rename to 4.8/DISM GUI/My Project/AssemblyInfo.vb diff --git a/4.0/DISM GUI/My Project/Resources.Designer.vb b/4.8/DISM GUI/My Project/Resources.Designer.vb similarity index 100% rename from 4.0/DISM GUI/My Project/Resources.Designer.vb rename to 4.8/DISM GUI/My Project/Resources.Designer.vb diff --git a/4.0/DISM GUI/My Project/Resources.resx b/4.8/DISM GUI/My Project/Resources.resx similarity index 100% rename from 4.0/DISM GUI/My Project/Resources.resx rename to 4.8/DISM GUI/My Project/Resources.resx diff --git a/4.0/DISM GUI/My Project/Settings.Designer.vb b/4.8/DISM GUI/My Project/Settings.Designer.vb similarity index 100% rename from 4.0/DISM GUI/My Project/Settings.Designer.vb rename to 4.8/DISM GUI/My Project/Settings.Designer.vb diff --git a/4.0/DISM GUI/My Project/Settings.settings b/4.8/DISM GUI/My Project/Settings.settings similarity index 100% rename from 4.0/DISM GUI/My Project/Settings.settings rename to 4.8/DISM GUI/My Project/Settings.settings diff --git a/4.0/DISM GUI/My Project/app.manifest b/4.8/DISM GUI/My Project/app.manifest similarity index 100% rename from 4.0/DISM GUI/My Project/app.manifest rename to 4.8/DISM GUI/My Project/app.manifest diff --git a/4.0/DISM GUI/app.config b/4.8/DISM GUI/app.config similarity index 100% rename from 4.0/DISM GUI/app.config rename to 4.8/DISM GUI/app.config diff --git a/4.0/DISM GUI/frmAbout.Designer.vb b/4.8/DISM GUI/frmAbout.Designer.vb similarity index 100% rename from 4.0/DISM GUI/frmAbout.Designer.vb rename to 4.8/DISM GUI/frmAbout.Designer.vb diff --git a/4.0/DISM GUI/frmAbout.resx b/4.8/DISM GUI/frmAbout.resx similarity index 100% rename from 4.0/DISM GUI/frmAbout.resx rename to 4.8/DISM GUI/frmAbout.resx diff --git a/4.0/DISM GUI/frmAbout.vb b/4.8/DISM GUI/frmAbout.vb similarity index 100% rename from 4.0/DISM GUI/frmAbout.vb rename to 4.8/DISM GUI/frmAbout.vb diff --git a/4.0/DISM GUI/frmMain.Designer.vb b/4.8/DISM GUI/frmMain.Designer.vb similarity index 100% rename from 4.0/DISM GUI/frmMain.Designer.vb rename to 4.8/DISM GUI/frmMain.Designer.vb diff --git a/4.0/DISM GUI/frmMain.resx b/4.8/DISM GUI/frmMain.resx similarity index 100% rename from 4.0/DISM GUI/frmMain.resx rename to 4.8/DISM GUI/frmMain.resx diff --git a/4.0/DISM GUI/frmMain.vb b/4.8/DISM GUI/frmMain.vb similarity index 100% rename from 4.0/DISM GUI/frmMain.vb rename to 4.8/DISM GUI/frmMain.vb diff --git a/4.0/DISM GUI/frmProgress.Designer.vb b/4.8/DISM GUI/frmProgress.Designer.vb similarity index 100% rename from 4.0/DISM GUI/frmProgress.Designer.vb rename to 4.8/DISM GUI/frmProgress.Designer.vb diff --git a/4.0/DISM GUI/frmProgress.resx b/4.8/DISM GUI/frmProgress.resx similarity index 100% rename from 4.0/DISM GUI/frmProgress.resx rename to 4.8/DISM GUI/frmProgress.resx diff --git a/4.0/DISM GUI/frmProgress.vb b/4.8/DISM GUI/frmProgress.vb similarity index 100% rename from 4.0/DISM GUI/frmProgress.vb rename to 4.8/DISM GUI/frmProgress.vb From b6810ab769cf3689b84d33d456a5019d39ca4434 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 19:52:46 -0500 Subject: [PATCH 4/6] Fix for issue #5 --- 4.8/DISM GUI/frmMain.vb | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/4.8/DISM GUI/frmMain.vb b/4.8/DISM GUI/frmMain.vb index 9f8a134..334565b 100644 --- a/4.8/DISM GUI/frmMain.vb +++ b/4.8/DISM GUI/frmMain.vb @@ -172,9 +172,9 @@ Public Class frmMain DISM.StartInfo.CreateNoWindow = True DISM.StartInfo.FileName = "dism.exe" If chkMountReadOnly.Checked = True Then - DISM.StartInfo.Arguments = "/Mount-WIM /ReadOnly /WimFile:""" & strWIM & """" & " /index:" & strIndex & " /MountDir:" & """" & strFolderName & """" + DISM.StartInfo.Arguments = "/Mount-WIM /ReadOnly /WimFile:""" & strWIM & """" & " /index:""" & strIndex & " /MountDir:" & """" & strFolderName & """" Else - DISM.StartInfo.Arguments = "/Mount-WIM /WimFile:""" & strWIM & """" & " /index:" & strIndex & " /MountDir:" & """" & strFolderName & """" + DISM.StartInfo.Arguments = "/Mount-WIM /WimFile:""" & strWIM & """" & " /index:""" & strIndex & " /MountDir:" & """" & strFolderName & """" End If strOutput = "Command line that ran is dism.exe " & DISM.StartInfo.Arguments @@ -314,7 +314,7 @@ Public Class frmMain txtOutput.Text = strOutput End Sub - + Private Sub btnDisplayWIMInfo_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnDisplayWIMInfo.Click If txtWIM.Text = "" Then @@ -334,14 +334,14 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Packages" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Packages" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput End If End Sub - + Private Sub btnOpenPackageFile_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOpenPackageFile.Click txtPackageFile.Text = OpenFolder() End Sub @@ -381,8 +381,8 @@ Public Class frmMain End If End Function - - + + Private Sub btnGetAllDriverInfo_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnGetAllDriverInfo.Click If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") @@ -439,7 +439,7 @@ Public Class frmMain MessageBox.Show("You must enter in a package path before continuing. The package path must point to a valid cab file.") Else strPackagePath = txtPackagePath.Text - strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Package /PackagePath:" & strPackagePath + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Package /PackagePath:""" & strPackagePath & """" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -452,7 +452,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Features" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Features" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -599,7 +599,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-CurrentEdition" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-CurrentEdition" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -610,7 +610,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-TargetEditions" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-TargetEditions" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -647,7 +647,7 @@ Public Class frmMain MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Exit Sub Else - + End If If txtEdition.Text = "" Then @@ -695,7 +695,7 @@ Public Class frmMain 'Do Nothing End If strXMLFileName = txtPatchLocation.Text - strDISMArguments = "/image:" & strMountedImageLocation & " /Apply-Unattend:" & strXMLFileName + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Apply-Unattend:" & strXMLFileName BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -705,7 +705,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Apps" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Apps" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -758,7 +758,7 @@ Public Class frmMain txtOutput.Text = strOutput End If - + End Sub Private Sub btnGetAppPatchInfo_Click(sender As System.Object, e As System.EventArgs) Handles btnGetAppPatchInfo.Click @@ -825,7 +825,7 @@ Public Class frmMain 'Do Nothing End If - + If txtPatchLocation.Text = "" Then MessageBox.Show("You must enter an MSP file.") @@ -834,7 +834,7 @@ Public Class frmMain 'Do Nothing End If strMSPFileName = txtPatchLocation.Text - strDISMArguments = "/image:" & strMountedImageLocation & " /Check-AppPatch /PatchLocation:" & strMSPFileName + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Check-AppPatch /PatchLocation:" & strMSPFileName BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -884,9 +884,9 @@ Public Class frmMain strCompression = cmbCompression.Text If chkCaptureVerify.Checked = True Then - strDISMArguments = "/Capture-Image /ImageFile:" + strDest + " /CaptureDir:" + strSource + " /Name:" + Chr(34) + strName + Chr(34) + " /Compress:" + strCompression + " /verify" + strDISMArguments = "/Capture-Image /ImageFile:""" & strDest & """" & " /CaptureDir:""" & strSource & """" & " /Name:" + Chr(34) + strName + Chr(34) + " /Compress:" + strCompression + " /verify" Else - strDISMArguments = "/Capture-Image /ImageFile:" + strDest + " /CaptureDir:" + strSource + " /Name:" + Chr(34) + strName + Chr(34) + " /Compress:" + strCompression + strDISMArguments = "/Capture-Image /ImageFile:""" & strDest & """" & " /CaptureDir:""" & strSource & """" & " /Name:" + Chr(34) + strName + Chr(34) + " /Compress:" + strCompression End If @@ -954,7 +954,7 @@ Public Class frmMain strName = txtName.Text strCompression = cmbCompression.Text - strDISMArguments = "/Append-Image /ImageFile:" + strDest + " /CaptureDir:" + strSource + " /Name:" + Chr(34) + strName + Chr(34) + strDISMArguments = "/Append-Image /ImageFile:""" & strDest & """" & " /CaptureDir:""" & strSource & """" & " /Name:" + Chr(34) + strName + Chr(34) BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -1030,9 +1030,9 @@ Public Class frmMain If chkApplyVerify.Checked = True Then - strDISMArguments = "/Apply-Image /ImageFile:" & strSource & " /index:" & strAppendIndex & " /ApplyDir:" & strDest & " /Verify" + strDISMArguments = "/Apply-Image /ImageFile:""" & strSource & """" & " /index:""" & strAppendIndex & " /ApplyDir:" & strDest & """" & " /Verify" Else - strDISMArguments = "/Apply-Image /ImageFile:" & strSource & " /index:" & strAppendIndex & " /ApplyDir:" & strDest & "" + strDISMArguments = "/Apply-Image /ImageFile:""" & strSource & """" & " /index:""" & strAppendIndex & " /ApplyDir:" & strDest & """" & "" End If BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() From 4dec80e9e6f72e124021cebec9ddde0c0413d0b3 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 20:11:45 -0500 Subject: [PATCH 5/6] Fixed build errors and issue #5 on 3.1.1 --- 3.1.1/DISM GUI.sln | 24 +++++++++++++----------- 3.1.1/DISM GUI/DISM GUI.vbproj | 8 ++++++++ 3.1.1/DISM GUI/frmMain.vb | 28 ++++++++++++++-------------- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/3.1.1/DISM GUI.sln b/3.1.1/DISM GUI.sln index 4e75f48..8ea4033 100644 --- a/3.1.1/DISM GUI.sln +++ b/3.1.1/DISM GUI.sln @@ -1,29 +1,31 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32228.430 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DISM GUI", "DISM GUI\DISM GUI.vbproj", "{D3E5BCD3-DED9-48F3-B457-70F561E54A1A}" EndProject Global - GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 2 - SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccTeamFoundationServer = http://us-mertfs02:8080/tfs/defaultcollection - SccLocalPath0 = . - SccProjectUniqueName1 = DISM\u0020GUI\\DISM\u0020GUI.vbproj - SccProjectName1 = DISM\u0020GUI - SccLocalPath1 = DISM\u0020GUI - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x64.ActiveCfg = Debug|x64 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x64.Build.0 = Debug|x64 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x86.ActiveCfg = Debug|x86 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Debug|x86.Build.0 = Debug|x86 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x64.ActiveCfg = Release|x64 + {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x64.Build.0 = Release|x64 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x86.ActiveCfg = Release|x86 {D3E5BCD3-DED9-48F3-B457-70F561E54A1A}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {9076E518-54FD-4A8E-A2FC-AF33A696D7DC} + EndGlobalSection EndGlobal diff --git a/3.1.1/DISM GUI/DISM GUI.vbproj b/3.1.1/DISM GUI/DISM GUI.vbproj index 38072ee..1e12791 100644 --- a/3.1.1/DISM GUI/DISM GUI.vbproj +++ b/3.1.1/DISM GUI/DISM GUI.vbproj @@ -69,6 +69,14 @@ My Project\app.manifest + + x64 + bin\x64\Debug\ + + + x64 + bin\x64\Release\ + diff --git a/3.1.1/DISM GUI/frmMain.vb b/3.1.1/DISM GUI/frmMain.vb index 67b77ab..1d4bdc3 100644 --- a/3.1.1/DISM GUI/frmMain.vb +++ b/3.1.1/DISM GUI/frmMain.vb @@ -163,7 +163,7 @@ Public Class frmMain strOutput = strOutput & vbCr & vbCr & DISM.StandardOutput.ReadToEnd() DISM.WaitForExit() 'txtOutput.Text = output - strDISMExitCode = DISM.ExitCode + strDISMExitCode = DISM.ExitCode.ToString() End Sub Private Sub BackgroundWorkerMount_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorkerMount.RunWorkerCompleted @@ -212,7 +212,7 @@ Public Class frmMain strOutput = strOutput & vbCr & vbCr & DISM.StandardOutput.ReadToEnd() DISM.WaitForExit() - strDISMExitCode = DISM.ExitCode + strDISMExitCode = DISM.ExitCode.ToString() End Sub Private Sub BackgroundWorkerDisMount_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorkerDisMount.RunWorkerCompleted @@ -229,7 +229,7 @@ Public Class frmMain End Sub Private Sub btnOpnDriverFolder_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOpnDriverFolder.Click - txtDriverLocation.Text = OpenFolder() + txtDriverLocation.Text = OpenFolder().ToString() End Sub Private Sub btnAddDriver_Click(ByVal sender As Object, ByVal e As System.EventArgs) Handles btnAddDriver.Click @@ -267,7 +267,7 @@ Public Class frmMain End Sub Private Sub BackgroundWorkerDISMCommand_DoWork(ByVal sender As System.Object, ByVal e As System.ComponentModel.DoWorkEventArgs) Handles BackgroundWorkerDISMCommand.DoWork - Dim strInput As String = e.Argument + Dim strInput As String = e.Argument.ToString() strDISMExitCode = "" Dim DISM As New Process() DISM.StartInfo.RedirectStandardOutput = True @@ -280,7 +280,7 @@ Public Class frmMain DISM.Start() strOutput = strOutput & vbCr & vbCr & DISM.StandardOutput.ReadToEnd() DISM.WaitForExit() - strDISMExitCode = DISM.ExitCode + strDISMExitCode = DISM.ExitCode.ToString() End Sub Private Sub BackgroundWorkerDISMCommand_RunWorkerCompleted(ByVal sender As Object, ByVal e As System.ComponentModel.RunWorkerCompletedEventArgs) Handles BackgroundWorkerDISMCommand.RunWorkerCompleted @@ -315,16 +315,16 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Packages" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Packages" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput End If End Sub - + Private Sub btnOpenPackageFile_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnOpenPackageFile.Click - txtPackageFile.Text = OpenFolder() + txtPackageFile.Text = OpenFolder().ToString() End Sub Private Sub btnAddPackages_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnAddPackages.Click @@ -349,7 +349,7 @@ Public Class frmMain txtOutput.Text = strOutput End Sub - Private Function OpenFolder() + Private Function OpenFolder() As Object dlgOpenFolder.ShowNewFolderButton = False dlgOpenFolder.RootFolder = Environment.SpecialFolder.MyComputer Dim DidWork As Integer = dlgOpenFolder.ShowDialog @@ -362,8 +362,8 @@ Public Class frmMain End If End Function - - + + Private Sub btnGetAllDriverInfo_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnGetAllDriverInfo.Click If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") @@ -385,7 +385,7 @@ Public Class frmMain MessageBox.Show("You must enter in a driver name before continuing. The Driver name must end with inf") Else strDelDriverLocation = txtDelDriverLocation.Text - strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Driver /driver:" & strDelDriverLocation + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Driver /driver:""" & strDelDriverLocation & """" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -419,7 +419,7 @@ Public Class frmMain MessageBox.Show("You must enter in a package path before continuing. The package path must point to a valid cab file.") Else strPackagePath = txtPackagePath.Text - strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Package /PackagePath:" & strPackagePath + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Remove-Package /PackagePath:""" & strPackagePath & """" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -432,7 +432,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Features" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Features" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput From 08c22715a5cc93f3bc8d827caaec9720b6a0d955 Mon Sep 17 00:00:00 2001 From: Ryan Hutchison Date: Wed, 16 Mar 2022 20:16:30 -0500 Subject: [PATCH 6/6] Fixed #5 from .NET 3.5 --- 3.5/DISM GUI/frmMain.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/3.5/DISM GUI/frmMain.vb b/3.5/DISM GUI/frmMain.vb index 39abbce..209849e 100644 --- a/3.5/DISM GUI/frmMain.vb +++ b/3.5/DISM GUI/frmMain.vb @@ -321,7 +321,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Packages" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Packages" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -439,7 +439,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Features" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Features" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -690,7 +690,7 @@ Public Class frmMain If WIMMounted = False Then MessageBox.Show("No WIM is mounted. You must mount a WIM before running this command.") Else - strDISMArguments = "/image:" & strMountedImageLocation & " /Get-Apps" + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Get-Apps" BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput @@ -819,7 +819,7 @@ Public Class frmMain 'Do Nothing End If strMSPFileName = txtPatchLocation.Text - strDISMArguments = "/image:" & strMountedImageLocation & " /Check-AppPatch /PatchLocation:" & strMSPFileName + strDISMArguments = "/image:""" & strMountedImageLocation & """" & " /Check-AppPatch /PatchLocation:" & strMSPFileName BackgroundWorkerDISMCommand.RunWorkerAsync(strDISMArguments) frmProgress.ShowDialog() txtOutput.Text = strOutput