[OMPT-svn-commit] SF.net SVN: modplug: [208] trunk/OpenMPT/mptrack

[<rel...@us...>]

Revision: 208
          http://modplug.svn.sourceforge.net/modplug/?rev=208&view=rev
Author:   relabsoluness
Date:     2008-03-29 09:08:03 -0700 (Sat, 29 Mar 2008)

Log Message:
-----------
1.17.02.51
. Fix to crash when loading plug with long(>32) param name.
. Internal: Fix to "_WIN32_WINNT settings conflicts with _WIN32_IE setting"-error when compiling with VS2008
? Minor internal changes to get rid of some compiler warnings

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Childfrm.cpp
    trunk/OpenMPT/mptrack/Ctrl_com.cpp
    trunk/OpenMPT/mptrack/Ctrl_pat.cpp
    trunk/OpenMPT/mptrack/OpenGLEditor.cpp
    trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp
    trunk/OpenMPT/mptrack/Stdafx.h
    trunk/OpenMPT/mptrack/View_gen.cpp
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/Vstplug.h
    trunk/OpenMPT/mptrack/bin/mptrack.exe
    trunk/OpenMPT/mptrack/fxp.cpp
    trunk/OpenMPT/mptrack/view_com.cpp
    trunk/OpenMPT/mptrack/view_graph.cpp

Modified: trunk/OpenMPT/mptrack/Childfrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Childfrm.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -150,7 +150,6 @@
 	{
 		if (m_bInitialActivation && m_ViewPatterns.nPattern==0)
 		{
-			CSoundFile *pSndFile = pModDoc->GetSoundFile();
 			m_ViewPatterns.nPattern=pModDoc->GetSoundFile()->Order[0];
 			m_ViewPatterns.nOrder=0; //just in case (should already be 0)
 			m_ViewPatterns.nRow=0;   //just in case

Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -208,7 +208,7 @@
 }
 
 //rewbs.customKeys
-LRESULT CCtrlComments::OnCustomKeyMsg(WPARAM wParam, LPARAM lParam)
+LRESULT CCtrlComments::OnCustomKeyMsg(WPARAM wParam, LPARAM /*lParam*/)
 {
 	if (wParam == kcNull)
 		return NULL;

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -485,7 +485,7 @@
 				//Toggle loop state
 				setLoop = !(m_pSndFile->m_dwSongFlags&SONG_PATTERNLOOP);
 			} else {
-				setLoop = static_cast<bool>(lParam);
+				setLoop = (lParam != 0);
 			}
 				
 			if (setLoop) {
@@ -657,6 +657,7 @@
 // -> CODE#0015
 // -> DESC="channels management dlg"
 void CCtrlPatterns::OnChannelManager()
+//------------------------------------
 {
 	if(CChannelManagerDlg::sharedInstance()){
 		if(CChannelManagerDlg::sharedInstance()->IsDisplayed())
@@ -758,24 +759,28 @@
 	}
 }
 void CCtrlPatterns::OnSplitNoteChanged()
+//--------------------------------------
 {
 	m_nSplitNote = m_CbnSplitNote.GetCurSel();
 	SendViewMessage(VIEWMSG_SETSPLITNOTE, m_nSplitNote);
 	SwitchToView();
 }
 void CCtrlPatterns::OnOctaveModifierChanged()
+//-------------------------------------------
 {
 	m_nOctaveModifier = m_CbnOctaveModifier.GetCurSel();
 	SendViewMessage(VIEWMSG_SETOCTAVEMODIFIER, m_nOctaveModifier);
 	SwitchToView();
 }
 void CCtrlPatterns::OnOctaveLink()
+//--------------------------------
 {
 	m_nOctaveLink = IsDlgButtonChecked(IDC_PATTERN_OCTAVELINK);
 	SendViewMessage(VIEWMSG_SETOCTAVELINK, m_nOctaveLink);
 	SwitchToView();
 }
 void CCtrlPatterns::OnSplitVolumeChanged()
+//----------------------------------------
 {
 	m_nSplitVolume = m_CbnSplitVolume.GetCurSel();
 	SendViewMessage(VIEWMSG_SETSPLITVOLUME, m_nSplitVolume);
@@ -1167,10 +1172,12 @@
 
 //rewbs.introVST
 void CCtrlPatterns::TogglePluginEditor()
+//--------------------------------------
 {
 	TogglePluginEditor(false);
 }
 
+
 void CCtrlPatterns::TogglePluginEditor(bool split)
 //----------------------------------------
 {
@@ -1195,6 +1202,7 @@
 }
 
 bool CCtrlPatterns::HasValidPlug(UINT instr)
+//------------------------------------------
 {
 	if ((instr) && (instr<MAX_INSTRUMENTS) && (m_pSndFile) && m_pSndFile->Headers[instr])
 	{

Modified: trunk/OpenMPT/mptrack/OpenGLEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/OpenGLEditor.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/OpenGLEditor.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -68,12 +68,12 @@
 		SendMessage(WM_ICONERASEBKGND, (WPARAM) dc.GetSafeHdc(), 0);
 
 		// Symbol in Client-Rechteck zentrieren
-		int cxIcon = GetSystemMetrics(SM_CXICON);
-		int cyIcon = GetSystemMetrics(SM_CYICON);
+		//int cxIcon = GetSystemMetrics(SM_CXICON);
+		//int cyIcon = GetSystemMetrics(SM_CYICON);
 		CRect rect;
 		GetClientRect(&rect);
-		int x = (rect.Width() - cxIcon + 1) / 2;
-		int y = (rect.Height() - cyIcon + 1) / 2;
+		//int x = (rect.Width() - cxIcon + 1) / 2;
+		//int y = (rect.Height() - cyIcon + 1) / 2;
 
 		// Symbol zeichnen
 		//dc.DrawIcon(x, y, m_hIcon);

Modified: trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/PatternRandomizerGUI.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -44,7 +44,7 @@
 	CRect rect;
 	GetDlgItem(IDC_RANDOM_PLACEHOLDER)->GetWindowRect(rect);
 	int hOff = 8, vOff = 86;
-	int width = 100, height = 200;
+	//int width = 100, height = 200;
 
 	m_RandomizerNote.Create(CPatternRandomizerGUINote::IDD, (CWnd*)this);
 	m_RandomizerNote.MoveWindow(hOff, vOff, rect.Width(), rect.Height());
@@ -96,7 +96,7 @@
 }
 
 
-void CPatternRandomizerGUI::OnRandomiserTabChange(NMHDR *pNMHDR, LRESULT *pResult)
+void CPatternRandomizerGUI::OnRandomiserTabChange(NMHDR* /*pNMHDR*/, LRESULT *pResult)
 //--------------------------------------------------------------------------------
 {
 	int nActiveTab = m_RandomizerTabs.GetCurSel();

Modified: trunk/OpenMPT/mptrack/Stdafx.h
===================================================================
--- trunk/OpenMPT/mptrack/Stdafx.h	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Stdafx.h	2008-03-29 16:08:03 UTC (rev 208)
@@ -11,8 +11,13 @@
 #endif // _MSC_VER >= 1000
 
 #define VC_EXTRALEAN		// Exclude rarely-used stuff from Windows headers
-#define WINVER	0x0401
 
+#if _MSC_VER >= 1500
+	#define _WIN32_WINNT	0x0500
+#else
+	#define WINVER	0x0401
+#endif
+
 // windows excludes
 #define NOMCX
 // mmreg excludes

Modified: trunk/OpenMPT/mptrack/View_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_gen.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/View_gen.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -476,7 +476,7 @@
 
 // -> CODE#0002
 // -> DESC="VST plugins presets"
-			CHAR s2[32];
+			CHAR s2[128];
 			//UINT k = 0, nProg = min(pVstPlugin->GetNumPrograms(), 256);  //Limit number of progs to 256 because of insane plugs like synth1
 			UINT k = 0, nProg = pVstPlugin->GetNumPrograms(); 
 			m_CbnPreset.SetRedraw(FALSE);

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -1971,11 +1971,11 @@
 	pszName[0] = 0;
 	if ((m_pEffect) && (m_pEffect->numParams > 0) && (nIndex < (UINT)m_pEffect->numParams))
 	{
-		CHAR s[32];
+		CHAR s[64]; //Increased to 64 bytes since 32 bytes doesn't seem to suffice for all plugs.
 		s[0] = 0;
 		Dispatch(effGetParamName, nIndex, 0, s, 0);
-		s[31] = 0;
-		lstrcpyn(pszName, s, cbSize);
+		s[min(sizeof(s)-1, cbSize-1)] = 0;
+		lstrcpyn(pszName, s, min(cbSize, sizeof(s)));
 	}
 }
 
@@ -3100,6 +3100,7 @@
 //end rewbs.VSTcompliance
 
 BOOL CVstPlugin::isInstrument() // ericus 18/02/2005
+//-----------------------------
 {
 	if(m_pEffect) return ((m_pEffect->flags & effFlagsIsSynth) || (!m_pEffect->numInputs)); // rewbs.dryRatio
 	return FALSE;
@@ -4114,10 +4115,9 @@
 {
 	if(pMixPlugin)
 	{
-		char s[32];
-		//To check: Is the cast safe?
+		char s[64];
 		((CVstPlugin*)(pMixPlugin))->GetParamName(index, s, sizeof(s));
-		s[31] = 0;
+		s[sizeof(s)-1] = 0;
 		return CString(s);
 	}
 	else

Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/Vstplug.h	2008-03-29 16:08:03 UTC (rev 208)
@@ -75,7 +75,7 @@
 	float **m_pOutputs;
 	int m_nEditorX, m_nEditorY;
 	int m_MixBuffer[MIXBUFFERSIZE*2+2];		// Stereo interleaved
-	float m_FloatBuffer[MIXBUFFERSIZE*(2+32)+31];	// 2ch separated + up to 32 VSTi outputs...
+	float m_FloatBuffer[MIXBUFFERSIZE*(2+32)+34];	// 2ch separated + up to 32 VSTi outputs...
 	VstMidiEvent m_ev_queue[VSTEVENT_QUEUE_LEN];
 	CModDoc* m_pModDoc;			 //rewbs.plugDocAware
 	CSoundFile* m_pSndFile;			 //rewbs.plugDocAware

Modified: trunk/OpenMPT/mptrack/bin/mptrack.exe
===================================================================
(Binary files differ)

Modified: trunk/OpenMPT/mptrack/fxp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/fxp.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/fxp.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -212,7 +212,7 @@
 
 bool Cfxp::ReadLE(CFile &in, long &l)
 {
-	int size=sizeof(long);
+	UINT size=sizeof(long);
 	if (in.Read(&l, size) < size)
 		return false;
 
@@ -223,7 +223,7 @@
 
 bool Cfxp::ReadLE(CFile &in, float &f)
 {
-	int size=sizeof(float);
+	UINT size=sizeof(float);
 
 	try {
 		if (in.Read(&f, size) < size)
@@ -245,7 +245,7 @@
 
 bool Cfxp::ReadLE(CFile &in, char *c, UINT length)
 {
-	int size=sizeof(char)*length;
+	UINT size=sizeof(char)*length;
 	return (in.Read(c, size) >= size);
 }
 

Modified: trunk/OpenMPT/mptrack/view_com.cpp
===================================================================
--- trunk/OpenMPT/mptrack/view_com.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/view_com.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -570,9 +570,9 @@
 LRESULT CViewComments::OnModViewMsg(WPARAM wParam, LPARAM lParam)
 //-----------------------------------------------------------------
 {
-	switch(wParam)
-	{
-		default:
+//	switch(wParam)
+//	{
+//		default:
 			return CModScrollView::OnModViewMsg(wParam, lParam);
-	}
+//	}
 }
\ No newline at end of file

Modified: trunk/OpenMPT/mptrack/view_graph.cpp
===================================================================
--- trunk/OpenMPT/mptrack/view_graph.cpp	2008-03-25 20:15:39 UTC (rev 207)
+++ trunk/OpenMPT/mptrack/view_graph.cpp	2008-03-29 16:08:03 UTC (rev 208)
@@ -56,7 +56,7 @@
 }
 
 
-void CViewGraph::OnUpdate(CView *pSender, LPARAM lHint, CObject *pHint)
+void CViewGraph::OnUpdate(CView* /*pSender*/, LPARAM /*lHint*/, CObject* /*pHint*/)
 //---------------------------------------------------------------------
 {
 }
@@ -65,9 +65,9 @@
 LRESULT CViewGraph::OnModViewMsg(WPARAM wParam, LPARAM lParam)
 //------------------------------------------------------------
 {
-	switch(wParam)
-	{
-		default:
+//	switch(wParam)
+//	{
+//		default:
 			return CModScrollView::OnModViewMsg(wParam, lParam);
-	}
+//	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.