From d7fa47ebaaf9267548b6d60edacbbf7a34553df4 Mon Sep 17 00:00:00 2001
From: luoliangyi <87842688@qq.com>
Date: Sat, 24 Sep 2022 10:41:29 +0800
Subject: [PATCH] =?UTF-8?q?windows=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E5=90=8E=E6=B8=85=E7=90=86twain=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 win/setup/scanner/HanvonScan_App_Setup.iss  | 5 +++--
 win/setup/scanner/HuaGoScan_App_Setup.iss   | 5 +++--
 win/setup/scanner/LanxumScan_App_Setup.iss  | 5 +++--
 win/setup/webscan/HanvonWebScan_Setup.iss   | 2 +-
 win/setup/webscan/HuaGoWebScan_Setup.iss    | 2 +-
 win/setup/webscan/LanxumWebScan_Setup.iss   | 2 +-
 win/setup/webservice/HanvonWebSdk_Setup.iss | 2 +-
 win/setup/webservice/HuaGoWebSdk_Setup.iss  | 2 +-
 win/setup/webservice/LanxumWebSdk_Setup.iss | 2 +-
 9 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/win/setup/scanner/HanvonScan_App_Setup.iss b/win/setup/scanner/HanvonScan_App_Setup.iss
index 8c97e94..4a07ffa 100644
--- a/win/setup/scanner/HanvonScan_App_Setup.iss
+++ b/win/setup/scanner/HanvonScan_App_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\hanvon
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
Compression=lzma
 AppPublisher={#MyAppPublisher}
SolidCompression=no
 UninstallIconFile=uninstall.ico
@@ -258,7 +258,8 @@ procedure CurUninstallStepChanged(CurUninstallStep:TUninstallStep);
 begin
   if CurUninstallStep = usDone then
   begin
-  DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_32\HanvonTwain'), True, True, True);
   end;
  end;
 
diff --git a/win/setup/scanner/HuaGoScan_App_Setup.iss b/win/setup/scanner/HuaGoScan_App_Setup.iss
index 2bb6b13..9b99beb 100644
--- a/win/setup/scanner/HuaGoScan_App_Setup.iss
+++ b/win/setup/scanner/HuaGoScan_App_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\huagao
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
@@ -266,7 +266,8 @@ procedure CurUninstallStepChanged(CurUninstallStep:TUninstallStep);
 begin
   if CurUninstallStep = usDone then
   begin
-  DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_32\HuaGoTwain'), True, True, True);
   end;
  end;
 
diff --git a/win/setup/scanner/LanxumScan_App_Setup.iss b/win/setup/scanner/LanxumScan_App_Setup.iss
index c2c0276..6cc5c5c 100644
--- a/win/setup/scanner/LanxumScan_App_Setup.iss
+++ b/win/setup/scanner/LanxumScan_App_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\lanxum
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
@@ -213,7 +213,8 @@ procedure CurUninstallStepChanged(CurUninstallStep:TUninstallStep);
 begin
   if CurUninstallStep = usDone then
   begin
-  DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{app}'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_32\LanxumTwain'), True, True, True);
   end;
  end;
 
diff --git a/win/setup/webscan/HanvonWebScan_Setup.iss b/win/setup/webscan/HanvonWebScan_Setup.iss
index e1d86e8..b5811ec 100644
--- a/win/setup/webscan/HanvonWebScan_Setup.iss
+++ b/win/setup/webscan/HanvonWebScan_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\hanvon
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
diff --git a/win/setup/webscan/HuaGoWebScan_Setup.iss b/win/setup/webscan/HuaGoWebScan_Setup.iss
index 19e6bf6..9bc1402 100644
--- a/win/setup/webscan/HuaGoWebScan_Setup.iss
+++ b/win/setup/webscan/HuaGoWebScan_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\huagao
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
diff --git a/win/setup/webscan/LanxumWebScan_Setup.iss b/win/setup/webscan/LanxumWebScan_Setup.iss
index ed1be63..e54b8a3 100644
--- a/win/setup/webscan/LanxumWebScan_Setup.iss
+++ b/win/setup/webscan/LanxumWebScan_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\lanxum
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
diff --git a/win/setup/webservice/HanvonWebSdk_Setup.iss b/win/setup/webservice/HanvonWebSdk_Setup.iss
index a27f701..e0a146c 100644
--- a/win/setup/webservice/HanvonWebSdk_Setup.iss
+++ b/win/setup/webservice/HanvonWebSdk_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\hanvon
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
diff --git a/win/setup/webservice/HuaGoWebSdk_Setup.iss b/win/setup/webservice/HuaGoWebSdk_Setup.iss
index deca442..0dd965f 100644
--- a/win/setup/webservice/HuaGoWebSdk_Setup.iss
+++ b/win/setup/webservice/HuaGoWebSdk_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\huagao
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}
diff --git a/win/setup/webservice/LanxumWebSdk_Setup.iss b/win/setup/webservice/LanxumWebSdk_Setup.iss
index af3b649..511a74f 100644
--- a/win/setup/webservice/LanxumWebSdk_Setup.iss
+++ b/win/setup/webservice/LanxumWebSdk_Setup.iss
@@ -17,7 +17,7 @@ AppVersion={#MyAppVersion}
 DefaultDirName={pf}\{#MyAppDefSetupDir}
 DefaultGroupName={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
-OutputDir=..\..\package\lanxum
+OutputDir=..\..\package
 OutputBaseFilename={#MyAppSetupName}_{#MyAppVersion}
 Compression=lzma
 AppPublisher={#MyAppPublisher}