diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2010-07-24 17:58:55 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2010-07-24 17:58:55 +0400 |
| commit | c24b79e5f026446ab57b67a660a1251681f36c20 (patch) | |
| tree | 472a600ea89c2f53ebbdd321f3f32e5d7d4ae4db /overlay | |
| parent | 9ba3eb389958b0efb7dc6083be209f9fd5d4ee55 (diff) | |
Overlay blacklist wmpnscfg.exe and fix the mumble_ol.dll's debug output
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/lib.cpp | 17 | ||||
| -rw-r--r-- | overlay/overlay.h | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/overlay/lib.cpp b/overlay/lib.cpp index 11bdeb671..45ca17021 100644 --- a/overlay/lib.cpp +++ b/overlay/lib.cpp @@ -580,20 +580,25 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE, DWORD fdwReason, LPVOID) { } } - strcpy_s(p+1, 64, "nooverlay"); - HANDLE h = CreateFile(procname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + char fname[sizeof(procname)]; + char *fp = fname + (procname - p); + strcpy_s(fname, sizeof(procname), procname); + + strcpy_s(fp+1, 64, "nooverlay"); + HANDLE h = CreateFile(fname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - fods("Overlay disable %s found", procname); + fods("Overlay disable %s found", fname); + bBlackListed = true; return TRUE; } - strcpy_s(p+1, 64, "debugoverlay"); + strcpy_s(fp+1, 64, "debugoverlay"); - h = CreateFile(procname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + h = CreateFile(fname, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h != INVALID_HANDLE_VALUE) { CloseHandle(h); - fods("Overlay debug %s found", procname); + fods("Overlay debug %s found", fname); bDebug = TRUE; } } diff --git a/overlay/overlay.h b/overlay/overlay.h index df8de66b1..a1c1614c7 100644 --- a/overlay/overlay.h +++ b/overlay/overlay.h @@ -97,6 +97,7 @@ static const char *overlayBlacklist[] = { "chrome.exe", "acrord32.exe", "explorer.exe", + "wmpnscfg.exe", NULL }; |