Andrew Talbot : msacm32: Cast-qual warnings fix.

[Alexandre Julliard]

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

Author: Andrew Talbot <Andrew.Talbot at talbotville.com>
Date:   Fri Nov  3 20:56:30 2006 +0000

msacm32: Cast-qual warnings fix.

---

 dlls/msacm32/driver.c |   33 ++++++++++++++++++++-------------
 1 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c
index f995808..d4ad644 100644
--- a/dlls/msacm32/driver.c
+++ b/dlls/msacm32/driver.c
@@ -402,6 +402,8 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV
         PWINE_ACMDRIVERID padid;
         LRESULT lResult;
         LPDRVCONFIGINFO pConfigInfo = NULL;
+        LPWSTR section_name = NULL;
+        LPWSTR alias_name = NULL;
 
         /* Check whether handle is an HACMDRIVERID */
         padid  = MSACM_GetDriverID((HACMDRIVERID)had);
@@ -434,16 +436,19 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV
                     ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n");
                 } else {
                     static const WCHAR drivers32[] = {'D','r','i','v','e','r','s','3','2','\0'};
+
                     pConfigInfo->dwDCISize = iStructSize;
-                
-                    pConfigInfo->lpszDCISectionName = HeapAlloc(MSACM_hHeap, 0, (strlenW(drivers32) + 1) * sizeof(WCHAR));
-                    if (pConfigInfo->lpszDCISectionName) strcpyW((WCHAR *)pConfigInfo->lpszDCISectionName, drivers32);
-                    pConfigInfo->lpszDCIAliasName = HeapAlloc(MSACM_hHeap, 0, (strlenW(pAlias) + 1) * sizeof(WCHAR));
-                    if (pConfigInfo->lpszDCIAliasName) strcpyW((WCHAR *)pConfigInfo->lpszDCIAliasName, pAlias);
-                    
+
+                    section_name = HeapAlloc(MSACM_hHeap, 0, (strlenW(drivers32) + 1) * sizeof(WCHAR));
+                    if (section_name) strcpyW(section_name, drivers32);
+                    pConfigInfo->lpszDCISectionName = section_name;
+                    alias_name = HeapAlloc(MSACM_hHeap, 0, (strlenW(pAlias) + 1) * sizeof(WCHAR));
+                    if (alias_name) strcpyW(alias_name, pAlias);
+                    pConfigInfo->lpszDCIAliasName = alias_name;
+
                     if (pConfigInfo->lpszDCISectionName == NULL || pConfigInfo->lpszDCIAliasName == NULL) {
-                        HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCIAliasName);
-                        HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCISectionName);
+                        HeapFree(MSACM_hHeap, 0, alias_name);
+                        HeapFree(MSACM_hHeap, 0, section_name);
                         HeapFree(MSACM_hHeap, 0, pConfigInfo);
                         pConfigInfo = NULL;
                         ERR("OOM while supplying DRVCONFIGINFO for DRV_CONFIGURE, using NULL\n");
@@ -471,8 +476,8 @@ LRESULT WINAPI acmDriverMessage(HACMDRIV
             lResult = MSACM_Message(had, uMsg, lParam1, lParam2);
         }
         if (pConfigInfo) {
-            HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCIAliasName);
-            HeapFree(MSACM_hHeap, 0, (void *)pConfigInfo->lpszDCISectionName);
+            HeapFree(MSACM_hHeap, 0, alias_name);
+            HeapFree(MSACM_hHeap, 0, section_name);
             HeapFree(MSACM_hHeap, 0, pConfigInfo);
         }
         return lResult;
@@ -523,6 +528,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE
     {
         ACMDRVOPENDESCW	adod;
         int		len;
+        LPWSTR		section_name;
 
 	/* this is not an externally added driver... need to actually load it */
 	if (!padid->pszDriverAlias)
@@ -538,14 +544,15 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVE
         adod.dwFlags = fdwOpen;
         adod.dwError = 0;
         len = strlen("Drivers32") + 1;
-        adod.pszSectionName = HeapAlloc(MSACM_hHeap, 0, len * sizeof(WCHAR));
-        MultiByteToWideChar(CP_ACP, 0, "Drivers32", -1, (LPWSTR)adod.pszSectionName, len);
+        section_name = HeapAlloc(MSACM_hHeap, 0, len * sizeof(WCHAR));
+        MultiByteToWideChar(CP_ACP, 0, "Drivers32", -1, section_name, len);
+        adod.pszSectionName = section_name;
         adod.pszAliasName = padid->pszDriverAlias;
         adod.dnDevNode = 0;
 
         pad->hDrvr = OpenDriver(padid->pszDriverAlias, NULL, (DWORD)&adod);
 
-        HeapFree(MSACM_hHeap, 0, (LPWSTR)adod.pszSectionName);
+        HeapFree(MSACM_hHeap, 0, section_name);
         if (!pad->hDrvr)
         {
             ret = adod.dwError;