From 57b3c4c23a59d129f2bdfd3cca894b5a78790072 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Wed, 21 Aug 2024 12:14:15 +0200 Subject: [simbatt] Remove unused MAX_SUPPORTED_SIMBATT_CHILDREN define This define isn't used anywhere in the driver. Therefore proposing to remove it to clean up. --- simbatt/func/simbattdriverif.h | 1 - 1 file changed, 1 deletion(-) diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h index 6fb45d8b..b2157a59 100644 --- a/simbatt/func/simbattdriverif.h +++ b/simbatt/func/simbattdriverif.h @@ -62,7 +62,6 @@ DEFINE_GUID(SIMBATT_DEVINTERFACE_GUID, #define IOCTL_SIMBATT_SET_UNIQUE_ID SIMBATT_IOCTL(0x809) #define IOCTL_SIMBATT_GET_MAXCHARGINGCURRENT SIMBATT_IOCTL(0x810) #define SIMBATT_RATE_CALCULATE 0x7fffffff -#define MAX_SUPPORTED_SIMBATT_CHILDREN 20 //------------------------------------------------------------------- Data Types -- cgit v1.3.1 From 97b9377fe5649c9a745ffc40c43318ae3e4d848e Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 7 Dec 2023 15:36:38 +0100 Subject: simbatt: Clear BATTERY_CAPACITY_RELATIVE field Clear BATTERY_INFORMATION::BATTERY_CAPACITY_RELATIVE field to enable per-battery charge display in Windows Settings. --- simbatt/func/miniclass.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/simbatt/func/miniclass.c b/simbatt/func/miniclass.c index 612b4c66..78a13bdf 100644 --- a/simbatt/func/miniclass.c +++ b/simbatt/func/miniclass.c @@ -239,9 +239,7 @@ Return Value: DevExt->State.BatteryStatus.Capacity = 100; DevExt->State.BatteryStatus.Voltage = BATTERY_UNKNOWN_VOLTAGE; DevExt->State.BatteryStatus.Rate = 0; - DevExt->State.BatteryInfo.Capabilities = BATTERY_SYSTEM_BATTERY | - BATTERY_CAPACITY_RELATIVE; - + DevExt->State.BatteryInfo.Capabilities = BATTERY_SYSTEM_BATTERY; DevExt->State.BatteryInfo.Technology = 1; DevExt->State.BatteryInfo.Chemistry[0] = 'F'; DevExt->State.BatteryInfo.Chemistry[1] = 'a'; -- cgit v1.3.1 From 95ca556121fcf891edcdd162b95b507e8f6c81cb Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 22 Aug 2024 12:13:48 +0200 Subject: Remove unreferenced BATTBUS_TYPE_SIMBATT define. --- simbatt/func/simbattdriverif.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h index b2157a59..ac9fab96 100644 --- a/simbatt/func/simbattdriverif.h +++ b/simbatt/func/simbattdriverif.h @@ -69,8 +69,6 @@ DEFINE_GUID(SIMBATT_DEVINTERFACE_GUID, // Data structure used in PlugIn and UnPlug ioctls // -#define BATTBUS_TYPE_SIMBATT 0; - typedef struct _BATTBUS_PLUGIN_HARDWARE { // -- cgit v1.3.1 From 673f69a6a755f17a2fb7afd1627cb8890073e4e8 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 22 Aug 2024 12:14:53 +0200 Subject: Remove unreferenced BATTBUS_PLUGIN_HARDWARE struct. --- simbatt/func/simbattdriverif.h | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h index ac9fab96..f0ceb017 100644 --- a/simbatt/func/simbattdriverif.h +++ b/simbatt/func/simbattdriverif.h @@ -69,37 +69,6 @@ DEFINE_GUID(SIMBATT_DEVINTERFACE_GUID, // Data structure used in PlugIn and UnPlug ioctls // -typedef struct _BATTBUS_PLUGIN_HARDWARE -{ - // - // Size of this type. - // - - ULONG Size; - - // - // Unique serial number of the device to be enumerated. - // Enumeration will be failed if another device on the - // bus has the same serial number. - // - - ULONG SerialNo; - - // - // UI number. - // - - ULONG UINumber; - - // - // Type of device being enumerated - // - // Reserved value, set to 0. - // - - ULONG Type; - -} BATTBUS_PLUGIN_HARDWARE, *PBATTBUS_PLUGIN_HARDWARE; typedef struct _BATTBUS_UNPLUG_HARDWARE { -- cgit v1.3.1 From 700a917f0ddd4e8489bbafc18f6326811ae91625 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 22 Aug 2024 12:15:38 +0200 Subject: Remove unreferenced BATTBUS_UNPLUG_HARDWARE struct. --- simbatt/func/simbattdriverif.h | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h index f0ceb017..bb617ebe 100644 --- a/simbatt/func/simbattdriverif.h +++ b/simbatt/func/simbattdriverif.h @@ -62,33 +62,3 @@ DEFINE_GUID(SIMBATT_DEVINTERFACE_GUID, #define IOCTL_SIMBATT_SET_UNIQUE_ID SIMBATT_IOCTL(0x809) #define IOCTL_SIMBATT_GET_MAXCHARGINGCURRENT SIMBATT_IOCTL(0x810) #define SIMBATT_RATE_CALCULATE 0x7fffffff - -//------------------------------------------------------------------- Data Types - -// -// Data structure used in PlugIn and UnPlug ioctls -// - - -typedef struct _BATTBUS_UNPLUG_HARDWARE -{ - // - // size of this type - // - - ULONG Size; - - // - // Serial number of the device to be unplugged. - // - - ULONG SerialNo; - - // - // Must not be referenced used. - // - - ULONG Reserved[2]; - -} BATTBUS_UNPLUG_HARDWARE, *PBATTBUS_UNPLUG_HARDWARE; - -- cgit v1.3.1 From c9de4121a19dc08d9a8887d3534b8a86c01160f1 Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 22 Aug 2024 12:18:33 +0200 Subject: Remove unreferenced battery bus GUID and IOCTL calls. --- simbatt/func/simbattdriverif.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/simbatt/func/simbattdriverif.h b/simbatt/func/simbattdriverif.h index bb617ebe..04549f72 100644 --- a/simbatt/func/simbattdriverif.h +++ b/simbatt/func/simbattdriverif.h @@ -25,20 +25,6 @@ Abstract: //------------------------------------------------------------------ Definitions -// -// Battery bus driver interface -// - -// {780AC894-01FF-4b5e-B4C8-9C00709200EB} -DEFINE_GUID(BATTBUS_DEVINTERFACE_GUID, - 0x780ac894, 0x1ff, 0x4b5e, 0xb4, 0xc8, 0x9c, 0x0, 0x70, 0x92, 0x0, 0xeb); - -#define BATTBUS_IOCTL(_index_) \ - CTL_CODE(FILE_DEVICE_BUS_EXTENDER, _index_, METHOD_BUFFERED, FILE_READ_DATA) - -#define IOCTL_BATTBUS_PLUGIN_HARDWARE BATTBUS_IOCTL(0x0) -#define IOCTL_BATTBUS_UNPLUG_HARDWARE BATTBUS_IOCTL(0x1) - // // Simulated battery ioctl interface // -- cgit v1.3.1 From 239566869e3b25bc381f4f188575da32773abcfd Mon Sep 17 00:00:00 2001 From: Fredrik Orderud Date: Thu, 22 Aug 2024 15:42:07 +0200 Subject: [simbatt] Delete redundant "batclass_prepublish.h" to simplify The contained BATTERY_MINIPORT_INFO_V1_1 struct and BATTERY_CLASS_MINOR_VERSION_1 define are already defined in , so there shouldn't be a need for duplicating the definitions here. --- simbatt/func/batclass_prepublish.h | 51 -------------------------------------- simbatt/func/wdf.c | 2 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 simbatt/func/batclass_prepublish.h diff --git a/simbatt/func/batclass_prepublish.h b/simbatt/func/batclass_prepublish.h deleted file mode 100644 index a952222b..00000000 --- a/simbatt/func/batclass_prepublish.h +++ /dev/null @@ -1,51 +0,0 @@ -/*++ - -Copyright (c) Microsoft Corporation. All rights reserved. - -Module Name: - - batclass_prepublish.h - -Abstract: - - This module defines pre-publish definations to be made available in DDK/SDK. - - N.B. This file must not be included when batclass.h defines - BATTERY_MINIPORT_INFO_V1_1 type and BATTERY_CLASS_MINOR_VERSION_1. - - N.B. This code is provided "AS IS" without any expressed or implied warranty. - ---*/ - -//---------------------------------------------------------------------- Pragmas - -#pragma once - -//--------------------------------------------------------------------- Includes - -#include - -//-------------------------------------------------- Would be Public Definitions - -#ifndef BATTERY_CLASS_MINOR_VERSION_1 - -typedef struct { - USHORT MajorVersion; - USHORT MinorVersion; - - PVOID Context; // Miniport context - - BCLASS_QUERY_TAG QueryTag; - BCLASS_QUERY_INFORMATION QueryInformation; - BCLASS_SET_INFORMATION SetInformation; - BCLASS_QUERY_STATUS QueryStatus; - BCLASS_SET_STATUS_NOTIFY SetStatusNotify; - BCLASS_DISABLE_STATUS_NOTIFY DisableStatusNotify; - PDEVICE_OBJECT Pdo; - PUNICODE_STRING DeviceName; - PDEVICE_OBJECT Fdo; -} BATTERY_MINIPORT_INFO_V1_1, *PBATTERY_MINIPORT_INFO_V1_1; - -#define BATTERY_CLASS_MINOR_VERSION_1 0x0001 - -#endif // BATTERY_CLASS_MINOR_VERSION_1 diff --git a/simbatt/func/wdf.c b/simbatt/func/wdf.c index de9aee30..3b9e87ad 100644 --- a/simbatt/func/wdf.c +++ b/simbatt/func/wdf.c @@ -19,7 +19,7 @@ Abstract: #include "simbatt.h" #include "simbattdriverif.h" -#include "batclass_prepublish.h" +#include //------------------------------------------------------------------- Prototypes -- cgit v1.3.1 From 77d8f2d6ca1283718626965b53c69477bffb5fa8 Mon Sep 17 00:00:00 2001 From: JakobL-MSFT <110699333+JakobL-MSFT@users.noreply.github.com> Date: Wed, 4 Feb 2026 18:15:21 -0800 Subject: removed the space after newline which seems to be bug in c++ 23 not i… (#1347) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit removed the space after newline which seems to be bug in c++ 23 not in samples Co-authored-by: Prashant Chahar --- .../sys/ClassifyFunctions_AdvancedPacketInjectionCallouts.cpp | 2 +- network/trans/WFPSampler/sys/ClassifyFunctions_BasicActionCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_BasicPacketInjectionCallouts.cpp | 2 +- .../sys/ClassifyFunctions_BasicPacketModificationCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_BasicStreamInjectionCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_FastPacketInjectionCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_FastStreamInjectionCallouts.cpp | 2 +- .../trans/WFPSampler/sys/ClassifyFunctions_FlowAssociationCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_PendAuthorizationCallouts.cpp | 2 +- .../WFPSampler/sys/ClassifyFunctions_PendEndpointClosureCallouts.cpp | 2 +- network/trans/WFPSampler/sys/ClassifyFunctions_ProxyCallouts.cpp | 2 +- .../sys/CompletionFunctions_AdvancedPacketInjectionCallouts.cpp | 2 +- .../sys/CompletionFunctions_BasicPacketModificationCallouts.cpp | 2 +- .../WFPSampler/sys/CompletionFunctions_PendAuthorizationCallouts.cpp | 2 +- network/trans/WFPSampler/sys/CompletionFunctions_ProxyCallouts.cpp | 2 +- network/trans/WFPSampler/sys/Framework_Events.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_AdvancedCallouts.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_BasicCallouts.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_FastCallouts.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_FlowDelete.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_PendCallouts.cpp | 2 +- network/trans/WFPSampler/sys/NotifyFunctions_ProxyCallouts.cpp | 2 +- network/trans/WFPSampler/sys/SubscriptionFunctions_BFEState.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_FlowContext.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_FwpObjects.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_NetBuffer.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_PendData.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp | 2 +- network/trans/WFPSampler/syslib/HelperFunctions_WorkItems.cpp | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_AdvancedPacketInjectionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_AdvancedPacketInjectionCallouts.cpp index 1df1f7b5..b71c77e0 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_AdvancedPacketInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_AdvancedPacketInjectionCallouts.cpp @@ -99,7 +99,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_AdvancedPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_AdvancedPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if DBG diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicActionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicActionCallouts.cpp index 375dab93..69773e8a 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicActionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicActionCallouts.cpp @@ -52,7 +52,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_BasicActionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_BasicActionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PerformBasicAction" diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketInjectionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketInjectionCallouts.cpp index 2409a64d..641cb8be 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketInjectionCallouts.cpp @@ -103,7 +103,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_BasicPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_BasicPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if DBG diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketModificationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketModificationCallouts.cpp index d6acb876..1a31999f 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketModificationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicPacketModificationCallouts.cpp @@ -106,7 +106,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_BasicPacketModificationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_BasicPacketModificationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN8) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicStreamInjectionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicStreamInjectionCallouts.cpp index 493fdace..7624c0f6 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_BasicStreamInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_BasicStreamInjectionCallouts.cpp @@ -54,7 +54,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_BasicStreamInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_BasicStreamInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PerformBasicPacketInjectionAtOutboundTransport" diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_FastPacketInjectionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_FastPacketInjectionCallouts.cpp index b7bf9fc9..0e99b61e 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_FastPacketInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_FastPacketInjectionCallouts.cpp @@ -46,7 +46,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_FastPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_FastPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN7) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_FastStreamInjectionCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_FastStreamInjectionCallouts.cpp index 07822e88..a10b0d8a 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_FastStreamInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_FastStreamInjectionCallouts.cpp @@ -42,7 +42,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_FastStreamInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_FastStreamInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN7) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_FlowAssociationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_FlowAssociationCallouts.cpp index 179a7ac0..f1c7f905 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_FlowAssociationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_FlowAssociationCallouts.cpp @@ -39,7 +39,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_FlowAssociationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_FlowAssociationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ NTSTATUS PerformFlowAssociation(_In_ const FWPS_INCOMING_METADATA_VALUES* pMetadata, _In_ const PC_FLOW_ASSOCIATION_DATA* pFlowAssociationData) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_PendAuthorizationCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_PendAuthorizationCallouts.cpp index f4f23eba..b3f3ba15 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_PendAuthorizationCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_PendAuthorizationCallouts.cpp @@ -47,7 +47,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_PendAuthorizationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_PendAuthorizationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PrvCloneAuthorizedNBLAndInject" diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_PendEndpointClosureCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_PendEndpointClosureCallouts.cpp index 315dde6c..d8d88721 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_PendEndpointClosureCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_PendEndpointClosureCallouts.cpp @@ -44,7 +44,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_PendEndpointClosureCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_PendEndpointClosureCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN7) diff --git a/network/trans/WFPSampler/sys/ClassifyFunctions_ProxyCallouts.cpp b/network/trans/WFPSampler/sys/ClassifyFunctions_ProxyCallouts.cpp index d6b2b4d4..f0cc853c 100644 --- a/network/trans/WFPSampler/sys/ClassifyFunctions_ProxyCallouts.cpp +++ b/network/trans/WFPSampler/sys/ClassifyFunctions_ProxyCallouts.cpp @@ -58,7 +58,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "ClassifyFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "ClassifyFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PerformProxyInjectionAtInboundNetwork" diff --git a/network/trans/WFPSampler/sys/CompletionFunctions_AdvancedPacketInjectionCallouts.cpp b/network/trans/WFPSampler/sys/CompletionFunctions_AdvancedPacketInjectionCallouts.cpp index 7348cb8d..cccaf200 100644 --- a/network/trans/WFPSampler/sys/CompletionFunctions_AdvancedPacketInjectionCallouts.cpp +++ b/network/trans/WFPSampler/sys/CompletionFunctions_AdvancedPacketInjectionCallouts.cpp @@ -52,7 +52,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "CompletionFunctions_AdvancedPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "CompletionFunctions_AdvancedPacketInjectionCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if DBG diff --git a/network/trans/WFPSampler/sys/CompletionFunctions_BasicPacketModificationCallouts.cpp b/network/trans/WFPSampler/sys/CompletionFunctions_BasicPacketModificationCallouts.cpp index ef51c44b..cd240d4e 100644 --- a/network/trans/WFPSampler/sys/CompletionFunctions_BasicPacketModificationCallouts.cpp +++ b/network/trans/WFPSampler/sys/CompletionFunctions_BasicPacketModificationCallouts.cpp @@ -54,7 +54,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "CompletionFunctions_BasicPacketModificationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "CompletionFunctions_BasicPacketModificationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="BasicPacketModificationCompletionDataDestroy" diff --git a/network/trans/WFPSampler/sys/CompletionFunctions_PendAuthorizationCallouts.cpp b/network/trans/WFPSampler/sys/CompletionFunctions_PendAuthorizationCallouts.cpp index e48a9ef8..7dd07b78 100644 --- a/network/trans/WFPSampler/sys/CompletionFunctions_PendAuthorizationCallouts.cpp +++ b/network/trans/WFPSampler/sys/CompletionFunctions_PendAuthorizationCallouts.cpp @@ -53,7 +53,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "CompletionFunctions_PendAuthorizationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "CompletionFunctions_PendAuthorizationCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PendAuthorizationCompletionDataDestroy" diff --git a/network/trans/WFPSampler/sys/CompletionFunctions_ProxyCallouts.cpp b/network/trans/WFPSampler/sys/CompletionFunctions_ProxyCallouts.cpp index ec47380e..d7527901 100644 --- a/network/trans/WFPSampler/sys/CompletionFunctions_ProxyCallouts.cpp +++ b/network/trans/WFPSampler/sys/CompletionFunctions_ProxyCallouts.cpp @@ -53,7 +53,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "CompletionFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "CompletionFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="ProxyCompletionDataDestroy" diff --git a/network/trans/WFPSampler/sys/Framework_Events.cpp b/network/trans/WFPSampler/sys/Framework_Events.cpp index baf59cc8..8f8001cc 100644 --- a/network/trans/WFPSampler/sys/Framework_Events.cpp +++ b/network/trans/WFPSampler/sys/Framework_Events.cpp @@ -20,7 +20,7 @@ #include "Framework_WFPSamplerCalloutDriver.h" /// . #include "Framework_Include.h" /// . -#include "Framework_Events.tmh" /// $(OBJ_PATH)\$(O)\ +#include "Framework_Events.tmh" /// $(OBJ_PATH)\$(O)\ /** @framework_function="EventDriverUnload" diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_AdvancedCallouts.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_AdvancedCallouts.cpp index 18c93824..badbe806 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_AdvancedCallouts.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_AdvancedCallouts.cpp @@ -32,7 +32,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_AdvancedCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_AdvancedCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PrvAdvancedNotificationWorkItemRoutine" diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_BasicCallouts.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_BasicCallouts.cpp index 6b86daaf..3893d7d1 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_BasicCallouts.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_BasicCallouts.cpp @@ -34,7 +34,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_BasicCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_BasicCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PrvBasicNotificationWorkItemRoutine" diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_FastCallouts.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_FastCallouts.cpp index 92011dfc..e7addba7 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_FastCallouts.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_FastCallouts.cpp @@ -34,7 +34,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_FastCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_FastCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PrvFastNotificationWorkItemRoutine" diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_FlowDelete.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_FlowDelete.cpp index bf1506ce..ab320f62 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_FlowDelete.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_FlowDelete.cpp @@ -32,7 +32,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_FlowDelete.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_FlowDelete.tmh" /// $(OBJ_PATH)\$(O)\ _IRQL_requires_min_(PASSIVE_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL) diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_PendCallouts.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_PendCallouts.cpp index e8b1fd63..1cc2913f 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_PendCallouts.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_PendCallouts.cpp @@ -34,7 +34,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_PendCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_PendCallouts.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_function="PrvPendNotificationWorkItemRoutine" diff --git a/network/trans/WFPSampler/sys/NotifyFunctions_ProxyCallouts.cpp b/network/trans/WFPSampler/sys/NotifyFunctions_ProxyCallouts.cpp index 5102b78d..b11d8569 100644 --- a/network/trans/WFPSampler/sys/NotifyFunctions_ProxyCallouts.cpp +++ b/network/trans/WFPSampler/sys/NotifyFunctions_ProxyCallouts.cpp @@ -35,7 +35,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "NotifyFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ +#include "NotifyFunctions_ProxyCallouts.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN7) diff --git a/network/trans/WFPSampler/sys/SubscriptionFunctions_BFEState.cpp b/network/trans/WFPSampler/sys/SubscriptionFunctions_BFEState.cpp index 8c141627..52e0b36b 100644 --- a/network/trans/WFPSampler/sys/SubscriptionFunctions_BFEState.cpp +++ b/network/trans/WFPSampler/sys/SubscriptionFunctions_BFEState.cpp @@ -34,7 +34,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "Framework_WFPSamplerCalloutDriver.h" /// . -#include "SubscriptionFunctions_BFEState.tmh" /// $(OBJ_PATH)\$(O)\ +#include "SubscriptionFunctions_BFEState.tmh" /// $(OBJ_PATH)\$(O)\ /** @notify_function="SubscriptionBFEStateChangeCallback" diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_FlowContext.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_FlowContext.cpp index a21dcf8a..e53a5e33 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_FlowContext.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_FlowContext.cpp @@ -42,7 +42,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_FlowContext.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_FlowContext.tmh" /// $(OBJ_PATH)\$(O)\ _IRQL_requires_min_(PASSIVE_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL) diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_FwpObjects.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_FwpObjects.cpp index 77324785..0b753a57 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_FwpObjects.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_FwpObjects.cpp @@ -74,7 +74,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_FwpObjects.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_FwpObjects.tmh" /// $(OBJ_PATH)\$(O)\ HANDLE g_EngineHandle = 0; HANDLE g_pIPv4InboundMACInjectionHandles[2] = {0}; diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp index 3e400890..f5bb66e3 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_Headers.cpp @@ -84,7 +84,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_Headers.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_Headers.tmh" /// $(OBJ_PATH)\$(O)\ /** @private_kernel_helper_function="PrvKrnlHlprCopyBufferToMDL" diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_NetBuffer.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_NetBuffer.cpp index 2d6bd3c9..4338d787 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_NetBuffer.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_NetBuffer.cpp @@ -49,7 +49,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_NetBuffer.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_NetBuffer.tmh" /// $(OBJ_PATH)\$(O)\ /** diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_PendData.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_PendData.cpp index bc2528a0..d8db09ee 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_PendData.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_PendData.cpp @@ -49,7 +49,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_PendData.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_PendData.tmh" /// $(OBJ_PATH)\$(O)\ /** @kernel_helper_function="KrnlHlprPendDataPurge" diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp index 22f08c60..92cca4ba 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp @@ -48,7 +48,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_RedirectData.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_RedirectData.tmh" /// $(OBJ_PATH)\$(O)\ #if(NTDDI_VERSION >= NTDDI_WIN7) diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_WorkItems.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_WorkItems.cpp index 3a5f7696..7e4f8c16 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_WorkItems.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_WorkItems.cpp @@ -54,7 +54,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// #include "HelperFunctions_Include.h" /// . -#include "HelperFunctions_WorkItems.tmh" /// $(OBJ_PATH)\$(O)\ +#include "HelperFunctions_WorkItems.tmh" /// $(OBJ_PATH)\$(O)\ /** @kernel_helper_function="KrnlHlprWorkItemDataPurge" -- cgit v1.3.1 From ed0aa30768bfd2576761e761a7da6ce6bfd4ca7c Mon Sep 17 00:00:00 2001 From: 5an7y Date: Thu, 12 Mar 2026 14:20:07 -0700 Subject: WDK test infra changes --- Build-AllSamples.ps1 | 3 ++- Build-SampleSet.ps1 | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Build-AllSamples.ps1 b/Build-AllSamples.ps1 index 6b3a1976..6b2e1661 100644 --- a/Build-AllSamples.ps1 +++ b/Build-AllSamples.ps1 @@ -40,6 +40,7 @@ param( [string[]]$Configurations = @(if ([string]::IsNullOrEmpty($env:WDS_Configuration)) { ('Debug', 'Release') } else { $env:WDS_Configuration }), [string[]]$Platforms = @(if ([string]::IsNullOrEmpty($env:WDS_Platform)) { ('x64', 'arm64') } else { $env:WDS_Platform }), [string]$LogFilesDirectory = (Join-Path (Get-Location) "_logs"), + [string]$InfOptions = "", [int]$ThrottleLimit ) @@ -68,4 +69,4 @@ foreach ($file in $solutionFiles) { } } -.\Build-SampleSet -SampleSet $sampleSet -Configurations $Configurations -Platform $Platforms -LogFilesDirectory $LogFilesDirectory -Verbose:$Verbose -ThrottleLimit $ThrottleLimit +.\Build-SampleSet -SampleSet $sampleSet -Configurations $Configurations -Platform $Platforms -LogFilesDirectory $LogFilesDirectory -Verbose:$Verbose -ThrottleLimit $ThrottleLimit -InfOptions $InfOptions diff --git a/Build-SampleSet.ps1 b/Build-SampleSet.ps1 index 8638d517..25346cda 100644 --- a/Build-SampleSet.ps1 +++ b/Build-SampleSet.ps1 @@ -5,6 +5,7 @@ param( [string[]]$Platforms = @(if ([string]::IsNullOrEmpty($env:WDS_Platform)) { "x64" } else { $env:WDS_Platform }), $LogFilesDirectory = (Get-Location), [string]$ReportFileName = $(if ([string]::IsNullOrEmpty($env:WDS_ReportFileName)) { "_overview" } else { $env:WDS_ReportFileName }), + [string]$InfOptions = "", [int]$ThrottleLimit = 0 ) @@ -135,6 +136,11 @@ if ($build_environment -match '^EWDK') { # $InfVerif_AdditionalOptions=($build_number -le 22621 ? "/sw1284 /sw1285 /sw1293 /sw2083 /sw2086" : "/samples") +# Override InfVerif_AdditionalOptions if InfOptions parameter was provided +if (-not [string]::IsNullOrEmpty($InfOptions)) { + $InfVerif_AdditionalOptions = $InfOptions +} + # # Determine exclusions. # -- cgit v1.3.1 -- cgit v1.3.1 From f204d700bc11a52baccbddf5378f4b68f95722ce Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 13 Mar 2026 18:07:28 +0000 Subject: Fix RCE vulnerability: pass issue body/number via env vars instead of direct interpolation Co-authored-by: 5an7y-Microsoft <219205893+5an7y-Microsoft@users.noreply.github.com> --- .github/workflows/tag-codeowner-on-issue.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tag-codeowner-on-issue.yml b/.github/workflows/tag-codeowner-on-issue.yml index fceed633..a4fe365d 100644 --- a/.github/workflows/tag-codeowner-on-issue.yml +++ b/.github/workflows/tag-codeowner-on-issue.yml @@ -6,7 +6,6 @@ on: jobs: tag-codeowner: - if: false # Disabled - workflow intentionally turned off runs-on: ubuntu-latest steps: @@ -24,13 +23,15 @@ jobs: - name: Extract selected path and tag codeowner env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + ISSUE_BODY: ${{ github.event.issue.body }} + ISSUE_NUMBER: ${{ github.event.issue.number }} run: | python3 - < Date: Thu, 26 Mar 2026 00:10:49 -0700 Subject: removing unused workflow --- .github/workflows/StaleIssues.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .github/workflows/StaleIssues.yml diff --git a/.github/workflows/StaleIssues.yml b/.github/workflows/StaleIssues.yml deleted file mode 100644 index d3a3776a..00000000 --- a/.github/workflows/StaleIssues.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Close inactive issues -on: - workflow_dispatch: -jobs: - close-issues: - runs-on: ubuntu-latest - permissions: - issues: write - steps: - - uses: actions/stale@v10 - with: - days-before-issue-stale: 365 - stale-issue-label: "stale" - stale-issue-message: "This issue has been inactive for a year. It will be closed in 31 days if no further activity occurs. If you believe this issue is still relevant, please comment to keep it open." - operations-per-run: 400 - repo-token: ${{ secrets.GITHUB_TOKEN }} -- cgit v1.3.1