This commit is contained in:
parent
a09948b125
commit
9118a4a81d
|
@ -1435,19 +1435,24 @@ public:
|
||||||
wchar_t* sc = (wchar_t*)data;
|
wchar_t* sc = (wchar_t*)data;
|
||||||
std::string str;
|
std::string str;
|
||||||
size_t len = 0;
|
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)
|
if (ret == ERROR_INSUFFICIENT_BUFFER)
|
||||||
{
|
{
|
||||||
str.resize(len);
|
str.resize(len);
|
||||||
ret = wchar_to_char(str, sc, len);
|
ret = wchar_to_char(str, sc, &len);
|
||||||
}
|
}
|
||||||
if (str.empty())
|
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 -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:
|
private:
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue