Commit 48ebc410 authored by Rémi Bernon's avatar Rémi Bernon Committed by Alexandre Julliard

kernel32: Fix indentation of Global* functions.

parent 56c57f8a
...@@ -231,11 +231,10 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem) ...@@ -231,11 +231,10 @@ BOOL WINAPI GlobalUnlock(HGLOBAL hmem)
* Handle: Success * Handle: Success
* NULL: Failure * NULL: Failure
*/ */
HGLOBAL WINAPI GlobalHandle( HGLOBAL WINAPI GlobalHandle( LPCVOID pmem )
LPCVOID pmem /* [in] Pointer to global memory block */ {
) {
HGLOBAL handle; HGLOBAL handle;
PGLOBAL32_INTERN maybe_intern; PGLOBAL32_INTERN maybe_intern;
LPCVOID test; LPCVOID test;
if (!pmem) if (!pmem)
...@@ -244,7 +243,7 @@ HGLOBAL WINAPI GlobalHandle( ...@@ -244,7 +243,7 @@ HGLOBAL WINAPI GlobalHandle(
return 0; return 0;
} }
RtlLockHeap(GetProcessHeap()); RtlLockHeap( GetProcessHeap() );
__TRY __TRY
{ {
handle = 0; handle = 0;
...@@ -252,22 +251,25 @@ HGLOBAL WINAPI GlobalHandle( ...@@ -252,22 +251,25 @@ HGLOBAL WINAPI GlobalHandle(
/* note that if pmem is a pointer to a block allocated by */ /* note that if pmem is a pointer to a block allocated by */
/* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */ /* GlobalAlloc with GMEM_MOVEABLE then magic test in HeapValidate */
/* will fail. */ /* will fail. */
if (ISPOINTER(pmem)) { if (ISPOINTER( pmem ))
if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem )) { {
handle = (HGLOBAL)pmem; /* valid fixed block */ if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, pmem ))
{
handle = (HGLOBAL)pmem; /* valid fixed block */
break; break;
} }
handle = POINTER_TO_HANDLE(pmem); handle = POINTER_TO_HANDLE( pmem );
} else }
handle = (HGLOBAL)pmem; else handle = (HGLOBAL)pmem;
/* Now test handle either passed in or retrieved from pointer */ /* Now test handle either passed in or retrieved from pointer */
maybe_intern = HANDLE_TO_INTERN( handle ); maybe_intern = HANDLE_TO_INTERN( handle );
if (maybe_intern->Magic == MAGIC_GLOBAL_USED) { if (maybe_intern->Magic == MAGIC_GLOBAL_USED)
{
test = maybe_intern->Pointer; test = maybe_intern->Pointer;
if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */ if (HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, (const char *)test - HGLOBAL_STORAGE ) && /* obj(-handle) valid arena? */
HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */ HeapValidate( GetProcessHeap(), HEAP_NO_SERIALIZE, maybe_intern )) /* intern valid arena? */
break; /* valid moveable block */ break; /* valid moveable block */
} }
handle = 0; handle = 0;
SetLastError( ERROR_INVALID_HANDLE ); SetLastError( ERROR_INVALID_HANDLE );
...@@ -278,12 +280,11 @@ HGLOBAL WINAPI GlobalHandle( ...@@ -278,12 +280,11 @@ HGLOBAL WINAPI GlobalHandle(
handle = 0; handle = 0;
} }
__ENDTRY __ENDTRY
RtlUnlockHeap(GetProcessHeap()); RtlUnlockHeap( GetProcessHeap() );
return handle; return handle;
} }
/*********************************************************************** /***********************************************************************
* GlobalReAlloc (KERNEL32.@) * GlobalReAlloc (KERNEL32.@)
* *
...@@ -317,50 +318,49 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags ) ...@@ -317,50 +318,49 @@ HGLOBAL WINAPI GlobalReAlloc( HGLOBAL hmem, SIZE_T size, UINT flags )
*/ */
SIZE_T WINAPI GlobalSize(HGLOBAL hmem) SIZE_T WINAPI GlobalSize(HGLOBAL hmem)
{ {
SIZE_T retval; SIZE_T retval;
PGLOBAL32_INTERN pintern; PGLOBAL32_INTERN pintern;
if (!((ULONG_PTR)hmem >> 16)) if (!((ULONG_PTR)hmem >> 16))
{ {
SetLastError(ERROR_INVALID_HANDLE); SetLastError( ERROR_INVALID_HANDLE );
return 0; return 0;
} }
if(ISPOINTER(hmem)) if (ISPOINTER( hmem ))
{ {
retval=HeapSize(GetProcessHeap(), 0, hmem); retval = HeapSize( GetProcessHeap(), 0, hmem );
if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */
if (retval == ~(SIZE_T)0) /* It might be a GMEM_MOVEABLE data pointer */ {
{ retval = HeapSize( GetProcessHeap(), 0, (char *)hmem - HGLOBAL_STORAGE );
retval = HeapSize(GetProcessHeap(), 0, (char*)hmem - HGLOBAL_STORAGE); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE;
if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; }
} }
} else
else {
{ RtlLockHeap( GetProcessHeap() );
RtlLockHeap(GetProcessHeap()); pintern = HANDLE_TO_INTERN( hmem );
pintern=HANDLE_TO_INTERN(hmem);
if (pintern->Magic == MAGIC_GLOBAL_USED)
if(pintern->Magic==MAGIC_GLOBAL_USED) {
{ if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */
if (!pintern->Pointer) /* handle case of GlobalAlloc( ??,0) */ retval = 0;
retval = 0; else
else {
{ retval = HeapSize( GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE );
retval = HeapSize(GetProcessHeap(), 0, (char *)pintern->Pointer - HGLOBAL_STORAGE ); if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE;
if (retval != ~(SIZE_T)0) retval -= HGLOBAL_STORAGE; }
} }
} else
else {
{ WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic );
WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); SetLastError( ERROR_INVALID_HANDLE );
SetLastError(ERROR_INVALID_HANDLE); retval = 0;
retval=0; }
} RtlUnlockHeap( GetProcessHeap() );
RtlUnlockHeap(GetProcessHeap()); }
} if (retval == ~(SIZE_T)0) retval = 0;
if (retval == ~(SIZE_T)0) retval = 0; return retval;
return retval;
} }
...@@ -415,32 +415,31 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem) ...@@ -415,32 +415,31 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem)
*/ */
UINT WINAPI GlobalFlags(HGLOBAL hmem) UINT WINAPI GlobalFlags(HGLOBAL hmem)
{ {
DWORD retval; DWORD retval;
PGLOBAL32_INTERN pintern; PGLOBAL32_INTERN pintern;
if(ISPOINTER(hmem)) if (ISPOINTER( hmem ))
{ {
retval=0; retval = 0;
} }
else else
{ {
RtlLockHeap(GetProcessHeap()); RtlLockHeap( GetProcessHeap() );
pintern=HANDLE_TO_INTERN(hmem); pintern = HANDLE_TO_INTERN( hmem );
if(pintern->Magic==MAGIC_GLOBAL_USED) if (pintern->Magic == MAGIC_GLOBAL_USED)
{ {
retval=pintern->LockCount + (pintern->Flags<<8); retval = pintern->LockCount + (pintern->Flags << 8);
if(pintern->Pointer==0) if (pintern->Pointer == 0) retval |= GMEM_DISCARDED;
retval|= GMEM_DISCARDED; }
} else
else {
{ WARN( "invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic );
WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic); SetLastError( ERROR_INVALID_HANDLE );
SetLastError(ERROR_INVALID_HANDLE); retval = GMEM_INVALID_HANDLE;
retval = GMEM_INVALID_HANDLE; }
} RtlUnlockHeap( GetProcessHeap() );
RtlUnlockHeap(GetProcessHeap()); }
} return retval;
return retval;
} }
......
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