Bugfix

Changelog.txt

@@ -1,23 +1,12 @@
 Changelog:
 ------------
 
-16.11.XX:
+16.12.XX:
 - Update: elementary icon theme
+- Update: Gnome/Adwaita icon theme
 - Update: AIMP3 Icons
-- Update: Mozilla Firefox / Thunderbird Theme compatibility Updates
+- Update: Mozilla Firefox / Thunderbird Theme compatibility Updates. Also uploaded to Mozilla Addons due to the need of AddOns to be signed and for easier updating. Signed files are inclued.
-- Fix: Updater will now simply download the latest Offline-Installer from ZippyShare. No more updating of parts due to bandwith limitations of Dropbox. 
+- Fix: Updater will now simply download the latest Offline-Installer from GitHub. No more updating of parts due to bandwith limitations of Dropbox.
-
+- Fix: Error during extraction of resources on x86 OS.
-16.01.07:
+- Update: Improved Errorlogging.
-- Update: Several elementary icons & bitmaps
+- Update: Notepad2 EN/DE 4.2.25.985
-- Update: elementaryOS Skin for Winyl (source by vicing | http://vicing.deviantart.com/)
-- Update: elementaryOS Visual Style for Windows 7
-- Update: Making the Reloader smarter to reduce reboots
-- Update: Mozilla Firefox Theme compatibility Updates
-- Update: Mozilla Firefox Theme-Extras uploaded to Mozilla Addons due to the need of AddOns to be signed by v43.0. Signed files are inclued.
-- Update: Extending the possibilities for the Overriding-Feature
-- Update: UltraUXThemePatcher v3.0.4
-- New: elementaryOS Skin for AIMP
-- New: elementaryOS Skin for RadioSure (source by vicing | http://vicing.deviantart.com/)
-- New: elementaryOS Skin for VLC (by vicing | http://vicing.deviantart.com/)
-- Fix: Updater can't download latest version
-- Fix: Checking for the right Windows Version didn't work properly anymore in the newest Build of Windows 10 causing the Patcher to patch unsupported files

LatestVersion.ini

@@ -1,3 +1,3 @@
 [Updater]
-MainApp=16.11.XX
+MainApp=16.01.07
-URL=http://www10.zippyshare.com/d/DIDzcPHu/3545653/WinTango-Patcher-LATEST-offline.exe
+URL=https://github.com/heebijeebi/WinTango-Patcher/releases/download/v16.01.07/WinTango-Patcher-16.01.07-offline.exe

_Build AiO Installer.cmd

@@ -8,7 +8,7 @@ set "FILENAME=WinTango-Patcher-LATEST"
 cd /d ".\project\_Resources"
 
 echo Compressing Resources...
-CALL _BuildRessources.exe
+CALL _BuildResources.exe
 md "%CURRDIR%\project\Themes"
 move "%CURRDIR%\project\_Resources\_ARCHIVES\*.7z" "%CURRDIR%\project\Themes"
 

_Build Resources.cmd

@@ -8,7 +8,7 @@ set "FILENAME=WinTango-Patcher-LATEST"
 cd /d ".\project\_Resources"
 
 echo Compressing Resources...
-CALL _BuildRessources.exe
+CALL _BuildResources.exe
 move "%CURRDIR%\project\_Resources\_ARCHIVES\*.7z" "%CURRDIR%"
 
 :cleanup

project/Changelog.txt

@@ -0,0 +1,9 @@
+Changelog:
+------------
+
+16.12.XX:
+- Update: elementary icon theme
+- Update: AIMP3 Icons
+- Update: Mozilla Firefox / Thunderbird Theme compatibility Updates. Also uploaded to Mozilla Addons due to the need of AddOns to be signed and for easier updating. Signed files are inclued.
+- Fix: Updater will now simply download the latest Offline-Installer from GitHub. No more updating of parts due to bandwith limitations of Dropbox.
+- Fix: Error during extraction of resources on x86 OS.

project/FuncMisc.au3

@@ -2,7 +2,7 @@ Func Defines()
    ;This defines all the globally used Variables
 
    Global $AppName = "WinTango Patcher"
-   Global $AppVersion = "16.06.XX"
+   Global $AppVersion = "16.12.XX"
    Global $AppPublisher = "heebijeebi"
    Global $AppRegKey = "HKLM\Software\" & $AppName
 
@@ -34,7 +34,8 @@ Func Defines()
    Global $UninstallRegKey = "HKLM\Software\Microsoft\Windows\CurrentVersion\Uninstall\" & $AppName
 
    ;URLs
-   Global $FilesURL = "https://dl.dropboxusercontent.com/u/825387/WinTango-Patcher"
+   ;Global $FilesURL = "https://dl.dropboxusercontent.com/u/825387/WinTango-Patcher"
+   Global $FilesURL = "https://github.com/heebijeebi/WinTango-Patcher/releases/download"
 
    ;Folders
    Global $ResourcesDir = @ScriptDir & "\Resources"

project/FuncUpdatecheck.au3

@@ -4,23 +4,23 @@ Func _CheckForUpdate()
    ;[1] = URL
 
    ;Check Database for new Version
-   $sUrl = $FilesURL & "/LatestVersion.ini"
+   $sUrl = $FilesURL & "/v0.0/LatestVersion.ini"
    $sDest = @TempDir & "\LatestVersion.ini"
+   If FileExists($sDest) Then FileDelete($sDest)
 
    InetGet($sUrl,$sDest) ;Download the Infofile
 
    $sData = IniRead($sDest, "Updater", "MainApp", "") ;Version Latest
    $sVer = RegRead($AppRegKey, "Version") ;Version Installed
 
-   FileDelete($sDest) ;Delete the Infofile
-
    If $sData = "" Then
 	  ;MsgBox(0, "error", "download error")
 	  $sVerLatest[0] = $sVer
 
    ElseIf $sData <> $sVer Then
-	  $sUrlChangelog = $FilesURL & "/Changelog.txt"
+	  $sUrlChangelog = $FilesURL & "/v" & $sData & "/Changelog.txt"
 	  $sDestChangelog = @ScriptDir & "\Changelog.txt"
+	  If FileExists($sDestChangelog) Then FileDelete($sDestChangelog)
 
 	  InetGet($sUrlChangelog,$sDestChangelog) ;Download Changelog to view
 
@@ -33,6 +33,8 @@ Func _CheckForUpdate()
 
    $sVerLatest[1] = IniRead($sDest, "Updater", "URL", "") ;URL for Installer
 
+   FileDelete($sDest) ;Delete the Infofile
+
    Return $sVerLatest ;Return Latest Version Number
 EndFunc
 
@@ -40,6 +42,8 @@ EndFunc
 Func _DownloadLatestVersion($sUrl, $sDest)
    ;Progressbar muss "prgbarUpdate" heissen, damit es keine Fehler gibt!
 
+   If FileExists($sDest) Then FileDelete($sDest)
+
    $iSize = InetGetSize($sUrl)
    $hDL = InetGet($sURL, $sDest, 1, 1)
 

project/JobsPatcher.au3

@@ -5,11 +5,7 @@ Func ExtractResources()
 
    ;Extract resources
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Override Feature
@@ -17,134 +13,70 @@ Func ExtractResources()
    #EndRegion
 
 
-   #Region: Icons
+   #Region: Resources
-   $sResName = "Icon Resources"
+   $sResName = "Resources"
+
+   $sResFileLocal = @ScriptDir & '\Themes\res-gnome.7z' ;base for all
+   $sResFileLocal2 = ""
+   $sResFileLocal3 = ""
+   $sResFileLocal4 = ""
+
    If $SelectedTheme = "gnome" Then
-	  $sResFileLocal = @ScriptDir & '\Themes\icons-' & $SelectedTheme & '.7z'
+	  ;use the above
 
-	  $sResFileLocal2 = ""
+   ElseIf $SelectedTheme = "cheser" or $SelectedTheme = "gnome-brave" or $SelectedTheme = "elementary" Then
-	  $sResFileLocal3 = ""
+	  $sResFileLocal2 = @ScriptDir & '\Themes\res-' & $SelectedTheme & '.7z'
-
-   ElseIf $SelectedTheme = "cheser" or $SelectedTheme = "gnome-brave" or $SelectedTheme = "tango" or $SelectedTheme = "elementary" Then
-	  ;base icons
-	  $sResFileLocal = @ScriptDir & '\Themes\icons-gnome.7z'
-
-	  ;specific icons
-	  $sResFileLocal2 = @ScriptDir & '\Themes\icons-' & $SelectedTheme & '.7z'
-
-	  $sResFileLocal3 = ""
 
    Else
-	  ;base icons
+	  ;2nd base images
-	  $sResFileLocal = @ScriptDir & '\Themes\icons-gnome.7z'
+	  $parent_theme = ""
+	  $parent_theme2 = ""
+
+	  If $SelectedTheme = "tango" Then
+		 $parent_theme = "gnome-brave"
+
+	  ElseIf $SelectedTheme = "tangerine" Then
+		 $parent_theme = "gnome-brave"
+		 $parent_theme2 = "tango"
 
-	  ;2nd base icons
-	  If $SelectedTheme = "tangerine" Then
-		 $parent_theme = "Tango"
 	  ElseIf $SelectedTheme = "humanity" Then
-		 $parent_theme = "Elementary"
+		 $parent_theme = "elementary"
+
 	  ElseIf $SelectedTheme = "gnome-human" or $SelectedTheme = "gnome-noble" or $SelectedTheme = "gnome-wine" or $SelectedTheme = "gnome-wise" Then
 		 $parent_theme = "gnome-brave"
-	  EndIf
-	  $sResFileLocal2 = @ScriptDir & '\Themes\icons-' & $parent_theme & '.7z'
 
-	  ;specific icons
+	  EndIf
-	  $sResFileLocal3 = @ScriptDir & '\Themes\icons-' & $SelectedTheme & '.7z'
+
+	  $sResFileLocal2 = @ScriptDir & '\Themes\res-' & $parent_theme & '.7z'
+	  $sResFileLocal3 = @ScriptDir & '\Themes\res-' & $parent_theme2 & '.7z'
+	  $sResFileLocal4 = @ScriptDir & '\Themes\res-' & $SelectedTheme & '.7z' ;specific images
 
    EndIf
 
    ;Extract resources
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
+   ExtractArchive($sResFileLocal2, $ResourcesDir)
-	  If $sResFileLocal2 <> "" Then RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal2 & '"', @ScriptDir ,@SW_HIDE)
+   ExtractArchive($sResFileLocal3, $ResourcesDir)
-	  If $sResFileLocal3 <> "" Then RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal3 & '"', @ScriptDir ,@SW_HIDE)
+   If $SelectedTheme <> "gnome" Then ExtractResCleanup()
-   Else
+   ExtractArchive($sResFileLocal4, $ResourcesDir)
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Override Feature
    If FileExists(@DesktopDir & "\Override\icons") Then DirCopy(@DesktopDir & "\Override\icons", $ResourcesDir & "\icons", 1)
-   #EndRegion
-
-
-   #Region: Bitmaps
-   $sResName = "Bitmap Resources"
-   If $SelectedTheme = "gnome" Then
-	  $sResFileLocal = @ScriptDir & '\Themes\bitmaps-' & $SelectedTheme & '.7z'
-
-	  $sResFileLocal2 = ""
-	  $sResFileLocal3 = ""
-
-   ElseIf $SelectedTheme = "cheser" or $SelectedTheme = "gnome-brave" or $SelectedTheme = "tango" or $SelectedTheme = "elementary" Then
-	  ;base icons
-	  $sResFileLocal = @ScriptDir & '\Themes\bitmaps-gnome.7z'
-
-	  ;specific icons
-	  $sResFileLocal2 = @ScriptDir & '\Themes\bitmaps-' & $SelectedTheme & '.7z'
-
-	  $sResFileLocal3 = ""
-
-   Else
-	  ;base icons
-	  $sResFileLocal = @ScriptDir & '\Themes\bitmaps-gnome.7z'
-
-	  ;2nd base icons
-	  If $SelectedTheme = "tangerine" Then
-		 $parent_theme = "Tango"
-	  ElseIf $SelectedTheme = "humanity" Then
-		 $parent_theme = "Elementary"
-	  ElseIf $SelectedTheme = "gnome-human" or $SelectedTheme = "gnome-noble" or $SelectedTheme = "gnome-wine" or $SelectedTheme = "gnome-wise" Then
-		 $parent_theme = "gnome-brave"
-	  EndIf
-	  $sResFileLocal2 = @ScriptDir & '\Themes\bitmaps-' & $parent_theme & '.7z'
-
-	  ;specific icons
-	  $sResFileLocal3 = @ScriptDir & '\Themes\bitmaps-' & $SelectedTheme & '.7z'
-
-   EndIf
-
-   ;Extract resources
-   InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-	  If $sResFileLocal2 <> "" Then RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal2 & '"', @ScriptDir ,@SW_HIDE)
-	  If $sResFileLocal3 <> "" Then RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal3 & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
-   InstallMsg("done")
-
-   ;Override Feature
    If FileExists(@DesktopDir & "\Override\bitmaps") Then DirCopy(@DesktopDir & "\Override\bitmaps", $ResourcesDir & "\bitmaps", 1)
    If FileExists(@DesktopDir & "\Override\shiki") Then DirCopy(@DesktopDir & "\Override\shiki", $ResourcesDir & "\shiki", 1)
    #EndRegion
+EndFunc
 
-
+Func ExtractResCleanup() ;cleanup Themes from other icon themes; at the moment a manual attempt...
-   #Region Themes-Apps
+   DirRemove($ResourcesDir & "\themes\Aimp", 1)
-   $sResName = "Application Theme Files"
+   FileDelete($ResourcesDir & "\themes\Firefox\*.xpi")
-
+   DirRemove($ResourcesDir & "\themes\jDownloader", 1)
-   ;step1: GNOME base
+   DirRemove($ResourcesDir & "\themes\RadioSure\skins", 1)
-   $sResFileLocal = @ScriptDir & '\Themes\theme-apps-gnome.7z'
+   DirRemove($ResourcesDir & "\themes\SMPlayer", 1)
-
+   FileDelete($ResourcesDir & "\themes\Thunderbird\*.xpi")
-   ;step2: specific theme
+   DirRemove($ResourcesDir & "\themes\Winyl", 1)
-   If $SelectedTheme <> "gnome" Then
-	  $sResFileLocal2 = @ScriptDir & '\Themes\theme-apps-' & $SelectedTheme & '.7z'
-   Else
-	  $sResFileLocal2 = ""
-   EndIf
-
-   ;Extract
-   InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-	  If $sResFileLocal2 <> "" Then RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal2 & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
-   InstallMsg("done")
-   #EndRegion
 EndFunc
 
 
@@ -204,17 +136,12 @@ EndFunc
 
 Func Apply_Notepad2()
    ;Replace MS Notepad with Notepad2
-
    $sResName = "Notepad2"
-   $sResFileLocal = @ScriptDir & '\Themes\files-notepad2-' & $SelectedTheme & '.7z'
+   $sResFileLocal = @ScriptDir & '\Themes\files-' & $SelectedTheme & '.7z'
 
    ;Extract
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Patch
@@ -237,22 +164,11 @@ EndFunc
 Func Apply_Desktops()
    ;Install Sysinternals Desktops
    $sResName = "Sysinternals Desktops"
-
+   $sResFileLocal = @ScriptDir & '\Themes\files-' & $SelectedTheme & '.7z'
-   If $SelectedTheme = "gnome" or $SelectedTheme = "cheser" or $SelectedTheme = "elementary" or $SelectedTheme = "tango" Then
-	  $sResFileLocal = @ScriptDir & '\Themes\files-desktops-gnome-brave.7z'
-   ElseIf $SelectedTheme = "tangerine" Then
-	  $sResFileLocal = @ScriptDir & '\Themes\files-desktops-gnome-human.7z'
-   Else
-	  $sResFileLocal = @ScriptDir & '\Themes\files-desktops-' & $SelectedTheme & '.7z'
-   EndIf
 
    ;Extract
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Install
@@ -309,11 +225,7 @@ Func ApplyTheme_Wallpapers()
 
    ;Extract
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Install
@@ -331,11 +243,7 @@ Func ApplyTheme_Cursors($Cursor_Style)
 
    ;Extract
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Install
@@ -396,11 +304,7 @@ Func ApplyTheme_VisualStyle($VS_Name)
 
    ;Extract
    InstallMsg("Extracting: " & $sResName)
-   If FileExists($sResFileLocal) Then
+   ExtractArchive($sResFileLocal, $ResourcesDir)
-	  RunWait($ToolsDir & '\7z.exe x -yo"' & $ResourcesDir & '" "' & $sResFileLocal & '"', @ScriptDir ,@SW_HIDE)
-   Else
-	  ;Some kind of Errorchecking needed?
-   EndIf
    InstallMsg("done")
 
    ;Install

project/Patcher.au3

@@ -42,6 +42,7 @@ RegWrite("HKLM\SYSTEM\CurrentControlSet\Control\Session Manager", "AllowProtecte
 
 ;Defines
 Defines() ;Global Standards
+$errorFlag = 0
 
 ;Define Windows Version for further usage & make sure that the Patcher only runs on supported Windows Versions
 Global $WinName = _GetWinVer()
@@ -245,6 +246,10 @@ While 1
 		 ElseIf $CurrentStatus = "done" Then
 			If $UpdatedFileCount > 0 Then Shutdown(6) ;Neustarten erzwingen
 			ExitPatcher()
+		 ElseIf $CurrentStatus = "error" Then
+			ShellExecute($AppBugReport)
+			ShellExecute("Patcher.log")
+			ExitPatcher()
 		 EndIf
 
 
@@ -397,91 +402,109 @@ Func Patch()
    ;Download all the needed resources
    Debug("=== Extract Basics Start ===")
    ExtractResources()
+   Local $iSize = DirGetSize($ResourcesDir)
+   Debug("Resources DirSize: " & Round($iSize / 1024 / 1024) & " MB")
+   ;Error-Check
+   If $iSize = -1 or $iSize = 0 Then
+	  InstallMsg("Error: Resources Dir empty or not existing!")
+	  $errorFlag = 1
+   EndIf
+   ;Error-Check End
    Debug("=== Extract Basics End ===")
 
    ;The patching magic:
-   Debug("=== ApplyOptions Start ===")
+   If $errorFlag = 0 Then
-   If $OptTrayIcons = 1 Then
+	  Debug("=== ApplyOptions Start ===")
-	  If GUICtrlRead($comboTrayIcons) = "Symbolic" Then Apply_SymbolicTray()
+	  If $OptTrayIcons = 1 Then
-   Else
+		 If GUICtrlRead($comboTrayIcons) = "Symbolic" Then Apply_SymbolicTray()
-	  Apply_NoTray()
+	  Else
+		 Apply_NoTray()
+	  EndIf
+
+	  If $OptStartOrb = 0 Then Apply_NoStartOrb()
+
+	  If $OptVisualStyle = 1 Then ApplyTheme_VisualStyle(GUICtrlRead($comboVisualStyle))
+	  If $OptWallpapers = 1 Then ApplyTheme_Wallpapers()
+	  If $OptCursors = 1 Then ApplyTheme_Cursors(GUICtrlRead($comboCursors))
+
+	  If $OptNotepad2 = 1 Then Apply_Notepad2()
+	  If $OptDesktops = 1 Then Apply_Desktops()
+
+	  If $OptUpdater = 1 Then Apply_UpdaterStartup()
+	  If $OptReloader = 1 Then Apply_ReloaderStartup()
+	  Debug("=== ApplyOptions End ===")
+
+	  Debug("=== ApplyAdvancedOptions Start ===")
+	  If GUICtrlRead($chkNoShell32) = 1 Then
+		 Global $NotPatchShell32 = 1 ;Don't patch shell32.dll
+	  Else
+		 Global $NotPatchShell32 = 0
+	  EndIf
+
+	  If GUICtrlRead($chkUsingIE) = 1 Then
+		 Global $keepIEusable = 1 ;Internet Explorer Usability
+	  Else
+		 Global $keepIEusable = 0
+	  EndIf
+
+	  If GUICtrlRead($chkUniversalThemePatcher) = 1 Then ApplyTheme_UXThemePatch("direct")
+	  If GUICtrlRead($chkUniversalThemeService) = 1 Then ApplyTheme_UXThemePatch("service")
+	  Debug("=== ApplyAdvancedOptions Start ===")
+
+	  Debug("=== PatchWindowsFiles Start ===")
+	  If GUICtrlRead($chkBranding) = 1 Then ApplyTheme_Branding()
+	  PatchWindowsFiles()
+	  Debug("=== PatchWindowsFiles End ===")
+
+	  Debug("=== ApplyAppearanceApps Start ===")
+	  If GUICtrlRead($chkAimpTheme) = 1 Then ApplyTheme_Aimp() ;Aimp Shiki-Colors Theme
+	  If GUICtrlRead($chkDiskInfoTheme) = 1 Then ApplyTheme_DiskInfo() ;CrystalDiskInfo Shiki-Colors Theme
+	  If GUICtrlRead($chkfoobar2000Theme) = 1 Then ApplyTheme_Foobar2000() ;foobar2000 File Type Icons
+	  If GUICtrlRead($chkGimpTheme) = 1 Then ApplyTheme_Gimp() ;Gimp Theme/Images
+	  If GUICtrlRead($chkInkscapeTheme) = 1 Then ApplyTheme_Inkscape() ;Inkscape Theme
+	  If GUICtrlRead($chkjDownloaderTheme) = 1 Then ApplyTheme_jDownloader() ;jDownloader Theme
+	  If GUICtrlRead($chkLibreOfficeTheme) = 1 Then ApplyTheme_LibreOffice() ;LibreOffice Images
+	  If GUICtrlRead($chkMPCTheme) = 1 Then ApplyTheme_MPC() ;Media Player Classic HC Theme
+	  If GUICtrlRead($chkMSOfficeTheme) = 1 Then  ApplyTheme_MSOffice() ;Microsoft Office
+	  If GUICtrlRead($chkFirefoxTheme) = 1 Then ApplyTheme_Firefox() ;Mozilla Firefox Theme
+	  If GUICtrlRead($chkThunderbirdTheme) = 1 Then ApplyTheme_Thunderbird() ;Mozilla Thunderbird Theme
+	  If GUICtrlRead($chkPidginTheme) = 1 Then ApplyTheme_Pidgin() ;Pidgin Theme
+	  If GUICtrlRead($chkRadioSureTheme) = 1 Then ApplyTheme_RadioSure() ;RadioSure Theme
+	  If GUICtrlRead($chkRainlendarTheme) = 1 Then ApplyTheme_Rainlendar() ;Rainlendar Theme
+	  If GUICtrlRead($chkSMPlayerTheme) = 1 Then ApplyTheme_SMPlayer() ;SMPlayer Theme
+	  If GUICtrlRead($chkUTorrentTheme) = 1 Then ApplyTheme_uTorrent() ;uTorrent 2.x Theme
+	  If GUICtrlRead($chkVLCTheme) = 1 Then ApplyTheme_VLC() ;VLC Theme
+	  If GUICtrlRead($chkWinylTheme) = 1 Then ApplyTheme_Winyl() ;Winyl Theme
+	  Debug("=== ApplyAppearanceApps End ===")
+
+	  Debug("=== PatchAppFiles Start ===")
+	  PatchAppFiles()
+	  Debug("=== PatchAppFiles End ===")
+
+	  InstallMsg("Clearing Icon-/Thumbnail-Cache...")
+	  ClearIconCache()
+	  InstallMsg("done")
+
+	  PostInstall()
    EndIf
 
-   If $OptStartOrb = 0 Then Apply_NoStartOrb()
-
-   If $OptVisualStyle = 1 Then ApplyTheme_VisualStyle(GUICtrlRead($comboVisualStyle))
-   If $OptWallpapers = 1 Then ApplyTheme_Wallpapers()
-   If $OptCursors = 1 Then ApplyTheme_Cursors(GUICtrlRead($comboCursors))
-
-   If $OptNotepad2 = 1 Then Apply_Notepad2()
-   If $OptDesktops = 1 Then Apply_Desktops()
-
-   If $OptUpdater = 1 Then Apply_UpdaterStartup()
-   If $OptReloader = 1 Then Apply_ReloaderStartup()
-   Debug("=== ApplyOptions End ===")
-
-   Debug("=== ApplyAdvancedOptions Start ===")
-   If GUICtrlRead($chkNoShell32) = 1 Then
-	  Global $NotPatchShell32 = 1 ;Don't patch shell32.dll
-   Else
-	  Global $NotPatchShell32 = 0
-   EndIf
-
-   If GUICtrlRead($chkUsingIE) = 1 Then
-	  Global $keepIEusable = 1 ;Internet Explorer Usability
-   Else
-	  Global $keepIEusable = 0
-   EndIf
-
-   If GUICtrlRead($chkUniversalThemePatcher) = 1 Then ApplyTheme_UXThemePatch("direct")
-   If GUICtrlRead($chkUniversalThemeService) = 1 Then ApplyTheme_UXThemePatch("service")
-   Debug("=== ApplyAdvancedOptions Start ===")
-
-   Debug("=== PatchWindowsFiles Start ===")
-   If GUICtrlRead($chkBranding) = 1 Then ApplyTheme_Branding()
-   PatchWindowsFiles()
-   Debug("=== PatchWindowsFiles End ===")
-
-   Debug("=== ApplyAppearanceApps Start ===")
-   If GUICtrlRead($chkAimpTheme) = 1 Then ApplyTheme_Aimp() ;Aimp Shiki-Colors Theme
-   If GUICtrlRead($chkDiskInfoTheme) = 1 Then ApplyTheme_DiskInfo() ;CrystalDiskInfo Shiki-Colors Theme
-   If GUICtrlRead($chkfoobar2000Theme) = 1 Then ApplyTheme_Foobar2000() ;foobar2000 File Type Icons
-   If GUICtrlRead($chkGimpTheme) = 1 Then ApplyTheme_Gimp() ;Gimp Theme/Images
-   If GUICtrlRead($chkInkscapeTheme) = 1 Then ApplyTheme_Inkscape() ;Inkscape Theme
-   If GUICtrlRead($chkjDownloaderTheme) = 1 Then ApplyTheme_jDownloader() ;jDownloader Theme
-   If GUICtrlRead($chkLibreOfficeTheme) = 1 Then ApplyTheme_LibreOffice() ;LibreOffice Images
-   If GUICtrlRead($chkMPCTheme) = 1 Then ApplyTheme_MPC() ;Media Player Classic HC Theme
-   If GUICtrlRead($chkMSOfficeTheme) = 1 Then  ApplyTheme_MSOffice() ;Microsoft Office
-   If GUICtrlRead($chkFirefoxTheme) = 1 Then ApplyTheme_Firefox() ;Mozilla Firefox Theme
-   If GUICtrlRead($chkThunderbirdTheme) = 1 Then ApplyTheme_Thunderbird() ;Mozilla Thunderbird Theme
-   If GUICtrlRead($chkPidginTheme) = 1 Then ApplyTheme_Pidgin() ;Pidgin Theme
-   If GUICtrlRead($chkRadioSureTheme) = 1 Then ApplyTheme_RadioSure() ;RadioSure Theme
-   If GUICtrlRead($chkRainlendarTheme) = 1 Then ApplyTheme_Rainlendar() ;Rainlendar Theme
-   If GUICtrlRead($chkSMPlayerTheme) = 1 Then ApplyTheme_SMPlayer() ;SMPlayer Theme
-   If GUICtrlRead($chkUTorrentTheme) = 1 Then ApplyTheme_uTorrent() ;uTorrent 2.x Theme
-   If GUICtrlRead($chkVLCTheme) = 1 Then ApplyTheme_VLC() ;VLC Theme
-   If GUICtrlRead($chkWinylTheme) = 1 Then ApplyTheme_Winyl() ;Winyl Theme
-   Debug("=== ApplyAppearanceApps End ===")
-
-   Debug("=== PatchAppFiles Start ===")
-   PatchAppFiles()
-   Debug("=== PatchAppFiles End ===")
-
-   InstallMsg("Clearing Icon-/Thumbnail-Cache...")
-   ClearIconCache()
-   InstallMsg("done")
-
-   PostInstall()
-
    GUICtrlSetData($lstPatchStatus, @LF)
-   InstallMsg($string_msgPatchingDone) ;Patching completed.
-   InstallMsg($string_msgPatchingDoneRestart) ;In order to apply these changes you have to restart your system!
 
-   GUICtrlSetData($btnPatch, $string_btnRestart)
+   If $errorFlag = 0 Then
+	  InstallMsg($string_msgPatchingDone) ;Patching completed.
+	  InstallMsg($string_msgPatchingDoneRestart) ;In order to apply these changes you have to restart your system!
+	  GUICtrlSetData($btnPatch, $string_btnRestart)
+	  $CurrentStatus = "done"
+   Else
+	  InstallMsg("The Patcher ended with an error!")
+	  InstallMsg("Please report this Bug to me by clicking the button above!")
+	  GUICtrlSetData($btnPatch, "Bugreport")
+	  GUICtrlSetColor($btnPatch, "0xff0000")
+	  $CurrentStatus = "error"
+   EndIf
+
    GuiCtrlSetState($btnPatch, $GUI_ENABLE)
    GuiCtrlSetState($btnPatch, $GUI_FOCUS)
-
-   $CurrentStatus = "done"
 EndFunc
 #EndRegion
 

project/Updater.au3

@@ -52,7 +52,7 @@ EndIf
 If $AppVersionInst <> $AppVersionLatest[0] Then
    $sDataChangelog = FileRead(@ScriptDir & "\Changelog.txt")
 
-   $queryUpdate = MsgBox(4, $string_msgYesUpdate, $AppName & " " & $AppVersionLatest & " " & $string_msgYesUpdate_msg1 & @LF & @LF & $string_msgYesUpdate_msg2 & @LF & @LF & $sDataChangelog)
+   $queryUpdate = MsgBox(4, $string_msgYesUpdate, $AppName & " " & $AppVersionLatest[0] & " " & $string_msgYesUpdate_msg1 & @LF & @LF & $string_msgYesUpdate_msg2 & @LF & @LF & $sDataChangelog)
    If $queryUpdate = 6 Then
 	  ;ja - weitermachen!
    Else

project/_UDFs/CommonFunctions.au3

@@ -92,6 +92,15 @@ Func InstallFont($sSourceFile, $sFontDescript="", $sFontsPath="")
 EndFunc
 
 
+;7Zip extract
+Func ExtractArchive($sArchive, $sOutputDir)
+   If FileExists($sArchive) Then
+	  RunWait($ToolsDir & '\7z.exe x -y "' & $sArchive & '" -o"' & $sOutputDir & '"', @ScriptDir ,@SW_HIDE)
+   Else
+	  ;Some kind of Errorchecking needed?
+   EndIf
+EndFunc
+
 ;Write Debug File
 Func Debug($Text)
    $DebugFileName = @ScriptDir & "\" & $Modus & ".log"