调整64位下 ,状态不正确的问题

This commit is contained in:
13038267101 2023-05-11 14:25:09 +08:00
parent 49dc3a690e
commit a295285040
4 changed files with 6 additions and 7 deletions

View File

@ -118,8 +118,7 @@
</IgnoreAllDefaultLibraries>
</Link>
<PostBuildEvent>
<Command>
</Command>
<Command>copy "$(TargetPath)" C:\Windows\twain_32\HuagoTwain\ /Y </Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

View File

@ -118,8 +118,7 @@
</AdditionalManifestDependencies>
</Link>
<PostBuildEvent>
<Command>
</Command>
<Command>copy "$(TargetPath)" C:\Windows\twain_32\HuagoTwain\$(TargetName) /y</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

View File

@ -2904,11 +2904,11 @@ COM_API_IMPLEMENT(scanner, bool, ui_show_main(HWND parent))
COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bool indicator))
{
is_show_ui_ = with_scan;
events_.clear();
if (callback::show_setting_ui)
{
if (with_scan)
{
events_.clear();
images_.clear();
scan_msg_ = "OK";
scan_err_ = false;

View File

@ -3456,8 +3456,8 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
//notifyCloseOk();
//break;
case SANE_EVENT_UI_CLOSE_SETTING:
notifyCloseCancel();
if (ev == SANE_EVENT_UI_CLOSE_SETTING)
rc = notifyCloseCancel();
if (!Twpp::success(rc))
{
rc = notifyXferReady(); // 好分数需要再通知 FAINT :( - modified on 2022-10-20
if (!Twpp::success(rc))
@ -3466,6 +3466,7 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
swprintf_s(msg, _countof(msg) - 1, L"[%x]yscan: notifyXferReady failed after setting UI closed with error %d\r\n", GetCurrentThreadId(), rc);
load_sane_util::log_info(msg, 0);
}
rc = notifyCloseCancel();
}
break;
case SANE_EVENT_UI_SCAN_COMMAND: