diff --git a/win/setup/scanner/MicrotekScan_App_Setup.iss b/win/setup/scanner/MicrotekScan_App_Setup.iss index c453468..5d2cc1a 100644 --- a/win/setup/scanner/MicrotekScan_App_Setup.iss +++ b/win/setup/scanner/MicrotekScan_App_Setup.iss @@ -140,8 +140,8 @@ Source: "..\..\x64\OEM\microtek\lang.dll"; DestDir: "{app}\"; Flags: ignoreversi Source: "..\..\..\lang\*"; DestDir: "{app}\lang\"; Flags: ignoreversion; Check: Is64BitInstallMode ;¿½±´Çı¶¯ -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.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 @@ -295,4 +295,4 @@ Filename: "{app}\MicrotekScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppNa Filename: "{app}\MicrotekScan.exe"; Description: "{cm:LaunchProgram, {cm:MyAppName}}"; Parameters:"-language=chinese"; Flags: postinstall nowait skipifsilent; Languages: chinese_simp ;Filename: "{app}\MicrotekScan.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\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\Microtek_A3HG_scanner_usb.inf"" /q /d"; Check: IsWin64 \ No newline at end of file +[UninstallRun] ;Filename: "{app}\DPInst32"; Parameters: "/u ""{app}\driver\Microtek_A3_scanner_usb.inf"" /q /d"; Check: not IsWin64 ;Filename: "{app}\DPInst64"; Parameters: "/u ""{app}\driver\Microtek_A3_scanner_usb.inf"" /q /d"; Check: IsWin64 \ No newline at end of file diff --git a/win/setup/scannerlib/MicrotekScannerLib_Setup.iss b/win/setup/scannerlib/MicrotekScannerLib_Setup.iss index 413d210..773d471 100644 --- a/win/setup/scannerlib/MicrotekScannerLib_Setup.iss +++ b/win/setup/scannerlib/MicrotekScannerLib_Setup.iss @@ -102,8 +102,8 @@ Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\bin\x64\"; Flags: igno Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\bin\x64\"; Flags: ignoreversion; Check: IsWin64 ;¿½±´Çı¶¯ -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.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/setup/webservice/MicrotekWebSdk_Setup.iss b/win/setup/webservice/MicrotekWebSdk_Setup.iss index 17ec7d3..4b8fce4 100644 --- a/win/setup/webservice/MicrotekWebSdk_Setup.iss +++ b/win/setup/webservice/MicrotekWebSdk_Setup.iss @@ -101,8 +101,8 @@ Source: "..\..\x64\Release\tinyxml2.dll"; DestDir: "{app}\"; Flags: ignoreversio Source: "..\..\x64\Release\zlib.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode ;¿½±´Çı¶¯ -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; -Source: "..\..\usb\microtek\Microtek_A3HG_scanner_usb.cat"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.inf"; DestDir: "{app}\driver\"; Flags: ignoreversion recursesubdirs; +Source: "..\..\usb\microtek\Microtek_A3_scanner_usb.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/microtek/Microtek_A3HG_scanner_usb.cat b/win/usb/microtek/Microtek_A3HG_scanner_usb.cat deleted file mode 100644 index ccbd2f4..0000000 Binary files a/win/usb/microtek/Microtek_A3HG_scanner_usb.cat and /dev/null differ diff --git a/win/usb/microtek/Microtek_A3HG_scanner_usb.inf b/win/usb/microtek/Microtek_A3_scanner_usb.inf similarity index 60% rename from win/usb/microtek/Microtek_A3HG_scanner_usb.inf rename to win/usb/microtek/Microtek_A3_scanner_usb.inf index 7ac53a5..679b7bf 100644 --- a/win/usb/microtek/Microtek_A3HG_scanner_usb.inf +++ b/win/usb/microtek/Microtek_A3_scanner_usb.inf @@ -3,8 +3,8 @@ Signature="$CHICAGO$" Class=Image ClassGUID={6bdd1fc6-810f-11d0-bec7-08002be2092f} Provider=%IPC% -DriverVer=01/04/2023,1.1.0.0 -CatalogFile=Microtek_A3HG_scanner_usb.cat +DriverVer=07/17/2023,4.1.0.0 +CatalogFile=Microtek_A3_scanner_usb.cat [SourceDisksNames] 1=%DisksName%,,, @@ -17,52 +17,28 @@ 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" [Manufacturer] %IPC%=Models,NTx86.5.1,NTia64,NTAMD64 -[Models] -%IPCProduct%=IPCProduct,USB\VID_05DA&PID_9220 - [Models.NTx86.5.1] -%IPCProduct%=IPCProduct_NT51,USB\VID_05DA&PID_9220 +%USB\VID_05DA&PID_9220.DeviceDesc%=IPCProduct_NT51,USB\VID_05DA&PID_9220 +%USB\VID_05DA&PID_9222.DeviceDesc%=IPCProduct_NT51,USB\VID_05DA&PID_9222 +%USB\VID_05DA&PID_9223.DeviceDesc%=IPCProduct_NT51,USB\VID_05DA&PID_9223 + [Models.NTia64] -%IPCProduct%=IPCProduct_NTia64,USB\VID_05DA&PID_9220 +%USB\VID_05DA&PID_9220.DeviceDesc%=IPCProduct_NTia64,USB\VID_05DA&PID_9220 +%USB\VID_05DA&PID_9222.DeviceDesc%=IPCProduct_NTia64,USB\VID_05DA&PID_9222 +%USB\VID_05DA&PID_9223.DeviceDesc%=IPCProduct_NTia64,USB\VID_05DA&PID_9223 [Models.NTAMD64] -%IPCProduct%=IPCProduct_NTAMD64,USB\VID_05DA&PID_9220 - -[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 +%USB\VID_05DA&PID_9220.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_05DA&PID_9220 +%USB\VID_05DA&PID_9222.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_05DA&PID_9222 +%USB\VID_05DA&PID_9223.DeviceDesc%=IPCProduct_NTAMD64,USB\VID_05DA&PID_9223 [IPCProduct_NT51] -DriverVer=05/21/2009,3.0.0.0 +DriverVer=07/21/2022,3.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -74,7 +50,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTia64] -DriverVer=05/21/2009,3.0.0.0 +DriverVer=07/21/2022,3.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -86,7 +62,7 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" [IPCProduct_NTAMD64] -DriverVer=05/21/2009,3.0.0.0 +DriverVer=07/21/2022,3.1.0.0 Include=sti.inf Needs=STI.USBSection,STI.MICRODRIVERSection SubClass=StillImage @@ -98,7 +74,6 @@ Capabilities=0x31 ICMProfiles="sRGB Color Space Profile.icm" -[WinXPCopyFile] [IPCProduct_NT51.Services] Include=sti.inf @@ -112,9 +87,7 @@ Needs=STI.USBSection.Services Include=sti.inf Needs=STI.USBSection.Services -[IPCProduct.NT.CoInstallers] -AddReg=CoInstaller_AddReg -CopyFiles=CoInstaller_CopyFiles + [IPCProduct_NT51.CoInstallers] AddReg=CoInstaller_AddReg @@ -135,13 +108,11 @@ CopyFiles=CoInstaller_CopyFiles [CoInstaller_AddReg] -[InstallInfo] -OriginalInfSourcePath = %1% - [Strings] -IPC="Microtek A3HG S/F Scanner" -IPCProduct="Microtek A3HG S/F Scanner" -ServiceName="Microtek A3HG S/F Scanner" -TwainDSName="Microtek A3HG S/F Scanner" +IPC="MICROTEK INTERNATIONAL, INC" RunOnce="Software\Microsoft\windows\CurrentVersion\RunOnce" DisksName="USB Scanner CD-ROM" + +USB\VID_05DA&PID_9220.DeviceDesc="Microtek A3HG S/F Scanner" +USB\VID_05DA&PID_9222.DeviceDesc="Microtek A3ES Scanner" +USB\VID_05DA&PID_9223.DeviceDesc="Microtek A3FZ Scanner" diff --git a/win/usb/microtek/microtek_a3_scanner_usb.cat b/win/usb/microtek/microtek_a3_scanner_usb.cat new file mode 100644 index 0000000..54b3152 Binary files /dev/null and b/win/usb/microtek/microtek_a3_scanner_usb.cat differ