调整64位下 ,状态不正确的问题
This commit is contained in:
parent
49dc3a690e
commit
a295285040
|
@ -118,8 +118,7 @@
|
||||||
</IgnoreAllDefaultLibraries>
|
</IgnoreAllDefaultLibraries>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>copy "$(TargetPath)" C:\Windows\twain_32\HuagoTwain\ /Y </Command>
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
|
|
@ -118,8 +118,7 @@
|
||||||
</AdditionalManifestDependencies>
|
</AdditionalManifestDependencies>
|
||||||
</Link>
|
</Link>
|
||||||
<PostBuildEvent>
|
<PostBuildEvent>
|
||||||
<Command>
|
<Command>copy "$(TargetPath)" C:\Windows\twain_32\HuagoTwain\$(TargetName) /y</Command>
|
||||||
</Command>
|
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
|
|
@ -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))
|
COM_API_IMPLEMENT(scanner, bool, ui_show_setting(HWND parent, bool with_scan, bool indicator))
|
||||||
{
|
{
|
||||||
is_show_ui_ = with_scan;
|
is_show_ui_ = with_scan;
|
||||||
|
events_.clear();
|
||||||
if (callback::show_setting_ui)
|
if (callback::show_setting_ui)
|
||||||
{
|
{
|
||||||
if (with_scan)
|
if (with_scan)
|
||||||
{
|
{
|
||||||
events_.clear();
|
|
||||||
images_.clear();
|
images_.clear();
|
||||||
scan_msg_ = "OK";
|
scan_msg_ = "OK";
|
||||||
scan_err_ = false;
|
scan_err_ = false;
|
||||||
|
|
|
@ -3456,8 +3456,8 @@ int huagao_ds::handle_scanner_event(int ev, bool from_event_proc)
|
||||||
//notifyCloseOk();
|
//notifyCloseOk();
|
||||||
//break;
|
//break;
|
||||||
case SANE_EVENT_UI_CLOSE_SETTING:
|
case SANE_EVENT_UI_CLOSE_SETTING:
|
||||||
notifyCloseCancel();
|
rc = notifyCloseCancel();
|
||||||
if (ev == SANE_EVENT_UI_CLOSE_SETTING)
|
if (!Twpp::success(rc))
|
||||||
{
|
{
|
||||||
rc = notifyXferReady(); // 好分数需要再通知 FAINT :( - modified on 2022-10-20
|
rc = notifyXferReady(); // 好分数需要再通知 FAINT :( - modified on 2022-10-20
|
||||||
if (!Twpp::success(rc))
|
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);
|
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);
|
load_sane_util::log_info(msg, 0);
|
||||||
}
|
}
|
||||||
|
rc = notifyCloseCancel();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case SANE_EVENT_UI_SCAN_COMMAND:
|
case SANE_EVENT_UI_SCAN_COMMAND:
|
||||||
|
|
Loading…
Reference in New Issue