PR nits

microsoft · Dec 14, 2020 · 3351e01 · 3351e01
1 parent 5dbf042
commit 3351e01
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 26 deletions.
diff --git a/consolegit2gitfilters.json b/consolegit2gitfilters.json
@@ -22,7 +22,7 @@
     "/doc/specs/",
     "/doc/cascadia/",
     "/doc/user-docs/",
-    "/src/tools/MonarchPeasantSample",
+    "/src/tools/MonarchPeasantSample/",
   ],
   "SuffixFilters": [
     ".dbb",

diff --git a/src/tools/MonarchPeasantSample/AppState.cpp b/src/tools/MonarchPeasantSample/AppState.cpp
@@ -1,5 +1,4 @@
 #include "pch.h"
-#include <conio.h>
 #include "Monarch.h"
 #include "Peasant.h"
 #include "AppState.h"
@@ -59,7 +58,7 @@ void AppState::remindKingWhoTheyAre(const winrt::MonarchPeasantSample::IPeasant&
     }
     else
     {
-        // printf("Shoot, we wanted to be able to get the impl here but couldnt\n");
+        printf("Shoot, we wanted to be able to get the monarchImpl here but couldnt\n");
     }
 }
 

diff --git a/src/tools/MonarchPeasantSample/Monarch.cpp b/src/tools/MonarchPeasantSample/Monarch.cpp
@@ -157,7 +157,7 @@ namespace winrt::MonarchPeasantSample::implementation
         }
         else
         {
-            // printf("They definitely weren't an existing process. They should make a new window.\n");
+            printf("They definitely weren't an existing process. They should make a new window.\n");
         }
 
         return createNewWindow;

diff --git a/src/tools/MonarchPeasantSample/Peasant.h b/src/tools/MonarchPeasantSample/Peasant.h
@@ -3,14 +3,6 @@
 #include "Peasant.g.h"
 #include "../cascadia/inc/cppwinrt_utils.h"
 
-// {50dba6cd-1111-4b12-8363-5e06f5d0082c}
-constexpr GUID Peasant_clsid{
-    0x50dba6cd,
-    0x1111,
-    0x4b12,
-    { 0x83, 0x63, 0x5e, 0x06, 0xf5, 0xd0, 0x08, 0x2c }
-};
-
 namespace winrt::MonarchPeasantSample::implementation
 {
     struct Peasant : public PeasantT<Peasant>

diff --git a/src/tools/MonarchPeasantSample/PeasantMain.cpp b/src/tools/MonarchPeasantSample/PeasantMain.cpp
@@ -8,11 +8,11 @@
 bool peasantReadInput(AppState& state)
 {
     DWORD cNumRead, i;
-    INPUT_RECORD irInBuf[128];
+    std::array<INPUT_RECORD, 128> irInBuf;
 
     if (!ReadConsoleInput(state.hInput, // input buffer handle
-                          irInBuf, // buffer to read into
-                          128, // size of read buffer
+                          irInBuf.data(), // buffer to read into
+                          static_cast<DWORD>(irInBuf.size()), // size of read buffer
                           &cNumRead)) // number of records read
     {
         printf("\x1b[31mReadConsoleInput failed\x1b[m\n");
@@ -59,10 +59,17 @@ bool peasantReadInput(AppState& state)
     return false;
 }
 
+// Returns true if we want to just exit the application.
+// Returns false if the monarch dies, and we need to elect a new one.
 bool peasantAppLoop(AppState& state)
 {
     wil::unique_handle hMonarch{ OpenProcess(PROCESS_ALL_ACCESS, FALSE, static_cast<DWORD>(state.monarch.GetPID())) };
-    // printf("handle for the monarch process is %d\n", hMonarch.get());
+    if (hMonarch.get() == nullptr)
+    {
+        const auto gle = GetLastError();
+        printf("\x1b[31mFailed to open the monarch process, error was %d\x1b[m\n", gle);
+        return false;
+    }
 
     HANDLE handlesToWaitOn[2]{ hMonarch.get(), state.hInput };
 
@@ -71,7 +78,6 @@ bool peasantAppLoop(AppState& state)
 
     while (!exitRequested)
     {
-        // printf("Beginning wait...\n");
         auto waitResult = WaitForMultipleObjects(2, handlesToWaitOn, false, INFINITE);
 
         switch (waitResult)

diff --git a/src/tools/MonarchPeasantSample/main.cpp b/src/tools/MonarchPeasantSample/main.cpp
@@ -24,8 +24,7 @@ winrt::weak_ref<MonarchPeasantSample::implementation::Monarch> g_weak{ nullptr }
 
 struct MonarchFactory : implements<MonarchFactory, IClassFactory>
 {
-    MonarchFactory() :
-        _guid{ Monarch_clsid } {};
+    MonarchFactory() = default;
 
     HRESULT __stdcall CreateInstance(IUnknown* outer, GUID const& iid, void** result) noexcept final
     {
@@ -55,9 +54,6 @@ struct MonarchFactory : implements<MonarchFactory, IClassFactory>
     {
         return S_OK;
     }
-
-private:
-    winrt::guid _guid;
 };
 ////////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/tools/MonarchPeasantSample/pch.h b/src/tools/MonarchPeasantSample/pch.h
@@ -20,9 +20,7 @@
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Media.h>
-#include <windows.ui.xaml.media.dxinterop.h>
-
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
+
+#include <conio.h>