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

[<sag...@us...>]

Revision: 898
          http://modplug.svn.sourceforge.net/modplug/?rev=898&view=rev
Author:   saga-games
Date:     2011-06-13 00:02:17 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
[Fix] Instrument tab: Suggested filename when saving instrument was sometimes cut
[Fix] Pattern tab: Using the "Paste Pattern" menu entry in the order list didn't refresh the pattern display.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Ctrl_ins.cpp
    trunk/OpenMPT/mptrack/Ctrl_smp.cpp
    trunk/OpenMPT/mptrack/View_pat.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-06-12 16:12:04 UTC (rev 897)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp	2011-06-13 00:02:17 UTC (rev 898)
@@ -1712,13 +1712,12 @@
 	if (!pIns) return;
 	if (pIns->filename[0])
 	{
-		memcpy(szFileName, pIns->filename, 12);
-		szFileName[12] = 0;
+		strncpy(szFileName, pIns->filename, min(CountOf(pIns->filename), CountOf(szFileName) - 1));
 	} else
 	{
-		memcpy(szFileName, pIns->name, 22);
-		szFileName[22] = 0;
+		strncpy(szFileName, pIns->name, min(CountOf(pIns->name), CountOf(szFileName) - 1));
 	}
+	SetNullTerminator(szFileName);
 	SanitizeFilename(szFileName);
 
 	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, (m_pSndFile->GetType() == MOD_TYPE_XM) ? "xi" : "iti", szFileName,

Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2011-06-12 16:12:04 UTC (rev 897)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp	2011-06-13 00:02:17 UTC (rev 898)
@@ -998,12 +998,11 @@
 		}
 		if (m_pSndFile->m_nType & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT))
 		{
-			memcpy(szFileName, m_pSndFile->Samples[m_nSample].filename, MAX_SAMPLEFILENAME);
-			szFileName[22] = 0;
+			strncpy(szFileName, m_pSndFile->Samples[m_nSample].filename, min(CountOf(m_pSndFile->Samples[m_nSample].filename), CountOf(szFileName) - 1));
 		} else
 		{
-			memcpy(szFileName, m_pSndFile->m_szNames[m_nSample], MAX_SAMPLENAME);
-			szFileName[32] = 0;		}
+			strncpy(szFileName, m_pSndFile->m_szNames[m_nSample], min(CountOf(m_pSndFile->m_szNames[m_nSample]), CountOf(szFileName) - 1));
+		}
 		if (!szFileName[0]) strcpy(szFileName, "untitled");
 	}
 	else
@@ -1020,6 +1019,7 @@
 		sPath += ".wav";
 		_splitpath(sPath, NULL, NULL, szFileName, NULL);
 	}
+	SetNullTerminator(szFileName);
 	SanitizeFilename(szFileName);
 
 	FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, "wav", szFileName,

Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp	2011-06-12 16:12:04 UTC (rev 897)
+++ trunk/OpenMPT/mptrack/View_pat.cpp	2011-06-13 00:02:17 UTC (rev 898)
@@ -3564,6 +3564,7 @@
 		{
 			CModDoc *pModDoc = GetDocument();
 			if (pModDoc) pModDoc->PastePattern(m_nPattern, 0, pm_overwrite);
+			InvalidatePattern();
 		}
 		break;
 


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