diff --git a/win/setup/scanner/CumtennScan_App_Setup.iss b/win/setup/scanner/CumtennScan_App_Setup.iss index d57be0c..5c1d64c 100644 --- a/win/setup/scanner/CumtennScan_App_Setup.iss +++ b/win/setup/scanner/CumtennScan_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 "4.37.18100.23012" +#define MyAppVersion "4.37.18100.23013" #define MyAppSetupName "CumtennScan_App_Setup" #define MyAppDefSetupDir "CumtennScan" #define MyAppPublisher "浙江沧田智能信息科技有限公司" @@ -112,10 +112,8 @@ Source: "..\..\x64\OEM\cumtenn\cumtenntwain6005.ds"; DestDir: "{win}\twain_64\Cu Source: "..\..\x64\OEM\cumtenn\cumtenntwain6006.ds"; DestDir: "{win}\twain_64\CumtennTwain\"; Flags: ignoreversion; Components: TwainG6006; Check: Is64BitInstallMode ;拷贝驱动 -Source: "..\..\usb\cumtenn\cumtennctsa3.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\cumtenn\cumtennctsa3.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\cumtenn\cumtennctsa4.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\cumtenn\cumtennctsa4.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\cumtenn\ctsusbscan.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\cumtenn\ctsusbscan.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; Source: "..\..\x86\Release\DPInst32.exe"; DestDir: "{app}\"; Flags: ignoreversion recursesubdirs; Check: not IsWin64 Source: "..\..\x64\Release\DPInst64.exe"; DestDir: "{app}\"; Flags: ignoreversion recursesubdirs; Check: IsWin64 diff --git a/win/usb/cumtenn/ctsusbscan.cat b/win/usb/cumtenn/ctsusbscan.cat new file mode 100644 index 0000000..7e044d7 Binary files /dev/null and b/win/usb/cumtenn/ctsusbscan.cat differ diff --git a/win/usb/cumtenn/cumtennctsa3.inf b/win/usb/cumtenn/ctsusbscan.inf similarity index 79% rename from win/usb/cumtenn/cumtennctsa3.inf rename to win/usb/cumtenn/ctsusbscan.inf index 382d335..e7d2c39 100644 --- a/win/usb/cumtenn/cumtennctsa3.inf +++ b/win/usb/cumtenn/ctsusbscan.inf @@ -3,8 +3,8 @@ Signature="$CHICAGO$" Class=Image ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f} Provider=%IPC% -DriverVer=7/28/2021,1.1.0.0 -CatalogFile=cumtennctsa3.cat +DriverVer=09/19/2022,2.1.0.0 +CatalogFile=ctsusbscan.cat [SourceDisksNames] 1=%DisksName%,,, @@ -30,25 +30,20 @@ usbscan.sys,usbscan.sy_,,32 HKR,,DevLoader,,*NTKERN HKR,,NTMPDriver,,"usbscan.sys" -#[IPCProduct_Wia.AddReg] - - -#[IPCProduct.DeviceData.WIA] - [Manufacturer] %IPC%=Models,NTx86.5.1,NTia64,NTAMD64 -[Models] -%IPCProduct%=IPCProduct,USB\VID_3072&PID_0238 - [Models.NTx86.5.1] -%IPCProduct%=IPCProduct_NT51,USB\VID_3072&PID_0238 +%USB\VID_3308&PID_6006.DeviceDesc%=IPCProduct_NT51,USB\VID_3308&PID_6006 +%USB\VID_3308&PID_6005.DeviceDesc%=IPCProduct_NT51,USB\VID_3308&PID_6005 [Models.NTia64] -%IPCProduct%=IPCProduct_NTia64,USB\VID_3072&PID_0238 +%USB\VID_3308&PID_6006.DeviceDesc%=IPCProduct_NTia64,USB\VID_3308&PID_6006 +%USB\VID_3308&PID_6005.DeviceDesc%=IPCProduct_NTia64,USB\VID_3308&PID_6005 [Models.NTAMD64] -%IPCProduct%=IPCProduct_NTAMD64,USB\VID_3072&PID_0238 +%USB\VID_3308&PID_6006.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_3308&PID_6006 +%USB\VID_3308&PID_6005.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_3308&PID_6005 [IPCProduct] AddReg=IPCProduct.AddReg.9x,IPCProduct_UsbScan.AddReg @@ -144,9 +139,9 @@ CopyFiles=CoInstaller_CopyFiles OriginalInfSourcePath = %1% [Strings] -IPC="CUMTENN CTS A3 TWAIN" -IPCProduct="CUMTENN CTS A3 TWAIN" -ServiceName="CUMTENN CTS A3 TWAIN" -TwainDSName="CUMTENN CTS A3 TWAIN" +IPC="Cangtian Intelligent Information Technology Co., Ltd" RunOnce="Software\Microsoft\windows\CurrentVersion\RunOnce" DisksName="USB Scanner CD-ROM" + +USB\VID_3308&PID_6006.DeviceDesc="CUMTENN CTS-9020 TWAIN" +USB\VID_3308&PID_6005.DeviceDesc="CUMTENN CTS-4520 TWAIN" diff --git a/win/usb/cumtenn/cumtennctsa3.cat b/win/usb/cumtenn/cumtennctsa3.cat deleted file mode 100644 index 17e1690..0000000 Binary files a/win/usb/cumtenn/cumtennctsa3.cat and /dev/null differ diff --git a/win/usb/cumtenn/cumtennctsa4.cat b/win/usb/cumtenn/cumtennctsa4.cat deleted file mode 100644 index 00e8509..0000000 Binary files a/win/usb/cumtenn/cumtennctsa4.cat and /dev/null differ diff --git a/win/usb/cumtenn/cumtennctsa4.inf b/win/usb/cumtenn/cumtennctsa4.inf deleted file mode 100644 index ed445aa..0000000 --- a/win/usb/cumtenn/cumtennctsa4.inf +++ /dev/null @@ -1,152 +0,0 @@ -[Version] -Signature="$CHICAGO$" -Class=Image -ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f} -Provider=%IPC% -DriverVer=7/28/2021,1.1.0.0 -CatalogFile=cumtennctsa4.cat - -[SourceDisksNames] -1=%DisksName%,,, - -;[SourceDisksFiles] -;usbscan.sys=1 - -[DestinationDirs] -CopySetupFile=10 -CopyUsbScan=11 -DefaultDestDir=11 - -[CopyUsbScan] -usbscan.sys,usbscan.sy_,,32 - -[CopySetupFile] - -[IPCProduct.AddReg.9x] - -[IPCProduct.AddReg] - -[IPCProduct_UsbScan.AddReg] -HKR,,DevLoader,,*NTKERN -HKR,,NTMPDriver,,"usbscan.sys" - -#[IPCProduct_Wia.AddReg] - - -#[IPCProduct.DeviceData.WIA] - -[Manufacturer] -%IPC%=Models,NTx86.5.1,NTia64,NTAMD64 - -[Models] -%IPCProduct%=IPCProduct,USB\VID_3072&PID_0303 - -[Models.NTx86.5.1] -%IPCProduct%=IPCProduct_NT51,USB\VID_3072&PID_0303 - -[Models.NTia64] -%IPCProduct%=IPCProduct_NTia64,USB\VID_3072&PID_0303 - -[Models.NTAMD64] -%IPCProduct%=IPCProduct_NTAMD64,USB\VID_3072&PID_0303 - -[IPCProduct] -AddReg=IPCProduct.AddReg.9x,IPCProduct_UsbScan.AddReg -;Copyfiles=CopyUsbScan -Copyfiles=CopySetupFile,CopyUsbScan - -[IPCProduct.NT] -DriverVer=05/21/2009,3.0.0.0 -Include=sti.inf -Needs=STI.USBSection -AddReg=IPCProduct.AddReg,IPCProduct_UsbScan.AddReg -;Copyfiles=CopySetupFile - -[IPCProduct.NT.Services] -Include=sti.inf -Needs=STI.USBSection.Services - -[IPCProduct_NT51] -DriverVer=05/21/2009,3.0.0.0 -Include=sti.inf -Needs=STI.USBSection,STI.MICRODRIVERSection -SubClass=StillImage -DeviceType=1 -Capabilities=0x31 -;DeviceData=IPCProduct.DeviceData.WIA -;AddReg=IPCProduct.AddReg,IPCProduct_Wia.AddReg -;Copyfiles=WinXPCopyFile -ICMProfiles="sRGB Color Space Profile.icm" - -[IPCProduct_NTia64] -DriverVer=05/21/2009,3.0.0.0 -Include=sti.inf -Needs=STI.USBSection,STI.MICRODRIVERSection -SubClass=StillImage -DeviceType=1 -Capabilities=0x31 -;DeviceData=IPCProduct.DeviceData.WIA -;AddReg=IPCProduct.AddReg,IPCProduct_Wia.AddReg -;Copyfiles=WinXPCopyFile -ICMProfiles="sRGB Color Space Profile.icm" - -[IPCProduct_NTAMD64] -DriverVer=05/21/2009,3.0.0.0 -Include=sti.inf -Needs=STI.USBSection,STI.MICRODRIVERSection -SubClass=StillImage -DeviceType=1 -Capabilities=0x31 -;DeviceData=IPCProduct.DeviceData.WIA -;AddReg=IPCProduct.AddReg,IPCProduct_Wia.AddReg -;Copyfiles=WinXPCopyFile -ICMProfiles="sRGB Color Space Profile.icm" - - -[WinXPCopyFile] - -[IPCProduct_NT51.Services] -Include=sti.inf -Needs=STI.USBSection.Services - -[IPCProduct_NTia64.Services] -Include=sti.inf -Needs=STI.USBSection.Services - -[IPCProduct_NTAMD64.Services] -Include=sti.inf -Needs=STI.USBSection.Services - -[IPCProduct.NT.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles - -[IPCProduct_NT51.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles - -[IPCProduct_NTia64.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles - -[IPCProduct_NTAMD64.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles - - -[CoInstaller_CopyFiles] - - -[CoInstaller_AddReg] - - -[InstallInfo] -OriginalInfSourcePath = %1% - -[Strings] -IPC="CUMTENN CTS A4 TWAIN" -IPCProduct="CUMTENN CTS A4 TWAIN" -ServiceName="CUMTENN CTS A4 TWAIN" -TwainDSName="CUMTENN CTS A4 TWAIN" -RunOnce="Software\Microsoft\windows\CurrentVersion\RunOnce" -DisksName="USB Scanner CD-ROM"