Skip to content

Commit

Permalink
Prevent "Codepage" dialog from closing on Enter press.
Browse files Browse the repository at this point in the history 
Removed empty OnOK methods.
Tidying up.
  • Loading branch information
@jovibor
jovibor committed Feb 5, 2025
1 parent 6ae699c commit 41477ab
Show file tree
Hide file tree
Showing 12 changed files with 102 additions and 117 deletions.
12 changes: 6 additions & 6 deletions HexCtrl/dep/ListEx/ListEx.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,19 +1347,19 @@ bool CListEx::Create(const LISTEXCREATE& lcs)
m_iLOGPIXELSY = ::GetDeviceCaps(hDC, LOGPIXELSY);
NONCLIENTMETRICSW ncm { .cbSize { sizeof(NONCLIENTMETRICSW) } };
::SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, ncm.cbSize, &ncm, 0); //Get System Default UI Font.
ncm.lfMessageFont.lfHeight = -MulDiv(lcs.dwSizeFontList, m_iLOGPIXELSY, 72);
ncm.lfMessageFont.lfHeight = -::MulDiv(lcs.dwSizeFontList, m_iLOGPIXELSY, 72);
LOGFONTW lfList { lcs.pLFList != nullptr ? *lcs.pLFList : ncm.lfMessageFont };
m_hFntList = ::CreateFontIndirectW(&lfList);
lfList.lfUnderline = TRUE;
m_hFntListUnderline = ::CreateFontIndirectW(&lfList);
ncm.lfMessageFont.lfHeight = -MulDiv(lcs.dwSizeFontHdr, m_iLOGPIXELSY, 72);
ncm.lfMessageFont.lfHeight = -::MulDiv(lcs.dwSizeFontHdr, m_iLOGPIXELSY, 72);
const LOGFONTW lfHdr { lcs.pLFHdr != nullptr ? *lcs.pLFHdr : ncm.lfMessageFont };
const auto fntDefault = ::CreateFontIndirectW(&lfHdr);
TEXTMETRICW tm;
::SelectObject(hDC, fntDefault);
::GetTextMetricsW(hDC, &tm);
const DWORD dwHdrHeight = lcs.dwHdrHeight == 0 ?
tm.tmHeight + tm.tmExternalLeading + MulDiv(5, m_iLOGPIXELSY, 72) : lcs.dwHdrHeight; //Header is a bit higher than list rows.
tm.tmHeight + tm.tmExternalLeading + ::MulDiv(5, m_iLOGPIXELSY, 72) : lcs.dwHdrHeight; //Header is a bit higher than list rows.
::ReleaseDC(m_hWnd, hDC);

m_hPenGrid = ::CreatePen(PS_SOLID, m_dwGridWidth, m_stColors.clrListGrid);
Expand Down Expand Up @@ -2251,7 +2251,7 @@ void CListEx::DrawItem(LPDRAWITEMSTRUCT pDIS)

void CListEx::FontSizeIncDec(bool fInc)
{
const auto lFontSize = MulDiv(-GetFontSize(), 72, m_iLOGPIXELSY) + (fInc ? 1 : -1);
const auto lFontSize = ::MulDiv(-GetFontSize(), 72, m_iLOGPIXELSY) + (fInc ? 1 : -1);
SetFontSize(lFontSize);
}

Expand Down Expand Up @@ -2933,7 +2933,7 @@ void CListEx::SetFontSize(long lSize)

LOGFONTW lf { };
::GetObjectW(m_hFntList, sizeof(lf), &lf);
lf.lfHeight = -MulDiv(lSize, m_iLOGPIXELSY, 72);
lf.lfHeight = -::MulDiv(lSize, m_iLOGPIXELSY, 72);
SetFont(lf);
}

Expand Down Expand Up @@ -3032,7 +3032,7 @@ auto CListEx::EditSubclassProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara
}
break;
case WM_NCDESTROY:
RemoveWindowSubclass(hWnd, EditSubclassProc, uIdSubclass);
::RemoveWindowSubclass(hWnd, EditSubclassProc, uIdSubclass);
break;
default:
break;
Expand Down
56 changes: 28 additions & 28 deletions HexCtrl/src/CHexCtrl.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace HEXCTRL::INTERNAL {
}

auto CHexDlgAbout::DoModal(HWND hWndParent)->INT_PTR {
return DialogBoxParamW(m_hInstRes, MAKEINTRESOURCEW(IDD_HEXCTRL_ABOUT),
return ::DialogBoxParamW(m_hInstRes, MAKEINTRESOURCEW(IDD_HEXCTRL_ABOUT),
hWndParent, wnd::DlgProc<CHexDlgAbout>, reinterpret_cast<LPARAM>(this));
}

Expand Down Expand Up @@ -714,12 +714,12 @@ bool CHexCtrl::Create(const HEXCREATE& hcs)

//Font related.
//Default main logfont.
const LOGFONTW lfMain { .lfHeight { -MulDiv(11, m_iLOGPIXELSY, 72) }, .lfWeight { FW_NORMAL },
const LOGFONTW lfMain { .lfHeight { -::MulDiv(11, m_iLOGPIXELSY, 72) }, .lfWeight { FW_NORMAL },
.lfQuality { CLEARTYPE_QUALITY }, .lfPitchAndFamily { FIXED_PITCH }, .lfFaceName { L"Consolas" } };
m_hFntMain = ::CreateFontIndirectW(hcs.pLogFont != nullptr ? hcs.pLogFont : &lfMain);

//Info area font, independent from the main font, its size is a bit smaller than the default main font.
const LOGFONTW lfInfo { .lfHeight { -MulDiv(11, m_iLOGPIXELSY, 72) + 1 }, .lfWeight { FW_NORMAL },
const LOGFONTW lfInfo { .lfHeight { -::MulDiv(11, m_iLOGPIXELSY, 72) + 1 }, .lfWeight { FW_NORMAL },
.lfQuality { CLEARTYPE_QUALITY }, .lfPitchAndFamily { FIXED_PITCH }, .lfFaceName { L"Consolas" } };
m_hFntInfoBar = ::CreateFontIndirectW(&lfInfo);
//End of font related.
Expand Down Expand Up @@ -1219,37 +1219,37 @@ auto CHexCtrl::GetWndHandle(EHexWnd eWnd, bool fCreate)const->HWND
case EHexWnd::WND_MAIN:
return m_Wnd;
case EHexWnd::DLG_BKMMGR:
if (!IsWindow(m_pDlgBkmMgr->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgBkmMgr->GetHWND()) && fCreate) {
m_pDlgBkmMgr->CreateDlg();
}
return m_pDlgBkmMgr->GetHWND();
case EHexWnd::DLG_DATAINTERP:
if (!IsWindow(m_pDlgDataInterp->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgDataInterp->GetHWND()) && fCreate) {
m_pDlgDataInterp->CreateDlg();
}
return m_pDlgDataInterp->GetHWND();
case EHexWnd::DLG_MODIFY:
if (!IsWindow(m_pDlgModify->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgModify->GetHWND()) && fCreate) {
m_pDlgModify->CreateDlg();
}
return m_pDlgModify->GetHWND();
case EHexWnd::DLG_SEARCH:
if (!IsWindow(m_pDlgSearch->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgSearch->GetHWND()) && fCreate) {
m_pDlgSearch->CreateDlg();
}
return m_pDlgSearch->GetHWND();
case EHexWnd::DLG_CODEPAGE:
if (!IsWindow(m_pDlgCodepage->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgCodepage->GetHWND()) && fCreate) {
m_pDlgCodepage->CreateDlg();
}
return m_pDlgCodepage->GetHWND();
case EHexWnd::DLG_GOTO:
if (!IsWindow(m_pDlgGoTo->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgGoTo->GetHWND()) && fCreate) {
m_pDlgGoTo->CreateDlg();
}
return m_pDlgGoTo->GetHWND();
case EHexWnd::DLG_TEMPLMGR:
if (!IsWindow(m_pDlgTemplMgr->GetHWND()) && fCreate) {
if (!::IsWindow(m_pDlgTemplMgr->GetHWND()) && fCreate) {
m_pDlgTemplMgr->CreateDlg();
}
return m_pDlgTemplMgr->GetHWND();
Expand Down Expand Up @@ -1344,7 +1344,7 @@ bool CHexCtrl::IsCmdAvail(EHexCmd eCmd)const
case CMD_CLPBRD_PASTE_HEX:
case CMD_CLPBRD_PASTE_TEXTUTF16:
case CMD_CLPBRD_PASTE_TEXTCP:
fAvail = fMutable && IsClipboardFormatAvailable(CF_UNICODETEXT);
fAvail = fMutable && ::IsClipboardFormatAvailable(CF_UNICODETEXT);
break;
case CMD_MODIFY_OPERS_DLG:
case CMD_MODIFY_FILLDATA_DLG:
Expand Down Expand Up @@ -1552,8 +1552,8 @@ void CHexCtrl::ModifyData(const HEXMODIFY& hms)
//Then clone this buffer to the destination data.
//Buffer is allocated with alignment for maximum performance.
constexpr auto ulSizeRandBuff { 1024U * 1024U }; //1MB.
const std::unique_ptr < std::byte[], decltype([](std::byte* pData) { _aligned_free(pData); }) >
uptrRandData(static_cast<std::byte*>(_aligned_malloc(ulSizeRandBuff, 32)));
const std::unique_ptr < std::byte[], decltype([](std::byte* pData) { ::_aligned_free(pData); }) >
uptrRandData(static_cast<std::byte*>(::_aligned_malloc(ulSizeRandBuff, 32)));
for (auto iter = 0UL; iter < ulSizeRandBuff; iter += sizeof(std::uint64_t)) {
*reinterpret_cast<std::uint64_t*>(&uptrRandData[iter]) = distUInt64(gen);
};
Expand Down Expand Up @@ -1867,7 +1867,7 @@ void CHexCtrl::SetCodepage(int iCodepage)
wsvFmt = L"UTF-16";
break;
default:
if (CPINFOEXW stCP; GetCPInfoExW(static_cast<UINT>(iCodepage), 0, &stCP) != FALSE) {
if (CPINFOEXW stCP; ::GetCPInfoExW(static_cast<UINT>(iCodepage), 0, &stCP) != FALSE) {
wsvFmt = L"Codepage {}";
}
break;
Expand Down Expand Up @@ -2453,7 +2453,7 @@ auto CHexCtrl::BuildDataToDraw(ULONGLONG ullStartLine, int iLines)const->std::tu
}
else {
wstrText.resize(sSizeDataToPrint);
MultiByteToWideChar(iCodepage, 0, reinterpret_cast<LPCCH>(pDataBegin),
::MultiByteToWideChar(iCodepage, 0, reinterpret_cast<LPCCH>(pDataBegin),
static_cast<int>(sSizeDataToPrint), wstrText.data(), static_cast<int>(sSizeDataToPrint));
}

Expand Down Expand Up @@ -2639,7 +2639,7 @@ void CHexCtrl::ChooseFontDlg()
.Flags { CF_EFFECTS | CF_FIXEDPITCHONLY | CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_NOSIMULATIONS },
.rgbColors { stClr.clrFontHex } };

if (ChooseFontW(&chf) != FALSE) {
if (::ChooseFontW(&chf) != FALSE) {
stClr.clrFontHex = chf.rgbColors;
SetColors(stClr);
SetFont(lf);
Expand Down Expand Up @@ -2694,7 +2694,7 @@ void CHexCtrl::ClipboardCopy(EClipboard eType)const
return;
}

const auto lpMemLock = GlobalLock(hMem);
const auto lpMemLock = ::GlobalLock(hMem);
if (!lpMemLock) {
ut::DBG_REPORT(L"GlobalLock error.");
return;
Expand All @@ -2717,7 +2717,7 @@ void CHexCtrl::ClipboardPaste(EClipboard eType)
if (!hClpbrd)
return;

const auto pDataClpbrd = static_cast<wchar_t*>(GlobalLock(hClpbrd));
const auto pDataClpbrd = static_cast<wchar_t*>(::GlobalLock(hClpbrd));
if (pDataClpbrd == nullptr) {
::CloseClipboard();
return;
Expand Down Expand Up @@ -3224,7 +3224,7 @@ void CHexCtrl::DrawOffsets(HDC hDC, ULONGLONG ullStartLine, int iLines)const
dc.SelectObject(m_hFntMain);
dc.SetTextColor(stClrOffset.clrText);
dc.SetBkColor(stClrOffset.clrBk);
ExtTextOutW(dc, m_iFirstVertLinePx + GetCharWidthNative() - iScrollH,
::ExtTextOutW(dc, m_iFirstVertLinePx + GetCharWidthNative() - iScrollH,
m_iStartWorkAreaYPx + (m_sizeFontMain.cy * iterLines), 0, nullptr,
OffsetToWstr((ullStartLine + iterLines) * dwCapacity).data(), GetDigitsOffset(), nullptr);
}
Expand Down Expand Up @@ -3331,11 +3331,11 @@ void CHexCtrl::DrawHexText(HDC hDC, ULONGLONG ullStartLine, int iLines, std::wst
dc.SetTextColor(iter.stClr.clrText);
dc.SetBkColor(iter.stClr.clrBk);
const auto& refH = iter.stPoly;
ExtTextOutW(dc, refH.x, refH.y, refH.uiFlags, &refH.rcl, refH.lpstr, refH.n, refH.pdx); //Hex printing.
::ExtTextOutW(dc, refH.x, refH.y, refH.uiFlags, &refH.rcl, refH.lpstr, refH.n, refH.pdx); //Hex printing.
const auto& refVecText = vecPolyText[index++];
dc.SetTextColor(refVecText.stClr.clrText); //Text color for the Text area.
const auto& refT = refVecText.stPoly;
ExtTextOutW(dc, refT.x, refT.y, refT.uiFlags, &refT.rcl, refT.lpstr, refT.n, refT.pdx); //Text printing.
::ExtTextOutW(dc, refT.x, refT.y, refT.uiFlags, &refT.rcl, refT.lpstr, refT.n, refT.pdx); //Text printing.
}
}

Expand Down Expand Up @@ -3824,7 +3824,7 @@ void CHexCtrl::DrawCaret(HDC hDC, ULONGLONG ullStartLine, std::wstring_view wsvH
dc.SetTextColor(m_stColors.clrFontCaret);
dc.SetBkColor(clrBkCaret);
for (const auto iter : arrPolyCaret) {
ExtTextOutW(dc, iter.x, iter.y, iter.uiFlags, &iter.rcl, iter.lpstr, iter.n, iter.pdx); //Hex/Text caret printing.
::ExtTextOutW(dc, iter.x, iter.y, iter.uiFlags, &iter.rcl, iter.lpstr, iter.n, iter.pdx); //Hex/Text caret printing.
}
}

Expand Down Expand Up @@ -3968,7 +3968,7 @@ void CHexCtrl::FillWithZeros()

void CHexCtrl::FontSizeIncDec(bool fInc)
{
const auto lFontSize = MulDiv(-GetFontSize(), 72, m_iLOGPIXELSY) + (fInc ? 1 : -1); //Convert font Height to point size.
const auto lFontSize = ::MulDiv(-GetFontSize(), 72, m_iLOGPIXELSY) + (fInc ? 1 : -1); //Convert font Height to point size.
SetFontSize(lFontSize);
}

Expand Down Expand Up @@ -4918,7 +4918,7 @@ void CHexCtrl::SetFontSize(long lSize)
return;

auto lf = GetFont();
lf.lfHeight = -MulDiv(lSize, m_iLOGPIXELSY, 72); //Convert point size to font Height.
lf.lfHeight = -::MulDiv(lSize, m_iLOGPIXELSY, 72); //Convert point size to font Height.
SetFont(lf);
}

Expand Down Expand Up @@ -7230,8 +7230,8 @@ auto CHexCtrl::OnKeyDown(const MSG& msg)->LRESULT
m_fKeyDownAtm = true;
}

if (const auto optCmd = GetCommandFromKey(nChar, GetAsyncKeyState(VK_CONTROL) < 0,
GetAsyncKeyState(VK_SHIFT) < 0, GetAsyncKeyState(VK_MENU) < 0); optCmd) {
if (const auto optCmd = GetCommandFromKey(nChar, ::GetAsyncKeyState(VK_CONTROL) < 0,
::GetAsyncKeyState(VK_SHIFT) < 0, ::GetAsyncKeyState(VK_MENU) < 0); optCmd) {
ExecuteCmd(*optCmd);
return 0;
}
Expand Down Expand Up @@ -7645,8 +7645,8 @@ auto CHexCtrl::OnSysKeyDown(const MSG& msg)->LRESULT
{
const auto nChar = static_cast<UINT>(msg.wParam);

if (const auto optCmd = GetCommandFromKey(nChar, ::GetAsyncKeyState(VK_CONTROL) < 0, ::
GetAsyncKeyState(VK_SHIFT) < 0, true); optCmd) {
if (const auto optCmd = GetCommandFromKey(nChar, ::GetAsyncKeyState(VK_CONTROL) < 0,
::GetAsyncKeyState(VK_SHIFT) < 0, true); optCmd) {
ExecuteCmd(*optCmd);
}

Expand Down
16 changes: 8 additions & 8 deletions HexCtrl/src/CHexScroll.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ bool CHexScroll::Create(HWND hWndParent, bool fVert, HBITMAP hArrow, ULONGLONG u
wc.style = CS_GLOBALCLASS;
wc.lpfnWndProc = wnd::WndProc<CHexScroll>;
wc.lpszClassName = pwszScrollClassName;
if (RegisterClassExW(&wc) == 0) {
if (::RegisterClassExW(&wc) == 0) {
ut::DBG_REPORT(L"RegisterClassExW failed.");
return false;
}
Expand Down Expand Up @@ -273,7 +273,7 @@ void CHexScroll::OnLButtonUp()
SendParentScrollMsg(); //For parent to check IsThumbReleased.
m_Wnd.KillTimer(static_cast<UINT_PTR>(ETimer::IDT_FIRSTCLICK));
m_Wnd.KillTimer(static_cast<UINT_PTR>(ETimer::IDT_CLICKREPEAT));
ReleaseCapture();
::ReleaseCapture();
DrawScrollBar();
}

Expand Down Expand Up @@ -612,14 +612,14 @@ void CHexScroll::SetScrollPageSize(ULONGLONG ullSize)
bool CHexScroll::CreateArrows(HBITMAP hArrow, bool fVert)
{
BITMAP stBMP { };
GetObjectW(hArrow, sizeof(BITMAP), &stBMP); //stBMP.bmBits is nullptr here.
::GetObjectW(hArrow, sizeof(BITMAP), &stBMP); //stBMP.bmBits is nullptr here.
const auto dwWidth = static_cast<DWORD>(stBMP.bmWidth);
const auto dwHeight = static_cast<DWORD>(stBMP.bmHeight);
const auto dwPixels = dwWidth * dwHeight;
const auto dwBytesBmp = stBMP.bmWidthBytes * stBMP.bmHeight;
const auto pPixelsOrig = std::make_unique<COLORREF[]>(dwPixels);
m_iArrowRCSizePx = stBMP.bmWidth;
GetBitmapBits(hArrow, dwBytesBmp, pPixelsOrig.get());
::GetBitmapBits(hArrow, dwBytesBmp, pPixelsOrig.get());

const auto lmbTranspose = [](COLORREF* pInOut, DWORD dwWidth, DWORD dwHeight) {
for (auto itHeight = 0UL; itHeight < dwHeight; ++itHeight) { //Transpose matrix.
Expand Down Expand Up @@ -657,7 +657,7 @@ bool CHexScroll::CreateArrows(HBITMAP hArrow, bool fVert)
lmbFlipHorz(pPixelsOrig.get(), dwWidth, dwHeight); //Right arrow.
}

SetBitmapBits(m_hBmpArrowLast, dwBytesBmp, pPixelsOrig.get());
::SetBitmapBits(m_hBmpArrowLast, dwBytesBmp, pPixelsOrig.get());

return true;
}
Expand Down Expand Up @@ -720,7 +720,7 @@ void CHexScroll::DrawArrows(HDC hDC)const
//SetBrushOrgEx to set the brush origin. If it fails to do so, brush misalignment occurs.
::SetBrushOrgEx(hDC, 0, 0, nullptr);

const auto hDCSource = CreateCompatibleDC(hDC);
const auto hDCSource = ::CreateCompatibleDC(hDC);
::SelectObject(hDCSource, m_hBmpArrowFirst); //First arrow button.
::StretchBlt(hDC, iFirstBtnOffsetDrawX, iFirstBtnOffsetDrawY, iFirstBtnWH, iFirstBtnWH,
hDCSource, 0, 0, m_iArrowRCSizePx, m_iArrowRCSizePx, SRCCOPY);
Expand Down Expand Up @@ -1021,7 +1021,7 @@ auto CHexScroll::OnTimer(const MSG& msg)->LRESULT
case FIRSTCHANNEL_CLICK:
{
POINT pt;
GetCursorPos(&pt);
::GetCursorPos(&pt);
auto rcThumb = GetThumbRect(true);
GetParent().ClientToScreen(rcThumb);
if (IsVert()) {
Expand All @@ -1039,7 +1039,7 @@ auto CHexScroll::OnTimer(const MSG& msg)->LRESULT
case LASTCHANNEL_CLICK:
{
POINT pt;
GetCursorPos(&pt);
::GetCursorPos(&pt);
auto rcThumb = GetThumbRect(true);
GetParent().ClientToScreen(rcThumb);
if (IsVert()) {
Expand Down
18 changes: 5 additions & 13 deletions HexCtrl/src/Dialogs/CHexDlgBkmMgr.ixx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ namespace HEXCTRL::INTERNAL {
void OnCheckHex();
auto OnDestroy() -> INT_PTR;
auto OnDrawItem(const MSG& msg) -> INT_PTR;
void OnOK();
auto OnInitDialog(const MSG& msg) -> INT_PTR;
auto OnMeasureItem(const MSG& msg) -> INT_PTR;
auto OnNotify(const MSG& msg) -> INT_PTR;
Expand Down Expand Up @@ -487,7 +486,6 @@ auto CHexDlgBkmMgr::OnCommand(const MSG& msg) -> INT_PTR
if (hWndCtrl != nullptr || uCtrlID == IDOK || uCtrlID == IDCANCEL) { //Notifications from controls.
if (uCode != BN_CLICKED) { return FALSE; }
switch (uCtrlID) {
case IDOK: OnOK(); break;
case IDCANCEL: OnCancel(); break;
case IDC_HEXCTRL_BKMMGR_CHK_HEX: OnCheckHex(); break;
default: return FALSE;
Expand Down Expand Up @@ -553,12 +551,6 @@ auto CHexDlgBkmMgr::OnDrawItem(const MSG& msg)->INT_PTR
return TRUE;
}

void CHexDlgBkmMgr::OnOK()
{
//Just an empty handler to prevent Dialog closing on Enter key.
//SetDefID() doesn't always work for no particular reason.
}

auto CHexDlgBkmMgr::OnInitDialog(const MSG& msg)->INT_PTR
{
m_Wnd.Attach(msg.hwnd);
Expand Down Expand Up @@ -650,7 +642,7 @@ void CHexDlgBkmMgr::OnNotifyListDblClick(NMHDR* pNMHDR)
COLORREF arrClr[16] { };
CHOOSECOLORW stChclr { .lStructSize { sizeof(CHOOSECOLORW) }, .rgbResult { *pClr },
.lpCustColors { arrClr }, .Flags { CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT } };
if (ChooseColorW(&stChclr) == FALSE) {
if (::ChooseColorW(&stChclr) == FALSE) {
return;
}

Expand Down Expand Up @@ -742,7 +734,7 @@ void CHexDlgBkmMgr::OnNotifyListRClick(NMHDR* pNMHDR)
m_menuList.EnableMenuItem(static_cast<UINT>(EMenuID::IDM_BKMMGR_REMOVEALL), m_ListEx.GetItemCount() > 0);

POINT pt;
GetCursorPos(&pt);
::GetCursorPos(&pt);
m_menuList.TrackPopupMenu(pt.x, pt.y, m_Wnd);
}

Expand All @@ -759,7 +751,7 @@ void CHexDlgBkmMgr::OnNotifyListSetData(NMHDR* pNMHDR)
{
const auto optOffset = stn::StrToUInt64(pLDI->pwszData);
if (!optOffset) {
MessageBoxW(m_Wnd, L"Invalid offset format.", L"Format error", MB_ICONERROR);
::MessageBoxW(m_Wnd, L"Invalid offset format.", L"Format error", MB_ICONERROR);
return;
}

Expand All @@ -777,12 +769,12 @@ void CHexDlgBkmMgr::OnNotifyListSetData(NMHDR* pNMHDR)
{
const auto optSize = stn::StrToUInt64(pLDI->pwszData);
if (!optSize) {
MessageBoxW(m_Wnd, L"Invalid size format.", L"Format error", MB_ICONERROR);
::MessageBoxW(m_Wnd, L"Invalid size format.", L"Format error", MB_ICONERROR);
return;
}

if (*optSize == 0) {
MessageBoxW(m_Wnd, L"Size can't be zero.", L"Size error", MB_ICONERROR);
::MessageBoxW(m_Wnd, L"Size can't be zero.", L"Size error", MB_ICONERROR);
return;
}

Expand Down
Loading

0 comments on commit 41477ab

Please sign in to comment.