From 0c95e110387aa948469c2d2f3ba6d23101ae770c Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 8 Jul 2006 19:00:35 +0000 Subject: [PATCH] -fixed some msvc /W4 warnings and errors svn path=/trunk/; revision=22938 --- reactos/dll/cpl/access/access.c | 6 +++--- reactos/dll/cpl/access/display.c | 4 ++-- reactos/dll/cpl/access/general.c | 2 ++ reactos/dll/cpl/access/keyboard.c | 4 ++-- reactos/dll/cpl/access/mouse.c | 4 ++-- reactos/dll/cpl/access/sound.c | 4 ++-- reactos/dll/cpl/appwiz/appwiz.c | 18 +++++++++--------- reactos/dll/cpl/desk/appearance.c | 6 +++--- reactos/dll/cpl/desk/background.c | 4 ++-- reactos/dll/cpl/desk/desk.c | 9 +++++---- reactos/dll/cpl/desk/settings.c | 10 +++++----- reactos/dll/cpl/hdwwiz/hdwwiz.c | 8 ++++---- reactos/dll/cpl/intl_new/En.rc | 26 +++++++++++++------------- reactos/dll/cpl/intl_new/extra.c | 5 +++-- reactos/dll/cpl/intl_new/intl.c | 6 ++++++ reactos/dll/cpl/intl_new/locale.c | 24 ++++++++++++------------ reactos/dll/cpl/main/keyboard.c | 11 +++++++++++ reactos/dll/cpl/main/main.c | 2 ++ reactos/dll/cpl/main/mouse.c | 17 ++++++++++++++--- reactos/dll/cpl/ncpa/ncpa.c | 16 +++++++++++----- reactos/dll/cpl/powercfg/alarms.c | 4 ++-- reactos/dll/cpl/powercfg/powercfg.c | 12 ++++++------ reactos/dll/cpl/powercfg/powershemes.c | 8 ++++---- reactos/dll/cpl/sysdm/advanced.c | 2 +- reactos/dll/cpl/sysdm/computer.c | 6 +++++- reactos/dll/cpl/sysdm/general.c | 4 ++-- reactos/dll/cpl/sysdm/hardware.c | 2 +- reactos/dll/cpl/sysdm/sysdm.c | 6 +++--- reactos/dll/cpl/sysdm/userprofile.c | 5 +++-- reactos/dll/cpl/sysdm/virtmem.c | 2 +- 30 files changed, 141 insertions(+), 96 deletions(-) diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c index 689ac45b996..aebad19a8c5 100644 --- a/reactos/dll/cpl/access/access.c +++ b/reactos/dll/cpl/access/access.c @@ -52,7 +52,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -118,7 +118,7 @@ CPlApplet( LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); switch(uMsg) { @@ -155,7 +155,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/access/display.c b/reactos/dll/cpl/access/display.c index 9708b04b171..99cd40914aa 100644 --- a/reactos/dll/cpl/access/display.c +++ b/reactos/dll/cpl/access/display.c @@ -22,8 +22,8 @@ DisplayPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/general.c b/reactos/dll/cpl/access/general.c index 6ed4596e291..bdc9cb9d1d7 100644 --- a/reactos/dll/cpl/access/general.c +++ b/reactos/dll/cpl/access/general.c @@ -22,6 +22,8 @@ GeneralPageProc( LPARAM lParam ) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c index 5e6c505ab77..c43a5d6d1a2 100644 --- a/reactos/dll/cpl/access/keyboard.c +++ b/reactos/dll/cpl/access/keyboard.c @@ -22,8 +22,8 @@ KeyboardPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c index 61a4e6ad715..769257ac933 100644 --- a/reactos/dll/cpl/access/mouse.c +++ b/reactos/dll/cpl/access/mouse.c @@ -22,8 +22,8 @@ MousePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c index 34d50ca4646..dad0dfcc87d 100644 --- a/reactos/dll/cpl/access/sound.c +++ b/reactos/dll/cpl/access/sound.c @@ -22,8 +22,8 @@ SoundPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/appwiz/appwiz.c b/reactos/dll/cpl/appwiz/appwiz.c index 4fda4894b91..7d59d08173f 100644 --- a/reactos/dll/cpl/appwiz/appwiz.c +++ b/reactos/dll/cpl/appwiz/appwiz.c @@ -64,7 +64,7 @@ CallUninstall(HWND hwndDlg) TCHAR pszUninstallString[MAX_PATH]; DWORD dwSize; - nIndex = SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); + nIndex = (int) SendDlgItemMessage(hwndDlg, IDC_SOFTWARELIST, LB_GETCURSEL, 0, 0); if (nIndex == -1) { MessageBox(hwndDlg, @@ -173,12 +173,12 @@ static void FillSoftwareList(HWND hwndDlg) { if ((!bIsUpdate) && (!bIsSystemComponent)) { - index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); } else if (bIsUpdate && bShowUpdates) { - index = SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); + index = (ULONG) SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_ADDSTRING,0,(LPARAM)pszDisplayName); SendDlgItemMessage(hwndDlg,IDC_SOFTWARELIST,LB_SETITEMDATA,index,(LPARAM)hSubKey); } } @@ -195,7 +195,7 @@ static void FillSoftwareList(HWND hwndDlg) static INT_PTR CALLBACK InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: @@ -235,9 +235,9 @@ InstallPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) static INT_PTR CALLBACK RosPageProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -297,7 +297,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) CPLINFO *CPlInfo; DWORD i; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); i = (DWORD)lParam1; switch(uMsg) @@ -328,7 +328,7 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 3fda33dc132..276a1c9f73f 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -15,9 +15,9 @@ INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c index 11cf35a708f..6cfa90232f3 100644 --- a/reactos/dll/cpl/desk/background.c +++ b/reactos/dll/cpl/desk/background.c @@ -302,8 +302,8 @@ void OnColorButton() BOOL CheckListBoxFilename(HWND list, TCHAR *filename) { - UNREFERENCED_PARAMETER(filename) - UNREFERENCED_PARAMETER(list) + UNREFERENCED_PARAMETER(filename); + UNREFERENCED_PARAMETER(list); return FALSE; } diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c index 45f3b6c27d7..b40c6612fa5 100644 --- a/reactos/dll/cpl/desk/desk.c +++ b/reactos/dll/cpl/desk/desk.c @@ -49,10 +49,10 @@ LONG APIENTRY DisplayApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) PROPSHEETHEADER psh; TCHAR Caption[1024]; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(hwnd) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -114,6 +114,7 @@ LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c index 8f1632a2f78..44048d20002 100644 --- a/reactos/dll/cpl/desk/settings.c +++ b/reactos/dll/cpl/desk/settings.c @@ -244,10 +244,10 @@ OnDisplayDeviceChanged(IN HWND hwndDlg, IN PDISPLAY_DEVICE_ENTRY pDeviceEntry) TCHAR Buffer[64]; if (LoadString(hApplet, (2900 + Current->dmBitsPerPel), Buffer, sizeof(Buffer) / sizeof(TCHAR))) { - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); if (index == (DWORD)CB_ERR) { - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_ADDSTRING, 0, (LPARAM)Buffer); SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_SETITEMDATA, index, Current->dmBitsPerPel); } } @@ -322,8 +322,8 @@ OnBPPChanged(IN HWND hwndDlg) TCHAR Buffer[64]; SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, WM_GETTEXT, (WPARAM)(sizeof(Buffer) / sizeof(TCHAR)), (LPARAM)Buffer); - index = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); - dmNewBitsPerPel = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); + index = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer); + dmNewBitsPerPel = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_BPP, CB_GETITEMDATA, index, 0); /* find if new parameters are valid */ Current = CurrentDisplayDevice->CurrentSettings; @@ -518,7 +518,7 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar case TB_BOTTOM: case TB_ENDTRACK: { - DWORD newPosition = SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); + DWORD newPosition = (DWORD) SendDlgItemMessage(hwndDlg, IDC_SETTINGS_RESOLUTION, TBM_GETPOS, 0, 0); OnResolutionChanged(hwndDlg, newPosition); } } diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c index f8d0ee2320f..ea304dd7ec6 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.c +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.c @@ -53,9 +53,9 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) BOOL ret; LONG rc; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(uMsg) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); hNewDev = LoadLibrary(_T("newdev.dll")); if (!hNewDev) @@ -140,7 +140,7 @@ CPlApplet(HWND hwndCpl, BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/intl_new/En.rc b/reactos/dll/cpl/intl_new/En.rc index ead119f7fde..4191e4f1126 100644 --- a/reactos/dll/cpl/intl_new/En.rc +++ b/reactos/dll/cpl/intl_new/En.rc @@ -6,24 +6,24 @@ CAPTION "Regional options" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Regional options and standards", IDC_GROUPBOX, 5, 3, 242, 165 - LTEXT "This option influences a way of display by some programs of numbers, sums of money, dates and time.", IDC_STATIC, 14, 15, 230, 16 - LTEXT "&Choose an element from the list or press the button ""Setup"" to set formats independently:", IDC_STATIC, 14, 36, 230, 16 + LTEXT "This option influences a way of display by some programs of numbers, sums of money, dates and time.", -1, 14, 15, 230, 16 + LTEXT "&Choose an element from the list or press the button ""Setup"" to set formats independently:", -1, 14, 36, 230, 16 COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT PUSHBUTTON "Se&tup...", IDC_SETUP_BUTTON, 187, 54, 52, 13 - LTEXT "Samples", IDC_STATIC, 14, 73, 70, 10 - LTEXT "Number:", IDC_STATIC, 16, 86, 48, 10 - LTEXT "Monetary:", IDC_STATIC, 16, 101, 48, 10 - LTEXT "Time:", IDC_STATIC, 16, 116, 48, 10 - LTEXT "Short date:", IDC_STATIC, 16, 131, 48, 10 - LTEXT "Long date:", IDC_STATIC, 16, 146, 48, 10 + LTEXT "Samples", -1, 14, 73, 70, 10 + LTEXT "Number:", -1, 16, 86, 48, 10 + LTEXT "Monetary:", -1, 16, 101, 48, 10 + LTEXT "Time:", -1, 16, 116, 48, 10 + LTEXT "Short date:", -1, 16, 131, 48, 10 + LTEXT "Long date:", -1, 16, 146, 48, 10 EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Geographic location", IDC_GROUPBOX, 5, 172, 242, 56 - LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", IDC_STATIC, 14, 184, 225, 24 + GROUPBOX "Geographic location", -1, 5, 172, 242, 56 + LTEXT "Set up your location that services could supply you with the local information, for example, news and reports of weather", -1, 14, 184, 225, 24 COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT END @@ -36,9 +36,9 @@ BEGIN GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33 - LTEXT "Select language...", IDC_STATIC, 14, 55, 223, 18 - GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 + LTEXT "This option...", -1, 14, 18, 223, 33 + LTEXT "Select language...", -1, 14, 55, 223, 18 + GROUPBOX "Transformation tables codepages", -1, 5, 101, 242, 88 END STRINGTABLE diff --git a/reactos/dll/cpl/intl_new/extra.c b/reactos/dll/cpl/intl_new/extra.c index 20dc3c888db..73a6031fbb2 100644 --- a/reactos/dll/cpl/intl_new/extra.c +++ b/reactos/dll/cpl/intl_new/extra.c @@ -33,7 +33,7 @@ LanguagesEnumProc(LPTSTR lpLanguage) Lcid = wcstoul(lpLanguage, NULL, 16); GetLocaleInfo(Lcid, LOCALE_SLANGUAGE, Lang, sizeof(Lang)); - Index = SendMessageW(hLanguageList, + Index = (int) SendMessageW(hLanguageList, CB_ADDSTRING, 0, (LPARAM)Lang); @@ -65,7 +65,7 @@ CreateLanguagesList(HWND hWnd) SendMessageW(hLanguageList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)LangSel); } @@ -75,6 +75,7 @@ INT_PTR CALLBACK ExtraOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/intl_new/intl.c b/reactos/dll/cpl/intl_new/intl.c index 8ef0b3b6424..2f30236e48b 100644 --- a/reactos/dll/cpl/intl_new/intl.c +++ b/reactos/dll/cpl/intl_new/intl.c @@ -54,6 +54,11 @@ Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) PROPSHEETHEADER psh; TCHAR Caption[MAX_STR_SIZE]; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); @@ -117,6 +122,7 @@ STDCALL DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/intl_new/locale.c b/reactos/dll/cpl/intl_new/locale.c index b24d9c8a27c..bbbca257f05 100644 --- a/reactos/dll/cpl/intl_new/locale.c +++ b/reactos/dll/cpl/intl_new/locale.c @@ -34,7 +34,7 @@ LocationsEnumProc(GEOID gId) int index; GetGeoInfo(gId, GEO_FRIENDLYNAME, loc, MAX_FMT_SIZE, LANG_SYSTEM_DEFAULT); - index = SendMessageW(hGeoList, + index = (int) SendMessageW(hGeoList, CB_ADDSTRING, 0, (LPARAM)loc); @@ -69,7 +69,7 @@ CreateLocationsList(HWND hWnd) SendMessageW(hGeoList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)loc); } @@ -85,14 +85,14 @@ LocalesEnumProc(LPTSTR lpLocale) lcid = wcstoul(lpLocale, NULL, 16); GetLocaleInfo(lcid, LOCALE_SLANGUAGE, lang, sizeof(lang)); - index = SendMessageW(hLocaleList, + index = (int) SendMessageW(hLocaleList, CB_ADDSTRING, 0, (LPARAM)lang); SendMessageW(hLocaleList, CB_SETITEMDATA, - index, + (WPARAM) index, (LPARAM)lcid); return TRUE; @@ -117,7 +117,7 @@ CreateLanguagesList(HWND hWnd) SendMessageW(hLocaleList, CB_SELECTSTRING, - -1, + (WPARAM) -1, (LPARAM)langSel); } @@ -208,7 +208,7 @@ SetNewLocale(LCID LcidLocale) } wsprintf(Value, L"%04X", (DWORD)LcidLocale); - ValueSize = (wcslen(Value) + 1) * sizeof(WCHAR); + ValueSize = (DWORD) (wcslen(Value) + 1) * sizeof(WCHAR); RegSetValueExW(LocaleKey, L"Locale", 0, REG_SZ, (BYTE *)Value, ValueSize); RegCloseKey(LocaleKey); @@ -246,9 +246,9 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (HIWORD(wParam) == CBN_SELCHANGE || HIWORD(wParam) == CBN_EDITCHANGE) { - CurrSel = SendMessageW((HWND)lParam, CB_GETCURSEL, + CurrSel = (int) SendMessageW((HWND)lParam, CB_GETCURSEL, 0, 0); - NewLCID = SendMessageW((HWND)lParam, CB_GETITEMDATA, + NewLCID = (LCID) SendMessageW((HWND)lParam, CB_GETITEMDATA, CurrSel, 0); UpdateLocaleSample(hwndDlg, MAKELCID(NewLCID, SORT_DEFAULT)); @@ -273,20 +273,20 @@ RegOptsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if (lpnm->code == (UINT)PSN_APPLY) { /* Set locale */ - CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CB_GETCURSEL, 0, 0); - NewLCID = SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), + NewLCID = (LCID) SendMessageW(GetDlgItem(hwndDlg, IDC_SETREG_COMBO), CB_GETITEMDATA, CurrSel, 0); if (NewLCID == (LCID)CB_ERR) break; SetNewLocale(MAKELCID(NewLCID, SORT_DEFAULT)); /* Set geo location */ - CurrSel = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + CurrSel = (int) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETCURSEL, 0, 0); - NewLocation = SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), + NewLocation = (GEOID) SendMessageW(GetDlgItem(hwndDlg, IDC_LOCATION_COMBO), CB_GETITEMDATA, CurrSel, 0); diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c index ac4ae5c8394..4e87974d650 100644 --- a/reactos/dll/cpl/main/keyboard.c +++ b/reactos/dll/cpl/main/keyboard.c @@ -41,6 +41,9 @@ KeybSpeedProc(IN HWND hwndDlg, IN WPARAM wParam, IN LPARAM lParam) { + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: @@ -61,6 +64,9 @@ KeybHardwareProc(IN HWND hwndDlg, GUID Guids[1]; Guids[0] = GUID_DEVCLASS_KEYBOARD; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { case WM_INITDIALOG: @@ -87,6 +93,11 @@ KeyboardApplet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) PROPSHEETHEADER psh; TCHAR Caption[256]; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + LoadString(hApplet, IDS_CPLNAME_2, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); diff --git a/reactos/dll/cpl/main/main.c b/reactos/dll/cpl/main/main.c index 074cc0800ac..3136b04591d 100644 --- a/reactos/dll/cpl/main/main.c +++ b/reactos/dll/cpl/main/main.c @@ -106,6 +106,8 @@ DllMain(HINSTANCE hinstDLL, LPVOID lpReserved) { INITCOMMONCONTROLSEX InitControls; + UNREFERENCED_PARAMETER(lpReserved); + switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c index de0de0c6ad1..3fc0c71a453 100644 --- a/reactos/dll/cpl/main/mouse.c +++ b/reactos/dll/cpl/main/mouse.c @@ -106,6 +106,9 @@ MouseHardwareProc(IN HWND hwndDlg, GUID Guids[1]; Guids[0] = GUID_DEVCLASS_MOUSE; + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { case WM_INITDIALOG: @@ -166,6 +169,8 @@ ClickLockProc(IN HWND hwndDlg, { HWND hDlgCtrl; int pos; + UNREFERENCED_PARAMETER(lParam); + switch(uMsg) { case WM_INITDIALOG: @@ -181,7 +186,7 @@ ClickLockProc(IN HWND hwndDlg, if (LOWORD(wParam) == IDOK) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_CLICK_LOCK); - g_ClickLockTime = (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; + g_ClickLockTime = (DWORD) (SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) * 200) + 200; EndDialog(hwndDlg, TRUE); } else if (LOWORD(wParam) == IDCANCEL) @@ -610,6 +615,7 @@ SaveSchemeProc(IN HWND hwndDlg, IN LPARAM lParam) { HWND hDlgCtrl; + UNREFERENCED_PARAMETER(lParam); switch(uMsg) { @@ -975,7 +981,7 @@ OptionProc(IN HWND hwndDlg, { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); - g_MouseTrails = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } break; } @@ -1028,7 +1034,7 @@ OptionProc(IN HWND hwndDlg, else lResult = 0; - SystemParametersInfo(SPI_SETMOUSETRAILS, lResult, 0, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); //FIXME //pointer precision @@ -1168,6 +1174,11 @@ MouseApplet(HWND hwnd, UINT uMsg, LONG lParam1, LONG lParam2) PROPSHEETHEADER psh; TCHAR Caption[256]; + UNREFERENCED_PARAMETER(lParam1); + UNREFERENCED_PARAMETER(lParam2); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(hwnd); + LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c index fc520ca3798..03a2de7b100 100644 --- a/reactos/dll/cpl/ncpa/ncpa.c +++ b/reactos/dll/cpl/ncpa/ncpa.c @@ -169,6 +169,9 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) TCHAR tpszNotifyObjectCLSID[MAX_PATH]; TCHAR *tpszSubKeyCopy; int nIndex; + + UNREFERENCED_PARAMETER(hBaseKey); + // CLSID CLSID_NotifObj; // IUnknown *pUnk = NULL; // INetCfgComponentControl *pNetCfg; @@ -224,7 +227,7 @@ NICPropertyProtocolCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) } RegCloseKey(hKey); - nIndex = SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_ADDSTRING,0,(LPARAM)tpszDescription); tpszSubKeyCopy = _tcsdup(tpszSubKey); SendDlgItemMessage(hwndDlg,IDC_COMPONENTSLIST,LB_SETITEMDATA,nIndex,(LPARAM)tpszSubKeyCopy); } @@ -309,7 +312,7 @@ NICPropertyPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) HKEY hNDIKey; DWORD dwType,dwSize; HWND hListBox = GetDlgItem(hwndDlg,IDC_COMPONENTSLIST); - int iListBoxIndex = SendMessage(hListBox,LB_GETCURSEL,0,0); + int iListBoxIndex = (int) SendMessage(hListBox,LB_GETCURSEL,0,0); if(iListBoxIndex != LB_ERR) tpszSubKey = (TCHAR*)SendMessage(hListBox,LB_GETITEMDATA,iListBoxIndex,0); if(!tpszSubKey) @@ -572,7 +575,7 @@ NetAdapterCallback(void *pCookie,HKEY hBaseKey,TCHAR *tpszSubKey) // How is this done properly ? - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_ADDSTRING,0,(LPARAM)tpszDisplayName); SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_SETITEMDATA,nIndex,(LPARAM)ptpszCfgInstanceID); RegCloseKey(hKey); } @@ -629,14 +632,14 @@ NetworkPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { case IDC_NETCARDLIST: if(HIWORD(wParam)==LBN_DBLCLK) { - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); if(nIndex!=-1) DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); } break; case IDC_PROPERTIES: - nIndex = SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); + nIndex = (int) SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETCURSEL,0,0); if(nIndex!=-1) DisplayNICStatus(hwndDlg,(TCHAR*)SendDlgItemMessage(hwndDlg,IDC_NETCARDLIST,LB_GETITEMDATA,nIndex,0)); break; @@ -679,6 +682,7 @@ DisplayApplet(VOID) LONG CALLBACK CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { + UNREFERENCED_PARAMETER(hwndCPl); switch (uMsg) { case CPL_INIT: @@ -714,6 +718,8 @@ CPlApplet(HWND hwndCPl, UINT uMsg, LPARAM lParam1, LPARAM lParam2) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID lpvReserved) { + UNREFERENCED_PARAMETER(lpvReserved); + switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/powercfg/alarms.c b/reactos/dll/cpl/powercfg/alarms.c index 65eafd84c4c..4c52b731e08 100644 --- a/reactos/dll/cpl/powercfg/alarms.c +++ b/reactos/dll/cpl/powercfg/alarms.c @@ -31,8 +31,8 @@ alarmsProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c index fa82fe20804..8ac977c0268 100644 --- a/reactos/dll/cpl/powercfg/powercfg.c +++ b/reactos/dll/cpl/powercfg/powercfg.c @@ -55,7 +55,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -90,10 +90,10 @@ Applet1(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam) SYSTEM_POWER_CAPABILITIES spc; INT i=0; - UNREFERENCED_PARAMETER(hwnd) - UNREFERENCED_PARAMETER(uMsg) - UNREFERENCED_PARAMETER(wParam) - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(hwnd); + UNREFERENCED_PARAMETER(uMsg); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); memset(Caption, 0x0, sizeof(Caption)); LoadString(hApplet, IDS_CPLNAME_1, Caption, sizeof(Caption) / sizeof(TCHAR)); @@ -171,7 +171,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(lpvReserved) + UNREFERENCED_PARAMETER(lpvReserved); switch(dwReason) { case DLL_PROCESS_ATTACH: diff --git a/reactos/dll/cpl/powercfg/powershemes.c b/reactos/dll/cpl/powercfg/powershemes.c index 49a2bf4417a..cf129c18d29 100644 --- a/reactos/dll/cpl/powercfg/powershemes.c +++ b/reactos/dll/cpl/powercfg/powershemes.c @@ -225,10 +225,10 @@ BOOLEAN CALLBACK callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName { int index; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(sDesc) - UNREFERENCED_PARAMETER(dwDesc) - UNREFERENCED_PARAMETER(dwName) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(sDesc); + UNREFERENCED_PARAMETER(dwDesc); + UNREFERENCED_PARAMETER(dwName); if (ValidatePowerPolicies(0,pp)) { diff --git a/reactos/dll/cpl/sysdm/advanced.c b/reactos/dll/cpl/sysdm/advanced.c index 7a4f026b479..20806dbce12 100644 --- a/reactos/dll/cpl/sysdm/advanced.c +++ b/reactos/dll/cpl/sysdm/advanced.c @@ -40,7 +40,7 @@ AdvancedPageProc( WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/computer.c b/reactos/dll/cpl/sysdm/computer.c index a54cbb27530..220810a5333 100644 --- a/reactos/dll/cpl/sysdm/computer.c +++ b/reactos/dll/cpl/sysdm/computer.c @@ -40,6 +40,11 @@ ComputerPageProc( LPARAM lParam ) { + LPWKSTA_INFO_101 wki; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + switch(uMsg) { case WM_INITDIALOG: @@ -51,7 +56,6 @@ ComputerPageProc( { SendDlgItemMessage(hwndDlg,IDC_COMPUTERNAME,WM_SETTEXT,0,(LPARAM)ComputerName); } - LPWKSTA_INFO_101 wki; if (NetWkstaGetInfo(NULL,101,(LPBYTE*)&wki) == NERR_Success) { SendDlgItemMessage(hwndDlg,IDC_WORKGROUPDOMAIN_NAME,WM_SETTEXT,0,(LPARAM)wki->wki101_langroup); diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c index c15382d4496..686d0702a0a 100644 --- a/reactos/dll/cpl/sysdm/general.c +++ b/reactos/dll/cpl/sysdm/general.c @@ -98,8 +98,8 @@ GeneralPageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch(uMsg) { diff --git a/reactos/dll/cpl/sysdm/hardware.c b/reactos/dll/cpl/sysdm/hardware.c index 4a1eeeae5e3..349afdc79c6 100644 --- a/reactos/dll/cpl/sysdm/hardware.c +++ b/reactos/dll/cpl/sysdm/hardware.c @@ -63,7 +63,7 @@ HardwarePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(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 b156cc3e6d4..f17b02fd585 100644 --- a/reactos/dll/cpl/sysdm/sysdm.c +++ b/reactos/dll/cpl/sysdm/sysdm.c @@ -64,7 +64,7 @@ PropSheetProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(hwndDlg) + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case PSCB_BUTTONPRESSED: @@ -130,7 +130,7 @@ CPlApplet( LPARAM lParam2) { int i = (int)lParam1; - UNREFERENCED_PARAMETER(hwndCPl) + UNREFERENCED_PARAMETER(hwndCPl); switch(uMsg) { @@ -167,7 +167,7 @@ DllMain( DWORD dwReason, LPVOID lpvReserved) { - UNREFERENCED_PARAMETER(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 920980b4b9e..3c2ebe9b36c 100644 --- a/reactos/dll/cpl/sysdm/userprofile.c +++ b/reactos/dll/cpl/sysdm/userprofile.c @@ -39,8 +39,9 @@ UserProfilePageProc( LPARAM lParam ) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(hwndDlg); switch(uMsg) { case WM_INITDIALOG: diff --git a/reactos/dll/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c index 4aefd68c014..92fb7c9f9c7 100644 --- a/reactos/dll/cpl/sysdm/virtmem.c +++ b/reactos/dll/cpl/sysdm/virtmem.c @@ -14,7 +14,7 @@ VirtMemDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) + UNREFERENCED_PARAMETER(lParam); switch (uMsg) { case WM_INITDIALOG: