kernel: Constify some formal parameters
Andrew Talbot
Andrew.Talbot at talbotville.com
Wed Aug 30 16:24:28 CDT 2006
Constifying certain formal parameters in this file should make it possible to
eliminate cast-qual warnings elsewhere.
---
Changelog:
kernel: Constify some formal parameters.
diff -urN a/dlls/kernel/resource16.c b/dlls/kernel/resource16.c
--- a/dlls/kernel/resource16.c 2006-05-23 13:48:03.000000000 +0100
+++ b/dlls/kernel/resource16.c 2006-08-30 21:58:28.000000000 +0100
@@ -388,10 +388,10 @@
return prevHandler;
}
-static inline DWORD get_dword(LPVOID *p)
+static inline DWORD get_dword(LPCVOID *p)
{
- DWORD ret = *(DWORD*)*p;
- *p = (DWORD *)*p + 1;
+ DWORD ret = *(const DWORD *)*p;
+ *p = (const DWORD *)*p + 1;
return ret;
}
@@ -401,10 +401,10 @@
*p = (DWORD *)*p + 1;
}
-static inline WORD get_word(LPVOID *p)
+static inline WORD get_word(LPCVOID *p)
{
- WORD ret = *(WORD*)*p;
- *p = (WORD *)*p + 1;
+ WORD ret = *(const WORD *)*p;
+ *p = (const WORD *)*p + 1;
return ret;
}
@@ -414,10 +414,10 @@
*p = (WORD *)*p + 1;
}
-static inline BYTE get_byte(LPVOID *p)
+static inline BYTE get_byte(LPCVOID *p)
{
- BYTE ret = *(BYTE *)*p;
- *p = (BYTE *)*p + 1;
+ BYTE ret = *(const BYTE *)*p;
+ *p = (const BYTE *)*p + 1;
return ret;
}
@@ -428,10 +428,10 @@
}
/* convert a resource name */
-static void convert_name( LPVOID *dst, LPVOID *src )
+static void convert_name( LPVOID *dst, LPCVOID *src )
{
int len;
- switch (*((WORD *)*src))
+ switch (*(const WORD *)*src)
{
case 0x0000:
get_word( src );
@@ -445,7 +445,7 @@
default:
len = WideCharToMultiByte( CP_ACP, 0, *src, -1, *dst, 0x7fffffff, NULL,NULL );
*dst = (char *)*dst + len;
- *src = (WCHAR *)*src + strlenW( (WCHAR *)*src ) + 1;
+ *src = (LPCWSTR)*src + strlenW( *src ) + 1;
break;
}
}
@@ -453,7 +453,7 @@
/**********************************************************************
* ConvertDialog32To16 (KERNEL.615)
*/
-VOID WINAPI ConvertDialog32To16( LPVOID dialog32, DWORD size, LPVOID dialog16 )
+VOID WINAPI ConvertDialog32To16( LPCVOID dialog32, DWORD size, LPVOID dialog16 )
{
WORD nbItems, data, dialogEx;
DWORD style;
@@ -469,7 +469,7 @@
put_dword( &dialog16, style ); /* style */
}
else
- dialog32 = (DWORD *)dialog32 + 1; /* exStyle ignored in 16-bit standard dialog */
+ dialog32 = (const DWORD *)dialog32 + 1; /* exStyle ignored in 16-bit standard dialog */
nbItems = get_word( &dialog32 );
put_byte( &dialog16, nbItems );
@@ -486,8 +486,8 @@
/* Transfer window caption */
WideCharToMultiByte( CP_ACP, 0, dialog32, -1, dialog16, 0x7fffffff, NULL, NULL );
- dialog16 = (LPSTR)dialog16 + strlen( (LPSTR)dialog16 ) + 1;
- dialog32 = (LPWSTR)dialog32 + strlenW( (LPWSTR)dialog32 ) + 1;
+ dialog16 = (LPSTR)dialog16 + strlen( dialog16 ) + 1;
+ dialog32 = (LPCWSTR)dialog32 + strlenW( dialog32 ) + 1;
/* Transfer font info */
if (style & DS_SETFONT)
@@ -498,16 +498,16 @@
put_word( &dialog16, get_word( &dialog32 ) ); /* weight */
put_word( &dialog16, get_word( &dialog32 ) ); /* italic */
}
- WideCharToMultiByte( CP_ACP, 0, (LPWSTR)dialog32, -1, (LPSTR)dialog16, 0x7fffffff, NULL, NULL ); /* faceName */
- dialog16 = (LPSTR)dialog16 + strlen( (LPSTR)dialog16 ) + 1;
- dialog32 = (LPWSTR)dialog32 + strlenW( (LPWSTR)dialog32 ) + 1;
+ WideCharToMultiByte( CP_ACP, 0, dialog32, -1, dialog16, 0x7fffffff, NULL, NULL ); /* faceName */
+ dialog16 = (LPSTR)dialog16 + strlen( dialog16 ) + 1;
+ dialog32 = (LPCWSTR)dialog32 + strlenW( dialog32 ) + 1;
}
/* Transfer dialog items */
while (nbItems)
{
/* align on DWORD boundary (32-bit only) */
- dialog32 = (LPVOID)(((UINT_PTR)dialog32 + 3) & ~3);
+ dialog32 = (LPCVOID)(((UINT_PTR)dialog32 + 3) & ~3);
if (dialogEx)
{
@@ -517,8 +517,8 @@
}
else
{
- style = get_dword( &dialog32 ); /* save style */
- dialog32 = (DWORD *)dialog32 + 1; /* ignore exStyle */
+ style = get_dword( &dialog32 ); /* save style */
+ dialog32 = (const DWORD *)dialog32 + 1; /* ignore exStyle */
}
put_word( &dialog16, get_word( &dialog32 ) ); /* x */
@@ -535,7 +535,7 @@
}
/* Transfer class name */
- switch (*(WORD *)dialog32)
+ switch (*(const WORD *)dialog32)
{
case 0x0000:
get_word( &dialog32 );
@@ -546,9 +546,9 @@
put_byte( &dialog16, get_word( &dialog32 ) );
break;
default:
- WideCharToMultiByte( CP_ACP, 0, (LPWSTR)dialog32, -1, (LPSTR)dialog16, 0x7fffffff, NULL, NULL );
- dialog16 = (LPSTR)dialog16 + strlen( (LPSTR)dialog16 ) + 1;
- dialog32 = (LPWSTR)dialog32 + strlenW( (LPWSTR)dialog32 ) + 1;
+ WideCharToMultiByte( CP_ACP, 0, dialog32, -1, dialog16, 0x7fffffff, NULL, NULL );
+ dialog16 = (LPSTR)dialog16 + strlen( dialog16 ) + 1;
+ dialog32 = (LPCWSTR)dialog32 + strlenW( dialog32 ) + 1;
break;
}
@@ -566,7 +566,7 @@
{
memcpy( dialog16, dialog32, data );
dialog16 = (BYTE *)dialog16 + data;
- dialog32 = (BYTE *)dialog32 + data;
+ dialog32 = (const BYTE *)dialog32 + data;
}
/* Next item */
@@ -716,7 +716,7 @@
else
level++;
- WideCharToMultiByte( CP_ACP, 0, (LPWSTR)menu32, -1, (LPSTR)menu16, 0x7fffffff, NULL, NULL );
+ WideCharToMultiByte( CP_ACP, 0, menu32, -1, menu16, 0x7fffffff, NULL, NULL );
menu16 = (LPSTR)menu16 + strlen( (LPSTR)menu16 ) + 1;
menu32 = (LPWSTR)menu32 + strlenW( (LPWSTR)menu32 ) + 1;
@@ -731,7 +731,7 @@
flags = get_word( &menu32 );
put_byte(&menu16,flags);
- WideCharToMultiByte( CP_ACP, 0, (LPWSTR)menu32, -1, (LPSTR)menu16, 0x7fffffff, NULL, NULL );
+ WideCharToMultiByte( CP_ACP, 0, menu32, -1, menu16, 0x7fffffff, NULL, NULL );
menu16 = (LPSTR)menu16 + strlen( (LPSTR)menu16 ) + 1;
menu32 = (LPWSTR)menu32 + strlenW( (LPWSTR)menu32 ) + 1;
diff -urN a/include/wine/winuser16.h b/include/wine/winuser16.h
--- a/include/wine/winuser16.h 2006-05-23 13:49:12.000000000 +0100
+++ b/include/wine/winuser16.h 2006-08-30 21:13:03.000000000 +0100
@@ -963,7 +963,7 @@
typedef VOID (*SYSTEMTIMERPROC)(WORD);
-void WINAPI ConvertDialog32To16(LPVOID,DWORD,LPVOID);
+void WINAPI ConvertDialog32To16(LPCVOID,DWORD,LPVOID);
WORD WINAPI CreateSystemTimer(WORD,SYSTEMTIMERPROC);
VOID WINAPI DisableSystemTimers16(void);
VOID WINAPI EnableSystemTimers16(void);
More information about the wine-patches
mailing list