[Fix] Fix incorrect usage of CComboBox::InitStorage, causing far too little string memory to be allocated and thus making the call practically useless.

git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@25203 56274372-70c3-4bfc-bfc3-4c3a0b034d27

Author: sagamusix

mptrack/ColorConfigDlg.cpp

@@ -226,7 +226,8 @@ BOOL COptionsColors::OnInitDialog()
 	SetDlgItemText(IDC_BUTTON10, FormatFontName(commentFont));
 
 	m_ComboPreset.SetRedraw(FALSE);
-	m_ComboPreset.InitStorage(static_cast<int>(2 + std::size(ColorSchemes)), 20 * sizeof(TCHAR));
+	const size_t numItems = 2 + std::size(ColorSchemes);
+	m_ComboPreset.InitStorage(static_cast<int>(numItems), static_cast<UINT>(numItems * 20 * sizeof(TCHAR)));
 	m_ComboPreset.AddString(_T("Choose a Colour Scheme..."));
 	m_ComboPreset.AddString(_T("OpenMPT (Default)"));
 	for(const auto &preset : ColorSchemes)

mptrack/Ctrl_smp.cpp

@@ -234,7 +234,7 @@ BOOL CCtrlSamples::OnInitDialog()
 		{_T("1:512"), 10},
 	};
 	m_ComboZoom.SetRedraw(FALSE);
-	m_ComboZoom.InitStorage(static_cast<int>(std::size(ZoomLevels)), 4);
+	m_ComboZoom.InitStorage(static_cast<int>(std::size(ZoomLevels)), static_cast<UINT>(std::size(ZoomLevels) * 5));
 	for(const auto &[str, data] : ZoomLevels)
 	{
 		m_ComboZoom.SetItemData(m_ComboZoom.AddString(str), static_cast<DWORD_PTR>(data));
@@ -266,7 +266,7 @@ BOOL CCtrlSamples::OnInitDialog()
 	m_SpinVolume.SetRange(0, 64);
 	m_SpinGlobalVol.SetRange(0, 64);
 
-	m_CbnBaseNote.InitStorage(BASENOTE_MAX - BASENOTE_MIN, 4);
+	m_CbnBaseNote.InitStorage(BASENOTE_MAX - BASENOTE_MIN, static_cast<UINT>((BASENOTE_MAX - BASENOTE_MIN) * 4 * sizeof(TCHAR)));
 	m_CbnBaseNote.SetRedraw(FALSE);
 	for(ModCommand::NOTE i = BASENOTE_MIN; i <= BASENOTE_MAX; i++)
 	{
@@ -277,7 +277,7 @@ BOOL CCtrlSamples::OnInitDialog()
 
 	// Pitch selection
 	// Allow pitch from -12 (1 octave down) to +12 (1 octave up)
-	m_ComboPitch.InitStorage(25, 4);
+	m_ComboPitch.InitStorage(25, 25 * 4 * sizeof(TCHAR));
 	m_ComboPitch.SetRedraw(FALSE);
 	for(int i = -12 ; i <= 12 ; i++)
 	{

mptrack/PatternEditorDialogs.cpp

@@ -1414,7 +1414,8 @@ BOOL CSplitKeyboardSettings::OnInitDialog()
 
 	// Octave modifier
 	m_CbnOctaveModifier.SetRedraw(FALSE);
-	m_CbnSplitVolume.InitStorage(SplitKeyboardSettings::splitOctaveRange * 2 + 1, 9);
+	int numItems = SplitKeyboardSettings::splitOctaveRange * 2 + 1;
+	m_CbnSplitVolume.InitStorage(numItems, static_cast<UINT>(numItems * 9 * sizeof(TCHAR)));
 	for(int i = -SplitKeyboardSettings::splitOctaveRange; i < SplitKeyboardSettings::splitOctaveRange + 1; i++)
 	{
 		s.Format(i < 0 ? _T("Octave -%d") : i > 0 ? _T("Octave +%d") : _T("No Change"), std::abs(i));
@@ -1427,7 +1428,7 @@ BOOL CSplitKeyboardSettings::OnInitDialog()
 
 	// Volume
 	m_CbnSplitVolume.SetRedraw(FALSE);
-	m_CbnSplitVolume.InitStorage(65, 4);
+	m_CbnSplitVolume.InitStorage(65, 65 * 4 * sizeof(TCHAR));
 	m_CbnSplitVolume.AddString(_T("No Change"));
 	m_CbnSplitVolume.SetItemData(0, 0);
 	for(int i = 1; i <= 64; i++)
@@ -1441,7 +1442,8 @@ BOOL CSplitKeyboardSettings::OnInitDialog()
 
 	// Instruments
 	m_CbnSplitInstrument.SetRedraw(FALSE);
-	m_CbnSplitInstrument.InitStorage(1 + (sndFile.GetNumInstruments() ? sndFile.GetNumInstruments() : sndFile.GetNumSamples()), 16);
+	numItems = 1 + (sndFile.GetNumInstruments() ? sndFile.GetNumInstruments() : sndFile.GetNumSamples());
+	m_CbnSplitInstrument.InitStorage(numItems, static_cast<UINT>(numItems * 16 * sizeof(TCHAR)));
 	m_CbnSplitInstrument.SetItemData(m_CbnSplitInstrument.AddString(_T("No Change")), 0);
 
 	if(sndFile.GetNumInstruments())

mptrack/PatternFindReplaceDlg.cpp

@@ -68,8 +68,10 @@ class CFindRangeDlg : public DialogBase
 			AppendNotesToControl(m_cbnMax, static_cast<ModCommand::NOTE>(m_minVal), static_cast<ModCommand::NOTE>(m_maxVal));
 		} else
 		{
-			m_cbnMin.InitStorage(m_minVal - m_maxVal + 1, 4);
-			m_cbnMax.InitStorage(m_minVal - m_maxVal + 1, 4);
+			const int numItems = m_minVal - m_maxVal + 1;
+			const UINT strSize = static_cast<UINT>(numItems * 4 * sizeof(TCHAR));
+			m_cbnMin.InitStorage(numItems, strSize);
+			m_cbnMax.InitStorage(numItems, strSize);
 			const TCHAR *formatString;
 			if(m_displayMode == kHex && m_maxVal <= 0x0F)
 				formatString = _T("%01X");
@@ -223,7 +225,7 @@ BOOL CFindReplaceTab::OnInitDialog()
 	{
 		int sel = -1;
 		m_cbnNote.SetRedraw(FALSE);
-		m_cbnNote.InitStorage(150, 6);
+		m_cbnNote.InitStorage(150, 150 * 6 * sizeof(TCHAR));
 		m_cbnNote.SetItemData(m_cbnNote.AddString(_T("...")), NOTE_NONE);
 		if (m_isReplaceTab)
 		{
@@ -270,10 +272,10 @@ BOOL CFindReplaceTab::OnInitDialog()
 
 	// Volume Command
 	m_cbnVolCmd.SetRedraw(FALSE);
-	m_cbnVolCmd.InitStorage(m_effectInfo.GetNumVolCmds(), 15);
-	m_cbnVolCmd.SetItemData(m_cbnVolCmd.AddString(_T(" None")), (DWORD_PTR)-1);
 	UINT count = m_effectInfo.GetNumVolCmds();
-	for (UINT n=0; n<count; n++)
+	m_cbnVolCmd.InitStorage(count, static_cast<UINT>(count * 15 * sizeof(TCHAR)));
+	m_cbnVolCmd.SetItemData(m_cbnVolCmd.AddString(_T(" None")), (DWORD_PTR)-1);
+	for (UINT n = 0; n < count; n++)
 	{
 		if(m_effectInfo.GetVolCmdInfo(n, &s) && !s.IsEmpty())
 		{
@@ -294,10 +296,10 @@ BOOL CFindReplaceTab::OnInitDialog()
 	// Command
 	{
 		m_cbnCommand.SetRedraw(FALSE);
-		m_cbnCommand.InitStorage(m_effectInfo.GetNumEffects(), 20);
-		m_cbnCommand.SetItemData(m_cbnCommand.AddString(_T(" None")), (DWORD_PTR)-1);
 		count = m_effectInfo.GetNumEffects();
-		for (UINT n=0; n<count; n++)
+		m_cbnCommand.InitStorage(count, static_cast<UINT>(count * 20 * sizeof(TCHAR)));
+		m_cbnCommand.SetItemData(m_cbnCommand.AddString(_T(" None")), (DWORD_PTR)-1);
+		for (UINT n = 0; n < count; n++)
 		{
 			if(m_effectInfo.GetEffectInfo(n, &s, true) && !s.IsEmpty())
 			{
@@ -343,7 +345,8 @@ void CFindReplaceTab::UpdateInstrumentList()
 	int sel = (oldSelection == 0) ? 0 : -1;
 	m_cbnInstr.SetRedraw(FALSE);
 	m_cbnInstr.ResetContent();
-	m_cbnInstr.InitStorage((isPCEvent ? MAX_MIXPLUGINS : MAX_INSTRUMENTS) + 3, 32);
+	const int numItems = (isPCEvent ? MAX_MIXPLUGINS : MAX_INSTRUMENTS) + 3;
+	m_cbnInstr.InitStorage(numItems, static_cast<UINT>(numItems * 32 * sizeof(TCHAR)));
 	m_cbnInstr.SetItemData(m_cbnInstr.AddString(_T("..")), 0);
 	if (m_isReplaceTab)
 	{
@@ -444,7 +447,7 @@ void CFindReplaceTab::UpdateParamList()
 		Limit(newpos, 0, newcount - 1);
 		m_cbnParam.SetRedraw(FALSE);
 		m_cbnParam.ResetContent();
-		m_cbnParam.InitStorage(newcount + 2, 4);
+		m_cbnParam.InitStorage(newcount + 2, static_cast<UINT>((newcount + 2) * 4 * sizeof(TCHAR)));
 
 		if(m_isReplaceTab)
 		{
@@ -518,8 +521,9 @@ void CFindReplaceTab::UpdateVolumeList()
 			AddPluginParameternamesToCombobox(m_cbnPCParam, *m_sndFile.m_MixPlugins[plug].pMixPlugin);
 		} else
 		{
-			m_cbnPCParam.InitStorage(ModCommand::maxColumnValue + 1, 20);
-			for(int i = 0; i <= ModCommand::maxColumnValue; i++)
+			const int numItems = ModCommand::maxColumnValue + 1;
+			m_cbnPCParam.InitStorage(numItems, static_cast<UINT>(numItems * 20 * sizeof(TCHAR)));
+			for(int i = 0; i < numItems; i++)
 			{
 				wsprintf(s, _T("%02u: Parameter %02u"), static_cast<unsigned int>(i), static_cast<unsigned int>(i));
 				m_cbnPCParam.SetItemData(m_cbnPCParam.AddString(s), i);
@@ -574,7 +578,7 @@ void CFindReplaceTab::UpdateVolumeList()
 		Limit(newpos, 0, newcount - 1);
 		m_cbnVolume.SetRedraw(FALSE);
 		m_cbnVolume.ResetContent();
-		m_cbnVolume.InitStorage(newcount + 2, 4);
+		m_cbnVolume.InitStorage(newcount + 2, static_cast<UINT>((newcount + 2) * 4 * sizeof(TCHAR)));
 		if(m_isReplaceTab)
 		{
 			wsprintf(s, _T("+ %d"), m_settings.replaceVolume);