Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_dm.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_dm.c	(revision 8239)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_dm.c	(revision 8240)
@@ -38,6 +38,9 @@
 #include "al_mgr.h"
 #include "ib_common.h"
 
+#ifdef DRIVER
+#include <ntstrsafe.h>
+#endif
 
 #if defined(EVENT_TRACING)
 #ifdef offsetof
@@ -761,12 +764,19 @@
 		cl_memclr( &reg_svc_req, sizeof( ib_reg_svc_req_t ) );
 
 		reg_svc_req.svc_rec.service_lease = 0xffffffff;
+#ifdef DRIVER
+	RtlStringCchCopyA(
+		(char*)reg_svc_req.svc_rec.service_name,
+		sizeof(reg_svc_req.svc_rec.service_name),
+		DM_SVC_NAME
+		);	
+#else
 		strcpy_s(
 			(char*)reg_svc_req.svc_rec.service_name,
 			sizeof(reg_svc_req.svc_rec.service_name),
 			DM_SVC_NAME
 			);
-		
+#endif		
 		reg_svc_req.svc_rec.service_gid = p_iou_port->port_gid;
 		reg_svc_req.port_guid = p_iou_port->port_guid;
 
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/l2w/l2w.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/l2w/l2w.c	(revision 8239)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/l2w/l2w.c	(revision 8240)
@@ -60,7 +60,7 @@
 	// fill the object
 	pool->mdev = pdev->dev;
 	pool->size = size;
-	strcpy_s(pool->name, sizeof(pool->name),name);
+	RtlStringCchCopyA(pool->name, sizeof(pool->name),name);
 
 	return pool;		
 }