diff options
| author | Jakob Lichtenberg <[email protected]> | 2025-04-01 17:04:36 -0700 |
|---|---|---|
| committer | Jakob Lichtenberg <[email protected]> | 2025-04-01 17:04:36 -0700 |
| commit | 38e10591ece2141ba2265d89a134bac25d88eca0 (patch) | |
| tree | 252d443a3a38dad0ecb9db09ce2490fb88f07f5f | |
| parent | fd2e0aaf97c2a31d1bcb608a96e68171e6308d69 (diff) | |
| parent | 377403a674ece9688631149a35adca7fe07d0115 (diff) | |
Merge branch 'main' into prahant/pc_loadletter_03012prahant/pc_loadletter_03012
| -rw-r--r-- | .github/workflows/Code-Scanning.yml | 23 | ||||
| -rw-r--r-- | avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp | 2 | ||||
| -rw-r--r-- | avstream/sampledevicemft/dllmain.cpp | 2 | ||||
| -rw-r--r-- | avstream/sampledevicemft/multipinmft.vcxproj | 26 | ||||
| -rw-r--r-- | avstream/sampledevicemft/multipinmftutils.cpp | 2 | ||||
| -rw-r--r-- | network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp | 2 | ||||
| -rw-r--r-- | serial/VirtualSerial2/queue.c | 4 |
7 files changed, 31 insertions, 30 deletions
diff --git a/.github/workflows/Code-Scanning.yml b/.github/workflows/Code-Scanning.yml index 72e9c32c..63e155c9 100644 --- a/.github/workflows/Code-Scanning.yml +++ b/.github/workflows/Code-Scanning.yml @@ -35,7 +35,9 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'cpp' ] + include: + - language: c-cpp + build-mode: manual steps: - name: Checkout repository @@ -44,20 +46,31 @@ jobs: submodules: 'recursive' - name: Install Nuget Packages run: nuget restore .\packages.config -PackagesDirectory .\packages\ - + - name: Get changed files + id: get-changed-files + uses: tj-actions/changed-files@v41 + with: + separator: "," - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} config-file: microsoft/Windows-Driver-Developer-Supplemental-Tools/config/codeql-config.yml@development - packs: +microsoft/[email protected] - - name: Retrieve and build all available solutions + - if: github.event_name == 'pull_request' + run: | + $changedFiles = "${{ steps.get-changed-files.outputs.all_changed_files }}".Split(',') + .\.github\scripts\Build-ChangedSamples.ps1 -ChangedFiles $changedFiles -Verbose + env: + WDS_Configuration: Debug + WDS_Platform: x64 + WDS_WipeOutputs: ${{ true }} + - if: github.event_name == 'push' run: .\Build-AllSamples.ps1 -Verbose -ThrottleLimit 1 env: WDS_Configuration: Debug WDS_Platform: x64 WDS_WipeOutputs: ${{ true }} - - name: Perform CodeQL analysis uses: github/codeql-action/analyze@v3 with: diff --git a/avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp b/avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp index 1b41496b..2b0d9dd0 100644 --- a/avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp +++ b/avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp @@ -776,7 +776,7 @@ HRESULT CreateDecoderFromLuid( _In_ LUID ullAdapterLuidRunningOn, DMFTCHECKHR_GOTO(pOutputType->GetGUID(MF_MT_SUBTYPE, &OutputType.guidSubtype), done); DMFTCHECKHR_GOTO(MFCreateAttributes(&spAttribs, 1), done); - DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (byte*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done); + DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (BYTE*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done); DMFTCHECKHR_GOTO(MFTEnum2(MFT_CATEGORY_VIDEO_DECODER, dwFlags, &InputType, &OutputType, spAttribs.Get(), &ppActivates, &cMFTActivate), done); for (DWORD i = 0; i < cMFTActivate; i++) diff --git a/avstream/sampledevicemft/dllmain.cpp b/avstream/sampledevicemft/dllmain.cpp index 88bfe6ab..64b6cf71 100644 --- a/avstream/sampledevicemft/dllmain.cpp +++ b/avstream/sampledevicemft/dllmain.cpp @@ -199,7 +199,7 @@ STDMETHODIMP_(BOOL) WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, void *) // Hook up WIL tracing to our trace provider. wil::SetResultLoggingCallback( - [](const wil::FailureInfo &failure) + [](const wil::FailureInfo &failure) noexcept { wchar_t debugString[2048]; if (SUCCEEDED(wil::GetFailureLogString(debugString, ARRAYSIZE(debugString), failure))) diff --git a/avstream/sampledevicemft/multipinmft.vcxproj b/avstream/sampledevicemft/multipinmft.vcxproj index 3b9ddf87..f44fe4c3 100644 --- a/avstream/sampledevicemft/multipinmft.vcxproj +++ b/avstream/sampledevicemft/multipinmft.vcxproj @@ -160,26 +160,8 @@ </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> + <LanguageStandard>stdcpp17</LanguageStandard> <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> - <ClCompile> - <ExceptionHandling>Sync</ExceptionHandling> - </ClCompile> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions> </ClCompile> <Midl> @@ -195,6 +177,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'"> <ClCompile> + <LanguageStandard>stdcpp17</LanguageStandard> + <ExceptionHandling>Sync</ExceptionHandling> <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions> </ClCompile> <Midl> @@ -210,6 +194,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> + <LanguageStandard>stdcpp17</LanguageStandard> + <ExceptionHandling>Sync</ExceptionHandling> <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions> </ClCompile> <Midl> @@ -225,6 +211,8 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'"> <ClCompile> + <LanguageStandard>stdcpp17</LanguageStandard> + <ExceptionHandling>Sync</ExceptionHandling> <PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions> </ClCompile> <Midl> diff --git a/avstream/sampledevicemft/multipinmftutils.cpp b/avstream/sampledevicemft/multipinmftutils.cpp index cbd64f72..ba879ccc 100644 --- a/avstream/sampledevicemft/multipinmftutils.cpp +++ b/avstream/sampledevicemft/multipinmftutils.cpp @@ -1055,7 +1055,7 @@ HRESULT CreateDecoderFromLuid( _In_ LUID ullAdapterLuidRunningOn, DMFTCHECKHR_GOTO(pOutputType->GetGUID(MF_MT_SUBTYPE, &OutputType.guidSubtype), done); DMFTCHECKHR_GOTO(MFCreateAttributes(&spAttribs, 1), done); - DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (byte*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done); + DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (BYTE*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done); DMFTCHECKHR_GOTO(MFTEnum2(MFT_CATEGORY_VIDEO_DECODER, dwFlags, &InputType, &OutputType, spAttribs.Get(), &ppActivates, &cMFTActivate), done); for (DWORD i = 0; i < cMFTActivate; i++) diff --git a/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp b/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp index 2671e276..22f08c60 100644 --- a/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp +++ b/network/trans/WFPSampler/syslib/HelperFunctions_RedirectData.cpp @@ -132,7 +132,7 @@ _IRQL_requires_min_(PASSIVE_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_same_ _Success_(*ppRedirectData == 0) -inline VOID KrnlHlprRedirectDataDestroy(_Inout_ REDIRECT_DATA** ppRedirectData) +VOID KrnlHlprRedirectDataDestroy(_Inout_ REDIRECT_DATA** ppRedirectData) { #if DBG diff --git a/serial/VirtualSerial2/queue.c b/serial/VirtualSerial2/queue.c index 83b022de..371ef693 100644 --- a/serial/VirtualSerial2/queue.c +++ b/serial/VirtualSerial2/queue.c @@ -717,7 +717,7 @@ QueueProcessGetLineControl( // // Take a snapshot of the line control register variable // - lineControlSnapshot = *lineControlRegister; + lineControlSnapshot = ReadNoFence((LONG *)lineControlRegister); // // Decode the word length @@ -946,7 +946,7 @@ QueueProcessSetLineControl( #endif } - lineControlSnapshot = *lineControlRegister; + lineControlSnapshot = ReadNoFence((LONG *)lineControlRegister); lineControlNew = (lineControlSnapshot & SERIAL_LCR_BREAK) | (lineControlData | lineControlParity | lineControlStop); |
