fix Windows build by introducing a method to retrieve thread id from crypto thread handle

Author: AlexeyMochalov

src/common/ThreadStart.cpp

@@ -219,6 +219,11 @@ ThreadId Thread::getId()
 #endif
 }
 
+ThreadId Thread::getIdFromHandle(Handle threadHandle)
+{
+	return threadHandle;
+}
+
 bool Thread::isCurrent(InternalId iid)
 {
 	return pthread_equal(iid, pthread_self());
@@ -368,6 +373,11 @@ ThreadId Thread::getId()
 	return GetCurrentThreadId();
 }
 
+ThreadId Thread::getIdFromHandle(Handle threadHandle)
+{
+	return GetThreadId(threadHandle);
+}
+
 bool Thread::isCurrent(InternalId iid)
 {
 	return GetCurrentThreadId() == iid;
@@ -420,6 +430,10 @@ Thread::Handle Thread::getId()
 {
 }
 
+Thread::Handle Thread::getIdFromHandle(Handle)
+{
+}
+
 void Thread::sleep(unsigned milliseconds)
 {
 }

src/common/ThreadStart.h

@@ -83,6 +83,7 @@ class Thread
 	static void kill(Handle& handle);
 
 	static ThreadId getId();
+	static ThreadId getIdFromHandle(Handle threadHandle);
 
 	static void sleep(unsigned milliseconds);
 	static void yield();

src/jrd/jrd.cpp

@@ -7765,10 +7765,15 @@ void release_attachment(thread_db* tdbb, Jrd::Attachment* attachment, XThreadEns
 	XThreadEnsureUnlock* activeThreadGuard = dropGuard;
 	if (!activeThreadGuard)
 	{
-		if (dbb->dbb_crypto_manager && Thread::isCurrent(dbb->dbb_crypto_manager->getCryptThreadHandle()))
+		if (dbb->dbb_crypto_manager
+			&& Thread::isCurrent(Thread::getIdFromHandle(dbb->dbb_crypto_manager->getCryptThreadHandle())))
+		{
 			activeThreadGuard = &dummyGuard;
+		}
 		else
+		{
 			activeThreadGuard = &threadGuard;
+		}
 		activeThreadGuard->enter();
 	}