Skip to content

Commit

Permalink
Merge branch 'lazyhamster:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
BestiaPL authored May 11, 2023
2 parents 8b387ad + 37d332d commit 24af787
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions source/IntChecker2-Far3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1254,8 +1254,7 @@ static void RunVerifySignatures(Far3Panel &panel)
}

std::vector<PanelFileInfo> filesToVerify;
bool allOk = true;


FarAdvControl(ACTL_SETPROGRESSSTATE, TBPS_INDETERMINATE, NULL);

// Prepare files list
Expand All @@ -1267,16 +1266,13 @@ static void RunVerifySignatures(Far3Panel &panel)

auto rm_it = std::remove_if(filesToVerify.begin(), filesToVerify.end(), [](PanelFileInfo &item) { return !FileCanHaveSignature(item.PanelPath.c_str()); });
filesToVerify.erase(rm_it, filesToVerify.end());
if (filesToVerify.size() == 0)
{
DisplayMessage(MSG_DLG_ERROR, MSG_DLG_NO_FILES_SELECTED, NULL, true, true);
return;
}
}

if (filesToVerify.size() > 0)
{
std::wstring strShortName;
std::wstring strFileNum;
bool allOk = true;

for (size_t i = 0; i < filesToVerify.size(); ++i)
{
Expand Down Expand Up @@ -1317,11 +1313,15 @@ static void RunVerifySignatures(Far3Panel &panel)
}
}
}
}

if (allOk)
DisplayMessage(MSG_DLG_VALIDATION_COMPLETE, MSG_DLG_OPERATION_COMPLETE, nullptr, false, true);

if (allOk)
DisplayMessage(MSG_DLG_VALIDATION_COMPLETE, MSG_DLG_OPERATION_COMPLETE, nullptr, false, true);
}
else
{
DisplayMessage(MSG_DLG_ERROR, MSG_DLG_NO_FILES_SELECTED, NULL, true, true);
}

FarAdvControl(ACTL_SETPROGRESSSTATE, TBPS_NOPROGRESS, NULL);
FarAdvControl(ACTL_PROGRESSNOTIFY, 0, NULL);
}
Expand Down
2 changes: 1 addition & 1 deletion source/trust.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

bool FileCanHaveSignature(const wchar_t* path)
{
static const wchar_t* SignatureExtensions[] = { L".exe", L".dll", L".msi" };
static const wchar_t* SignatureExtensions[] = { L".exe", L".dll", L".efi", L".msi", L".msu", L".msp", L".cab"};

const wchar_t* ext = PathFindExtension(path);
for (int i = 0; i < _countof(SignatureExtensions); ++i)
Expand Down
2 changes: 1 addition & 1 deletion source/version.m4i
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
m4_define(VMAJOR, `2')m4_dnl
m4_define(VMINOR, `8')m4_dnl
m4_define(VREVISION, `2')m4_dnl
m4_define(VREVISION, `3')m4_dnl
m4_define(PLUGIN_VERSION, `VMAJOR.VMINOR.VREVISION')m4_dnl

0 comments on commit 24af787

Please sign in to comment.