Author: cwittich
Date: Tue Mar 4 12:36:27 2008
New Revision: 32558
URL:
http://svn.reactos.org/svn/reactos?rev=3D32558&view=3Drev
Log:
fix some warnings
Modified:
trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Too=
ls/config/options.c?rev=3D32558&r1=3D32557&r2=3D32558&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c (original)
+++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Tue Mar 4 12:36=
:27 2008
@@ -53,8 +53,8 @@
strip =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK=
, 0, 0) =3D=3D BST_CHECKED);
objstate =3D (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GET=
CHECK, 0, 0) =3D=3D BST_CHECKED);
outstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GE=
TCHECK, 0, 0) =3D=3D BST_CHECKED);
- foreground =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETC=
URSEL, 0, 0);
- background =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETC=
URSEL, 0, 0);
+ foreground =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, C=
B_GETCURSEL, 0, 0);
+ background =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, C=
B_GETCURSEL, 0, 0);
GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH);
GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH);
GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH);
@@ -222,8 +222,8 @@
strip =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK=
, 0, 0) =3D=3D BST_CHECKED);
objstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GE=
TCHECK, 0, 0) =3D=3D BST_CHECKED);
outstate =3D (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GE=
TCHECK, 0, 0) =3D=3D BST_CHECKED);
- foreground =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETC=
URSEL, 0, 0);
- background =3D SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_GETC=
URSEL, 0, 0);
+ foreground =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, C=
B_GETCURSEL, 0, 0);
+ background =3D (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, C=
B_GETCURSEL, 0, 0);
GetDlgItemTextW(infoPtr->hwndDlg, ID_LOGDIR, logdir, MAX_PATH);
GetDlgItemTextW(infoPtr->hwndDlg, ID_MGWDIR, mingwpath, MAX_PATH);
GetDlgItemTextW(infoPtr->hwndDlg, ID_OBJDIR, objdir, MAX_PATH);
@@ -268,7 +268,7 @@
if (lParam !=3D ID_MGWDIR)
{
WCHAR BoxMsg[256], BoxTitle[128];
- INT PathLen;
+ size_t PathLen;
LoadString(hInstance, MSG_WARNINGBOX, BoxTitle, 128);
LoadString(hInstance, MSG_INVALIDDIR, BoxMsg, 256);
if (MessageBox(Dlg, BoxMsg, BoxTitle, MB_ICONWARNING | MB_=
YESNO) =3D=3D IDYES)
@@ -354,6 +354,7 @@
{ID_CANCEL, HLP_QUITBUTTON},
};
int i;
+ UINT j;
LOGFONT lf;
WCHAR TempColor[256];
=
@@ -393,9 +394,9 @@
lf.lfItalic, lf.lfUnderline, lf.lfStrikeOut, lf.lfCharSet, lf=
.lfOutPrecision,
lf.lfClipPrecision, lf.lfQuality, lf.lfPitchAndFamily, lf.lfF=
aceName);
=
- for(UINT i =3D 0; i < 16; i++)
- {
- LoadString(hInstance, i, TempColor, 256);
+ for(j =3D 0; j < 16; i++)
+ {
+ LoadString(hInstance, j, TempColor, 256);
SendDlgItemMessageW(Dlg, IDC_BACK, CB_ADDSTRING, 0, (LPARA=
M) TempColor);
SendDlgItemMessageW(Dlg, IDC_FONT, CB_ADDSTRING, 0, (LPARA=
M) TempColor);
}
@@ -523,7 +524,7 @@
hFontOld =3D SelectObject((HDC)wParam, infoPtr->hFont);
SetTextColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dl=
g, IDC_FONT, CB_GETCURSEL, 0, 0)]);
SetBkColor((HDC)wParam, ColorsRGB[SendDlgItemMessageW(Dlg,=
IDC_BACK, CB_GETCURSEL, 0, 0)]);
- return (LONG)CreateSolidBrush(ColorsRGB[SendDlgItemMessage=
W(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]);
+ return (INT_PTR)CreateSolidBrush(ColorsRGB[SendDlgItemMess=
ageW(Dlg, IDC_BACK, CB_GETCURSEL, 0, 0)]);
}
break;
}