From 3f19c51f2720954538f6e50c0a7ddbb6e00856b8 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Wed, 3 Sep 2003 03:30:32 +0000
Subject: [PATCH] simplify

---
 stepmania/src/RageThreads.cpp           |  2 +-
 stepmania/src/archutils/Win32/Crash.cpp | 10 +++++-----
 stepmania/src/archutils/Win32/Crash.h   |  3 +--
 stepmania/src/archutils/Win32/Tls.cpp   |  4 ++--
 stepmania/src/archutils/Win32/Tls.h     |  2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/stepmania/src/RageThreads.cpp b/stepmania/src/RageThreads.cpp
index 62e148e477..bc82eadc48 100644
--- a/stepmania/src/RageThreads.cpp
+++ b/stepmania/src/RageThreads.cpp
@@ -171,7 +171,7 @@ void ThreadSlot::SetupThisThread()
 #endif
 
 #ifdef _WINDOWS
-	InitThreadData( name );
+	InitThreadData();
 #endif
 
 	threadid = SDL_ThreadID();
diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp
index f1a4cfa415..f08b18f96d 100644
--- a/stepmania/src/archutils/Win32/Crash.cpp
+++ b/stepmania/src/archutils/Win32/Crash.cpp
@@ -119,7 +119,7 @@ static CRITICAL_SECTION g_csPerThreadState;
 static List2<VirtualDubThreadStateNode> g_listPerThreadState;
 static LONG g_nThreadsTrackedMinusOne = -1;
 
-void VirtualDubInitializeThread(const char *pszName) {
+void VirtualDubInitializeThread() {
 	DWORD dwThreadId = GetCurrentThreadId();
 
 	if (!InterlockedIncrement(&g_nThreadsTrackedMinusOne)) {
@@ -128,9 +128,9 @@ void VirtualDubInitializeThread(const char *pszName) {
 
 	EnterCriticalSection(&g_csPerThreadState);
 
-	if (DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), (HANDLE *)&g_PerThreadState.hThread, NULL, FALSE, DUPLICATE_SAME_ACCESS)) {
-
-		g_PerThreadState.pszThreadName = pszName;
+	g_PerThreadState.hThread = NULL;
+	if (DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), (HANDLE *)&g_PerThreadState.hThread, NULL, FALSE, DUPLICATE_SAME_ACCESS))
+	{
 		g_PerThreadState.dwThreadId = dwThreadId;
 
 		g_PerThreadStateNode.pState = &g_PerThreadState;
@@ -147,7 +147,7 @@ void VirtualDubDeinitializeThread() {
 
 	LeaveCriticalSection(&g_csPerThreadState);
 
-	if (g_PerThreadState.pszThreadName)
+	if (g_PerThreadState.hThread)
 		CloseHandle((HANDLE)g_PerThreadState.hThread);
 
 	InterlockedDecrement(&g_nThreadsTrackedMinusOne);
diff --git a/stepmania/src/archutils/Win32/Crash.h b/stepmania/src/archutils/Win32/Crash.h
index 631cecf16f..f764a34f77 100644
--- a/stepmania/src/archutils/Win32/Crash.h
+++ b/stepmania/src/archutils/Win32/Crash.h
@@ -27,14 +27,13 @@
 #define CHECKPOINT_COUNT		(2)
 
 struct VirtualDubThreadState {
-	const char				*pszThreadName;
 	unsigned long			dwThreadId;
 	void *					hThread;
 };
 
 EXTERN __declspec(thread) VirtualDubThreadState g_PerThreadState;
 
-void VirtualDubInitializeThread(const char *pszName);
+void VirtualDubInitializeThread();
 void VirtualDubDeinitializeThread();
 extern long __stdcall CrashHandler(struct _EXCEPTION_POINTERS *ExceptionInfo);
 
diff --git a/stepmania/src/archutils/Win32/Tls.cpp b/stepmania/src/archutils/Win32/Tls.cpp
index b5fcc88911..8eef31b4cc 100644
--- a/stepmania/src/archutils/Win32/Tls.cpp
+++ b/stepmania/src/archutils/Win32/Tls.cpp
@@ -21,7 +21,7 @@
 
 __declspec(thread) VirtualDubTLSData g_tlsdata;
 
-void InitThreadData(const char *pszName) {
+void InitThreadData() {
 	VirtualDubTLSData *pData = &g_tlsdata;
 
 	__asm {
@@ -29,7 +29,7 @@ void InitThreadData(const char *pszName) {
 		mov		dword ptr fs:[14h],eax
 	}
 
-	VirtualDubInitializeThread(pszName);
+	VirtualDubInitializeThread();
 }
 
 void DeinitThreadData() {
diff --git a/stepmania/src/archutils/Win32/Tls.h b/stepmania/src/archutils/Win32/Tls.h
index ff14f4cfa6..ae76b3286d 100644
--- a/stepmania/src/archutils/Win32/Tls.h
+++ b/stepmania/src/archutils/Win32/Tls.h
@@ -25,7 +25,7 @@ struct VirtualDubTLSData {
 
 extern __declspec(thread) VirtualDubTLSData g_tlsdata;
 
-void InitThreadData(const char *pszName);
+void InitThreadData();
 void DeinitThreadData();
 
 #endif