Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_common.c
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_common.c	(revision 8253)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/core/al/al_common.c	(revision 8255)
@@ -48,7 +48,7 @@
 #include "al_mgr.h"
 #include <complib/cl_math.h>
 #include "ib_common.h"
-#ifdef NTDDI_WIN8
+#ifdef DRIVER
 #include <ntstrsafe.h>
 #else
 #include <strsafe.h>
Index: B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/genutils/gu_utils.cpp
===================================================================
--- B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/genutils/gu_utils.cpp	(revision 8253)
+++ B:/users/xalex/PREFAST_TRUNK_3_0_0/hw/mlx4/kernel/genutils/gu_utils.cpp	(revision 8255)
@@ -555,7 +555,7 @@
 
     char temp[BUFFER_SIZE] = {0};
 
-    HRESULT hr = StringCbPrintf(temp, BUFFER_SIZE , "%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x",
+    HRESULT hr = RtlStringCbPrintfA(temp, BUFFER_SIZE , "%.2x%.2x:%.2x%.2x:%.2x%.2x:%.2x%.2x",
                                                     pGuid[7],
                                                     pGuid[6],
                                                     pGuid[5],
@@ -565,11 +565,9 @@
                                                     pGuid[1],
                                                     pGuid[0]
                                                     );
-    if (!SUCCEEDED(hr))
-    {
-        ASSERT(false);
-    }
-    
+    ASSERT(hr == STATUS_SUCCESS)
+    UNREFERENCED_PARAMETER(hr);
+
     mbstowcs(pWstr, temp, BUFFER_SIZE);
 }