Fixed some various comparisons wrt signedness.

This commit is contained in:
Vincent Béron 2002-06-21 22:25:17 +00:00 committed by Alexandre Julliard
parent bf50153479
commit e35580f4c9
6 changed files with 11 additions and 13 deletions

View File

@ -198,7 +198,7 @@ static LRESULT WINAPI ButtonWndProc_common(HWND hWnd, UINT uMsg,
checkBoxWidth = bmp.bmWidth / 4; checkBoxWidth = bmp.bmWidth / 4;
checkBoxHeight = bmp.bmHeight / 3; checkBoxHeight = bmp.bmHeight / 3;
} }
if (btn_type < 0L || btn_type >= MAX_BTN_TYPE) if (btn_type >= MAX_BTN_TYPE)
return -1; /* abort */ return -1; /* abort */
set_button_state( hWnd, BUTTON_UNCHECKED ); set_button_state( hWnd, BUTTON_UNCHECKED );
return 0; return 0;

View File

@ -842,7 +842,7 @@ BOOL WINAPI CryptGetDefaultProviderA (DWORD dwProvType, DWORD *pdwReserved,
CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER);
if (dwFlags & ~(CRYPT_USER_DEFAULT | CRYPT_MACHINE_DEFAULT)) if (dwFlags & ~(CRYPT_USER_DEFAULT | CRYPT_MACHINE_DEFAULT))
CRYPT_ReturnLastError(NTE_BAD_FLAGS); CRYPT_ReturnLastError(NTE_BAD_FLAGS);
if (dwProvType < 0 || dwProvType > 999) if (dwProvType > 999)
CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE); CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE);
if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT)) ) if ( !(keyname = CRYPT_GetTypeKeyName(dwProvType, dwFlags & CRYPT_USER_DEFAULT)) )
CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY); CRYPT_ReturnLastError(ERROR_NOT_ENOUGH_MEMORY);
@ -1129,7 +1129,7 @@ BOOL WINAPI CryptSetProviderExA (LPCSTR pszProvName, DWORD dwProvType, DWORD *pd
if (!pszProvName || pdwReserved) if (!pszProvName || pdwReserved)
CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER); CRYPT_ReturnLastError(ERROR_INVALID_PARAMETER);
if (dwProvType < 0 || dwProvType > MAXPROVTYPES) if (dwProvType > MAXPROVTYPES)
CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE); CRYPT_ReturnLastError(NTE_BAD_PROV_TYPE);
if (dwFlags & ~(CRYPT_MACHINE_DEFAULT | CRYPT_USER_DEFAULT | CRYPT_DELETE_DEFAULT) if (dwFlags & ~(CRYPT_MACHINE_DEFAULT | CRYPT_USER_DEFAULT | CRYPT_DELETE_DEFAULT)
|| dwFlags == CRYPT_DELETE_DEFAULT) || dwFlags == CRYPT_DELETE_DEFAULT)

View File

@ -1832,10 +1832,10 @@ static VOID LISTVIEW_ShiftIndices(HWND hwnd, INT nItem, INT direction)
{ {
checkselection = DPA_GetPtr(infoPtr->hdpaSelectionRanges,index); checkselection = DPA_GetPtr(infoPtr->hdpaSelectionRanges,index);
if ((checkselection->lower >= nItem)&& if ((checkselection->lower >= nItem)&&
(checkselection->lower + direction >= 0)) ((int)(checkselection->lower + direction) >= 0))
checkselection->lower += direction; checkselection->lower += direction;
if ((checkselection->upper >= nItem)&& if ((checkselection->upper >= nItem)&&
(checkselection->upper + direction >=0)) ((int)(checkselection->upper + direction) >= 0))
checkselection->upper += direction; checkselection->upper += direction;
index ++; index ++;
} }

View File

@ -288,8 +288,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise(
/* /*
* Check for invalid cookies. * Check for invalid cookies.
*/ */
if ( (dwConnection < 0) || if (dwConnection >= This->maxSinks)
(dwConnection >= This->maxSinks) )
return OLE_E_NOCONNECTION; return OLE_E_NOCONNECTION;
if (This->arrayOfSinks[dwConnection] == NULL) if (This->arrayOfSinks[dwConnection] == NULL)
@ -647,8 +646,7 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise(
/* /*
* Check for invalid cookies. * Check for invalid cookies.
*/ */
if ( (dwConnection < 0) || if (dwConnection >= This->maxCons)
(dwConnection >= This->maxCons) )
return OLE_E_NOCONNECTION; return OLE_E_NOCONNECTION;
if (This->Connections[dwConnection].sink == NULL) if (This->Connections[dwConnection].sink == NULL)

View File

@ -4067,7 +4067,7 @@ HRESULT WINAPI VarUI2FromUI4(ULONG ulIn, USHORT* puiOut)
{ {
TRACE("( %ld, %p ), stub\n", ulIn, puiOut ); TRACE("( %ld, %p ), stub\n", ulIn, puiOut );
if( ulIn < UI2_MIN || ulIn > UI2_MAX ) if( ulIn > UI2_MAX )
{ {
return DISP_E_OVERFLOW; return DISP_E_OVERFLOW;
} }
@ -4167,7 +4167,7 @@ HRESULT WINAPI VarUI4FromI4(LONG lIn, ULONG* pulOut)
{ {
TRACE("( %ld, %p ), stub\n", lIn, pulOut ); TRACE("( %ld, %p ), stub\n", lIn, pulOut );
if( lIn < UI4_MIN ) if( lIn < 0 )
{ {
return DISP_E_OVERFLOW; return DISP_E_OVERFLOW;
} }
@ -4885,7 +4885,7 @@ HRESULT WINAPI VarDateFromUdate(UDATE *pudateout,
*/ */
HRESULT WINAPI VarBstrCmp(BSTR left, BSTR right, LCID lcid, DWORD flags) HRESULT WINAPI VarBstrCmp(BSTR left, BSTR right, LCID lcid, DWORD flags)
{ {
DWORD r; INT r;
TRACE("( %s %s %ld %lx ) partial stub\n", debugstr_w(left), debugstr_w(right), lcid, flags); TRACE("( %s %s %ld %lx ) partial stub\n", debugstr_w(left), debugstr_w(right), lcid, flags);

View File

@ -1407,7 +1407,7 @@ static Window __get_top_decoration( Display *display, Window w, Window ancestor
static unsigned __td_lookup( Window w, Window* list, unsigned max ) static unsigned __td_lookup( Window w, Window* list, unsigned max )
{ {
unsigned i; unsigned i;
for( i = max - 1; i >= 0; i-- ) if( list[i] == w ) break; for( i = max; i > 0; i-- ) if( list[i - 1] == w ) break;
return i; return i;
} }