diff --git a/device/scanner.rc b/device/scanner.rc index 742cc3e..46373d1 100644 --- a/device/scanner.rc +++ b/device/scanner.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,25,10000,22259 - PRODUCTVERSION 4,25,10000,22259 + FILEVERSION 4,26,10000,22264 + PRODUCTVERSION 4,26,10000,22264 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "宁波华高信息科技有限公司" VALUE "FileDescription", "华高扫描仪应用程序" - VALUE "FileVersion", "4.25.10000.22259" + VALUE "FileVersion", "4.26.10000.22264" VALUE "InternalName", "scanner.dll" VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022" VALUE "OriginalFilename", "scanner.dll" VALUE "ProductName", "HUAGOScan" - VALUE "ProductVersion", "4.25.10000.22259" + VALUE "ProductVersion", "4.26.10000.22264" END END BLOCK "VarFileInfo" diff --git a/sane/sane.rc b/sane/sane.rc index bc314ad..54c9c10 100644 --- a/sane/sane.rc +++ b/sane/sane.rc @@ -248,8 +248,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,27,10000,22263 - PRODUCTVERSION 4,27,10000,22263 + FILEVERSION 4,26,10000,22264 + PRODUCTVERSION 4,26,10000,22264 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -264,13 +264,14 @@ BEGIN BEGIN BLOCK "080404b0" BEGIN - VALUE "FileDescription", "扫描仪应用程序" - VALUE "FileVersion", "4.27.10000.22263" + VALUE "CompanyName", "宁波华高信息科技有限公司" + VALUE "FileDescription", "华高扫描仪应用程序" + VALUE "FileVersion", "4.26.10000.22264" VALUE "InternalName", "sane.dll" - VALUE "LegalCopyright", "Copyright (C) Scan 2022" + VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022" VALUE "OriginalFilename", "sane.dll" - VALUE "ProductName", "Scan" - VALUE "ProductVersion", "4.27.10000.22263" + VALUE "ProductName", "HUAGOScan" + VALUE "ProductVersion", "4.26.10000.22264" END END BLOCK "VarFileInfo" diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe index 115280b..c4d7c6e 100644 Binary files a/sln/Release/hgsetver.exe and b/sln/Release/hgsetver.exe differ diff --git a/sln/hgsetver/hgsetver.cpp b/sln/hgsetver/hgsetver.cpp index 7028018..557031b 100644 --- a/sln/hgsetver/hgsetver.cpp +++ b/sln/hgsetver/hgsetver.cpp @@ -486,6 +486,7 @@ namespace rc } bool found = false, is_oem = false; + std::vector embed; bgn = end = 0; do { @@ -520,58 +521,66 @@ namespace rc cont.erase(0, bgn); // end -= bgn; bgn = 0; + embed.push_back(true); } - else if (!is_oem) + else // if (!is_oem) { is_oem = from_str(line.c_str()) != OEM_NOT; + embed.push_back(is_oem); } } else if (line.find(L"#el") == 0) { - if (found) + if (found && embed.size() && embed[embed.size() - 1]) { cont.erase(bgn + end); break; } else if (line.find(L"#elif ") == 0) { - line.erase(0, lstrlenW(L"elif ")); - trim_left(line); - if (line.find(L"defined(") == 0) + if (embed.size() && embed[embed.size() - 1]) { - line.erase(0, lstrlenW(L"defined(")); + line.erase(0, lstrlenW(L"elif ")); trim_left(line); + if (line.find(L"defined(") == 0) + { + line.erase(0, lstrlenW(L"defined(")); + trim_left(line); - size_t pos = line.find(L")"); - if (pos != std::wstring::npos) - line.erase(pos); - if (line == oem_str(o)) - { - found = true; - cont.erase(0, bgn); - // end -= bgn; - bgn = 0; - } - else if (!is_oem) - { - is_oem = from_str(line.c_str()) != OEM_NOT; + size_t pos = line.find(L")"); + if (pos != std::wstring::npos) + line.erase(pos); + if (line == oem_str(o)) + { + found = true; + cont.erase(0, bgn); + // end -= bgn; + bgn = 0; + } + //else // if (!is_oem) + //{ + // is_oem = from_str(line.c_str()) != OEM_NOT; + // embed.push_back(is_oem); + //} } } } else if (line.find(L"#else") == 0) { - found = is_oem; - if (found) + if (embed.size() && embed[embed.size() - 1]) { + found = true; cont.erase(0, bgn); - // end -= bgn; + // end -= bgn; bgn = 0; } } } else if (line.find(L"#endif") == 0) { - if (found) + bool over = embed.size() ? embed[embed.size() - 1] : true; + embed.pop_back(); + if (found && over) { cont.erase(bgn + end); break;