lmh188
/
code_twain
mirror of http://192.168.10.5:8099/sane/code_twain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v4.17

This commit is contained in:
gb 2022-08-09 17:07:39 +08:00
parent 7ccc332a99
commit 2fb912efde
4 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
device/scanner.rc
View File

@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,16,10100,22218
PRODUCTVERSION 4,16,10100,22218
FILEVERSION 4,17,10100,22221
PRODUCTVERSION 4,17,10100,22221
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.16.10100.22218"
VALUE "FileVersion", "4.17.10100.22221"
VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 10100"
VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.16.10100.22218"
VALUE "ProductVersion", "4.17.10100.22221"
END
END
BLOCK "VarFileInfo"

24
device/win_usb/win_usb.cpp
View File

@ -127,6 +127,17 @@ ovl_cls* ovl_mgr::get_ovl(void)
usb_device::usb_device(const char* name) : ref_(1), name_(name ? name : ""), is_ok_(false)
, dev_desc_(NULL), handle_(NULL), online_(true), timout_ms_(1000)
{
size_t pos = name_.find("#{");
if (pos != std::string::npos)
{
HANDLE h = open_usb((name_.substr(0, pos) + "#{" + HG_SCANNER_GUID + "}").c_str());
if (h != INVALID_HANDLE_NAME)
{
CloseHandle(h);
name_ = name_.substr(0, pos) + "#{" + HG_SCANNER_GUID + "}";
}
}
bzero(&guid_, sizeof(guid_));
id_ = usb_device::vid_pid_from_name(name);
}
@ -149,6 +160,10 @@ HANDLE usb_device::find_pipe(UCHAR addr, int type, int* index)
return NULL;
}
HANDLE usb_device::open_usb(const char* usb_name)
{
return CreateFileA(usb_name, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
}
int usb_device::set_timeout(HANDLE h)
{
USBSCAN_TIMEOUT uto = { 0 };
@ -634,7 +649,8 @@ int usb_device::open(libusb_device_handle** dev_handle)
if (!dev_desc_)
init();
HANDLE h = CreateFileA(name_.c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
HANDLE h = open_usb(name_.c_str());
if (h == INVALID_HANDLE_VALUE)
{
*dev_handle = NULL;
@ -653,7 +669,7 @@ int usb_device::open(libusb_device_handle** dev_handle)
up.address = upc.PipeInfo[i].EndpointAddress;
up.type = upc.PipeInfo[i].PipeType;
sprintf_s(ind, _countof(ind) - 1, "\\%04d", i);
up.pipe = CreateFileA((name_ + ind).c_str(), GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
up.pipe = open_usb((name_ + ind).c_str());
if (up.pipe != INVALID_HANDLE_VALUE)
{
set_timeout(up.pipe);
@ -732,8 +748,8 @@ int usb_device::transfer_bulk(unsigned endpoint, unsigned char* data, int* lengt
{
if (WaitForSingleObject(oc->over_lapped()->hEvent, timeout) == WAIT_OBJECT_0)
{
GetOverlappedResult(h, oc->over_lapped(), oc->io_bytes(), FALSE);
*length = *oc->io_bytes();
GetOverlappedResult(h, oc->over_lapped(), oc->io_bytes(), FALSE);
*length = *oc->io_bytes();
ret = LIBUSB_SUCCESS;
}
else

1
device/win_usb/win_usb.h
View File

@ -86,6 +86,7 @@ class usb_device // consider as libusb_device
std::vector<USBPIPE> pipes_;
DWORD timout_ms_;
HANDLE find_pipe(UCHAR addr, int type, int *index = NULL);
HANDLE open_usb(const char* usb_name);
int set_timeout(HANDLE h);
public:

8
sane/sane.rc
View File

@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,16,10100,22218
PRODUCTVERSION 4,16,10100,22218
FILEVERSION 4,17,10100,22221
PRODUCTVERSION 4,17,10100,22221
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "宁波华高信息科技有限公司"
VALUE "FileDescription", "华高扫描仪应用程序"
VALUE "FileVersion", "4.16.10100.22218"
VALUE "FileVersion", "4.17.10100.22221"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 10100"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
VALUE "ProductVersion", "4.16.10100.22218"
VALUE "ProductVersion", "4.17.10100.22221"
END
END
BLOCK "VarFileInfo"