Replace string locks with atomic Interlocked operations

githubawn · githubawn · commit b8f53bdc8857 · 2026-04-29T21:14:33.000+02:00
Fix VC6 build errors using InterlockedExchange casts
diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h
@@ -87,7 +87,7 @@ class AsciiString
 #if defined(RTS_DEBUG)
 		const char* m_debugptr;	// just makes it easier to read in the debugger
 #endif
-		volatile long	m_refCount;						// reference count
+		long	m_refCount;						// reference count
 		unsigned short	m_numCharsAllocated;  // length of data allocated
 		// char m_stringdata[];
 
diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h
@@ -87,7 +87,7 @@ class UnicodeString
 #if defined(RTS_DEBUG)
 		const WideChar* m_debugptr;	// just makes it easier to read in the debugger
 #endif
-		volatile long	m_refCount;						// reference count
+		long	m_refCount;						// reference count
 		unsigned short	m_numCharsAllocated;  // length of data allocated
 		// WideChar m_stringdata[];
 
diff --git a/Core/GameEngine/Source/Common/System/AsciiString.cpp b/Core/GameEngine/Source/Common/System/AsciiString.cpp
@@ -168,7 +168,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 	if (strToCat)
 		strcat(newData->peek(), strToCat);
 
-	AsciiStringData* oldData = (AsciiStringData*)InterlockedExchangePointer((PVOID*)&m_data, newData);
+	AsciiStringData* oldData = (AsciiStringData*)InterlockedExchange((LONG*)&m_data, (LONG)newData);
 	if (oldData)
 	{
 		if (InterlockedDecrement(&oldData->m_refCount) == 0)
@@ -185,7 +185,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData
 void AsciiString::releaseBuffer()
 {
 	validate();
-	AsciiStringData* data = (AsciiStringData*)InterlockedExchangePointer((PVOID*)&m_data, nullptr);
+	AsciiStringData* data = (AsciiStringData*)InterlockedExchange((LONG*)&m_data, (LONG)nullptr);
 	if (data)
 	{
 		if (InterlockedDecrement(&data->m_refCount) == 0)
@@ -229,7 +229,7 @@ void AsciiString::set(const AsciiString& stringSrc)
 			InterlockedIncrement(&newData->m_refCount);
 		}
 		
-		AsciiStringData* oldData = (AsciiStringData*)InterlockedExchangePointer((PVOID*)&m_data, newData);
+		AsciiStringData* oldData = (AsciiStringData*)InterlockedExchange((LONG*)&m_data, (LONG)newData);
 		if (oldData)
 		{
 			if (InterlockedDecrement(&oldData->m_refCount) == 0)
diff --git a/Core/GameEngine/Source/Common/System/UnicodeString.cpp b/Core/GameEngine/Source/Common/System/UnicodeString.cpp
@@ -119,7 +119,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa
 	if (strToCat)
 		wcscat(newData->peek(), strToCat);
 
-	UnicodeStringData* oldData = (UnicodeStringData*)InterlockedExchangePointer((PVOID*)&m_data, newData);
+	UnicodeStringData* oldData = (UnicodeStringData*)InterlockedExchange((LONG*)&m_data, (LONG)newData);
 	if (oldData)
 	{
 		if (InterlockedDecrement(&oldData->m_refCount) == 0)
@@ -136,7 +136,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa
 void UnicodeString::releaseBuffer()
 {
 	validate();
-	UnicodeStringData* data = (UnicodeStringData*)InterlockedExchangePointer((PVOID*)&m_data, nullptr);
+	UnicodeStringData* data = (UnicodeStringData*)InterlockedExchange((LONG*)&m_data, (LONG)nullptr);
 	if (data)
 	{
 		if (InterlockedDecrement(&data->m_refCount) == 0)
@@ -179,7 +179,7 @@ void UnicodeString::set(const UnicodeString& stringSrc)
 			InterlockedIncrement(&newData->m_refCount);
 		}
 
-		UnicodeStringData* oldData = (UnicodeStringData*)InterlockedExchangePointer((PVOID*)&m_data, newData);
+		UnicodeStringData* oldData = (UnicodeStringData*)InterlockedExchange((LONG*)&m_data, (LONG)newData);
 		if (oldData)
 		{
 			if (InterlockedDecrement(&oldData->m_refCount) == 0)

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData`
`168`	`168`	`if (strToCat)`
`169`	`169`	`strcat(newData->peek(), strToCat);`
`170`	`170`
`171`		`- AsciiStringData* oldData = (AsciiStringData)InterlockedExchangePointer((PVOID)&m_data, newData);`
	`171`	`+ AsciiStringData* oldData = (AsciiStringData)InterlockedExchange((LONG)&m_data, (LONG)newData);`
`172`	`172`	`if (oldData)`
`173`	`173`	`{`
`174`	`174`	`if (InterlockedDecrement(&oldData->m_refCount) == 0)`
`@@ -185,7 +185,7 @@ void AsciiString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveData`
`185`	`185`	`void AsciiString::releaseBuffer()`
`186`	`186`	`{`
`187`	`187`	`validate();`
`188`		`- AsciiStringData* data = (AsciiStringData)InterlockedExchangePointer((PVOID)&m_data, nullptr);`
	`188`	`+ AsciiStringData* data = (AsciiStringData)InterlockedExchange((LONG)&m_data, (LONG)nullptr);`
`189`	`189`	`if (data)`
`190`	`190`	`{`
`191`	`191`	`if (InterlockedDecrement(&data->m_refCount) == 0)`
`@@ -229,7 +229,7 @@ void AsciiString::set(const AsciiString& stringSrc)`
`229`	`229`	`InterlockedIncrement(&newData->m_refCount);`
`230`	`230`	`}`
`231`	`231`
`232`		`- AsciiStringData* oldData = (AsciiStringData)InterlockedExchangePointer((PVOID)&m_data, newData);`
	`232`	`+ AsciiStringData* oldData = (AsciiStringData)InterlockedExchange((LONG)&m_data, (LONG)newData);`
`233`	`233`	`if (oldData)`
`234`	`234`	`{`
`235`	`235`	`if (InterlockedDecrement(&oldData->m_refCount) == 0)`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa`
`119`	`119`	`if (strToCat)`
`120`	`120`	`wcscat(newData->peek(), strToCat);`
`121`	`121`
`122`		`- UnicodeStringData* oldData = (UnicodeStringData)InterlockedExchangePointer((PVOID)&m_data, newData);`
	`122`	`+ UnicodeStringData* oldData = (UnicodeStringData)InterlockedExchange((LONG)&m_data, (LONG)newData);`
`123`	`123`	`if (oldData)`
`124`	`124`	`{`
`125`	`125`	`if (InterlockedDecrement(&oldData->m_refCount) == 0)`
`@@ -136,7 +136,7 @@ void UnicodeString::ensureUniqueBufferOfSize(int numCharsNeeded, Bool preserveDa`
`136`	`136`	`void UnicodeString::releaseBuffer()`
`137`	`137`	`{`
`138`	`138`	`validate();`
`139`		`- UnicodeStringData* data = (UnicodeStringData)InterlockedExchangePointer((PVOID)&m_data, nullptr);`
	`139`	`+ UnicodeStringData* data = (UnicodeStringData)InterlockedExchange((LONG)&m_data, (LONG)nullptr);`
`140`	`140`	`if (data)`
`141`	`141`	`{`
`142`	`142`	`if (InterlockedDecrement(&data->m_refCount) == 0)`
`@@ -179,7 +179,7 @@ void UnicodeString::set(const UnicodeString& stringSrc)`
`179`	`179`	`InterlockedIncrement(&newData->m_refCount);`
`180`	`180`	`}`
`181`	`181`
`182`		`- UnicodeStringData* oldData = (UnicodeStringData)InterlockedExchangePointer((PVOID)&m_data, newData);`
	`182`	`+ UnicodeStringData* oldData = (UnicodeStringData)InterlockedExchange((LONG)&m_data, (LONG)newData);`
`183`	`183`	`if (oldData)`
`184`	`184`	`{`
`185`	`185`	`if (InterlockedDecrement(&oldData->m_refCount) == 0)`