kernel32: Cast-qual warnings fix (4 of 4)
Andrew Talbot
Andrew.Talbot at talbotville.com
Thu Sep 14 11:41:56 CDT 2006
Changelog:
kernel32: Cast-qual warnings fix.
diff -urN a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
--- a/dlls/kernel32/resource.c 2006-09-12 13:31:35.000000000 +0100
+++ b/dlls/kernel32/resource.c 2006-09-14 16:38:44.000000000 +0100
@@ -270,12 +270,12 @@
SetLastError( RtlNtStatusToDosError(status) );
return FALSE;
}
- et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++)
{
if (et[i].u1.s1.NameIsString)
{
- str = (PIMAGE_RESOURCE_DIR_STRING_U) ((LPBYTE) resdir + et[i].u1.s1.NameOffset);
+ str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset);
newlen = WideCharToMultiByte( CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL);
if (newlen + 1 > len)
{
@@ -320,12 +320,12 @@
SetLastError( RtlNtStatusToDosError(status) );
return FALSE;
}
- et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++)
{
if (et[i].u1.s1.NameIsString)
{
- str = (PIMAGE_RESOURCE_DIR_STRING_U) ((LPBYTE) resdir + et[i].u1.s1.NameOffset);
+ str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)resdir + et[i].u1.s1.NameOffset);
if (str->Length + 1 > len)
{
len = str->Length + 1;
@@ -375,12 +375,12 @@
if ((status = LdrFindResourceDirectory_U( hmod, &info, 1, &resdir )) != STATUS_SUCCESS)
goto done;
- et = (IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++)
{
if (et[i].u1.s1.NameIsString)
{
- str = (IMAGE_RESOURCE_DIR_STRING_U *) ((LPBYTE) basedir + et[i].u1.s1.NameOffset);
+ str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset);
newlen = WideCharToMultiByte(CP_ACP, 0, str->NameString, str->Length, NULL, 0, NULL, NULL);
if (newlen + 1 > len)
{
@@ -437,12 +437,12 @@
if ((status = LdrFindResourceDirectory_U( hmod, &info, 1, &resdir )) != STATUS_SUCCESS)
goto done;
- et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries+resdir->NumberOfIdEntries; i++)
{
if (et[i].u1.s1.NameIsString)
{
- str = (IMAGE_RESOURCE_DIR_STRING_U *) ((LPBYTE) basedir + et[i].u1.s1.NameOffset);
+ str = (const IMAGE_RESOURCE_DIR_STRING_U *)((const BYTE *)basedir + et[i].u1.s1.NameOffset);
if (str->Length + 1 > len)
{
len = str->Length + 1;
@@ -500,7 +500,7 @@
if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS)
goto done;
- et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++)
{
ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam );
@@ -543,7 +543,7 @@
if ((status = LdrFindResourceDirectory_U( hmod, &info, 2, &resdir )) != STATUS_SUCCESS)
goto done;
- et = (PIMAGE_RESOURCE_DIRECTORY_ENTRY)(resdir + 1);
+ et = (const IMAGE_RESOURCE_DIRECTORY_ENTRY *)(resdir + 1);
for (i = 0; i < resdir->NumberOfNamedEntries + resdir->NumberOfIdEntries; i++)
{
ret = lpfun( hmod, type, name, et[i].u1.s2.Id, lparam );
More information about the wine-patches
mailing list