Author: cwittich
Date: Fri Jan 25 20:36:55 2008
New Revision: 32001
URL:
http://svn.reactos.org/svn/reactos?rev=32001&view=rev
Log:
fix warnings
don't try to cast away const
Modified:
trunk/reactos/base/applications/charmap/charmap.c
trunk/reactos/base/applications/charmap/map.c
Modified: trunk/reactos/base/applications/charmap/charmap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/charmap.c (original)
+++ trunk/reactos/base/applications/charmap/charmap.c Fri Jan 25 20:36:55 2008
@@ -190,6 +190,7 @@
{
static HICON hSmIcon;
static HICON hBgIcon;
+ LPWSTR lpAboutText = NULL;
switch(Message)
{
@@ -229,16 +230,13 @@
IDC_FONTCOMBO));
ChangeMapFont(hDlg);
-
hSysMenu = GetSystemMenu(hDlg,
FALSE);
if (hSysMenu != NULL)
{
- LPCWSTR lpAboutText = NULL;
-
if (LoadStringW(hInstance,
IDS_ABOUT,
- (LPWSTR)&lpAboutText,
+ lpAboutText,
0))
{
AppendMenuW(hSysMenu,
Modified: trunk/reactos/base/applications/charmap/map.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/…
==============================================================================
--- trunk/reactos/base/applications/charmap/map.c (original)
+++ trunk/reactos/base/applications/charmap/map.c Fri Jan 25 20:36:55 2008
@@ -111,13 +111,15 @@
CreateLargeCell(PMAP infoPtr)
{
RECT rLarge;
+ POINT p;
CopyRect(&rLarge,
&infoPtr->pActiveCell->CellExt);
+ CopyMemory(&p, &rLarge, sizeof(POINT));
MapWindowPoints(infoPtr->hMapWnd,
infoPtr->hParent,
- (LPPOINT)&rLarge,
+ &p,
2);
InflateRect(&rLarge,
@@ -147,13 +149,15 @@
MoveLargeCell(PMAP infoPtr)
{
RECT rLarge;
+ POINT p;
CopyRect(&rLarge,
&infoPtr->pActiveCell->CellExt);
+ CopyMemory(&p, &rLarge, sizeof(POINT));
MapWindowPoints(infoPtr->hMapWnd,
infoPtr->hParent,
- (LPPOINT)&rLarge,
+ &p,
2);
InflateRect(&rLarge,