From 4de9cf5a44bea15ff2f2452a2c9f1f449a122b7c Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Fri, 23 Jun 2006 21:19:01 +0000 Subject: [PATCH] -fixed some warnings (msvc) svn path=/trunk/; revision=22549 --- reactos/dll/cpl/sysdm/advanced.c | 5 +++-- reactos/dll/cpl/sysdm/environment.c | 4 ++-- reactos/dll/cpl/sysdm/general.c | 3 +++ reactos/dll/cpl/sysdm/hardware.c | 9 +++++---- reactos/dll/cpl/sysdm/sysdm.c | 15 +++++++++------ reactos/dll/cpl/sysdm/userprofile.c | 2 ++ reactos/dll/cpl/sysdm/virtmem.c | 1 + reactos/dll/cpl/timedate/dateandtime.c | 12 ++++++------ reactos/dll/cpl/timedate/timedate.c | 6 +++--- reactos/dll/cpl/timedate/timezone.c | 2 +- 10 files changed, 35 insertions(+), 24 deletions(-) diff --git a/reactos/dll/cpl/sysdm/advanced.c b/reactos/dll/cpl/sysdm/advanced.c index 488ec40ff5c..7a4f026b479 100644 --- a/reactos/dll/cpl/sysdm/advanced.c +++ b/reactos/dll/cpl/sysdm/advanced.c @@ -40,6 +40,7 @@ AdvancedPageProc( WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: @@ -52,14 +53,14 @@ AdvancedPageProc( DialogBox(hApplet, MAKEINTRESOURCE(IDD_VIRTMEM), hwndDlg, - VirtMemDlgProc); + (DLGPROC) VirtMemDlgProc); break; case IDC_ENVVAR: DialogBox(hApplet, MAKEINTRESOURCE(IDD_ENVIRONMENT_VARIABLES), hwndDlg, - EnvironmentDlgProc); + (DLGPROC) EnvironmentDlgProc); break; } break; diff --git a/reactos/dll/cpl/sysdm/environment.c b/reactos/dll/cpl/sysdm/environment.c index ff6ae2f4a64..fd902c7b0cf 100644 --- a/reactos/dll/cpl/sysdm/environment.c +++ b/reactos/dll/cpl/sysdm/environment.c @@ -326,7 +326,7 @@ OnNewVariable(HWND hwndDlg, if (!DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - EditVariableDlgProc, + (DLGPROC) EditVariableDlgProc, (LPARAM)VarData) > 0) { if (VarData->lpName != NULL) @@ -378,7 +378,7 @@ OnEditVariable(HWND hwndDlg, if (DialogBoxParam(hApplet, MAKEINTRESOURCE(IDD_EDIT_VARIABLE), hwndDlg, - EditVariableDlgProc, + (DLGPROC) EditVariableDlgProc, (LPARAM)VarData) > 0) { ListView_SetItemText(hwndListView, iItem, 0, VarData->lpName); diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c index 689f24e79fb..c15382d4496 100644 --- a/reactos/dll/cpl/sysdm/general.c +++ b/reactos/dll/cpl/sysdm/general.c @@ -98,6 +98,9 @@ GeneralPageProc( LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) + switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/hardware.c b/reactos/dll/cpl/sysdm/hardware.c index dbabe0d2ab0..4a1eeeae5e3 100644 --- a/reactos/dll/cpl/sysdm/hardware.c +++ b/reactos/dll/cpl/sysdm/hardware.c @@ -39,11 +39,11 @@ BOOL LaunchDeviceManager(HWND hWndParent) PDEVMGREXEC DevMgrExec; BOOL Ret; - if(!(hDll = LoadLibrary(_TEXT("devmgr.dll")))) - { + hDll = LoadLibrary(_TEXT("devmgr.dll")); + if(!hDll) return FALSE; - } - if(!(DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"))) + DevMgrExec = (PDEVMGREXEC)GetProcAddress(hDll, "DeviceManager_ExecuteW"); + if(!DevMgrExec) { FreeLibrary(hDll); return FALSE; @@ -63,6 +63,7 @@ HardwarePageProc( LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c index 01e0130ab62..b156cc3e6d4 100644 --- a/reactos/dll/cpl/sysdm/sysdm.c +++ b/reactos/dll/cpl/sysdm/sysdm.c @@ -64,6 +64,7 @@ PropSheetProc( LPARAM lParam ) { + UNREFERENCED_PARAMETER(hwndDlg) switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -111,11 +112,11 @@ SystemApplet(VOID) psh.ppsp = psp; psh.pfnCallback = NULL; /* PropSheetProc; */ - InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, GeneralPageProc); - InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, ComputerPageProc); - InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, HardwarePageProc); - InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, UserProfilePageProc); - InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, AdvancedPageProc); + InitPropSheetPage(&psp[0], IDD_PROPPAGEGENERAL, (DLGPROC) GeneralPageProc); + InitPropSheetPage(&psp[1], IDD_PROPPAGECOMPUTER, (DLGPROC) ComputerPageProc); + InitPropSheetPage(&psp[2], IDD_PROPPAGEHARDWARE, (DLGPROC) HardwarePageProc); + InitPropSheetPage(&psp[3], IDD_PROPPAGEUSERPROFILE, (DLGPROC) UserProfilePageProc); + InitPropSheetPage(&psp[4], IDD_PROPPAGEADVANCED, (DLGPROC) AdvancedPageProc); return (LONG)(PropertySheet(&psh) != -1); } @@ -129,7 +130,8 @@ CPlApplet( LPARAM lParam2) { int i = (int)lParam1; - + UNREFERENCED_PARAMETER(hwndCPl) + switch(uMsg) { case CPL_INIT: @@ -165,6 +167,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved) switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/sysdm/userprofile.c b/reactos/dll/cpl/sysdm/userprofile.c index 11a4760d005..920980b4b9e 100644 --- a/reactos/dll/cpl/sysdm/userprofile.c +++ b/reactos/dll/cpl/sysdm/userprofile.c @@ -39,6 +39,8 @@ UserProfilePageProc( LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(wParam) switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c index 40b047d375e..4aefd68c014 100644 --- a/reactos/dll/cpl/sysdm/virtmem.c +++ b/reactos/dll/cpl/sysdm/virtmem.c @@ -14,6 +14,7 @@ VirtMemDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam) switch (uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/timedate/dateandtime.c b/reactos/dll/cpl/timedate/dateandtime.c index 7bd228da7d7..064516d7da3 100644 --- a/reactos/dll/cpl/timedate/dateandtime.c +++ b/reactos/dll/cpl/timedate/dateandtime.c @@ -309,9 +309,9 @@ DateTimePageProc(HWND hwndDlg, { ChangeMonthCalDate(GetDlgItem(hwndDlg, IDC_MONTHCALENDAR), - -1, + (WORD) -1, GetCBSelectedMonth((HWND)lParam), - -1); + (WORD) -1); } } break; @@ -341,14 +341,14 @@ DateTimePageProc(HWND hwndDlg, { short wYear; LPNMUPDOWN updown = (LPNMUPDOWN) lpnm; - wYear = SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); + wYear = (short) SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); ChangeMonthCalDate(GetDlgItem(hwndDlg, IDC_MONTHCALENDAR), - -1, - -1, - wYear + updown->iDelta); + (WORD) -1, + (WORD) -1, + (WORD) (wYear + updown->iDelta)); } break; } diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c index 842672bec1f..f942f243a2d 100644 --- a/reactos/dll/cpl/timedate/timedate.c +++ b/reactos/dll/cpl/timedate/timedate.c @@ -84,9 +84,9 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, DateTimePageProc); - InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, TimeZonePageProc); - InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, InetTimePageProc); + InitPropSheetPage(&psp[0], IDD_DATETIMEPAGE, (DLGPROC) DateTimePageProc); + InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc); + InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc); Ret = (LONG)(PropertySheet(&psh) != -1); diff --git a/reactos/dll/cpl/timedate/timezone.c b/reactos/dll/cpl/timedate/timezone.c index 4404336bb03..21fe01db8ec 100644 --- a/reactos/dll/cpl/timedate/timezone.c +++ b/reactos/dll/cpl/timedate/timezone.c @@ -279,7 +279,7 @@ SetLocalTimeZone(HWND hwnd) DWORD dwIndex; DWORD i; - dwIndex = SendMessage(hwnd, + dwIndex = (DWORD) SendMessage(hwnd, CB_GETCURSEL, 0, 0);