funcguard: add Scintilla DllMain guard

- Add trace to the main entry point and resource load/release for SciLexer.dll. This patch does _not_ enable the funcguard output, it only adds the guards to the source. [#32] Signed-off-by: Thell Fowler <git@tbfowler.name>
npp-community · Oct 30, 2010 · 36f8d10 · 36f8d10
1 parent d664039
commit 36f8d10
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/scintilla/src/MISC/Debug/FuncGuards.cpp b/scintilla/src/MISC/Debug/FuncGuards.cpp
@@ -53,4 +53,10 @@
 
 // FUNCGUARD_BLOCK_START << Do not alter or remove
 
+#ifdef FUNCGUARD_NPPCR_DLLMAIN
+        func_guard_enable_cat(guardDllMain);
+#else
+        func_guard_disable_cat(guardDllMain);
+#endif
+
 // FUNCGUARD_BLOCK_END << Do not alter or remove
diff --git a/scintilla/src/MISC/Debug/FuncGuardsImport.h b/scintilla/src/MISC/Debug/FuncGuardsImport.h
@@ -52,4 +52,6 @@
 #ifndef MISC_DEBUG_FUNCGUARDIMPORT_H
 #define MISC_DEBUG_FUNCGUARDIMPORT_H
 
+func_guard_import_cat(guardDllMain);
+
 #endif // MISC_DEBUG_FUNCGUARDS_H
diff --git a/scintilla/src/MISC/Debug/FuncGuards_skel.h b/scintilla/src/MISC/Debug/FuncGuards_skel.h
@@ -83,5 +83,9 @@
 
 #ifndef SHIPPING
 
+// func_guard(guardDllMain);
+// Description: Traces main entry point of SciLexer.dll
+//#define FUNCGUARD_NPPCR_DLLMAIN
+
 #endif // SHIPPING
 #endif // MISC_DEBUG_FUNCGUARD_H
diff --git a/scintilla/win32/ScintillaWin.cxx b/scintilla/win32/ScintillaWin.cxx
@@ -2769,6 +2769,7 @@ sptr_t PASCAL ScintillaWin::SWndProc(
 // This function is externally visible so it can be called from container when building statically.
 // Must be called once only.
 int Scintilla_RegisterClasses(void *hInstance) {
+	func_guard(guardDllMain);
 	Platform_Initialise(hInstance);
 	bool result = ScintillaWin::Register(reinterpret_cast<HINSTANCE>(hInstance));
 #ifdef SCI_LEXER
@@ -2779,13 +2780,15 @@ int Scintilla_RegisterClasses(void *hInstance) {
 
 // This function is externally visible so it can be called from container when building statically.
 int Scintilla_ReleaseResources() {
+	func_guard(guardDllMain);
 	bool result = ScintillaWin::Unregister();
 	Platform_Finalise();
 	return result;
 }
 
 #ifndef STATIC_BUILD
 extern "C" int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID) {
+	func_guard(guardDllMain);
 	//Platform::DebugPrintf("Scintilla::DllMain %d %d\n", hInstance, dwReason);
 	if (dwReason == DLL_PROCESS_ATTACH) {
 		if (!Scintilla_RegisterClasses(hInstance))