migrate to advanced installer!

setup-batch/Helper Scripts/disable_wufuc.bat

@@ -27,26 +27,7 @@ fltmc >nul 2>&1 || (
     goto :die
 )
 
-if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
-    goto :is_x64
-) else (
-    if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (
-        goto :is_x64
-    )
-    if /I "%PROCESSOR_ARCHITECTURE%"=="x86" (
-        goto :is_x86
-    )
-)
-goto :die
-
-:is_x86
-set "wufuc_dll=%~dp0..\wufuc32.dll"
-goto :disable
-
-:is_x64
-set "wufuc_dll=%~dp0..\wufuc64.dll"
-
-:disable
+set "wufuc_dll=%~dp0..\wufuc.dll"
 set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}"
 rundll32 "%wufuc_dll%",Rundll32Unload
 net start Schedule

setup-batch/install_wufuc.bat

@@ -43,13 +43,13 @@ goto :unsupported_os
 
 :is_x86
 set "WINDOWS_ARCHITECTURE=x86"
-set "wufuc_dll=%~dp0wufuc32.dll"
-goto :get_ver
+goto :dll_exists
 
 :is_x64
 set "WINDOWS_ARCHITECTURE=x64"
-set "wufuc_dll=%~dp0wufuc64.dll"
 
+:dll_exists
+set "wufuc_dll=%~dp0wufuc.dll"
 if exist "%wufuc_dll%" (
     goto :get_ver
 )

setup-batch/uninstall_wufuc.bat

@@ -41,14 +41,13 @@ goto :die
 
 :is_x86
 set "WINDOWS_ARCHITECTURE=x86"
-set "wufuc_dll=%~dp0wufuc32.dll"
 goto :get_ver
 
 :is_x64
 set "WINDOWS_ARCHITECTURE=x64"
-set "wufuc_dll=%~dp0wufuc64.dll"
 
 :get_ver
+set "wufuc_dll=%~dp0wufuc.dll"
 for /f "tokens=*" %%i in ('wmic /output:stdout datafile where "name='%wufuc_dll:\=\\%'" get Version /value ^| find "="') do set "%%i"
 title wufuc uninstaller - v%Version%