Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MPLAY32]: Fix CID 515203 and CID 515204: replace remaining _tcscpy and _stprintf with strsafe functions.

Browse source 
By Ricardo Hanke.
CORE-9306 CORE-9308 #resolve #comment Fixed, thanks!

svn path=/trunk/; revision=66562
This commit is contained in:
Hermès Bélusca-Maïto 2015-03-03 21:35:07 +00:00
parent f7730a4c06
commit 327531bfd4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/applications/mplay32/mplay32.c
View file

@ -165,7 +165,7 @@ ShowMCIError(HWND hwnd, MCIERROR mciError)
LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0])); LoadString(hInstance, IDS_DEFAULTMCIERRMSG, szErrorMessage, sizeof(szErrorMessage) / sizeof(szErrorMessage[0]));
} }
_stprintf(szTempMessage, _T("MMSYS%lu: %s"), mciError, szErrorMessage); StringCbPrintf(szTempMessage, sizeof(szTempMessage), _T("MMSYS%lu: %s"), mciError, szErrorMessage);
MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION); MessageBox(hwnd, szTempMessage, szAppTitle, MB_OK | MB_ICONEXCLAMATION);
} }
@ -412,7 +412,7 @@ OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName)
MCIERROR mciError; MCIERROR mciError;
MCI_STATUS_PARMS mciStatus; MCI_STATUS_PARMS mciStatus;
MCI_OPEN_PARMS mciOpen; MCI_OPEN_PARMS mciOpen;
TCHAR szNewTitle[MAX_PATH]; TCHAR szNewTitle[MAX_PATH + 128];
if (bIsOpened) if (bIsOpened)
{ {
@ -462,13 +462,13 @@ OpenMciDevice(HWND hwnd, LPTSTR lpType, LPTSTR lpFileName)
SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100000, (LPARAM) 0); SendMessage(hTrackBar, TBM_SETTICFREQ, (WPARAM) 100000, (LPARAM) 0);
} }
_stprintf(szNewTitle, _T("%s - %s"), szAppTitle, lpFileName); StringCbPrintf(szNewTitle, sizeof(szNewTitle), _T("%s - %s"), szAppTitle, lpFileName);
SetWindowText(hwnd, szNewTitle); SetWindowText(hwnd, szNewTitle);
MaxFilePos = mciStatus.dwReturn; MaxFilePos = mciStatus.dwReturn;
wDeviceId = mciOpen.wDeviceID; wDeviceId = mciOpen.wDeviceID;
bIsOpened = TRUE; bIsOpened = TRUE;
_tcscpy(szPrevFile, lpFileName); StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName);
EnableMenuItems(hwnd); EnableMenuItems(hwnd);
@ -656,11 +656,11 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
if (szPrevFile[0] == _T('\0')) if (szPrevFile[0] == _T('\0'))
return; return;
_tcscpy(szLocalFileName, szPrevFile); StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile);
} }
else else
{ {
_tcscpy(szLocalFileName, lpFileName); StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName);
} }
if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES)
@ -918,7 +918,7 @@ OpenFileDialog(HWND hwnd)
if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir)) if (!GetCurrentDirectory(sizeof(szCurrentDir) / sizeof(szCurrentDir[0]), szCurrentDir))
{ {
_tcscpy(szCurrentDir, _T("c:\\")); StringCbCopy(szCurrentDir, sizeof(szCurrentDir), _T("c:\\"));
} }
OpenFileName.lStructSize = sizeof(OpenFileName); OpenFileName.lStructSize = sizeof(OpenFileName);