Andrew Talbot : kernel32: Cast-qual warnings fix.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Sep 20 05:33:43 CDT 2006
Module: wine
Branch: master
Commit: 2b164a2d4186e5567755bf8a8568273f6582d1bf
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2b164a2d4186e5567755bf8a8568273f6582d1bf
Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date: Thu Sep 14 17:39:53 2006 +0100
kernel32: Cast-qual warnings fix.
---
dlls/kernel32/heap.c | 2 +-
dlls/kernel32/registry16.c | 2 +-
dlls/kernel32/time.c | 2 +-
dlls/kernel32/volume.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index dc481c4..6c44fd7 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -303,7 +303,7 @@ SIZE_T WINAPI HeapSize( HANDLE heap, DWO
#define MAGIC_GLOBAL_USED 0x5342
#define HANDLE_TO_INTERN(h) ((PGLOBAL32_INTERN)(((char *)(h))-2))
#define INTERN_TO_HANDLE(i) ((HGLOBAL) &((i)->Pointer))
-#define POINTER_TO_HANDLE(p) (*(((HGLOBAL *)(p))-2))
+#define POINTER_TO_HANDLE(p) (*(((const HGLOBAL *)(p))-2))
#define ISHANDLE(h) (((ULONG_PTR)(h)&2)!=0)
#define ISPOINTER(h) (((ULONG_PTR)(h)&2)==0)
/* align the storage needed for the HGLOBAL on an 8byte boundary thus
diff --git a/dlls/kernel32/registry16.c b/dlls/kernel32/registry16.c
index 5295bbc..5c84f12 100644
--- a/dlls/kernel32/registry16.c
+++ b/dlls/kernel32/registry16.c
@@ -198,7 +198,7 @@ DWORD WINAPI RegSetValueEx16( HKEY hkey,
{
if (!advapi32) init_func_ptrs();
fix_win16_hkey( &hkey );
- if (!count && (type==REG_SZ)) count = strlen( (char*) data);
+ if (!count && (type==REG_SZ)) count = strlen( (const char *)data );
return pRegSetValueExA( hkey, name, reserved, type, data, count );
}
diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c
index 0768266..5528a7c 100644
--- a/dlls/kernel32/time.c
+++ b/dlls/kernel32/time.c
@@ -416,7 +416,7 @@ DWORD WINAPI GetTimeZoneInformation( LPT
BOOL WINAPI SetTimeZoneInformation( const TIME_ZONE_INFORMATION *tzinfo )
{
NTSTATUS status;
- status = RtlSetTimeZoneInformation( (RTL_TIME_ZONE_INFORMATION*) tzinfo );
+ status = RtlSetTimeZoneInformation( (const RTL_TIME_ZONE_INFORMATION *)tzinfo );
if ( status != STATUS_SUCCESS )
SetLastError( RtlNtStatusToDosError(status) );
return !status;
diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
index ab23b14..ad83e3e 100644
--- a/dlls/kernel32/volume.c
+++ b/dlls/kernel32/volume.c
@@ -375,7 +375,7 @@ static void VOLUME_GetSuperblockLabel( e
}
}
if (label_len) RtlMultiByteToUnicodeN( label, (len-1) * sizeof(WCHAR),
- &label_len, (char*)label_ptr, label_len );
+ &label_len, (LPCSTR)label_ptr, label_len );
label_len /= sizeof(WCHAR);
label[label_len] = 0;
while (label_len && label[label_len-1] == ' ') label[--label_len] = 0;
More information about the wine-cvs
mailing list