[ofw] [Patch 49/62] Reference implementation of NDv2

[Fab Tillier]

More win8 build environment fixes...

Signed-off-by: Fab Tillier <ftillier at microsoft.com>

diff -dup3 -X \dev\openib\endure3\private\openib\excl.txt -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\nd\main.cpp hw\mlx4\user\nd\main.cpp
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\nd\main.cpp	Wed Aug 29 15:45:10 2012
+++ hw\mlx4\user\nd\main.cpp	Thu Aug 30 14:08:41 2012
@@ -246,8 +246,8 @@ WSPStartup(
 }
 
 
-static BOOL
-_DllMain(
+BOOL APIENTRY
+DllMain(
     __in HINSTANCE,
     DWORD Reason,
     __in LPVOID
@@ -256,6 +256,7 @@ _DllMain(
     switch( Reason )
     {
     case DLL_PROCESS_ATTACH:
+        __security_init_cookie();
         g_hHeap = HeapCreate( 0, 0, 0 );
         if( g_hHeap == NULL )
         {
@@ -279,48 +280,6 @@ _DllMain(
         break;
     }
 
-    return TRUE;
-}
-
-
-extern BOOL APIENTRY
-_DllMainCRTStartupForGS(
-    __in HINSTANCE hModule,
-    DWORD Reason,
-    __in LPVOID Reserved
-    );
-
-
-BOOL APIENTRY
-DllMain(
-    __in HINSTANCE hModule,
-    DWORD Reason,
-    __in LPVOID Reserved
-    )
-{
-    switch( Reason )
-    {
-    case DLL_PROCESS_ATTACH:
-        if( !_DllMainCRTStartupForGS(
-            hModule, Reason, Reserved ) )
-        {
-            return FALSE;
-        }
-
-        return _DllMain( hModule, Reason, Reserved );
-
-    case DLL_THREAD_ATTACH:
-        break;
-
-    case DLL_THREAD_DETACH:
-        break;
-
-    case DLL_PROCESS_DETACH:
-        _DllMain( hModule, Reason, Reserved );
-
-        return _DllMainCRTStartupForGS(
-            hModule, Reason, Reserved );
-    }
     return TRUE;
 }
 
diff -dup3 -X \dev\openib\endure3\private\openib\excl.txt -r \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\nd\precomp.h hw\mlx4\user\nd\precomp.h
--- \dev\openib\ofw\gen1\branches\mlx4_30\trunk\hw\mlx4\user\nd\precomp.h	Wed Aug 29 15:45:10 2012
+++ hw\mlx4\user\nd\precomp.h	Thu Aug 30 14:19:34 2012
@@ -43,6 +43,7 @@
 #include <ndspi.h>
 #include <ndstatus.h>
 #include <string.h>
+#include <process.h>
 
 #include "ndfltr.h"

-------------- next part --------------
A non-text attachment was scrubbed...
Name: ndv2.49.patch
Type: application/octet-stream
Size: 2042 bytes
Desc: ndv2.49.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20130221/f4e25cd1/attachment.obj>