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

调整

This commit is contained in:
13038267101 2023-03-20 14:21:49 +08:00
parent a09948b125
commit 9118a4a81d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/base/test_base.cpp
View File

@ -1435,19 +1435,24 @@ public:
wchar_t* sc = (wchar_t*)data;
std::string str;
size_t len = 0;
int ret =wchar_to_char(str, sc, len);
int ret =wchar_to_char(str, sc, &len);
if (ret == ERROR_INSUFFICIENT_BUFFER)
{
str.resize(len);
ret = wchar_to_char(str, sc, len);
ret = wchar_to_char(str, sc, &len);
}
if (str.empty())
{
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVEB_GET_DEVICE_CONFIG_DEVS_MODEL, wstr.empty() ? (void*)L"设置设备类型失败" : (void*)wstr.c_str(), wstr.empty() ? false : true);
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)L"设置设备类型失败", false);
return -1;
}
return helper_->io_control(IO_CTRL_CODE_SET_DEVS_MODEL, &str[0], str.size());
unsigned int l = str.size();
ret = helper_->io_control(IO_CTRL_CODE_SET_DEVS_MODEL, &str[0], &l);
if (ret != SCANNER_ERR_OK)return ret;
helper_->test_callback(set_test_name_.c_str(), ui_helper::TEST_EVENT_RESULT, (void*)L"设置设备类型成功", false);
return ret;
}
private: