system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-05 22:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

serialui: Use the ARRAY_SIZE() macro.

Browse source 
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2018-08-08 11:30:16 +02:00 committed by Alexandre Julliard
parent 8c430a8286
commit 1965332d5b
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/serialui/confdlg.c
View file

@ -214,7 +214,7 @@ static BOOL SERIALUI_MakeBaudDword(LPDWORD lpdwBaudRate)
{ {
unsigned int i; unsigned int i;
for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2)
{ {
if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i]) if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i])
{ {
@ -229,7 +229,7 @@ static BOOL SERIALUI_MakeBaudEnum(LPDWORD lpdwBaudRate)
{ {
unsigned int i; unsigned int i;
for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2)
{ {
if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i+1]) if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i+1])
{ {
@ -352,8 +352,8 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w
if(!info) if(!info)
return FALSE; return FALSE;
SetWindowLongPtrW(hWnd, DWLP_USER, lParam); SetWindowLongPtrW(hWnd, DWLP_USER, lParam);
GetWindowTextW(hWnd, format, sizeof(format)/sizeof(WCHAR)); GetWindowTextW(hWnd, format, ARRAY_SIZE(format));
snprintfW( szTitle, sizeof(szTitle)/sizeof(WCHAR), format, info->lpszDevice ); snprintfW(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice);
SetWindowTextW(hWnd, szTitle); SetWindowTextW(hWnd, szTitle);
SERIALUI_DCBToDialogInfo(hWnd, info); SERIALUI_DCBToDialogInfo(hWnd, info);
return TRUE; return TRUE;
@ -501,7 +501,7 @@ BOOL WINAPI drvSetDefaultCommConfigW(
if(r != ERROR_SUCCESS) if(r != ERROR_SUCCESS)
return FALSE; return FALSE;
snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort);
if(r == ERROR_SUCCESS) if(r == ERROR_SUCCESS)
{ {
@ -556,7 +556,7 @@ DWORD WINAPI drvGetDefaultCommConfigW(
} }
/* only "com1" - "com9" is allowed */ /* only "com1" - "com9" is allowed */
r = sizeof(comW) / sizeof(WCHAR); /* len of "com\0" */ r = ARRAY_SIZE(comW); /* len of "com\0" */
lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */
r--; r--;
@ -574,7 +574,7 @@ DWORD WINAPI drvGetDefaultCommConfigW(
r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg);
if(r != ERROR_SUCCESS) return r; if(r != ERROR_SUCCESS) return r;
snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice);
r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort);
if(r == ERROR_SUCCESS) if(r == ERROR_SUCCESS)
{ {