Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DllBlock: fix compatibility with Transparent Flyout and Sogou Pinyin #415

Merged
merged 2 commits into from
May 24, 2024
Merged

DllBlock: fix compatibility with Transparent Flyout and Sogou Pinyin #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b71d60a
DllBlock: fix GetDllExportName when dealing with resource DLLs
dinhngtu May 24, 2024
c0f0e40
DllBlock: block Translucent Flyouts from loading
dinhngtu May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions NanaZip.Shared/DllBlock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ namespace
else if (!::_stricmp(dllName, "ExplorerPatcher.IA-32.dll")) {
return true;
}
else if (!::_stricmp(dllName, "TFMain64.dll")) {
// Translucent Flyouts
return true;
}
return false;
}

Expand All @@ -53,16 +57,16 @@ namespace
if (ntHdr->Signature != IMAGE_NT_SIGNATURE || ntHdr->OptionalHeader.NumberOfRvaAndSizes < IMAGE_DIRECTORY_ENTRY_EXPORT)
return false;
const IMAGE_DATA_DIRECTORY* dirExport = &(ntHdr->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]);
if (dirExport->Size < sizeof(IMAGE_EXPORT_DIRECTORY) || !CheckExtents(viewSize, dirExport->VirtualAddress, sizeof(IMAGE_EXPORT_DIRECTORY))) {
if (dirExport->Size < sizeof(IMAGE_EXPORT_DIRECTORY) || !dirExport->VirtualAddress || !CheckExtents(viewSize, dirExport->VirtualAddress, sizeof(IMAGE_EXPORT_DIRECTORY))) {
return false;
}
const IMAGE_EXPORT_DIRECTORY* exports = reinterpret_cast<const IMAGE_EXPORT_DIRECTORY*>(base + dirExport->VirtualAddress);
// we don't know the export directory name size so assume that at least 256 bytes after the name are safe
if (!CheckExtents(viewSize, exports->Name, ARRAYSIZE(dllName))) {
if (!exports->Name || !CheckExtents(viewSize, exports->Name, ARRAYSIZE(dllName))) {
return false;
}
const char* name = base + exports->Name;
if (strcpy_s(dllName, name)) {
if (strncpy_s(dllName, name, _TRUNCATE)) {
return false;
}
return true;
Expand Down