Skip to content

Resolved issues with original sample app. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterv959 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Resolved issues with original sample app. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
275ddd8
Resolved issues with original sample app.
Dec 30, 2025
97eaeb4
Continued cleaning up this app. Issues found and addressed:
Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SampleApp_CPP/BarcodeDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ void CBarcodeDlg::OnCbnSelchangeCmblang()

CHECK_CMD0;

int inSel = (int) m_cmbSelectLocale.GetItemData(m_cmbSelectLocale.GetCurSel());
int inSel = static_cast<int>(m_cmbSelectLocale.GetItemData(m_cmbSelectLocale.GetCurSel()));
long status = 1;

SC->cmdSetKeyboardEmulatorLocale(inSel, Async, &status);
Expand Down
2 changes: 1 addition & 1 deletion SampleApp_CPP/BarcodeDlg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class CBarcodeDlg : public CDialog
//CEdit txtRawData;
//CEmbeddedBrowser m_EmbeddedBrowser;
CBrush m_brush;
bool m_bDisableEvents;
bool m_bDisableEvents = true;


CButton m_chkEnableLocaleSelection;
Expand Down
2 changes: 1 addition & 1 deletion SampleApp_CPP/ConfigurationDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ void CConfigurationDlg::UpdateClaimedStatus(int scnID)
void CConfigurationDlg::OnChangeProtocol()
{
int index = m_cmbProtocol.GetCurSel();
int NewProtocol = (int) m_cmbProtocol.GetItemData(index);
int NewProtocol = static_cast<int>(m_cmbProtocol.GetItemData(index));
int &CurrentProtocol = QueryScannerProtocol();
if(NewProtocol != CurrentProtocol)
{
Expand Down
1 change: 1 addition & 0 deletions SampleApp_CPP/EmbeddedBrowser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ typedef enum
VARIANT GetProperty(LPCTSTR Property)
{
VARIANT result;
VariantInit(&result); // explicitly initialize to empty variant
static BYTE parms[] = VTS_BSTR ;
InvokeHelper(0x12f, DISPATCH_METHOD, VT_VARIANT, (void*)&result, parms, Property);
return result;
Expand Down
18 changes: 9 additions & 9 deletions SampleApp_CPP/ImageVideoDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ void CImageVideoDlg::OnSelectJPG()
wstring ID;
wstring Value;

wchar_t buf[8];
wchar_t buf[_MAX_ITOSTR_BASE10_COUNT];
int a = 10;
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 8, 10);
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 10);
ID.append(buf);
_itow_s(JPEG_FILE_SELECTION, buf, 8, 10);
_itow_s(JPEG_FILE_SELECTION, buf, 10);
Value.append(buf);
SC->cmdSetParametersEx(SelectedScannerID, ID, Value, 0, &status);
LOG(status, "SET_PARAMETERS_IMAGE_JPG");
Expand All @@ -122,11 +122,11 @@ void CImageVideoDlg::OnSelectTIFF()
wstring ID;
wstring Value;

wchar_t buf[8];
wchar_t buf[_MAX_ITOSTR_BASE10_COUNT];
int a = 10;
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 8, 10);
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 10);
ID.append(buf);
_itow_s(TIFF_FILE_SELECTION, buf, 8, 10);
_itow_s(TIFF_FILE_SELECTION, buf, 10);
Value.append(buf);
SC->cmdSetParametersEx(SelectedScannerID, ID, Value, 0, &status);
LOG(status, "SET_PARAMETERS_IMAGE_TIFF");
Expand All @@ -143,11 +143,11 @@ void CImageVideoDlg::OnSelectBMP()
wstring ID;
wstring Value;

wchar_t buf[8];
wchar_t buf[_MAX_ITOSTR_BASE10_COUNT];
int a = 10;
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 8, 10);
_itow_s(IMAGE_FILETYPE_PARAMNUM, buf, 10);
ID.append(buf);
_itow_s(BMP_FILE_SELECTION, buf, 8, 10);
_itow_s(BMP_FILE_SELECTION, buf, 10);
Value.append(buf);
SC->cmdSetParametersEx(SelectedScannerID, ID, Value, 0, &status);
LOG(status, "SET_PARAMETERS_IMAGE_BMP");
Expand Down
20 changes: 10 additions & 10 deletions SampleApp_CPP/IntelDocCap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,23 +205,23 @@ void CIntelDocCap::SetAsync(int *ParaA)
void CIntelDocCap::OnCbnSelchangeComboIdcParam()
{
CHECK_CMD0;
m_edit_DocCapConfValue.SetWindowText(RSMGet((int)m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel())).c_str());
m_edit_DocCapConfValue.SetWindowText(RSMGet(static_cast<int>(m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel()))).c_str());
}

void CIntelDocCap::OnBnClickedButtonIdcParamGet()
{
CHECK_CMD0;
m_edit_DocCapConfValue.SetWindowText(RSMGet((int)m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel())).c_str());
m_edit_DocCapConfValue.SetWindowText(RSMGet(static_cast<int>(m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel()))).c_str());
}

std::wstring CIntelDocCap::RSMGet(int opcode)
{
DWORD_PTR dpOpCode = m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel());
wchar_t a[5];
int opCode = static_cast<int>(m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel()));
wchar_t a[_MAX_ITOSTR_BASE10_COUNT];
long status = 1;
CComBSTR outXml(L"");
//enable the secure methode '_itow_s' resolve the unsafe functions
_itow_s((int)dpOpCode, a, 10);
_itow_s(opCode, a, 10);
if ( !SC->cmdGet(SelectedScannerID,a, &outXml, Async, &status) )
{
if ( !Async )
Expand Down Expand Up @@ -264,19 +264,19 @@ std::wstring CIntelDocCap::RSMGet(int opcode)
void CIntelDocCap::OnBnClickedButtonIdcParamSet()
{
CHECK_CMD0;
DWORD_PTR dpOpCode = m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel());
int opCode = static_cast<int>(m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel()));
CString csValue;
m_edit_DocCapConfValue.GetWindowText(csValue);
RSMSet((int)dpOpCode, csValue.GetBuffer(), wsSelectedDataType);
RSMSet(opCode, csValue.GetBuffer(), wsSelectedDataType);
}

void CIntelDocCap::OnBnClickedButtonIdcParamStore()
{
CHECK_CMD0;
DWORD_PTR dpOpCode = m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel());
int opCode = static_cast<int>(m_cmbDocCapConf.GetItemData(m_cmbDocCapConf.GetCurSel()));
CString csValue;
m_edit_DocCapConfValue.GetWindowText(csValue);
RSMSet((int)dpOpCode, csValue.GetBuffer(), wsSelectedDataType, true);
RSMSet(opCode, csValue.GetBuffer(), wsSelectedDataType, true);
}

int CIntelDocCap::RSMSet(int attribID, std::wstring value, wstring dataType, bool isStore)
Expand All @@ -286,7 +286,7 @@ int CIntelDocCap::RSMSet(int attribID, std::wstring value, wstring dataType, boo

LONG status = -1;

wchar_t buff[10];
wchar_t buff[_MAX_ITOSTR_BASE10_COUNT];
//enable the secure methode '_itow_s' resolve the unsafe functions
_itow_s(attribID, buff, 10);
CString AttribID = buff;
Expand Down
4 changes: 2 additions & 2 deletions SampleApp_CPP/LogsDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ void CLogsDlg::UpdateResults(CString& result)
CString ExistingText;
txtResultLog.GetWindowTextW(ExistingText);

wchar_t buf[8];
_itow_s(++m_Count, buf, 8, 10);
wchar_t buf[_MAX_ITOSTR_BASE10_COUNT];
_itow_s(++m_Count, buf, 10);

ExistingText.Append(buf);
ExistingText.Append(L". ");
Expand Down
35 changes: 17 additions & 18 deletions SampleApp_CPP/QuickXmlParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,26 @@ BSTR CQuickXmlParser::LoadXmlFile(LPTSTR XmlFilePath )
char* Buffer = 0;

hConfigXml = CreateFile(XmlFilePath, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
if(hConfigXml == INVALID_HANDLE_VALUE ) goto end;

dwReadBufferSize = GetFileSize(hConfigXml, NULL);
if(dwReadBufferSize == INVALID_FILE_SIZE) goto end;

Buffer = new char[dwReadBufferSize + 8];

ret = ReadFile(hConfigXml, Buffer, dwReadBufferSize + 8, &dwRead, NULL);
if((ret && dwRead) == 0) goto end;


LPWSTR pszDest = new WCHAR[dwRead];
::MultiByteToWideChar( CP_THREAD_ACP, 0, Buffer, dwRead, pszDest, dwRead );
bs = SysAllocStringLen(pszDest, dwRead);
delete [] Buffer;
delete [] pszDest;
if(hConfigXml != INVALID_HANDLE_VALUE)
{
dwReadBufferSize = GetFileSize(hConfigXml, NULL);
if (dwReadBufferSize != INVALID_FILE_SIZE)
{
Buffer = new char[dwReadBufferSize + 8];

end:
ret = ReadFile(hConfigXml, Buffer, dwReadBufferSize + 8, &dwRead, NULL);
if (ret && (dwRead > 0))
{
LPWSTR pszDest = new WCHAR[dwRead];
::MultiByteToWideChar(CP_THREAD_ACP, 0, Buffer, dwRead, pszDest, dwRead);
bs = SysAllocStringLen(pszDest, dwRead);
delete[] pszDest;
}
delete[] Buffer;
}
}
CloseHandle(hConfigXml);
return bs;

}

void CQuickXmlParser::Clear()
Expand Down
17 changes: 12 additions & 5 deletions SampleApp_CPP/RTADlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,9 @@ void CRTADlg::UpdateRtaEvent(BSTR rtaData)
//OnGetRTAEventStatus(); //Update the RTAEventsGrid
}
catch (exception ex) {
LOG(-1, "Update RTA Event Error: {}",ex);
CString errorMsg;
errorMsg.Format(L"Update RTA Event Error: {%S}", ex.what());
LOGV(-1, errorMsg.GetBuffer());
}

}
Expand Down Expand Up @@ -254,7 +256,9 @@ void CRTADlg::OnCheckedSuspendReportingAlerts()
GetTabManager().GetTabDlg<CLogsDlg>().DisplayResult(0, logStr);
}
catch (exception ex) {
LOG(-1, "RTA_SUSPEND_STATE_UPDATE_ERROR: {}", ex);
CString errorMsg;
errorMsg.Format(L"RTA_SUSPEND_STATE_UPDATE_ERROR: {%S}", ex.what());
LOGV(-1, errorMsg.GetBuffer());
throw ex;
}
}
Expand Down Expand Up @@ -683,7 +687,9 @@ void CRTADlg::OnClearEventLog()
RtaEventLogGridControl.DeleteAllItems(); //Clearing the RTA Event Log
}
catch (exception ex) {
LOG(-1, "RTA_EVENT_LOG_CLEAR ERROR : {}", ex)
CString errorMsg;
errorMsg.Format(L"RTA_EVENT_LOG_CLEAR ERROR : {%S}", ex.what());
LOGV(-1, errorMsg.GetBuffer());
}

}
Expand Down Expand Up @@ -796,7 +802,7 @@ vector<vector<wstring>> CRTADlg::GetRTAEventsStatus() { //Parse the outXML of RT
}
catch (const exception& ex) {
// Handle exceptions
throw;
throw ex;
}

return eventDetailsList;
Expand Down Expand Up @@ -848,6 +854,7 @@ BOOL CRTADlg::GetRTASuspendStatus() //Parse the outXML of RTA State
LOG(status, "GET_RTA_SUSPEND_ERROR");
throw ex;
}
return FALSE;
}

void CRTADlg::UpdateRTAGrid(vector<vector<wstring>> eventDetailsList)
Expand All @@ -868,7 +875,7 @@ void CRTADlg::UpdateRTAGrid(vector<vector<wstring>> eventDetailsList)

// Set the subitem texts for the subsequent columns
for (size_t colIndex = 0; colIndex < event.size(); ++colIndex) {
RtaEventsGrid.SetItemText(nIndex, colIndex + 1, event[colIndex].c_str());
RtaEventsGrid.SetItemText(nIndex, static_cast<int>(colIndex + 1), event[colIndex].c_str());
}
}
}
Expand Down
40 changes: 20 additions & 20 deletions SampleApp_CPP/RsmList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,31 +33,31 @@ BOOL CRsmListCtrl::OnClickListView(NMHDR *pNMHDR, LRESULT *pResult)
CString sEditVal;
LPNMLISTVIEW p = (LPNMLISTVIEW)pNMHDR;

if(p->iItem == -1) goto End; //Clicked on a header ctrl
if(m_EditInfo.m_pEdit != 0)
if(p->iItem != -1) // Only if a list item
{
m_EditInfo.m_pEdit->GetWindowText(sEditVal);
SetItemText(m_EditInfo.m_Item, m_EditInfo.m_SubItem, sEditVal);
StopEdit();
}

if(p->iSubItem == 3)
{
GetSubItemRect(p->iItem, p->iSubItem, LVIR_BOUNDS, rec);
if(m_EditInfo.m_pEdit == 0)
if (m_EditInfo.m_pEdit != 0)
{
m_EditInfo.m_pEdit = new CEditText();
m_EditInfo.m_pEdit->Create(WS_CHILD | WS_VISIBLE | WS_BORDER | ES_CENTER, rec, this, 999);
m_EditInfo.m_pEdit->SetWindowText(GetItemText(p->iItem, p->iSubItem));
m_EditInfo.m_pEdit->SetSel(0, -1);
m_EditInfo.m_pEdit->SetFocus();
m_EditInfo.m_pEdit->GetWindowText(sEditVal);
SetItemText(m_EditInfo.m_Item, m_EditInfo.m_SubItem, sEditVal);
StopEdit();
}

m_EditInfo.m_Item = p->iItem;
m_EditInfo.m_SubItem = p->iSubItem;
}
if (p->iSubItem == 3)
{
GetSubItemRect(p->iItem, p->iSubItem, LVIR_BOUNDS, rec);
if (m_EditInfo.m_pEdit == 0)
{
m_EditInfo.m_pEdit = new CEditText();
m_EditInfo.m_pEdit->Create(WS_CHILD | WS_VISIBLE | WS_BORDER | ES_CENTER, rec, this, 999);
m_EditInfo.m_pEdit->SetWindowText(GetItemText(p->iItem, p->iSubItem));
m_EditInfo.m_pEdit->SetSel(0, -1);
m_EditInfo.m_pEdit->SetFocus();
}

End:
m_EditInfo.m_Item = p->iItem;
m_EditInfo.m_SubItem = p->iSubItem;
}
}
*pResult = 0;
return FALSE;
}
Expand Down
6 changes: 3 additions & 3 deletions SampleApp_CPP/RtaList.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,17 +301,17 @@ void CRtaListCtrl::OnCustomDraw(NMHDR* pNMHDR, LRESULT* pResult)

case CDDS_ITEMPREPAINT | CDDS_SUBITEM:
// Check if the current subitem is in a checkbox column
if (IsCheckboxColumn(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem))
if (IsCheckboxColumn(static_cast<int>(pLVCD->nmcd.dwItemSpec), pLVCD->iSubItem))
{
// Get a device context (DC) from the custom draw structure
CDC* pDC = CDC::FromHandle(pLVCD->nmcd.hdc);
CRect rect;

// Get the rectangle area of the subitem
GetSubItemRect(pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, LVIR_LABEL, rect);
GetSubItemRect(static_cast<int>(pLVCD->nmcd.dwItemSpec), pLVCD->iSubItem, LVIR_LABEL, rect);

// Draw the checkbox in the subitem's rectangle
DrawCheckbox(pDC, this, pLVCD->nmcd.dwItemSpec, pLVCD->iSubItem, rect);
DrawCheckbox(pDC, this, static_cast<int>(pLVCD->nmcd.dwItemSpec), pLVCD->iSubItem, rect);

// Skip the default drawing for this subitem (since we've custom drawn it)
*pResult = CDRF_SKIPDEFAULT;
Expand Down
3 changes: 2 additions & 1 deletion SampleApp_CPP/ScanToConnectDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ CScanToConnectDlg::CScanToConnectDlg(CWnd* pParent /*=NULL*/)

CScanToConnectDlg::~CScanToConnectDlg()
{
ClearImageCache();
}

void CScanToConnectDlg::DoDataExchange(CDataExchange* pDX)
Expand Down Expand Up @@ -177,7 +178,7 @@ void CScanToConnectDlg::RequestPairingBarcode()
}


SC->cmdGetBluetoothPairingBarcode(SelectedScannerID, Async, &status, protocol,(int) m_cmbDefaultOption.GetItemData(m_cmbDefaultOption.GetCurSel()),(int) m_cmbImageSize.GetItemData(m_cmbImageSize.GetCurSel()), L"");
SC->cmdGetBluetoothPairingBarcode(SelectedScannerID, Async, &status, protocol, static_cast<int>(m_cmbDefaultOption.GetItemData(m_cmbDefaultOption.GetCurSel())), static_cast<int>(m_cmbImageSize.GetItemData(m_cmbImageSize.GetCurSel())), L"");
LOG(status, "GET_PAIRING_BARCODE");
}

Expand Down
10 changes: 5 additions & 5 deletions SampleApp_CPP/ScannerActionDlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void CScannerActionDlg::OnLEDOn()
CHECK_CMD0;

SCANNER* p = GetMainDlg()->GetScannerInfo(SelectedScannerID);
int inSel = (int) CmbLED.GetItemData(CmbLED.GetCurSel());
int inSel = static_cast<int>(CmbLED.GetItemData(CmbLED.GetCurSel()));
long status = 1;
SC->cmdLED(SelectedScannerID, ScannerLEDTypes[inSel], Async, &status,p);
LOG(status, "LED_ON");
Expand All @@ -188,7 +188,7 @@ void CScannerActionDlg::OnLEDOff()
CHECK_CMD0;

SCANNER* p = GetMainDlg()->GetScannerInfo(SelectedScannerID);
int inSel = (int) CmbLED.GetItemData(CmbLED.GetCurSel());
int inSel = static_cast<int>(CmbLED.GetItemData(CmbLED.GetCurSel()));
long status = 1;
SC->cmdLEDOff(SelectedScannerID, ScannerLEDTypes[inSel + 1], Async, &status,p);
LOG(status, "LED_OFF");
Expand All @@ -198,11 +198,11 @@ void CScannerActionDlg::OnBeep()
{
CHECK_CMD0;

int val = (int) m_cmbBeeps.GetItemData(m_cmbBeeps.GetCurSel());
int val = static_cast<int>(m_cmbBeeps.GetItemData(m_cmbBeeps.GetCurSel()));
long status=1;

wchar_t buf[8];
_itow_s(val, buf, 8, 10);
wchar_t buf[_MAX_ITOSTR_BASE10_COUNT];
_itow_s(val, buf, 10);
wstring str = buf;
SC->cmdBeep(SelectedScannerID, str, Async, &status);
LOG(status, "SOUND_BEEPER");
Expand Down
Loading