From 4c8c2b15e56434ca97111cfe8a08037d3ba85b8c Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 24 Jan 2003 23:09:31 +0000
Subject: [PATCH] arch interface for little hooks that don't need their own
 drivers

---
 stepmania/src/StepMania.cpp                   | 22 ++++++--------
 stepmania/src/StepMania.dsp                   | 24 +++++++++++++--
 stepmania/src/StepMania.h                     |  4 +--
 stepmania/src/StepMania.vcproj                | 14 ++++++++-
 stepmania/src/arch/ArchHooks/ArchHooks.h      | 30 +++++++++++++++++++
 .../src/arch/ArchHooks/ArchHooks_Win32.cpp    | 18 +++++++++++
 .../src/arch/ArchHooks/ArchHooks_Win32.h      | 19 ++++++++++++
 stepmania/src/arch/ArchHooks/ArchHooks_none.h | 17 +++++++++++
 stepmania/src/arch/arch.cpp                   |  1 +
 stepmania/src/arch/arch.h                     |  4 ++-
 stepmania/src/arch/arch_Win32.h               |  1 +
 stepmania/src/arch/arch_default.h             |  1 +
 12 files changed, 136 insertions(+), 19 deletions(-)
 create mode 100644 stepmania/src/arch/ArchHooks/ArchHooks.h
 create mode 100644 stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
 create mode 100644 stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
 create mode 100644 stepmania/src/arch/ArchHooks/ArchHooks_none.h

diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp
index b878483023..6e1eaa86ea 100644
--- a/stepmania/src/StepMania.cpp
+++ b/stepmania/src/StepMania.cpp
@@ -10,6 +10,8 @@
 -----------------------------------------------------------------------------
 */
 
+#include "StepMania.h"
+
 //
 // Rage global classes
 //
@@ -46,13 +48,8 @@
 #include "InputQueue.h"
 #include "SongCacheIndex.h"
 
-
-#include "archutils/win32/tls.h"
-#include "archutils/win32/crash.h"
-
-
-#include "SDL.h"
-#include "SDL_opengl.h"
+/* This is also a global class; we own it. */
+ArchHooks *HOOKS = NULL;
 
 
 #ifdef DEBUG
@@ -217,14 +214,13 @@ static void RestoreAppPri()
 
 int main(int argc, char* argv[])
 {
+	/* Set up arch hooks first.  This may set up crash handling. */
+	HOOKS = MakeArchHooks();
+
 	ChangeToDirOfExecutable(argv[0]);
 
     atexit(SDL_Quit);   /* Clean up on exit */
 
-	SetUnhandledExceptionFilter(CrashHandler);
-	InitThreadData("Main thread");
-	VDCHECKPOINT;
-
 	/* Fire up the SDL, but don't actually start any subsystems. */
 	int SDL_flags = 0;
 #ifdef WIN32
@@ -365,8 +361,8 @@ int main(int argc, char* argv[])
 	SAFE_DELETE( TEXTUREMAN );
 	SAFE_DELETE( DISPLAY );
 	SAFE_DELETE( LOG );
-
-
+	SAFE_DELETE( HOOKS );
+	
 	if( g_sErrorString != "" )
 	{
 		// throw up a pretty error dialog
diff --git a/stepmania/src/StepMania.dsp b/stepmania/src/StepMania.dsp
index 23eb7d38b6..71495373af 100644
--- a/stepmania/src/StepMania.dsp
+++ b/stepmania/src/StepMania.dsp
@@ -60,7 +60,7 @@ IntDir=.\../Release6
 TargetDir=\temp\stepmania
 TargetName=StepMania
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                               	cl                                                /Zl                                                /nologo                                                /c                                                verstub.cpp                                                /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                	cl                                                 /Zl                                                 /nologo                                                 /c                                                 verstub.cpp                                                 /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -95,7 +95,7 @@ IntDir=.\../Debug6
 TargetDir=\temp\stepmania
 TargetName=StepMania-debug
 SOURCE="$(InputPath)"
-PreLink_Cmds=disasm\verinc                                               	cl                                                /Zl                                                /nologo                                                /c                                                verstub.cpp                                                /Fo$(IntDir)\ 
+PreLink_Cmds=disasm\verinc                                                	cl                                                 /Zl                                                 /nologo                                                 /c                                                 verstub.cpp                                                 /Fo$(IntDir)\ 
 PostBuild_Cmds=disasm\mapconv $(IntDir)\$(TargetName).map $(TargetDir)\StepMania.vdi ia32.vdi
 # End Special Build Tool
 
@@ -644,6 +644,26 @@ SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.cpp
 SOURCE=.\arch\ErrorDialog\ErrorDialog_Win32.h
 # End Source File
 # End Group
+# Begin Group "ArchHooks"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\arch\ArchHooks\ArchHooks.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ArchHooks\ArchHooks_none.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ArchHooks\ArchHooks_Win32.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\arch\ArchHooks\ArchHooks_Win32.h
+# End Source File
+# End Group
 # Begin Source File
 
 SOURCE=.\arch\arch.cpp
diff --git a/stepmania/src/StepMania.h b/stepmania/src/StepMania.h
index c280634371..0b15d97c99 100644
--- a/stepmania/src/StepMania.h
+++ b/stepmania/src/StepMania.h
@@ -13,10 +13,10 @@
 
 
 void ApplyGraphicOptions();
-
 void ExitGame();
-
 void ResetGame();
 
+#include "arch/ArchHooks/ArchHooks.h"
+extern ArchHooks *HOOKS;	// global and accessable from anywhere in our program
 
 #endif
diff --git a/stepmania/src/StepMania.vcproj b/stepmania/src/StepMania.vcproj
index a218b1b764..fa4e067498 100644
--- a/stepmania/src/StepMania.vcproj
+++ b/stepmania/src/StepMania.vcproj
@@ -742,8 +742,20 @@ cl /Zl /nologo /c verstub.cpp /Fo$(IntDir)\
 					</File>
 				</Filter>
 				<Filter
-					Name="DebugInfo"
+					Name="ArchHooks"
 					Filter="">
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks.h">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks_Win32.cpp">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks_Win32.h">
+					</File>
+					<File
+						RelativePath="arch\ArchHooks\ArchHooks_none.h">
+					</File>
 				</Filter>
 			</Filter>
 			<Filter
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks.h b/stepmania/src/arch/ArchHooks/ArchHooks.h
new file mode 100644
index 0000000000..1dcaa303bf
--- /dev/null
+++ b/stepmania/src/arch/ArchHooks/ArchHooks.h
@@ -0,0 +1,30 @@
+#ifndef ARCH_HOOKS_H
+#define ARCH_HOOKS_H
+
+/*
+ * I'm undecided about when it's a good idea to use arch; I'm experimenting
+ * a bit.
+ *
+ * This arch driver is simply called at various important points, to let
+ * architectures do things.  Windows can use this to start up the crash
+ * handler and to output Windows-specific debug information, for example.
+ *
+ * This class should have one-way data transfer only: functions are called,
+ * they may do something, and no data is returned.  (We don't want to have
+ * to deal with error handling and so on when using these functions.)
+ *
+ * This class is constructed at the very start of the program.
+ */
+class ArchHooks
+{
+public:
+	virtual ~ArchHooks() { }
+};
+
+#endif
+
+/*
+ * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
+ *
+ * Glenn Maynard
+ */
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
new file mode 100644
index 0000000000..98cd95f862
--- /dev/null
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp
@@ -0,0 +1,18 @@
+#include "stdafx.h"
+#include "ArchHooks_Win32.h"
+
+#include "archutils/win32/tls.h"
+#include "archutils/win32/crash.h"
+
+ArchHooks_Win32::ArchHooks_Win32()
+{
+	SetUnhandledExceptionFilter(CrashHandler);
+	InitThreadData("Main thread");
+	VDCHECKPOINT;
+}
+
+/*
+ * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
+ *
+ * Glenn Maynard
+ */
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
new file mode 100644
index 0000000000..20bf8ebc7f
--- /dev/null
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.h
@@ -0,0 +1,19 @@
+#ifndef ARCH_HOOKS_WIN32_H
+#define ARCH_HOOKS_WIN32_H
+
+#include "ArchHooks.h"
+class ArchHooks_Win32: public ArchHooks
+{
+public:
+	ArchHooks_Win32();
+};
+
+#undef ARCH_HOOKS
+#define ARCH_HOOKS ArchHooks_Win32
+
+#endif
+/*
+ * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
+ *
+ * Glenn Maynard
+ */
diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_none.h b/stepmania/src/arch/ArchHooks/ArchHooks_none.h
new file mode 100644
index 0000000000..2224783717
--- /dev/null
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_none.h
@@ -0,0 +1,17 @@
+#ifndef ARCH_HOOKS_NONE_H
+#define ARCH_HOOKS_NONE_H
+
+#include "ArchHooks.h"
+class ArchHooks_none: public ArchHooks
+{
+};
+
+#undef ARCH_HOOKS
+#define ARCH_HOOKS ArchHooks_none
+
+#endif
+/*
+ * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
+ *
+ * Glenn Maynard
+ */
diff --git a/stepmania/src/arch/arch.cpp b/stepmania/src/arch/arch.cpp
index b7ac23657e..8775d32ad6 100644
--- a/stepmania/src/arch/arch.cpp
+++ b/stepmania/src/arch/arch.cpp
@@ -19,6 +19,7 @@
 
 LoadingWindow *MakeLoadingWindow() { return new ARCH_LOADING_WINDOW; }
 ErrorDialog *MakeErrorDialog() { return new ARCH_ERROR_DIALOG; }
+ArchHooks *MakeArchHooks() { return new ARCH_HOOKS; }
 
 /* Err, this is ugly--breaks arch encapsulation. Hmm. */
 RageSoundDriver *MakeRageSoundDriver(CString drivers)
diff --git a/stepmania/src/arch/arch.h b/stepmania/src/arch/arch.h
index 670f0acb6a..54b01f3368 100644
--- a/stepmania/src/arch/arch.h
+++ b/stepmania/src/arch/arch.h
@@ -5,10 +5,12 @@
 class ErrorDialog;
 class LoadingWindow;
 class RageSoundDriver;
+class ArchHooks;
 
 ErrorDialog *MakeErrorDialog();
 LoadingWindow *MakeLoadingWindow();
 RageSoundDriver *MakeRageSoundDriver(CString drivers);
+ArchHooks *MakeArchHooks();
 
 /* Define the default list of sound drivers for each arch. */
 #if defined(WIN32)
@@ -18,7 +20,7 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers);
 #endif
 
 /*
- * Copyright (c) 2002 by the person(s) listed below.  All rights reserved.
+ * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
  *
  * Glenn Maynard
  */
diff --git a/stepmania/src/arch/arch_Win32.h b/stepmania/src/arch/arch_Win32.h
index b0291b8913..15de1293c2 100644
--- a/stepmania/src/arch/arch_Win32.h
+++ b/stepmania/src/arch/arch_Win32.h
@@ -4,6 +4,7 @@
 /* Load drivers for Win32. */
 #include "LoadingWindow/LoadingWindow_Win32.h"
 #include "ErrorDialog/ErrorDialog_Win32.h"
+#include "ArchHooks/ArchHooks_Win32.h"
 
 #include "Sound/RageSoundDriver_DSound.h"
 #include "Sound/RageSoundDriver_DSound_Software.h"
diff --git a/stepmania/src/arch/arch_default.h b/stepmania/src/arch/arch_default.h
index 70ac43902f..b839c9b102 100644
--- a/stepmania/src/arch/arch_default.h
+++ b/stepmania/src/arch/arch_default.h
@@ -7,6 +7,7 @@
 /* Load default fallback drivers; some of these may be overridden by arch-specific drivers. */
 #include "LoadingWindow/LoadingWindow_SDL.h"
 #include "ErrorDialog/ErrorDialog_stdout.h"
+#include "ArchHooks/ArchHooks_none.h"
 
 /* no default sound driver */