[idd] helper: fix crash when saving invalid values

idd/LGIddHelper/CConfigWindow.cpp

@@ -57,20 +57,11 @@ void CConfigWindow::updateFont()
 
   for (HWND child : std::initializer_list<HWND>({
     *m_version, *m_modeGroup, *m_modeBox, *m_widthLabel, *m_heightLabel, *m_refreshLabel,
-    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate, *m_modeDelete,
+    *m_modeWidth, *m_modeHeight, *m_modeRefresh, *m_modeUpdate,
   }))
     SendMessage(child, WM_SETFONT, (WPARAM)m_font.Get(), 1);
 }
 
-void CConfigWindow::updateModeList()
-{
-  m_modeBox->addItem(L"<add new>", -1);
-
-  auto &modes = *m_modes;
-  for (size_t i = 0; i < modes.size(); ++i)
-    m_modeBox->addItem(modes[i].toString(), i);
-}
-
 LRESULT CConfigWindow::handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
   switch (uMsg)
@@ -104,7 +95,13 @@ LRESULT CConfigWindow::onCreate()
 
   m_modeBox.reset(new CListBox(WS_CHILD | WS_VISIBLE | LBS_NOTIFY, m_hwnd));
   if (m_modes)
-    updateModeList();
+  {
+    m_modeBox->addItem(L"<add new>", -1);
+
+    auto &modes = *m_modes;
+    for (size_t i = 0; i < modes.size(); ++i)
+      m_modeBox->addItem(modes[i].toString(), i);
+  }
 
   m_widthLabel.reset(new CStaticWidget(L"Width:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
   m_heightLabel.reset(new CStaticWidget(L"Height:", WS_CHILD | WS_VISIBLE | SS_CENTERIMAGE, m_hwnd));
@@ -115,9 +112,7 @@ LRESULT CConfigWindow::onCreate()
   m_modeRefresh.reset(new CEditWidget(WS_CHILD | WS_VISIBLE | ES_LEFT, m_hwnd));
 
   m_modeUpdate.reset(new CButton(L"Save", WS_CHILD | WS_VISIBLE, m_hwnd));
-  m_modeDelete.reset(new CButton(L"Delete", WS_CHILD | WS_VISIBLE, m_hwnd));
   EnableWindow(*m_modeUpdate, FALSE);
-  EnableWindow(*m_modeDelete, FALSE);
 
   updateFont();
 
@@ -144,38 +139,36 @@ LRESULT CConfigWindow::onResize(DWORD width, DWORD height)
   pos.pinBottomLeft(*m_modeHeight, 75, 72, 50, 20);
   pos.pinBottomLeft(*m_modeRefresh, 75, 48, 50, 20);
   pos.pinBottomLeft(*m_modeUpdate, 24, 20, 50, 24);
-  pos.pinBottomLeft(*m_modeDelete, 75, 20, 50, 24);
   return 0;
 }
 
-void CConfigWindow::onModeListSelectChange()
-{
-  int sel = m_modeBox->getSel();
-  if (sel == LB_ERR)
-  {
-    EnableWindow(*m_modeUpdate, FALSE);
-    EnableWindow(*m_modeDelete, FALSE);
-    return;
-  }
-
-  int index = m_modeBox->getData(sel);
-
-  if (index >= 0)
-  {
-    auto &mode = (*m_modes)[index];
-    m_modeWidth->setNumericValue(mode.width);
-    m_modeHeight->setNumericValue(mode.height);
-    m_modeRefresh->setNumericValue(mode.refresh);
-  }
-  EnableWindow(*m_modeUpdate, TRUE);
-  EnableWindow(*m_modeDelete, index >= 0);
-}
-
 LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
 {
   if (hwnd == *m_modeBox && code == LBN_SELCHANGE && m_modes)
   {
-    onModeListSelectChange();
+    int sel = m_modeBox->getSel();
+    if (sel == LB_ERR)
+    {
+      EnableWindow(*m_modeUpdate, FALSE);
+      return 0;
+    }
+
+    int index = m_modeBox->getData(sel);
+
+    if (index >= 0)
+    {
+      auto &mode = (*m_modes)[index];
+      m_modeWidth->setNumericValue(mode.width);
+      m_modeHeight->setNumericValue(mode.height);
+      m_modeRefresh->setNumericValue(mode.refresh);
+    }
+    else
+    {
+      m_modeWidth->setValue(L"");
+      m_modeHeight->setValue(L"");
+      m_modeRefresh->setValue(L"");
+    }
+    EnableWindow(*m_modeUpdate, TRUE);
   }
   else if (hwnd == *m_modeUpdate && code == BN_CLICKED && m_modes)
   {
@@ -185,9 +178,17 @@ LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
 
     int index = m_modeBox->getData(sel);
     auto &mode = index >= 0 ? (*m_modes)[index] : m_modes->emplace_back();
-    mode.width = m_modeWidth->getNumericValue();
-    mode.height = m_modeHeight->getNumericValue();
-    mode.refresh = m_modeRefresh->getNumericValue();
+
+    try
+    {
+      mode.width = m_modeWidth->getNumericValue();
+      mode.height = m_modeHeight->getNumericValue();
+      mode.refresh = m_modeRefresh->getNumericValue();
+    }
+    catch (std::logic_error&)
+    {
+      return 0;
+    }
 
     if (index >= 0)
       m_modeBox->delItem(sel);
@@ -198,22 +199,5 @@ LRESULT CConfigWindow::onCommand(WORD id, WORD code, HWND hwnd)
     if (result != ERROR_SUCCESS)
       DEBUG_ERROR_HR(result, "Failed to save modes");
   }
-  else if (hwnd == *m_modeDelete && code == BN_CLICKED && m_modes)
-  {
-    int sel = m_modeBox->getSel();
-    if (sel == LB_ERR)
-      return 0;
-
-    int index = m_modeBox->getData(sel);
-    m_modeBox->clear();
-    m_modes->erase(m_modes->begin() + index);
-
-    LRESULT result = m_settings.setModes(*m_modes);
-    if (result != ERROR_SUCCESS)
-      DEBUG_ERROR_HR(result, "Failed to save modes");
-
-    updateModeList();
-    onModeListSelectChange();
-  }
   return 0;
 }

idd/LGIddHelper/CConfigWindow.h

@@ -30,7 +30,6 @@ class CConfigWindow : public CWindow
   std::unique_ptr<CEditWidget> m_modeRefresh;
 
   std::unique_ptr<CButton> m_modeUpdate;
-  std::unique_ptr<CButton> m_modeDelete;
 
   std::function<void()> m_onDestroy;
   double m_scale;
@@ -39,8 +38,6 @@ class CConfigWindow : public CWindow
   std::optional<std::vector<DisplayMode>> m_modes;
 
   void updateFont();
-  void updateModeList();
-  void onModeListSelectChange();
 
   virtual LRESULT handleMessage(UINT uMsg, WPARAM wParam, LPARAM lParam) override;
   virtual LRESULT onCreate() override;

idd/LGIddHelper/CListBox.cpp

@@ -50,8 +50,3 @@ void CListBox::setSel(int index)
   if (!ListBox_SetCurSel(m_hwnd, index))
     DEBUG_ERROR("listbox: failed to set selection to %d", index);
 }
-
-void CListBox::clear()
-{
-  ListBox_ResetContent(m_hwnd);
-}

idd/LGIddHelper/CListBox.h

@@ -12,5 +12,4 @@ public:
   int getSel();
   int getData(int index);
   void setSel(int index);
-  void clear();
 };