diff --git a/win/setup/scanner/CumtennScan2_App_Setup.iss b/win/setup/scanner/CumtennScan2_App_Setup.iss index 4acc613..607f5a0 100644 --- a/win/setup/scanner/CumtennScan2_App_Setup.iss +++ b/win/setup/scanner/CumtennScan2_App_Setup.iss @@ -1,7 +1,7 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "沧田扫描软件" -#define MyAppVersion GetFileVersion('..\..\x64\OEM\cumtenn\sane.dll') +#define MyAppVersion GetFileVersion('..\..\x64\OEM\cumtenn\sanexy.dll') #define MyAppSetupName "CumtennScan_App_Setup" #define MyAppDefSetupDir "CumtennScan" #define MyAppPublisher "浙江沧田智能信息科技有限公司" @@ -83,9 +83,9 @@ Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\VC++\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\x86\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: not Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: not Is64BitInstallMode ; app64 Source: "..\..\x64\Release\CTSTwainUI.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode @@ -123,17 +123,22 @@ Source: "..\..\x64\Release\PDFParse.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\VC++\*.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\cumtenn\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\cumtenn\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\cumtenn\lang.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\cumtenn\sanexy.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\cumtenn\scannerqd.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\cumtenn\yuyanbao.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode +;TWAINDSM +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: not Is64BitInstallMode +Source: "..\..\x86\Release\TWAINDSM.dll"; DestDir: "{syswow64}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode +Source: "..\..\x64\Release\TWAINDSM.dll"; DestDir: "{sys}\"; Flags: ignoreversion onlyifdoesntexist; Check: Is64BitInstallMode + ; twain32 Source: "..\..\x86\Release\CTSTwainUI.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\..\code_app\doc\scanner\CumtennScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\VC++\*.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\sane.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\scanner.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode -Source: "..\..\x86\OEM\cumtenn\lang.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\sanexy.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\scannerqd.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode +Source: "..\..\x86\OEM\cumtenn\yuyanbao.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\..\lang\*"; DestDir: "{win}\twain_32\CumtennTwain\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\CTSBase.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode Source: "..\..\x86\Release\CTSImgFmt.dll"; DestDir: "{win}\twain_32\CumtennTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode diff --git a/win/setup/scanner/LanxumScan2_App_Setup.iss b/win/setup/scanner/LanxumScan2_App_Setup.iss index bda93a5..849d85a 100644 --- a/win/setup/scanner/LanxumScan2_App_Setup.iss +++ b/win/setup/scanner/LanxumScan2_App_Setup.iss @@ -38,6 +38,7 @@ Name: "zn"; MessagesFile: "compiler:Languages/ChineseSimp.isl" Name: "TwainG42S"; Description: "LANXUMSCAN G42S TWAIN" ; Types: Full Name: "TwainG52S"; Description: "LANXUMSCAN G52S TWAIN" ; Types: Full Name: "TwainG62S"; Description: "LANXUMSCAN G62S TWAIN" ; Types: Full +Name: "TwainG63S"; Description: "LANXUMSCAN G63S TWAIN" ; Types: Full Name: "TwainG73S"; Description: "LANXUMSCAN G73S TWAIN" ; Types: Full [Files] @@ -151,13 +152,14 @@ Source: "..\..\x86\Release\tessdata\*"; DestDir: "{win}\twain_32\LanxumTwain\tes Source: "..\..\x86\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Components: TwainG42S; Source: "..\..\x86\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Components: TwainG52S; Source: "..\..\x86\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Components: TwainG62S; +Source: "..\..\x86\OEM\lanxum\lanxumtwain8630.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Components: TwainG63S; Source: "..\..\x86\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Components: TwainG73S; ; twain64 Source: "..\..\x64\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG42S; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG52S; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG62S; Check: Is64BitInstallMode -Source: "..\..\x64\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG73S; Check: Is64BitInstallMode +Source: "..\..\x64\OEM\lanxum\lanxumtwain8630.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG63S; Check: Is64BitInstallMode Source: "..\..\x64\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion; Components: TwainG73S; Check: Is64BitInstallMode ;拷贝驱动 Source: "..\..\usb\lanxum\lanxumusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; diff --git a/win/usb/lanxum/lanxumusb.cat b/win/usb/lanxum/lanxumusb.cat index 72b9bce..3cdd19c 100644 Binary files a/win/usb/lanxum/lanxumusb.cat and b/win/usb/lanxum/lanxumusb.cat differ diff --git a/win/usb/lanxum/lanxumusb.inf b/win/usb/lanxum/lanxumusb.inf index fbf173b..9c15ea2 100644 --- a/win/usb/lanxum/lanxumusb.inf +++ b/win/usb/lanxum/lanxumusb.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" Class=Image ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f} Provider=%IPC% -DriverVer=7/21/2022,3.1.0.1 +DriverVer=01/17/2024,4.1.0.1 CatalogFile=lanxumusb.cat [SourceDisksNames] @@ -43,6 +43,7 @@ HKR,,NTMPDriver,,"usbscan.sys" %USB\VID_31c9&PID_8429.DeviceDesc%=IPCProduct_NT51,USB\VID_31c9&PID_8429 %USB\VID_31c9&PID_8529.DeviceDesc%=IPCProduct_NT51,USB\VID_31c9&PID_8529 %USB\VID_31c9&PID_8629.DeviceDesc%=IPCProduct_NT51,USB\VID_31c9&PID_8629 +%USB\VID_31c9&PID_8630.DeviceDesc%=IPCProduct_NT51,USB\VID_31c9&PID_8630 %USB\VID_31c9&PID_8739.DeviceDesc%=IPCProduct_NT51,USB\VID_31c9&PID_8739 [Models.NTia64] @@ -55,6 +56,7 @@ HKR,,NTMPDriver,,"usbscan.sys" %USB\VID_31c9&PID_8429.DeviceDesc%=IPCProduct_NTia64,USB\VID_31c9&PID_8429 %USB\VID_31c9&PID_8529.DeviceDesc%=IPCProduct_NTia64,USB\VID_31c9&PID_8529 %USB\VID_31c9&PID_8629.DeviceDesc%=IPCProduct_NTia64,USB\VID_31c9&PID_8629 +%USB\VID_31c9&PID_8630.DeviceDesc%=IPCProduct_NTia64,USB\VID_31c9&PID_8630 %USB\VID_31c9&PID_8739.DeviceDesc%=IPCProduct_NTia64,USB\VID_31c9&PID_8739 [Models.NTAMD64] @@ -67,6 +69,7 @@ HKR,,NTMPDriver,,"usbscan.sys" %USB\VID_31c9&PID_8429.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_31c9&PID_8429 %USB\VID_31c9&PID_8529.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_31c9&PID_8529 %USB\VID_31c9&PID_8629.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_31c9&PID_8629 +%USB\VID_31c9&PID_8630.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_31c9&PID_8630 %USB\VID_31c9&PID_8739.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_31c9&PID_8739 [IPCProduct] @@ -75,7 +78,7 @@ AddReg=IPCProduct.AddReg.9x,IPCProduct_UsbScan.AddReg Copyfiles=CopySetupFile,CopyUsbScan [IPCProduct.NT] -DriverVer=07/21/2022,3.1.0.1 +DriverVer=01/17/2024,4.1.0.1 Include=sti.inf Needs=STI.USBSection AddReg=IPCProduct.AddReg,IPCProduct_UsbScan.AddReg @@ -86,7 +89,7 @@ Include=sti.inf Needs=STI.USBSection.Services [IPCProduct_NT51] -DriverVer=07/21/2022,3.1.0.1 +DriverVer=01/17/2024,4.1.0.1 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -98,7 +101,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTia64] -DriverVer=07/21/2022,3.1.0.1 +DriverVer=01/17/2024,4.1.0.1 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -110,7 +113,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTAMD64] -DriverVer=07/21/2022,3.1.0.1 +DriverVer=01/17/2024,4.1.0.1 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -176,4 +179,5 @@ USB\VID_31c9&PID_8730.DeviceDesc="LANXUMSCAN G73S TWAIN" USB\VID_31c9&PID_8429.DeviceDesc="LANXUMSCAN G42S TWAIN" USB\VID_31c9&PID_8529.DeviceDesc="LANXUMSCAN G52S TWAIN" USB\VID_31c9&PID_8629.DeviceDesc="LANXUMSCAN G62S TWAIN" +USB\VID_31c9&PID_8630.DeviceDesc="LANXUMSCAN G63S TWAIN" USB\VID_31c9&PID_8739.DeviceDesc="LANXUMSCAN G73S TWAIN"