From d87a17a0340f06e1c8f0af0b3b53c779d59ca8d9 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 25 Feb 2006 23:59:32 +0000 Subject: [PATCH] PRODUCT_NAME -> PRODUCT_FAMILY PRODUCT_NAME_VER -> PRODUCT_ID_VER --- stepmania/src/NetworkSyncManager.cpp | 2 +- stepmania/src/PrefsManager.cpp | 2 +- stepmania/src/ProductInfo.h | 10 +++++----- stepmania/src/ProductInfo.inc | 10 +++++----- stepmania/src/StepMania.cpp | 2 +- stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp | 6 +++--- .../src/arch/LoadingWindow/LoadingWindow_Win32.cpp | 2 +- stepmania/src/archutils/Win32/CrashHandlerChild.cpp | 6 +++--- stepmania/src/archutils/Win32/GraphicsWindow.cpp | 2 +- stepmania/src/smpackage/SMPackageUtil.cpp | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/stepmania/src/NetworkSyncManager.cpp b/stepmania/src/NetworkSyncManager.cpp index fcf84e8117..5109413306 100644 --- a/stepmania/src/NetworkSyncManager.cpp +++ b/stepmania/src/NetworkSyncManager.cpp @@ -178,7 +178,7 @@ void NetworkSyncManager::PostStartUp(const RString& ServerIP) m_packet.Write1(NETPROTOCOLVERSION); - m_packet.WriteNT(RString(PRODUCT_NAME_VER)); + m_packet.WriteNT(RString(PRODUCT_ID_VER)); //Block until responce is received //Move mode to blocking in order to give CPU back to the diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp index 68e45f809b..4104390321 100644 --- a/stepmania/src/PrefsManager.cpp +++ b/stepmania/src/PrefsManager.cpp @@ -269,7 +269,7 @@ PrefsManager::PrefsManager() : m_bShowBeginnerHelper ( "ShowBeginnerHelper", false ), m_bDisableScreenSaver ( "DisableScreenSaver", true ), m_sLanguage ( "Language", "" ), // ThemeManager will deal with this invalid language - m_sMemoryCardProfileSubdir ( "MemoryCardProfileSubdir", PRODUCT_NAME ), + m_sMemoryCardProfileSubdir ( "MemoryCardProfileSubdir", PRODUCT_ID ), m_iProductID ( "ProductID", 1 ), m_bMemoryCards ( "MemoryCards", true ), m_iCenterImageTranslateX ( "CenterImageTranslateX", 0 ), diff --git a/stepmania/src/ProductInfo.h b/stepmania/src/ProductInfo.h index 06345a9936..23c964860a 100644 --- a/stepmania/src/ProductInfo.h +++ b/stepmania/src/ProductInfo.h @@ -6,21 +6,21 @@ // Don't forget to also change ProductInfo.inc! // Change these two -#define PRODUCT_NAME_BARE StepMania +#define PRODUCT_FAMILY_BARE StepMania +#define PRODUCT_ID_BARE StepMania CVS #define PRODUCT_VER_BARE 4.0 CVS //#define PRODUCT_VER_BARE 4.0 alpha 1 // String used for the install directory and registry locations // Official releases = "StepMania"; intermediate releases = "StepMania CVS". -#define PRODUCT_ID_BARE StepMania CVS // These cannot be #undef'd so make them unlikely to conflict with anything #define PRODUCT_STRINGIFY(x) #x #define PRODUCT_XSTRINGIFY(x) PRODUCT_STRINGIFY(x) -#define PRODUCT_NAME PRODUCT_XSTRINGIFY(PRODUCT_NAME_BARE) -#define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE) -#define PRODUCT_NAME_VER PRODUCT_NAME " " PRODUCT_VER +#define PRODUCT_FAMILY PRODUCT_XSTRINGIFY(PRODUCT_FAMILY_BARE) #define PRODUCT_ID PRODUCT_XSTRINGIFY(PRODUCT_ID_BARE) +#define PRODUCT_VER PRODUCT_XSTRINGIFY(PRODUCT_VER_BARE) +#define PRODUCT_ID_VER PRODUCT_ID " " PRODUCT_VER #define VIDEO_TROUBLESHOOTING_URL "http://www.stepmania.com/stepmania/mediawiki.php?title=Video_Driver_Troubleshooting" #define REPORT_BUG_URL "http://sourceforge.net/tracker/?func=add&group_id=37892&atid=421366" diff --git a/stepmania/src/ProductInfo.inc b/stepmania/src/ProductInfo.inc index c4eb611e60..1f5f81248d 100644 --- a/stepmania/src/ProductInfo.inc +++ b/stepmania/src/ProductInfo.inc @@ -1,14 +1,14 @@ ; Included by the NSIS installer script ; Don't forget to also change ProductInfo.h! -!define PRODUCT_NAME "StepMania" -!define PRODUCT_VER "4.0 CVS" -; !define PRODUCT_VER "4.0 alpha 1" -!define PRODUCT_NAME_VER "${PRODUCT_NAME} ${PRODUCT_VER}" - +!define PRODUCT_FAMILY "StepMania" ; String used for the install directory and registry locations ; Official releases = "StepMania"; intermediate releases = "StepMania CVS". !define PRODUCT_ID "StepMania CVS" +!define PRODUCT_VER "4.0" +; !define PRODUCT_VER "4.0 alpha 1" +!define PRODUCT_ID_VER "${PRODUCT_ID} ${PRODUCT_VER}" + !define PRODUCT_URL "http://www.stepmania.com" !define UPDATES_URL "http://www.stepmania.com/wiki/Downloads" diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index a1d65629d6..ab8d49beac 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -855,7 +855,7 @@ extern const char *version_time; static void WriteLogHeader() { - LOG->Info( PRODUCT_NAME_VER ); + LOG->Info( PRODUCT_ID_VER ); #if defined(HAVE_VERSION_INFO) LOG->Info( "Compiled %s (build %lu)", version_time, version_num ); diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp index 50c6cd4bcf..abb6794d66 100644 --- a/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp +++ b/stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp @@ -30,7 +30,7 @@ ArchHooks_Win32::ArchHooks_Win32() * the main thread. */ SetThreadPriorityBoost( GetCurrentThread(), TRUE ); - g_hInstanceMutex = CreateMutex( NULL, TRUE, PRODUCT_NAME ); + g_hInstanceMutex = CreateMutex( NULL, TRUE, PRODUCT_ID ); g_bIsMultipleInstance = false; if( GetLastError() == ERROR_ALREADY_EXISTS ) @@ -79,9 +79,9 @@ bool ArchHooks_Win32::CheckForMultipleInstances() /* Search for the existing window. Prefer to use the class name, which is less likely to * have a false match, and will match the gameplay window. If that fails, try the window * name, which should match the loading window. */ - HWND hWnd = FindWindow( PRODUCT_NAME, NULL ); + HWND hWnd = FindWindow( PRODUCT_ID, NULL ); if( hWnd == NULL ) - hWnd = FindWindow( NULL, PRODUCT_NAME ); + hWnd = FindWindow( NULL, PRODUCT_ID ); if( hWnd != NULL ) { diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp index 08be1355d7..f3a96cacd0 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Win32.cpp @@ -87,7 +87,7 @@ BOOL CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam, STM_SETIMAGE, (WPARAM) IMAGE_BITMAP, (LPARAM) (HANDLE) g_hBitmap ); - SetWindowTextA( hWnd, PRODUCT_NAME ); + SetWindowTextA( hWnd, PRODUCT_ID ); break; case WM_DESTROY: diff --git a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp index 7896d986cb..9c51014b3b 100644 --- a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp @@ -399,7 +399,7 @@ namespace if( g_debugInfo.nBuildNumber != int(version_num) ) { - return ssprintf( "Incorrect %s file (build %d, expected %d) for this version of " PRODUCT_NAME " -- call stack unavailable.\n", + return ssprintf( "Incorrect %s file (build %d, expected %d) for this version of " PRODUCT_ID " -- call stack unavailable.\n", g_debugInfo.sFilename, g_debugInfo.nBuildNumber, int(version_num) ); } @@ -430,7 +430,7 @@ static void MakeCrashReport( const CompleteCrashData &Data, RString &sOut ) sOut += ssprintf( "%s crash report (build %d, %s)\n" "--------------------------------------\n\n", - PRODUCT_NAME_VER, version_num, version_time ); + PRODUCT_ID_VER, version_num, version_time ); sOut += ssprintf( "Crash reason: %s\n", Data.m_CrashInfo.m_CrashReason ); sOut += ssprintf( "\n" ); @@ -749,7 +749,7 @@ BOOL CrashDialog::HandleMessage( UINT msg, WPARAM wParam, LPARAM lParam ) /* Create the form data to send. */ m_pPost = new NetworkPostData; - m_pPost->SetData( "Product", PRODUCT_NAME ); + m_pPost->SetData( "Product", PRODUCT_ID ); m_pPost->SetData( "Version", PRODUCT_VER ); m_pPost->SetData( "Arch", HOOKS->GetArchName().c_str() ); m_pPost->SetData( "Report", m_sCrashReport ); diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp index 784a581ac9..9748bb1ef7 100644 --- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp +++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp @@ -13,7 +13,7 @@ #include -static const RString g_sClassName = PRODUCT_NAME; +static const RString g_sClassName = PRODUCT_ID; static HWND g_hWndMain; static HDC g_HDC; diff --git a/stepmania/src/smpackage/SMPackageUtil.cpp b/stepmania/src/smpackage/SMPackageUtil.cpp index 95796c2824..90d8f4a8d3 100644 --- a/stepmania/src/smpackage/SMPackageUtil.cpp +++ b/stepmania/src/smpackage/SMPackageUtil.cpp @@ -172,7 +172,7 @@ bool SMPackageUtil::LaunchGame() STARTUPINFO si; ZeroMemory( &si, sizeof(si) ); - RString sExe = PRODUCT_NAME ".exe"; + RString sExe = PRODUCT_FAMILY ".exe"; RString sFile = sExe; if( !DoesFileExist(sFile) ) {