This commit is contained in:
Glenn Maynard
2006-02-14 11:35:00 +00:00
parent 2b9f484548
commit 01629e7f53
2 changed files with 26 additions and 26 deletions
+13 -13
View File
@@ -62,24 +62,24 @@ Song* GameState::GetDefaultSong() const
GameState::GameState() : GameState::GameState() :
m_pCurGame( Message_CurrentGameChanged ), m_pCurGame( Message_CurrentGameChanged ),
m_pCurStyle( Message_CurrentStyleChanged ), m_pCurStyle( Message_CurrentStyleChanged ),
m_PlayMode( Message_PlayModeChanged ), m_PlayMode( Message_PlayModeChanged ),
m_sPreferredSongGroup( Message_PreferredSongGroupChanged ), m_sPreferredSongGroup( Message_PreferredSongGroupChanged ),
m_sPreferredCourseGroup(Message_PreferredCourseGroupChanged ), m_sPreferredCourseGroup( Message_PreferredCourseGroupChanged ),
m_PreferredDifficulty( Message_PreferredDifficultyP1Changed ), m_PreferredDifficulty( Message_PreferredDifficultyP1Changed ),
m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ), m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ),
m_SortOrder( Message_SortOrderChanged ), m_SortOrder( Message_SortOrderChanged ),
m_pCurSong( Message_CurrentSongChanged ), m_pCurSong( Message_CurrentSongChanged ),
m_pCurSteps( Message_CurrentStepsP1Changed ), m_pCurSteps( Message_CurrentStepsP1Changed ),
m_pCurCourse( Message_CurrentCourseChanged ), m_pCurCourse( Message_CurrentCourseChanged ),
m_pCurTrail( Message_CurrentTrailP1Changed ), m_pCurTrail( Message_CurrentTrailP1Changed ),
m_bGameplayLeadIn( Message_GameplayLeadInChanged ), m_bGameplayLeadIn( Message_GameplayLeadInChanged ),
m_stEdit( Message_EditStepsTypeChanged ), m_stEdit( Message_EditStepsTypeChanged ),
m_pEditSourceSteps( Message_EditSourceStepsChanged ), m_pEditSourceSteps( Message_EditSourceStepsChanged ),
m_stEditSource( Message_EditSourceStepsTypeChanged ), m_stEditSource( Message_EditSourceStepsTypeChanged ),
m_iEditCourseEntryIndex(Message_EditCourseEntryIndexChanged ), m_iEditCourseEntryIndex( Message_EditCourseEntryIndexChanged ),
m_sEditLocalProfileID( Message_EditLocalProfileIDChanged ) m_sEditLocalProfileID( Message_EditLocalProfileIDChanged )
{ {
m_pCurStyle.Set( NULL ); m_pCurStyle.Set( NULL );
+13 -13
View File
@@ -66,24 +66,24 @@ int ThreadImpl_Win32::Wait()
typedef struct tagTHREADNAME_INFO typedef struct tagTHREADNAME_INFO
{ {
DWORD dwType; // must be 0x1000 DWORD dwType; // must be 0x1000
LPCSTR szName; // pointer to name (in same addr space) LPCSTR szName; // pointer to name (in same addr space)
DWORD dwThreadID; // thread ID (-1 caller thread) DWORD dwThreadID; // thread ID (-1 caller thread)
DWORD dwFlags; // reserved for future use, most be zero DWORD dwFlags; // reserved for future use, most be zero
} THREADNAME_INFO; } THREADNAME_INFO;
static void SetThreadName( DWORD dwThreadID, LPCTSTR szThreadName ) static void SetThreadName( DWORD dwThreadID, LPCTSTR szThreadName )
{ {
THREADNAME_INFO info; THREADNAME_INFO info;
info.dwType = 0x1000; info.dwType = 0x1000;
info.szName = szThreadName; info.szName = szThreadName;
info.dwThreadID = dwThreadID; info.dwThreadID = dwThreadID;
info.dwFlags = 0; info.dwFlags = 0;
__try { __try {
RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(DWORD), (ULONG_PTR *)&info); RaiseException(MS_VC_EXCEPTION, 0, sizeof(info) / sizeof(DWORD), (ULONG_PTR *)&info);
} __except (EXCEPTION_CONTINUE_EXECUTION) { } __except (EXCEPTION_CONTINUE_EXECUTION) {
} }
} }
static DWORD WINAPI StartThread( LPVOID pData ) static DWORD WINAPI StartThread( LPVOID pData )