Commit 08acae5d authored by Frédéric Delanoy's avatar Frédéric Delanoy Committed by Alexandre Julliard

rsaenh: Use BOOL type where appropriate.

parent 6e472d8b
...@@ -87,13 +87,13 @@ void destroy_handle_table(struct handle_table *lpTable) ...@@ -87,13 +87,13 @@ void destroy_handle_table(struct handle_table *lpTable)
* dwType [I] A magic value that identifies the referenced object's type. * dwType [I] A magic value that identifies the referenced object's type.
* *
* RETURNS * RETURNS
* non zero, if handle is valid. * TRUE, if handle is valid.
* zero, if handle is not valid. * FALSE, if handle is not valid.
*/ */
int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) BOOL is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType)
{ {
unsigned int index = HANDLE2INDEX(handle); unsigned int index = HANDLE2INDEX(handle);
int ret = 0; BOOL ret = FALSE;
TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
...@@ -110,8 +110,8 @@ int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType ...@@ -110,8 +110,8 @@ int is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType
/* Check if this handle references an object of the correct type. */ /* Check if this handle references an object of the correct type. */
if (lpTable->paEntries[index].pObject->dwType != dwType) goto exit; if (lpTable->paEntries[index].pObject->dwType != dwType) goto exit;
ret = 1; ret = TRUE;
exit: exit:
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return ret; return ret;
...@@ -126,13 +126,13 @@ exit: ...@@ -126,13 +126,13 @@ exit:
* lpTable [I] Pointer to the table, which is to be grown * lpTable [I] Pointer to the table, which is to be grown
* *
* RETURNS * RETURNS
* non zero, if successful * TRUE, if successful
* zero, if not successful (out of memory on process heap) * FALSE, if not successful (out of memory on process heap)
* *
* NOTES * NOTES
* This is a support function for alloc_handle. Do not call! * This is a support function for alloc_handle. Do not call!
*/ */
static int grow_handle_table(struct handle_table *lpTable) static BOOL grow_handle_table(struct handle_table *lpTable)
{ {
struct handle_table_entry *newEntries; struct handle_table_entry *newEntries;
unsigned int i, newIEntries; unsigned int i, newIEntries;
...@@ -140,8 +140,8 @@ static int grow_handle_table(struct handle_table *lpTable) ...@@ -140,8 +140,8 @@ static int grow_handle_table(struct handle_table *lpTable)
newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT; newIEntries = lpTable->iEntries + TABLE_SIZE_INCREMENT;
newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries); newEntries = HeapAlloc(GetProcessHeap(), 0, sizeof(struct handle_table_entry)*newIEntries);
if (!newEntries) if (!newEntries)
return 0; return FALSE;
if (lpTable->paEntries) if (lpTable->paEntries)
{ {
...@@ -158,7 +158,7 @@ static int grow_handle_table(struct handle_table *lpTable) ...@@ -158,7 +158,7 @@ static int grow_handle_table(struct handle_table *lpTable)
lpTable->paEntries = newEntries; lpTable->paEntries = newEntries;
lpTable->iEntries = newIEntries; lpTable->iEntries = newIEntries;
return 1; return TRUE;
} }
/****************************************************************************** /******************************************************************************
...@@ -174,12 +174,12 @@ static int grow_handle_table(struct handle_table *lpTable) ...@@ -174,12 +174,12 @@ static int grow_handle_table(struct handle_table *lpTable)
* be stored. If not successful, this will be * be stored. If not successful, this will be
* INVALID_HANDLE_VALUE * INVALID_HANDLE_VALUE
* RETURNS * RETURNS
* non zero, if successful * TRUE, if successful
* zero, if not successful (no free handle) * FALSE, if not successful (no free handle)
*/ */
static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle) static BOOL alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYPTKEY *lpHandle)
{ {
int ret = 0; BOOL ret = FALSE;
TRACE("(lpTable=%p, lpObject=%p, lpHandle=%p)\n", lpTable, lpObject, lpHandle); TRACE("(lpTable=%p, lpObject=%p, lpHandle=%p)\n", lpTable, lpObject, lpHandle);
...@@ -197,7 +197,7 @@ static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYP ...@@ -197,7 +197,7 @@ static int alloc_handle(struct handle_table *lpTable, OBJECTHDR *lpObject, HCRYP
lpTable->iFirstFree = lpTable->paEntries[lpTable->iFirstFree].iNextFree; lpTable->iFirstFree = lpTable->paEntries[lpTable->iFirstFree].iNextFree;
InterlockedIncrement(&lpObject->refcount); InterlockedIncrement(&lpObject->refcount);
ret = 1; ret = TRUE;
exit: exit:
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return ret; return ret;
...@@ -221,14 +221,14 @@ exit: ...@@ -221,14 +221,14 @@ exit:
* to be released. * to be released.
* *
* RETURNS * RETURNS
* non zero, if successful * TRUE, if successful
* zero, if not successful (invalid handle) * FALSE, if not successful (invalid handle)
*/ */
int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType)
{ {
unsigned int index = HANDLE2INDEX(handle); unsigned int index = HANDLE2INDEX(handle);
OBJECTHDR *pObject; OBJECTHDR *pObject;
int ret = 0; BOOL ret = FALSE;
TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle);
...@@ -248,8 +248,8 @@ int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) ...@@ -248,8 +248,8 @@ int release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType)
lpTable->paEntries[index].pObject = NULL; lpTable->paEntries[index].pObject = NULL;
lpTable->paEntries[index].iNextFree = lpTable->iFirstFree; lpTable->paEntries[index].iNextFree = lpTable->iFirstFree;
lpTable->iFirstFree = index; lpTable->iFirstFree = index;
ret = 1; ret = TRUE;
exit: exit:
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return ret; return ret;
...@@ -263,16 +263,16 @@ exit: ...@@ -263,16 +263,16 @@ exit:
* PARAMS * PARAMS
* lpTable [I] Pointer to the handle table, in which the handle is looked up. * lpTable [I] Pointer to the handle table, in which the handle is looked up.
* handle [I] The handle, which is to be looked up * handle [I] The handle, which is to be looked up
* lplpObject [O] Pointer to the variable, into which the pointer to the * lplpObject [O] Pointer to the variable, into which the pointer to the
* object looked up is copied. * object looked up is copied.
* RETURNS * RETURNS
* non zero, if successful * TRUE, if successful
* zero, if not successful (invalid handle) * FALSE, if not successful (invalid handle)
*/ */
int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) BOOL lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject)
{ {
int ret = 0; BOOL ret = FALSE;
TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject); TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
...@@ -283,7 +283,7 @@ int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, ...@@ -283,7 +283,7 @@ int lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType,
} }
*lplpObject = lpTable->paEntries[HANDLE2INDEX(handle)].pObject; *lplpObject = lpTable->paEntries[HANDLE2INDEX(handle)].pObject;
ret = 1; ret = TRUE;
exit: exit:
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return ret; return ret;
...@@ -301,14 +301,14 @@ exit: ...@@ -301,14 +301,14 @@ exit:
* copy [O] Pointer to a handle variable, where the copied handle is put. * copy [O] Pointer to a handle variable, where the copied handle is put.
* *
* RETURNS * RETURNS
* non zero, if successful * TRUE, if successful
* zero, if not successful (invalid handle or out of memory) * FALSE, if not successful (invalid handle or out of memory)
*/ */
int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) BOOL copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy)
{ {
OBJECTHDR *pObject; OBJECTHDR *pObject;
int ret; BOOL ret;
TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy); TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy);
EnterCriticalSection(&lpTable->mutex); EnterCriticalSection(&lpTable->mutex);
...@@ -316,7 +316,7 @@ int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HC ...@@ -316,7 +316,7 @@ int copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HC
{ {
*copy = (HCRYPTKEY)INVALID_HANDLE_VALUE; *copy = (HCRYPTKEY)INVALID_HANDLE_VALUE;
LeaveCriticalSection(&lpTable->mutex); LeaveCriticalSection(&lpTable->mutex);
return 0; return FALSE;
} }
ret = alloc_handle(lpTable, pObject, copy); ret = alloc_handle(lpTable, pObject, copy);
......
...@@ -58,10 +58,10 @@ struct handle_table ...@@ -58,10 +58,10 @@ struct handle_table
void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN; void init_handle_table (struct handle_table *lpTable) DECLSPEC_HIDDEN;
void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN; void destroy_handle_table(struct handle_table *lpTable) DECLSPEC_HIDDEN;
int release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; BOOL release_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN;
int copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN; BOOL copy_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, HCRYPTKEY *copy) DECLSPEC_HIDDEN;
int lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN; BOOL lookup_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, OBJECTHDR **lplpObject) DECLSPEC_HIDDEN;
int is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN; BOOL is_valid_handle (struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType) DECLSPEC_HIDDEN;
HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor, HCRYPTKEY new_object (struct handle_table *lpTable, size_t cbSize, DWORD dwType, DESTRUCTOR destructor,
OBJECTHDR **ppObject) DECLSPEC_HIDDEN; OBJECTHDR **ppObject) DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment