Address comments

Author: nums11

Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/DXResourceBindingORT/DXResourceBindingORT.xaml.cs

@@ -50,7 +50,7 @@ private async void LaunchWindow(object sender, RoutedEventArgs e)
  private async void ClassifyCube()
  {
  int i = 0;
- float[] prev_results = { };
+ float[] previousResults  = { };
  while (true)
  {
  if (pageExited)
@@ -60,12 +60,12 @@ private async void ClassifyCube()
  }
  float[] results = await Task.Run(() => WinMLSamplesGalleryNative.DXResourceBinding.EvalORT());
  if (i == 0)
- prev_results = results;
+ previousResults  = results;
  // The first evaluation may return null so move to the next iteration
  if (results == null)
  continue;
- UpdateClassificationResults(prev_results);
- prev_results = results;
+ UpdateClassificationResults(previousResults );
+ previousResults  = results;
  System.Threading.Thread.Sleep(1000);
  i++;
  }

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/D3D12Quad.cpp

@@ -39,7 +39,7 @@ void D3D12Quad::OnInit()
  LoadPipeline();
  LoadAssets();
  initializationSemaphore.release();
- copy_texture = false;
+ copyTexture = false;
 }
 
 // Load the rendering pipeline dependencies.
@@ -427,7 +427,7 @@ void D3D12Quad::Reset() {
 void D3D12Quad::OnUpdate()
 {
  justReset = false;
- if (copy_texture) {
+ if (copyTexture) {
  Reset();
  LoadImageTexture();
  justReset = true;
@@ -493,10 +493,10 @@ void D3D12Quad::PopulateCommandList()
  auto render_to_present = CD3DX12_RESOURCE_BARRIER::Transition(m_renderTargets[m_frameIndex].Get(), D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_PRESENT);
  m_commandList->ResourceBarrier(1, &render_to_present);
 
- if (copy_texture)
+ if (copyTexture)
  {
  CopyTextureIntoCurrentBuffer();
- copy_texture = false;
+ copyTexture = false;
  }
 
  ThrowIfFailed(m_commandList->Close());
@@ -826,12 +826,12 @@ ComPtr<ID3D12Resource> D3D12Quad::GetCurrentBuffer()
  return currentBuffer;
 }
 
-// Schedules the next image to be shown by setting the copy_texture
+// Schedules the next image to be shown by setting the copyTexture
 // variable to true. OnUpdate will catch this variable and load the
 // next image then the image texture will be copied into a resource
 // dimension buffer at the end of PopulateCommandLists
 void D3D12Quad::ShowNextImage()
 {
- copy_texture = true;
+ copyTexture = true;
 }
 

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/D3D12Quad.h

@@ -103,6 +103,6 @@ class D3D12Quad
  // a resource dimension buffer that will be used by ORT for inference
  ComPtr<ID3D12Resource> currentBuffer;
  int imageBytesPerRow;
- bool copy_texture;
+ bool copyTexture;
 };
 

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/DXResourceBinding.cpp

@@ -1,6 +1,3 @@
-#define NOMINMAX
-#define WIN32_LEAN_AND_MEAN
-
 #include "pch.h"
 #include "DXResourceBinding.h"
 #include "DXResourceBinding.g.cpp"

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/ORTHelpers.cpp

@@ -1,6 +1,5 @@
 #include "pch.h"
 #include "ORTHelpers.h"
-#undef min
 
 #define THROW_IF_FAILED(hr) {HRESULT localHr = (hr); if (FAILED(hr)) throw hr;}
 #define RETURN_IF_FAILED(hr) {HRESULT localHr = (hr); if (FAILED(hr)) return hr;}

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Win32Application.cpp

@@ -3,7 +3,7 @@
 #include "Win32Application.h"
 
 HWND Win32Application::m_hwnd = nullptr;
-bool Win32Application::close_window = false;
+bool Win32Application::m_closeWindow = false;
 
 // Get the HModule that will be used to spawn
 // the HWND
@@ -65,20 +65,17 @@ int Win32Application::Run(D3D12Quad* pSample, int nCmdShow)
  ShowWindow(m_hwnd, nCmdShow);
 
  // Main sample loop.
- close_window = false;
+ m_closeWindow = false;
  MSG msg = {};
- while (msg.message != WM_QUIT)
+ while (GetMessage(&msg, m_hwnd, 0, 0) != 0)
  {
- // Destroy the sample and window if the close_window
- // variable is set to true
- if (close_window)
+ if (m_closeWindow)
  {
  pSample->OnDestroy();
  PostMessage(m_hwnd, WM_CLOSE, 0, 0);
  break;
  }
- // Process any messages in the queue.
- if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
+ else
  {
  TranslateMessage(&msg);
  DispatchMessage(&msg);
@@ -121,7 +118,7 @@ LRESULT CALLBACK Win32Application::WindowProc(HWND hWnd, UINT message, WPARAM wP
  case WM_PAINT:
  if (pSample)
  {
- if (!close_window)
+ if (!m_closeWindow)
  {
  pSample->OnUpdate();
  pSample->OnRender();
@@ -140,7 +137,7 @@ LRESULT CALLBACK Win32Application::WindowProc(HWND hWnd, UINT message, WPARAM wP
 
 void Win32Application::CloseWindow()
 {
- close_window = true;
+ m_closeWindow = true;
 }
 
 std::wstring Win32Application::GetAssetPath(LPCWSTR assetName)

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/Win32Application.h

@@ -14,5 +14,5 @@ class Win32Application
 
 private:
  static HWND m_hwnd;
- static bool close_window;
+ static bool m_closeWindow;
 };

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/stdafx.h

@@ -15,6 +15,8 @@
 
 #pragma once
 
+#define NOMINMAX
+
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers.
 #endif