From: wittend99 <wittend99@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sun, 27 May 2012 15:41:44 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@503 01035d8c-6547-0410-b346-abe4f9... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=dbc7d93b8e3cbde1130b35014fa37a650f2ecec5;p=freetel-svn-tracking.git

git-svn-id: https://svn.code.sf.net/p/freetel/code@503 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll b/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll
index 3152c2fd..21a5a48d 100644
Binary files a/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll and b/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll differ
diff --git a/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.lib b/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.lib
index 16e9c48d..7e2cce74 100644
Binary files a/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.lib and b/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.lib differ
diff --git a/fdmdv2/fdmdv2dll/dllmain.cpp b/fdmdv2/fdmdv2dll/dllmain.cpp
index 8a4edd31..eaa3831f 100644
--- a/fdmdv2/fdmdv2dll/dllmain.cpp
+++ b/fdmdv2/fdmdv2dll/dllmain.cpp
@@ -1,18 +1,19 @@
 // dllmain.cpp : Defines the entry point for the DLL application.
 #include "stdafx.h"
 
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-					 )
+BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
 {
 	switch (ul_reason_for_call)
 	{
-	case DLL_PROCESS_ATTACH:
-	case DLL_THREAD_ATTACH:
-	case DLL_THREAD_DETACH:
-	case DLL_PROCESS_DETACH:
-		break;
+        case DLL_PROCESS_ATTACH:
+        case DLL_THREAD_ATTACH:
+        case DLL_THREAD_DETACH:
+        case DLL_PROCESS_DETACH:
+        {
+            //Disable thread notifications
+            DisableThreadLibraryCalls(hModule);
+        };
+        break;
 	}
 	return TRUE;
 }
diff --git a/fdmdv2/fdmdv2dll/fdmdv2-dll.sln b/fdmdv2/fdmdv2dll/fdmdv2-dll.sln
index 0745993e..554e3c07 100644
--- a/fdmdv2/fdmdv2dll/fdmdv2-dll.sln
+++ b/fdmdv2/fdmdv2dll/fdmdv2-dll.sln
@@ -3,16 +3,38 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdmdv2-dll", "fdmdv2-project.vcxproj", "{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}"
 EndProject
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbTest", "vbTest\vbTest.vbproj", "{36C01EFE-7F22-486B-82C4-07DF02101B1A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|Win32 = Debug|Win32
+		Debug|x86 = Debug|x86
+		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|Win32 = Release|Win32
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.Build.0 = Debug|Win32
 		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.ActiveCfg = Debug|Win32
 		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.Build.0 = Debug|Win32
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|x86.ActiveCfg = Debug|Win32
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.ActiveCfg = Release|Win32
 		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.Build.0 = Release|Win32
+		{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|x86.ActiveCfg = Release|Win32
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Win32.ActiveCfg = Debug|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.ActiveCfg = Debug|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.Build.0 = Debug|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.Build.0 = Release|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Win32.ActiveCfg = Release|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.ActiveCfg = Release|x86
+		{36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/fdmdv2/fdmdv2dll/fdmdv2-dll.suo b/fdmdv2/fdmdv2dll/fdmdv2-dll.suo
index febd1065..6b495826 100644
Binary files a/fdmdv2/fdmdv2dll/fdmdv2-dll.suo and b/fdmdv2/fdmdv2dll/fdmdv2-dll.suo differ
diff --git a/fdmdv2/fdmdv2dll/fdmdv2-project.vcxproj b/fdmdv2/fdmdv2dll/fdmdv2-project.vcxproj
index 09cba745..76e18b34 100644
--- a/fdmdv2/fdmdv2dll/fdmdv2-project.vcxproj
+++ b/fdmdv2/fdmdv2dll/fdmdv2-project.vcxproj
@@ -67,6 +67,8 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;WIN32PROJECT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..\codec2-dev\src</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4305;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <CompileAsManaged>false</CompileAsManaged>
+      <ExceptionHandling>Sync</ExceptionHandling>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -74,6 +76,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Manifest>
+      <GenerateCatalogFiles>true</GenerateCatalogFiles>
+    </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
     <None Include="ReadMe.txt" />
@@ -96,6 +101,7 @@
     <ClInclude Include="..\..\codec2-dev\src\test_bits.h" />
     <ClInclude Include="..\..\codec2-dev\src\_kiss_fft_guts.h" />
     <ClInclude Include="fdmdv2-dll.h" />
+    <ClInclude Include="resource.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
@@ -127,6 +133,9 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="fdmdv2-dll.rc" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>