From f40484650d6419244b8307d7f0c12097c88a00a2 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Wed, 21 Sep 2022 10:27:21 +0800 Subject: [PATCH] v4.26; modify hgsetver.exe --- device/scanner.rc | 8 +++--- sane/sane.rc | 15 ++++++----- sln/Release/hgsetver.exe | Bin 94208 -> 96768 bytes sln/hgsetver/hgsetver.cpp | 55 ++++++++++++++++++++++---------------- 4 files changed, 44 insertions(+), 34 deletions(-) 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 115280b4f87960be9b49a64f7db4db3eae28717a..c4d7c6ea620effad53bcef364cc69669e98239a9 100644 GIT binary patch delta 24817 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 delta 22323 zcmeIac~n%#_V;~GfeOl`GAhU*Dk@;lb3>z|IA9tF#2M!faXNg8;9inhV{JbUGG0{uT_5PRPEZe zYu9v6or5_|?Q$C0m3#4F_y7H12Iu%SaD?x~djxU6B4M>Xagdct_+a9nEi;#t!(rbE{RqK$ok+ucOWZUxJ>)}njP zwrfDNp@!aU*EjG!bJJ~H&)LcTwZ0(;v>;kuLqpqlRVqy-cd1$iE3q)=yY|70Z89$T#)i5np?qwsW~e?$yz+T+%vK zPK@I$@l8f+#&>kM>)yUip>Z6mNcfF2H|93FSrVJ9U$(Zknl?h#e8On``%R9kr6XOV zNK+^s(NRmHnrME9gZS(810>!SIYpgvGIa1jLmDE_fte_j+0=-OOxVk^b^ZL4dPhdeF zt#r#I@7K}+?&6MpYdOxTb-Z;}ElqPD6?x?XtHjylLO9N{&I<7~&S-6_hjL3HEV682 zX}Q&I)@~*Aw)-+N^8%gX5lciD=zAVLLL0UiV8xsQ=TT<&&0g@+wZd;}4)jFxy!=a87;4!J)2!3?K-7tUc75eTI={1oUrb9oE6IV0^qbB@$opq$XqRq5 zhOu5fme%N(L=)lrRU}pxDCDMmo)lJ zd?VMI*_dR$Y;DY@UA&bf^Rz?5WPTw%=6$8VxZ2*&Bg4bZXQoY^B(1gHIAu5YWlJwM z(Mq2&J_|UmAhX3WrY(uroSs@&FQ6g50VMYb)%r#g=`#A7??m$GBrUA;qorRv`@Vhh zMSU2cXm_s%wAptkKc5=>r1&?(PZ~H6u1u`F=VVU2W{SjwN#oka;=6O{DZdfq=_2ao zuOdrN(Bb~0N!SVcp8r@rjsE68mW*3ThXsW2uhO&tG3i-Fw*~a@yEPxxvVN~ewU@a<5b%1>BzYpSI$qHY91Lr7Cz8@VYk^nu#Q|qY3nd% z;n?sHsEI+eO{D~Jl$yL@aJb*JsVK{RQL(DKH$QUDOB!z;dr70w4;pQ0&our6(IYY> zLi?A9zofDBSjBgNGJfQ&mo!d3`jW;i|9?ty8nJ;N{ zJMxmo5PxV4z;fnjwFjbY8VTYrX{#98SX&36=J0ROUr7C%}d0d_6pbJLpYIGi^wZ*%=XK)@fl*?^(K|y5B$<-yf zW_YpdcwC>twJ{{qY2dx@o+VkFjmB0Vm(CbjiKVEefKTgca>H1$B$iowrZR(aIM2K{ znc6nfXkoYyx!w7%rd&p^+fDhuH6h1tg0CsxVZzF3Q29A?Gpu;)MJogcbrC#dy8p~W zn*U%{um7iJSy=sc%X~~t4$Cf2WtOpihh_9-%Y54U?�YEVFq1)nQp!R_qR&Q}}=B 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%0A)*!Ju8w!J#0XWzJI0zYO7ngL06> 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 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;