From 3728253810c1b435d1a2b9a93108540b5e318653 Mon Sep 17 00:00:00 2001 From: 13038267101 Date: Tue, 2 May 2023 15:37:30 +0800 Subject: [PATCH] =?UTF-8?q?show=5Fsetting=5Fui=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sane/scanner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 76bec83..837e5b7 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -343,7 +343,7 @@ namespace callback // SANE_EVENT_IMAGE_OK - void* unused, be NULL, flag - unused, be 0 int (*choose_scanner)(const std::vector& devs) = NULL; // blocked. return selected DEVQUE::id or -1 if user cancelled int (*apply_current_config)(const char* dev_name, SANE_Handle device, LPSANEAPI api) = NULL; // 应用设备的当前配置 - int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, bool with_scan) = NULL; + int (*show_setting_ui)(SANE_Handle device, HWND parent, LPSANEAPI api, const char* devname, bool with_scan) = NULL; int (*show_progress_ui)(HWND parent, std::function callback, std::function* notify) = NULL; //std::function ui_result_callback; @@ -2947,7 +2947,7 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bo // break; // } //}; - int res = callback::show_setting_ui(handle_, parent, &sane_api_, with_scan); + int res = callback::show_setting_ui(handle_, parent, &sane_api_, local_trans::u2a(scanner_name_.c_str(), CP_UTF8).c_str(),with_scan); if (res == ui_result::UI_RESULT_CLOSE_NORMAL) { int ev = SANE_EVENT_UI_CLOSE_NORMAL;