diff --git a/win/setup/scanner/DeliScan2_App_Setup.iss b/win/setup/scanner/DeliScan2_App_Setup.iss index e74aa8f..ce59782 100644 --- a/win/setup/scanner/DeliScan2_App_Setup.iss +++ b/win/setup/scanner/DeliScan2_App_Setup.iss @@ -157,8 +157,7 @@ Source: "..\..\x64\OEM\deli\delitwain4015.ds"; DestDir: "{win}\twain_64\DeliTwai Source: "..\..\x64\OEM\deli\delitwain4019.ds"; DestDir: "{win}\twain_64\DeliTwain\"; Flags: ignoreversion; Components: TwainDL9000; Check: Is64BitInstallMode ;¿½±´Çı¶¯ -Source: "..\..\usb\deli\deliscannerusb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\deli\deliscannerusb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\deli\*.*"; 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/setup/scanner/HuaGoScan2_App_Setup.iss b/win/setup/scanner/HuaGoScan2_App_Setup.iss index e537fde..126e84f 100644 --- a/win/setup/scanner/HuaGoScan2_App_Setup.iss +++ b/win/setup/scanner/HuaGoScan2_App_Setup.iss @@ -186,8 +186,7 @@ Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_64\HuaGo Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG400; Check: Is64BitInstallMode ;¿½±´Çı¶¯ -Source: "..\..\usb\huagao\huagaousb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\huagao\huagaousb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\huagao\*.*"; 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 @@ -359,4 +358,4 @@ Filename: "{app}\HGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=S Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp ;Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese-trad"; Flags: postinstall nowait skipifsilent; Languages: chinese_trad -[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: IsWin64 \ No newline at end of file +[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\hgscannerusball.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\hgscannerusball.inf"" /q /d"; Check: IsWin64 \ No newline at end of file diff --git a/win/setup/scanner/HuaGoScan_App_Setup.iss b/win/setup/scanner/HuaGoScan_App_Setup.iss index e6a5e45..0f0860f 100644 --- a/win/setup/scanner/HuaGoScan_App_Setup.iss +++ b/win/setup/scanner/HuaGoScan_App_Setup.iss @@ -176,8 +176,7 @@ Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_64\HuaGo Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion; Components: TwainG400; Check: Is64BitInstallMode ;¿½±´Çı¶¯ -Source: "..\..\usb\huagao\huagaousb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\huagao\huagaousb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\huagao\*.*"; 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 @@ -349,4 +348,4 @@ Filename: "{app}\HGUpgradeApp.exe"; Parameters:"-type=postinstallinfo -appName=S Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp ;Filename: "{app}\HuaGoScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese-trad"; Flags: postinstall nowait skipifsilent; Languages: chinese_trad -[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\huagaousb.inf"" /q /d"; Check: IsWin64 \ No newline at end of file +[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\hgscannerusball.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\hgscannerusball.inf"" /q /d"; Check: IsWin64 \ No newline at end of file diff --git a/win/usb/deli/deliscannerusb.cat b/win/usb/deli/deliscannerusb.cat index a8e614a..c0ce11f 100644 Binary files a/win/usb/deli/deliscannerusb.cat and b/win/usb/deli/deliscannerusb.cat differ diff --git a/win/usb/deli/deliscannerusb.inf b/win/usb/deli/deliscannerusb.inf index d289ce4..5a2af15 100644 --- a/win/usb/deli/deliscannerusb.inf +++ b/win/usb/deli/deliscannerusb.inf @@ -3,7 +3,7 @@ Signature="$CHICAGO$" Class=Image ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f} Provider=%IPC% -DriverVer=7/10/2023,1.0.0.0 +DriverVer=08/18/2023,1.1.0.1 CatalogFile=deliscannerusb.cat [SourceDisksNames] @@ -35,51 +35,18 @@ HKR,,NTMPDriver,,"usbscan.sys" [Models.NTx86.5.1] %USB\VID_300E&PID_401C.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401C -%USB\VID_300E&PID_401D.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401D -%USB\VID_300E&PID_401E.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401E -%USB\VID_300E&PID_401F.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401F -%USB\VID_300E&PID_4020.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4020 -%USB\VID_300E&PID_4021.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4021 -%USB\VID_300E&PID_4022.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4022 %USB\VID_300E&PID_4015.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4015 -%USB\VID_300E&PID_4016.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4016 -%USB\VID_300E&PID_4017.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4017 -%USB\VID_300E&PID_4018.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4018 %USB\VID_300E&PID_4019.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_4019 -%USB\VID_300E&PID_401A.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401A -%USB\VID_300E&PID_401B.DeviceDesc%=IPCProduct_NT51,USB\VID_300E&PID_401B [Models.NTia64] %USB\VID_300E&PID_401C.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401C -%USB\VID_300E&PID_401D.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401D -%USB\VID_300E&PID_401E.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401E -%USB\VID_300E&PID_401F.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401F -%USB\VID_300E&PID_4020.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4020 -%USB\VID_300E&PID_4021.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4021 -%USB\VID_300E&PID_4022.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4022 %USB\VID_300E&PID_4015.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4015 -%USB\VID_300E&PID_4016.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4016 -%USB\VID_300E&PID_4017.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4017 -%USB\VID_300E&PID_4018.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4018 %USB\VID_300E&PID_4019.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_4019 -%USB\VID_300E&PID_401A.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401A -%USB\VID_300E&PID_401B.DeviceDesc%=IPCProduct_NTia64,USB\VID_300E&PID_401B [Models.NTAMD64] %USB\VID_300E&PID_401C.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401C -%USB\VID_300E&PID_401D.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401D -%USB\VID_300E&PID_401E.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401E -%USB\VID_300E&PID_401F.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401F -%USB\VID_300E&PID_4020.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4020 -%USB\VID_300E&PID_4021.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4021 -%USB\VID_300E&PID_4022.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4022 %USB\VID_300E&PID_4015.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4015 -%USB\VID_300E&PID_4016.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4016 -%USB\VID_300E&PID_4017.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4017 -%USB\VID_300E&PID_4018.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4018 %USB\VID_300E&PID_4019.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_4019 -%USB\VID_300E&PID_401A.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401A -%USB\VID_300E&PID_401B.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_300E&PID_401B [IPCProduct] AddReg=IPCProduct.AddReg.9x,IPCProduct_UsbScan.AddReg @@ -87,7 +54,7 @@ AddReg=IPCProduct.AddReg.9x,IPCProduct_UsbScan.AddReg Copyfiles=CopySetupFile,CopyUsbScan [IPCProduct.NT] -DriverVer=07/10/2023,1.0.0.0 +DriverVer=08/18/2023,1.1.0.0 Include=sti.inf Needs=STI.USBSection AddReg=IPCProduct.AddReg,IPCProduct_UsbScan.AddReg @@ -98,7 +65,7 @@ Include=sti.inf Needs=STI.USBSection.Services [IPCProduct_NT51] -DriverVer=07/10/2023,1.0.0.0 +DriverVer=08/18/2023,1.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -110,7 +77,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTia64] -DriverVer=07/10/2023,1.0.0.0 +DriverVer=08/18/2023,1.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -122,7 +89,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTAMD64] -DriverVer=07/10/2023,1.0.0.0 +DriverVer=08/18/2023,1.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -180,16 +147,5 @@ RunOnce="Software\Microsoft\windows\CurrentVersion\RunOnce" DisksName="Deli USB Scanner CD-ROM" USB\VID_300E&PID_401C.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_401D.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_401E.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_401F.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_4020.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_4021.DeviceDesc="DELI SCAN S3000 TWAIN" -USB\VID_300E&PID_4022.DeviceDesc="DELI SCAN S3000 TWAIN" USB\VID_300E&PID_4015.DeviceDesc="DELI SCAN S2000 TWAIN" -USB\VID_300E&PID_4016.DeviceDesc="DELI SCAN S2000 TWAIN" -USB\VID_300E&PID_4017.DeviceDesc="DELI SCAN S2000 TWAIN" -USB\VID_300E&PID_4018.DeviceDesc="DELI SCAN S2000 TWAIN" USB\VID_300E&PID_4019.DeviceDesc="DELI SCAN DL9000 TWAIN" -USB\VID_300E&PID_401A.DeviceDesc="DELI SCAN DL9000 TWAIN" -USB\VID_300E&PID_401B.DeviceDesc="DELI SCAN DL9000 TWAIN" diff --git a/win/usb/deli/usbscan.sys b/win/usb/deli/usbscan.sys new file mode 100644 index 0000000..8617053 Binary files /dev/null and b/win/usb/deli/usbscan.sys differ diff --git a/win/usb/huagao/huagaousb.cat b/win/usb/huagao/hgscannerusball.cat similarity index 100% rename from win/usb/huagao/huagaousb.cat rename to win/usb/huagao/hgscannerusball.cat diff --git a/win/usb/huagao/huagaousb.inf b/win/usb/huagao/hgscannerusball.inf similarity index 100% rename from win/usb/huagao/huagaousb.inf rename to win/usb/huagao/hgscannerusball.inf