Correct unload dynamic.dll after test

Author: KindDragon

.gitignore

@@ -18,3 +18,4 @@ src/bin/vld.ini
 /src/tests/vld_ComTest/ComTest_i.h
 /src/tests/vld_ComTest/ComTest_p.c
 /src/tests/vld_ComTest/ComTest_i.c
+*.VC.opendb

appveyor.yml

@@ -62,6 +62,10 @@ configuration:
 matrix:
   fast_finish: false
 
+nuget:
+  project_feed: true
+  disable_publish_on_pr: true
+
 notifications:
 - provider: Webhook
   url: https://webhooks.gitter.im/e/f26eac97358590c8feca

src/tests/dynamic_app/LoadTests.cpp

@@ -42,25 +42,32 @@ void CallDynamicMethods(HMODULE module, const CHAR* function)
     }
 }
 
-HMODULE RunLoaderTests(bool resolve)
+HMODULE LoadDynamicTests()
 {
     HMODULE hdyn = LoadLibrary(_T("dynamic.dll"));
     if (hdyn)
     {
         VLDEnableModule(hdyn);
+    }
+    return hdyn;
+}
 
-        // Should leak 18 memory allocations in total
-        // These requires ansi, not Unicode strings
-        CallDynamicMethods(hdyn, "SimpleLeak_Malloc");    // leaks 6
-        CallDynamicMethods(hdyn, "SimpleLeak_New");       // leaks 6
-        CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6
+void RunLoaderTests(HMODULE hdyn, bool resolve)
+{
+    if (!hdyn)
+        return;
+    VLDEnableModule(hdyn);
 
-        if (resolve)
-        {
-            CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings
-        }
+    // Should leak 18 memory allocations in total
+    // These requires ansi, not Unicode strings
+    CallDynamicMethods(hdyn, "SimpleLeak_Malloc");    // leaks 6
+    CallDynamicMethods(hdyn, "SimpleLeak_New");       // leaks 6
+    CallDynamicMethods(hdyn, "SimpleLeak_New_Array"); // leaks 6
+
+    if (resolve)
+    {
+        CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings
     }
-    return hdyn;
 }
 
 void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function )
@@ -80,23 +87,28 @@ void CallLibraryMethods( HMODULE hmfcLib, LPCSTR function )
     }
 }
 
-
-HMODULE RunMFCLoaderTests(bool resolve)
+HMODULE LoadMFCTests()
 {
     HMODULE hmfcLib = LoadLibrary(_T("test_mfc.dll"));
     if (hmfcLib)
     {
         VLDEnableModule(hmfcLib);
-        // Should leak 11 memory allocations in total
-        // This requires ansi, not Unicode strings
-        CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 x 2 = 8
-        CallLibraryMethods(hmfcLib, "MFC_LeakArray");  // leaks 3
-
-        if (resolve)
-        {
-            CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings
-        }
     }
     return hmfcLib;
 }
 
+void RunMFCLoaderTests(HMODULE hmfcLib, bool resolve)
+{
+    if (!hmfcLib)
+        return;
+    // Should leak 11 memory allocations in total
+    // This requires ansi, not Unicode strings
+    CallLibraryMethods(hmfcLib, "MFC_LeakSimple"); // Leaks 4 x 2 = 8
+    CallLibraryMethods(hmfcLib, "MFC_LeakArray");  // leaks 3
+
+    if (resolve)
+    {
+        CallVLDExportedMethod("VLDResolveCallstacks"); // This requires ansi, not Unicode strings
+    }
+}
+

src/tests/dynamic_app/LoadTests.h

@@ -1,4 +1,6 @@
 #pragma once
 
-HMODULE RunLoaderTests( bool resolve );
-HMODULE RunMFCLoaderTests( bool resolve );
+HMODULE LoadDynamicTests();
+void RunLoaderTests(HMODULE hdyn, bool resolve);
+HMODULE LoadMFCTests();
+void RunMFCLoaderTests(HMODULE hmfcLib, bool resolve);

src/tests/dynamic_app/ThreadTest.cpp

@@ -22,15 +22,21 @@ void RunPSApiLoaderTests()
 void Call_LoaderLocks(const ThreadData& threadData)
 {
 	RunPSApiLoaderTests(); // will not crash
-	HMODULE hmfcLib;
-	if (threadData.mfc)
-		hmfcLib = RunMFCLoaderTests(threadData.resolve); // Leaks 11 allocs
-	else
-		hmfcLib = RunLoaderTests(threadData.resolve); // Leaks 18 allocs
+	HMODULE hlib;
+    if (threadData.mfc)
+    {
+        hlib = LoadMFCTests();
+        RunMFCLoaderTests(hlib, threadData.resolve); // Leaks 11 allocs
+    }
+    else
+    {
+        hlib = LoadDynamicTests();
+        RunLoaderTests(hlib, threadData.resolve); // Leaks 18 allocs
+    }
 #ifndef STATIC_CRT
-    FreeLibrary(hmfcLib);
+    FreeLibrary(hlib);
 #else
-    UNREFERENCED_PARAMETER(hmfcLib);
+    UNREFERENCED_PARAMETER(hlib);
 #endif
 
     HMODULE this_app = NULL;
@@ -63,7 +69,6 @@ unsigned __stdcall Dynamic_Thread_Procedure(LPVOID foo)
 
 void RunLoaderLockTests(bool resolve, bool mfc)
 {
-    static const int NUMTHREADS = 64;
     HANDLE threads[NUMTHREADS] = {0};
     unsigned thread_id = NULL;
 	ThreadData threadData;

src/tests/dynamic_app/ThreadTests.h

@@ -1,4 +1,5 @@
 #pragma once
 
-void RunLoaderLockTests(bool, bool);
+static const int NUMTHREADS = 64;
 
+void RunLoaderLockTests(bool, bool);

src/tests/dynamic_app/dynamic_app.cpp

@@ -40,16 +40,26 @@ class DynamicLoader : public ::testing::TestWithParam<bool> {
 
 TEST_P(DynamicLoader, LoaderTests)
 {
-    HMODULE hmfcLib = RunLoaderTests(GetParam());    // leaks 18
-    ASSERT_NE(0u, (UINT_PTR)hmfcLib);
-    int leaks = (int)VLDGetLeaksCount();
+    HMODULE hdynLib = LoadDynamicTests();
+    ASSERT_NE(0u, reinterpret_cast<UINT_PTR>(hdynLib));
+#ifdef STATIC_CRT // Toolset <= v100 use own heap
+    VLDMarkAllLeaksAsReported();
+    RunLoaderTests(hdynLib, GetParam());    // leaks 18
+    int leaks = static_cast<int>(VLDGetLeaksCount());
+    FreeLibrary(hdynLib);
+#else
+    //VLDMarkAllLeaksAsReported();
+    RunLoaderTests(hdynLib, GetParam());    // leaks 18
+    FreeLibrary(hdynLib);
+    int leaks = static_cast<int>(VLDGetLeaksCount());
+#endif
     if (18 != leaks) VLDReportLeaks();
     ASSERT_EQ(18, leaks);
 }
 
 TEST_P(DynamicLoader, MultithreadLoadingTests)
 {
-    // Creates 64 threads that each leaks 18 allocations
+    // Creates NUMTHREADS threads that each leaks 18 allocations
     DWORD start = GetTickCount();
     RunLoaderLockTests(GetParam(), false);
     DWORD duration = GetTickCount() - start;
@@ -58,23 +68,38 @@ TEST_P(DynamicLoader, MultithreadLoadingTests)
     int leaks = (int)VLDGetLeaksCount();
     duration = GetTickCount() - start;
     _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration);
-    if (64 * 18 != leaks) VLDReportLeaks();
-    ASSERT_EQ(64 * 18, leaks);
+    int correctLeaks = NUMTHREADS * 18;
+    if (correctLeaks != leaks) VLDReportLeaks();
+#ifdef STATIC_CRT // One leak from dll static allocation
+    HMODULE hlib = LoadDynamicTests();
+    for (int i = 0; i < NUMTHREADS + 1; i++)
+        FreeLibrary(hlib);
+#endif
+    ASSERT_EQ(correctLeaks, leaks);
 }
 
 TEST_P(DynamicLoader, MfcLoaderTests)
 {
-    HMODULE hmfcLib = RunMFCLoaderTests(GetParam()); // leaks 11
-    ASSERT_NE(0u, (UINT_PTR)hmfcLib);
+    HMODULE hmfcLib = LoadMFCTests();
+    ASSERT_NE(0u, reinterpret_cast<UINT_PTR>(hmfcLib));
+#ifdef STATIC_CRT // Toolset <= v100 use own heap
+    VLDMarkAllLeaksAsReported();
+    RunMFCLoaderTests(hmfcLib, GetParam()); // leaks 11
+    int leaks = (int)VLDGetLeaksCount();
+    FreeLibrary(hmfcLib);
+#else
+    //VLDMarkAllLeaksAsReported();
+    RunMFCLoaderTests(hmfcLib, GetParam()); // leaks 11
     FreeLibrary(hmfcLib);
     int leaks = (int)VLDGetLeaksCount();
+#endif
     if (11 != leaks) VLDReportLeaks();
     ASSERT_EQ(11, leaks);
 }
 
 TEST_P(DynamicLoader, MfcMultithreadLoadingTests)
 {
-    // Creates 64 threads that each leaks 11 allocations
+    // Creates NUMTHREADS threads that each leaks 11 allocations
     DWORD start = GetTickCount();
     RunLoaderLockTests(GetParam(), true);
     DWORD duration = GetTickCount() - start;
@@ -83,8 +108,13 @@ TEST_P(DynamicLoader, MfcMultithreadLoadingTests)
     int leaks = (int)VLDGetLeaksCount();
     duration = GetTickCount() - start;
     _tprintf(_T("VLDGetLeaksCount took: %u ms\n"), duration);
-    if (64 * 11 != leaks) VLDReportLeaks();
-    ASSERT_EQ(64 * 11, leaks);
+    if (NUMTHREADS * 11 != leaks) VLDReportLeaks();
+#ifdef STATIC_CRT // One leak from dll static allocation
+    HMODULE hlib = LoadMFCTests();
+    for (int i = 0; i < NUMTHREADS + 1; i++)
+        FreeLibrary(hlib);
+#endif
+    ASSERT_EQ(NUMTHREADS * 11, leaks);
 }
 
 INSTANTIATE_TEST_CASE_P(ResolveVal,

src/tests/dynamic_dll/dynamic.vcxproj

@@ -190,6 +190,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -239,6 +240,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>