From 175bc8e48047a3b4aa1c2595f52d4505fad91054 Mon Sep 17 00:00:00 2001
From: robmikh <rob.mikh@outlook.com>
Date: Fri, 13 May 2022 01:17:24 -0700
Subject: [PATCH] cleanup

---
 Win32CaptureSample/App.cpp             |  8 ++++----
 Win32CaptureSample/CaptureSnapshot.cpp |  4 ++--
 Win32CaptureSample/SampleWindow.cpp    |  2 +-
 Win32CaptureSample/SimpleCapture.cpp   |  4 ++--
 Win32CaptureSample/main.cpp            |  2 +-
 Win32CaptureSample/pch.h               | 15 +++++++--------
 6 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Win32CaptureSample/App.cpp b/Win32CaptureSample/App.cpp
index 289cef8..d56ecf6 100644
--- a/Win32CaptureSample/App.cpp
+++ b/Win32CaptureSample/App.cpp
@@ -4,16 +4,16 @@
 
 namespace winrt
 {
+    using namespace Windows::Foundation;
+    using namespace Windows::Graphics::Capture;
+    using namespace Windows::Graphics::DirectX;
+    using namespace Windows::Graphics::Imaging;
     using namespace Windows::Storage;
     using namespace Windows::Storage::Pickers;
     using namespace Windows::System;
-    using namespace Windows::Foundation;
     using namespace Windows::UI;
     using namespace Windows::UI::Composition;
     using namespace Windows::UI::Popups;
-    using namespace Windows::Graphics::Capture;
-    using namespace Windows::Graphics::DirectX;
-    using namespace Windows::Graphics::Imaging;
 }
 
 namespace util
diff --git a/Win32CaptureSample/CaptureSnapshot.cpp b/Win32CaptureSample/CaptureSnapshot.cpp
index e3cffdc..7b37a9a 100644
--- a/Win32CaptureSample/CaptureSnapshot.cpp
+++ b/Win32CaptureSample/CaptureSnapshot.cpp
@@ -5,12 +5,12 @@ namespace winrt
 {
     using namespace Windows;
     using namespace Windows::Foundation;
-    using namespace Windows::System;
+    using namespace Windows::Foundation::Numerics;
     using namespace Windows::Graphics;
     using namespace Windows::Graphics::Capture;
     using namespace Windows::Graphics::DirectX;
     using namespace Windows::Graphics::DirectX::Direct3D11;
-    using namespace Windows::Foundation::Numerics;
+    using namespace Windows::System;
     using namespace Windows::UI;
     using namespace Windows::UI::Composition;
 }
diff --git a/Win32CaptureSample/SampleWindow.cpp b/Win32CaptureSample/SampleWindow.cpp
index aed6c84..0b96c2b 100644
--- a/Win32CaptureSample/SampleWindow.cpp
+++ b/Win32CaptureSample/SampleWindow.cpp
@@ -8,11 +8,11 @@ namespace winrt
 {
     using namespace Windows::Foundation::Metadata;
     using namespace Windows::Graphics::Capture;
+    using namespace Windows::Graphics::DirectX;
     using namespace Windows::System;
     using namespace Windows::UI;
     using namespace Windows::UI::Composition;
     using namespace Windows::UI::Composition::Desktop;
-    using namespace Windows::Graphics::DirectX;
 }
 
 namespace util
diff --git a/Win32CaptureSample/SimpleCapture.cpp b/Win32CaptureSample/SimpleCapture.cpp
index bbcfc4d..7985364 100644
--- a/Win32CaptureSample/SimpleCapture.cpp
+++ b/Win32CaptureSample/SimpleCapture.cpp
@@ -4,12 +4,12 @@
 namespace winrt
 {
     using namespace Windows::Foundation;
-    using namespace Windows::System;
+    using namespace Windows::Foundation::Numerics;
     using namespace Windows::Graphics;
     using namespace Windows::Graphics::Capture;
     using namespace Windows::Graphics::DirectX;
     using namespace Windows::Graphics::DirectX::Direct3D11;
-    using namespace Windows::Foundation::Numerics;
+    using namespace Windows::System;
     using namespace Windows::UI;
     using namespace Windows::UI::Composition;
 }
diff --git a/Win32CaptureSample/main.cpp b/Win32CaptureSample/main.cpp
index dda7e14..7917b5d 100644
--- a/Win32CaptureSample/main.cpp
+++ b/Win32CaptureSample/main.cpp
@@ -6,8 +6,8 @@
 
 namespace winrt
 {
-    using namespace Windows::Storage::Pickers;
     using namespace Windows::Graphics::Capture;
+    using namespace Windows::Storage::Pickers;
     using namespace Windows::UI::Composition;
 }
 
diff --git a/Win32CaptureSample/pch.h b/Win32CaptureSample/pch.h
index 7e99dd2..3fef2cf 100644
--- a/Win32CaptureSample/pch.h
+++ b/Win32CaptureSample/pch.h
@@ -1,14 +1,21 @@
 #pragma once
 
+// Windows SDK support
 #include <Unknwn.h>
 #include <inspectable.h>
 
+// Needs to come before C++/WinRT headers
 #include <wil/cppwinrt.h>
 
 // WinRT
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Foundation.Metadata.h>
+#include <winrt/Windows.Graphics.Capture.h>
+#include <winrt/Windows.Graphics.DirectX.h>
+#include <winrt/Windows.Graphics.DirectX.Direct3d11.h>
+#include <winrt/Windows.Graphics.Imaging.h>
+#include <winrt/Windows.Security.Authorization.AppCapabilityAccess.h>
 #include <winrt/Windows.Storage.h>
 #include <winrt/Windows.Storage.Pickers.h>
 #include <winrt/Windows.Storage.Streams.h>
@@ -17,14 +24,6 @@
 #include <winrt/Windows.UI.Composition.h>
 #include <winrt/Windows.UI.Composition.Desktop.h>
 #include <winrt/Windows.UI.Popups.h>
-#include <winrt/Windows.Graphics.Capture.h>
-#include <winrt/Windows.Graphics.DirectX.h>
-#include <winrt/Windows.Graphics.DirectX.Direct3d11.h>
-#include <winrt/Windows.Graphics.Imaging.h>
-#include <winrt/Windows.Security.Authorization.AppCapabilityAccess.h>
-
-#include <windows.ui.composition.interop.h>
-#include <DispatcherQueue.h>
 
 // STL
 #include <atomic>