Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:13:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CALC] Adapt to <strsafe.h> (#5894)

Browse source 
Use safer string functions of  <strsafe.h>.
Use StringCbPrintf instead of _stprintf.
Use StringCbCopy insteaad of _tcscpy.
Use StringCbCat instead of _tcscat.
CORE-19306
This commit is contained in:
Katayama Hirofumi MZ 2023-11-19 21:46:00 +09:00 • committed by GitHub
parent 80c4856bba
commit ede60035f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
base/applications/calc/calc.h
View file

@ -15,6 +15,7 @@
#include <htmlhelp.h> #include <htmlhelp.h>
#endif #endif
#include <limits.h> #include <limits.h>
#include <strsafe.h>
/* RESOURCES */ /* RESOURCES */
#include "resource.h" #include "resource.h"

8
base/applications/calc/utl_ieee.c
View file

@ -27,7 +27,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
switch (base) { switch (base) {
case IDC_RADIO_HEX: case IDC_RADIO_HEX:
_stprintf(buffer, _T("%I64X"), rpn->i); StringCchPrintf(buffer, size, _T("%I64X"), rpn->i);
break; break;
case IDC_RADIO_DEC: case IDC_RADIO_DEC:
/* /*
@ -40,11 +40,11 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
/* calculate the width of integer number */ /* calculate the width of integer number */
width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
_stprintf(buffer, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f); StringCchPrintf(buffer, size, _T("%#.*e"), MAX_LD_WIDTH-1, rpn->f);
else { else {
TCHAR *ptr, *dst; TCHAR *ptr, *dst;
ptr = buffer + _stprintf(buffer, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f); StringCchPrintfEx(buffer, size, &ptr, NULL, 0, _T("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
/* format string ensures there is a '.': */ /* format string ensures there is a '.': */
dst = _tcschr(buffer, _T('.')); dst = _tcschr(buffer, _T('.'));
while (--ptr > dst) while (--ptr > dst)
@ -61,7 +61,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
#undef MAX_LD_WIDTH #undef MAX_LD_WIDTH
break; break;
case IDC_RADIO_OCT: case IDC_RADIO_OCT:
_stprintf(buffer, _T("%I64o"), rpn->i); StringCchPrintf(buffer, size, _T("%I64o"), rpn->i);
break; break;
case IDC_RADIO_BIN: case IDC_RADIO_BIN:
if (rpn->i == 0) { if (rpn->i == 0) {

2
base/applications/calc/utl_mpfr.c
View file

@ -107,7 +107,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
} }
mpz_clear(zz); mpz_clear(zz);
mpf_clear(ff); mpf_clear(ff);
_sntprintf(buffer, SIZEOF(calc.buffer), _T("%hs"), temp); StringCchPrintf(buffer, size, _T("%hs"), temp);
} }
void convert_text2number_2(calc_number_t *a) void convert_text2number_2(calc_number_t *a)

50
base/applications/calc/winmain.c
View file

@ -254,10 +254,10 @@ static void UpdateNumberIntl(void)
{ {
/* Get current user defaults */ /* Get current user defaults */
if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal))) if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal)))
_tcscpy(calc.sDecimal, _T(".")); StringCbCopy(calc.sDecimal, sizeof(calc.sDecimal), _T("."));
if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand))) if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand)))
_tcscpy(calc.sThousand, _T(",")); StringCbCopy(calc.sThousand, sizeof(calc.sThousand), _T(","));
/* get the string lengths */ /* get the string lengths */
calc.sDecimal_len = _tcslen(calc.sDecimal); calc.sDecimal_len = _tcslen(calc.sDecimal);
@ -342,7 +342,7 @@ static void save_config(void)
switch (osvi.dwPlatformId) { switch (osvi.dwPlatformId) {
case VER_PLATFORM_WIN32s: case VER_PLATFORM_WIN32s:
case VER_PLATFORM_WIN32_WINDOWS: case VER_PLATFORM_WIN32_WINDOWS:
_stprintf(buf, _T("%lu"), calc.layout); StringCbPrintf(buf, sizeof(buf), _T("%lu"), calc.layout);
WriteProfileString(_T("SciCalc"), _T("layout"), buf); WriteProfileString(_T("SciCalc"), _T("layout"), buf);
WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0")); WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0"));
break; break;
@ -496,16 +496,16 @@ static void update_lcd_display(HWND hwnd)
TCHAR tmp[MAX_CALC_SIZE * 2 + 2]; TCHAR tmp[MAX_CALC_SIZE * 2 + 2];
if (calc.buffer[0] == _T('\0')) if (calc.buffer[0] == _T('\0'))
_tcscpy(tmp, _T("0")); StringCbCopy(tmp, sizeof(tmp), _T("0"));
else else
_tcscpy(tmp, calc.buffer); StringCbCopy(tmp, sizeof(tmp), calc.buffer);
/* Add final '.' in decimal mode (if it's missing), but /* Add final '.' in decimal mode (if it's missing), but
* only if it's a result: no append if it prints "ERROR". * only if it's a result: no append if it prints "ERROR".
*/ */
if (calc.base == IDC_RADIO_DEC && !calc.is_nan) { if (calc.base == IDC_RADIO_DEC && !calc.is_nan) {
if (_tcschr(tmp, _T('.')) == NULL) if (_tcschr(tmp, _T('.')) == NULL)
_tcscat(tmp, _T(".")); StringCbCat(tmp, sizeof(tmp), _T("."));
} }
/* if separator mode is on, let's add an additional space */ /* if separator mode is on, let's add an additional space */
if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) { if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) {
@ -573,13 +573,14 @@ static void update_parent_display(HWND hWnd)
if (!n) if (!n)
str[0] = _T('\0'); str[0] = _T('\0');
else else
_stprintf(str,_T("(=%d"), n); StringCbPrintf(str, sizeof(str), _T("(=%d"), n);
SetDlgItemText(hWnd, IDC_TEXT_PARENT, str); SetDlgItemText(hWnd, IDC_TEXT_PARENT, str);
} }
static void build_operand(HWND hwnd, DWORD idc) static void build_operand(HWND hwnd, DWORD idc)
{ {
unsigned int i = 0, n; unsigned int i = 0, n;
size_t cbPtr;
if (idc == IDC_BUTTON_DOT) { if (idc == IDC_BUTTON_DOT) {
/* if dot is the first char, it's added automatically */ /* if dot is the first char, it's added automatically */
@ -617,12 +618,14 @@ static void build_operand(HWND hwnd, DWORD idc)
if (idc != IDC_STATIC) if (idc != IDC_STATIC)
calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE; calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE;
if (calc.ptr == calc.buffer) if (calc.ptr == calc.buffer)
_stprintf(calc.ptr, _T("0.e%+d"), calc.esp); StringCbPrintf(calc.ptr, sizeof(calc.buffer), _T("0.e%+d"), calc.esp);
else { else {
/* adds the dot at the end if the number has no decimal part */ /* adds the dot at the end if the number has no decimal part */
if (!_tcschr(calc.buffer, _T('.'))) if (!_tcschr(calc.buffer, _T('.')))
*calc.ptr++ = _T('.'); *calc.ptr++ = _T('.');
_stprintf(calc.ptr, _T("e%+d"), calc.esp);
cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
StringCbPrintf(calc.ptr, cbPtr, _T("e%+d"), calc.esp);
} }
update_lcd_display(hwnd); update_lcd_display(hwnd);
return; return;
@ -637,7 +640,11 @@ static void build_operand(HWND hwnd, DWORD idc)
return; return;
break; break;
} }
calc.ptr += _stprintf(calc.ptr, _T("%C"), key2code[i].key);
cbPtr = sizeof(calc.buffer) - ((BYTE*)calc.ptr - (BYTE*)calc.buffer);
StringCbPrintfEx(calc.ptr, cbPtr, &calc.ptr, NULL, STRSAFE_FILL_ON_FAILURE,
_T("%C"), key2code[i].key);
update_lcd_display(hwnd); update_lcd_display(hwnd);
} }
@ -850,11 +857,11 @@ static void update_memory_flag(HWND hWnd, BOOL mem_flag)
SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T("")); SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T(""));
} }
static void update_n_stats_items(HWND hWnd, TCHAR *buffer) static void update_n_stats_items(HWND hWnd, TCHAR *buffer, size_t cbBuffer)
{ {
unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0);
_stprintf(buffer, _T("n=%u"), n); StringCbPrintf(buffer, cbBuffer, _T("n=%u"), n);
SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer); SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer);
} }
@ -905,7 +912,7 @@ static char *ReadConversion(const char *formula)
str[len+1] = ')'; str[len+1] = ')';
str[len+2] = '\0'; str[len+2] = '\0';
_tcscpy(calc.source, (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer); StringCbCopy(calc.source, sizeof(calc.source), (*calc.buffer == _T('\0')) ? _T("0") : calc.buffer);
/* clear display content before proceeding */ /* clear display content before proceeding */
calc.ptr = calc.buffer; calc.ptr = calc.buffer;
@ -942,13 +949,13 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
if (n == LB_ERR) if (n == LB_ERR)
return TRUE; return TRUE;
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer, sizeof(buffer));
delete_stat_item(n); delete_stat_item(n);
return TRUE; return TRUE;
case IDC_BUTTON_CAD: case IDC_BUTTON_CAD:
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
clean_stat_list(); clean_stat_list();
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer, sizeof(buffer));
return TRUE; return TRUE;
} }
break; break;
@ -964,7 +971,7 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
buffer, SIZEOF(buffer), buffer, SIZEOF(buffer),
((statistic_t *)lp)->base); ((statistic_t *)lp)->base);
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_ADDSTRING, 0, (LPARAM)buffer); SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_ADDSTRING, 0, (LPARAM)buffer);
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer, sizeof(buffer));
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -986,11 +993,13 @@ static void CopyMemToClipboard(void *ptr)
if(OpenClipboard(NULL)) { if(OpenClipboard(NULL)) {
HGLOBAL clipbuffer; HGLOBAL clipbuffer;
TCHAR *buffer; TCHAR *buffer;
size_t cbBuffer;
EmptyClipboard(); EmptyClipboard();
clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR)); cbBuffer = (_tcslen(ptr) + 1) * sizeof(TCHAR);
clipbuffer = GlobalAlloc(GMEM_DDESHARE, cbBuffer);
buffer = (TCHAR *)GlobalLock(clipbuffer); buffer = (TCHAR *)GlobalLock(clipbuffer);
_tcscpy(buffer, ptr); StringCbCopy(buffer, cbBuffer, ptr);
GlobalUnlock(clipbuffer); GlobalUnlock(clipbuffer);
#ifdef UNICODE #ifdef UNICODE
SetClipboardData(CF_UNICODETEXT,clipbuffer); SetClipboardData(CF_UNICODETEXT,clipbuffer);
@ -1056,9 +1065,8 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq)
} }
} else } else
if (ch == '$') { if (ch == '$') {
calc.ptr = StringCbCopyEx(calc.buffer, sizeof(calc.buffer), calc.source, &calc.ptr, NULL,
_tcscpy(calc.buffer, calc.source) + STRSAFE_FILL_ON_FAILURE);
_tcslen(calc.source);
} else { } else {
for (x=0; x<SIZEOF(key2code); x++) { for (x=0; x<SIZEOF(key2code); x++) {
if (!(key2code[x].mask & BITMASK_IS_ASCII) || if (!(key2code[x].mask & BITMASK_IS_ASCII) ||