From 3fcc0f2bee2fbd40fe953ecbcb15b2bd8b0d3eb9 Mon Sep 17 00:00:00 2001 From: Adonais Romero González Date: Mon, 26 Feb 2024 09:47:25 -0800 Subject: Remove x86 and ARM configurations for sample projects. (#1126) * Removed Win32 and Arm from the project configurations. * Set default platform to x64. --- network/wlan/WDI/COMMON/common.vcxproj | 6 +- network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj | 133 +-------------------------- network/wlan/ihvsampleui/IHVSampleUI.vcxproj | 114 +---------------------- 3 files changed, 5 insertions(+), 248 deletions(-) (limited to 'network/wlan') diff --git a/network/wlan/WDI/COMMON/common.vcxproj b/network/wlan/WDI/COMMON/common.vcxproj index e6f6a941..2842595d 100644 --- a/network/wlan/WDI/COMMON/common.vcxproj +++ b/network/wlan/WDI/COMMON/common.vcxproj @@ -21,7 +21,7 @@ 1.0 $(Configuration.Replace(' ','')) - $(BUILD_ALT_DIR)\$(Platform)\ + $(BUILD_ALT_DIR)\$(Platform)\ $(SolutionDir)COMMON\$(Configuration)\$(Platform)\ @@ -30,10 +30,6 @@ {956B060D-1055-4584-9CF4-9FE14C428545} - - Win8 - True - Windows10 True diff --git a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj index 30586499..a4044511 100644 --- a/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj +++ b/network/wlan/WDI/HAL/HALSOURCE/hal.vcxproj @@ -1,78 +1,14 @@  - - Debug - Arm - - - Debug - Win32 - Debug x64 - - Release - Arm - - - Release - Win32 - Release x64 - - WinBlue Debug - Arm - - - Win8 Debug - Arm - - - WinBlue Release - Arm - - - Win8 Release - Arm - - - WinBlue Debug - Win32 - - - Win8 Debug - Win32 - - - Win7 Debug - Win32 - - - Vista Debug - Win32 - - - WinBlue Release - Win32 - - - Win8 Release - Win32 - - - Win7 Release - Win32 - - - Vista Release - Win32 - WinBlue Debug x64 @@ -118,8 +54,7 @@ 1.0 $(Configuration.Replace(' ','')) - $(BUILD_ALT_DIR)\$(Platform)\ - $(BUILD_ALT_DIR)\x86\ + $(BUILD_ALT_DIR)\$(Platform)\ $(IntDir) @@ -128,72 +63,6 @@ {316BB9D3-0947-4431-BC09-1C71C7201001} - - WindowsV6.3 - True - - - Windows10 - True - Mobile - - - Win8 - True - - - WindowsV6.3 - False - - - Windows10 - False - Mobile - - - Win8 - False - - - WindowsV6.3 - True - - - Windows10 - True - - - Win8 - True - - - Win7 - True - - - Vista - True - - - WindowsV6.3 - False - - - Windows10 - False - - - Win8 - False - - - Win7 - False - - - Vista - False - WindowsV6.3 True diff --git a/network/wlan/ihvsampleui/IHVSampleUI.vcxproj b/network/wlan/ihvsampleui/IHVSampleUI.vcxproj index 36ff1126..09f3dad7 100644 --- a/network/wlan/ihvsampleui/IHVSampleUI.vcxproj +++ b/network/wlan/ihvsampleui/IHVSampleUI.vcxproj @@ -1,14 +1,6 @@  - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -22,7 +14,7 @@ {1EE6DF41-8C0B-4C74-98D2-FCDF020E7128} $(MSBuildProjectName) Debug - Win32 + x64 {C7745B6F-E931-4E1C-A12B-5BF1C854C635} @@ -42,22 +34,6 @@ WindowsApplicationForDrivers10.0 DynamicLibrary - - Windows10 - False - Desktop - - WindowsApplicationForDrivers10.0 - DynamicLibrary - - - Windows10 - True - Desktop - - WindowsApplicationForDrivers10.0 - DynamicLibrary - $(IntDir) @@ -68,12 +44,6 @@ - - - - - - IHVSampleUI @@ -81,12 +51,6 @@ IHVSampleUI - - IHVSampleUI - - - IHVSampleUI - %(PreprocessorDefinitions);UNICODE;WIN32 @@ -98,8 +62,7 @@ %(PreprocessorDefinitions);UNICODE;WIN32 - _DllMainCRTStartup@12 - _DllMainCRTStartup + _DllMainCRTStartup @@ -113,38 +76,7 @@ %(PreprocessorDefinitions);UNICODE;WIN32 - _DllMainCRTStartup@12 - _DllMainCRTStartup - - - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - _DllMainCRTStartup@12 - _DllMainCRTStartup - - - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - %(PreprocessorDefinitions);UNICODE;WIN32 - - - _DllMainCRTStartup@12 - _DllMainCRTStartup + _DllMainCRTStartup @@ -187,46 +119,6 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - %(AdditionalOptions) /EHa - true - Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - - - %(AdditionalDependencies);ole32.lib;oleaut32.lib;user32.lib;uuid.lib;Kernel32.lib;Advapi32.lib;comctl32.lib - IHVSampleUI.def - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - - - %(AdditionalOptions) /EHa - true - Level4 - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - - - %(AdditionalDependencies);ole32.lib;oleaut32.lib;user32.lib;uuid.lib;Kernel32.lib;Advapi32.lib;comctl32.lib - IHVSampleUI.def - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH) - - -- cgit v1.3.1 From b5a831819b45104d389df709e6bc00ee117906f3 Mon Sep 17 00:00:00 2001 From: Enya Quetzalli <62947298+equetzal@users.noreply.github.com> Date: Thu, 21 Mar 2024 16:30:19 -0700 Subject: [WDI Sample] Refactoring Platform File IO ops to use WDM calls (#1142) --- network/wlan/WDI/HEADER/PlatformDef.h | 32 +- network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c | 410 ++++++++++++++------------ 2 files changed, 230 insertions(+), 212 deletions(-) (limited to 'network/wlan') diff --git a/network/wlan/WDI/HEADER/PlatformDef.h b/network/wlan/WDI/HEADER/PlatformDef.h index cad6fb7a..a8f4fb55 100644 --- a/network/wlan/WDI/HEADER/PlatformDef.h +++ b/network/wlan/WDI/HEADER/PlatformDef.h @@ -813,42 +813,42 @@ PlatformRequestPreAuthentication( RT_STATUS PlatformReadFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT pu1Byte pBufOfLines, - IN s4Byte nMaxNumLine, - IN s4Byte nMaxByteCntLine, - OUT ps4Byte pnNumLines + IN PVOID Adapter, + IN UNICODE_STRING* fileName, + IN OUT pu1Byte pBufOfLines, + IN s4Byte nMaxNumLine, + IN s4Byte nMaxByteCntLine, + OUT ps4Byte pnNumLinesRead ); RT_STATUS PlatformOpenFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT PRT_FILE_HANDLER pFileHandler + IN UNICODE_STRING* fileName, + IN OUT HANDLE* fileHandle ); RT_STATUS PlatformMapFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT HANDLE* fileHandle, + OUT u1Byte* contentBuffer, + OUT s4Byte* contentBufferLength ); VOID PlatformUnMapFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT u1Byte* contentBuffer ); VOID PlatformCloseFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT HANDLE* fileHandle ); RT_STATUS PlatformReadAndMapFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT pu1Byte pOutFile, - IN OUT pu4Byte UNALIGNED pFileSize + IN UNICODE_STRING* fileName, + OUT u1Byte* outFileBuffer, + OUT u4Byte* outFileBufferLength ); BOOLEAN diff --git a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c index d122f0c0..a8eb835d 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c +++ b/network/wlan/WDI/PLATFORM/NDIS6/Ndis6Common.c @@ -207,85 +207,105 @@ ParseFileBufToLines( // which is a 2-dimention array, for example, // u1Byte pBufOfLines[nMaxNumLine][nMaxByteCntLine]. // -// Note: -// In NDIS5, the file to open shall be placed at the directory the same as -// driver binary. -// RT_STATUS PlatformReadFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT pu1Byte pBufOfLines, - IN s4Byte nMaxNumLine, - IN s4Byte nMaxByteCntLine, - OUT ps4Byte pnNumLinesRead + IN PVOID Adapter, + IN UNICODE_STRING* fileName, + IN OUT pu1Byte pBufOfLines, + IN s4Byte nMaxNumLine, + IN s4Byte nMaxByteCntLine, + OUT ps4Byte pnNumLinesRead ) { - RT_STATUS rtStatus = RT_STATUS_FAILURE; - NDIS_STRING NdisStrFileName; - NDIS_PHYSICAL_ADDRESS ndisPhyAddr; - NDIS_STATUS ndisStatus; - NDIS_HANDLE hFileHandle; - UINT ulFileLength; - pu1Byte pMappedFile = NULL; - - // Check input parameters. - if(szFileName == NULL) - { - RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadFile(): szFileName should not be NULL!\n")); - return rtStatus; - } + RT_STATUS rtStatus = RT_STATUS_FAILURE; + OBJECT_ATTRIBUTES objectAttributes; + HANDLE fileHandle; + IO_STATUS_BLOCK iostatBlock; + NTSTATUS ntStatus; + + // Check Input parameters. if(pBufOfLines == NULL) { RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadFile(): pBufOfLines should not be NULL!\n")); return rtStatus; } - // Convert szFileName to NDIS_STRING. - NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName); - if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0) - { - // Open the file specified. - ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1; - NdisOpenFile(&ndisStatus, - &hFileHandle, - &ulFileLength, - &NdisStrFileName, - ndisPhyAddr); - if(ndisStatus == NDIS_STATUS_SUCCESS) - { - // Map the file into memory. - NdisMapFile(&ndisStatus, (PVOID *)(&pMappedFile), hFileHandle); - if(ndisStatus == NDIS_STATUS_SUCCESS) - { - // Read the file into pBufOfLines. - ParseFileBufToLines(Adapter, pMappedFile, ulFileLength, pBufOfLines, nMaxNumLine, nMaxByteCntLine, pnNumLinesRead); - - // Return Success only when Config Success - rtStatus = RT_STATUS_SUCCESS; - - // Relase the memory for mapping the file. - NdisUnmapFile(hFileHandle); + // Initialize the object attributes of the file we want to open + InitializeObjectAttributes( + &objectAttributes, + fileName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, // RootDirectory + NULL // Default Security + ); + + // Open the file using the object attributes to get a Handle + ntStatus = ZwOpenFile( + &fileHandle, + GENERIC_READ, + &objectAttributes, + &iostatBlock, + 0, // Do not share the file + FILE_NON_DIRECTORY_FILE + ); + + if (NT_SUCCESS(ntStatus)) { + FILE_STANDARD_INFORMATION fileInformation = { 0 }; + + // Get the file information to know the size we need to alloc + ntStatus = ZwQueryInformationFile( + fileHandle, + &iostatBlock, + &fileInformation, + sizeof(fileInformation), + FileStandardInformation + ); + + if (NT_SUCCESS(ntStatus)) { + u1Byte* buffer = NULL; + s4Byte bufferLength = (s4Byte)fileInformation.EndOfFile.QuadPart; + + // Try to allocate space to read the file + buffer = ExAllocatePool2(POOL_FLAG_NON_PAGED, bufferLength, 'frP'); + if (buffer) { + + // If alloc was successful, then read the file + ntStatus = ZwReadFile( + fileHandle, + NULL, + NULL, + NULL, + &iostatBlock, + buffer, + bufferLength, + 0, // No offset + NULL + ); + + if (NT_SUCCESS(ntStatus)) { + // Read the buffer into pBufOfLines. + ParseFileBufToLines(Adapter, buffer, bufferLength, pBufOfLines, nMaxNumLine, nMaxByteCntLine, pnNumLinesRead); + rtStatus = RT_STATUS_SUCCESS; + } + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file, ntStatus: %#X\n", ntStatus)); + } + + ExFreePool(buffer); + } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to map the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus)); + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to allocate space for file!\n")); } - - // Close the file. - NdisCloseFile(hFileHandle); } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus)); + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file attributes!, ntStatus: %#X\n", ntStatus)); } - - // Release the NDIS_STRING allocated via NdisInitializeString(). - NdisFreeString(NdisStrFileName); + + ZwClose(fileHandle); } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName)); + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file!, ntStatus: %#X\n", ntStatus)); } return rtStatus; @@ -293,51 +313,39 @@ PlatformReadFile( RT_STATUS PlatformOpenFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT PRT_FILE_HANDLER pFileHandler + IN UNICODE_STRING* fileName, + IN OUT HANDLE* fileHandle ) { - RT_STATUS rtStatus = RT_STATUS_FAILURE; - NDIS_STRING NdisStrFileName; - NDIS_PHYSICAL_ADDRESS ndisPhyAddr; - NDIS_STATUS ndisStatus; - pu1Byte pMappedFile = NULL; + RT_STATUS rtStatus = RT_STATUS_FAILURE; + OBJECT_ATTRIBUTES objectAttributes; + IO_STATUS_BLOCK iostatBlock; + NTSTATUS ntStatus; + + // Initialize the object attributes of the file we want to open + InitializeObjectAttributes( + &objectAttributes, + fileName, + OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, + NULL, // RootDirectory + NULL // Default Security + ); - - // Check input parameters. - if(szFileName == NULL) - { - RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): szFileName should not be NULL!\n")); - return rtStatus; - } + // Open the file using the object attributes to get a Handle + ntStatus = ZwOpenFile( + fileHandle, + GENERIC_READ, + &objectAttributes, + &iostatBlock, + 0, // Do not share the file + FILE_NON_DIRECTORY_FILE + ); - // Convert szFileName to NDIS_STRING. - NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName); - if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0) - { - // Open the file specified. - ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1; - NdisOpenFile(&ndisStatus, - &(pFileHandler->FileHandler), - &(pFileHandler->FileLength), - &NdisStrFileName, - ndisPhyAddr); - - NdisFreeString(NdisStrFileName); - if(ndisStatus == NDIS_STATUS_SUCCESS) - { - rtStatus = RT_STATUS_SUCCESS; - } - else - { - RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus)); - } - + if (NT_SUCCESS(ntStatus)) { + rtStatus = RT_STATUS_SUCCESS; } - else - { - RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformOpenFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName)); + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to open the file!, ntStatus: %#X, fileName: %wZ\n", ntStatus, fileName)); } return rtStatus; @@ -345,20 +353,66 @@ PlatformOpenFile( RT_STATUS PlatformMapFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT HANDLE* fileHandle, + OUT u1Byte* contentBuffer, + OUT s4Byte* contentBufferLength ) { - RT_STATUS rtStatus = RT_STATUS_FAILURE; - NDIS_STATUS ndisStatus; - - // Map the file into memory. - NdisMapFile(&ndisStatus, (PVOID *)(&(pFileHandler->MappedFile)), pFileHandler->FileHandler); - if(ndisStatus == NDIS_STATUS_SUCCESS) { - rtStatus = RT_STATUS_SUCCESS; + RT_STATUS rtStatus = RT_STATUS_FAILURE; + OBJECT_ATTRIBUTES objectAttributes; + IO_STATUS_BLOCK iostatBlock; + NTSTATUS ntStatus; + + + FILE_STANDARD_INFORMATION fileInformation = { 0 }; + + // Get the file information to know the size we need to alloc + ntStatus = ZwQueryInformationFile( + *fileHandle, + &iostatBlock, + &fileInformation, + sizeof(fileInformation), + FileStandardInformation + ); + + if (NT_SUCCESS(ntStatus)) { + u1Byte* buffer = NULL; + s4Byte bufferLength = (s4Byte)fileInformation.EndOfFile.QuadPart; + + // Try to allocate space to read the file + buffer = ExAllocatePool2(POOL_FLAG_NON_PAGED, bufferLength, 'frP'); + if (buffer) { + + // If alloc was successful, then read the file + ntStatus = ZwReadFile( + fileHandle, + NULL, + NULL, + NULL, + &iostatBlock, + buffer, + bufferLength, + 0, // No offset + NULL + ); + + if (NT_SUCCESS(ntStatus)) { + contentBuffer = buffer; + *contentBufferLength = bufferLength; + rtStatus = RT_STATUS_SUCCESS; + } + else { + ExFreePool(buffer); + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file, ntStatus: %#X\n", ntStatus)); + } + } + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to allocate space for file!\n")); + } } else { - RT_TRACE(COMP_INIT, DBG_LOUD, ("PlatformMapFile(): failed to map the file!, ndisStatus: %#X\n", ndisStatus)); + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadFile(): failed to read file attributes!, ntStatus: %#X\n", ntStatus)); } return rtStatus; @@ -366,22 +420,65 @@ PlatformMapFile( VOID PlatformUnMapFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT u1Byte* contentBuffer ) { // Relase the memory for mapping the file. - NdisUnmapFile(pFileHandler->FileHandler); + ExFreePool(contentBuffer); } + VOID PlatformCloseFile( - IN OUT PRT_FILE_HANDLER pFileHandler + IN OUT HANDLE* fileHandle ) { // Relase the memory for mapping the file. - NdisCloseFile(pFileHandler->FileHandler); + ZwClose(fileHandle); +} + +// +// Description: +// Open the file specifed and copy the file into an byte buffer, +// +RT_STATUS +PlatformReadAndMapFile( + IN UNICODE_STRING* fileName, + OUT u1Byte* outFileBuffer, + OUT u4Byte* outFileBufferLength +) +{ + RT_STATUS rtStatus = RT_STATUS_FAILURE; + HANDLE fileHandle; + RT_STATUS callStatus; + + callStatus = PlatformOpenFile(fileName, &fileHandle); + + if (callStatus == RT_STATUS_SUCCESS) { + u1Byte* fileBuffer = NULL; + u4Byte* fileBufferLength = NULL; + + callStatus = PlatformMapFile(&fileHandle, fileBuffer, fileBufferLength); + + if (callStatus == RT_STATUS_SUCCESS) { + outFileBuffer = fileBuffer; + outFileBufferLength = fileBufferLength; + rtStatus = RT_STATUS_SUCCESS; + } + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to map file!, rtStatus: %#X\n", callStatus)); + } + + PlatformCloseFile(fileHandle); + } + else { + RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to open the file!, rtStatus: %#X\n", callStatus)); + } + + return rtStatus; } + // // Description: // Indication for PHY power state changed. @@ -2722,85 +2819,6 @@ N6InitializeNative80211MIBs( Adapter->pNdisCommon->PrivacyExemptionEntrieNum = 0; } -// -// Description: -// Open the file specifed and copy the file into an array, -// -RT_STATUS -PlatformReadAndMapFile( - IN PVOID Adapter, - IN ps1Byte szFileName, - IN OUT pu1Byte pOutFile, - IN OUT pu4Byte UNALIGNED pFileSize - ) -{ - RT_STATUS rtStatus = RT_STATUS_FAILURE; - NDIS_STRING NdisStrFileName; - NDIS_PHYSICAL_ADDRESS ndisPhyAddr; - NDIS_STATUS ndisStatus; - NDIS_HANDLE hFileHandle; - UINT ulFileLength; - pu1Byte pMappedFile = NULL; - - // Check input parameters. - if(szFileName == NULL) - { - RT_TRACE(COMP_INIT, DBG_WARNING, ("PlatformReadAndMapFile(): szFileName should not be NULL!\n")); - return rtStatus; - } - - - // Convert szFileName to NDIS_STRING. - NdisInitializeString(&NdisStrFileName, (PUCHAR)szFileName); - if(NdisStrFileName.Buffer != NULL && NdisStrFileName.Length > 0) - { - // Open the file specified. - ndisPhyAddr.LowPart = ndisPhyAddr.HighPart = -1; - NdisOpenFile(&ndisStatus, - &hFileHandle, - &ulFileLength, - &NdisStrFileName, - ndisPhyAddr); - if(ndisStatus == NDIS_STATUS_SUCCESS) - { - // Map the file into memory. - NdisMapFile(&ndisStatus, (PVOID *)(&pMappedFile), hFileHandle); - if(ndisStatus == NDIS_STATUS_SUCCESS) - { - // Copy File into array - PlatformMoveMemory(pOutFile, pMappedFile, ulFileLength); - *pFileSize = ulFileLength; - - // Return Success only when Config Success - rtStatus = RT_STATUS_SUCCESS; - - // Relase the memory for mapping the file. - NdisUnmapFile(hFileHandle); - } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to map the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus)); - } - - // Close the file. - NdisCloseFile(hFileHandle); - } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): failed to open the file, %s!, ndisStatus: %#X\n", szFileName, ndisStatus)); - } - - // Release the NDIS_STRING allocated via NdisInitializeString(). - NdisFreeString(NdisStrFileName); - } - else - { - RT_TRACE(COMP_INIT, DBG_SERIOUS, ("PlatformReadAndMapFile(): NdisInitializeString() failed! szFileName: %s\n", szFileName)); - } - - return rtStatus; -} - // // Description: -- cgit v1.3.1 From d5569c08aa2818c6240744bb47a00f67f20fdb54 Mon Sep 17 00:00:00 2001 From: Adonais Romero Gonzalez Date: Mon, 1 Jul 2024 17:33:16 -0700 Subject: Standarize INF files enconding to UTF-16 (LE with BOM); renormalize files --- .gitattributes | 5 ++++- audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf | Bin 8526 -> 4123 bytes .../Source/Main/SimpleAudioSample.inx | Bin 15004 -> 7299 bytes .../TabletAudioSample/ComponentizedApoSample.inx | Bin 22624 -> 11119 bytes .../TabletAudioSample/ComponentizedAudioSample.inx | Bin 52952 -> 25853 bytes .../ComponentizedAudioSampleExtension.inx | Bin 13660 -> 6686 bytes avstream/avscamera/sys/avscamera.inx | Bin 25172 -> 12364 bytes avstream/avshws/avshws.inx | Bin 6028 -> 2905 bytes avstream/avssamp/avssamp.inx | Bin 3278 -> 1567 bytes bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx | Bin 4570 -> 2206 bytes bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx | Bin 4578 -> 2210 bytes bluetooth/serialhcibus/WDK/SerialBusWdk.inx | Bin 4732 -> 2277 bytes filesys/miniFilter/MetadataManager/fmm.inf | Bin 8292 -> 4012 bytes filesys/miniFilter/NameChanger/NameChanger.inf | Bin 9004 -> 4361 bytes filesys/miniFilter/avscan/avscan.inf | Bin 8858 -> 4274 bytes filesys/miniFilter/cancelSafe/cancelSafe.inf | Bin 8792 -> 4262 bytes filesys/miniFilter/cdo/cdo.inf | Bin 8270 -> 4004 bytes filesys/miniFilter/change/change.inf | Bin 7816 -> 3782 bytes filesys/miniFilter/ctx/ctx.inf | Bin 8252 -> 3993 bytes filesys/miniFilter/delete/delete.inf | Bin 8084 -> 3913 bytes filesys/miniFilter/minispy/minispy.inf | Bin 9920 -> 4817 bytes filesys/miniFilter/nullFilter/nullFilter.inf | Bin 7928 -> 3836 bytes filesys/miniFilter/passThrough/passThrough.inf | Bin 8116 -> 3930 bytes filesys/miniFilter/scanner/scanner.inf | Bin 8340 -> 4035 bytes filesys/miniFilter/simrep/simrep.inf | Bin 9280 -> 4496 bytes filesys/miniFilter/swapBuffers/swapBuffers.inf | Bin 8270 -> 4005 bytes .../osrfx2_DCHU_base/osrfx2_DCHU_base.inx | Bin 7898 -> 3827 bytes .../osrfx2_DCHU_component/osrfx2_DCHU_component.inx | Bin 3386 -> 1628 bytes .../osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx | Bin 3020 -> 1455 bytes .../osrfx2_DCHU_component/osrfx2_DCHU_component.inx | Bin 3386 -> 1628 bytes .../osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx | Bin 2994 -> 1442 bytes general/PLX9x5x/sys/pci9x5x.inx | Bin 5334 -> 2574 bytes .../SimpleMediaSourceDriver.inf | Bin 6768 -> 3283 bytes general/echo/kmdf/driver/AutoSync/echo.inx | Bin 4138 -> 1981 bytes general/echo/kmdf/driver/DriverSync/echo_2.inx | Bin 4272 -> 2047 bytes general/echo/umdf2/driver/AutoSync/echoum.inx | Bin 4596 -> 2198 bytes general/pcidrv/kmdf/genpci.inx | Bin 6258 -> 3028 bytes .../toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx | Bin 4794 -> 2309 bytes .../toaster/toastDrv/kmdf/bus/static/statbus.inx | Bin 4696 -> 2260 bytes general/toaster/toastDrv/kmdf/filter/filter.inx | Bin 6262 -> 3016 bytes .../toastDrv/kmdf/func/featured/wdffeatured.inx | Bin 5076 -> 2442 bytes .../toaster/toastDrv/kmdf/func/simple/wdfsimple.inx | Bin 6070 -> 2935 bytes .../toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx | Bin 3964 -> 1898 bytes general/toaster/umdf2/filter/generic/filterum.inx | Bin 4586 -> 2197 bytes .../toaster/umdf2/func/featured/wdffeaturedum.inx | Bin 4730 -> 2267 bytes general/toaster/umdf2/func/simple/wdfsimpleum.inx | Bin 4606 -> 2206 bytes gnss/gnssUmdf/gnssUmdf.inf | Bin 2672 -> 1275 bytes gpio/samples/simdevice/kmdf/simdevice.inx | Bin 3068 -> 1462 bytes gpio/samples/simdevice/umdf/simdeviceumdf.inx | Bin 3444 -> 1652 bytes gpio/samples/simgpio/simgpio.inx | Bin 3714 -> 1776 bytes gpio/samples/simgpio_i2c/simgpio_i2c.inx | Bin 3786 -> 1812 bytes hid/firefly/driver/firefly.inx | Bin 6552 -> 3155 bytes hid/hidusbfx2/sys/hidusbfx2.inx | Bin 7642 -> 3686 bytes hid/vhidmini2/driver/kmdf/vhidmini.inx | Bin 4072 -> 1945 bytes hid/vhidmini2/driver/umdf2/VhidminiUm.inx | Bin 4588 -> 2200 bytes input/kbfiltr/sys/kbfiltr.inx | Bin 4976 -> 2362 bytes input/moufiltr/moufiltr.inx | Bin 4952 -> 2350 bytes network/modem/fakemodem/mdmfake.inx | Bin 24280 -> 11875 bytes .../ndis/extension/samples/forward/msforwardext.inf | Bin 5048 -> 2442 bytes .../samples/passthrough/mspassthroughext.inf | Bin 5218 -> 2529 bytes network/ndis/filter/netlwf.inf | Bin 19952 -> 9749 bytes network/ndis/mux/driver/60/mux_mp.inf | Bin 7718 -> 3736 bytes network/ndis/mux/driver/60/muxp.inf | Bin 7380 -> 3564 bytes network/ndis/ndisprot/6x/sys/60/ndisprot60.inf | Bin 7168 -> 3475 bytes network/ndis/ndisprot/6x/sys/630/ndisprot630.inf | Bin 8974 -> 4363 bytes network/ndis/ndisprot_kmdf/60/ndisprot.inx | Bin 13478 -> 6557 bytes network/ndis/netvmini/6x/60/netvmini60.inf | Bin 6470 -> 3138 bytes network/ndis/netvmini/6x/620/netvmini620.inf | Bin 11196 -> 5460 bytes network/ndis/netvmini/6x/630/netvmini630.inf | Bin 12318 -> 6011 bytes network/ndis/netvmini/6x/680/netvmini680.inf | Bin 12314 -> 6010 bytes network/trans/inspect/sys/inspect.inf | Bin 3944 -> 1919 bytes network/trans/msnmntr/sys/msnmntr.inf | Bin 3172 -> 1538 bytes .../WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf | Bin 74380 -> 36123 bytes network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf | Bin 8266 -> 4013 bytes .../windows-drivertemplate-nfc.inf | Bin 3316 -> 1595 bytes pofx/PEP/acpi/sampleacpipep.inx | Bin 4270 -> 2053 bytes .../SingleComp/SingleComponentSingleStateUm.inx | Bin 4262 -> 2040 bytes pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx | Bin 3608 -> 1726 bytes .../SingleComp/SingleComponentFStateSample.inx | Bin 5090 -> 2456 bytes .../SampleMagneticStripeReaderDrv.inf | Bin 3040 -> 1458 bytes .../barcodescanner/SampleBarcodeScannerDrv.inf | Bin 2912 -> 1394 bytes prm/PrmFunc/prmfuncsample.inf | Bin 2780 -> 1334 bytes sd/miniport/sdhc/sdhc.inx | Bin 7856 -> 3752 bytes sensors/ADXL345Acc/ADXL345Acc.inx | Bin 4398 -> 2114 bytes sensors/Activity/Activity.inx | Bin 4250 -> 2038 bytes sensors/CustomSensors/CustomSensors.inx | Bin 4524 -> 2175 bytes sensors/Fusion/FusionSensor.inx | Bin 4458 -> 2142 bytes sensors/Pedometer/Pedometer.inx | Bin 4302 -> 2064 bytes sensors/SensorsComboDriver/SensorsComboDriver.inx | Bin 4746 -> 2289 bytes .../SimpleDeviceOrientationSensor.inx | Bin 5444 -> 2635 bytes serial/VirtualSerial2/ComPort/virtualserial2um.inx | Bin 6316 -> 3053 bytes serial/VirtualSerial2/FakeModem/fakemodem2um.inx | Bin 16818 -> 8209 bytes serial/serial/serial.inx | Bin 5586 -> 2696 bytes simbatt/func/simbatt.inx | Bin 3946 -> 1891 bytes smartcrd/pscr/pscr.inx | Bin 6898 -> 3322 bytes spb/SkeletonI2C/skeletoni2c.inx | Bin 3914 -> 1883 bytes spb/SpbTestTool/sys/spbtesttool.inx | Bin 4846 -> 2334 bytes storage/msdsm/src/SampleDSM.inf | Bin 4388 -> 2108 bytes thermal/simsensor/simsensor.inf | Bin 5570 -> 2689 bytes thermal/thermalclient/simtc.inf | Bin 3860 -> 1852 bytes .../DV-FailDriver-WDM/driver/defect_toastmon.inf | Bin 3674 -> 1765 bytes usb/UcmCxUcsi/UcmCxUcsi.inf | Bin 3940 -> 1896 bytes .../UcmTcpciCxClientSample.inf | Bin 3352 -> 1616 bytes .../UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf | Bin 3250 -> 1563 bytes usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx | Bin 5330 -> 2567 bytes usb/kmdf_fx2/driver/osrusbfx2.inx | Bin 7006 -> 3386 bytes usb/ufxclientsample/UfxClientSample.inx | Bin 4470 -> 2156 bytes usb/umdf2_fx2/driver/osrusbfx2um.inx | Bin 6012 -> 2903 bytes usb/usbsamp/sys/driver/usbsamp.inx | Bin 5820 -> 2812 bytes usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx | Bin 5046 -> 2423 bytes usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx | Bin 5042 -> 2422 bytes usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx | Bin 5042 -> 2422 bytes usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx | Bin 5042 -> 2422 bytes usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx | Bin 5042 -> 2422 bytes .../IddSampleDriver/IddSampleDriver.inf | Bin 4198 -> 2026 bytes wia/ProdScan/ProdScan.inx | Bin 3786 -> 1825 bytes wia/microdrv/testmcro.inx | Bin 3292 -> 1580 bytes wia/wiadriverex/usd/WiaDriver.inx | Bin 7566 -> 3682 bytes wmi/wmisamp/wmisamp.inx | Bin 5212 -> 2501 bytes 119 files changed, 4 insertions(+), 1 deletion(-) (limited to 'network/wlan') diff --git a/.gitattributes b/.gitattributes index 84b1bf11..a59c7386 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,6 +24,10 @@ *.vcxproj text eol=crlf *.xaml text eol=crlf +# Declare files that are encoded in UTF-16 +*.inf text diff working-tree-encoding=UTF-16LE-BOM eol=crlf +*.inx text diff working-tree-encoding=UTF-16LE-BOM eol=crlf + ############################################################################### # Set default behavior for command prompt diff. # @@ -32,4 +36,3 @@ # Note: This is only used by command line ############################################################################### *.cs diff=csharp - diff --git a/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf b/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf index 889f9bdb..0bc5fe23 100644 Binary files a/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf and b/audio/Acx/Samples/AudioCodec/Driver/AudioCodec.inf differ diff --git a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx index d0835f1f..db2b62c1 100644 Binary files a/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx and b/audio/simpleaudiosample/Source/Main/SimpleAudioSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx index 7c08f86a..2cda2dae 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx and b/audio/sysvad/TabletAudioSample/ComponentizedApoSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx index 1c638273..c6655868 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx and b/audio/sysvad/TabletAudioSample/ComponentizedAudioSample.inx differ diff --git a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx index 2ce2f6a0..7511017c 100644 Binary files a/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx and b/audio/sysvad/TabletAudioSample/ComponentizedAudioSampleExtension.inx differ diff --git a/avstream/avscamera/sys/avscamera.inx b/avstream/avscamera/sys/avscamera.inx index f75da695..a7c58505 100644 Binary files a/avstream/avscamera/sys/avscamera.inx and b/avstream/avscamera/sys/avscamera.inx differ diff --git a/avstream/avshws/avshws.inx b/avstream/avshws/avshws.inx index 9409635d..a2d94aba 100644 Binary files a/avstream/avshws/avshws.inx and b/avstream/avshws/avshws.inx differ diff --git a/avstream/avssamp/avssamp.inx b/avstream/avssamp/avssamp.inx index c06925ea..0036dc50 100644 Binary files a/avstream/avssamp/avssamp.inx and b/avstream/avssamp/avssamp.inx differ diff --git a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx index 6f326ff3..1002f10d 100644 Binary files a/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx and b/bluetooth/bthecho/bthcli/sys/BthEchoSampleCli.inx differ diff --git a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx index 3079c6d0..ea9238e1 100644 Binary files a/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx and b/bluetooth/bthecho/bthsrv/sys/BthEchoSampleSrv.inx differ diff --git a/bluetooth/serialhcibus/WDK/SerialBusWdk.inx b/bluetooth/serialhcibus/WDK/SerialBusWdk.inx index 27f70ab6..813c52f1 100644 Binary files a/bluetooth/serialhcibus/WDK/SerialBusWdk.inx and b/bluetooth/serialhcibus/WDK/SerialBusWdk.inx differ diff --git a/filesys/miniFilter/MetadataManager/fmm.inf b/filesys/miniFilter/MetadataManager/fmm.inf index ad231a8c..63f0bd4b 100644 Binary files a/filesys/miniFilter/MetadataManager/fmm.inf and b/filesys/miniFilter/MetadataManager/fmm.inf differ diff --git a/filesys/miniFilter/NameChanger/NameChanger.inf b/filesys/miniFilter/NameChanger/NameChanger.inf index 7c0b2364..b4474bb1 100644 Binary files a/filesys/miniFilter/NameChanger/NameChanger.inf and b/filesys/miniFilter/NameChanger/NameChanger.inf differ diff --git a/filesys/miniFilter/avscan/avscan.inf b/filesys/miniFilter/avscan/avscan.inf index cfc9c9ab..8c1e329d 100644 Binary files a/filesys/miniFilter/avscan/avscan.inf and b/filesys/miniFilter/avscan/avscan.inf differ diff --git a/filesys/miniFilter/cancelSafe/cancelSafe.inf b/filesys/miniFilter/cancelSafe/cancelSafe.inf index 69d0ccf1..5367e66e 100644 Binary files a/filesys/miniFilter/cancelSafe/cancelSafe.inf and b/filesys/miniFilter/cancelSafe/cancelSafe.inf differ diff --git a/filesys/miniFilter/cdo/cdo.inf b/filesys/miniFilter/cdo/cdo.inf index cdac24d9..37af1d59 100644 Binary files a/filesys/miniFilter/cdo/cdo.inf and b/filesys/miniFilter/cdo/cdo.inf differ diff --git a/filesys/miniFilter/change/change.inf b/filesys/miniFilter/change/change.inf index e7da4250..6a1923d2 100644 Binary files a/filesys/miniFilter/change/change.inf and b/filesys/miniFilter/change/change.inf differ diff --git a/filesys/miniFilter/ctx/ctx.inf b/filesys/miniFilter/ctx/ctx.inf index 8edaf764..bc637613 100644 Binary files a/filesys/miniFilter/ctx/ctx.inf and b/filesys/miniFilter/ctx/ctx.inf differ diff --git a/filesys/miniFilter/delete/delete.inf b/filesys/miniFilter/delete/delete.inf index da348874..e0c8c04c 100644 Binary files a/filesys/miniFilter/delete/delete.inf and b/filesys/miniFilter/delete/delete.inf differ diff --git a/filesys/miniFilter/minispy/minispy.inf b/filesys/miniFilter/minispy/minispy.inf index 60eb8684..a368bd75 100644 Binary files a/filesys/miniFilter/minispy/minispy.inf and b/filesys/miniFilter/minispy/minispy.inf differ diff --git a/filesys/miniFilter/nullFilter/nullFilter.inf b/filesys/miniFilter/nullFilter/nullFilter.inf index c04e9f06..1fffa028 100644 Binary files a/filesys/miniFilter/nullFilter/nullFilter.inf and b/filesys/miniFilter/nullFilter/nullFilter.inf differ diff --git a/filesys/miniFilter/passThrough/passThrough.inf b/filesys/miniFilter/passThrough/passThrough.inf index 129a2ab6..f77c3e4c 100644 Binary files a/filesys/miniFilter/passThrough/passThrough.inf and b/filesys/miniFilter/passThrough/passThrough.inf differ diff --git a/filesys/miniFilter/scanner/scanner.inf b/filesys/miniFilter/scanner/scanner.inf index d7bf6256..b7c3ac9e 100644 Binary files a/filesys/miniFilter/scanner/scanner.inf and b/filesys/miniFilter/scanner/scanner.inf differ diff --git a/filesys/miniFilter/simrep/simrep.inf b/filesys/miniFilter/simrep/simrep.inf index 8eea42ce..76aa1f0c 100644 Binary files a/filesys/miniFilter/simrep/simrep.inf and b/filesys/miniFilter/simrep/simrep.inf differ diff --git a/filesys/miniFilter/swapBuffers/swapBuffers.inf b/filesys/miniFilter/swapBuffers/swapBuffers.inf index 0aab9452..e5acbdd3 100644 Binary files a/filesys/miniFilter/swapBuffers/swapBuffers.inf and b/filesys/miniFilter/swapBuffers/swapBuffers.inf differ diff --git a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.inx b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.inx index 39bd5468..eca5c5cc 100644 Binary files a/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.inx and b/general/DCHU/osrfx2_DCHU_base/osrfx2_DCHU_base/osrfx2_DCHU_base.inx differ diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.inx b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.inx index 045fc91f..cc9e43a9 100644 Binary files a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.inx and b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_component/osrfx2_DCHU_component.inx differ diff --git a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx index a762b235..d824d08b 100644 Binary files a/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx and b/general/DCHU/osrfx2_DCHU_extension_loose/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx differ diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_component/osrfx2_DCHU_component.inx b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_component/osrfx2_DCHU_component.inx index 045fc91f..cc9e43a9 100644 Binary files a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_component/osrfx2_DCHU_component.inx and b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_component/osrfx2_DCHU_component.inx differ diff --git a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx index 17670efa..a8f2a505 100644 Binary files a/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx and b/general/DCHU/osrfx2_DCHU_extension_tight/osrfx2_DCHU_extension/osrfx2_DCHU_extension.inx differ diff --git a/general/PLX9x5x/sys/pci9x5x.inx b/general/PLX9x5x/sys/pci9x5x.inx index 8fdb2eea..0d98041d 100644 Binary files a/general/PLX9x5x/sys/pci9x5x.inx and b/general/PLX9x5x/sys/pci9x5x.inx differ diff --git a/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf b/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf index d9f05402..aa21c882 100644 Binary files a/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf and b/general/SimpleMediaSource/SimpleMediaSourceDriver/SimpleMediaSourceDriver.inf differ diff --git a/general/echo/kmdf/driver/AutoSync/echo.inx b/general/echo/kmdf/driver/AutoSync/echo.inx index cd83b6c0..60be19a8 100644 Binary files a/general/echo/kmdf/driver/AutoSync/echo.inx and b/general/echo/kmdf/driver/AutoSync/echo.inx differ diff --git a/general/echo/kmdf/driver/DriverSync/echo_2.inx b/general/echo/kmdf/driver/DriverSync/echo_2.inx index b4cf3c25..73987894 100644 Binary files a/general/echo/kmdf/driver/DriverSync/echo_2.inx and b/general/echo/kmdf/driver/DriverSync/echo_2.inx differ diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx index 00320858..9962e6c2 100644 Binary files a/general/echo/umdf2/driver/AutoSync/echoum.inx and b/general/echo/umdf2/driver/AutoSync/echoum.inx differ diff --git a/general/pcidrv/kmdf/genpci.inx b/general/pcidrv/kmdf/genpci.inx index f8581414..1c474ca2 100644 Binary files a/general/pcidrv/kmdf/genpci.inx and b/general/pcidrv/kmdf/genpci.inx differ diff --git a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx index f557b6e3..e42b1969 100644 Binary files a/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx and b/general/toaster/toastDrv/kmdf/bus/dynamic/dynambus.inx differ diff --git a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx index 094bce09..8f433735 100644 Binary files a/general/toaster/toastDrv/kmdf/bus/static/statbus.inx and b/general/toaster/toastDrv/kmdf/bus/static/statbus.inx differ diff --git a/general/toaster/toastDrv/kmdf/filter/filter.inx b/general/toaster/toastDrv/kmdf/filter/filter.inx index 8a2ca006..31c6cf93 100644 Binary files a/general/toaster/toastDrv/kmdf/filter/filter.inx and b/general/toaster/toastDrv/kmdf/filter/filter.inx differ diff --git a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx index b91edc1b..7310ceb2 100644 Binary files a/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx and b/general/toaster/toastDrv/kmdf/func/featured/wdffeatured.inx differ diff --git a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx index 549f20e1..203e251f 100644 Binary files a/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx and b/general/toaster/toastDrv/kmdf/func/simple/wdfsimple.inx differ diff --git a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx index 0c1a410b..384344c0 100644 Binary files a/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx and b/general/toaster/toastDrv/kmdf/toastmon/wdftoastmon.inx differ diff --git a/general/toaster/umdf2/filter/generic/filterum.inx b/general/toaster/umdf2/filter/generic/filterum.inx index e7e04b65..fad4882d 100644 Binary files a/general/toaster/umdf2/filter/generic/filterum.inx and b/general/toaster/umdf2/filter/generic/filterum.inx differ diff --git a/general/toaster/umdf2/func/featured/wdffeaturedum.inx b/general/toaster/umdf2/func/featured/wdffeaturedum.inx index 7b5f9c07..f93fcf91 100644 Binary files a/general/toaster/umdf2/func/featured/wdffeaturedum.inx and b/general/toaster/umdf2/func/featured/wdffeaturedum.inx differ diff --git a/general/toaster/umdf2/func/simple/wdfsimpleum.inx b/general/toaster/umdf2/func/simple/wdfsimpleum.inx index e07cf3a1..10f52074 100644 Binary files a/general/toaster/umdf2/func/simple/wdfsimpleum.inx and b/general/toaster/umdf2/func/simple/wdfsimpleum.inx differ diff --git a/gnss/gnssUmdf/gnssUmdf.inf b/gnss/gnssUmdf/gnssUmdf.inf index b7f3363e..e3815c9e 100644 Binary files a/gnss/gnssUmdf/gnssUmdf.inf and b/gnss/gnssUmdf/gnssUmdf.inf differ diff --git a/gpio/samples/simdevice/kmdf/simdevice.inx b/gpio/samples/simdevice/kmdf/simdevice.inx index c758f27a..cdb02c81 100644 Binary files a/gpio/samples/simdevice/kmdf/simdevice.inx and b/gpio/samples/simdevice/kmdf/simdevice.inx differ diff --git a/gpio/samples/simdevice/umdf/simdeviceumdf.inx b/gpio/samples/simdevice/umdf/simdeviceumdf.inx index 587cd604..1cfda2e7 100644 Binary files a/gpio/samples/simdevice/umdf/simdeviceumdf.inx and b/gpio/samples/simdevice/umdf/simdeviceumdf.inx differ diff --git a/gpio/samples/simgpio/simgpio.inx b/gpio/samples/simgpio/simgpio.inx index fd8a4c18..7cd926a1 100644 Binary files a/gpio/samples/simgpio/simgpio.inx and b/gpio/samples/simgpio/simgpio.inx differ diff --git a/gpio/samples/simgpio_i2c/simgpio_i2c.inx b/gpio/samples/simgpio_i2c/simgpio_i2c.inx index 7706cfbf..e57a67d3 100644 Binary files a/gpio/samples/simgpio_i2c/simgpio_i2c.inx and b/gpio/samples/simgpio_i2c/simgpio_i2c.inx differ diff --git a/hid/firefly/driver/firefly.inx b/hid/firefly/driver/firefly.inx index caab90fc..aec3a013 100644 Binary files a/hid/firefly/driver/firefly.inx and b/hid/firefly/driver/firefly.inx differ diff --git a/hid/hidusbfx2/sys/hidusbfx2.inx b/hid/hidusbfx2/sys/hidusbfx2.inx index f45b9708..b4944828 100644 Binary files a/hid/hidusbfx2/sys/hidusbfx2.inx and b/hid/hidusbfx2/sys/hidusbfx2.inx differ diff --git a/hid/vhidmini2/driver/kmdf/vhidmini.inx b/hid/vhidmini2/driver/kmdf/vhidmini.inx index e126977f..98ad43ec 100644 Binary files a/hid/vhidmini2/driver/kmdf/vhidmini.inx and b/hid/vhidmini2/driver/kmdf/vhidmini.inx differ diff --git a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx index aa617a3f..92cdd4b9 100644 Binary files a/hid/vhidmini2/driver/umdf2/VhidminiUm.inx and b/hid/vhidmini2/driver/umdf2/VhidminiUm.inx differ diff --git a/input/kbfiltr/sys/kbfiltr.inx b/input/kbfiltr/sys/kbfiltr.inx index 1412bc67..c489caf0 100644 Binary files a/input/kbfiltr/sys/kbfiltr.inx and b/input/kbfiltr/sys/kbfiltr.inx differ diff --git a/input/moufiltr/moufiltr.inx b/input/moufiltr/moufiltr.inx index c3cf47c4..92aea951 100644 Binary files a/input/moufiltr/moufiltr.inx and b/input/moufiltr/moufiltr.inx differ diff --git a/network/modem/fakemodem/mdmfake.inx b/network/modem/fakemodem/mdmfake.inx index ea95a9ad..29629983 100644 Binary files a/network/modem/fakemodem/mdmfake.inx and b/network/modem/fakemodem/mdmfake.inx differ diff --git a/network/ndis/extension/samples/forward/msforwardext.inf b/network/ndis/extension/samples/forward/msforwardext.inf index 4af1b0fb..be4d37dc 100644 Binary files a/network/ndis/extension/samples/forward/msforwardext.inf and b/network/ndis/extension/samples/forward/msforwardext.inf differ diff --git a/network/ndis/extension/samples/passthrough/mspassthroughext.inf b/network/ndis/extension/samples/passthrough/mspassthroughext.inf index 8339e7c8..71ecfbe8 100644 Binary files a/network/ndis/extension/samples/passthrough/mspassthroughext.inf and b/network/ndis/extension/samples/passthrough/mspassthroughext.inf differ diff --git a/network/ndis/filter/netlwf.inf b/network/ndis/filter/netlwf.inf index e59b56fb..42a80912 100644 Binary files a/network/ndis/filter/netlwf.inf and b/network/ndis/filter/netlwf.inf differ diff --git a/network/ndis/mux/driver/60/mux_mp.inf b/network/ndis/mux/driver/60/mux_mp.inf index f216ac16..5c0944bb 100644 Binary files a/network/ndis/mux/driver/60/mux_mp.inf and b/network/ndis/mux/driver/60/mux_mp.inf differ diff --git a/network/ndis/mux/driver/60/muxp.inf b/network/ndis/mux/driver/60/muxp.inf index f9c4c04e..ea09e77d 100644 Binary files a/network/ndis/mux/driver/60/muxp.inf and b/network/ndis/mux/driver/60/muxp.inf differ diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf index bae3936c..7022c0e6 100644 Binary files a/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf and b/network/ndis/ndisprot/6x/sys/60/ndisprot60.inf differ diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf index c5d7adb6..6a3e7da1 100644 Binary files a/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf and b/network/ndis/ndisprot/6x/sys/630/ndisprot630.inf differ diff --git a/network/ndis/ndisprot_kmdf/60/ndisprot.inx b/network/ndis/ndisprot_kmdf/60/ndisprot.inx index ecd932c1..1c5762f1 100644 Binary files a/network/ndis/ndisprot_kmdf/60/ndisprot.inx and b/network/ndis/ndisprot_kmdf/60/ndisprot.inx differ diff --git a/network/ndis/netvmini/6x/60/netvmini60.inf b/network/ndis/netvmini/6x/60/netvmini60.inf index 63382e9b..31361685 100644 Binary files a/network/ndis/netvmini/6x/60/netvmini60.inf and b/network/ndis/netvmini/6x/60/netvmini60.inf differ diff --git a/network/ndis/netvmini/6x/620/netvmini620.inf b/network/ndis/netvmini/6x/620/netvmini620.inf index 4dc1c9b6..f2ece226 100644 Binary files a/network/ndis/netvmini/6x/620/netvmini620.inf and b/network/ndis/netvmini/6x/620/netvmini620.inf differ diff --git a/network/ndis/netvmini/6x/630/netvmini630.inf b/network/ndis/netvmini/6x/630/netvmini630.inf index eb7d61c8..40db5135 100644 Binary files a/network/ndis/netvmini/6x/630/netvmini630.inf and b/network/ndis/netvmini/6x/630/netvmini630.inf differ diff --git a/network/ndis/netvmini/6x/680/netvmini680.inf b/network/ndis/netvmini/6x/680/netvmini680.inf index 4160c520..5da91049 100644 Binary files a/network/ndis/netvmini/6x/680/netvmini680.inf and b/network/ndis/netvmini/6x/680/netvmini680.inf differ diff --git a/network/trans/inspect/sys/inspect.inf b/network/trans/inspect/sys/inspect.inf index cf7f7e76..1a1aa466 100644 Binary files a/network/trans/inspect/sys/inspect.inf and b/network/trans/inspect/sys/inspect.inf differ diff --git a/network/trans/msnmntr/sys/msnmntr.inf b/network/trans/msnmntr/sys/msnmntr.inf index 38589761..e3ec3563 100644 Binary files a/network/trans/msnmntr/sys/msnmntr.inf and b/network/trans/msnmntr/sys/msnmntr.inf differ 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 Binary files a/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf and b/network/wlan/WDI/PLATFORM/WinInf/SDIO/x64/netrtwlans.inf differ diff --git a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf index 48f893c6..496e5c6a 100644 Binary files a/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf and b/network/wwan/cxwmbclass/cxwmbclass/cxwmbclass.inf differ diff --git a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf index 5d1afa6e..38d5d022 100644 Binary files a/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf and b/nfc/NfcCxSample/windows-drivertemplate-nfc/windows-drivertemplate-nfc.inf differ diff --git a/pofx/PEP/acpi/sampleacpipep.inx b/pofx/PEP/acpi/sampleacpipep.inx index 9f93ad5b..94063ad0 100644 Binary files a/pofx/PEP/acpi/sampleacpipep.inx and b/pofx/PEP/acpi/sampleacpipep.inx differ diff --git a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx index ffdf5414..2a8dffc1 100644 Binary files a/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx and b/pofx/UMDF2/Driver/SingleComp/SingleComponentSingleStateUm.inx differ diff --git a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx index 4642ce27..5bd9ee1c 100644 Binary files a/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx and b/pofx/WDF/Driver/MultiComp/driver/WdfMultiComp.inx differ diff --git a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx index adaa2411..7f99b48c 100644 Binary files a/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx and b/pofx/WDF/Driver/SingleComp/SingleComponentFStateSample.inx differ diff --git a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.inf b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.inf index 1dbdcc58..94a9bd03 100644 Binary files a/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.inf and b/pos/drivers/MagneticStripeReader/SampleMagneticStripeReaderDrv.inf differ diff --git a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.inf b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.inf index 28a173ea..835a550a 100644 Binary files a/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.inf and b/pos/drivers/barcodescanner/SampleBarcodeScannerDrv.inf differ diff --git a/prm/PrmFunc/prmfuncsample.inf b/prm/PrmFunc/prmfuncsample.inf index bdd78384..f583ca59 100644 Binary files a/prm/PrmFunc/prmfuncsample.inf and b/prm/PrmFunc/prmfuncsample.inf differ diff --git a/sd/miniport/sdhc/sdhc.inx b/sd/miniport/sdhc/sdhc.inx index 50026a87..379978b1 100644 Binary files a/sd/miniport/sdhc/sdhc.inx and b/sd/miniport/sdhc/sdhc.inx differ diff --git a/sensors/ADXL345Acc/ADXL345Acc.inx b/sensors/ADXL345Acc/ADXL345Acc.inx index 73fd9d97..a2f05fb6 100644 Binary files a/sensors/ADXL345Acc/ADXL345Acc.inx and b/sensors/ADXL345Acc/ADXL345Acc.inx differ diff --git a/sensors/Activity/Activity.inx b/sensors/Activity/Activity.inx index 5d111d86..7570a42c 100644 Binary files a/sensors/Activity/Activity.inx and b/sensors/Activity/Activity.inx differ diff --git a/sensors/CustomSensors/CustomSensors.inx b/sensors/CustomSensors/CustomSensors.inx index 86438b0d..ff288b6f 100644 Binary files a/sensors/CustomSensors/CustomSensors.inx and b/sensors/CustomSensors/CustomSensors.inx differ diff --git a/sensors/Fusion/FusionSensor.inx b/sensors/Fusion/FusionSensor.inx index 44d590c4..21419ef8 100644 Binary files a/sensors/Fusion/FusionSensor.inx and b/sensors/Fusion/FusionSensor.inx differ diff --git a/sensors/Pedometer/Pedometer.inx b/sensors/Pedometer/Pedometer.inx index 91a304bf..16a752c2 100644 Binary files a/sensors/Pedometer/Pedometer.inx and b/sensors/Pedometer/Pedometer.inx differ diff --git a/sensors/SensorsComboDriver/SensorsComboDriver.inx b/sensors/SensorsComboDriver/SensorsComboDriver.inx index 699be4de..00c1eebf 100644 Binary files a/sensors/SensorsComboDriver/SensorsComboDriver.inx and b/sensors/SensorsComboDriver/SensorsComboDriver.inx differ diff --git a/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx b/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx index b2ccfaba..9ea73281 100644 Binary files a/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx and b/sensors/SimpleDeviceOrientationSensor/SimpleDeviceOrientationSensor.inx differ diff --git a/serial/VirtualSerial2/ComPort/virtualserial2um.inx b/serial/VirtualSerial2/ComPort/virtualserial2um.inx index 6679d7ab..f40e466d 100644 Binary files a/serial/VirtualSerial2/ComPort/virtualserial2um.inx and b/serial/VirtualSerial2/ComPort/virtualserial2um.inx differ diff --git a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx index 235bdddd..ecb8f875 100644 Binary files a/serial/VirtualSerial2/FakeModem/fakemodem2um.inx and b/serial/VirtualSerial2/FakeModem/fakemodem2um.inx differ diff --git a/serial/serial/serial.inx b/serial/serial/serial.inx index d6bfc3bb..2b26d20b 100644 Binary files a/serial/serial/serial.inx and b/serial/serial/serial.inx differ diff --git a/simbatt/func/simbatt.inx b/simbatt/func/simbatt.inx index 5aab816a..c628040b 100644 Binary files a/simbatt/func/simbatt.inx and b/simbatt/func/simbatt.inx differ diff --git a/smartcrd/pscr/pscr.inx b/smartcrd/pscr/pscr.inx index ad9040fe..5e62eee6 100644 Binary files a/smartcrd/pscr/pscr.inx and b/smartcrd/pscr/pscr.inx differ diff --git a/spb/SkeletonI2C/skeletoni2c.inx b/spb/SkeletonI2C/skeletoni2c.inx index 056423f9..67ca6582 100644 Binary files a/spb/SkeletonI2C/skeletoni2c.inx and b/spb/SkeletonI2C/skeletoni2c.inx differ diff --git a/spb/SpbTestTool/sys/spbtesttool.inx b/spb/SpbTestTool/sys/spbtesttool.inx index baf82127..b52c4ccc 100644 Binary files a/spb/SpbTestTool/sys/spbtesttool.inx and b/spb/SpbTestTool/sys/spbtesttool.inx differ diff --git a/storage/msdsm/src/SampleDSM.inf b/storage/msdsm/src/SampleDSM.inf index a820c7ec..f0dbb34d 100644 Binary files a/storage/msdsm/src/SampleDSM.inf and b/storage/msdsm/src/SampleDSM.inf differ diff --git a/thermal/simsensor/simsensor.inf b/thermal/simsensor/simsensor.inf index 2b9a4394..f1aa5512 100644 Binary files a/thermal/simsensor/simsensor.inf and b/thermal/simsensor/simsensor.inf differ diff --git a/thermal/thermalclient/simtc.inf b/thermal/thermalclient/simtc.inf index 7c27c1d2..e015a83c 100644 Binary files a/thermal/thermalclient/simtc.inf and b/thermal/thermalclient/simtc.inf differ diff --git a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf index edb7ee89..e577f586 100644 Binary files a/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf and b/tools/dv/samples/DV-FailDriver-WDM/driver/defect_toastmon.inf differ diff --git a/usb/UcmCxUcsi/UcmCxUcsi.inf b/usb/UcmCxUcsi/UcmCxUcsi.inf index 661424db..e238ba06 100644 Binary files a/usb/UcmCxUcsi/UcmCxUcsi.inf and b/usb/UcmCxUcsi/UcmCxUcsi.inf differ diff --git a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf index 5a526ab9..6ee60372 100644 Binary files a/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf and b/usb/UcmTcpciCxClientSample/UcmTcpciCxClientSample.inf differ diff --git a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf index c52e7865..39b3c16a 100644 Binary files a/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf and b/usb/UcmUcsiAcpiSample/UcmUcsiAcpiSample/UcmUcsiAcpiSample.inf differ diff --git a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx index d9d1366b..eb3c3c4b 100644 Binary files a/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx and b/usb/kmdf_enumswitches/sys/kmdf_enumswitches.inx differ diff --git a/usb/kmdf_fx2/driver/osrusbfx2.inx b/usb/kmdf_fx2/driver/osrusbfx2.inx index 1185053e..b30e6dc9 100644 Binary files a/usb/kmdf_fx2/driver/osrusbfx2.inx and b/usb/kmdf_fx2/driver/osrusbfx2.inx differ diff --git a/usb/ufxclientsample/UfxClientSample.inx b/usb/ufxclientsample/UfxClientSample.inx index 01c37a10..357bf788 100644 Binary files a/usb/ufxclientsample/UfxClientSample.inx and b/usb/ufxclientsample/UfxClientSample.inx differ diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx index 737295b0..de08b136 100644 Binary files a/usb/umdf2_fx2/driver/osrusbfx2um.inx and b/usb/umdf2_fx2/driver/osrusbfx2um.inx differ diff --git a/usb/usbsamp/sys/driver/usbsamp.inx b/usb/usbsamp/sys/driver/usbsamp.inx index 57dc4bf3..1dfa8473 100644 Binary files a/usb/usbsamp/sys/driver/usbsamp.inx and b/usb/usbsamp/sys/driver/usbsamp.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx index 0fc45d1a..3d5fe521 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step1/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx index f7e12d74..4805bc9c 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step2/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx index f7e12d74..4805bc9c 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step3/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx index f7e12d74..4805bc9c 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step4/osrusbfx2.inx differ diff --git a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx index f7e12d74..4805bc9c 100644 Binary files a/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx and b/usb/wdf_osrfx2_lab/kmdf/step5/osrusbfx2.inx differ diff --git a/video/IndirectDisplay/IddSampleDriver/IddSampleDriver.inf b/video/IndirectDisplay/IddSampleDriver/IddSampleDriver.inf index dc63f6ad..4edee6b8 100644 Binary files a/video/IndirectDisplay/IddSampleDriver/IddSampleDriver.inf and b/video/IndirectDisplay/IddSampleDriver/IddSampleDriver.inf differ diff --git a/wia/ProdScan/ProdScan.inx b/wia/ProdScan/ProdScan.inx index 6e8036ef..f27b79b9 100644 Binary files a/wia/ProdScan/ProdScan.inx and b/wia/ProdScan/ProdScan.inx differ diff --git a/wia/microdrv/testmcro.inx b/wia/microdrv/testmcro.inx index 86e3d220..3d084142 100644 Binary files a/wia/microdrv/testmcro.inx and b/wia/microdrv/testmcro.inx differ diff --git a/wia/wiadriverex/usd/WiaDriver.inx b/wia/wiadriverex/usd/WiaDriver.inx index 5d394e80..f527cde2 100644 Binary files a/wia/wiadriverex/usd/WiaDriver.inx and b/wia/wiadriverex/usd/WiaDriver.inx differ diff --git a/wmi/wmisamp/wmisamp.inx b/wmi/wmisamp/wmisamp.inx index bdf4152f..3b6250b9 100644 Binary files a/wmi/wmisamp/wmisamp.inx and b/wmi/wmisamp/wmisamp.inx differ -- cgit v1.3.1 From b20980a63d4d35794c5266fef6b96f9199ab83d0 Mon Sep 17 00:00:00 2001 From: Wei Mao Date: Thu, 20 Mar 2025 13:25:54 -0700 Subject: Update samples to use WDF v15+ --- general/ioctl/kmdf/exe/nonpnpapp.vcxproj | 26 ----------- .../ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj | 50 +++++++++++----------- .../WDI/PLATFORM/NDIS6/SDIO/n6c_sdio.inc.props | 2 +- 3 files changed, 26 insertions(+), 52 deletions(-) (limited to 'network/wlan') diff --git a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj index 83b8dacb..85fb0878 100644 --- a/general/ioctl/kmdf/exe/nonpnpapp.vcxproj +++ b/general/ioctl/kmdf/exe/nonpnpapp.vcxproj @@ -21,8 +21,6 @@ {18A38FF8-1227-4F3B-997B-A83A6E4CFD20} $(MSBuildProjectName) - 1 - 11 Debug x64 {F5414C9C-6CDE-4673-879E-27AD5A30C4C5} @@ -99,20 +97,14 @@ %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 sha256 @@ -124,20 +116,14 @@ %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 sha256 @@ -149,20 +135,14 @@ %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 sha256 @@ -174,20 +154,14 @@ %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 %(AdditionalIncludeDirectories);..\sys - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 sha256 diff --git a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj index 82f995bd..629ce98a 100644 --- a/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj +++ b/network/ndis/ndisprot_kmdf/notifyob/ProtNotify.vcxproj @@ -22,7 +22,7 @@ {E92C4A1E-396E-4CAF-A5DB-44901F07C515} $(MSBuildProjectName) 1 - 11 + 15 false true Debug @@ -213,16 +213,16 @@ - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 ProtNotify.def @@ -230,16 +230,16 @@ - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 ProtNotify.def @@ -247,16 +247,16 @@ - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 ProtNotify.def @@ -264,16 +264,16 @@ - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 - %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=11 - %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.11 + %(PreprocessorDefinitions);KMDF_VERSION_MAJOR=1;KMDF_VERSION_MINOR=15 + %(AdditionalIncludeDirectories);$(WDKContentRoot)\Include\wdf\kmdf\1.15 ProtNotify.def diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/n6c_sdio.inc.props b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/n6c_sdio.inc.props index 95559b3c..48fb4917 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/n6c_sdio.inc.props +++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/n6c_sdio.inc.props @@ -17,7 +17,7 @@ 11 11 - 13 + 15 -DNDIS_MINIPORT_DRIVER -DNDIS60_MINIPORT=1 -DBINARY_COMPATIBLE=0 -DUSE_KLOCKS=1 -DNDIS_MINIPORT_DRIVER -DNDIS60_MINIPORT=1 -DNDIS61_MINIPORT=1 -DNDIS620_MINIPORT=1 -DBINARY_COMPATIBLE=0 -DUSE_KLOCKS=1 -- cgit v1.3.1