From 8b09ea30246760671da26266fd9fa8cd88f049ba Mon Sep 17 00:00:00 2001 From: zeffy Date: Sat, 7 Oct 2017 16:00:50 -0700 Subject: [PATCH] update folder structure and readme --- README.md | 11 +- appveyor.yml | 10 +- setup-ai/Helper Scripts/disable_wufuc.bat | 42 ---- setup-ai/Helper Scripts/enable_wufuc.bat | 41 ---- setup-ai/wufuc.aip | 224 ------------------ wufuc.sln | 35 ++- {setup-ai => wufuc_setup_ai}/LICENSE.rtf | 0 wufuc_setup_ai/wufuc_setup_ai.aip | 130 ++++++++++ wufuc_setup_ai/wufuc_setup_ai.aiproj | 24 ++ wufuc_setup_ai/wufuc_setup_ai.back.aip | 130 ++++++++++ .../install_wufuc.bat | 0 .../uninstall_wufuc.bat | 0 12 files changed, 330 insertions(+), 317 deletions(-) delete mode 100644 setup-ai/Helper Scripts/disable_wufuc.bat delete mode 100644 setup-ai/Helper Scripts/enable_wufuc.bat delete mode 100644 setup-ai/wufuc.aip rename {setup-ai => wufuc_setup_ai}/LICENSE.rtf (100%) create mode 100644 wufuc_setup_ai/wufuc_setup_ai.aip create mode 100644 wufuc_setup_ai/wufuc_setup_ai.aiproj create mode 100644 wufuc_setup_ai/wufuc_setup_ai.back.aip rename {setup-batch => wufuc_setup_bat}/install_wufuc.bat (100%) rename {setup-batch => wufuc_setup_bat}/uninstall_wufuc.bat (100%) diff --git a/README.md b/README.md index e51e313..0c6a2e0 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Disables the "Unsupported Hardware" message in Windows Update, and allows you to - [**Click here for the latest stable version**](../../releases/latest) -- [~~Unstable builds~~](https://ci.appveyor.com/project/zeffy/wufuc) **Broken until AppVeyor adds WDK support for Visual Studio 2017 ([appveyor/ci#1554](https://github.com/appveyor/ci/issues/1554))** +- [~~Unstable builds~~](https://ci.appveyor.com/project/zeffy/wufuc) **Discontinued until AppVeyor adds WDK support for Visual Studio 2017 ([appveyor/ci#1554](https://github.com/appveyor/ci/issues/1554))** ## Preface @@ -57,9 +57,13 @@ My patch takes advantage of this behavior by patching a couple of boolean values * `RegQueryValueExW` hook is necessary to provide compatibility with attempts by other third-parties at bypassing the CPU check. (see issue [#100](../../issues/100)) - If wufuc gets loaded by a `svchost.exe` process that isn't related to Windows Update, it goes into a dormant state and no hooks are applied. +## How to deploy wufuc using Group Policy + +[There is a tutorial on the Advanced Installer website that explains how to do this](http://www.advancedinstaller.com/user-guide/tutorial-gpo.html). + ## How to use unattended feature in the batch setup scripts -`install_wufuc.bat` and `uninstall_wufuc.bat` both support two command line parameters that can used alone or be combined to change the behavior of the scripts: +`install_wufuc.bat` and `uninstall_wufuc.bat` both support two command line parameters that can be used alone, or combined to change the behavior of the scripts: - `/NORESTART` - Automatically declines rebooting after the setup finishes. - `/UNATTENDED` - Skips all prompts for user interaction, and automatically restarts unless `/NORESTART` is also specified. @@ -87,7 +91,8 @@ However, just in case this does happen to someone, here is how to fix it: ### [Advanced Installer](http://www.advancedinstaller.com/) -The installer packages are created with Advanced Installer using an [open source license](http://www.advancedinstaller.com/free-license.html). Advanced Installer's intuitive and friendly user interface allowed me to quickly create a feature complete installer with minimal effort. [Check it out!](http://www.advancedinstaller.com/) +The installer packages are created with Advanced Installer using an [open source license](http://www.advancedinstaller.com/free-license.html). +Advanced Installer's intuitive and friendly user interface allowed me to quickly create a feature complete installer with minimal effort. [Check it out!](http://www.advancedinstaller.com/) ## Special thanks diff --git a/appveyor.yml b/appveyor.yml index e3d3907..eaaf5b9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,18 +19,18 @@ before_build: set "BUILD_ZIPFILE=%APPVEYOR_BUILD_FOLDER%\%APPVEYOR_PROJECT_NAME%_v%BUILD_COMMIT_VERSION%_%PLATFORM%.zip" after_build: - cmd: >- - copy /Y "wufuc\bin\%CONFIGURATION%\%PLATFORM%\wufuc*.dll" "setup-batch\" + copy /Y "wufuc\bin\%CONFIGURATION%\%PLATFORM%\wufuc*.dll" "wufuc_setup_bat\" - copy /Y "LICENSE" "setup-batch\COPYING.txt" + copy /Y "LICENSE" "wufuc_setup_bat\COPYING.txt" - cd "%APPVEYOR_BUILD_FOLDER%\setup-batch" + cd "%APPVEYOR_BUILD_FOLDER%\wufuc_setup_bat" for /R %%i in (*.txt) do unix2dos "%%i" for /R %%i in (*.bat) do unix2dos "%%i" - 7z a "%BUILD_ZIPFILE%" "..\setup-batch" + 7z a "%BUILD_ZIPFILE%" "..\wufuc_setup_bat" - 7z rn "%BUILD_ZIPFILE%" "setup-batch" "%APPVEYOR_PROJECT_NAME%" + 7z rn "%BUILD_ZIPFILE%" "wufuc_setup_bat" "%APPVEYOR_PROJECT_NAME%" artifacts: - path: '*.zip' diff --git a/setup-ai/Helper Scripts/disable_wufuc.bat b/setup-ai/Helper Scripts/disable_wufuc.bat deleted file mode 100644 index e28bad9..0000000 --- a/setup-ai/Helper Scripts/disable_wufuc.bat +++ /dev/null @@ -1,42 +0,0 @@ -@echo off -title wufuc utility - disable task -:: Copyright (C) 2017 zeffy - -:: This program is free software: you can redistribute it and/or modify -:: it under the terms of the GNU General Public License as published by -:: the Free Software Foundation, either version 3 of the License, or -:: (at your option) any later version. - -:: This program is distributed in the hope that it will be useful, -:: but WITHOUT ANY WARRANTY; without even the implied warranty of -:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -:: GNU General Public License for more details. - -:: You should have received a copy of the GNU General Public License -:: along with this program. If not, see . - -echo Copyright ^(C^) 2017 zeffy -echo This program comes with ABSOLUTELY NO WARRANTY. -echo This is free software, and you are welcome to redistribute it -echo under certain conditions; see COPYING.txt for details. -echo. - -fltmc >nul 2>&1 || ( - echo This batch script requires administrator privileges. Right-click on - echo %~nx0 and select "Run as administrator". - goto :die -) - -set "wufuc_dll=%~dp0..\wufuc.dll" -set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}" -rundll32 "%wufuc_dll%",Rundll32Unload -net start Schedule -schtasks /Change /TN "%wufuc_task%" /DISABLE - -echo. -echo Disabled wufuc! You will still be able to check for updates until you restart. - -:die -echo. -pause -exit diff --git a/setup-ai/Helper Scripts/enable_wufuc.bat b/setup-ai/Helper Scripts/enable_wufuc.bat deleted file mode 100644 index 4b2e1c6..0000000 --- a/setup-ai/Helper Scripts/enable_wufuc.bat +++ /dev/null @@ -1,41 +0,0 @@ -@echo off -title wufuc utility - enable task -:: Copyright (C) 2017 zeffy - -:: This program is free software: you can redistribute it and/or modify -:: it under the terms of the GNU General Public License as published by -:: the Free Software Foundation, either version 3 of the License, or -:: (at your option) any later version. - -:: This program is distributed in the hope that it will be useful, -:: but WITHOUT ANY WARRANTY; without even the implied warranty of -:: MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -:: GNU General Public License for more details. - -:: You should have received a copy of the GNU General Public License -:: along with this program. If not, see . - -echo Copyright ^(C^) 2017 zeffy -echo This program comes with ABSOLUTELY NO WARRANTY. -echo This is free software, and you are welcome to redistribute it -echo under certain conditions; see COPYING.txt for details. -echo. - -fltmc >nul 2>&1 || ( - echo This batch script requires administrator privileges. Right-click on - echo %~nx0 and select "Run as administrator". - goto :die -) - -set "wufuc_task=wufuc.{72EEE38B-9997-42BD-85D3-2DD96DA17307}" -net start Schedule -schtasks /Change /TN "%wufuc_task%" /ENABLE -schtasks /Run /TN "%wufuc_task%" - -echo. -echo Enabled and started wufuc! - -:die -echo. -pause -exit diff --git a/setup-ai/wufuc.aip b/setup-ai/wufuc.aip deleted file mode 100644 index f9ba054..0000000 --- a/setup-ai/wufuc.aip +++ /dev/null @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/wufuc.sln b/wufuc.sln index c21b9cb..9a765a9 100644 --- a/wufuc.sln +++ b/wufuc.sln @@ -9,17 +9,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ProjectSection(SolutionItems) = preProject .gitignore = .gitignore appveyor.yml = appveyor.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wufuc_setup_bat", "wufuc_setup_bat", "{97E33D3C-9AA1-4B84-803A-1A6AE2C6F361}" + ProjectSection(SolutionItems) = preProject + wufuc_setup_bat\install_wufuc.bat = wufuc_setup_bat\install_wufuc.bat + wufuc_setup_bat\uninstall_wufuc.bat = wufuc_setup_bat\uninstall_wufuc.bat + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Documentation", "Documentation", "{65210B26-9B74-4B7E-B777-7A2EE4162595}" + ProjectSection(SolutionItems) = preProject CONTRIBUTING.md = CONTRIBUTING.md - setup-batch\install_wufuc.bat = setup-batch\install_wufuc.bat LICENSE = LICENSE README.md = README.md - setup-batch\uninstall_wufuc.bat = setup-batch\uninstall_wufuc.bat EndProjectSection EndProject +Project("{840C416C-B8F3-42BC-B0DD-F6BB14C9F8CB}") = "wufuc_setup_ai", "wufuc_setup_ai\wufuc_setup_ai.aiproj", "{8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + DefaultBuild|x64 = DefaultBuild|x64 + DefaultBuild|x86 = DefaultBuild|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection @@ -28,14 +40,33 @@ Global {00F96695-CE41-4C2F-A344-6219DFB4F887}.Debug|x64.Build.0 = Debug|x64 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Debug|x86.ActiveCfg = Debug|Win32 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Debug|x86.Build.0 = Debug|Win32 + {00F96695-CE41-4C2F-A344-6219DFB4F887}.DefaultBuild|x64.ActiveCfg = Debug|x64 + {00F96695-CE41-4C2F-A344-6219DFB4F887}.DefaultBuild|x64.Build.0 = Debug|x64 + {00F96695-CE41-4C2F-A344-6219DFB4F887}.DefaultBuild|x86.ActiveCfg = Debug|Win32 + {00F96695-CE41-4C2F-A344-6219DFB4F887}.DefaultBuild|x86.Build.0 = Debug|Win32 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Release|x64.ActiveCfg = Release|x64 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Release|x64.Build.0 = Release|x64 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Release|x86.ActiveCfg = Release|Win32 {00F96695-CE41-4C2F-A344-6219DFB4F887}.Release|x86.Build.0 = Release|Win32 + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Debug|x64.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Debug|x64.Build.0 = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Debug|x86.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Debug|x86.Build.0 = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.DefaultBuild|x64.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.DefaultBuild|x64.Build.0 = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.DefaultBuild|x86.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.DefaultBuild|x86.Build.0 = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Release|x64.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Release|x64.Build.0 = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Release|x86.ActiveCfg = DefaultBuild + {8F75FC4A-22FF-4CDA-8A09-3BC547E7C29B}.Release|x86.Build.0 = DefaultBuild EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {65210B26-9B74-4B7E-B777-7A2EE4162595} = {8C2147FF-2B83-479B-813E-5ACB86F43042} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {5070ABC4-3344-4D6E-B744-E3508B10A327} EndGlobalSection diff --git a/setup-ai/LICENSE.rtf b/wufuc_setup_ai/LICENSE.rtf similarity index 100% rename from setup-ai/LICENSE.rtf rename to wufuc_setup_ai/LICENSE.rtf diff --git a/wufuc_setup_ai/wufuc_setup_ai.aip b/wufuc_setup_ai/wufuc_setup_ai.aip new file mode 100644 index 0000000..f00eaba --- /dev/null +++ b/wufuc_setup_ai/wufuc_setup_ai.aip @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wufuc_setup_ai/wufuc_setup_ai.aiproj b/wufuc_setup_ai/wufuc_setup_ai.aiproj new file mode 100644 index 0000000..a9c36a7 --- /dev/null +++ b/wufuc_setup_ai/wufuc_setup_ai.aiproj @@ -0,0 +1,24 @@ + + + All + 2.0 + 8f75fc4a-22ff-4cda-8a09-3bc547e7c29b + msi + . + wufuc_setup_ai.aip + + + . + True + wufuc_setup_ai + wufuc_setup_ai + wufuc_setup_ai + + + + + Code + + + + \ No newline at end of file diff --git a/wufuc_setup_ai/wufuc_setup_ai.back.aip b/wufuc_setup_ai/wufuc_setup_ai.back.aip new file mode 100644 index 0000000..de40137 --- /dev/null +++ b/wufuc_setup_ai/wufuc_setup_ai.back.aip @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/setup-batch/install_wufuc.bat b/wufuc_setup_bat/install_wufuc.bat similarity index 100% rename from setup-batch/install_wufuc.bat rename to wufuc_setup_bat/install_wufuc.bat diff --git a/setup-batch/uninstall_wufuc.bat b/wufuc_setup_bat/uninstall_wufuc.bat similarity index 100% rename from setup-batch/uninstall_wufuc.bat rename to wufuc_setup_bat/uninstall_wufuc.bat