Add variable names to nthread (#161)

Also inline some parameters that were just copied to local variables.

Source/nthread.cpp

@@ -7,18 +7,18 @@ char byte_679704; // weak
 int gdwMsgLenTbl[4];
 static CRITICAL_SECTION sgMemCrit;
 int gdwDeltaBytesSec; // weak
-char byte_679734; // weak
+char nthread_should_run; // weak
 int gdwTurnsInTransit; // weak
 int glpMsgTbl[4];
 unsigned int glpNThreadId;
 char sgbSyncCountdown; // weak
-int dword_679754; // weak
+int turn_upper_bit; // weak
 char byte_679758; // weak
 char sgbPacketCountdown; // weak
 char sgbThreadIsRunning; // weak
 int gdwLargestMsgSize; // weak
 int gdwNormalMsgSize; // weak
-int dword_679764; // weak
+int last_tick; // weak
 
 const int nthread_inf = 0x7F800000; // weak
 
@@ -59,24 +59,20 @@ void __cdecl nthread_cleanup_mutex()
 	DeleteCriticalSection(&sgMemCrit);
 }
 
-void __fastcall nthread_terminate_game(char *pszFcn)
+void __fastcall nthread_terminate_game(const char *pszFcn)
 {
-	char *v1; // esi
+	DWORD sErr; // eax
-	int v2; // eax
-	char *v3; // eax
 
-	v1 = pszFcn;
+	sErr = SErrGetLastError();
-	v2 = SErrGetLastError();
+	if ( sErr != STORM_ERROR_INVALID_PLAYER )
-	if ( v2 != STORM_ERROR_INVALID_PLAYER )
 	{
-		if ( v2 == STORM_ERROR_GAME_TERMINATED || v2 == STORM_ERROR_NOT_IN_GAME )
+		if ( sErr == STORM_ERROR_GAME_TERMINATED || sErr == STORM_ERROR_NOT_IN_GAME )
 		{
 			gbGameDestroyed = 1;
 		}
 		else
 		{
-			v3 = TraceLastError();
+			TermMsg("%s:\n%s", pszFcn, TraceLastError());
-			TermMsg("%s:\n%s", v1, v3);
 		}
 	}
 }
@@ -84,73 +80,72 @@ void __fastcall nthread_terminate_game(char *pszFcn)
 
 int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta)
 {
-	int v2; // ebx
+	unsigned int new_cur_turn; // edi
-	unsigned int v3; // edi
+	const char *lastStormFn; // ecx
-	char *v5; // ecx
+	int turn_tmp; // eax
-	int v6; // eax
 	int turn; // [esp+Ch] [ebp-8h]
-	int turns; // [esp+10h] [ebp-4h]
+	int curTurnsInTransit; // [esp+10h] [ebp-4h]
 
-	v2 = turn_delta;
+	new_cur_turn = cur_turn;
-	v3 = cur_turn;
+	if ( SNetGetTurnsInTransit(&curTurnsInTransit) )
-	if ( SNetGetTurnsInTransit(&turns) )
 	{
-		if ( turns >= (unsigned int)gdwTurnsInTransit )
+		if ( curTurnsInTransit >= (unsigned int)gdwTurnsInTransit )
-			return v3;
+			return new_cur_turn;
 		while ( 1 )
 		{
-			++turns;
+			++curTurnsInTransit;
-			v6 = dword_679754 | v3 & 0x7FFFFFFF;
+
-			dword_679754 = 0;
+			turn_tmp = turn_upper_bit | new_cur_turn & 0x7FFFFFFF;
-			turn = v6;
+			turn_upper_bit = 0;
-			if ( !SNetSendTurn((char *)&turn, 4) )
+			turn = turn_tmp;
+
+			if ( !SNetSendTurn((char *)&turn, sizeof(turn)) )
 				break;
-			v3 += v2;
+
-			if ( v3 >= 0x7FFFFFFF )
+			new_cur_turn += turn_delta;
-				v3 = (unsigned short)v3;
+			if ( new_cur_turn >= 0x7FFFFFFF )
-			if ( turns >= (unsigned int)gdwTurnsInTransit )
+				new_cur_turn = (unsigned short)new_cur_turn;
-				return v3;
+			if ( curTurnsInTransit >= (unsigned int)gdwTurnsInTransit )
+				return new_cur_turn;
 		}
-		v5 = "SNetSendTurn";
+		lastStormFn = "SNetSendTurn";
 	}
 	else
 	{
-		v5 = "SNetGetTurnsInTransit";
+		lastStormFn = "SNetGetTurnsInTransit";
 	}
-	nthread_terminate_game(v5);
+	nthread_terminate_game(lastStormFn);
 	return 0;
 }
 // 679738: using guessed type int gdwTurnsInTransit;
-// 679754: using guessed type int dword_679754;
+// 679754: using guessed type int turn_upper_bit;
 
 int __fastcall nthread_recv_turns(int *pfSendAsync)
 {
-	int *v1; // esi
+	bool hasCountedDown; // zf
-	bool v2; // zf
 
-	v1 = pfSendAsync;
 	*pfSendAsync = 0;
 	if ( --sgbPacketCountdown )
 	{
-		dword_679764 += 50;
+		last_tick += 50;
 		return 1;
 	}
-	v2 = sgbSyncCountdown-- == 1;
+	hasCountedDown = sgbSyncCountdown-- == 1;
 	sgbPacketCountdown = byte_679704;
-	if ( !v2 )
+	if ( !hasCountedDown )
 		goto LABEL_11;
 	if ( SNetReceiveTurns(0, 4, (char **)glpMsgTbl, (unsigned int *)gdwMsgLenTbl, (unsigned long *)player_state) )
 	{
 		if ( !byte_679758 )
 		{
 			byte_679758 = 1;
-			dword_679764 = GetTickCount();
+			last_tick = GetTickCount();
 		}
 		sgbSyncCountdown = 4;
 		multi_msg_countdown();
 LABEL_11:
-		*v1 = 1;
+		*pfSendAsync = 1;
-		dword_679764 += 50;
+		last_tick += 50;
 		return 1;
 	}
 	if ( SErrGetLastError() != STORM_ERROR_NO_MESSAGES_WAITING )
@@ -164,37 +159,35 @@ LABEL_11:
 // 679750: using guessed type char sgbSyncCountdown;
 // 679758: using guessed type char byte_679758;
 // 679759: using guessed type char sgbPacketCountdown;
-// 679764: using guessed type int dword_679764;
+// 679764: using guessed type int last_tick;
 
 void __cdecl nthread_set_turn_upper_bit()
 {
-	dword_679754 = 0x80000000;
+	turn_upper_bit = 0x80000000;
 }
-// 679754: using guessed type int dword_679754;
+// 679754: using guessed type int turn_upper_bit;
 
 void __fastcall nthread_start(bool set_turn_upper_bit)
 {
-	BOOL v1; // esi
+	char *err; // eax
-	char *v3; // eax
+	unsigned int largestMsgSize; // esi
-	unsigned int v4; // esi
+	unsigned int normalMsgSize; // eax
-	unsigned int v5; // eax
+	char *err2; // eax
-	char *v6; // eax
 	_SNETCAPS caps; // [esp+8h] [ebp-24h]
 
-	v1 = set_turn_upper_bit;
+	last_tick = GetTickCount();
-	dword_679764 = GetTickCount();
 	sgbPacketCountdown = 1;
 	sgbSyncCountdown = 1;
 	byte_679758 = 1;
-	if ( v1 )
+	if (set_turn_upper_bit)
 		nthread_set_turn_upper_bit();
 	else
-		dword_679754 = 0;
+		turn_upper_bit = 0;
 	caps.size = 36;
 	if ( !SNetGetProviderCaps(&caps) )
 	{
-		v3 = TraceLastError();
+		err = TraceLastError();
-		TermMsg("SNetGetProviderCaps:\n%s", v3);
+		TermMsg("SNetGetProviderCaps:\n%s", err);
 	}
 	gdwTurnsInTransit = caps.defaultturnsintransit;
 	if ( !caps.defaultturnsintransit )
@@ -203,37 +196,37 @@ void __fastcall nthread_start(bool set_turn_upper_bit)
 		byte_679704 = 0x14u / caps.defaultturnssec;
 	else
 		byte_679704 = 1;
-	v4 = 512;
+	largestMsgSize = 512;
 	if ( caps.maxmessagesize < 0x200u )
-		v4 = caps.maxmessagesize;
+		largestMsgSize = caps.maxmessagesize;
 	gdwDeltaBytesSec = (unsigned int)caps.bytessec >> 2;
-	gdwLargestMsgSize = v4;
+	gdwLargestMsgSize = largestMsgSize;
 	if ( caps.maxplayers > 4u )
 		caps.maxplayers = 4;
-	v5 = (3 * (caps.bytessec * (unsigned int)(unsigned char)byte_679704 / 0x14) >> 2) / caps.maxplayers;
+	normalMsgSize = (3 * (caps.bytessec * (unsigned int)(unsigned char)byte_679704 / 0x14) >> 2) / caps.maxplayers;
-	gdwNormalMsgSize = v5;
+	gdwNormalMsgSize = normalMsgSize;
-	if ( v5 < 0x80 )
+	if ( normalMsgSize < 0x80 )
 	{
 		do
 		{
 			byte_679704 *= 2;
-			v5 *= 2;
+			normalMsgSize *= 2;
 		}
-		while ( v5 < 0x80 );
+		while ( normalMsgSize < 0x80 );
-		gdwNormalMsgSize = v5;
+		gdwNormalMsgSize = normalMsgSize;
 	}
-	if ( v5 > v4 )
+	if ( normalMsgSize > largestMsgSize )
-		gdwNormalMsgSize = v4;
+		gdwNormalMsgSize = largestMsgSize;
 	if ( (unsigned char)gbMaxPlayers > 1u )
 	{
 		sgbThreadIsRunning = 0;
 		EnterCriticalSection(&sgMemCrit);
-		byte_679734 = 1;
+		nthread_should_run = 1;
 		sghThread = (HANDLE)_beginthreadex(NULL, 0, nthread_handler, NULL, 0, &glpNThreadId);
 		if ( sghThread == (HANDLE)-1 )
 		{
-			v6 = TraceLastError();
+			err2 = TraceLastError();
-			TermMsg("nthread2:\n%s", v6);
+			TermMsg("nthread2:\n%s", err2);
 		}
 		SetThreadPriority(sghThread, THREAD_PRIORITY_HIGHEST);
 	}
@@ -241,52 +234,50 @@ void __fastcall nthread_start(bool set_turn_upper_bit)
 // 679660: using guessed type char gbMaxPlayers;
 // 679704: using guessed type char byte_679704;
 // 679730: using guessed type int gdwDeltaBytesSec;
-// 679734: using guessed type char byte_679734;
+// 679734: using guessed type char nthread_should_run;
 // 679738: using guessed type int gdwTurnsInTransit;
 // 679750: using guessed type char sgbSyncCountdown;
-// 679754: using guessed type int dword_679754;
+// 679754: using guessed type int turn_upper_bit;
 // 679758: using guessed type char byte_679758;
 // 679759: using guessed type char sgbPacketCountdown;
 // 67975A: using guessed type char sgbThreadIsRunning;
 // 67975C: using guessed type int gdwLargestMsgSize;
 // 679760: using guessed type int gdwNormalMsgSize;
-// 679764: using guessed type int dword_679764;
+// 679764: using guessed type int last_tick;
 
 unsigned int __stdcall nthread_handler(void *a1)
 {
-	signed int v1; // esi
+	signed int delta; // esi
-	int recieved; // [esp+Ch] [ebp-4h]
+	int received; // [esp+Ch] [ebp-4h]
 
-	if ( byte_679734 )
+	if ( nthread_should_run )
 	{
 		while ( 1 )
 		{
 			EnterCriticalSection(&sgMemCrit);
-			if ( !byte_679734 )
+			if ( !nthread_should_run )
 				break;
 			nthread_send_and_recv_turn(0, 0);
-			if ( nthread_recv_turns(&recieved) )
+			if ( nthread_recv_turns(&received) )
-				v1 = dword_679764 - GetTickCount();
+				delta = last_tick - GetTickCount();
 			else
-				v1 = 50;
+				delta = 50;
 			LeaveCriticalSection(&sgMemCrit);
-			if ( v1 > 0 )
+			if ( delta > 0 )
-				Sleep(v1);
+				Sleep(delta);
-			if ( !byte_679734 )
+			if ( !nthread_should_run )
 				return 0;
 		}
 		LeaveCriticalSection(&sgMemCrit);
 	}
 	return 0;
 }
-// 679734: using guessed type char byte_679734;
+// 679734: using guessed type char nthread_should_run;
-// 679764: using guessed type int dword_679764;
+// 679764: using guessed type int last_tick;
 
 void __cdecl nthread_cleanup()
 {
-	char *v0; // eax
+	nthread_should_run = 0;
-
-	byte_679734 = 0;
 	gdwTurnsInTransit = 0;
 	gdwNormalMsgSize = 0;
 	gdwLargestMsgSize = 0;
@@ -296,14 +287,13 @@ void __cdecl nthread_cleanup()
 			LeaveCriticalSection(&sgMemCrit);
 		if ( WaitForSingleObject(sghThread, 0xFFFFFFFF) == -1 )
 		{
-			v0 = TraceLastError();
+			TermMsg("nthread3:\n(%s)", TraceLastError());
-			TermMsg("nthread3:\n(%s)", v0);
 		}
 		CloseHandle(sghThread);
 		sghThread = (HANDLE)-1;
 	}
 }
-// 679734: using guessed type char byte_679734;
+// 679734: using guessed type char nthread_should_run;
 // 679738: using guessed type int gdwTurnsInTransit;
 // 67975A: using guessed type char sgbThreadIsRunning;
 // 67975C: using guessed type int gdwLargestMsgSize;
@@ -311,33 +301,30 @@ void __cdecl nthread_cleanup()
 
 void __fastcall nthread_ignore_mutex(bool bStart)
 {
-	bool v1; // bl
-
-	v1 = bStart;
 	if ( sghThread != (HANDLE)-1 )
 	{
 		if ( bStart )
 			LeaveCriticalSection(&sgMemCrit);
 		else
 			EnterCriticalSection(&sgMemCrit);
-		sgbThreadIsRunning = v1;
+		sgbThreadIsRunning = bStart;
 	}
 }
 // 67975A: using guessed type char sgbThreadIsRunning;
 
 bool __cdecl nthread_has_500ms_passed()
 {
-	DWORD v0; // eax
+	DWORD currentTickCount; // eax
-	int v1; // ecx
+	int ticksElapsed; // ecx
 
-	v0 = GetTickCount();
+	currentTickCount = GetTickCount();
-	v1 = v0 - dword_679764;
+	ticksElapsed = currentTickCount - last_tick;
-	if ( gbMaxPlayers == 1 && v1 > 500 )
+	if ( gbMaxPlayers == 1 && ticksElapsed > 500 )
 	{
-		dword_679764 = v0;
+		last_tick = currentTickCount;
-		v1 = 0;
+		ticksElapsed = 0;
 	}
-	return v1 >= 0;
+	return ticksElapsed >= 0;
 }
 // 679660: using guessed type char gbMaxPlayers;
-// 679764: using guessed type int dword_679764;
+// 679764: using guessed type int last_tick;

Source/nthread.h

@@ -6,25 +6,23 @@ extern int nthread_cpp_init_value; // weak
 extern char byte_679704; // weak
 extern int gdwMsgLenTbl[4];
 extern int gdwDeltaBytesSec; // weak
-extern char byte_679734; // weak
+extern char nthread_should_run; // weak
 extern int gdwTurnsInTransit; // weak
 extern int glpMsgTbl[4];
 extern unsigned int glpNThreadId;
 extern char sgbSyncCountdown; // weak
-extern int dword_679754; // weak
+extern int turn_upper_bit; // weak
 extern char byte_679758; // weak
 extern char sgbPacketCountdown; // weak
 extern char sgbThreadIsRunning; // weak
 extern int gdwLargestMsgSize; // weak
 extern int gdwNormalMsgSize; // weak
-extern int dword_679764; // weak
+extern int last_tick; // weak
 
-void __cdecl nthread_cpp_init_1();
-void __cdecl nthread_cpp_init_2();
 void __cdecl nthread_init_mutex();
 void __cdecl nthread_cleanup_mutex_atexit();
 void __cdecl nthread_cleanup_mutex();
-void __fastcall nthread_terminate_game(char *pszFcn);
+void __fastcall nthread_terminate_game(const char *pszFcn);
 int __fastcall nthread_send_and_recv_turn(int cur_turn, int turn_delta);
 int __fastcall nthread_recv_turns(int *pfSendAsync);
 void __cdecl nthread_set_turn_upper_bit();