Andrew Talbot : advapi32: Cast-qual warnings fix.

Alexandre Julliard julliard at wine.codeweavers.com
Sat Aug 26 13:47:39 CDT 2006


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

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Fri Aug 25 22:14:38 2006 +0100

advapi32: Cast-qual warnings fix.

---

 dlls/advapi32/crypt.c        |    3 ++-
 dlls/advapi32/crypt_lmhash.c |    2 +-
 dlls/advapi32/eventlog.c     |    8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/advapi32/crypt.c b/dlls/advapi32/crypt.c
index 01be73b..7fd50e0 100644
--- a/dlls/advapi32/crypt.c
+++ b/dlls/advapi32/crypt.c
@@ -1819,7 +1819,8 @@ BOOL WINAPI CryptSetProviderExW (LPCWSTR
 		}
 		CRYPT_Free(keyname);
 		
-		if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (LPBYTE)pszProvName, (strlenW(pszProvName) + 1)*sizeof(WCHAR)))
+		if (RegSetValueExW(hTypeKey, nameW, 0, REG_SZ, (const BYTE *)pszProvName,
+			(strlenW(pszProvName) + 1)*sizeof(WCHAR)))
 		{
 			RegCloseKey(hTypeKey);
 			RegCloseKey(hProvKey);
diff --git a/dlls/advapi32/crypt_lmhash.c b/dlls/advapi32/crypt_lmhash.c
index 5617d3f..a7e8e55 100644
--- a/dlls/advapi32/crypt_lmhash.c
+++ b/dlls/advapi32/crypt_lmhash.c
@@ -50,7 +50,7 @@ static void CRYPT_LMhash( unsigned char 
 
 NTSTATUS WINAPI SystemFunction006( LPCSTR password, LPSTR hash )
 {
-    CRYPT_LMhash( (unsigned char*)hash, (unsigned char*)password, strlen(password) );
+    CRYPT_LMhash( (unsigned char*)hash, (const unsigned char*)password, strlen(password) );
 
     return STATUS_SUCCESS;
 }
diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index ad477d4..2c40173 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -373,7 +373,7 @@ HANDLE WINAPI RegisterEventSourceW( LPCW
 BOOL WINAPI ReportEventA ( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dwEventID,
     PSID lpUserSid, WORD wNumStrings, DWORD dwDataSize, LPCSTR *lpStrings, LPVOID lpRawData)
 {
-    LPCWSTR *wideStrArray;
+    LPWSTR *wideStrArray;
     UNICODE_STRING str;
     int i;
     BOOL ret;
@@ -384,17 +384,17 @@ BOOL WINAPI ReportEventA ( HANDLE hEvent
     if (wNumStrings == 0) return TRUE;
     if (!lpStrings) return TRUE;
 
-    wideStrArray = HeapAlloc(GetProcessHeap(), 0, sizeof(LPCWSTR) * wNumStrings);
+    wideStrArray = HeapAlloc(GetProcessHeap(), 0, sizeof(LPWSTR) * wNumStrings);
     for (i = 0; i < wNumStrings; i++)
     {
         RtlCreateUnicodeStringFromAsciiz(&str, lpStrings[i]);
         wideStrArray[i] = str.Buffer;
     }
     ret = ReportEventW(hEventLog, wType, wCategory, dwEventID, lpUserSid,
-                       wNumStrings, dwDataSize, wideStrArray, lpRawData);
+                       wNumStrings, dwDataSize, (LPCWSTR *)wideStrArray, lpRawData);
     for (i = 0; i < wNumStrings; i++)
     {
-        HeapFree( GetProcessHeap(), 0, (LPSTR)wideStrArray[i] );
+        HeapFree( GetProcessHeap(), 0, wideStrArray[i] );
     }
     HeapFree(GetProcessHeap(), 0, wideStrArray);
     return ret;




More information about the wine-cvs mailing list