Skip to content

Commit 30bc6de

Browse files
authored
[avstream/sampledevicemft] Use C++17 (#1256)
1 parent 1fd430c commit 30bc6de

File tree

4 files changed

+10
-22
lines changed

4 files changed

+10
-22
lines changed

avstream/sampledevicemft/SampleSocDeviceMFTutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ HRESULT CreateDecoderFromLuid( _In_ LUID ullAdapterLuidRunningOn,
776776
DMFTCHECKHR_GOTO(pOutputType->GetGUID(MF_MT_SUBTYPE, &OutputType.guidSubtype), done);
777777

778778
DMFTCHECKHR_GOTO(MFCreateAttributes(&spAttribs, 1), done);
779-
DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (byte*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done);
779+
DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (BYTE*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done);
780780
DMFTCHECKHR_GOTO(MFTEnum2(MFT_CATEGORY_VIDEO_DECODER, dwFlags, &InputType, &OutputType, spAttribs.Get(), &ppActivates, &cMFTActivate), done);
781781

782782
for (DWORD i = 0; i < cMFTActivate; i++)

avstream/sampledevicemft/dllmain.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ STDMETHODIMP_(BOOL) WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, void *)
199199

200200
// Hook up WIL tracing to our trace provider.
201201
wil::SetResultLoggingCallback(
202-
[](const wil::FailureInfo &failure)
202+
[](const wil::FailureInfo &failure) noexcept
203203
{
204204
wchar_t debugString[2048];
205205
if (SUCCEEDED(wil::GetFailureLogString(debugString, ARRAYSIZE(debugString), failure)))

avstream/sampledevicemft/multipinmft.vcxproj

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -160,26 +160,8 @@
160160
</PropertyGroup>
161161
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
162162
<ClCompile>
163+
<LanguageStandard>stdcpp17</LanguageStandard>
163164
<ExceptionHandling>Sync</ExceptionHandling>
164-
</ClCompile>
165-
</ItemDefinitionGroup>
166-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
167-
<ClCompile>
168-
<ExceptionHandling>Sync</ExceptionHandling>
169-
</ClCompile>
170-
</ItemDefinitionGroup>
171-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
172-
<ClCompile>
173-
<ExceptionHandling>Sync</ExceptionHandling>
174-
</ClCompile>
175-
</ItemDefinitionGroup>
176-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
177-
<ClCompile>
178-
<ExceptionHandling>Sync</ExceptionHandling>
179-
</ClCompile>
180-
</ItemDefinitionGroup>
181-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
182-
<ClCompile>
183165
<PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions>
184166
</ClCompile>
185167
<Midl>
@@ -195,6 +177,8 @@
195177
</ItemDefinitionGroup>
196178
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
197179
<ClCompile>
180+
<LanguageStandard>stdcpp17</LanguageStandard>
181+
<ExceptionHandling>Sync</ExceptionHandling>
198182
<PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions>
199183
</ClCompile>
200184
<Midl>
@@ -210,6 +194,8 @@
210194
</ItemDefinitionGroup>
211195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
212196
<ClCompile>
197+
<LanguageStandard>stdcpp17</LanguageStandard>
198+
<ExceptionHandling>Sync</ExceptionHandling>
213199
<PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions>
214200
</ClCompile>
215201
<Midl>
@@ -225,6 +211,8 @@
225211
</ItemDefinitionGroup>
226212
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
227213
<ClCompile>
214+
<LanguageStandard>stdcpp17</LanguageStandard>
215+
<ExceptionHandling>Sync</ExceptionHandling>
228216
<PreprocessorDefinitions>%(PreprocessorDefinitions);UNICODE;MF_WPP;SECURITY_WIN32;MFT_UNIQUE_METHOD_NAMES;MF_DEVICEMFT_ALLOW_MFT0_LOAD</PreprocessorDefinitions>
229217
</ClCompile>
230218
<Midl>

avstream/sampledevicemft/multipinmftutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1055,7 +1055,7 @@ HRESULT CreateDecoderFromLuid( _In_ LUID ullAdapterLuidRunningOn,
10551055
DMFTCHECKHR_GOTO(pOutputType->GetGUID(MF_MT_SUBTYPE, &OutputType.guidSubtype), done);
10561056

10571057
DMFTCHECKHR_GOTO(MFCreateAttributes(&spAttribs, 1), done);
1058-
DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (byte*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done);
1058+
DMFTCHECKHR_GOTO(spAttribs->SetBlob(MFT_ENUM_ADAPTER_LUID, (BYTE*)&ullAdapterLuidRunningOn, sizeof(ullAdapterLuidRunningOn)), done);
10591059
DMFTCHECKHR_GOTO(MFTEnum2(MFT_CATEGORY_VIDEO_DECODER, dwFlags, &InputType, &OutputType, spAttribs.Get(), &ppActivates, &cMFTActivate), done);
10601060

10611061
for (DWORD i = 0; i < cMFTActivate; i++)

0 commit comments

Comments
 (0)