From e2cfb32afda263297540cb56d68b028a8a0fc60d Mon Sep 17 00:00:00 2001 From: abbodi1406 <33669284+abbodi1406@users.noreply.github.com> Date: Wed, 20 Nov 2019 03:27:19 +0300 Subject: [PATCH] v0.0.34-beta Update: handle paths with special or non-ascii characters Update: auto elevation code to prevent loop --- KMS_VL_ALL_AIO.cmd | 73 ++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/KMS_VL_ALL_AIO.cmd b/KMS_VL_ALL_AIO.cmd index 6e0e3ea..be83c24 100644 --- a/KMS_VL_ALL_AIO.cmd +++ b/KMS_VL_ALL_AIO.cmd @@ -57,15 +57,19 @@ set KMS_Port=1688 set KMS_Emulation=1 set Unattend=0 +set _args= +set _elev= +set _batf= +set _batp= set fAUR= set rAUR= set "_args=%*" if not defined _args goto :NoProgArgs -if "%~1"=="" set "_args="&goto :NoProgArgs set _args=%_args:"=% for %%A in (%_args%) do ( -if /i "%%A"=="/d" (set _Debug=1 +if /i "%%A"=="-elevated" (set _elev=1 +) else if /i "%%A"=="/d" (set _Debug=1 ) else if /i "%%A"=="/u" (set Unattend=1 ) else if /i "%%A"=="/s" (set Silent=1 ) else if /i "%%A"=="/l" (set Logger=1 @@ -87,7 +91,7 @@ if %uAutoRenewal% EQU 1 (set fAUR=1&set External=0) if defined fAUR set Unattend=1 if defined rAUR set Unattend=1 if %Silent% EQU 1 set Unattend=1 -set "_run=nul" +set _run=nul if %Logger% EQU 1 set _run="%~dpn0_Silent.log" set "SysPath=%SystemRoot%\System32" @@ -108,32 +112,22 @@ if /i %PROCESSOR_ARCHITECTURE%==x86 (if not defined PROCESSOR_ARCHITEW6432 ( ) ) -set "param=%~f0" -cmd /v:on /c echo(^^!param^^!| findstr /R "[| ` ~ ! @ %% \^ & ( ) \[ \] { } + = ; ' , |]*^" -if %errorlevel% EQU 0 ( -echo. -echo %_err% -echo Disallowed special characters detected in the file path. -echo Make sure the path does not contain the following special characters, -echo ^` ^~ ^! ^@ %% ^^ ^& ^( ^) [ ] { } ^+ ^= ^; ^' ^, -echo. -echo Press any key to exit. -pause >nul -goto :eof -) - if not exist "%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell.exe" goto :E_PS -1>nul 2>nul reg query HKU\S-1-5-19 && goto :Passed +1>nul 2>nul reg query HKU\S-1-5-19 && ( + goto :Passed + ) || ( + if defined _elev goto :E_Admin +) -set "_PSarg="""%~f0""" " -if defined _args set "_PSarg="""%~f0""" %_args%" +set _PSarg="""%~f0""" %_args% -elevated +set _PSarg=%_PSarg:'=''% -(1>nul 2>nul cscript //NoLogo "%~f0?.wsf" //job:ELAV /File:"%~f0" %*) && ( +(1>nul 2>nul cscript //NoLogo "%~f0?.wsf" //job:ELAV /File:"%~f0" %_args% -elevated) && ( exit /b ) || ( call setlocal EnableDelayedExpansion - 1>nul 2>nul %SysPath%\WindowsPowerShell\v1.0\%_psc% "start cmd -ArgumentList '/c \"!_PSarg!\"' -verb runas" && ( + 1>nul 2>nul %SysPath%\WindowsPowerShell\v1.0\%_psc% "start cmd.exe -ArgumentList '/c \"!_PSarg!\"' -verb runas" && ( exit /b ) || ( goto :E_Admin @@ -141,6 +135,8 @@ if defined _args set "_PSarg="""%~f0""" %_args%" ) :Passed +set "_batf=%~f0" +set "_batp=%_batf:'=''%" set "_temp=%SystemRoot%\Temp" set "_log=%~dpn0" set "_work=%~dp0" @@ -187,7 +183,10 @@ if %_Debug% EQU 0 ( @exit /b :Begin -if %_Debug% EQU 1 if defined _args echo %_args% +if %_Debug% EQU 1 ( +if defined _args echo %_args% +echo "!_batf!" +) if exist "%_temp%\'" del /f /q "%_temp%\'" set _verb=0 set "_wApp=55c92734-d682-4d71-983e-d6ec3f16059f" @@ -236,8 +235,10 @@ call :StopService sppsvc ) set _uRI= set _uAI= -for /f "tokens=2 delims==" %%# in ('findstr /i /b /c:"set KMS_RenewalInterval" "%~f0"') do if not defined _uRI set _uRI=%%# -for /f "tokens=2 delims==" %%# in ('findstr /i /b /c:"set KMS_ActivationInterval" "%~f0"') do if not defined _uAI set _uAI=%%# +for /f "tokens=2 delims==" %%# in ('findstr /i /b /c:"set KMS_RenewalInterval" "!_batf!" %_Nul6%') do if not defined _uRI set _uRI=%%# +for /f "tokens=2 delims==" %%# in ('findstr /i /b /c:"set KMS_ActivationInterval" "!_batf!" %_Nul6%') do if not defined _uAI set _uAI=%%# +if not defined _uRI set _uRI=10080 +if not defined _uAI set _uAI=120 set _dDbg=No if %ActWindows% EQU 0 if %ActOffice% EQU 0 set ActWindows=1 if %_Debug% EQU 1 if not defined fAUR set fAUR=0&set External=0 @@ -1091,7 +1092,7 @@ for %%# in (SppExtComObjHookAvrf.dll,SppExtComObjHook.dll,SppExtComObjPatcher.dl del /f /q "%SysPath%\%%#" %_Nul3% ) pushd %SysPath% -%_Nul3% %_psc% "$f=[io.file]::ReadAllText('%~f0') -split ':%xOS%dll\:.*';iex ($f[1]);X 1;" +%_Nul3% %_psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':%xOS%dll\:.*';iex ($f[1]);X 1;" popd if not exist "%SysPath%\SppExtComObjHook.dll" goto :E_DLL if %_verb% EQU 1 ( @@ -1266,7 +1267,7 @@ schtasks /query /tn "%_TaskEx%" %_Nul3% || ( ) schtasks /query /tn "%_TaskEx%" %_Nul3% || ( pushd %_temp% -%_Nul3% %_psc% "$f=[io.file]::ReadAllText('%~f0') -split ':spptask\:.*';iex ($f[1]);" +%_Nul3% %_psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':spptask\:.*';iex ($f[1]);" popd if exist "!_temp!\SvcTrigger.xml" ( schtasks /create /tn "%_TaskEx%" /xml "!_temp!\SvcTrigger.xml" /f %_Nul3% @@ -1283,7 +1284,7 @@ goto :eof :CreateReadMe if exist not "%SystemDrive%\Users\Public\ReadMeAIO.html" ( pushd %SystemDrive%\Users\Public -%_Nul3% %_psc% "$f=[io.file]::ReadAllText('%~f0') -split ':readme\:.*';iex ($f[1]);" +%_Nul3% %_psc% "$f=[io.file]::ReadAllText('!_batp!') -split ':readme\:.*';iex ($f[1]);" popd ) if exist "%SystemDrive%\Users\Public\ReadMeAIO.html" start "" "%SystemDrive%\Users\Public\ReadMeAIO.html" @@ -1309,8 +1310,8 @@ echo $OEM$ Folder Created... echo. echo "!_oem!\$OEM$" echo.&echo %line3%&echo. -if not exist "!_oem!\$OEM$\$$\Setup\Scripts\KMS_VL_ALL_AIO.cmd" mkdir ""!_oem!\$OEM$\$$\Setup\Scripts" -copy /y "%~f0" "!_oem!\$OEM$\$$\Setup\Scripts\KMS_VL_ALL_AIO.cmd" %_Nul3% +if not exist "!_oem!\$OEM$\$$\Setup\Scripts\KMS_VL_ALL_AIO.cmd" mkdir "!_oem!\$OEM$\$$\Setup\Scripts" +copy /y "!_batf!" "!_oem!\$OEM$\$$\Setup\Scripts\KMS_VL_ALL_AIO.cmd" %_Nul3% ( echo @echo off echo call %%~dp0KMS_VL_ALL_AIO.cmd /s /a @@ -1473,7 +1474,7 @@ set xBit=x86 ) if %_Retail% EQU 0 if defined _copp ( pushd %_copp% -%_Nul3% %_psc% "$d='!cd!';$f=[io.file]::ReadAllText('%~f0') -split ':%xBit%exe\:.*';iex ($f[1]);X 1;" +%_Nul3% %_psc% "$d='!cd!';$f=[io.file]::ReadAllText('!_batp!') -split ':%xBit%exe\:.*';iex ($f[1]);X 1;" %_Nul3% cleanospp.exe -Licenses %_Nul3% del /f /q cleanospp.exe popd @@ -3647,6 +3648,7 @@ Add-Type -Language CSharp -TypeDefinition @"
  • Home Page:
    https://forums.mydigitallife.net/posts/838808/
    Backup links:
    + https://github.com/abbodi1406/KMS_VL_ALL_AIO
    https://pastebin.com/cpdmr6HZ
    https://textuploader.com/1dav8
    • @@ -3661,7 +3663,7 @@ Add-Type -Language CSharp -TypeDefinition @"
  • Combine all the functions of the traditional scripts (Activate, AutoRenewal-Setup, Check-Activation-Status, setupcomplete).

  • Required binary files are embedded in the script (including ReadMeAIO.html itself), using ascii encoder by AveYo.

  • The needed files get extracted (decoded) later on-demand, via Windows PowerShell.

    • -
  • Simple colorization for some menu options text (for easier differentiation).

    • +
  • Simple text colorization for some menu options (for easier differentiation).

  • Auto administrator elevation request.
    • @@ -3904,14 +3906,14 @@ Add-Type -Language CSharp -TypeDefinition @"

    [8] Check Activation Status [vbs]:

    [9] Check Activation Status [wmic]:

    @@ -4132,6 +4134,7 @@ KMS_VL_ALL_AIO.cmd /s dbenham, jeb - Color text in batch script.
    dbenham - Set buffer height independently of window height.
    jeb - Check if the file path name contains special characters.
    + Aacini - Julian Day Number conversions to get specific date.
    hearywarlot - Auto Elevate as admin.
    qewpal - KMS-VL-ALL script.
    NormieLyfe - GVLK categorize, Office checks help.
    @@ -4192,7 +4195,7 @@ KMS_VL_ALL_AIO.cmd /s :DoDebug set _dDbg=No -call "%~f0" !_para! +cmd.exe /c ""!_batf!" !_para!" set _dDbg=Yes echo. echo Done.