Michael Stefaniuc : uxtheme: Remove superfluous pointer casts.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Jan 13 10:55:29 2009 +0100

uxtheme: Remove superfluous pointer casts.

---

 dlls/uxtheme/msstyles.c |   10 +++++-----
 dlls/uxtheme/system.c   |   24 +++++++++++-------------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c
index 3f2a054..825645d 100644
--- a/dlls/uxtheme/msstyles.c
+++ b/dlls/uxtheme/msstyles.c
@@ -733,9 +733,9 @@ static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state)
     memset (state, 0, sizeof (*state));
     state->metrics.cbSize = sizeof (NONCLIENTMETRICSW);
     SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW),
-        (PVOID)&state->metrics, 0);
+        &state->metrics, 0);
     SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW),
-        (PVOID)&state->iconTitleFont, 0);
+        &state->iconTitleFont, 0);
 }
 
 static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state, 
@@ -838,9 +838,9 @@ static void parse_apply_nonclient (struct PARSENONCLIENTSTATE* state)
     if (state->metricsDirty)
     {
         SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (state->metrics),
-            (PVOID)&state->metrics, 0);
+            &state->metrics, 0);
         SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (state->iconTitleFont),
-            (PVOID)&state->iconTitleFont, 0);
+            &state->iconTitleFont, 0);
     }
 }
 
@@ -1086,7 +1086,7 @@ static BOOL prepare_alpha (HBITMAP bmp, BOOL* hasAlpha)
         return TRUE;
 
     *hasAlpha = TRUE;
-    p = (BYTE*)dib.dsBm.bmBits;
+    p = dib.dsBm.bmBits;
     n = abs(dib.dsBmih.biHeight) * dib.dsBmih.biWidth;
     /* AlphaBlend() wants premultiplied alpha, so do that now */
     while (n-- > 0)
diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c
index c1e26c8..2839539 100644
--- a/dlls/uxtheme/system.c
+++ b/dlls/uxtheme/system.c
@@ -126,7 +126,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue,
       RegQueryValueExW (hKey, lpszValue, 0, NULL, (LPBYTE)szData, &nBytesToAlloc);
       dwExpDataLen = ExpandEnvironmentStringsW(szData, &cNull, 1);
       dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen);
-      LocalFree((HLOCAL) szData);
+      LocalFree(szData);
     }
     else
     {
@@ -136,7 +136,7 @@ static DWORD query_reg_path (HKEY hKey, LPCWSTR lpszValue,
       dwExpDataLen = ExpandEnvironmentStringsW(szData, pvData, MAX_PATH );
       if (dwExpDataLen > MAX_PATH) dwRet = ERROR_MORE_DATA;
       dwUnExpDataLen = max(nBytesToAlloc, dwExpDataLen);
-      LocalFree((HLOCAL) szData);
+      LocalFree(szData);
     }
   }
 
@@ -411,7 +411,7 @@ static void UXTHEME_RestoreSystemMetrics(void)
 		&type, (LPBYTE)&ncm, &count) == ERROR_SUCCESS)
 	    {
 		SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, 
-		    count, (LPVOID)&ncm, SPIF_UPDATEINIFILE);
+                    count, &ncm, SPIF_UPDATEINIFILE);
 	    }
 	    
             count = sizeof(iconTitleFont);
@@ -420,7 +420,7 @@ static void UXTHEME_RestoreSystemMetrics(void)
 		&type, (LPBYTE)&iconTitleFont, &count) == ERROR_SUCCESS)
 	    {
 		SystemParametersInfoW (SPI_SETICONTITLELOGFONT, 
-		    count, (LPVOID)&iconTitleFont, SPIF_UPDATEINIFILE);
+                    count, &iconTitleFont, SPIF_UPDATEINIFILE);
 	    }
 	}
       
@@ -453,17 +453,15 @@ static void UXTHEME_SaveSystemMetrics(void)
     
     memset (&ncm, 0, sizeof (ncm));
     ncm.cbSize = sizeof (ncm);
-    SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, 
-	sizeof (ncm), (LPVOID)&ncm, 0);
-    SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, 
-	sizeof (ncm), (LPVOID)&ncm, SPIF_UPDATEINIFILE);
+    SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (ncm), &ncm, 0);
+    SystemParametersInfoW (SPI_SETNONCLIENTMETRICS, sizeof (ncm), &ncm,
+        SPIF_UPDATEINIFILE);
 
     memset (&iconTitleFont, 0, sizeof (iconTitleFont));
-    SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 
-	sizeof (iconTitleFont), (LPVOID)&iconTitleFont, 0);
-    SystemParametersInfoW (SPI_SETICONTITLELOGFONT, 
-	sizeof (iconTitleFont), (LPVOID)&iconTitleFont, 
-	SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
+    SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (iconTitleFont),
+        &iconTitleFont, 0);
+    SystemParametersInfoW (SPI_SETICONTITLELOGFONT, sizeof (iconTitleFont),
+        &iconTitleFont, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE);
 }
 
 /***********************************************************************