From ff0cfc3f560304bd4ecd7859dc06d7ce3aa8f143 Mon Sep 17 00:00:00 2001
From: abbodi1406 <33669284+abbodi1406@users.noreply.github.com>
Date: Thu, 7 Apr 2022 15:39:59 +0300
Subject: [PATCH] v16

---
 C2R-R2V-AIO.cmd | 59 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 45 insertions(+), 14 deletions(-)

diff --git a/C2R-R2V-AIO.cmd b/C2R-R2V-AIO.cmd
index b8dd10a..27b6b8d 100644
--- a/C2R-R2V-AIO.cmd
+++ b/C2R-R2V-AIO.cmd
@@ -1,6 +1,6 @@
 <!-- : Begin batch script
 @setlocal DisableDelayedExpansion
-@set uivr=v15 AIO
+@set uivr=v16 AIO
 @echo off
 
 :: set to 1 to enable debug mode
@@ -9,21 +9,29 @@ set _Debug=0
 :: set to 0 to enable debug mode without cleaning or converting
 set _Cnvrt=1
 
-:: set to 1 to use VBScript instead wmic.exe to access WMI
-:: this option is automatically enabled for Windows 11 build 22483 and later
+:: change to 1 to use VBScript to access WMI
+:: automatically enabled if wmic.exe is not available for Windows 11 build 22483 and later
 set WMI_VBS=0
 
 :: ##################################################################
 
+set _args=
+set _args=%*
+if not defined _args goto :NoProgArgs
+for %%A in (%_args%) do (
+if /i "%%A"=="-wow" set _rel1=1
+if /i "%%A"=="-arm" set _rel2=1
+)
+:NoProgArgs
 set "_cmdf=%~f0"
-if exist "%SystemRoot%\Sysnative\cmd.exe" (
+if exist "%SystemRoot%\Sysnative\cmd.exe" if not defined _rel1 (
 setlocal EnableDelayedExpansion
-start %SystemRoot%\Sysnative\cmd.exe /c ""!_cmdf!" "
+start %SystemRoot%\Sysnative\cmd.exe /c ""!_cmdf!" -wow "
 exit /b
 )
-if exist "%SystemRoot%\SysArm32\cmd.exe" if /i %PROCESSOR_ARCHITECTURE%==AMD64 (
+if exist "%SystemRoot%\SysArm32\cmd.exe" if /i %PROCESSOR_ARCHITECTURE%==AMD64 if not defined _rel2 (
 setlocal EnableDelayedExpansion
-start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" "
+start %SystemRoot%\SysArm32\cmd.exe /c ""!_cmdf!" -arm "
 exit /b
 )
 set "SysPath=%SystemRoot%\System32"
@@ -37,8 +45,16 @@ if /i "%PROCESSOR_ARCHITECTURE%"=="x86" if "%PROCESSOR_ARCHITEW6432%"=="" set "x
 if /i "%PROCESSOR_ARCHITEW6432%"=="amd64" set "xBit=x64"
 if /i "%PROCESSOR_ARCHITEW6432%"=="arm64" set "xBit=x86"
 
+set _cwmi=0
+for %%# in (wmic.exe) do @if not "%%~$PATH:#"=="" (
+wmic path Win32_ComputerSystem get CreationClassName /value 2>nul | find /i "ComputerSystem" 1>nul && set _cwmi=1
+)
+set _pwsh=1
+for %%# in (powershell.exe) do @if "%%~$PATH:#"=="" set _pwsh=0
+if not exist "%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" set _pwsh=0
+:: if %_pwsh% equ 0 goto :E_PS
+
 set "_psc=powershell -nop -c"
-if not exist "%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" goto :E_PS
 
 if %_Cnvrt% NEQ 1 set _Debug=1
 
@@ -49,9 +65,10 @@ goto :TheEnd
 )
 
 :Passed
-set "_Local=%LocalAppData%"
+if not exist "%SystemRoot%\Temp\" mkdir "%SystemRoot%\Temp" 1>nul 2>nul
 set "_batf=%~f0"
 set "_batp=%_batf:'=''%"
+set "_Local=%LocalAppData%"
 set "_log=%~dpn0"
 set "_work=%~dp0"
 if "%_work:~-1%"=="\" set "_work=%_work:~0,-1%"
@@ -61,7 +78,7 @@ for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
 set "_csq=cscript.exe //NoLogo //Job:WmiQuery "%~nx0?.wsf""
 set "_csm=cscript.exe //NoLogo //Job:WmiMethod "%~nx0?.wsf""
 set "_csp=cscript.exe //NoLogo //Job:WmiPKey "%~nx0?.wsf""
-if %winbuild% GEQ 22483 set WMI_VBS=1
+if %_cwmi% EQU 0 set WMI_VBS=1
 if %WMI_VBS% EQU 0 (
 set "_zz1=wmic path"
 set "_zz2=where"
@@ -86,6 +103,11 @@ reg query "HKCU\SOFTWARE\Microsoft\Windows Script Host\Settings" /v Enabled 2>nu
 reg query "HKLM\SOFTWARE\Microsoft\Windows Script Host\Settings" /v Enabled 2>nul | find /i "0x0" 1>nul && (set _WSH=0)
 if %_WSH% EQU 0 if %WMI_VBS% NEQ 0 goto :E_VBS
 setlocal EnableDelayedExpansion
+copy /y nul "!_work!\#.rw" 1>nul 2>nul && (
+if exist "!_work!\#.rw" del /f /q "!_work!\#.rw"
+) || (
+set "_log=!_dsk!\%~n0"
+)
 pushd "!_work!"
 
 if %_Debug% EQU 0 (
@@ -99,7 +121,6 @@ if %_Debug% EQU 0 (
   set "_Nul2="
   set "_Nul6="
   set "_Nul3="
-  copy /y nul "!_work!\#.rw" 1>nul 2>nul && (if exist "!_work!\#.rw" del /f /q "!_work!\#.rw") || (set "_log=!_dsk!\%~n0")
   echo.
   echo Running in Debug Mode...
   echo The window will be closed when finished
@@ -362,13 +383,20 @@ set xBit=x86
 )
 set _exeNum=1
 if %xBit%==x64 set _exeNum=2
-if %_Cnvrt% EQU 1 if %_Identity% EQU 0 if %_Retail% EQU 0 if %_OMSI% EQU 0 if defined _copp (
+if %_Cnvrt% EQU 1 if %_Identity% EQU 0 if %_Retail% EQU 0 if %_OMSI% EQU 0 if defined _copp if %_pwsh% equ 1 call :oppcln
+goto :oppchk
+
+:oppcln
 echo.
 echo %_ln%
 echo Cleaning Current Office Licenses...
 echo %_ln%
 pushd %_copp%
+setlocal
+set "TMP=%SystemRoot%\Temp"
+set "TEMP=%SystemRoot%\Temp"
 %_Nul3% %_psc% "$d='!cd!';$f=[IO.File]::ReadAllText('!_batp!') -split ':embdbin\:.*';iex ($f[1]);Y %_exeNum%"
+endlocal
 if exist cleanospp.exe (
 %_Nul3% cleanospp.exe -Licenses
 %_Nul3% del /f /q cleanospp.exe
@@ -377,7 +405,9 @@ echo.
 echo ERROR: could not extract cleanospp.exe
 )
 popd
-)
+exit /b
+
+:oppchk
 echo.
 echo %_ln%
 echo Checking installed Office Products...
@@ -478,7 +508,7 @@ find /i "Office16MondoVL_KMS_Client" "!_temp!\crvVolume.txt" %_Nul1% && (
 )
 if %sub_O365% EQU 1 (
   for %%a in (%_Suites%) do set _%%a=0
-echo Microsoft 365 product is activated with a subscription.
+echo Microsoft Office is activated with a subscription.
 echo.
 )
 if %sub_proj% EQU 1 (
@@ -937,6 +967,7 @@ echo Refreshing Windows Insider Preview Licenses...
 echo %_ln%
 echo.
 %_cscript% %_SLMGR% /rilc
+if !ERRORLEVEL! NEQ 0 %_cscript% %_SLMGR% /rilc
 )
 set "msg=Finished"
 goto :TheEnd