basic glass implementation

ALTaleX531 · Jun 28, 2024 · f7411e1 · f7411e1
1 parent 60ca882
commit f7411e1
Show file tree

Hide file tree

Showing 23 changed files with 2,250 additions and 974 deletions.
diff --git a/OpenGlass/BackdropManager.cpp b/OpenGlass/BackdropManager.cpp
diff --git a/OpenGlass/BackdropManager.hpp b/OpenGlass/BackdropManager.hpp
diff --git a/OpenGlass/CaptionTextHandler.cpp b/OpenGlass/CaptionTextHandler.cpp
@@ -299,9 +299,8 @@ HRESULT CaptionTextHandler::Startup()
 			);
 			RETURN_LAST_ERROR_IF_NULL(g_IWICImagingFactory2_CreateBitmapFromHBITMAP_Org);
 
-			HMODULE udwmModule{ GetModuleHandleW(L"uDwm.dll") };
-			g_DrawTextW_Org = reinterpret_cast<decltype(g_DrawTextW_Org)>(HookHelper::WriteIAT(udwmModule, "user32.dll", "DrawTextW", MyDrawTextW));
-			g_CreateBitmap_Org = reinterpret_cast<decltype(g_CreateBitmap_Org)>(HookHelper::WriteIAT(udwmModule, "gdi32.dll", "CreateBitmap", MyCreateBitmap));
+			g_DrawTextW_Org = reinterpret_cast<decltype(g_DrawTextW_Org)>(HookHelper::WriteIAT(uDwm::g_moduleHandle, "user32.dll", "DrawTextW", MyDrawTextW));
+			g_CreateBitmap_Org = reinterpret_cast<decltype(g_CreateBitmap_Org)>(HookHelper::WriteIAT(uDwm::g_moduleHandle, "gdi32.dll", "CreateBitmap", MyCreateBitmap));
 
 			HookHelper::Detours::Write([]()
 			{
@@ -348,14 +347,13 @@ void CaptionTextHandler::Shutdown()
 					g_IWICImagingFactory2_CreateBitmapFromHBITMAP_Org
 				);
 			}
-			HMODULE udwmModule{ GetModuleHandleW(L"uDwm.dll") };
 			if (g_DrawTextW_Org)
 			{
-				HookHelper::WriteIAT(udwmModule, "user32.dll", "DrawTextW", g_DrawTextW_Org);
+				HookHelper::WriteIAT(uDwm::g_moduleHandle, "user32.dll", "DrawTextW", g_DrawTextW_Org);
 			}
 			if (g_CreateBitmap_Org)
 			{
-				HookHelper::WriteIAT(udwmModule, "gdi32.dll", "CreateBitmap", g_CreateBitmap_Org);
+				HookHelper::WriteIAT(uDwm::g_moduleHandle, "gdi32.dll", "CreateBitmap", g_CreateBitmap_Org);
 			}
 
 			g_textVisual = nullptr;

diff --git a/OpenGlass/ConfigurationFramework.cpp b/OpenGlass/ConfigurationFramework.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 #include "ConfigurationFramework.hpp"
-#include "BackdropManager.hpp"
 #include "CaptionTextHandler.hpp"
 #include "GlassFramework.hpp"
+#include "GlassRenderer.hpp"
 #include "CustomMsstyleLoader.hpp"
 #include "ServiceApi.hpp"
 
@@ -16,6 +16,7 @@ namespace OpenGlass::ConfigurationFramework
 void ConfigurationFramework::Update(UpdateType type)
 {
 	GlassFramework::UpdateConfiguration(type);
+	GlassRenderer::UpdateConfiguration(type);
 	CaptionTextHandler::UpdateConfiguration(type);
 	CustomMsstyleLoader::UpdateConfiguration(type);
 	DwmFlush();

diff --git a/OpenGlass/ConfigurationFramework.hpp b/OpenGlass/ConfigurationFramework.hpp
@@ -1,7 +1,6 @@
 #pragma once
 #include "framework.hpp"
 #include "cpprt.hpp"
-#include "winrt.hpp"
 #include "uDwmProjection.hpp"
 
 namespace OpenGlass::ConfigurationFramework