tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code improvement 

Closes #4085
This commit is contained in:
SinghRajenM 2018-01-15 00:19:16 +05:30 committed by Don HO
parent 440c9c57fe
commit fcb3ce31a0
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/MISC/Common/verifySignedfile.cpp
View File

@ -71,7 +71,7 @@ bool VerifySignedLibrary(const wstring& filepath,
// Initialise WinTrust data // Initialise WinTrust data
WINTRUST_DATA winTEXTrust_data = { 0 }; WINTRUST_DATA winTEXTrust_data = { 0 };
winTEXTrust_data.cbStruct = sizeof(winTEXTrust_data); winTEXTrust_data.cbStruct = sizeof(winTEXTrust_data);
winTEXTrust_data.dwUIChoice = WTD_UI_NONE; // do not display optionnal dialog boxes winTEXTrust_data.dwUIChoice = WTD_UI_NONE; // do not display optional dialog boxes
winTEXTrust_data.dwUnionChoice = WTD_CHOICE_FILE; // we are not checking catalog signed files winTEXTrust_data.dwUnionChoice = WTD_CHOICE_FILE; // we are not checking catalog signed files
winTEXTrust_data.dwStateAction = WTD_STATEACTION_VERIFY; // only checking winTEXTrust_data.dwStateAction = WTD_STATEACTION_VERIFY; // only checking
winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; // verify the whole certificate chain winTEXTrust_data.fdwRevocationChecks = WTD_REVOKE_WHOLECHAIN; // verify the whole certificate chain
@ -227,14 +227,14 @@ bool VerifySignedLibrary(const wstring& filepath,
} }
display_name = display_name_buffer.get(); display_name = display_name_buffer.get();
} catch (wstring s) { } catch (const wstring& s) {
::MessageBox(NULL, s.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR); ::MessageBox(NULL, s.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR);
OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n")); OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n"));
status = false; status = false;
} catch (...) { } catch (...) {
// Unknown error // Unknown error
OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n")); OutputDebugString(TEXT("VerifyLibrary: error while getting certificate informations\n"));
wstring errMsg(TEXT("Unknown exception occured. ")); wstring errMsg(TEXT("Unknown exception occurred. "));
errMsg += GetLastErrorAsString(GetLastError()); errMsg += GetLastErrorAsString(GetLastError());
::MessageBox(NULL, errMsg.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR); ::MessageBox(NULL, errMsg.c_str(), TEXT("DLL signature verification failed"), MB_ICONERROR);
status = false; status = false;

2
PowerEditor/src/ScitillaComponent/AutoCompletion.h
View File

@ -51,7 +51,7 @@ public:
private: private:
std::vector<MatchedCharInserted> _insertedMatchedChars; std::vector<MatchedCharInserted> _insertedMatchedChars;
ScintillaEditView * _pEditView; ScintillaEditView * _pEditView = nullptr;;
}; };
class AutoCompletion { class AutoCompletion {

2
PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp
View File

@ -342,6 +342,7 @@ void FunctionListPanel::reload()
for (size_t i = 0, len = _foundFuncInfos.size(); i < len; ++i) for (size_t i = 0, len = _foundFuncInfos.size(); i < len; ++i)
{ {
// no 2 levels // no 2 levels
/*
bool b = false; bool b = false;
if (b) if (b)
{ {
@ -355,6 +356,7 @@ void FunctionListPanel::reload()
addEntry(NULL, entryName.c_str(), _foundFuncInfos[i]._pos); addEntry(NULL, entryName.c_str(), _foundFuncInfos[i]._pos);
} }
else else
*/
{ {
addEntry(_foundFuncInfos[i]._data2.c_str(), _foundFuncInfos[i]._data.c_str(), _foundFuncInfos[i]._pos); addEntry(_foundFuncInfos[i]._data2.c_str(), _foundFuncInfos[i]._data.c_str(), _foundFuncInfos[i]._pos);
} }