v4.26; modify hgsetver.exe
This commit is contained in:
parent
779d2552db
commit
f40484650d
|
@ -51,8 +51,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 4,25,10000,22259
|
FILEVERSION 4,26,10000,22264
|
||||||
PRODUCTVERSION 4,25,10000,22259
|
PRODUCTVERSION 4,26,10000,22264
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -69,12 +69,12 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "宁波华高信息科技有限公司"
|
VALUE "CompanyName", "宁波华高信息科技有限公司"
|
||||||
VALUE "FileDescription", "华高扫描仪应用程序"
|
VALUE "FileDescription", "华高扫描仪应用程序"
|
||||||
VALUE "FileVersion", "4.25.10000.22259"
|
VALUE "FileVersion", "4.26.10000.22264"
|
||||||
VALUE "InternalName", "scanner.dll"
|
VALUE "InternalName", "scanner.dll"
|
||||||
VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022"
|
VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022"
|
||||||
VALUE "OriginalFilename", "scanner.dll"
|
VALUE "OriginalFilename", "scanner.dll"
|
||||||
VALUE "ProductName", "HUAGOScan"
|
VALUE "ProductName", "HUAGOScan"
|
||||||
VALUE "ProductVersion", "4.25.10000.22259"
|
VALUE "ProductVersion", "4.26.10000.22264"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
15
sane/sane.rc
15
sane/sane.rc
|
@ -248,8 +248,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 4,27,10000,22263
|
FILEVERSION 4,26,10000,22264
|
||||||
PRODUCTVERSION 4,27,10000,22263
|
PRODUCTVERSION 4,26,10000,22264
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -264,13 +264,14 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
BLOCK "080404b0"
|
BLOCK "080404b0"
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "FileDescription", "扫描仪应用程序"
|
VALUE "CompanyName", "宁波华高信息科技有限公司"
|
||||||
VALUE "FileVersion", "4.27.10000.22263"
|
VALUE "FileDescription", "华高扫描仪应用程序"
|
||||||
|
VALUE "FileVersion", "4.26.10000.22264"
|
||||||
VALUE "InternalName", "sane.dll"
|
VALUE "InternalName", "sane.dll"
|
||||||
VALUE "LegalCopyright", "Copyright (C) Scan 2022"
|
VALUE "LegalCopyright", "Copyright (C) HUAGOScan 2022"
|
||||||
VALUE "OriginalFilename", "sane.dll"
|
VALUE "OriginalFilename", "sane.dll"
|
||||||
VALUE "ProductName", "Scan"
|
VALUE "ProductName", "HUAGOScan"
|
||||||
VALUE "ProductVersion", "4.27.10000.22263"
|
VALUE "ProductVersion", "4.26.10000.22264"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Binary file not shown.
|
@ -486,6 +486,7 @@ namespace rc
|
||||||
}
|
}
|
||||||
|
|
||||||
bool found = false, is_oem = false;
|
bool found = false, is_oem = false;
|
||||||
|
std::vector<bool> embed;
|
||||||
bgn = end = 0;
|
bgn = end = 0;
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
|
@ -520,20 +521,24 @@ namespace rc
|
||||||
cont.erase(0, bgn);
|
cont.erase(0, bgn);
|
||||||
// end -= bgn;
|
// end -= bgn;
|
||||||
bgn = 0;
|
bgn = 0;
|
||||||
|
embed.push_back(true);
|
||||||
}
|
}
|
||||||
else if (!is_oem)
|
else // if (!is_oem)
|
||||||
{
|
{
|
||||||
is_oem = from_str(line.c_str()) != OEM_NOT;
|
is_oem = from_str(line.c_str()) != OEM_NOT;
|
||||||
|
embed.push_back(is_oem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (line.find(L"#el") == 0)
|
else if (line.find(L"#el") == 0)
|
||||||
{
|
{
|
||||||
if (found)
|
if (found && embed.size() && embed[embed.size() - 1])
|
||||||
{
|
{
|
||||||
cont.erase(bgn + end);
|
cont.erase(bgn + end);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (line.find(L"#elif ") == 0)
|
else if (line.find(L"#elif ") == 0)
|
||||||
|
{
|
||||||
|
if (embed.size() && embed[embed.size() - 1])
|
||||||
{
|
{
|
||||||
line.erase(0, lstrlenW(L"elif "));
|
line.erase(0, lstrlenW(L"elif "));
|
||||||
trim_left(line);
|
trim_left(line);
|
||||||
|
@ -552,17 +557,19 @@ namespace rc
|
||||||
// end -= bgn;
|
// end -= bgn;
|
||||||
bgn = 0;
|
bgn = 0;
|
||||||
}
|
}
|
||||||
else if (!is_oem)
|
//else // if (!is_oem)
|
||||||
{
|
//{
|
||||||
is_oem = from_str(line.c_str()) != OEM_NOT;
|
// is_oem = from_str(line.c_str()) != OEM_NOT;
|
||||||
|
// embed.push_back(is_oem);
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (line.find(L"#else") == 0)
|
else if (line.find(L"#else") == 0)
|
||||||
{
|
{
|
||||||
found = is_oem;
|
if (embed.size() && embed[embed.size() - 1])
|
||||||
if (found)
|
|
||||||
{
|
{
|
||||||
|
found = true;
|
||||||
cont.erase(0, bgn);
|
cont.erase(0, bgn);
|
||||||
// end -= bgn;
|
// end -= bgn;
|
||||||
bgn = 0;
|
bgn = 0;
|
||||||
|
@ -571,7 +578,9 @@ namespace rc
|
||||||
}
|
}
|
||||||
else if (line.find(L"#endif") == 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);
|
cont.erase(bgn + end);
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue