Merge branch 'main' into fix-transaction-processing

20 files changed, 10 insertions, 10 deletions

diff --git a/network/modem/fakemodem/mdmfake.inx b/network/modem/fakemodem/mdmfake.inx
index ea95a9ad..29629983 100644
--- a/network/modem/fakemodem/mdmfake.inx
+++ b/network/modem/fakemodem/mdmfake.inx
diff --git a/network/ndis/extension/samples/forward/msforwardext.inf b/network/ndis/extension/samples/forward/msforwardext.inf
index 4af1b0fb..be4d37dc 100644
--- a/network/ndis/extension/samples/forward/msforwardext.inf
+++ b/network/ndis/extension/samples/forward/msforwardext.inf
diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.inf b/network/ndis/extension/samples/passthrough/mspassthroughext.inf
index 8339e7c8..71ecfbe8 100644
--- a/network/ndis/extension/samples/passthrough/mspassthroughext.inf
+++ b/network/ndis/extension/samples/passthrough/mspassthroughext.inf
diff --git a/network/ndis/filter/netlwf.inf b/network/ndis/filter/netlwf.inf
index e59b56fb..42a80912 100644
--- a/network/ndis/filter/netlwf.inf
+++ b/network/ndis/filter/netlwf.inf
diff --git a/network/ndis/mux/driver/60/mux_mp.inf b/network/ndis/mux/driver/60/mux_mp.inf
index f216ac16..5c0944bb 100644
--- a/network/ndis/mux/driver/60/mux_mp.inf
+++ b/network/ndis/mux/driver/60/mux_mp.inf
diff --git a/network/ndis/mux/driver/60/muxp.inf b/network/ndis/mux/driver/60/muxp.inf
index f9c4c04e..ea09e77d 100644
--- a/network/ndis/mux/driver/60/muxp.inf
+++ b/network/ndis/mux/driver/60/muxp.inf
diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf
index bae3936c..7022c0e6 100644
--- a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf
+++ b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf
diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf
index c5d7adb6..6a3e7da1 100644
--- a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf
+++ b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf
diff --git a/network/ndis/ndisprot_kmdf/60/ndisprot.inx b/network/ndis/ndisprot_kmdf/60/ndisprot.inx
index ecd932c1..1c5762f1 100644
--- a/network/ndis/ndisprot_kmdf/60/ndisprot.inx
+++ b/network/ndis/ndisprot_kmdf/60/ndisprot.inx
diff --git a/network/ndis/netvmini/6x/60/netvmini60.inf b/network/ndis/netvmini/6x/60/netvmini60.inf
index 63382e9b..31361685 100644
--- a/network/ndis/netvmini/6x/60/netvmini60.inf
+++ b/network/ndis/netvmini/6x/60/netvmini60.inf
diff --git a/network/ndis/netvmini/6x/620/netvmini620.inf b/network/ndis/netvmini/6x/620/netvmini620.inf
index 4dc1c9b6..f2ece226 100644
--- a/network/ndis/netvmini/6x/620/netvmini620.inf
+++ b/network/ndis/netvmini/6x/620/netvmini620.inf
diff --git a/network/ndis/netvmini/6x/630/netvmini630.inf b/network/ndis/netvmini/6x/630/netvmini630.inf
index eb7d61c8..40db5135 100644
--- a/network/ndis/netvmini/6x/630/netvmini630.inf
+++ b/network/ndis/netvmini/6x/630/netvmini630.inf
diff --git a/network/ndis/netvmini/6x/680/netvmini680.inf b/network/ndis/netvmini/6x/680/netvmini680.inf
index 4160c520..5da91049 100644
--- a/network/ndis/netvmini/6x/680/netvmini680.inf
+++ b/network/ndis/netvmini/6x/680/netvmini680.inf
diff --git a/network/trans/inspect/sys/inspect.inf b/network/trans/inspect/sys/inspect.inf
index cf7f7e76..1a1aa466 100644
--- a/network/trans/inspect/sys/inspect.inf
+++ b/network/trans/inspect/sys/inspect.inf
diff --git a/network/trans/msnmntr/sys/msnmntr.inf b/network/trans/msnmntr/sys/msnmntr.inf
index 38589761..e3ec3563 100644
--- a/network/trans/msnmntr/sys/msnmntr.inf
+++ b/network/trans/msnmntr/sys/msnmntr.inf
diff --git a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
index e7753ef3..4640bc85 100644
--- a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
+++ b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf
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/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/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;
         }