6 files changed, 14 insertions, 26 deletions
diff --git a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf
index 48f893c6..496e5c6a 100644
--- a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf
+++ b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf
diff --git a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.vcxproj b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.vcxproj
index 9d7d5b16..8057b531 100644
--- a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.vcxproj
+++ b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.vcxproj
@@ -71,22 +71,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
-    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath);$(KIT_SHARED_INC_PATH)\netcx\shared\1.0</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
-    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath);$(KIT_SHARED_INC_PATH)\netcx\shared\1.0</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
-    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath);$(KIT_SHARED_INC_PATH)\netcx\shared\1.0</ExternalIncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
     <DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
     <IncludePath>$(SolutionDir)\inc;$(IncludePath)</IncludePath>
-    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath)</ExternalIncludePath>
+    <ExternalIncludePath>$(KIT_SHARED_INC_PATH_WDK)\netcx\shared\1.0;$(KM_IncludePath)\mbbcx\1.0;$(KIT_SHARED_INC_PATH_WDK);$(KM_IncludePath)\netcx\kmdf\adapter\2.3;$(ExternalIncludePath);$(KIT_SHARED_INC_PATH)\netcx\shared\1.0</ExternalIncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <DriverSign>
diff --git a/network/wwan/cxwmbclass/datapipe.cpp b/network/wwan/cxwmbclass/datapipe.cpp
index 4452b761..b753a9e9 100644
--- a/network/wwan/cxwmbclass/datapipe.cpp
+++ b/network/wwan/cxwmbclass/datapipe.cpp
@@ -428,6 +428,7 @@ MbbBusWriteData(__in MBB_BUS_HANDLE BusHandle, __in MBB_REQUEST_HANDLE RequestHa
     WDFMEMORY BufferMemoryObject = NULL;
     WDFREQUEST WriteRequestZLP = NULL;
     PUSB_WRITE_REQ_CONTEXT writeContextZLP = NULL;
+    NTSTATUS ZlpStatus;
 
     usbDeviceContext = GetUsbDeviceContext(BusObject->WdfUsbDevice);
 
@@ -641,7 +642,7 @@ MbbBusWriteData(__in MBB_BUS_HANDLE BusHandle, __in MBB_REQUEST_HANDLE RequestHa
         if (WriteRequestZLP != NULL)
         {
 
-            NTSTATUS ZlpStatus;
+            
 
             Status = WdfUsbTargetPipeFormatRequestForWrite(usbDeviceContext->BulkOutputPipe, WriteRequestZLP, NULL, NULL);
             if (!NT_SUCCESS(Status))
@@ -696,6 +697,7 @@ Cleanup:
 
     if (WriteRequestZLP != NULL)
     {
+        Status = ZlpStatus;
         FreeWriteRequest(BusObject->WdfUsbDevice, WriteRequestZLP);
         WriteRequestZLP = NULL;
     }
diff --git a/network/wwan/cxwmbclass/inc/util.h b/network/wwan/cxwmbclass/inc/util.h
index 12d166b4..e55c07e0 100644
--- a/network/wwan/cxwmbclass/inc/util.h
+++ b/network/wwan/cxwmbclass/inc/util.h
@@ -2,14 +2,12 @@
 //    Copyright (C) Microsoft.  All rights reserved.
 //
 #pragma once
-typedef enum
-{
-    MbbPoolTagDefault = '0CBM',
-    MbbPoolTagNtbSend = '1CBM',
-    MbbPoolTagNblSend = '2CBM',
-    MbbPoolTagNbSend = '3CBM',
-    MbbPoolTagMdlReceive = '6CBM'
-} MBB_POOL_TAG;
+
+#define MbbPoolTagDefault '0CBM'
+#define MbbPoolTagNtbSend '1CBM'
+#define MbbPoolTagNblSend '2CBM'
+#define MbbPoolTagNbSend '3CBM'
+#define MbbPoolTagMdlReceive '6CBM'
 
 #define ALLOCATE_PAGED_POOL(_y) ExAllocatePool2(POOL_FLAG_PAGED, _y, MbbPoolTagDefault)
 #define ALLOCATE_NONPAGED_POOL(_y) ExAllocatePool2(POOL_FLAG_NON_PAGED, _y, MbbPoolTagDefault)
diff --git a/network/wwan/cxwmbclass/sources.inc b/network/wwan/cxwmbclass/sources.inc
deleted file mode 100644
index 7b1e526c..00000000
--- a/network/wwan/cxwmbclass/sources.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MBBCX_MAJOR_VERSION=1
-MBBCX_MINOR_VERSION=0
-
-MBBCX_VERSION=$(MBBCX_MAJOR_VERSION).$(MBBCX_MINOR_VERSION)
-
-MBBCX_DDK_INC_PATH=$(ONECORE_EXTERNAL_DDK_INC_PATH)\mbbcx\$(MBBCX_VERSION)
-MBBCX_DDK_LIB_PATH=$(ONECORE_EXTERNAL_DDK_LIB_PATH)\mbbcx\$(MBBCX_VERSION)
-
-KMDF_VERSION_MAJOR=1
-KMDF_VERSION_MINOR=31
-KMDF_VERSION=$(KMDF_VERSION_MAJOR).$(KMDF_VERSION_MINOR)
-KMDF_DDK_INC_PATH=$(ONECORE_INTERNAL_DDK_INC_PATH)\wdf\kmdf\$(KMDF_VERSION);
diff --git a/network/wwan/cxwmbclass/utils.cpp b/network/wwan/cxwmbclass/utils.cpp
index ec791ab4..bc74100d 100644
--- a/network/wwan/cxwmbclass/utils.cpp
+++ b/network/wwan/cxwmbclass/utils.cpp
@@ -248,7 +248,7 @@ MbbBusGetStat(__in MBB_BUS_HANDLE BusHandle, __in USHORT StatIndex, __out ULONGL
 
     if (NT_SUCCESS(Status))
     {
-        if (BytesTransfered < sizeof(Value))
+        if (BytesTransfered < sizeof(*Value))
         {
             Status = STATUS_INFO_LENGTH_MISMATCH;
         }