diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp index feef4b9..d8bf27c 100644 --- a/code/base/test_base.cpp +++ b/code/base/test_base.cpp @@ -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: