From cd601ef7f21b121a512a707a85da0c2a01ac42db Mon Sep 17 00:00:00 2001
From: mingkuang <mingkuang@live.com>
Date: Thu, 5 Sep 2019 10:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20GetGlobalKeyedEventHandle?=
 =?UTF-8?q?=EF=BC=8CWinXP=E6=A8=A1=E5=BC=8F=E4=B8=8EVista=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=20ABI=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/YY_Thunks.cpp | 49 +++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/YY_Thunks.cpp b/src/YY_Thunks.cpp
index f611bd6..d7d40bc 100644
--- a/src/YY_Thunks.cpp
+++ b/src/YY_Thunks.cpp
@@ -278,36 +278,39 @@ namespace YY
 			static HANDLE __fastcall GetGlobalKeyedEventHandle()
 			{
 #if (YY_Thunks_Support_Version < NTDDI_WIN6)
-				if (_GlobalKeyedEventHandle == nullptr)
+				//Windows XP等平台则 使用系统自身的 CritSecOutOfMemoryEvent，Vista或者更高平台 我们直接返回 nullptr 即可。
+				if (NtCurrentTeb()->ProcessEnvironmentBlock->OSMajorVersion < 6)
 				{
-					auto pNtOpenKeyedEvent = try_get_NtOpenKeyedEvent();
-
-					if(pNtOpenKeyedEvent == nullptr)
-						RaiseStatus(STATUS_RESOURCE_NOT_OWNED);
-
-					constexpr const wchar_t Name[] = L"\\KernelObjects\\CritSecOutOfMemoryEvent";
-					
-					UNICODE_STRING ObjectName = {sizeof(Name) - sizeof(wchar_t),sizeof(Name) - sizeof(wchar_t) ,(PWSTR)Name };
-					OBJECT_ATTRIBUTES attr = { sizeof(attr),nullptr,&ObjectName };
-
-					HANDLE KeyedEventHandle;
-
-					if (pNtOpenKeyedEvent(&KeyedEventHandle, MAXIMUM_ALLOWED, &attr) < 0)
+					if (_GlobalKeyedEventHandle == nullptr)
 					{
-						RaiseStatus(STATUS_RESOURCE_NOT_OWNED);
+						auto pNtOpenKeyedEvent = try_get_NtOpenKeyedEvent();
+
+						if(pNtOpenKeyedEvent == nullptr)
+							RaiseStatus(STATUS_RESOURCE_NOT_OWNED);
+
+						constexpr const wchar_t Name[] = L"\\KernelObjects\\CritSecOutOfMemoryEvent";
+
+						UNICODE_STRING ObjectName = {sizeof(Name) - sizeof(wchar_t),sizeof(Name) - sizeof(wchar_t) ,(PWSTR)Name };
+						OBJECT_ATTRIBUTES attr = { sizeof(attr),nullptr,&ObjectName };
+
+						HANDLE KeyedEventHandle;
+
+						if (pNtOpenKeyedEvent(&KeyedEventHandle, MAXIMUM_ALLOWED, &attr) < 0)
+						{
+							RaiseStatus(STATUS_RESOURCE_NOT_OWNED);
+						}
+
+						if (InterlockedCompareExchange((size_t*)&_GlobalKeyedEventHandle, (size_t)KeyedEventHandle, (size_t)nullptr))
+						{
+							CloseHandle(KeyedEventHandle);
+						}
 					}
 
-					if (InterlockedCompareExchange((size_t*)&_GlobalKeyedEventHandle, (size_t)KeyedEventHandle, (size_t)nullptr))
-					{
-						CloseHandle(KeyedEventHandle);
-					}
+					return _GlobalKeyedEventHandle;
 				}
-
-				return _GlobalKeyedEventHandle;
-#else
+#endif
 				//Vista以上平台支持给 KeyedEvent直接传 nullptr
 				return nullptr;
-#endif
 			}
 
 #if (YY_Thunks_Support_Version < NTDDI_WIN6)