kernel32: Constify a variable

Andrew Talbot Andrew.Talbot at talbotville.com
Wed May 2 15:24:46 CDT 2007


I believe the third parameter of HeapSize() is const in the SDK.

-- Andy.
---
Changelog:
    kernel32: Constify a variable.

diff -urN a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
--- a/dlls/kernel32/heap.c	2007-04-09 15:25:46.000000000 +0100
+++ b/dlls/kernel32/heap.c	2007-05-02 20:25:47.000000000 +0100
@@ -287,7 +287,7 @@
     return RtlReAllocateHeap( heap, flags, ptr, size );
 }
 
-SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPVOID ptr )
+SIZE_T WINAPI HeapSize( HANDLE heap, DWORD flags, LPCVOID ptr )
 {
     return RtlSizeHeap( heap, flags, ptr );
 }
diff -urN a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
--- a/dlls/ntdll/heap.c	2007-04-12 17:42:18.000000000 +0100
+++ b/dlls/ntdll/heap.c	2007-05-02 20:26:29.000000000 +0100
@@ -1511,7 +1511,7 @@
  * NOTES
  *  The size may be bigger than what was passed to RtlAllocateHeap().
  */
-SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, PVOID ptr )
+SIZE_T WINAPI RtlSizeHeap( HANDLE heap, ULONG flags, const void *ptr )
 {
     SIZE_T ret;
     HEAP *heapPtr = HEAP_GetPtr( heap );
@@ -1531,7 +1531,7 @@
     }
     else
     {
-        ARENA_INUSE *pArena = (ARENA_INUSE *)ptr - 1;
+        const ARENA_INUSE *pArena = (const ARENA_INUSE *)ptr - 1;
         ret = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes;
     }
     if (!(flags & HEAP_NO_SERIALIZE)) RtlLeaveCriticalSection( &heapPtr->critSection );
diff -urN a/include/winbase.h b/include/winbase.h
--- a/include/winbase.h	2007-04-27 14:24:06.000000000 +0100
+++ b/include/winbase.h	2007-05-02 20:14:22.000000000 +0100
@@ -1742,7 +1742,7 @@
 LPVOID      WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,SIZE_T);
 BOOL        WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T);
 BOOL        WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T);
-SIZE_T      WINAPI HeapSize(HANDLE,DWORD,LPVOID);
+SIZE_T      WINAPI HeapSize(HANDLE,DWORD,LPCVOID);
 BOOL        WINAPI HeapUnlock(HANDLE);
 BOOL        WINAPI HeapValidate(HANDLE,DWORD,LPCVOID);
 BOOL        WINAPI HeapWalk(HANDLE,LPPROCESS_HEAP_ENTRY);
diff -urN a/include/winternl.h b/include/winternl.h
--- a/include/winternl.h	2007-03-26 14:13:56.000000000 +0100
+++ b/include/winternl.h	2007-05-02 20:26:06.000000000 +0100
@@ -2193,7 +2193,7 @@
 void      WINAPI RtlSetLastWin32ErrorAndNtStatusFromNtStatus(NTSTATUS);
 NTSTATUS  WINAPI RtlSetSaclSecurityDescriptor(PSECURITY_DESCRIPTOR,BOOLEAN,PACL,BOOLEAN);
 NTSTATUS  WINAPI RtlSetTimeZoneInformation(const RTL_TIME_ZONE_INFORMATION*);
-SIZE_T    WINAPI RtlSizeHeap(HANDLE,ULONG,PVOID);
+SIZE_T    WINAPI RtlSizeHeap(HANDLE,ULONG,const void*);
 NTSTATUS  WINAPI RtlStringFromGUID(REFGUID,PUNICODE_STRING);
 LPDWORD   WINAPI RtlSubAuthoritySid(PSID,DWORD);
 LPBYTE    WINAPI RtlSubAuthorityCountSid(PSID);



More information about the wine-patches mailing list