Exe updater support and bug fixes

InnoSetup/AdblockPlus.iss

Index: InnoSetup/AdblockPlus.iss
===================================================================
--- a/InnoSetup/AdblockPlus.iss
+++ b/InnoSetup/AdblockPlus.iss
@@ -1,18 +1,24 @@
 ; AdblockPlus installer for 32 & 64
 
 [Setup]
-AppVerName=Adblock Plus
-AppName=Adblock Plus
-DefaultDirName={pf}\AdblockPlus
+AppVerName=avast! Ad Blocker IE
+AppName=avast! Adblocker IE
+DefaultDirName={pf}\AVAST Software\avast! Adblocker IE
 DisableProgramGroupPage=yes
-UninstallDisplayIcon={app}\AdblockPlus
+UninstallDisplayIcon={app}\avast! Adblocker IE
 DisableDirPage=yes
-LicenseFile={#file AddBackslash(SourcePath) + "License.txt"}
 
 
 [Files]
-Source: "AdblockPlus32.dll"; DestDir: "{app}"
-Source: "AdblockPlus64.dll"; DestDir: "{app}"
+Source: "Adblocker32.dll"; DestDir: "{app}"
+Source: "Adblocker64.dll"; DestDir: "{app}"
+Source: "..\html\static\css\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker\html\static\css"
+Source: "..\html\static\img\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker\html\static\img"
+Source: "..\html\static\js\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker\html\static\js"
+Source: "..\html\templates\*"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker\html\templates"
+Source: "..\AdBlocker\files\settings.ini"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker"
+Source: "..\AdBlocker\files\dictionary_w.ini"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker"
+Source: "..\AdBlocker\files\settings_page_w.ini"; DestDir: "{userappdata}\..\LocalLow\avast! Ad Blocker"
 
 [Code]
 
@@ -22,9 +28,9 @@
 begin
   if CurStep = ssPostInstall then
   begin
-    Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{app}') + '\AdblockPlus32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+    Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{app}') + '\Adblocker32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
     if IsWin64 then
-      Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{app}') + '\AdblockPlus64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+      Exec(ExpandConstant('{sys}') + '\regsvr32', '/s ' + '"' + ExpandConstant('{app}') + '\Adblocker64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
   end
 end;
 
@@ -34,8 +40,8 @@
 begin
   if CurUninstallStep = usUninstall then
   begin
-    Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant('{app}') + '\AdblockPlus32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+    Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant('{app}') + '\Adblocker32.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
     if IsWin64 then
-      Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant('{app}') + '\AdblockPlus64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
+      Exec(ExpandConstant('{sys}') + '\regsvr32', '/u /s ' + '"' + ExpandConstant('{app}') + '\Adblocker64.dll' + '"', '', SW_SHOWNORMAL, ewWaitUntilTerminated, ResultCode);
   end
 end;