comctl32: more cast-qual warnings fixes (2 of 2)

[Andrew Talbot]

Changelog:
    comctl32: cast-qual warning fix.

diff -urN a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
--- a/dlls/comctl32/propsheet.c	2006-10-20 18:07:57.000000000 +0100
+++ b/dlls/comctl32/propsheet.c	2006-10-21 14:58:31.000000000 +0100
@@ -275,14 +275,14 @@
  *
  * Convert ASCII to Unicode since all data is saved as Unicode.
  */
-static void PROPSHEET_AtoW(LPCWSTR *tostr, LPCSTR frstr)
+static void PROPSHEET_AtoW(LPWSTR *tostr, LPCSTR frstr)
 {
     INT len;
 
     TRACE("<%s>\n", frstr);
     len = MultiByteToWideChar(CP_ACP, 0, frstr, -1, 0, 0);
     *tostr = Alloc(len * sizeof(WCHAR));
-    MultiByteToWideChar(CP_ACP, 0, frstr, -1, (LPWSTR)*tostr, len);
+    MultiByteToWideChar(CP_ACP, 0, frstr, -1, *tostr, len);
 }
 
 /******************************************************************************
@@ -2948,14 +2948,20 @@
 
     if (ppsp->dwFlags & PSP_USEICONID)
     {
+        LPWSTR *p_pszIcon;
+
+        p_pszIcon = (LPWSTR *)((char *)ppsp + offsetof(PROPSHEETPAGEW, u2.pszIcon));
         if (HIWORD( ppsp->u2.pszIcon ))
-            PROPSHEET_AtoW(&ppsp->u2.pszIcon, lpPropSheetPage->u2.pszIcon);
+            PROPSHEET_AtoW(p_pszIcon, lpPropSheetPage->u2.pszIcon);
     }
 
     if (ppsp->dwFlags & PSP_USETITLE)
     {
+        LPWSTR *p_pszTitle;
+
+        p_pszTitle = (LPWSTR *)((char *)ppsp + offsetof(PROPSHEETPAGEW, pszTitle));
         if (HIWORD( ppsp->pszTitle ))
-            PROPSHEET_AtoW( &ppsp->pszTitle, lpPropSheetPage->pszTitle );
+            PROPSHEET_AtoW(p_pszTitle, lpPropSheetPage->pszTitle);
         else
             ppsp->pszTitle = load_string( ppsp->hInstance, ppsp->pszTitle );
     }
@@ -2967,8 +2973,11 @@
 
     if (ppsp->dwFlags & PSP_USEHEADERTITLE)
     {
+        LPWSTR *p_pszHeaderTitle;
+
+        p_pszHeaderTitle = (LPWSTR *)((char *)ppsp + offsetof(PROPSHEETPAGEW, pszHeaderTitle));
         if (HIWORD( ppsp->pszHeaderTitle ))
-            PROPSHEET_AtoW(&ppsp->pszHeaderTitle, lpPropSheetPage->pszHeaderTitle);
+            PROPSHEET_AtoW(p_pszHeaderTitle, lpPropSheetPage->pszHeaderTitle);
         else
             ppsp->pszHeaderTitle = load_string( ppsp->hInstance, ppsp->pszHeaderTitle );
     }
@@ -2977,8 +2986,11 @@
 
     if (ppsp->dwFlags & PSP_USEHEADERSUBTITLE)
     {
+        LPWSTR *p_pszHeaderSubTitle;
+
+        p_pszHeaderSubTitle = (LPWSTR *)((char *)ppsp + offsetof(PROPSHEETPAGEW, pszHeaderSubTitle));
         if (HIWORD( ppsp->pszHeaderSubTitle ))
-            PROPSHEET_AtoW(&ppsp->pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle);
+            PROPSHEET_AtoW(p_pszHeaderSubTitle, lpPropSheetPage->pszHeaderSubTitle);
         else
             ppsp->pszHeaderSubTitle = load_string( ppsp->hInstance, ppsp->pszHeaderSubTitle );
     }