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

diff --git a/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll b/fdmdv2/fdmdv2dll/Release/fdmdv2-dll.dll
index 3152c2fd9f7a5f9375f8ba38369ae9e05f0f8b03..21a5a48db40ce570e667c85680f90eeb9ad7a788 100644 (file)
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 16e9c48d63914c332cc6f7427850b02b68e826bb..7e2cce74fd2f9a8c0928771dbfe390c99704c649 100644 (file)
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 8a4edd3105cfc6af17024195a8afeaaab7e090e1..eaa3831f119d9dd38f505ebb7d65695bd987f970 100644 (file)
--- a/fdmdv2/fdmdv2dll/dllmain.cpp
+++ b/fdmdv2/fdmdv2dll/dllmain.cpp
@@ -1,18 +1,19 @@
 // dllmain.cpp : Defines the entry point for the DLL application.\r
 #include "stdafx.h"\r
 \r
-BOOL APIENTRY DllMain( HMODULE hModule,\r
-                       DWORD  ul_reason_for_call,\r
-                       LPVOID lpReserved\r
-                                        )\r
+BOOL APIENTRY DllMain( HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)\r
 {\r
        switch (ul_reason_for_call)\r
        {\r
-       case DLL_PROCESS_ATTACH:\r
-       case DLL_THREAD_ATTACH:\r
-       case DLL_THREAD_DETACH:\r
-       case DLL_PROCESS_DETACH:\r
-               break;\r
+        case DLL_PROCESS_ATTACH:\r
+        case DLL_THREAD_ATTACH:\r
+        case DLL_THREAD_DETACH:\r
+        case DLL_PROCESS_DETACH:\r
+        {\r
+            //Disable thread notifications\r
+            DisableThreadLibraryCalls(hModule);\r
+        };\r
+        break;\r
        }\r
        return TRUE;\r
 }\r

diff --git a/fdmdv2/fdmdv2dll/fdmdv2-dll.sln b/fdmdv2/fdmdv2dll/fdmdv2-dll.sln
index 0745993e50ff8816127ffe9577b54400382b803d..554e3c0715b9da44968d316e2aea5ad2e5bbcd90 100644 (file)
--- 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\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdmdv2-dll", "fdmdv2-project.vcxproj", "{25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}"\r
 EndProject\r
+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "vbTest", "vbTest\vbTest.vbproj", "{36C01EFE-7F22-486B-82C4-07DF02101B1A}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug|Mixed Platforms = Debug|Mixed Platforms\r
                Debug|Win32 = Debug|Win32\r
+               Debug|x86 = Debug|x86\r
+               Release|Mixed Platforms = Release|Mixed Platforms\r
                Release|Win32 = Release|Win32\r
+               Release|x86 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
                {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|Win32.Build.0 = Debug|Win32\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Debug|x86.ActiveCfg = Debug|Win32\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Mixed Platforms.Build.0 = Release|Win32\r
                {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.ActiveCfg = Release|Win32\r
                {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|Win32.Build.0 = Release|Win32\r
+               {25ED31A8-B64D-47A6-A8EA-9B6E3BCDD541}.Release|x86.ActiveCfg = Release|Win32\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Mixed Platforms.Build.0 = Debug|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|Win32.ActiveCfg = Debug|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.ActiveCfg = Debug|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Debug|x86.Build.0 = Debug|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.ActiveCfg = Release|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Mixed Platforms.Build.0 = Release|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|Win32.ActiveCfg = Release|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.ActiveCfg = Release|x86\r
+               {36C01EFE-7F22-486B-82C4-07DF02101B1A}.Release|x86.Build.0 = Release|x86\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/fdmdv2/fdmdv2dll/fdmdv2-dll.suo b/fdmdv2/fdmdv2dll/fdmdv2-dll.suo
index febd1065b85c8060885efb0d2ba72a88f62478d1..6b49582627eb57c565730da49318d91296f70e9c 100644 (file)
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 09cba745a9438e02c3fd9fd37dbaa12948e4f936..76e18b3455432873945b149b5f8cebadb0daa08e 100644 (file)
--- 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>\r
       <AdditionalIncludeDirectories>..\..\codec2-dev\src</AdditionalIncludeDirectories>\r
       <DisableSpecificWarnings>4305;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <CompileAsManaged>false</CompileAsManaged>\r
+      <ExceptionHandling>Sync</ExceptionHandling>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
@@ -74,6 +76,9 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
     </Link>\r
+    <Manifest>\r
+      <GenerateCatalogFiles>true</GenerateCatalogFiles>\r
+    </Manifest>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
     <None Include="ReadMe.txt" />\r
@@ -96,6 +101,7 @@
     <ClInclude Include="..\..\codec2-dev\src\test_bits.h" />\r
     <ClInclude Include="..\..\codec2-dev\src\_kiss_fft_guts.h" />\r
     <ClInclude Include="fdmdv2-dll.h" />\r
+    <ClInclude Include="resource.h" />\r
     <ClInclude Include="stdafx.h" />\r
     <ClInclude Include="targetver.h" />\r
   </ItemGroup>\r
@@ -127,6 +133,9 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>\r
     </ClCompile>\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="fdmdv2-dll.rc" />\r
+  </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r