diff --git a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp index 413921a4b0..942bc41ddc 100644 --- a/stepmania/src/archutils/Win32/CrashHandlerChild.cpp +++ b/stepmania/src/archutils/Win32/CrashHandlerChild.cpp @@ -332,7 +332,7 @@ namespace SymbolLookup VirtualQueryEx( g_hParent, ptr, &meminfo, sizeof meminfo ); char tmp[512]; - if( VDDebugInfoLookupRVA(pctx, (unsigned int)ptr, tmp, sizeof(tmp)) >= 0 ) + if( VDDebugInfo::VDDebugInfoLookupRVA(pctx, (unsigned int)ptr, tmp, sizeof(tmp)) >= 0 ) { wsprintf( buf, "%08x: %s", ptr, Demangle(tmp) ); return; @@ -777,9 +777,9 @@ void ChildProcess() ReadCrashDataFromParent( fileno(stdin), Data ); RString sCrashReport; - VDDebugInfoInitFromFile( &g_debugInfo ); + VDDebugInfo::VDDebugInfoInitFromFile( &g_debugInfo ); MakeCrashReport( Data, sCrashReport ); - VDDebugInfoDeinit( &g_debugInfo ); + VDDebugInfo::VDDebugInfoDeinit( &g_debugInfo ); DoSave( sCrashReport ); diff --git a/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp b/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp index 317df636c0..85e2accfb4 100644 --- a/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp +++ b/stepmania/src/archutils/Win32/CrashHandlerNetworking.cpp @@ -665,7 +665,7 @@ void NetworkPostData::HttpThread() RString sResult; while( m_pStream->GetState() == NetworkStream::STATE_CONNECTED ) { - sBuf.clear(); + sBuf.erase( sBuf.begin(), sBuf.end() ); void *p = sBuf.GetBuffer( 1024 ); int iGot = m_pStream->Read( p, 1024 ); if( iGot >= 0 ) @@ -704,7 +704,7 @@ void NetworkPostData::Start( const RString &sHost, int iPort, const RString &sPa m_sHost = sHost; m_iPort = iPort; m_sPath = sPath; - m_sStatus.clear(); + m_sStatus.erase( m_sStatus.begin(), m_sStatus.end() ); m_fProgress = 0; m_Thread.SetName( "HTTP thread" ); diff --git a/stepmania/src/smpackage/smpackage.rc b/stepmania/src/smpackage/smpackage.rc index 879f67fd1f..34bbd38584 100644 --- a/stepmania/src/smpackage/smpackage.rc +++ b/stepmania/src/smpackage/smpackage.rc @@ -299,7 +299,7 @@ BEGIN PUSHBUTTON "Delete Language",IDC_BUTTON_DELETE,230,62,91,15 PUSHBUTTON "Export CSV",IDC_BUTTON_EXPORT,230,83,91,15 PUSHBUTTON "Import CSV",IDC_BUTTON_IMPORT,230,123,91,15 - LTEXT "- Create a new language\n- Export the theme strings to a CSV\n- Edit the CSV using Excel or a text editor\n- Import the CSV file back into the same language", + LTEXT "1) Create a new language\n2) Export the theme strings to a CSV\n3) Edit the CSV using Excel or a text editor\n4) Import the CSV file back into the same language", IDC_STATIC,7,145,258,37 LTEXT "Selection details",IDC_STATIC,230,7,100,9 LTEXT "Total Strings:",IDC_STATIC,221,17,89,10