Andrew Talbot : kernel32: Cast-qual warnings fix.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Sep 20 05:33:46 CDT 2006


Module: wine
Branch: master
Commit: 10a0931ebe302fa5a2e3101a4a9d68270cd5136c
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=10a0931ebe302fa5a2e3101a4a9d68270cd5136c

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Thu Sep 14 17:41:56 2006 +0100

kernel32: Cast-qual warnings fix.

---

 dlls/kernel32/resource.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/kernel32/resource.c b/dlls/kernel32/resource.c
index aed006a..49b2d7a 100644
--- a/dlls/kernel32/resource.c
+++ b/dlls/kernel32/resource.c
@@ -270,12 +270,12 @@ BOOL WINAPI EnumResourceTypesA( HMODULE 
         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 @@ BOOL WINAPI EnumResourceTypesW( HMODULE 
         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 @@ BOOL WINAPI EnumResourceNamesA( HMODULE 
     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 @@ BOOL WINAPI EnumResourceNamesW( HMODULE 
     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 @@ BOOL WINAPI EnumResourceLanguagesA( HMOD
     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 @@ BOOL WINAPI EnumResourceLanguagesW( HMOD
     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-cvs mailing list