Front ported fix for bug #8850 : Firebird 3.0.13 Win32: KERNEL32.GetThreadId import breaks Windows XP (regression vs 3.0.12)

Author: hvlad

src/common/ThreadStart.cpp

@@ -219,15 +219,14 @@ ThreadId Thread::getId()
 #endif
 }
 
-bool Thread::isCurrent(Handle threadHandle)
+bool Thread::isCurrent(InternalId iid)
 {
-	static_assert(std::is_same<Handle, InternalId>().value, "type mismatch");
-	return pthread_equal(threadHandle, pthread_self());
+	return pthread_equal(iid, pthread_self());
 }
 
 bool Thread::isCurrent()
 {
-	return pthread_equal(internalId, pthread_self());
+	return isCurrent(internalId);
 }
 
 void Thread::sleep(unsigned milliseconds)
@@ -369,14 +368,14 @@ ThreadId Thread::getId()
 	return GetCurrentThreadId();
 }
 
-bool Thread::isCurrent(Handle threadHandle)
+bool Thread::isCurrent(InternalId iid)
 {
-	return GetCurrentThreadId() == GetThreadId(threadHandle);
+	return GetCurrentThreadId() == iid;
 }
 
 bool Thread::isCurrent()
 {
-	return GetCurrentThreadId() == internalId;
+	return isCurrent(internalId);
 }
 
 void Thread::sleep(unsigned milliseconds)

src/common/ThreadStart.h

@@ -82,12 +82,19 @@ class Thread
 	static void waitForCompletion(Handle& handle);
 	static void kill(Handle& handle);
 
+	// Returns TID of current OS thread
 	static ThreadId getId();
 
+	// Returns internal ID of given thread instance
+	InternalId getInternalId() const
+	{
+		return internalId;
+	}
+
 	static void sleep(unsigned milliseconds);
 	static void yield();
 
-	static bool isCurrent(Handle threadHandle);
+	static bool isCurrent(InternalId iid);
 	bool isCurrent();
 
 	Thread()

src/jrd/CryptoManager.cpp

@@ -331,6 +331,8 @@ namespace Jrd {
 		  flDown(false),
 		  run(false)
 	{
+		memset(&cryptThreadId, 0, sizeof(cryptThreadId));
+
 		stateLock = FB_NEW_RPT(getPool(), 0)
 			Lock(tdbb, 0, LCK_crypt_status, this, blockingAstChangeCryptState);
 		threadLock = FB_NEW_RPT(getPool(), 0) Lock(tdbb, 0, LCK_crypt);
@@ -987,7 +989,8 @@ namespace Jrd {
 
 			// ready to go
 			guard.leave();		// release in advance to avoid races with cryptThread()
-			Thread::start(cryptThreadStatic, (THREAD_ENTRY_PARAM) this, THREAD_medium, &cryptThreadHandle);
+			const Thread& thread = Thread::start(cryptThreadStatic, (THREAD_ENTRY_PARAM) this, THREAD_medium, &cryptThreadHandle);
+			cryptThreadId = thread.getInternalId();
 		}
 		catch (const Firebird::Exception&)
 		{

src/jrd/CryptoManager.h

@@ -301,9 +301,11 @@ class CryptoManager FB_FINAL : public Firebird::PermanentStorage, public BarSync
 	UCHAR getCurrentState(thread_db* tdbb) const;
 	const char* getKeyName() const;
 	const char* getPluginName() const;
-	Thread::Handle getCryptThreadHandle() const
+
+	// Return true if crypt thread is running and it is the current thread.
+	bool isCryptThreadCurrent() const
 	{
-		return cryptThreadHandle;
+		return cryptThreadHandle && Thread::isCurrent(cryptThreadId);
 	}
 
 private:
@@ -383,6 +385,7 @@ class CryptoManager FB_FINAL : public Firebird::PermanentStorage, public BarSync
 	Firebird::string hash;
 	Firebird::RefPtr<DbInfo> dbInfo;
 	Thread::Handle cryptThreadHandle;
+	Thread::InternalId cryptThreadId;
 	Firebird::IDbCryptPlugin* cryptPlugin;
 	Factory* checkFactory;
 	Database& dbb;

src/jrd/jrd.cpp

@@ -7661,8 +7661,7 @@ 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 && dbb->dbb_crypto_manager->isCryptThreadCurrent())
 		{
 			activeThreadGuard = &dummyGuard;
 		}