kernel32: Cast-qual warnings fix (1 of 4)

Andrew Talbot Andrew.Talbot at talbotville.com
Thu Sep 14 11:39:53 CDT 2006


Changelog:
    kernel32: Cast-qual warnings fix.

diff -urN a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
--- a/dlls/kernel32/heap.c	2006-09-12 13:31:34.000000000 +0100
+++ b/dlls/kernel32/heap.c	2006-09-14 15:24:33.000000000 +0100
@@ -303,7 +303,7 @@
 #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 -urN a/dlls/kernel32/registry16.c b/dlls/kernel32/registry16.c
--- a/dlls/kernel32/registry16.c	2006-09-12 13:31:35.000000000 +0100
+++ b/dlls/kernel32/registry16.c	2006-09-14 15:02:04.000000000 +0100
@@ -198,7 +198,7 @@
 {
     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 -urN a/dlls/kernel32/time.c b/dlls/kernel32/time.c
--- a/dlls/kernel32/time.c	2006-09-12 13:31:35.000000000 +0100
+++ b/dlls/kernel32/time.c	2006-09-14 16:47:04.000000000 +0100
@@ -416,7 +416,7 @@
 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 -urN a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c
--- a/dlls/kernel32/volume.c	2006-09-12 13:31:35.000000000 +0100
+++ b/dlls/kernel32/volume.c	2006-09-14 17:02:24.000000000 +0100
@@ -375,7 +375,7 @@
         }
     }
     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-patches mailing list