Merged PR 4271163: [Git2Git] Remove use of private theme APIs

References MSFT:24418178
microsoft · Feb 3, 2020 · bc7eb96 · bc7eb96
1 parent eb480b6
commit bc7eb96
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 187 deletions.
diff --git a/src/inc/conint.h b/src/inc/conint.h
@@ -32,11 +32,17 @@ namespace Microsoft::Console::Internal
 
  [[nodiscard]] HRESULT CheckIntegrityLevelPolicy(const HANDLE hOtherToken,
  bool& fIsWrongWayBlocked) noexcept;
+
+
  }
 
  namespace EdpPolicy
  {
  void AuditClipboard(const std::wstring_view destinationName) noexcept;
  }
 
+ namespace Theming
+ {
+ [[nodiscard]] HRESULT TrySetDarkMode(HWND hwnd) noexcept;
+ }
 }
diff --git a/src/interactivity/win32/lib/win32.LIB.vcxproj b/src/interactivity/win32/lib/win32.LIB.vcxproj
@@ -36,7 +36,6 @@
  <ClCompile Include="..\WindowIo.cpp" />
  <ClCompile Include="..\WindowMetrics.cpp" />
  <ClCompile Include="..\WindowProc.cpp" />
- <ClCompile Include="..\windowtheme.cpp" />
  <ClCompile Include="..\windowUiaProvider.cpp" />
  </ItemGroup>
  <ItemGroup>
@@ -59,7 +58,6 @@
  <ClInclude Include="..\WindowIme.hpp" />
  <ClInclude Include="..\WindowMetrics.hpp" />
  <ClInclude Include="..\WindowIo.hpp" />
- <ClInclude Include="..\windowtheme.hpp" />
  <ClInclude Include="..\windowUiaProvider.hpp" />
  </ItemGroup>
  <ItemDefinitionGroup>

diff --git a/src/interactivity/win32/lib/win32.LIB.vcxproj.filters b/src/interactivity/win32/lib/win32.LIB.vcxproj.filters
@@ -66,9 +66,6 @@
  <ClCompile Include="..\InputServices.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="..\windowtheme.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
  <ClCompile Include="..\windowUiaProvider.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
@@ -131,9 +128,6 @@
  <ClInclude Include="..\InputServices.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="..\windowtheme.hpp">
- <Filter>Header Files</Filter>
- </ClInclude>
  <ClInclude Include="..\windowUiaProvider.hpp">
  <Filter>Header Files</Filter>
  </ClInclude>

diff --git a/src/interactivity/win32/sources.inc b/src/interactivity/win32/sources.inc
@@ -56,7 +56,6 @@ SOURCES = \
  ..\windowio.cpp \
  ..\WindowMetrics.cpp \
  ..\windowproc.cpp \
- ..\windowtheme.cpp \
  ..\windowUiaProvider.cpp \
 
 INCLUDES = \

diff --git a/src/interactivity/win32/window.cpp b/src/interactivity/win32/window.cpp
@@ -10,7 +10,8 @@
 #include "windowio.hpp"
 #include "windowdpiapi.hpp"
 #include "windowmetrics.hpp"
-#include "windowtheme.hpp"
+
+#include "..\..\inc\conint.h"
 
 #include "..\..\host\globals.h"
 #include "..\..\host\dbcs.h"
@@ -349,12 +350,7 @@ void Window::_UpdateSystemMetrics() const
  siAttached.PostUpdateWindowSize();
 
  // Locate window theming modules and try to set the dark mode.
- try
- {
- WindowTheme theme;
- LOG_IF_FAILED(theme.TrySetDarkMode(_hWnd));
- }
- CATCH_LOG();
+ LOG_IF_FAILED(Microsoft::Console::Internal::Theming::TrySetDarkMode(_hWnd));
  }
  }
  }

diff --git a/src/interactivity/win32/windowproc.cpp b/src/interactivity/win32/windowproc.cpp
@@ -25,7 +25,8 @@
 
 #include "..\inc\ServiceLocator.hpp"
 
-#include "..\interactivity\win32\windowtheme.hpp"
+#include "..\..\inc\conint.h"
+
 #include "..\interactivity\win32\CustomWindowMessages.h"
 
 #include "..\interactivity\win32\windowUiaProvider.hpp"
@@ -336,13 +337,7 @@ using namespace Microsoft::Console::Types;
 
  case WM_SETTINGCHANGE:
  {
- try
- {
- WindowTheme theme;
- LOG_IF_FAILED(theme.TrySetDarkMode(hWnd));
- }
- CATCH_LOG();
-
+ LOG_IF_FAILED(Microsoft::Console::Internal::Theming::TrySetDarkMode(hWnd));
  gci.GetCursorBlinker().SettingsChanged();
  }
  __fallthrough;

diff --git a/src/interactivity/win32/windowtheme.cpp b/src/interactivity/win32/windowtheme.cpp
diff --git a/src/interactivity/win32/windowtheme.hpp b/src/interactivity/win32/windowtheme.hpp
diff --git a/src/internal/stubs.cpp b/src/internal/stubs.cpp
@@ -24,3 +24,8 @@ using namespace Microsoft::Console::Internal;
 void EdpPolicy::AuditClipboard(const std::wstring_view /*destinationName*/) noexcept
 {
 }
+
+[[nodiscard]] HRESULT Theming::TrySetDarkMode(HWND /*hwnd*/) noexcept
+{
+ return S_FALSE;
+}