From 93734ef70555dc8c95f32c244b5d18b81f3d00ab Mon Sep 17 00:00:00 2001
From: ALTaleX <2368730049@qq.com>
Date: Fri, 22 Jul 2022 23:51:47 +0800
Subject: [PATCH] Fix KB5015882

---
 TranslucentFlyouts/Win32HookHelper.cpp | 15 ++++++++-------
 TranslucentFlyouts/Win32HookHelper.h   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/TranslucentFlyouts/Win32HookHelper.cpp b/TranslucentFlyouts/Win32HookHelper.cpp
index fa7c415..273d83e 100644
--- a/TranslucentFlyouts/Win32HookHelper.cpp
+++ b/TranslucentFlyouts/Win32HookHelper.cpp
@@ -344,8 +344,7 @@ HRESULT WINAPI TranslucentFlyoutsLib::MyDrawThemeTextEx(
 	            !(pOptions->dwFlags & DTT_CALCRECT) and
 	            !(pOptions->dwFlags & DTT_COMPOSITED)
 	        )
-	    ) and
-		!VerifyCaller(g_hModule)
+	    )
 	)
 	{
 		DTTOPTS Options = *pOptions;
@@ -456,7 +455,7 @@ HRESULT WINAPI TranslucentFlyoutsLib::MyDrawThemeText(
 
 int WINAPI TranslucentFlyoutsLib::MyDrawTextW(
     HDC     hdc,
-    LPCTSTR lpchText,
+    LPCWSTR lpchText,
     int     cchText,
     LPRECT  lprc,
     UINT    format
@@ -494,12 +493,13 @@ int WINAPI TranslucentFlyoutsLib::MyDrawTextW(
 	return nResult;
 Default:
 	nResult =
-	    DrawTextWHook.OldFunction<decltype(MyDrawTextW)>(
+	    DrawTextExWHook.OldFunction<decltype(MyDrawTextExW)>(
 	        hdc,
-	        lpchText,
+	        (LPWSTR)lpchText,
 	        cchText,
 	        lprc,
-	        format
+	        format,
+	        nullptr
 	    );
 	return nResult;
 }
@@ -523,7 +523,8 @@ int WINAPI TranslucentFlyoutsLib::MyDrawTextExW(
 	    lpdtp or
 	    !(GetCurrentFlyoutPolicy() != Null) or
 	    VerifyCaller(TEXT("Uxtheme")) or
-	    VerifyCaller(TEXT("MToolExtend"))
+	    VerifyCaller(TEXT("MToolExtend")) or
+	    VerifyCaller(g_hModule)
 	)
 	{
 		goto Default;
diff --git a/TranslucentFlyouts/Win32HookHelper.h b/TranslucentFlyouts/Win32HookHelper.h
index 9ddd697..56c6f3e 100644
--- a/TranslucentFlyouts/Win32HookHelper.h
+++ b/TranslucentFlyouts/Win32HookHelper.h
@@ -36,7 +36,7 @@ namespace TranslucentFlyoutsLib
 	);
 	extern int WINAPI MyDrawTextW(
 	    HDC     hdc,
-	    LPCTSTR lpchText,
+		LPCWSTR lpchText,
 	    int     cchText,
 	    LPRECT  lprc,
 	    UINT    format