Add fixes for cpp20

nums11 · nums11 · commit aa585036cf0a · 2022-08-22T16:08:11.000-07:00
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Pages/SampleBasePage.xaml.cs b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Pages/SampleBasePage.xaml.cs
@@ -44,6 +44,7 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
                     break;
                 case "StreamEffect":
                     SampleFrame.Navigate(typeof(Samples.StreamEffect));
+                    break;
                 case "DXResourceBindingORT":
                     SampleFrame.Navigate(typeof(Samples.DXResourceBindingORT));
                     break;
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json b/Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json
@@ -92,7 +92,7 @@
       "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml",
       "CSharpGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml.cs",
       "Docs": [],
-      "IsRecentlyAdded": true,
+      "IsRecentlyAdded": true
     },
     {
       "Title": "DX Resource Binding in ORT",
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Capture.h b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Capture.h
@@ -138,7 +138,7 @@ class CaptureManager
 
         pwrCtxt.Version = POWER_REQUEST_CONTEXT_VERSION;
         pwrCtxt.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING;
-        pwrCtxt.Reason.SimpleReasonString = L"CaptureEngine is recording!";
+        pwrCtxt.Reason.SimpleReasonString = const_cast<WCHAR*>(L"CaptureEngine is recording!");
 
         m_hpwrRequest = PowerCreateRequest(&pwrCtxt);
     }
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/StreamEffect.cpp b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/StreamEffect.cpp
@@ -178,7 +178,7 @@ namespace MainWindow
             }
             else
             {
-                SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, L"Start Preview");
+                SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, const_cast<WCHAR*>(L"Start Preview"));
             }
         }
         else if (g_engine->IsPreviewing())

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`"XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml",`
`93`	`93`	`"CSharpGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/StreamEffect/StreamEffect.xaml.cs",`
`94`	`94`	`"Docs": [],`
`95`		`- "IsRecentlyAdded": true,`
	`95`	`+ "IsRecentlyAdded": true`
`96`	`96`	`},`
`97`	`97`	`{`
`98`	`98`	`"Title": "DX Resource Binding in ORT",`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ class CaptureManager`
`138`	`138`
`139`	`139`	`pwrCtxt.Version = POWER_REQUEST_CONTEXT_VERSION;`
`140`	`140`	`pwrCtxt.Flags = POWER_REQUEST_CONTEXT_SIMPLE_STRING;`
`141`		`- pwrCtxt.Reason.SimpleReasonString = L"CaptureEngine is recording!";`
	`141`	`+ pwrCtxt.Reason.SimpleReasonString = const_cast<WCHAR*>(L"CaptureEngine is recording!");`
`142`	`142`
`143`	`143`	`m_hpwrRequest = PowerCreateRequest(&pwrCtxt);`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ namespace MainWindow`
`178`	`178`	`}`
`179`	`179`	`else`
`180`	`180`	`{`
`181`		`- SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, L"Start Preview");`
	`181`	`+ SetMenuItemText(GetMenu(hwnd), ID_START_PREVIEW, const_cast<WCHAR*>(L"Start Preview"));`
`182`	`182`	`}`
`183`	`183`	`}`
`184`	`184`	`else if (g_engine->IsPreviewing())`