system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

mapi32: Avoid signed-unsigned integer comparisons.

Browse source
This commit is contained in:
Andrew Talbot 2013-02-11 22:44:56 +00:00 committed by Alexandre Julliard
parent ba7eebfd62
commit d24dc4b884
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dlls/mapi32/sendmail.c
View file

@ -269,7 +269,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
if (message->nFileCount > 0) if (message->nFileCount > 0)
{ {
ULONG num_attach = 0; ULONG num_attach = 0;
int i, j; unsigned int i;
for (i = 0; i < message->nFileCount; i++) for (i = 0; i < message->nFileCount; i++)
{ {
@ -294,6 +294,8 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
if (!filename) if (!filename)
{ {
int j;
filename = message->lpFiles[i].lpszPathName; filename = message->lpFiles[i].lpszPathName;
for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--) for (j = lstrlenW(message->lpFiles[i].lpszPathName)-1; j >= 0; j--)
@ -307,7 +309,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM
} }
} }
TRACE("Attachment %d path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName), TRACE("Attachment %u path: '%s'; filename: '%s'\n", i, debugstr_w(message->lpFiles[i].lpszPathName),
debugstr_w(filename)); debugstr_w(filename));
/* Create the attachment */ /* Create the attachment */
@ -504,7 +506,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam,
if (message->nFileCount && message->lpFiles) if (message->nFileCount && message->lpFiles)
{ {
lpMapiFileDescW filesW; lpMapiFileDescW filesW;
int i; unsigned int i;
filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount); filesW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDescW) * message->nFileCount);
@ -522,7 +524,7 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam,
/* Now free everything we allocated */ /* Now free everything we allocated */
if (message->nFileCount && message->lpFiles) if (message->nFileCount && message->lpFiles)
{ {
int i; unsigned int i;
for (i = 0; i < message->nFileCount; i++) for (i = 0; i < message->nFileCount; i++)
{ {
@ -623,7 +625,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam,
if (message->nRecipCount && message->lpRecips) if (message->nRecipCount && message->lpRecips)
{ {
lpMapiRecipDesc recipsA; lpMapiRecipDesc recipsA;
int i; unsigned int i;
recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount); recipsA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiRecipDesc) * message->nRecipCount);
@ -638,7 +640,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam,
if (message->nFileCount && message->lpFiles) if (message->nFileCount && message->lpFiles)
{ {
lpMapiFileDesc filesA; lpMapiFileDesc filesA;
int i; unsigned int i;
filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount); filesA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MapiFileDesc) * message->nFileCount);
@ -666,7 +668,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam,
if (message->nRecipCount && message->lpRecips) if (message->nRecipCount && message->lpRecips)
{ {
int i; unsigned int i;
for (i = 0; i < message->nRecipCount; i++) for (i = 0; i < message->nRecipCount; i++)
{ {
@ -679,7 +681,7 @@ ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam,
if (message->nFileCount && message->lpFiles) if (message->nFileCount && message->lpFiles)
{ {
int i; unsigned int i;
for (i = 0; i < message->nFileCount; i++) for (i = 0; i < message->nFileCount; i++)
{ {