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

修复文件传输日志错误；修复内存控制日志错误

This commit is contained in:
gb 2023-09-27 09:55:37 +08:00
parent 710809cad1
commit 8faee2ea33
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sane/scanner.cpp
View File

@ -84,13 +84,13 @@ namespace callback
}SCNINST; }SCNINST;
std::vector<SCNINST> g_scanner_instances; std::vector<SCNINST> g_scanner_instances;
int sane_event_callback( // 婵炲鍔岄崬浠嬪炊閻愬墎娈堕柣銊ュ椤曨喚鎸掗埥鍛闂傚洠鍋撻悷鏇氭缁绘氨鎷犳担绛嬪殙闁搞儳鍋犻惃鐔煎及椤栨凹妯嬬紒鎹愭硶閳昏偐鈧懓顦崣蹇涙儍? int sane_event_callback( // 憍萇<EFBFBD><EFBFBD>剝<EFBFBD>撗<EFBFBD>摒瘚惩洩<EFBFBD>𢠃鸘<EFBFBD>砍<EFBFBD>憡<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>伍<EFBFBD>璊斗𢂚<EFBFBD>𡁻纒<EFBFBD>堒䰻<EFBFBD>䝼<EFBFBD><EFBFBD>桅<EFBFBD><EFBFBD>𡁏<EFBFBD><EFBFBD>𧢲凃<EFBFBD>琿<EFBFBD>瘞叟猸蝻<EFBFBD><EFBFBD>瘞券繮<EFBFBD>單<EFBFBD>蝏𥕦洩畾䠷<EFBFBD><EFBFBD>𧼮<EFBFBD><EFBFBD>讠䪴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>𤾸<EFBFBD>璊斗礆<EFBFBD>孵旬戭祉<EFBFBD><EFBFBD>寞<EFBFBD>蝖園鯏<EFBFBD>誩<EFBFBD><EFBFBD>抆<EFBFBD><EFBFBD>㯄’<EFBFBD>𧼮提頩<EFBFBD><EFBFBD><EFBFBD>?
SANE_Handle hdev // 濞存籂鍛櫢濞存粌顑勫▎銏ゆ儍閸曨噮鍟庡璺烘搐瑜扮偤寮? SANE_Handle hdev // 濞存籂鍛櫢濞存粌顑勫▎銏ゆ儍閸曨噮鍟庡璺烘搐瑜扮偤寮?
, int code // 闁搞儳鍋犻惃鐔哥鐎ｂ晜顐藉ù鐙呯悼閻? , int code // 闁搞儳鍋犻惃鐔哥鐎ｂ晜顐藉ù鐙呯悼閻?
, void* data // 闁搞儳鍋犻惃鐔哥鐎ｂ晜顐介柡浣哄瀹撲線鏁嶇仦鍓у闁硅鍠曠花銊︾閺堥潧鏁╅柣顔荤劍濠€渚€骞嶉埀顒佺▔瀹ュ懏鍊遍柨娑樿嫰瀵剟鎮¤閸欐寧鎷呴幘鑼殤濞寸姾娉涢悾鐐▕? , void* data // <EFBFBD><EFBFBD><EFBFBD><EFBFBD>喲<EFBFBD><EFBFBD>餅<EFBFBD><EFBFBD>𥪜𢬢<EFBFBD>脤<EFBFBD>嚚<EFBFBD><EFBFBD>憿𣂷<EFBFBD><EFBFBD>⊥童<EFBFBD><EFBFBD>焩<EFBFBD>寞兞蝺𡁻<EFBFBD>撊<EFBFBD>誚<EFBFBD>暎<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㚚<EFBFBD><EFBFBD>㰘<EFBFBD><EFBFBD>𠺪蜀<EFBFBD>琿𤄄<EFBFBD>交膚<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>文<EFBFBD>瞈罱<EFBFBD>皜尠<EFBFBD>撉𧼮<EFBFBD><EFBFBD><EFBFBD>憿雴蝶<EFBFBD>𠉛<EFBFBD>嫘<EFBFBD><EFBFBD>誯<EFBFBD><EFBFBD>齿傦憡烐阮憳啁<EFBFBD>蛔<EFBFBD><EFBFBD>罸緤瞻<EFBFBD>脤鴡甈𣂼祐<EFBFBD>瑕㧥撟㗛鐤<EFBFBD><EFBFBD>恕瞈𧼮站憪曉<EFBFBD>瘨Ｘ<EFBFBD><EFBFBD>韮<EFBFBD><EFBFBD>?
, unsigned int* len // 闁轰胶澧楀畵渚€姊归崹顔碱唺闁挎稑鐗嗛悺褔鎳為崒锔剧闁挎稑鏈崹銊╂嚀閸楁仸ent_data闁汇劌瀚槐锕傚礃閹绘帒闅橀梻鈧崹顔碱唺闁挎稑鐭侀娑氱磼閸℃凹鍤為柣顏勵儑濞村鎯旈弮鍌涚暠濞存粌顑勫▎銏＄閿濆洨鍨? , unsigned int* len // <EFBFBD><EFBFBD>蔑<EFBFBD>嗆儒璆<EFBFBD><EFBFBD>菜<EFBFBD><EFBFBD>砍<EFBFBD>敶鍦晶憿𠉛２<EFBFBD>粹<EFBFBD><EFBFBD>𡒊<EFBFBD><EFBFBD>堒<EFBFBD><EFBFBD>箄<EFBFBD><EFBFBD>喟<EFBFBD>撏㘾<EFBFBD><EFBFBD>抆瀃<EFBFBD><EFBFBD><EFBFBD>蝔煾<EFBFBD><EFBFBD><EFBFBD>晶<EFBFBD>𪙛<EFBFBD><EFBFBD><EFBFBD><EFBFBD>豢<EFBFBD>隞粳nt_data<EFBFBD><EFBFBD><EFBFBD><EFBFBD>𣬚<EFBFBD>𡃓<EFBFBD>瑽鞾<EFBFBD><EFBFBD>𡁶<EFBFBD><EFBFBD>寧<EFBFBD>撣㘾<EFBFBD>璈<EFBFBD>璇駁ê<EFBFBD><EFBFBD>晶憿𠉛２<EFBFBD>粹<EFBFBD><EFBFBD>𡒊<EFBFBD><EFBFBD>凋<EFBFBD><EFBFBD>𡁜<EFBFBD>瘞梁ˉ<EFBFBD>詹<EFBFBD><EFBFBD>寥搇<EFBFBD>箸鰊憿誩䠀<EFBFBD>烐<EFBFBD><EFBFBD>㻇𨩙<EFBFBD>舀<EFBFBD>撘桅<EFBFBD>瘨𡁏<EFBFBD>瞈𧼮<EFBFBD>蝎屸<EFBFBD><EFBFBD>徉<EFBFBD><EFBFBD>𧶏<EFBFBD><EFBFBD>琿𪃭瞈<EFBFBD>捶<EFBFBD>?
, void* param // 闁活潿鍔嶉崺娑㈡嚊椤忓嫮鏆板☉鏂款槹閺嗙喖骞戦鍡欑濞戞挸姘﹂惃鐔兼偨閳虹棏ne_init_ex濞磋偐濮撮崣鍡涘籍閸撲焦鐣卞ǎ鍥ㄧ箖鐎垫梹绋夐埀顒勬嚊? , void* param // <EFBFBD><EFBFBD>暑瞏輸<EFBFBD>撊匧景憡㻫ǜ<EFBFBD>𦠜中敹枏垣<EFBFBD><EFBFBD>踎<EFBFBD>厰<EFBFBD>甈暹完<EFBFBD>箏<EFBFBD><EFBFBD>㚚<EFBFBD><EFBFBD>佇<EFBFBD><EFBFBD>⊥<EFBFBD><EFBFBD>格<EFBFBD><EFBFBD>墧袐憪矋<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>澆<EFBFBD><EFBFBD>唾葤璉萏e_init_ex瞈䂿<EFBFBD><EFBFBD>鞉耨<EFBFBD>桀提<EFBFBD>⊥<EFBFBD>蝐漤鴡<EFBFBD>脩<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>乓<EFBFBD>蝞㚚<EFBFBD><EFBFBD>急Ⅰ蝏见<EFBFBD><EFBFBD><EFBFBD>憿鍦𡠺<EFBFBD>?
) // 閺夆晜鏌ㄥú鏍磹闂傚璐╁☉鎾崇Т閹捇鎯冮崟顏嗙殤濞寸姵婀归崬顒勬儘娴ｈВ鍋撶仦鐣屾毎闁挎稑鐭傞埀顒佽壘閻栬埖绋夌悰鈾€鍋?闁? ) // <EFBFBD>箏<EFBFBD><EFBFBD>𣈯<EFBFBD><EFBFBD>永粹<EFBFBD><EFBFBD>䂿ㄨ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>剔<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>曉<EFBFBD>苠<EFBFBD>察<EFBFBD><EFBFBD><EFBFBD>㴓<EFBFBD>桀<EFBFBD>憿誩<EFBFBD>畾斗<EFBFBD>撖詨孝憍<EFBFBD>敶鍦摒憿鍦𡠺<EFBFBD>睃迄嚚<EFBFBD>㘾<EFBFBD><EFBFBD>嗡誚<EFBFBD><EFBFBD>掛瘥𡡞<EFBFBD><EFBFBD>𡒊<EFBFBD><EFBFBD>剖<EFBFBD><EFBFBD><EFBFBD>憿雴蝸憯㗛鸘<EFBFBD>砍<EFBFBD>蝏见<EFBFBD><EFBFBD>圈<EFBFBD><EFBFBD>祇<EFBFBD>?<3F>?
{ {
std::lock_guard<std::mutex> lock(cb_lock_); std::lock_guard<std::mutex> lock(cb_lock_);
std::vector<SCNINST>::iterator it = std::find(g_scanner_instances.begin(), g_scanner_instances.end(), hdev); std::vector<SCNINST>::iterator it = std::find(g_scanner_instances.begin(), g_scanner_instances.end(), hdev);
@ -207,10 +207,10 @@ namespace callback
, {SANE_STD_OPT_NAME_COLOR_CORRECTION , OPTION_TITLE_SPJZ} , {SANE_STD_OPT_NAME_COLOR_CORRECTION , OPTION_TITLE_SPJZ}
, {SANE_STD_OPT_NAME_DISCARDBLANK , OPTION_TITLE_TGKBY} , {SANE_STD_OPT_NAME_DISCARDBLANK , OPTION_TITLE_TGKBY}
}, },
g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // 濮掓稒鍨瑰▍褔宕堕幆褍鍓奸柛娆忕Х婢瑰﹥娼忛幘鍐叉瘔闁挎稑鐗婇婊呮暜閹间緡鏉归柤纭呭紦鐠愮喖鏁?-濮掓稒鍨兼竟濠囨晬?-闁谎冣偓鐔奉棌闁? g_discard[] = { {SANE_STD_OPT_NAME_REVERSE_01 , "\351\273\221\347\231\275\345\233\276\345\203\217\345\217\215\350\211\262\350\276\223\345\207\272\357\274\210\346\255\243\345\270\270\351\242\234\350\211\262\344\270\272\357\274\2320-\351\273\221\350\211\262\357\274\2331-\347\231\275\350\211\262\357\274\211"} // 瞈格<EFBFBD>蝔㘾崕<EFBFBD>售<EFBFBD>銴𥪜<EFBFBD><EFBFBD>訫<EFBFBD>銴漤<EFBFBD>憟豢<EFBFBD>憡<EFBFBD><EFBFBD>苭憍Ｙ麯儮亙釆敹𥕦<EFBFBD><EFBFBD>𣂼<EFBFBD><EFBFBD>娪<EFBFBD><EFBFBD>𡒊<EFBFBD><EFBFBD>堒<EFBFBD><EFBFBD>堒<EFBFBD><EFBFBD>格<EFBFBD><EFBFBD>寥𡢿蝺⊿<EFBFBD>敶埝鴂蝥剖麢蝝阡<EFBFBD><EFBFBD>桀<EFBFBD><EFBFBD>?-瞈格<E79E88>蝔㘾崕<E398BE>潛<EFBFBD>瞈惩𢂚<E683A9>?-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>𥪜<EFBFBD>璉屸<E79289>?
, {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // 闁诲繑婢樼€规娊骞嬮弽顓犳嫧闁谎嗘濞存﹢宕?- 闂傚嫨鍊涙竟? , {SANE_STD_OPT_NAME_FILTER , "\347\201\260\345\272\246\346\210\226\351\273\221\347\231\275\345\233\276\345\203\217 - \351\231\244\350\211\262"} // 闁诲繑婢樼€规娊骞嬮弽顓犳嫧闁谎嗘濞存﹢宕?- 闂傚嫨鍊涙竟?
, {SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH , "\350\207\252\345\212\250\346\220\223\347\272\270\345\274\272\345\272\246"} // 闁煎浜滄慨鈺呭箹閹惧墎鍓ㄧ€殿喖鎼€? , {SANE_STD_OPT_NAME_IS_AUTO_FEED_STRENGTH , "\350\207\252\345\212\250\346\220\223\347\272\270\345\274\272\345\272\246"} // 闁煎浜滄慨鈺呭箹閹惧墎鍓ㄧ€殿喖鎼€?
, {SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE , "\346\220\223\347\272\270\351\230\210\345\200\274"} // " 闁瑰吋鎸鹃悞濠囨⒓閸績鍋? , {SANE_STD_OPT_NAME_FEED_STRENGTH_VALUE , "\346\220\223\347\272\270\351\230\210\345\200\274"} // " <EFBFBD><EFBFBD>麯<EFBFBD>钅纒暽<EFBFBD><EFBFBD>瞈惩𢂚<EFBFBD>㯄鴡<EFBFBD><EFBFBD>蜀<EFBFBD>?
}; };
const char* option_title_2_name(const char* title) const char* option_title_2_name(const char* title)
{ {
@ -352,7 +352,7 @@ namespace callback
int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL; int (*show_progress_ui)(HWND parent, std::function<void(ui_result)> callback, std::function<void(int/*event*/, void*/*msg*/, int/*flag*/)>* notify) = NULL;
int (*show_messagebox_ui)(HWND parent, int event, void* msg, int flag) = NULL; int (*show_messagebox_ui)(HWND parent, int event, void* msg, int flag) = NULL;
int (*close_ui)(int) = NULL; int (*close_ui)(int) = NULL;
int (*apply_given_config)(const char* content, SANE_Handle device, LPSANEAPI api) = NULL; // 閹煎瓨姊婚弫銈夊箰閸パ呮毎闁汇劌瀚伴崢銈囩磾椤曞棛绀塩ontent濞戞挻妞介崢銈囩磾椤旇姤娈堕柟璇″枟缁? int (*apply_given_config)(const char* content, SANE_Handle device, LPSANEAPI api) = NULL; // <EFBFBD>寧<EFBFBD><EFBFBD>典<EFBFBD>憍𡁜憤<EFBFBD><EFBFBD><EFBFBD>蝞圈鴡<EFBFBD>穃䴴瘥𡡞<EFBFBD>瘙<EFBFBD><EFBFBD><EFBFBD>帋撈撏ａ<EFBFBD><EFBFBD>拍ˇ璊斗<EFBFBD>璉𤤿<EFBFBD>憛妯ntent瞈墧<EFBFBD><EFBFBD>餃<EFBFBD>隞见揣<EFBFBD><EFBFBD>䣐蝤暹中<EFBFBD><EFBFBD>坐憡<EFBFBD><EFBFBD><EFBFBD>毺<EFBFBD><EFBFBD>單<EFBFBD>蝻?
char* (*get_config_content)(const char* dev_name, const char* name) = NULL; char* (*get_config_content)(const char* dev_name, const char* name) = NULL;
void (*twain_ui_free)(void* buf) = NULL; void (*twain_ui_free)(void* buf) = NULL;
@ -1033,7 +1033,7 @@ int scanner::open(void)
{ {
if (callback::show_messagebox_ui) if (callback::show_messagebox_ui)
{ {
// 缂佺偓鐡曢悿鍡涘箹閹惧墎鍓ㄦ繛鍡忓墲閺嗙喎顔忛懠鍓佇㈤弶鈺佹穿椤旀洜鎷嬮垾鎻掆枏闁活潿鍔忕€垫牠宕舵潏鍓х闁规鍋呭鎸庢交閸モ斁鏌ゅ☉鎿冨幗閹紕鐥粙瑁や杭閻犳劑鍎埀顑跨劍椤掞綁寮┃搴撳亾娴ｈ鍋傚鑸佃壘缁卞墎绮垫径濠勭＝閻㈩垱鎮傞。璺衡枎閳ュ啿璁查柤铏灊缁变即寮版惔銏♀枖濠⒀呭仜椤﹀潡鏁嶅畝鍐惧殲婵炲鍔嶉崜浼村矗婵犲啯顦ф繛鎾虫噺绾俱儵濡存担姝屽珯闁艰鲸姊婚柈瀵告媼閹屾У濞撴碍绋戠花鏌ュ疮閸℃艾鏋犲☉鏃傚濞存盯骞戦姀銏㈠墾閺夌儐鍣槐? // 蝻<EFBFBD>蝶<EFBFBD>㯄𠴱<EFBFBD>Ｘ<EFBFBD><EFBFBD>⊥<EFBFBD>蝞寥䲮<EFBFBD>批<EFBFBD><EFBFBD>瓐<EFBFBD>蝜偦㨃敹枏３<EFBFBD>箏<EFBFBD><EFBFBD>𡡞<EFBFBD>敹𥟇<EFBFBD><EFBFBD>㮖<EFBFBD><EFBFBD>文撰<EFBFBD>箔蝴蝛踵中<EFBFBD><EFBFBD>瘣𣈯繮戭桀𤭮<EFBFBD>餅<EFBFBD><EFBFBD>誯<EFBFBD>瘣餅蝙<EFBFBD>𥪜<EFBFBD><EFBFBD>砍𠿭<EFBFBD>惩<EFBFBD><EFBFBD>菜<EFBFBD><EFBFBD>暎<EFBFBD>玏<EFBFBD><EFBFBD><EFBFBD><EFBFBD>㚚<EFBFBD><EFBFBD>叟竼<EFBFBD>詨滯鈭日鴡<EFBFBD>Ｘ<EFBFBD><EFBFBD>䎚<EFBFBD><EFBFBD>厰礶<EFBFBD>典<EFBFBD><EFBFBD>察<EFBFBD>蝝閖𨯫<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>剝鸘<EFBFBD>喳<EFBFBD><EFBFBD>舩<EFBFBD><EFBFBD><EFBFBD>憿𤏸楊<EFBFBD>齿中<EFBFBD>䂿<EFBFBD>撖殉<EFBFBD><EFBFBD><EFBFBD>鐦<EFBFBD>喃瑣憡湛<EFBFBD><EFBFBD>厰<EFBFBD><EFBFBD>𡃓𣳽<EFBFBD>訾<EFBFBD>憯条<EFBFBD><EFBFBD>𧼮<EFBFBD>蝏桀𠿭敺<EFBFBD><EFBFBD><EFBFBD>哨<EFBFBD><EFBFBD>颯⏚<EFBFBD>梢緤<EFBFBD>𠺶<EFBFBD><EFBFBD>冨銵⊥<EFBFBD><EFBFBD>喋<EFBFBD><EFBFBD>輻<EFBFBD><EFBFBD>交鴂<EFBFBD>𧵔<EFBFBD><EFBFBD>羓<EFBFBD><EFBFBD>睃朖撖桃<EFBFBD><EFBFBD>娪<EFBFBD><EFBFBD><EFBFBD><EFBFBD>𡝗<EFBFBD><EFBFBD><EFBFBD><EFBFBD>凋<EFBFBD>璊歹<EFBFBD>瞏⊿<EFBFBD>撊<EFBFBD><EFBFBD><EFBFBD>鞉<EFBFBD>畾脣延<EFBFBD>船嵰<EFBFBD>𥪜<EFBFBD>撏𨀣絳<EFBFBD>𤑳<EFBFBD>憍萇𤗈<EFBFBD>舫’<EFBFBD>蝜偦罇<EFBFBD>怠惣蝏曆膨<EFBFBD>菜縑摮䀹<EFBFBD>憪嘥掃<EFBFBD>舫<EFBFBD><EFBFBD>圈硫憪𠰴<EFBFBD><EFBFBD><EFBFBD><EFBFBD>萄<EFBFBD>慦潮䲮<EFBFBD><EFBFBD>掛苺瞈墧𣖕蝣滨<EFBFBD><EFBFBD>㰘<EFBFBD><EFBFBD>䎚<EFBFBD><EFBFBD>桅鴡<EFBFBD><EFBFBD>𪄳<EFBFBD>讠𤗈<EFBFBD>厰<EFBFBD><EFBFBD>𡃓焩瞈𧼮<EFBFBD><EFBFBD>舫<EFBFBD><EFBFBD>血<EFBFBD><EFBFBD>譌<EFBFBD>憓暸𤄄憭<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>瑽?
std::wstring roller_msgw(local_trans::lang_trans_between_hz936(L"\u7EB8\u8F6E\u6413\u7EB8\u6B21\u6570\u5DF2\u8D85\u8FC7\u8BBE\u8BA1\u4F7F\u7528\u8303\u56F4\uFF0C\u626B\u63CF\u8FC7\u7A0B\u4E2D\u6413\u7EB8\u5931\u8D25\u3001\u6B6A\u659C\u3001\u6413\u591A\u5F20\u7B49\u5F02\u5E38\u9891\u6B21\u53EF\u80FD\u4F1A\u660E\u663E\u589E\u591A\uFF0C\u8BF7\u6CE8\u610F\u53CA\u65F6\u6E05\u6D01\u3001\u5E76\u8054\u7CFB\u8BBE\u5907\u4F9B\u5E94\u5546\u8D2D\u4E70\u66FF\u6362\u7EB8\u8F6E\uFF01")); std::wstring roller_msgw(local_trans::lang_trans_between_hz936(L"\u7EB8\u8F6E\u6413\u7EB8\u6B21\u6570\u5DF2\u8D85\u8FC7\u8BBE\u8BA1\u4F7F\u7528\u8303\u56F4\uFF0C\u626B\u63CF\u8FC7\u7A0B\u4E2D\u6413\u7EB8\u5931\u8D25\u3001\u6B6A\u659C\u3001\u6413\u591A\u5F20\u7B49\u5F02\u5E38\u9891\u6B21\u53EF\u80FD\u4F1A\u660E\u663E\u589E\u591A\uFF0C\u8BF7\u6CE8\u610F\u53CA\u65F6\u6E05\u6D01\u3001\u5E76\u8054\u7CFB\u8BBE\u5907\u4F9B\u5E94\u5546\u8D2D\u4E70\u66FF\u6362\u7EB8\u8F6E\uFF01"));
std::string roller_msg(local_trans::u2a(roller_msgw.c_str(), CP_UTF8)); std::string roller_msg(local_trans::u2a(roller_msgw.c_str(), CP_UTF8));
app_wnd_ = callback::find_main_wnd(); app_wnd_ = callback::find_main_wnd();
@ -3545,7 +3545,11 @@ int scanner::handle_device_event(int ev_code, void* data, unsigned int* len)
cnt = images_.count(&bytes); cnt = images_.count(&bytes);
bytes /= 1024 * 1024; bytes /= 1024 * 1024;
if (times == 1) if (times == 1)
log_info(L"Memory usage upto limit! wait up to 100 ms ...\r\n", 1); {
wchar_t tips[128] = { 0 };
swprintf_s(tips, _countof(tips) - 1, L"Memory usage upto limit! wait up to %u ms ...\r\n", wait_fetch_);
log_info(tips, 1);
}
} }
images_.save(img, img->bytes()); images_.save(img, img->bytes());
} }
@ -3610,7 +3614,7 @@ int scanner::handle_device_event(int ev_code, void* data, unsigned int* len)
// { // {
// callback::show_messagebox_ui(app_wnd_, ev_code, (void*)data, 0); // callback::show_messagebox_ui(app_wnd_, ev_code, (void*)data, 0);
// } // }
// else if (*len) //闂佹寧鐟ㄩ銈咁嚕閻熸澘姣? // else if (*len) //<EFBFBD><EFBFBD>蝴撖折<EFBFBD><EFBFBD>拆<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>閖鸘<EFBFBD>豢<EFBFBD>憪?
// { // {
// std::wstring msg(local_trans::a2u((char*)data, CP_UTF8)); // std::wstring msg(local_trans::a2u((char*)data, CP_UTF8));
// if (!IsWindow(app_wnd_)) // if (!IsWindow(app_wnd_))

2
twain/twain/huagaods.cpp
View File

@ -1630,7 +1630,7 @@ Twpp::Result huagao_ds::imageFileXferGet(const Twpp::Identity& origin)
{ {
std::wstring info(load_sane_util::ansi2unic(m_fileXfer.filePath().string().c_str())); std::wstring info(load_sane_util::ansi2unic(m_fileXfer.filePath().string().c_str()));
wchar_t r[80] = { 0 }; wchar_t r[80] = { 0 };
swprintf_s(r, _countof(r) - 1, L": status = %d(Fail: 0x%x)\r\n", (int)ret.status(), cv_e); swprintf_s(r, _countof(r) - 1, L": status = %d(0x%x)\r\n", (CC)ret.status(), cv_e);
load_sane_util::log_info((info + r).c_str(), 1); load_sane_util::log_info((info + r).c_str(), 1);
} }
} }