Remove Windows 9X support

Author: samofatov

src/common/classes/locks.cpp

@@ -39,124 +39,6 @@ namespace Firebird {
 
 #if defined(WIN_NT)
 
-// Win9X support
-#ifdef WIN9X_SUPPORT
-
-// NS: This code is adapted from from KernelEx project, with the explicit
-// permission from the author. KernelEx project aims to provide Windows XP
-// compatibility layer for Windows 98 and Windows ME. For further information
-// please refer to http://www.sourceforge.net/projects/kernelex/
-
-static const K32OBJ_CRITICAL_SECTION = 4;
-static const TDBX_WIN98 = 0x50;
-static const TDBX_WINME = 0x80;
-
-typedef struct _CRIT_SECT     // Size = 0x20
-{
-	BYTE      Type;           // 00 = 4: K32_OBJECT_CRITICAL_SECTION
-	int       RecursionCount; // 04 initially 0, incremented on lock
-	void*     OwningThread;   // 08 pointer to TDBX
-	DWORD     un3;            // 0C
-	int       LockCount;      // 10 initially 1, decremented on lock
-	struct _CRIT_SECT* Next;  // 14
-	void*     PLst;           // 18 list of processes using it?
-	struct _WIN_CRITICAL_SECTION* UserCS; // 1C pointer to user defined CRITICAL_SECTION
-} CRIT_SECT, *PCRIT_SECT;
-
-typedef struct _WIN_CRITICAL_SECTION
-{
-	BYTE Type; //= 4: K32_OBJECT_CRITICAL_SECTION
-	PCRIT_SECT crit;
-	DWORD un1;
-	DWORD un2;
-	DWORD un3;
-	DWORD un4;
-} WIN_CRITICAL_SECTION, *PWIN_CRITICAL_SECTION;
-
-static DWORD tdbx_offset;
-
-__declspec(naked) BOOL WINAPI TryEnterCrst(CRIT_SECT* crit)
-{
-__asm {
-	mov edx, [esp+4]
-	xor eax, eax
-	inc eax
-	xor ecx, ecx
-	cmpxchg [edx+10h], ecx ;if (OP1==eax) { OP1=OP2; ZF=1; } else { eax=OP1; ZF=0 }
-	;mov ecx, ppTDBXCur
-	mov ecx, fs:[18h]
-	add ecx, [tdbx_offset]
-	mov ecx, [ecx] ;ecx will contain TDBX now
-	cmp eax, 1
-	jnz L1
-	;critical section was unowned => successful lock
-	mov [edx+8], ecx
-	inc dword ptr [edx+4]
-	ret 4
-L1:
-	cmp [edx+8], ecx
-	jnz L2
-	;critical section owned by this thread
-	dec dword ptr [edx+10h]
-	inc dword ptr [edx+4]
-	xor eax, eax
-	inc eax
-	ret 4
-L2:
-	;critical section owned by other thread - do nothing
-	xor eax, eax
-	ret 4
-	}
-}
-
-BOOL WINAPI TryEnterCriticalSection_Win9X(CRITICAL_SECTION* cs)
-{
-	WIN_CRITICAL_SECTION* mycs = (WIN_CRITICAL_SECTION*) cs;
-	if (mycs->Type != K32OBJ_CRITICAL_SECTION)
-		RaiseException(STATUS_ACCESS_VIOLATION, 0, 0, NULL);
-
-	return TryEnterCrst(mycs->crit);
-}
-
-#endif
-
-// On Win 98 and Win ME TryEnterCriticalSection is defined, but not implemented
-// So direct linking to it won't hurt and will signal our incompatibility with Win 95
-TryEnterCS::tTryEnterCriticalSection TryEnterCS::m_funct =
-	reinterpret_cast<TryEnterCS::tTryEnterCriticalSection>(TryEnterCriticalSection);
-
-static TryEnterCS tryEnterCS;
-
-TryEnterCS::TryEnterCS()
-{
-// Win9X support
-#ifdef WIN9X_SUPPORT
-	OSVERSIONINFO OsVersionInfo;
-
-	OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-	if (GetVersionEx((LPOSVERSIONINFO) &OsVersionInfo))
-	{
-		if (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS &&
-			OsVersionInfo.dwMajorVersion == 4)
-		{
-			// Windows 98
-			if (OsVersionInfo.dwMinorVersion == 10)
-			{
-				tdbx_offset = TDBX_WIN98;
-				m_funct = TryEnterCriticalSection_Win9X;
-			}
-
-			// Windows ME
-			if (OsVersionInfo.dwMinorVersion == 90)
-			{
-				tdbx_offset = TDBX_WINME;
-				m_funct = TryEnterCriticalSection_Win9X;
-			}
-		}
-	}
-#endif
-}
-
 void Spinlock::init()
 {
 	SetCriticalSectionSpinCount(&spinlock, 4000);

src/common/classes/locks.h

@@ -55,22 +55,6 @@ class Exception;	// Needed for catch
 
 // Windows version of the class
 
-class TryEnterCS
-{
-public:
-	TryEnterCS();
-
-	static bool tryEnter(LPCRITICAL_SECTION lpCS)
-	{
-		return ((m_funct) (lpCS) == TRUE);
-	}
-
-private:
-	typedef BOOL (WINAPI *tTryEnterCriticalSection)(LPCRITICAL_SECTION lpCriticalSection);
-
-	static tTryEnterCriticalSection m_funct;
-};
-
 class Mutex : public Reasons
 {
 protected:
@@ -97,7 +81,7 @@ class Mutex : public Reasons
 
 	~Mutex()
 	{
-#if defined DEV_BUILD && !defined WIN9X_SUPPORT
+#if defined DEV_BUILD
 		if (spinlock.OwningThread != 0)
 			DebugBreak();
 		fb_assert(lockCount == 0);
@@ -116,7 +100,7 @@ class Mutex : public Reasons
 
 	bool tryEnter(const char* aReason)
 	{
-		const bool ret = TryEnterCS::tryEnter(&spinlock);
+		const bool ret = (TryEnterCriticalSection(&spinlock) == TRUE);
 		if (ret)
 		{
 			reason(aReason);
@@ -129,7 +113,7 @@ class Mutex : public Reasons
 
 	void leave()
 	{
-#if defined DEV_BUILD && !defined WIN9X_SUPPORT
+#if defined DEV_BUILD
 		// NS: This check is based on internal structure on CRITICAL_SECTION
 		// On 9X it works differently, and future OS versions may break this check as well
 		if ((U_IPTR) spinlock.OwningThread != GetCurrentThreadId())

src/common/common.h

@@ -551,11 +551,6 @@ extern "C" int remove(const char* path);
 #define INET_ERRNO	WSAGetLastError()
 #define H_ERRNO		WSAGetLastError()
 
-// For Visual Studio 2003 and earlier enable Windows 9X support
-#if defined _MSC_VER && (_MSC_VER < 1400)
-#define WIN9X_SUPPORT
-#endif
-
 #endif /* WIN_NT */
 
 

src/common/isc.cpp

@@ -505,40 +505,6 @@ SLONG ISC_set_prefix(const TEXT* sw, const TEXT* path)
 }
 
 
-#ifdef WIN9X_SUPPORT
-
-static DWORD os_type = 0;
-
-// Returns the type of OS: true for NT,
-// false for the 16-bit based ones (9x/ME, ...).
-//
-bool ISC_is_WinNT()
-{
-	// NS: this is thread safe.
-	// In the worst case initialization will be called more than once
-	if (!os_type)
-	{
-		// The first time this routine is called we use the Windows API
-		// call GetVersion to determine whether Windows NT or 9X
-		// is running.
-		OSVERSIONINFO OsVersionInfo;
-
-		OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-		if (GetVersionEx((LPOSVERSIONINFO) &OsVersionInfo))
-		{
-			os_type = OsVersionInfo.dwPlatformId;
-			fb_assert(os_type);
-		}
-		else {
-			os_type = VER_PLATFORM_WIN32_NT; // Default to NT
-		}
-	}
-
-	return os_type >= VER_PLATFORM_WIN32_NT; // Windows NT, CE and future platforms
-}
-#endif
-
-
 #ifdef WIN_NT
 LPSECURITY_ATTRIBUTES ISC_get_security_desc()
 {

src/common/isc_proto.h

@@ -39,10 +39,6 @@ void	iscLogStatus(const TEXT* text, const ISC_STATUS* status_vector);
 void	iscLogStatus(const TEXT* text, const Firebird::IStatus* status);
 void	iscLogException(const TEXT* text, const Firebird::Exception& e);
 
-#ifdef WIN9X_SUPPORT
-bool	ISC_is_WinNT();
-#endif
-
 #ifdef WIN_NT
 struct _SECURITY_ATTRIBUTES* ISC_get_security_desc();
 #endif