diff --git a/stepmania/src/archutils/Win32/Crash.cpp b/stepmania/src/archutils/Win32/Crash.cpp
index fb63203d97..26ebf08b96 100644
--- a/stepmania/src/archutils/Win32/Crash.cpp
+++ b/stepmania/src/archutils/Win32/Crash.cpp
@@ -937,8 +937,10 @@ void NORETURN debug_crash()
 }
 
 /* Get a stack trace of the current thread and the specified thread. */
-void ForceCrashHandlerDeadlock( const char *reason, HANDLE hThread )
+void ForceCrashHandlerDeadlock( CString reason, uint64_t iThreadHandle )
 {
+	HANDLE hThread = (HANDLE) iThreadHandle;
+
 	strncpy( g_CrashInfo.m_CrashReason, reason, sizeof(g_CrashInfo.m_CrashReason) );
 	g_CrashInfo.m_CrashReason[ sizeof(g_CrashInfo.m_CrashReason)-1 ] = 0;
 
diff --git a/stepmania/src/archutils/Win32/Crash.h b/stepmania/src/archutils/Win32/Crash.h
index 5207e4934e..2296f9c494 100644
--- a/stepmania/src/archutils/Win32/Crash.h
+++ b/stepmania/src/archutils/Win32/Crash.h
@@ -12,7 +12,7 @@ void NORETURN debug_crash();
 void do_backtrace( const void **buf, size_t size, HANDLE hProcess, HANDLE hThread, const CONTEXT *pContext );
 void SymLookup( const void *ptr, char *buf );
 void ForceCrashHandler( const char *reason );
-void ForceCrashHandlerDeadlock( const char *reason, HANDLE hThread );
+void ForceCrashHandlerDeadlock( CString reason, uint64_t iCrashHandle );
 
 #endif
 /*