fix warnings

don't try to cast away const

svn path=/trunk/; revision=32001

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index f737318..22c966e 100644 (file)
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -190,6 +190,7 @@ DlgProc(HWND hDlg,
 {\r
     static HICON hSmIcon;\r
     static HICON hBgIcon;\r
+    LPWSTR lpAboutText = NULL;\r
 \r
     switch(Message)\r
     {\r
@@ -229,16 +230,13 @@ DlgProc(HWND hDlg,
                                               IDC_FONTCOMBO));\r
 \r
             ChangeMapFont(hDlg);\r
-\r
             hSysMenu = GetSystemMenu(hDlg,\r
                                      FALSE);\r
             if (hSysMenu != NULL)\r
             {\r
-                LPCWSTR lpAboutText = NULL;\r
-\r
                 if (LoadStringW(hInstance,\r
                                 IDS_ABOUT,\r
-                                (LPWSTR)&lpAboutText,\r
+                                lpAboutText,\r
                                 0))\r
                 {\r
                     AppendMenuW(hSysMenu,\r

diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index 358e535..8d06967 100644 (file)
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -111,13 +111,15 @@ static BOOL
 CreateLargeCell(PMAP infoPtr)\r
 {\r
     RECT rLarge;\r
+    POINT p;\r
 \r
     CopyRect(&rLarge,\r
              &infoPtr->pActiveCell->CellExt);\r
+    CopyMemory(&p, &rLarge, sizeof(POINT));\r
 \r
     MapWindowPoints(infoPtr->hMapWnd,\r
                     infoPtr->hParent,\r
-                    (LPPOINT)&rLarge,\r
+                    &p,\r
                     2);\r
 \r
     InflateRect(&rLarge,\r
@@ -147,13 +149,15 @@ static VOID
 MoveLargeCell(PMAP infoPtr)\r
 {\r
     RECT rLarge;\r
+    POINT p;\r
 \r
     CopyRect(&rLarge,\r
              &infoPtr->pActiveCell->CellExt);\r
+    CopyMemory(&p, &rLarge, sizeof(POINT));\r
 \r
     MapWindowPoints(infoPtr->hMapWnd,\r
                     infoPtr->hParent,\r
-                    (LPPOINT)&rLarge,\r
+                    &p,\r
                     2);\r
 \r
     InflateRect(&rLarge,\r