diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp index 1778cee1e15..619db40431b 100644 --- a/reactos/base/applications/games/solitaire/solitaire.cpp +++ b/reactos/base/applications/games/solitaire/solitaire.cpp @@ -567,8 +567,8 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { int ret; - ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION); - if (ret == IDOK) + ret = MessageBox(hwnd, MsgQuit, szAppName, MB_YESNO|MB_ICONQUESTION); + if (ret == IDYES) { WinHelp(hwnd, szHelpPath, HELP_QUIT, 0); DestroyWindow(hwnd); diff --git a/reactos/base/applications/mspaint/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc index efedb049bb8..9f3b1391b3c 100644 --- a/reactos/base/applications/mspaint/rsrc.rc +++ b/reactos/base/applications/mspaint/rsrc.rc @@ -34,6 +34,7 @@ #include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" +#include "lang/sv-SE.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" #include "lang/zh-TW.rc" diff --git a/reactos/dll/cpl/access/access.c b/reactos/dll/cpl/access/access.c index 7b0a85eb160..5b33e1436ae 100644 --- a/reactos/dll/cpl/access/access.c +++ b/reactos/dll/cpl/access/access.c @@ -76,7 +76,7 @@ ReadSettings(PGLOBAL_DATA pGlobalData) pGlobalData->uCaretBlinkTime = GetCaretBlinkTime(); - /* get sound settings */ + /* Get sound settings */ pGlobalData->ssSoundSentry.cbSize = sizeof(SOUNDSENTRY); SystemParametersInfo(SPI_GETSOUNDSENTRY, sizeof(SOUNDSENTRY), diff --git a/reactos/dll/cpl/access/access.h b/reactos/dll/cpl/access/access.h index 5237cb947b6..0a10a461ade 100644 --- a/reactos/dll/cpl/access/access.h +++ b/reactos/dll/cpl/access/access.h @@ -21,7 +21,7 @@ typedef struct _APPLET typedef struct _GLOBAL_DATA { - /* keyboard page */ + /* Keyboard page */ STICKYKEYS stickyKeys; STICKYKEYS oldStickyKeys; FILTERKEYS filterKeys; @@ -30,11 +30,11 @@ typedef struct _GLOBAL_DATA TOGGLEKEYS oldToggleKeys; BOOL bKeyboardPref; - /* sound page */ + /* Sound page */ SOUNDSENTRY ssSoundSentry; BOOL bShowSounds; - /* display page */ + /* Display page */ HIGHCONTRAST highContrast; UINT uCaretBlinkTime; UINT uCaretWidth; @@ -42,10 +42,10 @@ typedef struct _GLOBAL_DATA RECT rcCaret; RECT rcOldCaret; - /* mouse page */ + /* Mouse page */ MOUSEKEYS mouseKeys; - /* general page */ + /* General page */ ACCESSTIMEOUT accessTimeout; SERIALKEYS serialKeys; TCHAR szActivePort[MAX_PATH]; diff --git a/reactos/dll/cpl/access/lang/nl-NL.rc b/reactos/dll/cpl/access/lang/nl-NL.rc index 1c7aa52293d..6fa0b87b26d 100644 --- a/reactos/dll/cpl/access/lang/nl-NL.rc +++ b/reactos/dll/cpl/access/lang/nl-NL.rc @@ -1,5 +1,5 @@ -//vertaald door Lionel Lowie -//major update jansssens +// Vertaald door Lionel Lowie +// Major update jansssens LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/reactos/dll/cpl/access/lang/ro-RO.rc b/reactos/dll/cpl/access/lang/ro-RO.rc index eca1898ccea..afec1884177 100644 --- a/reactos/dll/cpl/access/lang/ro-RO.rc +++ b/reactos/dll/cpl/access/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.05 - Fulea Ștefan: minor changes +// 2011.11.05 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_PROPPAGEKEYBOARD DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT diff --git a/reactos/dll/cpl/access/lang/uk-UA.rc b/reactos/dll/cpl/access/lang/uk-UA.rc index 09c2a6c0bf1..e04b8c6e92f 100644 --- a/reactos/dll/cpl/access/lang/uk-UA.rc +++ b/reactos/dll/cpl/access/lang/uk-UA.rc @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/access/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Accessibility Control Panel Applet - * TRANSLATORS: Rostislav Zabolotny, Igor Paliychuk + * TRANSLATORS: Rostislav Zabolotny, Igor Paliychuk */ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/cpl/appwiz/lang/cs-CZ.rc b/reactos/dll/cpl/appwiz/lang/cs-CZ.rc index 8bfb70e574d..91843c0b54b 100644 --- a/reactos/dll/cpl/appwiz/lang/cs-CZ.rc +++ b/reactos/dll/cpl/appwiz/lang/cs-CZ.rc @@ -2,7 +2,7 @@ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2010-03-14 */ - + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_FIRSTPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT diff --git a/reactos/dll/cpl/appwiz/resource.h b/reactos/dll/cpl/appwiz/resource.h index b0dda4080cf..8c1dd24164c 100644 --- a/reactos/dll/cpl/appwiz/resource.h +++ b/reactos/dll/cpl/appwiz/resource.h @@ -1,11 +1,11 @@ #pragma once -/* metrics */ +/* Metrics */ #define PROPSHEETWIDTH 380 #define PROPSHEETHEIGHT 228 #define PROPSHEETPADDING 6 -/* icons */ +/* Icons */ #define IDI_CPLSYSTEM 1500 #define IDI_APPICO 1501 #define IDI_INSTICO 1502 @@ -13,20 +13,20 @@ #define IDI_DOWNLOADICO 1504 #define IDI_APPINETICO 1505 -/* dialogs */ +/* Dialogs */ #define IDD_SHORTCUT_LOCATION 203 #define IDD_SHORTCUT_FINISH 204 -/* bitmaps */ +/* Bitmaps */ #define IDB_WATERMARK 5001 -/* strings */ +/* Strings */ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 #define IDS_CREATE_SHORTCUT 2021 #define IDS_ERROR_NOT_FOUND 2022 -/* controls */ +/* Controls */ #define IDC_SHORTCUT_LOCATION 107 #define IDC_SHORTCUT_BROWSE 108 #define IDC_SHORTCUT_NAME 109 diff --git a/reactos/dll/cpl/console/colors.c b/reactos/dll/cpl/console/colors.c index d312fadda0b..75b2ce502f6 100644 --- a/reactos/dll/cpl/console/colors.c +++ b/reactos/dll/cpl/console/colors.c @@ -92,7 +92,7 @@ ColorsProc( } else { - /* options have already been applied */ + /* Options have already been applied */ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } @@ -121,7 +121,7 @@ ColorsProc( red = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_RED), UDM_GETPOS, 0, 0); if (HIWORD(red)) { - //TODO: handle error + // TODO: Handle error break; } red = LOBYTE(red); @@ -132,7 +132,7 @@ ColorsProc( green = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_GREEN), UDM_GETPOS, 0, 0); if (HIWORD(green)) { - //TODO: handle error + // TODO: Handle error break; } green = LOBYTE(green); @@ -143,7 +143,7 @@ ColorsProc( blue = SendMessage(GetDlgItem(hwndDlg, IDC_UPDOWN_COLOR_BLUE), UDM_GETPOS, 0, 0); if (HIWORD(blue)) { - //TODO: handle error + // TODO: Handle error break; } blue = LOBYTE(blue); @@ -201,7 +201,7 @@ ColorsProc( if (index == pConInfo->ActiveStaticControl) { - /* same static control was re-clicked */ + /* Same static control was re-clicked */ break; } @@ -209,7 +209,7 @@ ColorsProc( SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(pConInfo->Colors[index]), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(pConInfo->Colors[index]), FALSE); - /* update global struct */ + /* Update global struct */ if (IsDlgButtonChecked(hwndDlg, IDC_RADIO_SCREEN_TEXT)) { pConInfo->ScreenText = pConInfo->Colors[index]; @@ -236,7 +236,6 @@ ColorsProc( } } - default: break; } diff --git a/reactos/dll/cpl/console/console.c b/reactos/dll/cpl/console/console.c index 9dc3c713b02..c75a63dc0ca 100644 --- a/reactos/dll/cpl/console/console.c +++ b/reactos/dll/cpl/console/console.c @@ -71,7 +71,7 @@ AllocConsoleInfo() void InitConsoleDefaults(PConsoleInfo pConInfo) { - /* initialize struct */ + /* Initialize struct */ pConInfo->InsertMode = TRUE; pConInfo->HistoryBufferSize = 50; pConInfo->NumberOfHistoryBuffers = 5; @@ -142,7 +142,7 @@ ApplyConsoleInfo(HWND hwndDlg, PConsoleInfo pConInfo) if (res == IDCANCEL) { - /* dont destroy when user presses cancel */ + /* Don't destroy when user presses cancel */ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE); } else if ( res == IDC_RADIO_APPLY_ALL ) @@ -175,8 +175,8 @@ InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) /* * console.dll shares information with win32csr with wParam, lParam * - * wParam is a pointer to an ConsoleInfo struct - * lParam is a boolean parameter which specifies wheter defaults should be shown + * wParam is a pointer to a ConsoleInfo struct + * lParam is a boolean parameter which specifies whether defaults should be shown */ pConInfo = AllocConsoleInfo(); @@ -187,14 +187,14 @@ InitApplet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) if (lParam) { - /* use defaults */ + /* Use defaults */ InitConsoleDefaults(pConInfo); } else { if (IsBadReadPtr((const void *)pSharedInfo, sizeof(ConsoleInfo))) { - /* use defaults */ + /* Use defaults */ InitConsoleDefaults(pConInfo); } else @@ -306,4 +306,3 @@ DllMain( } return TRUE; } - diff --git a/reactos/dll/cpl/console/console.h b/reactos/dll/cpl/console/console.h index 1a07871a65f..c7d1619f68c 100644 --- a/reactos/dll/cpl/console/console.h +++ b/reactos/dll/cpl/console/console.h @@ -53,7 +53,7 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo); #define PM_APPLY_CONSOLE_INFO (WM_APP + 100) -//globals +// Globals extern HINSTANCE hApplet; #endif /* CONSOLE_H__ */ diff --git a/reactos/dll/cpl/console/layout.c b/reactos/dll/cpl/console/layout.c index cca60ca92eb..86a37b917eb 100644 --- a/reactos/dll/cpl/console/layout.c +++ b/reactos/dll/cpl/console/layout.c @@ -9,7 +9,6 @@ #include "console.h" - void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) { HBRUSH hBrush; @@ -30,46 +29,46 @@ void PaintConsole(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) } else { - //TODO - // calculate pos correctly when console centered + // TODO: + // Calculate pos correctly when console centered startx = sizex / 3; starty = sizey / 3; } - //TODO - // strech console when bold fonts are selected + // TODO: + // Strech console when bold fonts are selected endx = drawItem->rcItem.right - startx + 15; endy = starty + sizey / 3; - /* draw console size */ + /* Draw console size */ SetRect(&cRect, startx, starty, endx, endy); FillRect(drawItem->hDC, &cRect, GetSysColorBrush(COLOR_WINDOWFRAME)); - /* draw console border */ + /* Draw console border */ SetRect(&fRect, startx + 1, starty + 1, cRect.right - 1, cRect.bottom - 1); FrameRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - /* draw left box */ + /* Draw left box */ SetRect(&fRect, startx + 3, starty + 3, startx + 5, starty + 5); FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - /* draw window title */ + /* Draw window title */ SetRect(&fRect, startx + 7, starty + 3, cRect.right - 9, starty + 5); FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVECAPTION)); - /* draw first right box */ + /* Draw first right box */ SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - /* draw second right box */ + /* Draw second right box */ SetRect(&fRect, fRect.right + 1, starty + 3, fRect.right + 3, starty + 5); FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_ACTIVEBORDER)); - /* draw scrollbar */ + /* Draw scrollbar */ SetRect(&fRect, cRect.right - 5, fRect.bottom + 1, cRect.right - 3, cRect.bottom - 3); FillRect(drawItem->hDC, &fRect, GetSysColorBrush(COLOR_SCROLLBAR)); - /* draw console background */ + /* Draw console background */ hBrush = CreateSolidBrush(pConInfo->ScreenBackground); SetRect(&fRect, startx + 3, starty + 6, cRect.right - 6, cRect.bottom - 3); FillRect(drawItem->hDC, &fRect, hBrush); @@ -107,7 +106,7 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); if (ntColor == nbkColor) { - /* text has same color -> invisible */ + /* Text has same color -> invisible */ return; } @@ -120,7 +119,6 @@ void PaintText(LPDRAWITEMSTRUCT drawItem, PConsoleInfo pConInfo) } - INT_PTR CALLBACK LayoutProc( @@ -167,7 +165,7 @@ LayoutProc( } else { - //FIXME calculate window pos from xres, yres + // FIXME: Calculate window pos from xres, yres SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT, 88, FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_POS_TOP, 88, FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_WINDOW_POS_LEFT), FALSE); @@ -251,7 +249,7 @@ LayoutProc( if (lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_WINDOW_SIZE_HEIGHT) { - /* automatically adjust screen buffer size when window size enlarges */ + /* Automatically adjust screen buffer size when window size enlarges */ if (wwidth >= swidth) { SetDlgItemInt(hwndDlg, IDC_EDIT_SCREEN_BUFFER_WIDTH, wwidth, TRUE); @@ -269,7 +267,7 @@ LayoutProc( if (lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_WIDTH || lppsn->hdr.idFrom == IDC_UPDOWN_SCREEN_BUFFER_HEIGHT) { - /* automatically adjust window size when screen buffer decreases */ + /* Automatically adjust window size when screen buffer decreases */ if (wwidth > swidth) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); @@ -317,7 +315,7 @@ LayoutProc( swidth = max(swidth, 1); sheight = max(sheight, 1); - /* automatically adjust window size when screen buffer decreases */ + /* Automatically adjust window size when screen buffer decreases */ if (wwidth > swidth) { SetDlgItemInt(hwndDlg, IDC_EDIT_WINDOW_SIZE_WIDTH, swidth, TRUE); diff --git a/reactos/dll/cpl/console/options.c b/reactos/dll/cpl/console/options.c index c544c38a58b..ace6599509c 100644 --- a/reactos/dll/cpl/console/options.c +++ b/reactos/dll/cpl/console/options.c @@ -61,7 +61,7 @@ OptionsProc( } else { - /* options have already been applied */ + /* Options have already been applied */ SetWindowLongPtr(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } @@ -174,10 +174,10 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) HWND hDlgCtrl; TCHAR szBuffer[MAX_PATH]; - /* update cursor size */ + /* Update cursor size */ if ( pConInfo->CursorSize == 0) { - /* small cursor */ + /* Small cursor */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_SMALL_CURSOR); SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); @@ -207,14 +207,14 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } - /* update num buffers */ + /* Update num buffers */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_NUM_BUFFER); SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_NUM_BUFFER); _stprintf(szBuffer, _T("%d"), pConInfo->NumberOfHistoryBuffers); SendMessage(hDlgCtrl, WM_SETTEXT, 0, (LPARAM)szBuffer); - /* update buffer size */ + /* Update buffer size */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_UPDOWN_BUFFER_SIZE); SendMessage(hDlgCtrl, UDM_SETRANGE, 0, MAKELONG((short)999, (short)1)); hDlgCtrl = GetDlgItem(hwndDlg, IDC_EDIT_BUFFER_SIZE); @@ -223,14 +223,14 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) - /* update discard duplicates */ + /* Update discard duplicates */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_DISCARD_DUPLICATES); if ( pConInfo->HistoryNoDup ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - /* update full/window screen */ + /* Update full/window screen */ if ( pConInfo->FullScreen ) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_RADIO_DISPLAY_FULL); @@ -248,19 +248,17 @@ UpdateDialogElements(HWND hwndDlg, PConsoleInfo pConInfo) SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); } - /* update quick edit */ + /* Update quick edit */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_QUICK_EDIT); if ( pConInfo->QuickEdit ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); - /* update insert mode */ + /* Update insert mode */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_INSERT_MODE); if ( pConInfo->InsertMode ) SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); else SendMessage(hDlgCtrl, BM_SETCHECK, (LPARAM)BST_UNCHECKED, 0); } - - diff --git a/reactos/dll/cpl/console/resource.h b/reactos/dll/cpl/console/resource.h index 09ffcced27c..7627bfd7612 100644 --- a/reactos/dll/cpl/console/resource.h +++ b/reactos/dll/cpl/console/resource.h @@ -11,7 +11,7 @@ #define IDD_PROPPAGECOLORS 103 #define IDD_APPLYOPTIONS 104 -//options dialog +// Options dialog #define IDC_CHECK_QUICK_EDIT 200 #define IDC_CHECK_INSERT_MODE 201 #define IDC_CHECK_DISCARD_DUPLICATES 202 @@ -25,11 +25,11 @@ #define IDC_RADIO_DISPLAY_WINDOW 210 #define IDC_RADIO_DISPLAY_FULL 211 -// apply dialog +// Apply dialog #define IDC_RADIO_APPLY_ALL 300 #define IDC_RADIO_APPLY_CURRENT 301 -//font dialog +// Font dialog #define IDC_CHECK_BOLD_FONTS 400 #define IDC_STATIC_SELECT_FONT_PREVIEW 401 #define IDC_FONT_SIZE_X 402 @@ -39,8 +39,7 @@ #define IDC_LBOX_TYPE 406 #define IDC_GROUPBOX_FONT_NAME 407 -//layout dialog - +// Layout dialog #define IDC_UPDOWN_SCREEN_BUFFER_WIDTH 500 #define IDC_EDIT_SCREEN_BUFFER_WIDTH 501 #define IDC_EDIT_SCREEN_BUFFER_HEIGHT 502 @@ -56,8 +55,7 @@ #define IDC_CHECK_SYSTEM_POS_WINDOW 512 #define IDC_STATIC_LAYOUT_WINDOW_PREVIEW 513 -//color dialog - +// Color dialog #define IDC_RADIO_SCREEN_TEXT 600 #define IDC_RADIO_SCREEN_BACKGROUND 601 #define IDC_RADIO_POPUP_TEXT 602 @@ -87,7 +85,6 @@ #define IDC_STATIC_COLOR15 626 #define IDC_STATIC_COLOR16 627 - -//string ids +// String IDs #define IDS_SCREEN_TEXT 700 #define IDS_RASTERFONTS 701 diff --git a/reactos/dll/cpl/desk/advappdlg.c b/reactos/dll/cpl/desk/advappdlg.c index f0f58887b9d..837bc0b18c2 100644 --- a/reactos/dll/cpl/desk/advappdlg.c +++ b/reactos/dll/cpl/desk/advappdlg.c @@ -356,7 +356,7 @@ AdvAppearanceDlg_Init(HWND hwndDlg, GLOBALS *g) g->SchemeAdv = g->Scheme; SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->SchemeAdv); - + /* Add the elements to the combo */ for (iElement = 0; iElement < NUM_ELEMENTS; iElement++) diff --git a/reactos/dll/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c index 0785623e4c2..1d707cab0bd 100644 --- a/reactos/dll/cpl/desk/appearance.c +++ b/reactos/dll/cpl/desk/appearance.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/appearance.c + * FILE: dll/cpl/desk/appearance.c * PURPOSE: Appearance property page * * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) @@ -18,7 +18,7 @@ AppearancePage_ShowColorScemes(GLOBALS *g, HWND hwndColor, INT ThemeId) int i, iListIndex; SendMessage(hwndColor, CB_RESETCONTENT , 0, 0); - + if(g->bThemeActive == FALSE) { for(i = 0; i < g_TemplateCount; i++) @@ -183,7 +183,7 @@ AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if(g->bThemeActive == FALSE) { COLOR_SCHEME Scheme; - + g->bSchemeChanged = TRUE; if (SchemeId != -1 && LoadSchemeFromReg(&Scheme, SchemeId)) { @@ -233,7 +233,7 @@ AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) PTHEME pTheme = (PTHEME)DSA_GetItemPtr(g->Themes, g->ThemeId); ActivateTheme(pTheme, g->SchemeId, 0); } - + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, PVM_UPDATETHEME, 0, (LPARAM)&g->Scheme); g->bThemeChanged = FALSE; g->bSchemeChanged = FALSE; diff --git a/reactos/dll/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c index 5c4067d945a..3a767ebf981 100644 --- a/reactos/dll/cpl/desk/background.c +++ b/reactos/dll/cpl/desk/background.c @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/background.c + * FILE: dll/cpl/desk/background.c * PURPOSE: Background property page * * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) @@ -134,7 +134,7 @@ AddListViewItems(HWND hwndDlg, PDATA pData) { _tcscpy(wallpaperFilename, buffer); } - + himl = (HIMAGELIST)SHGetFileInfo(wallpaperFilename, 0, &sfi, @@ -280,7 +280,7 @@ InitBackgroundDialog(HWND hwndDlg, PDATA pData) DWORD dwDisposition = 0; result = RegCreateKeyEx( HKEY_CURRENT_USER, TEXT("Control Panel\\Desktop"), 0, NULL, 0, KEY_ALL_ACCESS, NULL, ®Key, &dwDisposition ); - /* now the key must be created & opened and regKey points to opened key */ + /* Now the key must be created & opened and regKey points to opened key */ /* On error result will not contain ERROR_SUCCESS. I don't know how to handle */ /* this case :( */ } @@ -401,10 +401,10 @@ CheckListViewFilenameExists(HWND hwndList, LPCTSTR tszFileName) LVFINDINFO lvfi; int retVal; - lvfi.flags = LVFI_STRING; /* search item by EXACT string */ - lvfi.psz = tszFileName; /* string to search */ + lvfi.flags = LVFI_STRING; /* Search item by EXACT string */ + lvfi.psz = tszFileName; /* String to search */ - /* other items of this structure are not valid, besacuse flags are not set. */ + /* Other items of this structure are not valid, besacuse flags are not set. */ retVal = ListView_FindItem(hwndList, -1, &lvfi); if (retVal != -1) return TRUE; /* item found! */ @@ -552,7 +552,7 @@ DrawBackgroundPreview(LPDRAWITEMSTRUCT draw, PDATA pData) if (pData->backgroundItems[pData->backgroundSelection].bWallpaper == FALSE) { - /* update desktop background color image */ + /* Update desktop background color image */ hBrush = CreateSolidBrush(g_GlobalData.desktop_color); FillRect(hDC, &rcItem, hBrush); DeleteObject(hBrush); @@ -732,7 +732,7 @@ SetDesktopBackColor(HWND hwndDlg, DATA *pData) red = GetRValue(g_GlobalData.desktop_color); green = GetGValue(g_GlobalData.desktop_color); blue = GetBValue(g_GlobalData.desktop_color); - /* format string to be set to registry */ + /* Format string to be set to registry */ wsprintf(clText, TEXT("%d %d %d"), red, green, blue); RegSetValueEx(hKey, TEXT("Background"), 0, REG_SZ, (BYTE *)clText, (lstrlen(clText) + 1) * sizeof(TCHAR)); diff --git a/reactos/dll/cpl/desk/classinst.c b/reactos/dll/cpl/desk/classinst.c index 0cdb70c0b5a..610eb779d87 100644 --- a/reactos/dll/cpl/desk/classinst.c +++ b/reactos/dll/cpl/desk/classinst.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/classinst.c + * FILE: dll/cpl/desk/classinst.c * PURPOSE: Display class installer * * PROGRAMMERS: Herv Poussineau (hpoussin@reactos.org) diff --git a/reactos/dll/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c index cd229010a19..dbab35e6b71 100644 --- a/reactos/dll/cpl/desk/desk.c +++ b/reactos/dll/cpl/desk/desk.c @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/desk.c + * FILE: dll/cpl/desk/desk.c * PURPOSE: ReactOS Display Control Panel * * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) diff --git a/reactos/dll/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h index ba156e2543d..d6d8e692eb6 100644 --- a/reactos/dll/cpl/desk/desk.h +++ b/reactos/dll/cpl/desk/desk.h @@ -83,7 +83,7 @@ typedef struct _DISPLAY_DEVICE_ENTRY LPTSTR DeviceKey; LPTSTR DeviceID; DWORD DeviceStateFlags; - PSETTINGS_ENTRY Settings; /* sorted by increasing dmPelsHeight, BPP */ + PSETTINGS_ENTRY Settings; /* Sorted by increasing dmPelsHeight, BPP */ DWORD SettingsCount; PRESOLUTION_INFO Resolutions; DWORD ResolutionsCount; diff --git a/reactos/dll/cpl/desk/devsett.c b/reactos/dll/cpl/desk/devsett.c index d79bd732b21..1d541e2fdb7 100644 --- a/reactos/dll/cpl/desk/devsett.c +++ b/reactos/dll/cpl/desk/devsett.c @@ -1,7 +1,7 @@ /* -* COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/devsett.c + * FILE: dll/cpl/desk/devsett.c * PURPOSE: ReactOS Display Control Panel Shell Extension Support */ @@ -17,15 +17,15 @@ typedef struct _CDevSettings const struct IDataObjectVtbl *lpIDataObjectVtbl; DWORD ref; - CLIPFORMAT cfExtInterface; /* "Desk.cpl extension interface" */ - CLIPFORMAT cfDisplayDevice; /* "Display Device" */ - CLIPFORMAT cfDisplayName; /* "Display Name" */ - CLIPFORMAT cfDisplayId; /* "Display ID" */ - CLIPFORMAT cfMonitorName; /* "Monitor Name" */ - CLIPFORMAT cfMonitorDevice; /* "Monitor Device" */ - CLIPFORMAT cfDisplayKey; /* "Display Key" */ + CLIPFORMAT cfExtInterface; /* "Desk.cpl extension interface" */ + CLIPFORMAT cfDisplayDevice; /* "Display Device" */ + CLIPFORMAT cfDisplayName; /* "Display Name" */ + CLIPFORMAT cfDisplayId; /* "Display ID" */ + CLIPFORMAT cfMonitorName; /* "Monitor Name" */ + CLIPFORMAT cfMonitorDevice; /* "Monitor Device" */ + CLIPFORMAT cfDisplayKey; /* "Display Key" */ CLIPFORMAT cfDisplayStateFlags; /* "Display State Flags" */ - CLIPFORMAT cfPruningMode; /* "Pruning Mode" */ + CLIPFORMAT cfPruningMode; /* "Pruning Mode" */ PWSTR pDisplayDevice; PWSTR pDisplayName; diff --git a/reactos/dll/cpl/desk/dibitmap.c b/reactos/dll/cpl/desk/dibitmap.c index b58b8b8e5eb..b14b7155cc3 100644 --- a/reactos/dll/cpl/desk/dibitmap.c +++ b/reactos/dll/cpl/desk/dibitmap.c @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/dibitmap.c + * FILE: dll/cpl/desk/dibitmap.c * PURPOSE: DIB loading * * PROGRAMMERS: Trevor McCort (lycan359@gmail.com) diff --git a/reactos/dll/cpl/desk/draw.c b/reactos/dll/cpl/desk/draw.c index a6bf08a12c1..0ac722004bf 100644 --- a/reactos/dll/cpl/desk/draw.c +++ b/reactos/dll/cpl/desk/draw.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/draw.c + * FILE: dll/cpl/desk/draw.c * PURPOSE: Providing drawing functions * * PROGRAMMERS: Katayama Hirofumi MZ @@ -257,22 +257,22 @@ MyDrawFrameCaption(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme) lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); hFont = CreateFontIndirect(&lf); - /* save font and text color */ + /* Save font and text color */ hOldFont = SelectObject(dc, hFont); clrsave = GetTextColor(dc); bkmode = GetBkMode(dc); - /* set color and drawing mode */ + /* Set color and drawing mode */ SetBkMode(dc, TRANSPARENT); if(uFlags & DFCS_INACTIVE) { - /* draw shadow */ + /* Draw shadow */ SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]); TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]); - /* draw selected symbol */ + /* Draw selected symbol */ TextOut(dc, myr.left, myr.top, &Symbol, 1); - /* restore previous settings */ + /* Restore previous settings */ SetTextColor(dc, clrsave); SelectObject(dc, hOldFont); SetBkMode(dc, bkmode); @@ -325,20 +325,20 @@ MyDrawFrameScroll(HDC dc, LPRECT r, UINT uFlags, COLOR_SCHEME *scheme) lf.lfCharSet = DEFAULT_CHARSET; lstrcpy(lf.lfFaceName, TEXT("Marlett")); hFont = CreateFontIndirect(&lf); - /* save font and text color */ + /* Save font and text color */ hOldFont = SelectObject(dc, hFont); clrsave = GetTextColor(dc); bkmode = GetBkMode(dc); - /* set color and drawing mode */ + /* Set color and drawing mode */ SetBkMode(dc, TRANSPARENT); if(uFlags & DFCS_INACTIVE) { - /* draw shadow */ + /* Draw shadow */ SetTextColor(dc, scheme->crColor[COLOR_BTNHIGHLIGHT]); TextOut(dc, myr.left + 1, myr.top + 1, &Symbol, 1); } SetTextColor(dc, scheme->crColor[(uFlags & DFCS_INACTIVE) ? COLOR_BTNSHADOW : COLOR_BTNTEXT]); - /* draw selected symbol */ + /* Draw selected symbol */ TextOut(dc, myr.left, myr.top, &Symbol, 1); /* restore previous settings */ SetTextColor(dc, clrsave); diff --git a/reactos/dll/cpl/desk/effappdlg.c b/reactos/dll/cpl/desk/effappdlg.c index 9b1c86b9e3b..02198b48a89 100644 --- a/reactos/dll/cpl/desk/effappdlg.c +++ b/reactos/dll/cpl/desk/effappdlg.c @@ -17,9 +17,9 @@ UpdateControls(HWND hwndDlg, GLOBALS *g) WPARAM state; state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATION, BM_GETCHECK, 0, 0); g->SchemeAdv.Effects.bMenuAnimation = (state == BST_CHECKED) ? TRUE : FALSE; - EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->SchemeAdv.Effects.bMenuAnimation); + EnableWindow(GetDlgItem(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE), g->SchemeAdv.Effects.bMenuAnimation); - //A boolean as an index for a 2-value list: + // A boolean as an index for a 2-value list: SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_ANIMATIONTYPE, CB_SETCURSEL, (WPARAM)g->SchemeAdv.Effects.bMenuFade, 0); state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_KEYBOARDCUES, BM_GETCHECK, 0, 0); @@ -38,15 +38,15 @@ SaveCurrentValues(HWND hwndDlg, GLOBALS *g) static VOID AddToCombo(HWND hwndDlg, INT From, INT To, INT Combo) { - INT iElement, iListIndex, i=0; - TCHAR tstrText[80]; + INT iElement, iListIndex, i=0; + TCHAR tstrText[80]; for (iElement = From; iElement<=To; iElement++) - { - LoadString(hApplet, iElement, (LPTSTR)tstrText, 80); - iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText); - SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); - } + { + LoadString(hApplet, iElement, (LPTSTR)tstrText, 80); + iListIndex = SendDlgItemMessage(hwndDlg, Combo, CB_ADDSTRING, 0, (LPARAM)tstrText); + SendDlgItemMessage(hwndDlg, Combo, CB_SETITEMDATA, (WPARAM)iListIndex, (LPARAM)i++ ); + } } /* Initialize the effects appearance dialog */ diff --git a/reactos/dll/cpl/desk/general.c b/reactos/dll/cpl/desk/general.c index 8477e17905b..32b89917e40 100644 --- a/reactos/dll/cpl/desk/general.c +++ b/reactos/dll/cpl/desk/general.c @@ -31,7 +31,7 @@ InitFontSizeList(HWND hWnd) for (;;) { TCHAR Desc[LINE_LEN]; - + if (SetupGetStringField(&Context, 0, Desc, sizeof(Desc), NULL) && SetupGetIntField(&Context, 1, &ci)) { diff --git a/reactos/dll/cpl/desk/lang/es-ES.rc b/reactos/dll/cpl/desk/lang/es-ES.rc index 0d2cd18ebec..d6cae84e37b 100644 --- a/reactos/dll/cpl/desk/lang/es-ES.rc +++ b/reactos/dll/cpl/desk/lang/es-ES.rc @@ -45,7 +45,7 @@ BEGIN WS_BORDER | WS_GROUP, 61, 123, 12, 13 LTEXT "minutos", IDC_MINTEXT, 70, 125, 26, 9 CONTROL "Pr&oteger con contrasea al reanudar",IDC_SCREENS_USEPASSCHK,"button", - BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 //104 + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 // 104 GROUPBOX "Energa del monitor ", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Para ajustar la configuracin de energa del monitor y ahorrar energa, haga clic en Energa.", IDC_STATIC, 14, 166, 146, 24 @@ -61,7 +61,7 @@ BEGIN WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Visual Style", IDC_STATIC, 7, 130, 64, 7 COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - LTEXT "Com&binacin de colores", IDC_STATIC, 7, 160, 90, 7 //64 + LTEXT "Com&binacin de colores", IDC_STATIC, 7, 160, 90, 7 // 64 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efectos...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Opciones &avanzadas", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 diff --git a/reactos/dll/cpl/desk/lang/ro-RO.rc b/reactos/dll/cpl/desk/lang/ro-RO.rc index 439e12d5ba6..0987ea6569e 100644 --- a/reactos/dll/cpl/desk/lang/ro-RO.rc +++ b/reactos/dll/cpl/desk/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.07 - Fulea Ștefan: minor changes +// 2011.11.07 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 diff --git a/reactos/dll/cpl/desk/lang/sk-SK.rc b/reactos/dll/cpl/desk/lang/sk-SK.rc index 9d387c21b9e..e8d7ff90045 100644 --- a/reactos/dll/cpl/desk/lang/sk-SK.rc +++ b/reactos/dll/cpl/desk/lang/sk-SK.rc @@ -156,7 +156,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Veobecn" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Zobrazenie", -1, 7, 6, 237, 56, WS_GROUP //Display=viac vznamov + GROUPBOX "Zobrazenie", -1, 7, 6, 237, 56, WS_GROUP // Display=viac vznamov LTEXT "Vekos psma", -1, 14, 20, 222, 8 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 @@ -188,8 +188,8 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Posvanie" //Slide effect - IDS_FADEEFFECT "Vytrcanie" //Fade effect + IDS_SLIDEEFFECT "Posvanie" // Slide effect + IDS_FADEEFFECT "Vytrcanie" // Fade effect END STRINGTABLE DISCARDABLE @@ -207,7 +207,7 @@ END STRINGTABLE BEGIN - IDS_CPLNAME "Obrazovka" //Display + IDS_CPLNAME "Obrazovka" // Display IDS_CPLDESCRIPTION "Umouje prispsobi vzhad, pozadie a etri obrazovky." IDS_NONE "(Nie je)" IDS_CENTER "V strede" @@ -255,7 +255,7 @@ BEGIN IDS_ELEMENT_10 "Priestorov objekty" IDS_ELEMENT_11 "Nzov palety" IDS_ELEMENT_12 "Nzov tlaidla" - IDS_ELEMENT_13 "Ovldacie tlaidl" //old=Lita znaiek + IDS_ELEMENT_13 "Ovldacie tlaidl" // old=Lita znaiek IDS_ELEMENT_14 "Nedostupn poloky ponuky" IDS_ELEMENT_15 "Polko s hlsenm" IDS_ELEMENT_16 "Ovldanie posvaa" diff --git a/reactos/dll/cpl/desk/misc.c b/reactos/dll/cpl/desk/misc.c index e30b7704387..db61bac65e3 100644 --- a/reactos/dll/cpl/desk/misc.c +++ b/reactos/dll/cpl/desk/misc.c @@ -24,7 +24,7 @@ LengthOfStrResource(IN HINSTANCE hInst, UINT x; /* Find the string we're looking for */ - uID &= 0xF; /* position in the block, same as % 16 */ + uID &= 0xF; /* Position in the block, same as % 16 */ for (x = 0; x < uID; x++) { lpStr += (*lpStr) + 1; diff --git a/reactos/dll/cpl/desk/monslctl.c b/reactos/dll/cpl/desk/monslctl.c index 37c61a25e2d..ea96760633e 100644 --- a/reactos/dll/cpl/desk/monslctl.c +++ b/reactos/dll/cpl/desk/monslctl.c @@ -750,7 +750,7 @@ MonSelDrawDisabledRect(IN OUT PMONITORSELWND infoPtr, if (infoPtr->hbrDisabled != NULL) { - /* FIXME - implement */ + /* FIXME: Implement */ } return Ret; @@ -1242,7 +1242,7 @@ MonitorSelWndProc(IN HWND hwnd, if (!(infoPtr->ControlExStyle & MSLM_EX_SELECTONRIGHTCLICK)) break; - /* fall through */ + /* Fall through */ } case WM_LBUTTONDBLCLK: @@ -1274,7 +1274,7 @@ MonitorSelWndProc(IN HWND hwnd, &pt); } - /* fall through */ + /* Fall through */ } case WM_MBUTTONDOWN: @@ -1308,7 +1308,7 @@ MonitorSelWndProc(IN HWND hwnd, { case VK_TAB: { - /* change the UI status */ + /* Change the UI status */ SendMessage(GetAncestor(hwnd, GA_PARENT), WM_CHANGEUISTATE, diff --git a/reactos/dll/cpl/desk/preview.c b/reactos/dll/cpl/desk/preview.c index 6a4e71809bf..a230ecb0d7f 100644 --- a/reactos/dll/cpl/desk/preview.c +++ b/reactos/dll/cpl/desk/preview.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Desktop Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/desk/preview.c + * FILE: dll/cpl/desk/preview.c * PURPOSE: Draws the preview control * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ diff --git a/reactos/dll/cpl/desk/preview.h b/reactos/dll/cpl/desk/preview.h index 444872bb7a6..66aa5f94808 100644 --- a/reactos/dll/cpl/desk/preview.h +++ b/reactos/dll/cpl/desk/preview.h @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Desktop Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/desk/preview.h + * FILE: dll/cpl/desk/preview.h * PURPOSE: Definitions used by the preview control * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ diff --git a/reactos/dll/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h index f5f78959da3..4ba076f42c7 100644 --- a/reactos/dll/cpl/desk/resource.h +++ b/reactos/dll/cpl/desk/resource.h @@ -1,6 +1,6 @@ #pragma once -/* metrics */ +/* Metrics */ #define PROPSHEETWIDTH 246 #define PROPSHEETHEIGHT 228 #define PROPSHEETPADDING 6 diff --git a/reactos/dll/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c index b9948a5633a..9420e008b52 100644 --- a/reactos/dll/cpl/desk/screensaver.c +++ b/reactos/dll/cpl/desk/screensaver.c @@ -108,7 +108,7 @@ SetScreenSaverPreviewBox(HWND hwndDlg, PDATA pData) STARTUPINFO si; TCHAR szCmdline[2048]; - /* kill off the previous preview process*/ + /* Kill off the previous preview process */ if (pData->PrevWindowPi.hProcess) { TerminateProcess(pData->PrevWindowPi.hProcess, 0); @@ -214,7 +214,7 @@ ScreensaverConfig(HWND hwndDlg, PDATA pData) &si, &pi)) { - /* kill off the previous preview process */ + /* Kill off the previous preview process */ if (pData->PrevWindowPi.hProcess) { TerminateProcess(pData->PrevWindowPi.hProcess, 0); @@ -243,7 +243,7 @@ ScreensaverPreview(HWND hwndDlg, PDATA pData) if (pData->Selection < 1) return; - /* kill off the previous preview process*/ + /* Kill off the previous preview process */ if (pData->PrevWindowPi.hProcess) { TerminateProcess(pData->PrevWindowPi.hProcess, 0); @@ -476,7 +476,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) TCHAR szTime[256], Sec; UINT Ret; - /* set the screensaver */ + /* Set the screensaver */ if (pData->ScreenSaverItems[pData->Selection].bIsScreenSaver) { RegSetValueEx(regKey, @@ -515,7 +515,7 @@ SetScreenSaver(HWND hwndDlg, PDATA pData) SystemParametersInfoW(SPI_SETSCREENSAVETIMEOUT, Time, 0, SPIF_SENDCHANGE); - /* set the secure value */ + /* Set the secure value */ Ret = SendDlgItemMessage(hwndDlg, IDC_SCREENS_USEPASSCHK, BM_GETCHECK, @@ -568,7 +568,7 @@ OnInitDialog(HWND hwndDlg, PDATA pData) CheckRegScreenSaverIsSecure(hwndDlg); - /* set the current screensaver in the combo box */ + /* Set the current screensaver in the combo box */ lpCurSs = GetCurrentScreenSaverValue(_T("SCRNSAVE.EXE")); if (lpCurSs) { @@ -610,14 +610,14 @@ OnInitDialog(HWND hwndDlg, PDATA pData) } else { - /* set screensaver to (none) */ + /* Set screensaver to (none) */ SendMessage(hwndSSCombo, CB_SETCURSEL, 0, 0); } - /* set the current timeout */ + /* Set the current timeout */ lpCurSs = GetCurrentScreenSaverValue(_T("ScreenSaveTimeOut")); if (lpCurSs) { @@ -758,7 +758,7 @@ ScreenSaverPageProc(HWND hwndDlg, case PSN_SETACTIVE: { - /* activate screen saver support */ + /* Activate screen saver support */ SystemParametersInfoW(SPI_SETSCREENSAVEACTIVE, TRUE, 0, SPIF_SENDCHANGE); SetScreenSaverPreviewBox(hwndDlg, pData); break; diff --git a/reactos/dll/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c index d9527cf239b..304fb75de7e 100644 --- a/reactos/dll/cpl/desk/settings.c +++ b/reactos/dll/cpl/desk/settings.c @@ -336,7 +336,7 @@ OnInitDialog(IN HWND hwndDlg) 1, (LPARAM)&monitors); } - else /* FIXME: incomplete! */ + else /* FIXME: Incomplete! */ { PMONSL_MONINFO pMonitors; DWORD i; @@ -424,7 +424,7 @@ ShowColorSpectrum(IN HDC hDC, IN LPRECT client, IN DWORD BitsPerPel, IN PDATA pD static VOID OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) { - /* if new BPP is not compatible with resolution: + /* If new BPP is not compatible with resolution: * 1) try to find the nearest smaller matching resolution * 2) otherwise, get the nearest bigger resolution */ @@ -444,11 +444,11 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) GetClientRect(hSpectrumControl, &client); ShowColorSpectrum(hSpectrumDC, &client, dmNewBitsPerPel, pData); - /* find if new parameters are valid */ + /* Find if new parameters are valid */ Current = pData->CurrentDisplayDevice->CurrentSettings; if (dmNewBitsPerPel == Current->dmBitsPerPel) { - /* no change */ + /* No change */ return; } @@ -487,7 +487,7 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) } } - /* search smaller resolution compatible with current color depth */ + /* Search smaller resolution compatible with current color depth */ Current = pData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { @@ -500,7 +500,7 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) Current = Current->Blink; } - /* search bigger resolution compatible with current color depth */ + /* Search bigger resolution compatible with current color depth */ Current = pData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { @@ -513,14 +513,14 @@ OnBPPChanged(IN HWND hwndDlg, IN PDATA pData) Current = Current->Flink; } - /* we shouldn't go there */ + /* We shouldn't go there */ } static VOID OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, IN BOOL bUpdateThumb) { - /* if new resolution is not compatible with color depth: + /* If new resolution is not compatible with color depth: * 1) try to find the nearest bigger matching color depth * 2) otherwise, get the nearest smaller color depth */ @@ -528,11 +528,11 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, DWORD dmNewPelsHeight = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsHeight; DWORD dmNewPelsWidth = pData->CurrentDisplayDevice->Resolutions[NewPosition].dmPelsWidth; - /* find if new parameters are valid */ + /* Find if new parameters are valid */ Current = pData->CurrentDisplayDevice->CurrentSettings; if (dmNewPelsHeight == Current->dmPelsHeight && dmNewPelsWidth == Current->dmPelsWidth) { - /* no change */ + /* No change */ return; } @@ -571,7 +571,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, } } - /* search bigger color depth compatible with current resolution */ + /* Search bigger color depth compatible with current resolution */ Current = pData->CurrentDisplayDevice->CurrentSettings->Flink; while (Current != NULL) { @@ -584,7 +584,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, Current = Current->Flink; } - /* search smaller color depth compatible with current resolution */ + /* Search smaller color depth compatible with current resolution */ Current = pData->CurrentDisplayDevice->CurrentSettings->Blink; while (Current != NULL) { @@ -597,7 +597,7 @@ OnResolutionChanged(IN HWND hwndDlg, IN PDATA pData, IN DWORD NewPosition, Current = Current->Blink; } - /* we shouldn't go there */ + /* We shouldn't go there */ } /* Property sheet page callback */ @@ -764,7 +764,7 @@ SettingsPageProc(IN HWND hwndDlg, IN UINT uMsg, IN WPARAM wParam, IN LPARAM lPar } else pt.x = pt.y = 0; - + MapWindowPoints(hwndMonSel, NULL, &pt, diff --git a/reactos/dll/cpl/desk/theme.c b/reactos/dll/cpl/desk/theme.c index d6b65f49a35..e7fd9c055cf 100644 --- a/reactos/dll/cpl/desk/theme.c +++ b/reactos/dll/cpl/desk/theme.c @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel - * FILE: lib/cpl/desk/theme.c + * FILE: dll/cpl/desk/theme.c * PURPOSE: Handling themes * * PROGRAMMERS: Katayama Hirofumi MZ @@ -122,7 +122,7 @@ VOID LoadCurrentScheme(COLOR_SCHEME* scheme) scheme->Effects.bTooltipAnimation = scheme->Effects.bMenuAnimation; scheme->Effects.bTooltipFade = scheme->Effects.bMenuFade; - /* show content of windows during dragging */ + /* Show content of windows during dragging */ SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &scheme->Effects.bDragFullWindows, 0); /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ @@ -306,7 +306,7 @@ VOID ApplyScheme(COLOR_SCHEME* scheme, INT SchemeId) BOOL SaveScheme(COLOR_SCHEME* scheme, LPCTSTR strLegacyName) { - /* FIXME: implement */ + /* FIXME: Implement */ return FALSE; } @@ -341,7 +341,7 @@ INT LoadSchemePresetEntries(LPTSTR pszSelectedStyle) while((RegEnumKeyEx(hkNewSchemes, iStyle, g_ColorSchemes[iTemplateIndex].strKeyName, &dwLength, NULL, NULL, NULL, &ftLastWriteTime) == ERROR_SUCCESS) && (iTemplateIndex < MAX_TEMPLATES)) { - /* is it really a template or one of the other entries */ + /* Is it really a template or one of the other entries */ if (dwLength <= 4) { if (RegOpenKeyEx(hkNewSchemes, g_ColorSchemes[iTemplateIndex].strKeyName, 0, KEY_READ, &hkScheme) == ERROR_SUCCESS) @@ -535,4 +535,4 @@ void CleanupThemes(GLOBALS *g) free(g->pszSizeName); DSA_DestroyCallback(g->Themes, CleanUpThemeCallback, NULL); -} \ No newline at end of file +} diff --git a/reactos/dll/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c index ac875831f8e..793fa311156 100644 --- a/reactos/dll/cpl/hdwwiz/hdwwiz.c +++ b/reactos/dll/cpl/hdwwiz/hdwwiz.c @@ -319,7 +319,7 @@ InitProbeListPage(HWND hwndDlg) if (hDevInfo == INVALID_HANDLE_VALUE) return; - /* get the device image List */ + /* Get the device image List */ ImageListData.cbSize = sizeof(ImageListData); SetupDiGetClassImageList(&ImageListData); @@ -335,7 +335,7 @@ InitProbeListPage(HWND hwndDlg) if (ulStatus & DN_NO_SHOW_IN_DM) continue; } - /* get the device's friendly name */ + /* Get the device's friendly name */ if (!SetupDiGetDeviceRegistryProperty(hDevInfo, &DevInfoData, SPDRP_FRIENDLYNAME, @@ -344,7 +344,7 @@ InitProbeListPage(HWND hwndDlg) MAX_STR_SIZE, NULL)) { - /* if the friendly name fails, try the description instead */ + /* If the friendly name fails, try the description instead */ SetupDiGetDeviceRegistryProperty(hDevInfo, &DevInfoData, SPDRP_DEVICEDESC, @@ -574,7 +574,7 @@ EnumDeviceClasses(INT ClassIndex, 0); if (Ret != CR_SUCCESS) { - /* all classes enumerated */ + /* All classes enumerated */ if(Ret == CR_NO_SUCH_VALUE) { hDevInfoTypes = NULL; @@ -583,10 +583,10 @@ EnumDeviceClasses(INT ClassIndex, if (Ret == CR_INVALID_DATA) { - ; /*FIXME: what should we do here? */ + ; /* FIXME: What should we do here? */ } - /* handle other errors... */ + /* Handle other errors... */ } if (SetupDiClassNameFromGuid(&ClassGuid, @@ -601,9 +601,9 @@ EnumDeviceClasses(INT ClassIndex, &ClassGuid, ClassImage)) { - /* FIXME: can we do this? + /* FIXME: Can we do this? * Set the blank icon: IDI_SETUPAPI_BLANK = 41 - * it'll be image 24 in the imagelist */ + * It'll be image 24 in the imagelist */ *ClassImage = 24; } @@ -696,7 +696,7 @@ InitHardWareTypesPage(HWND hwndDlg) (VOID) ListView_InsertItem(hList, &Item); - /* kill InfoList initialized in EnumDeviceClasses */ + /* Kill InfoList initialized in EnumDeviceClasses */ if (hDevInfoTypes) { SetupDiDestroyDeviceInfoList(hDevInfoTypes); diff --git a/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc b/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc index 42906f11297..258eab46981 100644 --- a/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc +++ b/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.08 - Fulea Ștefan: minor changes +// 2011.11.08 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_STARTPAGE DIALOG DISCARDABLE 0, 0, 317, 186 diff --git a/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc b/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc index 6bbf55f3bcb..eb3a5a142c8 100644 --- a/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc +++ b/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc @@ -16,7 +16,7 @@ BEGIN LTEXT "2) Vyriei problmy, ktor mete ma s Vam hardvrom.", -1, 121, 78, 185, 16 ICON IDI_WARNINGICON, IDC_WARNINGICON, 124, 109, 20, 20 LTEXT "Ak bolo spolu s Vam hardvrom dodan aj intalan CD, odpora sa, aby ste klikli na tlaidlo Zrui pre zatvorenie tohto sprievodcu a pouili CD od vrobcu pre naintalovanie tohto hardvru.", 503, 150, 106, 155, 50 - LTEXT "Pre pokraovanie kliknite na tlaidlo alej.", -1, 114, 166, 193, 8 //Pokraujte stlaenm tlaidla alej. + LTEXT "Pre pokraovanie kliknite na tlaidlo alej.", -1, 114, 166, 193, 8 // Pokraujte stlaenm tlaidla alej. END IDD_SEARCHPAGE DIALOG DISCARDABLE 0, 0, 317, 143 @@ -33,7 +33,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS CAPTION "Sprievodca pridanm hardvru" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Pripojili ste u tento hardvr k Vmu potau?", -1, 20, 11, 275, 8 //tento = dan + LTEXT "Pripojili ste u tento hardvr k Vmu potau?", -1, 20, 11, 275, 8 // tento = dan AUTORADIOBUTTON "n&o, u som pripojil hardvr", IDC_CONNECTED, 29, 23, 266, 8, WS_GROUP AUTORADIOBUTTON "&Nie, zatia som nepridal hardvr", IDC_NOTCONNECTED, 29, 35, 266, 8 END diff --git a/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc b/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc index e2129e039fb..dc4648f810a 100644 --- a/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc +++ b/reactos/dll/cpl/hdwwiz/lang/uk-UA.rc @@ -1,7 +1,7 @@ /* * PROJECT: Add Hardware Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/hdwwiz/Uk.rc + * FILE: dll/cpl/hdwwiz/lang/uk-UA.rc * PURPOSE: Ukraianian Language File for Add Hardware Control Panel Applet * TRANSLATORS: Artem Reznikov, Igor Paliychuk */ diff --git a/reactos/dll/cpl/input/changekeyseq.c b/reactos/dll/cpl/input/changekeyseq.c index e38cbff7b93..eb6fd3da845 100644 --- a/reactos/dll/cpl/input/changekeyseq.c +++ b/reactos/dll/cpl/input/changekeyseq.c @@ -183,7 +183,7 @@ ChangeKeySeqDlgProc(HWND hDlg, } } break; - + case IDC_SWITCH_KBLAYOUTS_CB: if (HIWORD(wParam) == BN_CLICKED) { diff --git a/reactos/dll/cpl/input/lang/ro-RO.rc b/reactos/dll/cpl/input/lang/ro-RO.rc index 3fea85dab5b..5d1fc144141 100644 --- a/reactos/dll/cpl/input/lang/ro-RO.rc +++ b/reactos/dll/cpl/input/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.10.30 - Fulea Ștefan: minor changes +// 2011.10.30 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_PROPPAGESETTINGS DIALOGEX 0, 0, 254, 228 diff --git a/reactos/dll/cpl/input/lang/sk-SK.rc b/reactos/dll/cpl/input/lang/sk-SK.rc index aeecf8745d8..3b4ac9d37fe 100644 --- a/reactos/dll/cpl/input/lang/sk-SK.rc +++ b/reactos/dll/cpl/input/lang/sk-SK.rc @@ -26,7 +26,7 @@ CAPTION "Roz FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Vypnutie funkcie Caps Lock", -1, 7, 7, 258, 26 - AUTORADIOBUTTON "Stlaenm klvesu CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP //ten klves, nie t klvesa + AUTORADIOBUTTON "Stlaenm klvesu CAPS &LOCK", IDC_PRESS_CL_KEY_RB, 14, 17, 120, 11, WS_GROUP // Ten klves, nie t klvesa AUTORADIOBUTTON " Stlaenm klvesu SHI&FT", IDC_PRESS_SHIFT_KEY_RB, 144, 17, 120, 11, NOT WS_TABSTOP GROUPBOX "Klvesov skratky pre vstupn jazyky", -1, 7, 37, 258, 95 LTEXT "Akcia", -1, 14, 47, 60, 9 @@ -95,7 +95,7 @@ BEGIN IDS_LANGUAGE "Jazyk" IDS_LAYOUT "Rozloenie klvesnice" IDS_REM_QUESTION "Chcete odstrni vybran rozloenie klvesnice?" - IDS_CONFIRMATION "Potvrdenie" //Confirmation + IDS_CONFIRMATION "Potvrdenie" // Confirmation IDS_LAYOUT_EXISTS "Toto rozloenie u existuje." IDS_LAYOUT_EXISTS2 "Toto rozloenie u existuje a neme by pridan." IDS_CTRL_SHIFT "Ctrl+Shift" @@ -114,7 +114,7 @@ BEGIN IDS_ARMENIAN_WESTERN_LAYOUT, "Armnske Western" IDS_ASSAMESE_LAYOUT, "Assamese" IDS_AZERI_CYRILLIC_LAYOUT, "Azeri Cyrillic" - IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" //latinka ? + IDS_AZERI_LATIN_LAYOUT, "Azeri Latin" // Latinka? IDS_BELGIAN_COMMA_LAYOUT, "Belgian (Comma)" IDS_BELGIAN_FRENCH_LAYOUT, "Belgick French" IDS_BELGIAN_LAYOUT, "Belgick (Period)" @@ -240,7 +240,7 @@ BEGIN IDS_UNITED_STATES_DVORAK_FOR_RIGHT_HAND_LAYOUT, "United States-Dvorak for right hand" IDS_UNITED_STATES_INTERNATIONAL_LAYOUT, "United States-International" IDS_URDU_LAYOUT, "Urdu" - IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" //Arabsk + IDS_USENG_TABLE_IBM_ARABIC238L_LAYOUT, "US English Table for IBM Arabic 238_L" // Arabsk IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" IDS_VIETNAMESE_LAYOUT, "Vietnamese" END diff --git a/reactos/dll/cpl/input/lang/zh-CN.rc b/reactos/dll/cpl/input/lang/zh-CN.rc index d69f6b7e5fd..5a6641d9c9c 100644 --- a/reactos/dll/cpl/input/lang/zh-CN.rc +++ b/reactos/dll/cpl/input/lang/zh-CN.rc @@ -1,5 +1,5 @@ /* - *Simplified Chinese resource for input (dll/cpl/input/lang/zh-CN.rc) + * Simplified Chinese resource for input (dll/cpl/input/lang/zh-CN.rc) * * TRANSLATOR: Jingjing Fu (jingjingf AT 188.com) * CREATED: 2009-04-26 diff --git a/reactos/dll/cpl/input/resource.h b/reactos/dll/cpl/input/resource.h index 4147d2c3da5..2a897d197c2 100644 --- a/reactos/dll/cpl/input/resource.h +++ b/reactos/dll/cpl/input/resource.h @@ -1,6 +1,6 @@ #pragma once -/* metrics */ +/* Metrics */ #define PROPSHEETWIDTH 252 #define PROPSHEETHEIGHT 228 #define PROPSHEETPADDING 6 diff --git a/reactos/dll/cpl/input/settings.c b/reactos/dll/cpl/input/settings.c index a55bf0c2502..3da6187805c 100644 --- a/reactos/dll/cpl/input/settings.c +++ b/reactos/dll/cpl/input/settings.c @@ -545,7 +545,7 @@ SaveInputLang(HWND hDlg) _ultot(OldLayoutNum, szLayoutNum, 10); if (!GetLayoutID(szLayoutNum, szLayoutID)) return; - // if old layout = selected layout + // If old layout = selected layout if (_tcscmp(szLayoutID, pts) == 0) return; if (RegOpenKeyEx(HKEY_CURRENT_USER, _T("Keyboard Layout\\Preload"), 0, diff --git a/reactos/dll/cpl/intl/advanced.c b/reactos/dll/cpl/intl/advanced.c index 22c5a11bfc4..48a66bfe331 100644 --- a/reactos/dll/cpl/intl/advanced.c +++ b/reactos/dll/cpl/intl/advanced.c @@ -1,4 +1,3 @@ - #include "intl.h" typedef struct CPStruct diff --git a/reactos/dll/cpl/intl/currency.c b/reactos/dll/cpl/intl/currency.c index c3b10419293..53a1067c903 100644 --- a/reactos/dll/cpl/intl/currency.c +++ b/reactos/dll/cpl/intl/currency.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/currency.c + * FILE: dll/cpl/intl/currency.c * PURPOSE: Currency property page * PROGRAMMER: Eric Kohl */ @@ -36,14 +36,14 @@ UpdateExamples(HWND hwndDlg, PGLOBALDATA pGlobalData) { TCHAR szBuffer[MAX_FMT_SIZE]; - /* positive example */ + /* Positive example */ GetCurrencyFormat(pGlobalData->lcid, 0, POSITIVE_EXAMPLE, NULL, szBuffer, MAX_FMT_SIZE); SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYPOSSAMPLE), WM_SETTEXT, 0, (LPARAM)szBuffer); - /* negative example */ + /* Negative example */ GetCurrencyFormat(pGlobalData->lcid, 0, NEGATIVE_EXAMPLE, NULL, szBuffer, MAX_FMT_SIZE); @@ -75,7 +75,7 @@ InitCurrencySymbols(HWND hwndDlg, PGLOBALDATA pGlobalData) SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYSYMBOL), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); } @@ -251,7 +251,7 @@ InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) LOCALE_SMONDECIMALSEP, szBuffer, MAX_FMT_SIZE); - /* decimal separator */ + /* Decimal separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_ADDSTRING, 0, @@ -259,7 +259,7 @@ InitCurrencyDecimalSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYDECSEP), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); } @@ -321,7 +321,7 @@ InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) LOCALE_SMONTHOUSANDSEP, szBuffer, MAX_FMT_SIZE); - /* digit group separator */ + /* Digit group separator */ SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_ADDSTRING, 0, @@ -329,7 +329,7 @@ InitCurrencyGroupSeparators(HWND hwndDlg, PGLOBALDATA pGlobalData) SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPSEP), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); } @@ -353,7 +353,7 @@ InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData) LOCALE_SMONGROUPING, szGrouping, MAX_FMT_SIZE); - /* digit grouping */ + /* Digit grouping */ cyFmt.NumDigits = 0; cyFmt.LeadingZero = 0; cyFmt.lpDecimalSep = _T(""); @@ -400,7 +400,7 @@ InitDigitGroupCB(HWND hwndDlg, PGLOBALDATA pGlobalData) SendMessage(GetDlgItem(hwndDlg, IDC_CURRENCYGRPNUM), CB_SETCURSEL, - i, /* index */ + i, /* Index */ 0); } @@ -462,7 +462,7 @@ SetCurrencyFracSymNum(HWND hwndDlg, LCID lcid) (WPARAM)0, (LPARAM)0); - /* convert to wide char */ + /* Convert to wide char */ _itot(nCurrSel, szCurrencyFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ @@ -504,7 +504,7 @@ SetNegCurrencySumFmt(HWND hwndDlg, LCID lcid) (WPARAM)0, (LPARAM)0); - /* convert to wide char */ + /* Convert to wide char */ _itot(nCurrSel, szNegCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ @@ -526,7 +526,7 @@ SetPosCurrencySumFmt(HWND hwndDlg, LCID lcid) (WPARAM)0, (LPARAM)0); - /* convert to wide char */ + /* Convert to wide char */ _itot(nCurrSel, szPosCurrencySumFmt, DECIMAL_RADIX); /* Save currency sum format */ @@ -630,7 +630,6 @@ CurrencyPageProc(HWND hwndDlg, } break; } - return FALSE; } diff --git a/reactos/dll/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c index ff7468f870a..2473ae828ae 100644 --- a/reactos/dll/cpl/intl/date.c +++ b/reactos/dll/cpl/intl/date.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/date.c + * FILE: dll/cpl/intl/date.c * PURPOSE: Date property page * PROGRAMMER: Eric Kohl */ @@ -38,7 +38,7 @@ static HWND hwndEnum = NULL; /* FUNCTIONS ****************************************************************/ -/* if char is 'y' or 'M' or 'd' return TRUE, else FALSE */ +/* If char is 'y' or 'M' or 'd' return TRUE, else FALSE */ BOOL isDateCompAl(TCHAR alpha) { @@ -173,7 +173,7 @@ SetShortDateFormat(HWND hwndDlg, LCID lcid) return FALSE; } - /* substring replacement of separator */ + /* Substring replacement of separator */ _tcscpy(szFindedDateSep, FindDateSep(szShortDateFmt)); pszResultStr = ReplaceSubStr(szShortDateFmt, szShortDateSep, szFindedDateSep); _tcscpy(szShortDateFmt, pszResultStr); @@ -278,7 +278,7 @@ InitShortDateSepSamples(HWND hwndDlg, LCID lcid) -1, (LPARAM)szShortDateSep); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new value to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATESEP_COMBO), @@ -342,7 +342,7 @@ InitShortDateCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)szShortDateFmt); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new value to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_SHRTDATEFMT_COMBO), @@ -391,7 +391,7 @@ InitLongDateCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)szLongDateFmt); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new value to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_LONGDATEFMT_COMBO), diff --git a/reactos/dll/cpl/intl/generalp.c b/reactos/dll/cpl/intl/generalp.c index 9cbe5d032b1..c2aa089a144 100644 --- a/reactos/dll/cpl/intl/generalp.c +++ b/reactos/dll/cpl/intl/generalp.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/generalp.c + * FILE: dll/cpl/intl/generalp.c * PURPOSE: General property page * PROGRAMMER: Eric Kohl * Klemens Friedl @@ -176,7 +176,7 @@ SetNewLocale(LCID lcid) ret = RegOpenKey(HKEY_CURRENT_USER, _T("Control Panel\\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // some serious error + // Some serious error MessageBox(NULL, _T("Problem opening HKCU\\Control Panel\\International key"), _T("Big Problem"), MB_OK); return; @@ -191,7 +191,7 @@ SetNewLocale(LCID lcid) ret = RegOpenKey(HKEY_USERS, _T(".DEFAULT\\Control Panel\\International"), &localeKey); if (ret != ERROR_SUCCESS) { - // some serious error + // Some serious error MessageBox(NULL, _T("Problem opening HKU\\.DEFAULT\\Control Panel\\International key"), _T("Big Problem"), MB_OK); return; @@ -451,5 +451,4 @@ GeneralPageProc(HWND hwndDlg, return FALSE; } - /* EOF */ diff --git a/reactos/dll/cpl/intl/inplocale.c b/reactos/dll/cpl/intl/inplocale.c index 785cf902aaa..6451e8a10af 100644 --- a/reactos/dll/cpl/intl/inplocale.c +++ b/reactos/dll/cpl/intl/inplocale.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/inplocale.c + * FILE: dll/cpl/intl/inplocale.c * PURPOSE: Input Locale property page * PROGRAMMER: Eric Kohl */ diff --git a/reactos/dll/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c index d3dc375a306..5610abcf57f 100644 --- a/reactos/dll/cpl/intl/intl.c +++ b/reactos/dll/cpl/intl/intl.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/intl.c + * FILE: dll/cpl/intl/intl.c * PURPOSE: Property sheet code * PROGRAMMER: Eric Kohl */ @@ -207,4 +207,3 @@ DllMain(HINSTANCE hinstDLL, return TRUE; } - diff --git a/reactos/dll/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h index 20dbbba4ff1..29359010ad8 100644 --- a/reactos/dll/cpl/intl/intl.h +++ b/reactos/dll/cpl/intl/intl.h @@ -12,7 +12,7 @@ #define DECIMAL_RADIX 10 -/* limits */ +/* Limits */ #define MAX_FMT_SIZE 30 #define MAX_STR_SIZE 128 #define MAX_SAMPLES_STR_SIZE 70 diff --git a/reactos/dll/cpl/intl/kblayouts.c b/reactos/dll/cpl/intl/kblayouts.c index d1a8f982ab5..4d420b363b8 100644 --- a/reactos/dll/cpl/intl/kblayouts.c +++ b/reactos/dll/cpl/intl/kblayouts.c @@ -238,6 +238,5 @@ AddNewKbLayoutsByLcid(LCID Lcid) } } } - SetupCloseInfFile(hIntlInf); } diff --git a/reactos/dll/cpl/intl/lang/pl-PL.rc b/reactos/dll/cpl/intl/lang/pl-PL.rc index c03fb81ee92..d84a7a82476 100644 --- a/reactos/dll/cpl/intl/lang/pl-PL.rc +++ b/reactos/dll/cpl/intl/lang/pl-PL.rc @@ -5,7 +5,7 @@ * IRC: irc.freenode.net #reactos-pl; * UTF-8 conversion by Caemyr (May, 2011) */ - + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 diff --git a/reactos/dll/cpl/intl/lang/ro-RO.rc b/reactos/dll/cpl/intl/lang/ro-RO.rc index 6ec5bbf1de1..1530a61169a 100644 --- a/reactos/dll/cpl/intl/lang/ro-RO.rc +++ b/reactos/dll/cpl/intl/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.14 - Fulea Ștefan: minor changes +// 2011.11.14 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_GENERALPAGE DIALOGEX 0, 0, 246, 230 diff --git a/reactos/dll/cpl/intl/languages.c b/reactos/dll/cpl/intl/languages.c index 1ae36d94870..28323d782c6 100644 --- a/reactos/dll/cpl/intl/languages.c +++ b/reactos/dll/cpl/intl/languages.c @@ -1,4 +1,3 @@ - #include "intl.h" /* Property page dialog callback */ @@ -40,7 +39,6 @@ LanguagesPageProc(HWND hwndDlg, } break; } - return FALSE; } diff --git a/reactos/dll/cpl/intl/misc.c b/reactos/dll/cpl/intl/misc.c index bd5d5dec7c8..143955c0073 100644 --- a/reactos/dll/cpl/intl/misc.c +++ b/reactos/dll/cpl/intl/misc.c @@ -1,4 +1,3 @@ - #include "intl.h" #define NUM_SHEETS 4 @@ -52,7 +51,7 @@ InsSpacesFmt(LPCTSTR szSourceStr, LPCTSTR szFmtStr) _tcscpy(pszDestStr, szSourceStr); - /* if format is clean return source string */ + /* If format is clean return source string */ if (!*szFmtStr) return pszDestStr; @@ -80,12 +79,12 @@ InsSpacesFmt(LPCTSTR szSourceStr, LPCTSTR szFmtStr) szFmtVal[nValCount] = _T('\0'); nValCount=0; - /* insert space to finded position plus all pos before */ + /* Insert space to finded position plus all pos before */ pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset); _tcscpy(pszDestStr,pszTempStr); free(pszTempStr); - /* num of spaces total increment */ + /* Num of spaces total increment */ if (!wasNul) { nSpaceOffset++; diff --git a/reactos/dll/cpl/intl/numbers.c b/reactos/dll/cpl/intl/numbers.c index e1cae1984d0..e2d86583b9e 100644 --- a/reactos/dll/cpl/intl/numbers.c +++ b/reactos/dll/cpl/intl/numbers.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/numbers.c + * FILE: dll/cpl/intl/numbers.c * PURPOSE: Numbers property page * PROGRAMMER: Eric Kohl */ @@ -95,7 +95,7 @@ InitNumDecimalSepCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)(LPCSTR)szNumSep); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new values to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERDSYMBOL), @@ -132,7 +132,7 @@ InitNumOfFracSymbCB(HWND hwndDlg, LCID lcid) /* Create standard list of fractional symbols */ for (nCBIndex = 0; nCBIndex < MAX_FRAC_NUM_SAMPLES; nCBIndex++) { - /* convert to wide char */ + /* Convert to wide char */ _itot(nCBIndex, szFracCount, DECIMAL_RADIX); SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNDIGDEC), @@ -189,7 +189,7 @@ InitNumFieldSepCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)szFieldSep); - /* if is not success, add new value to list and select them */ + /* If it is not success, add new values to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDIGITGRSYM), @@ -243,7 +243,7 @@ InitFieldDigNumCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)pszFieldDigNumSmpl); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new values to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSDGROUPING), @@ -300,7 +300,7 @@ InitNegSignCB(HWND hwndDlg, LCID lcid) -1, (LPARAM)szNegSign); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new values to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSNSIGNSYM), @@ -464,7 +464,7 @@ InitListSepCB(HWND hwndDlg, -1, (LPARAM)szListSep); - /* if is not success, add new value to list and select them */ + /* If it is not successful, add new values to list and select them */ if (nRetCode == CB_ERR) { SendMessage(GetDlgItem(hwndDlg, IDC_NUMBERSLSEP), @@ -584,7 +584,7 @@ SetFracSymNum(HWND hwndDlg, (WPARAM)0, (LPARAM)0); - /* convert to wide char */ + /* Convert to wide char */ _itot(nCurrSel, szFracSymNum, DECIMAL_RADIX); /* Save number of fractional symbols */ @@ -687,7 +687,7 @@ SetNumLeadZero(HWND hwndDlg, (WPARAM)0, (LPARAM)0); - /* convert to wide char */ + /* Convert to wide char */ _itot(nCurrSel, szLeadZero, DECIMAL_RADIX); /* Save leading zero format */ diff --git a/reactos/dll/cpl/intl/setupreg.c b/reactos/dll/cpl/intl/setupreg.c index b9c464b2b6a..a6f1845d948 100644 --- a/reactos/dll/cpl/intl/setupreg.c +++ b/reactos/dll/cpl/intl/setupreg.c @@ -65,7 +65,7 @@ InsSpacesFmt(const TCHAR *szSourceStr, const TCHAR *szFmtStr) _tcscpy(pszDestStr, szSourceStr); - /* if format is clean return source string */ + /* If format is clean return source string */ if (!*szFmtStr) return pszDestStr; @@ -93,12 +93,12 @@ InsSpacesFmt(const TCHAR *szSourceStr, const TCHAR *szFmtStr) szFmtVal[nValCount] = _T('\0'); nValCount=0; - /* insert space to finded position plus all pos before */ + /* Insert space to finded position plus all pos before */ pszTempStr = InsSpacePos(pszDestStr, nSpaceOffset); _tcscpy(pszDestStr, pszTempStr); free(pszTempStr); - /* num of spaces total increment */ + /* Num of spaces total increment */ if (!wasNul) { nSpaceOffset++; diff --git a/reactos/dll/cpl/intl/time.c b/reactos/dll/cpl/intl/time.c index 7156363813c..8d1043e5de4 100644 --- a/reactos/dll/cpl/intl/time.c +++ b/reactos/dll/cpl/intl/time.c @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS International Control Panel - * FILE: lib/cpl/intl/time.c + * FILE: dll/cpl/intl/time.c * PURPOSE: Time property page * PROGRAMMER: Eric Kohl */ @@ -54,26 +54,26 @@ GetSelectedComboEntry(HWND hwndDlg, DWORD dwIdc, TCHAR *Buffer, UINT uSize) int nIndex; HWND hChildWnd; - /* get handle to time format control */ + /* Get handle to time format control */ hChildWnd = GetDlgItem(hwndDlg, dwIdc); /* Get index to selected time format */ nIndex = SendMessage(hChildWnd, CB_GETCURSEL, 0, 0); if (nIndex == CB_ERR) - /* no selection? get content of the edit control */ + /* No selection? Get content of the edit control */ SendMessage(hChildWnd, WM_GETTEXT, uSize, (LPARAM)Buffer); else { LPTSTR tmp; UINT uReqSize; - /* get requested size, including the null terminator; + /* Get requested size, including the null terminator; * it shouldn't be required because the previous CB_LIMITTEXT, * but it would be better to check it anyways */ uReqSize = SendMessage(hChildWnd, CB_GETLBTEXTLEN, (WPARAM)nIndex, 0) + 1; - /* allocate enough space to be more safe */ + /* Allocate enough space to be more safe */ tmp = (LPTSTR)_alloca(uReqSize*sizeof(TCHAR)); - /* get selected time format text */ + /* Get selected time format text */ SendMessage(hChildWnd, CB_GETLBTEXT, (WPARAM)nIndex, (LPARAM)tmp); - /* finally, copy the result into the output */ + /* Finally, copy the result into the output */ _tcsncpy(Buffer, tmp, uSize); } } @@ -126,7 +126,7 @@ TimePageProc(HWND hwndDlg, (LPARAM)Buffer); SendMessage(GetDlgItem(hwndDlg, IDC_TIMESEPARATOR), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); /* Get the AM symbol */ @@ -146,7 +146,7 @@ TimePageProc(HWND hwndDlg, } SendMessage(GetDlgItem(hwndDlg, IDC_TIMEAMSYMBOL), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); /* Get the PM symbol */ @@ -166,7 +166,7 @@ TimePageProc(HWND hwndDlg, } SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPMSYMBOL), CB_SETCURSEL, - 0, /* index */ + 0, /* Index */ 0); } break; @@ -195,25 +195,25 @@ TimePageProc(HWND hwndDlg, { TCHAR Buffer[80]; - /* get selected/typed time format text */ + /* Get selected/typed time format text */ GetSelectedComboEntry(hwndDlg, IDC_TIMEFORMAT, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set time format */ SetLocaleInfo(pGlobalData->lcid, LOCALE_STIMEFORMAT, Buffer); - /* get selected/typed time separator text */ + /* Get selected/typed time separator text */ GetSelectedComboEntry(hwndDlg, IDC_TIMESEPARATOR, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set time separator */ SetLocaleInfo(pGlobalData->lcid, LOCALE_STIME, Buffer); - /* get selected/typed AM symbol text */ + /* Get selected/typed AM symbol text */ GetSelectedComboEntry(hwndDlg, IDC_TIMEAMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set the AM symbol */ SetLocaleInfo(pGlobalData->lcid, LOCALE_S1159, Buffer); - /* get selected/typed PM symbol text */ + /* Get selected/typed PM symbol text */ GetSelectedComboEntry(hwndDlg, IDC_TIMEPMSYMBOL, Buffer, sizeof(Buffer)/sizeof(TCHAR)); /* Set the PM symbol */ diff --git a/reactos/dll/cpl/joy/joy.c b/reactos/dll/cpl/joy/joy.c index 5fcc48acb72..ce05e33846f 100644 --- a/reactos/dll/cpl/joy/joy.c +++ b/reactos/dll/cpl/joy/joy.c @@ -103,7 +103,7 @@ AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (LOWORD(wParam)) { case SC_CONTEXTHELP: - // not implemented + // Not implemented yet break; } break; @@ -141,7 +141,7 @@ CustomPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (LOWORD(wParam)) { case SC_CONTEXTHELP: - // not implemented + // Not implemented yet break; } break; @@ -186,7 +186,7 @@ AddPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) switch (LOWORD(wParam)) { case SC_CONTEXTHELP: - // not implemented + // Not implemented yet break; } break; @@ -240,7 +240,7 @@ MainPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) break; case SC_CONTEXTHELP: - // not implemented + // Not implemented yet break; } break; diff --git a/reactos/dll/cpl/joy/lang/cs-CZ.rc b/reactos/dll/cpl/joy/lang/cs-CZ.rc index 977cf2f888d..a07fc689321 100644 --- a/reactos/dll/cpl/joy/lang/cs-CZ.rc +++ b/reactos/dll/cpl/joy/lang/cs-CZ.rc @@ -2,7 +2,7 @@ * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) * UPDATED: 2009-01-10 */ - + LANGUAGE LANG_CZECH, SUBLANG_DEFAULT IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 diff --git a/reactos/dll/cpl/joy/lang/ro-RO.rc b/reactos/dll/cpl/joy/lang/ro-RO.rc index c12e7b7526b..bb2281c721b 100644 --- a/reactos/dll/cpl/joy/lang/ro-RO.rc +++ b/reactos/dll/cpl/joy/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.20 - Fulea Ștefan: minor changes +// 2011.11.20 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 diff --git a/reactos/dll/cpl/joy/lang/sk-SK.rc b/reactos/dll/cpl/joy/lang/sk-SK.rc index c3b4c37295f..9c6c44087d3 100644 --- a/reactos/dll/cpl/joy/lang/sk-SK.rc +++ b/reactos/dll/cpl/joy/lang/sk-SK.rc @@ -7,7 +7,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT IDD_PROPPAGEMAIN DIALOGEX 0, 0, 252, 205 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUPWINDOW | WS_CAPTION EXSTYLE WS_EX_CONTEXTHELP -CAPTION "Hracie zariadenia" //Game Controllers +CAPTION "Hracie zariadenia" // Game Controllers FONT 8, "MS Shell Dlg" BEGIN ICON IDI_CPLSYSTEM, -1, 7, 7, 20, 20 @@ -18,7 +18,7 @@ BEGIN PUSHBUTTON "O&dstrni", IDC_REMOVE_BUTTON, 104, 129, 65, 14, WS_DISABLED PUSHBUTTON "&Vlastnosti", IDC_PROPERTIES_BUTTON, 173, 129, 65, 14, WS_DISABLED PUSHBUTTON "&Spresni...", IDC_ADVANCED_BUTTON, 96, 157, 65, 14 - PUSHBUTTON "&Rieenie problmov...", IDC_TROUBLESHOOT_BUTTON, 165, 157, 80, 14 //Troubleshoot = Rieenie problmov + PUSHBUTTON "&Rieenie problmov...", IDC_TROUBLESHOOT_BUTTON, 165, 157, 80, 14 // Troubleshoot = Rieenie problmov PUSHBUTTON "OK", IDOK, 195, 185, 50, 14 END @@ -47,7 +47,7 @@ EXSTYLE WS_EX_CONTEXTHELP CAPTION "Vlastn hracie zariadenie" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Charakter zariadenia", -1, 7, 7, 245, 52 //Special characteristics + GROUPBOX "Charakter zariadenia", -1, 7, 7, 245, 52 // Special characteristics AUTORADIOBUTTON "&Pkov ovlda", IDC_JOYSTICK_RADIO, 17, 23, 80, 10 AUTORADIOBUTTON "O&vldacia pka lietadla", IDC_FLIGHT_YOKE_RADIO, 147, 23, 89, 10 AUTORADIOBUTTON "&Gamepad", IDC_GAME_PAD_RADIO, 17, 40, 65, 10 diff --git a/reactos/dll/cpl/joy/resource.h b/reactos/dll/cpl/joy/resource.h index 17efe670339..d8c31dce51e 100644 --- a/reactos/dll/cpl/joy/resource.h +++ b/reactos/dll/cpl/joy/resource.h @@ -1,21 +1,21 @@ #pragma once -/* icons */ +/* Icons */ #define IDI_CPLSYSTEM 102 -/* dialogs */ +/* Dialogs */ #define IDD_PROPPAGEMAIN 101 #define IDD_ADD 119 #define IDD_CUSTOM 4099 #define IDD_ADVANCED 8188 -/* strings */ +/* Strings */ #define IDS_CPLSYSTEMNAME 1076 #define IDS_CPLSYSTEMDESCRIPTION 1099 #define IDS_CONTROLLER 1151 #define IDS_STATUS 1152 -/* controls */ +/* Controls */ #define IDC_CONTROLLER_LIST 1020 #define IDC_ADD_BUTTON 1011 #define IDC_REMOVE_BUTTON 1028 diff --git a/reactos/dll/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c index 958f5eb0ef6..2f098a72d05 100644 --- a/reactos/dll/cpl/main/keyboard.c +++ b/reactos/dll/cpl/main/keyboard.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS Main Control Panel - * FILE: lib/cpl/main/keyboard.c + * FILE: dll/cpl/main/keyboard.c * PURPOSE: Keyboard Control Panel * PROGRAMMER: Eric Kohl */ diff --git a/reactos/dll/cpl/main/lang/bg-BG.rc b/reactos/dll/cpl/main/lang/bg-BG.rc index 05897d14378..a49f6aef5d1 100644 --- a/reactos/dll/cpl/main/lang/bg-BG.rc +++ b/reactos/dll/cpl/main/lang/bg-BG.rc @@ -1,4 +1,4 @@ -// Location: \dll\cpl\main\lang +// Location: dll/cpl/main/lang/bg-BG.rc LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 diff --git a/reactos/dll/cpl/main/lang/pl-PL.rc b/reactos/dll/cpl/main/lang/pl-PL.rc index e6ec1677587..3d0d47bf89c 100644 --- a/reactos/dll/cpl/main/lang/pl-PL.rc +++ b/reactos/dll/cpl/main/lang/pl-PL.rc @@ -4,7 +4,7 @@ * https://sourceforge.net/projects/reactospl * UTF-8 conversion by Caemyr (May, 2011) */ - + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 diff --git a/reactos/dll/cpl/main/lang/ro-RO.rc b/reactos/dll/cpl/main/lang/ro-RO.rc index f936ef231da..343d1415e3d 100644 --- a/reactos/dll/cpl/main/lang/ro-RO.rc +++ b/reactos/dll/cpl/main/lang/ro-RO.rc @@ -1,4 +1,4 @@ -//2011.11.20 - Fulea Ștefan: minor changes +// 2011.11.20 - Fulea Ștefan: minor changes LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT IDD_KEYBSPEED DIALOGEX 0, 0, 246, 228 diff --git a/reactos/dll/cpl/main/lang/sk-SK.rc b/reactos/dll/cpl/main/lang/sk-SK.rc index ab607b955e8..d8e51df1489 100644 --- a/reactos/dll/cpl/main/lang/sk-SK.rc +++ b/reactos/dll/cpl/main/lang/sk-SK.rc @@ -20,8 +20,8 @@ BEGIN CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 LTEXT "&Rchlos opakovania:", -1, 40, 70, 50, 10 - LTEXT "mal", -1, 40, 85, 20, 10 //pomaly - LTEXT "vek", -1, 200, 85, 20, 10 //rchlo + LTEXT "mal", -1, 40, 85, 20, 10 // pomaly + LTEXT "vek", -1, 200, 85, 20, 10 // rchlo CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 LTEXT "Kliknite sem a podrte klves k o&testovaniu rchlosti opakovania:", -1, 15, 105, 150, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP diff --git a/reactos/dll/cpl/main/main.c b/reactos/dll/cpl/main/main.c index 379ab8985ea..1853aa410b5 100644 --- a/reactos/dll/cpl/main/main.c +++ b/reactos/dll/cpl/main/main.c @@ -19,7 +19,7 @@ /* $Id$ * * PROJECT: ReactOS Sample Control Panel - * FILE: lib/cpl/main/main.c + * FILE: dll/cpl/main/main.c * PURPOSE: ReactOS Main Control Panel * PROGRAMMER: Eric Kohl * UPDATE HISTORY: @@ -141,4 +141,3 @@ DllMain(HINSTANCE hinstDLL, return TRUE; } - diff --git a/reactos/dll/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c index a015793add0..c11194e9815 100644 --- a/reactos/dll/cpl/main/mouse.c +++ b/reactos/dll/cpl/main/mouse.c @@ -19,14 +19,14 @@ /* $Id$ * * PROJECT: ReactOS Main Control Panel - * FILE: lib/cpl/main/mouse.c + * FILE: dll/cpl/main/mouse.c * PURPOSE: Mouse Control Panel * PROGRAMMER: Eric Kohl * Johannes Anderwald */ -//TODO: -// add missing icons +// TODO: +// Add missing icons #include "main.h" @@ -46,8 +46,8 @@ typedef struct _BUTTON_DATA ULONG g_OrigSwapMouseButtons; ULONG g_DoubleClickSpeed; // = DEFAULT_DOUBLE_CLICK_SPEED; ULONG g_OrigDoubleClickSpeed; - BOOL g_ClickLockEnabled; // = 0; - DWORD g_ClickLockTime; // = DEFAULT_CLICK_LOCK_TIME; + BOOL g_ClickLockEnabled; // = 0; + DWORD g_ClickLockTime; // = DEFAULT_CLICK_LOCK_TIME; HICON hButtonLeft; HICON hButtonRight; @@ -363,7 +363,7 @@ ButtonProc(IN HWND hwndDlg, { pButtonData->g_OrigSwapMouseButtons = pButtonData->g_SwapMouseButtons; SystemParametersInfo(SPI_SETMOUSEBUTTONSWAP, pButtonData->g_OrigSwapMouseButtons, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - + } SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); //SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); @@ -399,7 +399,7 @@ ButtonProc(IN HWND hwndDlg, case TB_ENDTRACK: lResult = SendDlgItemMessage(hwndDlg, IDC_SLIDER_DOUBLE_CLICK_SPEED, TBM_GETPOS, 0, 0); pButtonData->g_DoubleClickSpeed = (14 - (INT)lResult) * 50 + 200; - //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + //SystemParametersInfo(SPI_SETDOUBLECLICKTIME, pButtonData->g_DoubleClickSpeed, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); SetDoubleClickTime(pButtonData->g_DoubleClickSpeed); PropSheet_Changed(GetParent(hwndDlg), hwndDlg); break; @@ -1001,12 +1001,12 @@ LoadNewCursorScheme(HWND hwndDlg) SendDlgItemMessage(hwndDlg, IDC_COMBO_CURSOR_SCHEME, CB_GETLBTEXT, nSel, (LPARAM)buffer); LoadString(hApplet, IDS_SYSTEM_SCHEME, szSystemScheme, MAX_PATH); - if (_tcsstr(buffer, szSystemScheme) || nSel == 0) //avoid the default scheme can be deleted + if (_tcsstr(buffer, szSystemScheme) || nSel == 0) // Avoid the default scheme - Can be deleted bEnable = FALSE; else bEnable = TRUE; - /* delete button */ + /* Delete button */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_BUTTON_DELETE_SCHEME); EnableWindow(hDlgCtrl, bEnable); @@ -1397,19 +1397,19 @@ OptionProc(IN HWND hwndDlg, pOptionData->OrigMouseAccel.nThreshold1 = pOptionData->MouseAccel.nThreshold1; pOptionData->OrigMouseAccel.nThreshold2 = pOptionData->MouseAccel.nThreshold2; - /* snap to default button */ + /* Snap to default button */ SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->bSnapToDefaultButton, 0); pOptionData->bOrigSnapToDefaultButton = pOptionData->bSnapToDefaultButton; - /* mouse trails */ + /* Mouse trails */ SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0); pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; - /* hide pointer while typing */ + /* Hide pointer while typing */ SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->bMouseVanish, 0); pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; - /* show pointer with Ctrl-Key */ + /* Show pointer with Ctrl-Key */ SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->bMouseSonar, 0); pOptionData->bOrigMouseSonar = pOptionData->bMouseSonar; @@ -1430,7 +1430,7 @@ OptionProc(IN HWND hwndDlg, SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } - /* set mouse trail */ + /* Set mouse trail */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5)); if (pOptionData->uMouseTrails < 2) @@ -1572,7 +1572,7 @@ OptionProc(IN HWND hwndDlg, } - /* set snap to default button */ + /* Set snap to default button */ if (pOptionData->bOrigSnapToDefaultButton != pOptionData->bSnapToDefaultButton) { SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, (UINT)pOptionData->bSnapToDefaultButton, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); @@ -1586,14 +1586,14 @@ OptionProc(IN HWND hwndDlg, pOptionData->uOrigMouseTrails = pOptionData->uMouseTrails; } - /* hide pointer while typing */ + /* Hide pointer while typing */ if (pOptionData->bOrigMouseVanish != pOptionData->bMouseVanish) { SystemParametersInfo(SPI_SETMOUSEVANISH, 0, IntToPtr(pOptionData->bMouseVanish), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); pOptionData->bOrigMouseVanish = pOptionData->bMouseVanish; } - /* show pointer with Ctrl-Key */ + /* Show pointer with Ctrl-Key */ if (pOptionData->bOrigMouseSonar != pOptionData->bMouseSonar) { SystemParametersInfo(SPI_SETMOUSESONAR, 0, IntToPtr(pOptionData->bMouseSonar), SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); diff --git a/reactos/dll/cpl/mmsys/audio.c b/reactos/dll/cpl/mmsys/audio.c index 775d94282e0..d190c944045 100644 --- a/reactos/dll/cpl/mmsys/audio.c +++ b/reactos/dll/cpl/mmsys/audio.c @@ -1,7 +1,7 @@ /* * * PROJECT: ReactOS Multimedia Control Panel - * FILE: lib/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller * Johannes Anderwald @@ -212,7 +212,7 @@ AudioDlgProc(HWND hwndDlg, case IDC_ADV2_BTN: { - + } break; @@ -231,7 +231,7 @@ AudioDlgProc(HWND hwndDlg, case IDC_ADV1_BTN: { - + } break; @@ -250,7 +250,7 @@ AudioDlgProc(HWND hwndDlg, case IDC_ADV3_BTN: { - + } break; } diff --git a/reactos/dll/cpl/mmsys/lang/nl-NL.rc b/reactos/dll/cpl/mmsys/lang/nl-NL.rc index fb62de1f1f9..c23785d13c0 100644 --- a/reactos/dll/cpl/mmsys/lang/nl-NL.rc +++ b/reactos/dll/cpl/mmsys/lang/nl-NL.rc @@ -1,4 +1,4 @@ -//update jansssens +// Update jansssens LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_VOLUME DIALOGEX 0, 0, 246, 228 diff --git a/reactos/dll/cpl/mmsys/lang/sk-SK.rc b/reactos/dll/cpl/mmsys/lang/sk-SK.rc index 7ca4b027407..2f27356484c 100644 --- a/reactos/dll/cpl/mmsys/lang/sk-SK.rc +++ b/reactos/dll/cpl/mmsys/lang/sk-SK.rc @@ -239,7 +239,7 @@ BEGIN IDS_CPLNAME "Zvuk a zvukov zariadenia" IDS_CPLDESCRIPTION "Changes the sound scheme for your computer, or configure the settings for your speakers and recording devices." IDS_NO_SOUND "(iadne)" - IDS_NO_DEVICES "iadne zariadenia" + IDS_NO_DEVICES "iadne zariadenia" 5825 "Chyba programu" 5826 "Zavrie program" @@ -260,15 +260,15 @@ BEGIN 5841 "Restore Down" 5842 "Restore Up" 5843 "Hviezdika" - 5844 "Predvolen zvuk" //Default sound + 5844 "Predvolen zvuk" // Default sound 5845 "Vkrik" 5846 "Ukonenie systmu ReactOS" 5847 "Kritick zastavenie" - 5848 "Hlsenie systmu" //System notif. + 5848 "Hlsenie systmu" // System notif. 5849 "Otzka" 5850 "Spustenie systmu ReactOS" 5851 "Ponuka tart" 5852 "Odhlsenie zo systmu ReactOS" 5853 "Prihlsenie do systmu ReactOS" - 5854 "ReactOS Explorer" + 5854 "ReactOS Explorer" END diff --git a/reactos/dll/cpl/mmsys/mmsys.c b/reactos/dll/cpl/mmsys/mmsys.c index 9b32a7ef04a..0b0988bd9aa 100644 --- a/reactos/dll/cpl/mmsys/mmsys.c +++ b/reactos/dll/cpl/mmsys/mmsys.c @@ -310,7 +310,8 @@ InstallSystemSoundScheme() RegCloseKey(hNames); if (dwDisposition & REG_CREATED_NEW_KEY) { - RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)L".Default", (wcslen(L".Default")+1) * sizeof(WCHAR)); //FIXME + // FIXME + RegSetValueExW(hSubKey, NULL, 0, REG_SZ, (LPBYTE)L".Default", (wcslen(L".Default")+1) * sizeof(WCHAR)); } } @@ -404,7 +405,7 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) hService = OpenService(hSCManager, L"RosAudioSrv", SERVICE_ALL_ACCESS); if (hService) { - /* make RosAudioSrv start automatically */ + /* Make RosAudioSrv start automatically */ ChangeServiceConfig(hService, SERVICE_NO_CHANGE, SERVICE_AUTO_START, SERVICE_NO_CHANGE, NULL, NULL, NULL, NULL, NULL, NULL, NULL); StartService(hService, 0, NULL); @@ -439,7 +440,7 @@ MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) if (!wcsicmp(Buffer, szBuffer)) { - /* an entry already exists */ + /* An entry already exists */ break; } } @@ -525,7 +526,7 @@ HardwareDlgProc(HWND hwndDlg, Guids[0] = GUID_DEVCLASS_CDROM; Guids[1] = GUID_DEVCLASS_MEDIA; - /* create the hardware page */ + /* Create the hardware page */ DeviceCreateHardwarePageEx(hwndDlg, Guids, sizeof(Guids) / sizeof(Guids[0]), @@ -544,7 +545,7 @@ MmSysApplet(HWND hwnd, LPARAM lParam) { PROPSHEETPAGE psp[5]; - PROPSHEETHEADER psh; //= {0}; + PROPSHEETHEADER psh; // = { 0 }; TCHAR Caption[256]; UNREFERENCED_PARAMETER(lParam); diff --git a/reactos/dll/cpl/mmsys/sounds.c b/reactos/dll/cpl/mmsys/sounds.c index 01297a02e78..f48d8d272be 100644 --- a/reactos/dll/cpl/mmsys/sounds.c +++ b/reactos/dll/cpl/mmsys/sounds.c @@ -1,7 +1,7 @@ /* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ * * PROJECT: ReactOS Multimedia Control Panel - * FILE: lib/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller * Johannes Anderwald @@ -19,7 +19,7 @@ typedef struct __LABEL_MAP__ TCHAR * szIcon; struct __APP_MAP__ * AppMap; struct __LABEL_MAP__ * Next; -}LABEL_MAP, *PLABEL_MAP; +} LABEL_MAP, *PLABEL_MAP; typedef struct __APP_MAP__ { @@ -29,7 +29,7 @@ typedef struct __APP_MAP__ struct __APP_MAP__ *Next; PLABEL_MAP LabelMap; -}APP_MAP, *PAPP_MAP; +} APP_MAP, *PAPP_MAP; typedef struct __LABEL_CONTEXT__ { @@ -37,14 +37,14 @@ typedef struct __LABEL_CONTEXT__ PAPP_MAP AppMap; TCHAR szValue[MAX_PATH]; struct __LABEL_CONTEXT__ *Next; -}LABEL_CONTEXT, *PLABEL_CONTEXT; +} LABEL_CONTEXT, *PLABEL_CONTEXT; typedef struct __SOUND_SCHEME_CONTEXT__ { TCHAR szName[MAX_PATH]; TCHAR szDesc[MAX_PATH]; PLABEL_CONTEXT LabelContext; -}SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; +} SOUND_SCHEME_CONTEXT, *PSOUND_SCHEME_CONTEXT; static PLABEL_MAP s_Map = NULL; static PAPP_MAP s_App = NULL; @@ -56,7 +56,7 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) { PLABEL_MAP pMap = s_Map; - while(pMap) + while (pMap) { ASSERT(pMap); ASSERT(pMap->szName); @@ -64,12 +64,11 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) return pMap; pMap = pMap->Next; - } pMap = pAppMap->LabelMap; - while(pMap) + while (pMap) { ASSERT(pMap); ASSERT(pMap->szName); @@ -77,7 +76,6 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) return pMap; pMap = pMap->Next; - } pMap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LABEL_MAP)); @@ -90,6 +88,7 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) HeapFree(GetProcessHeap(), 0, pMap); return NULL; } + pMap->AppMap = pAppMap; pMap->Next = s_Map; s_Map = pMap; @@ -97,6 +96,7 @@ PLABEL_MAP FindLabel(PAPP_MAP pAppMap, TCHAR * szName) return pMap; } + VOID RemoveLabel(PLABEL_MAP pMap) { PLABEL_MAP pCurMap = s_Map; @@ -107,8 +107,7 @@ VOID RemoveLabel(PLABEL_MAP pMap) return; } - - while(pCurMap) + while (pCurMap) { if (pCurMap->Next == pMap) { @@ -120,15 +119,11 @@ VOID RemoveLabel(PLABEL_MAP pMap) } - - - - PAPP_MAP FindApp(TCHAR * szName) { PAPP_MAP pMap = s_App; - while(pMap) + while (pMap) { if (!_tcscmp(pMap->szName, szName)) return pMap; @@ -139,18 +134,19 @@ PAPP_MAP FindApp(TCHAR * szName) return NULL; } + PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppName, TCHAR * LabelName) { PLABEL_CONTEXT pLabelContext; pLabelContext = pSoundScheme->LabelContext; - while(pLabelContext) + while (pLabelContext) { ASSERT(pLabelContext->AppMap); ASSERT(pLabelContext->LabelMap); - if(!_tcsicmp(pLabelContext->AppMap->szName, AppName) && !_tcsicmp(pLabelContext->LabelMap->szName, LabelName)) + if (!_tcsicmp(pLabelContext->AppMap->szName, AppName) && !_tcsicmp(pLabelContext->LabelMap->szName, LabelName)) { return pLabelContext; } @@ -172,6 +168,7 @@ PLABEL_CONTEXT FindLabelContext(PSOUND_SCHEME_CONTEXT pSoundScheme, TCHAR * AppN return pLabelContext; } + BOOL LoadEventLabel(HKEY hKey, TCHAR * szSubKey) { @@ -237,6 +234,7 @@ LoadEventLabel(HKEY hKey, TCHAR * szSubKey) return TRUE; } + BOOL LoadEventLabels() { @@ -278,12 +276,13 @@ LoadEventLabels() } dwCurKey++; - }while(dwResult == ERROR_SUCCESS); + } while (dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); return (dwCount != 0); } + BOOL AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) { @@ -331,6 +330,7 @@ AddSoundProfile(HWND hwndDlg, HKEY hKey, TCHAR * szSubKey, BOOL SetDefault) return FALSE; } + DWORD EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) { @@ -383,12 +383,13 @@ EnumerateSoundProfiles(HWND hwndDlg, HKEY hKey) } dwCurKey++; - }while(dwResult == ERROR_SUCCESS); + } while (dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); return dwNumSchemes; } + PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) { LRESULT lCount, lIndex, lResult; @@ -416,6 +417,8 @@ PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, TCHAR * szName) } return NULL; } + + BOOL ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName, TCHAR * szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { @@ -427,13 +430,11 @@ ImportSoundLabel(HWND hwndDlg, HKEY hKey, TCHAR * szProfile, TCHAR * szLabelName PLABEL_CONTEXT pLabelContext; BOOL bCurrentProfile, bActiveProfile; - //MessageBox(hwndDlg, szProfile, szLabelName, MB_OK); bCurrentProfile = !_tcsicmp(szProfile, _T(".Current")); bActiveProfile = !_tcsicmp(szProfile, szDefault); - if (RegOpenKeyEx(hKey, szProfile, 0, @@ -533,7 +534,7 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName } dwCurKey++; - }while(dwResult == ERROR_SUCCESS); + } while (dwResult == ERROR_SUCCESS); RegCloseKey(hSubKey); @@ -541,7 +542,6 @@ ImportSoundEntry(HWND hwndDlg, HKEY hKey, TCHAR * szLabelName, TCHAR * szAppName } - DWORD ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) { @@ -626,11 +626,13 @@ ImportAppProfile(HWND hwndDlg, HKEY hKey, TCHAR * szAppName) } } dwCurKey++; - }while(dwResult == ERROR_SUCCESS); + } while (dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); return dwNumEntry; } + BOOL ImportSoundProfiles(HWND hwndDlg, HKEY hKey) { @@ -666,14 +668,14 @@ ImportSoundProfiles(HWND hwndDlg, HKEY hKey) } } dwCurKey++; - }while(dwResult == ERROR_SUCCESS); + } while (dwResult == ERROR_SUCCESS); + RegCloseKey(hSubKey); return (dwNumApps != 0); } - BOOL LoadSoundProfiles(HWND hwndDlg) { @@ -697,9 +699,12 @@ LoadSoundProfiles(HWND hwndDlg) //MessageBox(hwndDlg, _T("importing sound profiles..."), NULL, MB_OK); ImportSoundProfiles(hwndDlg, hSubKey); } + RegCloseKey(hSubKey); return FALSE; } + + BOOL LoadSoundFiles(HWND hwndDlg) { @@ -757,14 +762,13 @@ LoadSoundFiles(HWND hwndDlg) wcscpy(&szPath[length-1], FileData.cFileName); SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)_wcsdup(szPath)); } - }while(FindNextFileW(hFile, &FileData) != 0); + } while (FindNextFileW(hFile, &FileData) != 0); FindClose(hFile); return TRUE; } - BOOL ShowSoundScheme(HWND hwndDlg) { @@ -804,10 +808,10 @@ ShowSoundScheme(HWND hwndDlg) ItemIndex = 0; pAppMap = s_App; - while(pAppMap) + while (pAppMap) { PLABEL_MAP pLabelMap = pAppMap->LabelMap; - while(pLabelMap) + while (pLabelMap) { ZeroMemory(&listItem, sizeof(LV_ITEM)); listItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; @@ -825,6 +829,7 @@ ShowSoundScheme(HWND hwndDlg) return TRUE; } + BOOL ApplyChanges(HWND hwndDlg) { @@ -873,7 +878,7 @@ ApplyChanges(HWND hwndDlg) pLabelContext = pScheme->LabelContext; - while(pLabelContext) + while (pLabelContext) { _stprintf(Buffer, _T("%s\\%s\\.Current"), pLabelContext->AppMap->szName, pLabelContext->LabelMap->szName); @@ -900,7 +905,7 @@ SoundsDlgProc(HWND hwndDlg, WPARAM wParam, LPARAM lParam) { - switch(uMsg) + switch (uMsg) { case WM_INITDIALOG: { @@ -930,7 +935,7 @@ SoundsDlgProc(HWND hwndDlg, } case WM_COMMAND: { - switch(LOWORD(wParam)) + switch (LOWORD(wParam)) { case IDC_PLAY_SOUND: { @@ -1002,7 +1007,7 @@ SoundsDlgProc(HWND hwndDlg, { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); /// - /// should store in current member + /// Should store in current member /// _tcscpy(pLabelContext->szValue, (TCHAR*)lResult); } diff --git a/reactos/dll/cpl/mmsys/voice.c b/reactos/dll/cpl/mmsys/voice.c index f19fe69438c..2061e17bc4b 100644 --- a/reactos/dll/cpl/mmsys/voice.c +++ b/reactos/dll/cpl/mmsys/voice.c @@ -1,7 +1,7 @@ /* * * PROJECT: ReactOS Multimedia Control Panel - * FILE: lib/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller * Johannes Anderwald diff --git a/reactos/dll/cpl/mmsys/volume.c b/reactos/dll/cpl/mmsys/volume.c index 836b13d4596..efe050a9739 100644 --- a/reactos/dll/cpl/mmsys/volume.c +++ b/reactos/dll/cpl/mmsys/volume.c @@ -1,7 +1,7 @@ /* $Id: main.c 12852 2005-01-06 13:58:04Z mf $ * * PROJECT: ReactOS Multimedia Control Panel - * FILE: lib/cpl/mmsys/mmsys.c + * FILE: dll/cpl/mmsys/mmsys.c * PURPOSE: ReactOS Multimedia Control Panel * PROGRAMMER: Thomas Weidenmueller * Johannes Anderwald @@ -60,6 +60,7 @@ InitImageInfo(PIMGINFO ImgInfo) } } + VOID GetMuteControl(PGLOBAL_DATA pGlobalData) { @@ -89,6 +90,7 @@ GetMuteControl(PGLOBAL_DATA pGlobalData) pGlobalData->muteControlID = mxc.dwControlID; } + VOID GetMuteState(PGLOBAL_DATA pGlobalData) { @@ -112,6 +114,7 @@ GetMuteState(PGLOBAL_DATA pGlobalData) pGlobalData->muteVal = mxcdMute.fValue; } + VOID SwitchMuteState(PGLOBAL_DATA pGlobalData) { @@ -133,6 +136,7 @@ SwitchMuteState(PGLOBAL_DATA pGlobalData) pGlobalData->muteVal = mxcdMute.fValue; } + VOID GetVolumeControl(PGLOBAL_DATA pGlobalData) { @@ -164,6 +168,7 @@ GetVolumeControl(PGLOBAL_DATA pGlobalData) pGlobalData->volumeControlID = mxc.dwControlID; } + VOID GetVolumeValue(PGLOBAL_DATA pGlobalData) { @@ -187,6 +192,7 @@ GetVolumeValue(PGLOBAL_DATA pGlobalData) pGlobalData->volumeValue = mxcdVolume.dwValue; } + VOID SetVolumeValue(PGLOBAL_DATA pGlobalData){ MIXERCONTROLDETAILS_UNSIGNED mxcdVolume; @@ -269,6 +275,7 @@ InitVolumeControls(HWND hwndDlg, PGLOBAL_DATA pGlobalData) SendDlgItemMessage(hwndDlg, IDC_VOLUME_TRACKBAR, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pGlobalData->volumeValue/VOLUME_DIVIDER); } + VOID LaunchSoundControl(HWND hwndDlg) { @@ -322,10 +329,10 @@ VolumeDlgProc(HWND hwndDlg, { pGlobalData = (GLOBAL_DATA*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(GLOBAL_DATA)); SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pGlobalData); - + pGlobalData->hIconUnMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_CPLICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); pGlobalData->hIconMuted = LoadImage(hApplet, MAKEINTRESOURCE(IDI_MUTED_ICON), IMAGE_ICON, 32, 32, LR_DEFAULTCOLOR); - + InitImageInfo(&ImgInfo); InitVolumeControls(hwndDlg, pGlobalData); break; @@ -340,7 +347,7 @@ VolumeDlgProc(HWND hwndDlg, HDC hdcMem; LONG left; - /* position image in centre of dialog */ + /* Position image in centre of dialog */ left = (lpDrawItem->rcItem.right - ImgInfo.cxSource) / 2; hdcMem = CreateCompatibleDC(lpDrawItem->hDC); diff --git a/reactos/dll/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c index 5019e07f9a1..4cf865baf1e 100644 --- a/reactos/dll/cpl/ncpa/ncpa.c +++ b/reactos/dll/cpl/ncpa/ncpa.c @@ -1,6 +1,6 @@ /* * PROJECT: ReactOS Network Control Panel - * FILE: lib/cpl/system/ncpa.c + * FILE: dll/cpl/ncpa/ncpa.c * PURPOSE: ReactOS Network Control Panel * PROGRAMMER: Gero Kuehn (reactos.filter@gkware.com) * UPDATE HISTORY: @@ -19,8 +19,7 @@ LONG CALLBACK DisplayApplet(VOID) { WCHAR szParameters[160]; - //FIXME - // use correct path + // FIXME: Use correct path //::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\::{21EC2020-3AEA-1069-A2DD-08002B30309D}\::{7007ACC7-3202-11D1-AAD2-00805FC1270E} wcscpy(szParameters, L"/n,::{20D04FE0-3AEA-1069-A2D8-08002B30309D}\\::{7007ACC7-3202-11D1-AAD2-00805FC1270E}"); diff --git a/reactos/dll/cpl/odbccp32/odbccp32.c b/reactos/dll/cpl/odbccp32/odbccp32.c index 939fac0602d..7b3e787869b 100644 --- a/reactos/dll/cpl/odbccp32/odbccp32.c +++ b/reactos/dll/cpl/odbccp32/odbccp32.c @@ -1,7 +1,7 @@ /* $Id$ * * PROJECT: ReactOS ODBC Control Panel Applet - * FILE: lib/cpl/main/main.c + * FILE: dll/cpl/main/main.c * PURPOSE: applet initialization * PROGRAMMER: Johannes Anderwald */ @@ -77,4 +77,3 @@ DllMain(HINSTANCE hinstDLL, return TRUE; } - diff --git a/reactos/dll/cpl/powercfg/advanced.c b/reactos/dll/cpl/powercfg/advanced.c index 15313f259c4..8fffcfdb04b 100644 --- a/reactos/dll/cpl/powercfg/advanced.c +++ b/reactos/dll/cpl/powercfg/advanced.c @@ -180,8 +180,6 @@ SaveCurrentPowerActionPolicy(IN HWND hDlgCtrl, } - - //------------------------------------------------------------------- VOID @@ -394,7 +392,6 @@ Adv_InitDialog(VOID) } } - static VOID Adv_SaveData(HWND hwndDlg) { diff --git a/reactos/dll/cpl/powercfg/alarms.c b/reactos/dll/cpl/powercfg/alarms.c index df44386c416..d58293203d9 100644 --- a/reactos/dll/cpl/powercfg/alarms.c +++ b/reactos/dll/cpl/powercfg/alarms.c @@ -177,8 +177,8 @@ AlarmsDlgProc(HWND hwndDlg, case WM_INITDIALOG: if (!Ala_InitData(hwndDlg)) { - //TODO - //handle initialization error + // TODO: + // Handle initialization error } return TRUE; default: diff --git a/reactos/dll/cpl/powercfg/hibernate.c b/reactos/dll/cpl/powercfg/hibernate.c index 1b69cc8c95b..1ea6ea3f273 100644 --- a/reactos/dll/cpl/powercfg/hibernate.c +++ b/reactos/dll/cpl/powercfg/hibernate.c @@ -38,7 +38,7 @@ Hib_InitDialog(HWND hwndDlg) msex.dwLength = sizeof(msex); if (!GlobalMemoryStatusEx(&msex)) { - return; //FIXME + return; // FIXME } if (GetWindowsDirectory(szTemp,MAX_PATH)) diff --git a/reactos/dll/cpl/powercfg/lang/bg-BG.rc b/reactos/dll/cpl/powercfg/lang/bg-BG.rc index dcc8f486de5..63ef10eb2f1 100644 --- a/reactos/dll/cpl/powercfg/lang/bg-BG.rc +++ b/reactos/dll/cpl/powercfg/lang/bg-BG.rc @@ -1,4 +1,4 @@ -// English (en) resources by Lohegrim (Lohnegrim at gmx dot net) +// Bulgarian resources LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 " 4 " IDS_TIMEOUT15 " 5 " IDS_TIMEOUT16 "" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/el-GR.rc b/reactos/dll/cpl/powercfg/lang/el-GR.rc index ba0b067ce16..3f0c189dc50 100644 --- a/reactos/dll/cpl/powercfg/lang/el-GR.rc +++ b/reactos/dll/cpl/powercfg/lang/el-GR.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 " 4 " IDS_TIMEOUT15 " 5 " IDS_TIMEOUT16 "" - + IDS_DEL_SCHEME " ;" IDS_DEL_SCHEME_TITLE " " END diff --git a/reactos/dll/cpl/powercfg/lang/en-US.rc b/reactos/dll/cpl/powercfg/lang/en-US.rc index d2eb5f3cd32..cffb8330fde 100644 --- a/reactos/dll/cpl/powercfg/lang/en-US.rc +++ b/reactos/dll/cpl/powercfg/lang/en-US.rc @@ -159,7 +159,7 @@ BEGIN IDS_TIMEOUT14 "After 4 hours" IDS_TIMEOUT15 "After 5 hours" IDS_TIMEOUT16 "Never" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/es-ES.rc b/reactos/dll/cpl/powercfg/lang/es-ES.rc index dc3ea9f24da..70f039cc838 100644 --- a/reactos/dll/cpl/powercfg/lang/es-ES.rc +++ b/reactos/dll/cpl/powercfg/lang/es-ES.rc @@ -1,5 +1,5 @@ /* - *Spanish Language resource file + * Spanish language resource file * Traducido por: Javier Remacha 2007-12-23 */ @@ -161,7 +161,7 @@ BEGIN IDS_TIMEOUT14 "Tras 4 horas" IDS_TIMEOUT15 "Tras 5 horas" IDS_TIMEOUT16 "Nunca" - + IDS_DEL_SCHEME "Est seguro de que desea eliminar la combinacin de energa?" IDS_DEL_SCHEME_TITLE "Eliminar combinacin" END diff --git a/reactos/dll/cpl/powercfg/lang/fr-FR.rc b/reactos/dll/cpl/powercfg/lang/fr-FR.rc index 5972f8dd7f4..5b8b720a62a 100644 --- a/reactos/dll/cpl/powercfg/lang/fr-FR.rc +++ b/reactos/dll/cpl/powercfg/lang/fr-FR.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "Aprs 4 heures" IDS_TIMEOUT15 "Aprs 5 heures" IDS_TIMEOUT16 "Jamais" - + IDS_DEL_SCHEME "tes-vous sr de vouloir supprimer le profil d'alimentation ?" IDS_DEL_SCHEME_TITLE "Supprimer le profil" END diff --git a/reactos/dll/cpl/powercfg/lang/id-ID.rc b/reactos/dll/cpl/powercfg/lang/id-ID.rc index 3e57f465b9b..ba6c5357352 100644 --- a/reactos/dll/cpl/powercfg/lang/id-ID.rc +++ b/reactos/dll/cpl/powercfg/lang/id-ID.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "Setelah 4 jam" IDS_TIMEOUT15 "Setelah 5 jam" IDS_TIMEOUT16 "Tidak pernah" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/it-IT.rc b/reactos/dll/cpl/powercfg/lang/it-IT.rc index 664f131828c..e9bfcc58255 100644 --- a/reactos/dll/cpl/powercfg/lang/it-IT.rc +++ b/reactos/dll/cpl/powercfg/lang/it-IT.rc @@ -173,7 +173,7 @@ BEGIN IDS_TIMEOUT14 "Dopo 4 ore" IDS_TIMEOUT15 "Dopo 5 ore" IDS_TIMEOUT16 "Mai" - + IDS_DEL_SCHEME "Siete sicuro di voler cancellare lo schema?" IDS_DEL_SCHEME_TITLE "Cancellazione schema" END diff --git a/reactos/dll/cpl/powercfg/lang/nl-NL.rc b/reactos/dll/cpl/powercfg/lang/nl-NL.rc index ef7c15a951a..2876e57ab9d 100644 --- a/reactos/dll/cpl/powercfg/lang/nl-NL.rc +++ b/reactos/dll/cpl/powercfg/lang/nl-NL.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "Na 4 uur" IDS_TIMEOUT15 "Na 5 uur" IDS_TIMEOUT16 "Nooit" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/no-NO.rc b/reactos/dll/cpl/powercfg/lang/no-NO.rc index c80fbe06512..a17374ea1e7 100644 --- a/reactos/dll/cpl/powercfg/lang/no-NO.rc +++ b/reactos/dll/cpl/powercfg/lang/no-NO.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "Etter 4 timer" IDS_TIMEOUT15 "Etter 5 timer" IDS_TIMEOUT16 "Aldri" - + IDS_DEL_SCHEME "Er du sikker p at du vil slette strmplanen?" IDS_DEL_SCHEME_TITLE "Slett planen" END diff --git a/reactos/dll/cpl/powercfg/lang/pl-PL.rc b/reactos/dll/cpl/powercfg/lang/pl-PL.rc index 42081492382..a9e7f150892 100644 --- a/reactos/dll/cpl/powercfg/lang/pl-PL.rc +++ b/reactos/dll/cpl/powercfg/lang/pl-PL.rc @@ -164,7 +164,7 @@ BEGIN IDS_TIMEOUT14 "Po 4 godzinach" IDS_TIMEOUT15 "Po 5 godzinach" IDS_TIMEOUT16 "Nigdy" - + IDS_DEL_SCHEME "Czy na pewno chcesz skasować schemat oszczędzania energii?" IDS_DEL_SCHEME_TITLE "Skasuj schemat" END diff --git a/reactos/dll/cpl/powercfg/lang/ro-RO.rc b/reactos/dll/cpl/powercfg/lang/ro-RO.rc index c05aafaf235..dec1d664683 100644 --- a/reactos/dll/cpl/powercfg/lang/ro-RO.rc +++ b/reactos/dll/cpl/powercfg/lang/ro-RO.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "După 4 ore" IDS_TIMEOUT15 "După 5 ore" IDS_TIMEOUT16 "Niciodată" - + IDS_DEL_SCHEME "Sunteți sigur că vreți să eliminați această schemă?" IDS_DEL_SCHEME_TITLE "Eliminare schemă" END diff --git a/reactos/dll/cpl/powercfg/lang/ru-RU.rc b/reactos/dll/cpl/powercfg/lang/ru-RU.rc index 3cb3f9b5f5e..710d7f0982f 100644 --- a/reactos/dll/cpl/powercfg/lang/ru-RU.rc +++ b/reactos/dll/cpl/powercfg/lang/ru-RU.rc @@ -158,7 +158,7 @@ BEGIN IDS_TIMEOUT14 "через 4 часа" IDS_TIMEOUT15 "через 5 часов" IDS_TIMEOUT16 "никогда" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/sk-SK.rc b/reactos/dll/cpl/powercfg/lang/sk-SK.rc index 290f126c77b..ce122468116 100644 --- a/reactos/dll/cpl/powercfg/lang/sk-SK.rc +++ b/reactos/dll/cpl/powercfg/lang/sk-SK.rc @@ -136,9 +136,9 @@ BEGIN IDS_SIZEBYTS "%i bajtov" IDS_SIZEMB "%i MB" - IDS_NOACTION "Nerob ni" //Do nothing + IDS_NOACTION "Nerob ni" // Do nothing - IDS_PowerActionNone1 "Bez akcie" //No action + IDS_PowerActionNone1 "Bez akcie" // No action IDS_PowerActionUnknown "Neznme" IDS_PowerActionSleep "sporn reim" IDS_PowerActionHibernate "Dlhodob spnok" @@ -146,7 +146,7 @@ BEGIN IDS_PowerActionRestart "Retartova" IDS_PowerActionShutdownOff "Vypn a odpoji zdroj" IDS_PowerActionWarmEject "Zobrazi vzvu na akciu" - IDS_PowerActionNone2 "Ni" //None + IDS_PowerActionNone2 "Ni" // None IDS_TIMEOUT1 "Po 1 minte" IDS_TIMEOUT2 "Po 2 mintach" @@ -164,7 +164,7 @@ BEGIN IDS_TIMEOUT14 "Po 4 hodinch" IDS_TIMEOUT15 "Po 5 hodinch" IDS_TIMEOUT16 "Nikdy" - + IDS_DEL_SCHEME "Ste si ist, e chcete vymaza schmu napjania?" IDS_DEL_SCHEME_TITLE "Vymaza schmu" END diff --git a/reactos/dll/cpl/powercfg/lang/th-TH.rc b/reactos/dll/cpl/powercfg/lang/th-TH.rc index 0b36b3151d3..8f6abc9237c 100644 --- a/reactos/dll/cpl/powercfg/lang/th-TH.rc +++ b/reactos/dll/cpl/powercfg/lang/th-TH.rc @@ -156,7 +156,7 @@ BEGIN IDS_TIMEOUT14 "ѧҡ 4 " IDS_TIMEOUT15 "ѧҡ 5 " IDS_TIMEOUT16 "駤" - + IDS_DEL_SCHEME "Are you sure you want to delete the power scheme?" IDS_DEL_SCHEME_TITLE "Delete Scheme" END diff --git a/reactos/dll/cpl/powercfg/lang/uk-UA.rc b/reactos/dll/cpl/powercfg/lang/uk-UA.rc index a9d32ed5a58..bee12b92ad4 100644 --- a/reactos/dll/cpl/powercfg/lang/uk-UA.rc +++ b/reactos/dll/cpl/powercfg/lang/uk-UA.rc @@ -164,7 +164,7 @@ BEGIN IDS_TIMEOUT14 "через 4 години" IDS_TIMEOUT15 "через 5 годин" IDS_TIMEOUT16 "ніколи" - + IDS_DEL_SCHEME "Ви дійсно бажаєте видалити схему керування електроживленням?" IDS_DEL_SCHEME_TITLE "Видалення схеми" END diff --git a/reactos/dll/cpl/powercfg/lang/zh-CN.rc b/reactos/dll/cpl/powercfg/lang/zh-CN.rc index b2dd6fbdaf5..0d0b3b36582 100644 --- a/reactos/dll/cpl/powercfg/lang/zh-CN.rc +++ b/reactos/dll/cpl/powercfg/lang/zh-CN.rc @@ -161,7 +161,7 @@ BEGIN IDS_TIMEOUT14 "4 Сʱ֮" IDS_TIMEOUT15 "5 Сʱ֮" IDS_TIMEOUT16 "Ӳ" - + IDS_DEL_SCHEME "ȷҪɾԴʹ÷?" IDS_DEL_SCHEME_TITLE "ɾ" END diff --git a/reactos/dll/cpl/powercfg/powercfg.c b/reactos/dll/cpl/powercfg/powercfg.c index 28c7b84f5a0..dca5e78a67d 100644 --- a/reactos/dll/cpl/powercfg/powercfg.c +++ b/reactos/dll/cpl/powercfg/powercfg.c @@ -172,5 +172,3 @@ DllMain(HINSTANCE hinstDLL, } return TRUE; } - - diff --git a/reactos/dll/cpl/powercfg/powershemes.c b/reactos/dll/cpl/powercfg/powershemes.c index 05037de508c..3acbf91e4e4 100644 --- a/reactos/dll/cpl/powercfg/powershemes.c +++ b/reactos/dll/cpl/powercfg/powershemes.c @@ -197,7 +197,7 @@ LoadConfig(HWND hwndDlg) i-2, (LPARAM)0); } - if (Sec[i]==pp.user.SpindownTimeoutDc)//IdleTimeoutDc) + if (Sec[i]==pp.user.SpindownTimeoutDc) // IdleTimeoutDc) { SendDlgItemMessage(hwndDlg, IDC_DISKDCLIST, CB_SETCURSEL, @@ -252,8 +252,8 @@ callback_EnumPwrScheme(UINT uiIndex, DWORD dwName, LPTSTR sName, DWORD dwDesc, { if (guiIndex >= MAX_POWER_POLICY) { - //FIXME - //implement store power policy dynamically + // FIXME: + // Implement store power policy dynamically return FALSE; } @@ -475,17 +475,17 @@ DelScheme(HWND hwnd) if (MessageBox(hwnd, (LPCTSTR)szBuf, (LPCTSTR)szBufT, MB_OKCANCEL | MB_ICONQUESTION) == IDOK) { UINT Current; - + if (GetActivePwrScheme(&Current)) { SendMessage(hList, CB_SETCURSEL, (WPARAM)0, 0); SendMessage(hList, CB_DELETESTRING, (WPARAM)iCurSel, 0); if (Current == DelScheme) Pos_SaveData(hwnd); } - + if (DeletePwrScheme(DelScheme) != 0) return TRUE; } - + return FALSE; } @@ -521,8 +521,8 @@ CreateEnergyList(HWND hwnd) if (CanUserWritePwrScheme()) { - //TODO - // enable write / delete powerscheme button + // TODO: + // Enable write / delete powerscheme button } Pos_InitPage(GetParent(hwnd)); @@ -531,7 +531,7 @@ CreateEnergyList(HWND hwnd) return FALSE; retval = EnumPwrSchemes(callback_EnumPwrScheme, aps); - + if(SendMessage(hwnd, CB_GETCOUNT, 0, 0) > 0) { EnableWindow(GetDlgItem(hwndDialog, IDC_DELETE_BTN),TRUE); @@ -558,17 +558,17 @@ PowerSchemesDlgProc( hwndDialog = hwndDlg; if (!Pos_InitData()) { - //TODO - // initialization failed - // handle error + // TODO: + // Initialization failed + // Handle error MessageBox(hwndDlg,_T("Pos_InitData failed\n"), NULL, MB_OK); } if (!CreateEnergyList(GetDlgItem(hwndDlg, IDC_ENERGYLIST))) { - //TODO - // initialization failed - // handle error + // TODO: + // Initialization failed + // Handle error MessageBox(hwndDlg,_T("CreateEnergyList failed\n"), NULL, MB_OK); } return TRUE; @@ -589,7 +589,7 @@ PowerSchemesDlgProc( break; case IDC_SAVEAS_BTN: { - + } break; case IDC_MONITORACLIST: diff --git a/reactos/dll/cpl/powercfg/resource.h b/reactos/dll/cpl/powercfg/resource.h index 5993106ecfb..d0cac0a890f 100644 --- a/reactos/dll/cpl/powercfg/resource.h +++ b/reactos/dll/cpl/powercfg/resource.h @@ -1,15 +1,15 @@ #pragma once -/* metrics */ -#define PROPSHEETWIDTH 246 -#define PROPSHEETHEIGHT 228 -#define PROPSHEETPADDING 6 -#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) -#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) -#define ICONSIZE 16 +/* Metrics */ +#define PROPSHEETWIDTH 246 +#define PROPSHEETHEIGHT 228 +#define PROPSHEETPADDING 6 +#define SYSTEM_COLUMN (18 * PROPSHEETPADDING) +#define LABELLINE(x) (((PROPSHEETPADDING + 2) * x) + (x + 2)) +#define ICONSIZE 16 -/* ids */ -#define IDC_CPLICON_1 1 +/* IDs */ +#define IDC_CPLICON_1 1 #define IDS_PROCENT 49 #define IDS_SOUND 50 @@ -60,7 +60,7 @@ #define IDI_SCREEN 178 #define IDI_HIBERNATE 179 -#define IDS_CPLNAME_1 190 +#define IDS_CPLNAME_1 190 #define IDC_ENERGYLIST 200 #define IDC_GRPDETAIL 201 #define IDC_SAT 202 @@ -115,12 +115,12 @@ #define IDC_DELETE_BTN 504 #define IDC_SAVEAS_BTN 505 -#define IDS_ALPERTLOWENERGY 715 -#define IDS_ALPERTCRITICLEENERGY 716 -#define IDS_CRITCLENERGY 717 -#define IDS_LOWENERGY 718 -#define IDS_UNKNOWN 719 +#define IDS_ALPERTLOWENERGY 715 +#define IDS_ALPERTCRITICLEENERGY 716 +#define IDS_CRITCLENERGY 717 +#define IDS_LOWENERGY 718 +#define IDS_UNKNOWN 719 -#define IDS_CPLDESCRIPTION_1 901 +#define IDS_CPLDESCRIPTION_1 901 /* EOF */ diff --git a/reactos/dll/cpl/sysdm/environment.c b/reactos/dll/cpl/sysdm/environment.c index a6f8b46cdd7..9a4b192c834 100644 --- a/reactos/dll/cpl/sysdm/environment.c +++ b/reactos/dll/cpl/sysdm/environment.c @@ -536,9 +536,9 @@ SetAllVars(HWND hwndDlg, /* Get the handle to the list box with all system vars in it */ hwndListView = GetDlgItem(hwndDlg, iDlgItem); - /* first item is 0 */ + /* First item is 0 */ iItem = 0; - /* set up struct to retreive item */ + /* Set up struct to retreive item */ lvi.mask = LVIF_PARAM; lvi.iItem = iItem; @@ -608,7 +608,7 @@ SetAllVars(HWND hwndDlg, { if (aValueArray[i] != NULL) { - /* Delete the value*/ + /* Delete the value */ RegDeleteValue(hKey, aValueArray[i]); diff --git a/reactos/dll/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c index 72b87de1154..4502142c6ee 100644 --- a/reactos/dll/cpl/sysdm/general.c +++ b/reactos/dll/cpl/sysdm/general.c @@ -76,130 +76,132 @@ InitImageInfo(PIMGINFO ImgInfo) LRESULT CALLBACK RosImageProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - static UINT timerid = 0, top = 0, offset; - static HBITMAP hBitmap2; - RECT r; - NONCLIENTMETRICS ncm; - HFONT hfont; - BITMAP bitmap; - HDC dc, sdc; - TCHAR devtext[2048]; - switch (uMsg) - { - case WM_LBUTTONDBLCLK: - if (wParam & (MK_CONTROL | MK_SHIFT)) - { - if (timerid == 0) - { - top = 0; // set top - - // build new bitmap - GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap); - dc = CreateCompatibleDC(GetDC(NULL)); - if (dc == NULL) - { - break; - } - sdc = CreateCompatibleDC(dc); - if (sdc == NULL) - { - DeleteDC(dc); - break; - } - ncm.cbSize = sizeof(NONCLIENTMETRICS); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); + static UINT timerid = 0, top = 0, offset; + static HBITMAP hBitmap2; + RECT r; + NONCLIENTMETRICS ncm; + HFONT hfont; + BITMAP bitmap; + HDC dc, sdc; + TCHAR devtext[2048]; + switch (uMsg) + { + case WM_LBUTTONDBLCLK: + if (wParam & (MK_CONTROL | MK_SHIFT)) + { + if (timerid == 0) + { + top = 0; // Set top - hfont = CreateFontIndirect(&ncm.lfMessageFont); - SelectObject(dc, hfont); - SetRect(&r, 0, 0, 0, 0); - LoadString(hApplet, IDS_DEVS, devtext, sizeof(devtext) / sizeof(TCHAR)); - DrawText(dc, devtext, -1, &r, DT_CALCRECT); - hBitmap2 = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL); - SelectObject(sdc, pImgInfo->hBitmap); - SelectObject(dc, hBitmap2); - offset = 0; - BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); - offset += bitmap.bmHeight; + // Build new bitmap + GetObject(pImgInfo->hBitmap, sizeof(BITMAP), &bitmap); + dc = CreateCompatibleDC(GetDC(NULL)); + if (dc == NULL) + { + break; + } + sdc = CreateCompatibleDC(dc); + if (sdc == NULL) + { + DeleteDC(dc); + break; + } + ncm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICS), &ncm, 0); - SetRect(&r, 0, offset, bitmap.bmWidth, offset + (r.bottom - r.top) + 1); - FillRect(dc, &r, GetSysColorBrush(COLOR_3DFACE)); - SetBkMode(dc, TRANSPARENT); - OffsetRect(&r, 1, 1); - SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); - DrawText(dc, devtext, -1, &r, DT_CENTER); - OffsetRect(&r, -1, -1); - SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); - DrawText(dc, devtext, -1, &r, DT_CENTER); - offset += r.bottom - r.top; + hfont = CreateFontIndirect(&ncm.lfMessageFont); + SelectObject(dc, hfont); + SetRect(&r, 0, 0, 0, 0); + LoadString(hApplet, IDS_DEVS, devtext, sizeof(devtext) / sizeof(TCHAR)); + DrawText(dc, devtext, -1, &r, DT_CALCRECT); + hBitmap2 = CreateBitmap(pImgInfo->cxSource, (2 * pImgInfo->cySource) + (r.bottom + 1 - r.top), bitmap.bmPlanes, bitmap.bmBitsPixel, NULL); + SelectObject(sdc, pImgInfo->hBitmap); + SelectObject(dc, hBitmap2); + offset = 0; + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; - BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); - offset += bitmap.bmHeight; - DeleteDC(sdc); - DeleteDC(dc); + SetRect(&r, 0, offset, bitmap.bmWidth, offset + (r.bottom - r.top) + 1); + FillRect(dc, &r, GetSysColorBrush(COLOR_3DFACE)); + SetBkMode(dc, TRANSPARENT); + OffsetRect(&r, 1, 1); + SetTextColor(dc, GetSysColor(COLOR_BTNSHADOW)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + OffsetRect(&r, -1, -1); + SetTextColor(dc, GetSysColor(COLOR_WINDOWTEXT)); + DrawText(dc, devtext, -1, &r, DT_CENTER); + offset += r.bottom - r.top; - timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); - } - } - break; - case WM_LBUTTONDOWN: - if (timerid) - { - KillTimer(hwnd, timerid); - top = 0; - timerid = 0; - DeleteObject(hBitmap2); - InvalidateRect(hwnd, NULL, FALSE); - } - break; - case WM_TIMER: - top += ANIM_STEP; - if (top > offset - pImgInfo->cySource) - { - KillTimer(hwnd, timerid); - top = 0; - timerid = 0; - DeleteObject(hBitmap2); - } - InvalidateRect(hwnd, NULL, FALSE); - break; - case WM_PAINT: - { - PAINTSTRUCT PS; - HDC hdcMem, hdc; - LONG left; - if (wParam != 0) - { - hdc = (HDC)wParam; - } else - { - hdc = BeginPaint(hwnd,&PS); - } - GetClientRect(hwnd,&PS.rcPaint); + BitBlt(dc, 0, offset, bitmap.bmWidth, bitmap.bmHeight, sdc, 0, 0, SRCCOPY); + offset += bitmap.bmHeight; + DeleteDC(sdc); + DeleteDC(dc); - /* position image in center of dialog */ - left = (PS.rcPaint.right - pImgInfo->cxSource) / 2; - hdcMem = CreateCompatibleDC(hdc); - - if (hdcMem != NULL) - { - SelectObject(hdcMem, timerid ? hBitmap2 : pImgInfo->hBitmap); - BitBlt(hdc, - left, - PS.rcPaint.top, - PS.rcPaint.right - PS.rcPaint.left, - PS.rcPaint.top + pImgInfo->cySource, - hdcMem, - 0, - top, - SRCCOPY); - DeleteDC(hdcMem); - } - if (wParam == 0) - EndPaint(hwnd,&PS); - break; - } - } - return TRUE; + timerid = SetTimer(hwnd, 1, ANIM_TIME, NULL); + } + } + break; + case WM_LBUTTONDOWN: + if (timerid) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + InvalidateRect(hwnd, NULL, FALSE); + } + break; + case WM_TIMER: + top += ANIM_STEP; + if (top > offset - pImgInfo->cySource) + { + KillTimer(hwnd, timerid); + top = 0; + timerid = 0; + DeleteObject(hBitmap2); + } + InvalidateRect(hwnd, NULL, FALSE); + break; + case WM_PAINT: + { + PAINTSTRUCT PS; + HDC hdcMem, hdc; + LONG left; + if (wParam != 0) + { + hdc = (HDC)wParam; + } + else + { + hdc = BeginPaint(hwnd,&PS); + } + GetClientRect(hwnd,&PS.rcPaint); + + /* Position image in center of dialog */ + left = (PS.rcPaint.right - pImgInfo->cxSource) / 2; + hdcMem = CreateCompatibleDC(hdc); + + if (hdcMem != NULL) + { + SelectObject(hdcMem, timerid ? hBitmap2 : pImgInfo->hBitmap); + BitBlt(hdc, + left, + PS.rcPaint.top, + PS.rcPaint.right - PS.rcPaint.left, + PS.rcPaint.top + pImgInfo->cySource, + hdcMem, + 0, + top, + SRCCOPY); + DeleteDC(hdcMem); + } + + if (wParam == 0) + EndPaint(hwnd,&PS); + break; + } + } + return TRUE; } static VOID @@ -547,7 +549,7 @@ GeneralPageProc(HWND hwndDlg, HDC hdcMem; LONG left; - /* position image in centre of dialog */ + /* Position image in centre of dialog */ left = (lpDrawItem->rcItem.right - pImgInfo->cxSource) / 2; hdcMem = CreateCompatibleDC(lpDrawItem->hDC); diff --git a/reactos/dll/cpl/sysdm/hardware.c b/reactos/dll/cpl/sysdm/hardware.c index 4b919bb9d4a..5e628e8b915 100644 --- a/reactos/dll/cpl/sysdm/hardware.c +++ b/reactos/dll/cpl/sysdm/hardware.c @@ -15,7 +15,7 @@ typedef BOOL (WINAPI *PDEVMGREXEC)(HWND hWndParent, HINSTANCE hInst, PVOID Unkno static BOOL LaunchDeviceManager(HWND hWndParent) { -/* hack for ROS to start our devmgmt until we have mmc */ +/* Hack for ROS to start our devmgmt until we have MMC */ #ifdef __REACTOS__ return ((INT_PTR)ShellExecuteW(NULL, L"open", L"devmgmt.exe", NULL, NULL, SW_SHOWNORMAL) > 32); #else @@ -34,7 +34,7 @@ LaunchDeviceManager(HWND hWndParent) return FALSE; } - /* run the Device Manager */ + /* Run the Device Manager */ Ret = DevMgrExec(hWndParent, hApplet, NULL /* ??? */, SW_SHOW); FreeLibrary(hDll); return Ret; diff --git a/reactos/dll/cpl/sysdm/lang/bg-BG.rc b/reactos/dll/cpl/sysdm/lang/bg-BG.rc index f51ef14ce2d..b38b34c83b3 100644 --- a/reactos/dll/cpl/sysdm/lang/bg-BG.rc +++ b/reactos/dll/cpl/sysdm/lang/bg-BG.rc @@ -1,4 +1,4 @@ -// Location: \dll\cpl\sysdm\lang +// Location: dll/cpl/sysdm/lang/bg-BG.rc // LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/reactos/dll/cpl/sysdm/lang/de-DE.rc b/reactos/dll/cpl/sysdm/lang/de-DE.rc index ecc2be63da8..6d477eb0c45 100644 --- a/reactos/dll/cpl/sysdm/lang/de-DE.rc +++ b/reactos/dll/cpl/sysdm/lang/de-DE.rc @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS System Configuration Applet * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/cpl/sysdm/de.rc + * FILE: dll/cpl/sysdm/lang/de-DE.rc * PURPOSE: German language file for sysdm.cpl * PROGRAMMERS: Eric Kohl * TRANSLATOR: Colin Finck diff --git a/reactos/dll/cpl/sysdm/lang/nl-NL.rc b/reactos/dll/cpl/sysdm/lang/nl-NL.rc index 94eca7ef70b..ff21b5b0dc6 100644 --- a/reactos/dll/cpl/sysdm/lang/nl-NL.rc +++ b/reactos/dll/cpl/sysdm/lang/nl-NL.rc @@ -1,4 +1,5 @@ -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +// Vertaald door Lionel Lowie +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL RC_LICENSE RTDATA "resources/gpl.txt" diff --git a/reactos/dll/cpl/sysdm/lang/pl-PL.rc b/reactos/dll/cpl/sysdm/lang/pl-PL.rc index a928171bea5..1f7e4894fd0 100644 --- a/reactos/dll/cpl/sysdm/lang/pl-PL.rc +++ b/reactos/dll/cpl/sysdm/lang/pl-PL.rc @@ -1,4 +1,4 @@ -/* +/* * translated by xrogers * xxrogers@users.sourceforge.net * https://sourceforge.net/projects/reactospl diff --git a/reactos/dll/cpl/sysdm/lang/ro-RO.rc b/reactos/dll/cpl/sysdm/lang/ro-RO.rc index b0e9bb435b2..698eae727ab 100644 --- a/reactos/dll/cpl/sysdm/lang/ro-RO.rc +++ b/reactos/dll/cpl/sysdm/lang/ro-RO.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION diff --git a/reactos/dll/cpl/sysdm/lang/ru-RU.rc b/reactos/dll/cpl/sysdm/lang/ru-RU.rc index 93c6cb70949..ac94b11abd0 100644 --- a/reactos/dll/cpl/sysdm/lang/ru-RU.rc +++ b/reactos/dll/cpl/sysdm/lang/ru-RU.rc @@ -1,4 +1,4 @@ -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION diff --git a/reactos/dll/cpl/sysdm/lang/sv-SE.rc b/reactos/dll/cpl/sysdm/lang/sv-SE.rc index 3267cfdb4a1..1e42270196f 100644 --- a/reactos/dll/cpl/sysdm/lang/sv-SE.rc +++ b/reactos/dll/cpl/sysdm/lang/sv-SE.rc @@ -1,5 +1,6 @@ -//Swedish resources by Kris Engeman 2005-04-28 -//Updated 2008 by Andreas Bjerkeholt (Harteex) +// Swedish resources by Kris Engeman 2005-04-28 +// Updated 2008 by Andreas Bjerkeholt (Harteex) + LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 256, 218 diff --git a/reactos/dll/cpl/sysdm/lang/uk-UA.rc b/reactos/dll/cpl/sysdm/lang/uk-UA.rc index 1323c0255a5..a55b010924f 100644 --- a/reactos/dll/cpl/sysdm/lang/uk-UA.rc +++ b/reactos/dll/cpl/sysdm/lang/uk-UA.rc @@ -1,4 +1,4 @@ -/* +/* * PROJECT: System Control Panel Applet * LICENSE: GPL - See COPYING in the top level directory * FILE: dll/cpl/sysdm/lang/uk-UA.rc diff --git a/reactos/dll/cpl/sysdm/licence.c b/reactos/dll/cpl/sysdm/licence.c index 8dfe6cf1b15..72cfa7644e6 100644 --- a/reactos/dll/cpl/sysdm/licence.c +++ b/reactos/dll/cpl/sysdm/licence.c @@ -34,7 +34,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) ICON_SMALL, (LPARAM)pLicInfo->hIcon); - /* load license from resource */ + /* Load license from resource */ if (!(hResInfo = FindResource(hApplet, MAKEINTRESOURCE(RC_LICENSE), MAKEINTRESOURCE(RTDATA))) || @@ -45,7 +45,7 @@ OnInitDialog(HWND hDlg, PLIC_CONTEXT pLicInfo) return FALSE; } - /* insert the license into the edit control (unicode!) */ + /* Insert the license into the edit control (unicode!) */ SetDlgItemText(hDlg, IDC_LICENCEEDIT, LicenseText); diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h index f3b20cfbc57..eb0b0c5f03a 100644 --- a/reactos/dll/cpl/sysdm/precomp.h +++ b/reactos/dll/cpl/sysdm/precomp.h @@ -34,12 +34,12 @@ extern HINSTANCE hApplet; void ShowLastWin32Error(HWND hWndOwner); -/* prop sheet pages */ +/* Prop sheet pages */ INT_PTR CALLBACK GeneralPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK HardwarePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AdvancedPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); -/* dialogs */ +/* Dialogs */ INT_PTR CALLBACK HardProfDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK UserProfileDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK EnvironmentDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); diff --git a/reactos/dll/cpl/sysdm/resource.h b/reactos/dll/cpl/sysdm/resource.h index 3e082dc176f..a17ae521a78 100644 --- a/reactos/dll/cpl/sysdm/resource.h +++ b/reactos/dll/cpl/sysdm/resource.h @@ -38,7 +38,7 @@ #define IDS_WARNINITIALRANGE 80 #define IDS_WARNMAXIMUMRANGE 81 -/* propsheet - general */ +/* Propsheet - general */ #define IDD_PROPPAGEGENERAL 100 #define IDC_MACHINELINE1 101 #define IDC_MACHINELINE2 102 @@ -50,7 +50,7 @@ #define IDC_ROSHOMEPAGE_LINK 108 -/* propsheet - hardware */ +/* Propsheet - hardware */ #define IDD_PROPPAGEHARDWARE 300 #define IDC_HARDWARE_WIZARD 207 #define IDC_HARDWARE_PROFILE 209 @@ -58,7 +58,7 @@ #define IDC_HARDWARE_DEVICE_MANAGER 211 -/* propsheet - advanced */ +/* Propsheet - advanced */ #define IDD_PROPPAGEADVANCED 400 #define IDC_SYSSETTINGS 401 #define IDC_ENVVAR 402 @@ -67,11 +67,11 @@ #define IDC_USERPROFILE 405 #define IDC_ERRORREPORT 406 -/* system settings */ +/* System settings */ #define IDD_SYSSETTINGS 800 #define IDC_REPORTASWORKSTATION 801 -/* user profiles */ +/* User profiles */ #define IDD_USERPROFILE 500 #define IDC_USERPROFILE_LIST 501 #define IDC_USERPROFILE_CHANGE 503 @@ -80,7 +80,7 @@ #define IDC_USERACCOUNT_LINK 506 -/* environment variables */ +/* Environment variables */ #define IDD_ENVIRONMENT_VARIABLES 600 #define IDC_USER_VARIABLE_LIST 601 #define IDC_USER_VARIABLE_NEW 602 @@ -92,7 +92,7 @@ #define IDC_SYSTEM_VARIABLE_DELETE 608 -/* edit environment variables */ +/* Edit environment variables */ #define IDD_EDIT_VARIABLE 700 #define IDC_VARIABLE_NAME 701 #define IDC_VARIABLE_VALUE 702 @@ -116,7 +116,7 @@ #define IDC_CURRENT 914 -/* startup and recovery */ +/* Startup and recovery */ #define IDD_STARTUPRECOVERY 1000 #define IDC_STRECOSCOMBO 1001 #define IDC_STRECLIST 1002 @@ -134,7 +134,7 @@ #define IDC_STRRECOVERWRITE 1014 -/* hardware profiles */ +/* Hardware profiles */ #define IDD_HARDWAREPROFILES 1100 #define IDC_HRDPROFLSTBOX 1102 #define IDC_HRDPROFUP 1103 @@ -149,19 +149,19 @@ #define IDC_HRDPROFUPDWN 1112 -/* copy profile */ +/* Copy profile */ #define IDD_COPYPROFILE 1200 #define IDC_COPYPROFILEFROM 1201 #define IDC_COPYPROFILETO 1202 -/* rename profile */ +/* Rename profile */ #define IDD_RENAMEPROFILE 1300 #define IDC_RENPROFEDITFROM 1301 #define IDC_RENPROFEDITTO 1302 -/* licence */ +/* Licence */ #define IDD_LICENCE 1500 #define IDC_LICENCEEDIT 1501 #define RC_LICENSE 1502 diff --git a/reactos/dll/cpl/sysdm/startrec.c b/reactos/dll/cpl/sysdm/startrec.c index 69e87e9edd0..937c0a94c66 100644 --- a/reactos/dll/cpl/sysdm/startrec.c +++ b/reactos/dll/cpl/sysdm/startrec.c @@ -60,7 +60,7 @@ GetSystemDrive(WCHAR **szSystemDrive) { DWORD dwBufSize; - /* get Path to freeldr.ini or boot.ini */ + /* Get Path to freeldr.ini or boot.ini */ *szSystemDrive = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR)); if (*szSystemDrive != NULL) { @@ -108,7 +108,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName) NULL, &InfContext)) { - /* failed to find section */ + /* Failed to find section */ return NULL; } @@ -144,7 +144,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName) { if (!_wcsnicmp(szValue, L"ReactOS", 7)) { - //FIXME store as enum + // FIXME: Store as enum pRecord->BootType = 1; } else @@ -158,7 +158,7 @@ ReadFreeldrSection(HINF hInf, WCHAR *szSectionName) } else if (!_wcsnicmp(szName, L"Options", 7)) { - //FIXME store flags as values + // FIXME: Store flags as values wcscpy(pRecord->szOptions, szValue); } @@ -186,7 +186,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) L"DefaultOS", &InfContext)) { - /* failed to find default os */ + /* Failed to find default os */ return FALSE; } @@ -196,7 +196,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) sizeof(szDefaultOs) / sizeof(WCHAR), &LineLength)) { - /* no key */ + /* No key */ return FALSE; } @@ -205,7 +205,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) L"TimeOut", &InfContext)) { - /* expected to find timeout value */ + /* Expected to find timeout value */ return FALSE; } @@ -214,7 +214,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) 1, (PINT)&TimeOut)) { - /* failed to retrieve timeout */ + /* Failed to retrieve timeout */ return FALSE; } @@ -223,7 +223,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) NULL, &InfContext)) { - /* expected list of operating systems */ + /* Expected list of operating systems */ return FALSE; } @@ -235,7 +235,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) sizeof(szName) / sizeof(WCHAR), &LineLength)) { - /* the ini file is messed up */ + /* The ini file is messed up */ return FALSE; } @@ -245,7 +245,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) sizeof(szValue) / sizeof(WCHAR), &LineLength)) { - /* the ini file is messed up */ + /* The ini file is messed up */ return FALSE; } @@ -258,7 +258,7 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETITEMDATA, (WPARAM)lResult, (LPARAM)pRecord); if (!wcscmp(szDefaultOs, szName)) { - /* we store the friendly name as key */ + /* We store the friendly name as key */ wcscpy(szDefaultOs, szValue); } } @@ -270,11 +270,11 @@ LoadFreeldrSettings(HINF hInf, HWND hwndDlg) } while (SetupFindNextLine(&InfContext, &InfContext)); - /* find default os in list */ + /* Find default os in list */ lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)-1, (LPARAM)szDefaultOs); if (lResult != CB_ERR) { - /* set cur sel */ + /* Set cur sel */ SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } @@ -347,7 +347,7 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) NULL, &InfContext)) { - /* failed to find operating systems section */ + /* Failed to find operating systems section */ return FALSE; } @@ -405,11 +405,11 @@ LoadBootSettings(HINF hInf, HWND hwndDlg) } while (SetupFindNextLine(&InfContext, &InfContext)); - /* find default os in list */ + /* Find default os in list */ lResult = SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_FINDSTRING, (WPARAM)0, (LPARAM)szDefaultOS); if (lResult != CB_ERR) { - /* set cur sel */ + /* Set cur sel */ SendDlgItemMessageW(hwndDlg, IDC_STRECOSCOMBO, CB_SETCURSEL, (WPARAM)lResult, (LPARAM)0); } @@ -462,7 +462,7 @@ LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo) if (PathFileExistsW(pStartInfo->szFreeldrIni)) { - /* free resource previously allocated by GetSystemDrive() */ + /* Free resource previously allocated by GetSystemDrive() */ HeapFree(GetProcessHeap(), 0, szSystemDrive); /* freeldr.ini exists */ hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, @@ -480,16 +480,16 @@ LoadOSList(HWND hwndDlg, PSTARTINFO pStartInfo) return FALSE; } - /* try load boot.ini settings */ + /* Try loading boot.ini settings */ wcscpy(pStartInfo->szFreeldrIni, szSystemDrive); wcscat(pStartInfo->szFreeldrIni, L"\\boot.ini"); - /* free resource previously allocated by GetSystemDrive() */ + /* Free resource previously allocated by GetSystemDrive() */ HeapFree(GetProcessHeap(), 0, szSystemDrive); if (PathFileExistsW(pStartInfo->szFreeldrIni)) { - /* load boot.ini settings */ + /* Load boot.ini settings */ hInf = SetupOpenInfFileW(pStartInfo->szFreeldrIni, NULL, INF_STYLE_OLDNT, @@ -514,20 +514,20 @@ SetCrashDlgItems(HWND hwnd, PSTARTINFO pStartInfo) { if (pStartInfo->dwCrashDumpEnabled == 0) { - /* no crash information required */ + /* No crash information required */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), FALSE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); } else if (pStartInfo->dwCrashDumpEnabled == 3) { - /* minidump type */ + /* Minidump type */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), FALSE); SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szMinidumpDir); } else if (pStartInfo->dwCrashDumpEnabled == 1 || pStartInfo->dwCrashDumpEnabled == 2) { - /* kernel or complete dump */ + /* Kernel or complete dump */ EnableWindow(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_STRRECOVERWRITE), TRUE); SendMessageW(GetDlgItem(hwnd, IDC_STRRECDUMPFILE), WM_SETTEXT, (WPARAM)0, (LPARAM)pStartInfo->szDumpFile); @@ -547,7 +547,7 @@ WriteStartupRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) KEY_WRITE, &hKey) != ERROR_SUCCESS) { - /* failed to open key */ + /* Failed to open key */ return; } @@ -592,7 +592,7 @@ LoadRecoveryOptions(HWND hwndDlg, PSTARTINFO pStartInfo) KEY_READ, &hKey) != ERROR_SUCCESS) { - /* failed to open key */ + /* Failed to open key */ return; } @@ -690,13 +690,13 @@ StartRecDlgProc(HWND hwndDlg, { case IDC_STRRECEDIT: ShellExecuteW(0, L"open", L"notepad", pStartInfo->szFreeldrIni, NULL, SW_SHOWNORMAL); - // FIXME use CreateProcess and wait untill finished + // FIXME: Use CreateProcess and wait untill finished // DeleteBootRecords(hwndDlg); // LoadOSList(hwndDlg); break; case IDOK: - /* save timeout */ + /* Save timeout */ if (SendDlgItemMessage(hwndDlg, IDC_STRECLIST, BM_GETCHECK, (WPARAM)0, (LPARAM)0) == BST_CHECKED) iTimeout = SendDlgItemMessage(hwndDlg, IDC_STRRECLISTUPDWN, UDM_GETPOS, (WPARAM)0, (LPARAM)0); else @@ -717,12 +717,12 @@ StartRecDlgProc(HWND hwndDlg, { if (pStartInfo->iFreeLdrIni == 1) // FreeLdrIni style { - /* set default timeout */ + /* Set default timeout */ WritePrivateProfileStringW(L"FREELOADER", L"TimeOut", szTimeout, pStartInfo->szFreeldrIni); - /* set default os */ + /* Set default OS */ WritePrivateProfileStringW(L"FREELOADER", L"DefaultOS", pRecord->szSectionName, @@ -731,12 +731,12 @@ StartRecDlgProc(HWND hwndDlg, } else if (pStartInfo->iFreeLdrIni == 2) // BootIni style { - /* set default timeout */ + /* Set default timeout */ WritePrivateProfileStringW(L"boot loader", L"timeout", szTimeout, pStartInfo->szFreeldrIni); - /* set default os */ + /* Set default OS */ WritePrivateProfileStringW(L"boot loader", L"default", pRecord->szBootPath, diff --git a/reactos/dll/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c index 0e2b3562c2c..1d09af1e985 100644 --- a/reactos/dll/cpl/sysdm/virtmem.c +++ b/reactos/dll/cpl/sysdm/virtmem.c @@ -104,9 +104,9 @@ GetPageFileSizes(LPTSTR lpPageFiles, static VOID ParseMemSettings(PVIRTMEM pVirtMem) { - TCHAR szDrives[1024]; // all drives + TCHAR szDrives[1024]; // All drives LPTSTR DrivePtr = szDrives; - TCHAR szDrive[3]; // single drive + TCHAR szDrive[3]; // Single drive TCHAR szVolume[MAX_PATH]; TCHAR *szDisplayString; INT InitialSize = 0; @@ -130,15 +130,15 @@ ParseMemSettings(PVIRTMEM pVirtMem) DrivePtr = _tcsupr(DrivePtr); - /* copy the 'X:' portion */ + /* Copy the 'X:' portion */ lstrcpyn(szDrive, DrivePtr, sizeof(szDrive) / sizeof(TCHAR)); if (GetDriveType(DrivePtr) == DRIVE_FIXED) { - /* does drive match the one in the registry ? */ + /* Does drive match the one in the registry ? */ if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2)) { - /* FIXME: we only check the first available pagefile in the reg */ + /* FIXME: We only check the first available pagefile in the reg */ GetPageFileSizes(pVirtMem->szPagingFiles, &InitialSize, &MaximumSize); @@ -159,7 +159,7 @@ ParseMemSettings(PVIRTMEM pVirtMem) _tcscpy(szDisplayString, szDrive); _tcscat(szDisplayString, _T("\t")); - /* set a volume label if there is one */ + /* Set a volume label if there is one */ if (GetVolumeInformation(DrivePtr, szVolume, 255, @@ -224,7 +224,7 @@ WritePageFileSettings(PVIRTMEM pVirtMem) /* Record the position where the next string will start */ nPos += (INT)lstrlen(szText) + 1; - /* add another NULL for REG_MULTI_SZ */ + /* Add another NULL for REG_MULTI_SZ */ szPagingFiles[nPos] = _T('\0'); nPos++; } @@ -313,7 +313,7 @@ OnSet(PVIRTMEM pVirtMem) 0); if (Index >= 0 && Index < pVirtMem->Count) { - /* check if custom settings are checked */ + /* Check if custom settings are checked */ if (IsDlgButtonChecked(pVirtMem->hSelf, IDC_CUSTOM) == BST_CHECKED) { @@ -417,11 +417,11 @@ OnSet(PVIRTMEM pVirtMem) } else { - /* set sizes to 0 */ + /* Set sizes to 0 */ pVirtMem->Pagefile[Index].InitialSize = 0; pVirtMem->Pagefile[Index].MaximumSize = 0; - // check to see if this drive is used for a paging file + // Check to see if this drive is used for a paging file if (IsDlgButtonChecked(pVirtMem->hSelf, IDC_NOPAGEFILE) == BST_UNCHECKED) { @@ -468,7 +468,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem) if (pVirtMem->Pagefile[Index].InitialSize != 0 && pVirtMem->Pagefile[Index].MaximumSize != 0) { - /* enable and fill the custom values */ + /* Enable and fill the custom values */ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); @@ -492,7 +492,7 @@ OnSelChange(HWND hwndDlg, PVIRTMEM pVirtMem) EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE); EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE); - /* is it system managed */ + /* Is it system managed */ if (pVirtMem->Pagefile[Index].bUsed) { CheckDlgButton(pVirtMem->hSelf, diff --git a/reactos/dll/cpl/telephon/resource.h b/reactos/dll/cpl/telephon/resource.h index 9d2319a8bb0..12068a2adb7 100644 --- a/reactos/dll/cpl/telephon/resource.h +++ b/reactos/dll/cpl/telephon/resource.h @@ -1,9 +1,9 @@ #pragma once -/* icons */ +/* Icons */ #define IDI_CPLSYSTEM 100 -/* strings */ +/* Strings */ #define IDS_CPLSYSTEMNAME 1001 #define IDS_CPLSYSTEMDESCRIPTION 2001 diff --git a/reactos/dll/cpl/timedate/clock.c b/reactos/dll/cpl/timedate/clock.c index 6f9e0071f91..b9eaf29d870 100644 --- a/reactos/dll/cpl/timedate/clock.c +++ b/reactos/dll/cpl/timedate/clock.c @@ -54,24 +54,24 @@ DrawClock(HDC hdc, PCLOCKDATA pClockData) HBRUSH hBrushOld; HPEN hPenOld = NULL; - /* grey brush to fill the dots */ + /* Grey brush to fill the dots */ hBrushOld = SelectObject(hdc, pClockData->hGreyBrush); hPenOld = GetCurrentObject(hdc, OBJ_PEN); - // TODO: check if this conversion is correct resp. usable + // TODO: Check if this conversion is correct resp. usable Radius = min(pClockData->cxClient,pClockData->cyClient) * 2; for (iAngle = 0; iAngle < 360; iAngle += 6) { - /* starting coords */ + /* Starting coords */ pt[0].x = 0; pt[0].y = Radius; - /* rotate start coords */ + /* Rotate start coords */ RotatePoint(pt, 1, iAngle); - /* determine whether it's a big dot or a little dot + /* Determine whether it's a big dot or a little dot * i.e. 1-4 or 5, 6-9 or 10, 11-14 or 15 */ if (iAngle % 5) { @@ -174,7 +174,7 @@ ClockWndProc(HWND hwnd, if (hdcMem) { HBITMAP hBmp, hBmpOld; - + hBmp = CreateCompatibleBitmap(hdc, pClockData->cxClient, pClockData->cyClient); diff --git a/reactos/dll/cpl/timedate/dateandtime.c b/reactos/dll/cpl/timedate/dateandtime.c index 750e895bce7..f82ab7a1511 100644 --- a/reactos/dll/cpl/timedate/dateandtime.c +++ b/reactos/dll/cpl/timedate/dateandtime.c @@ -239,7 +239,7 @@ AutoUpdateMonthCal(HWND hwndDlg, { UNREFERENCED_PARAMETER(lpAutoUpdate); - /* update the controls */ + /* Update the controls */ FillMonthsComboBox(GetDlgItem(hwndDlg, IDC_MONTHCB)); } @@ -254,7 +254,7 @@ DTPProc(HWND hwnd, switch (uMsg) { case WM_KEYDOWN: - /* stop the timer when the user is about to change the time */ + /* Stop the timer when the user is about to change the time */ if ((wParam != VK_LEFT) & (wParam != VK_RIGHT)) KillTimer(GetParent(hwnd), ID_TIMER); break; @@ -281,7 +281,7 @@ DateTimePageProc(HWND hwndDlg, SetTimer(hwndDlg, ID_TIMER, 1000, NULL); - /* set range and current year */ + /* Set range and current year */ SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); @@ -393,7 +393,7 @@ DateTimePageProc(HWND hwndDlg, break; case WM_TIMECHANGE: - /* FIXME - we don't get this message as we're not a top-level window... */ + /* FIXME: We don't get this message as we're not a top-level window... */ SendMessageW(GetDlgItem(hwndDlg, IDC_MONTHCALENDAR), MCCM_RESET, diff --git a/reactos/dll/cpl/timedate/internettime.c b/reactos/dll/cpl/timedate/internettime.c index 0734b314598..02cdf0acfd9 100644 --- a/reactos/dll/cpl/timedate/internettime.c +++ b/reactos/dll/cpl/timedate/internettime.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/internettime.c + * FILE: dll/cpl/timedate/internettime.c * PURPOSE: Internet Time property page * COPYRIGHT: Copyright 2006 Ged Murphy * @@ -47,7 +47,7 @@ CreateNTPServerList(HWND hwnd) &dwNameSize); if (lRet == ERROR_SUCCESS) { - /* get date from default reg value */ + /* Get date from default reg value */ if (wcscmp(szValName, L"") == 0) // if (Index == 0) { dwDefault = _wtoi(szData); @@ -71,8 +71,8 @@ CreateNTPServerList(HWND hwnd) if (dwDefault < 1 || dwDefault > dwIndex) dwDefault = 1; - /* server reg entries count from 1, - * combo boxes count from 0 */ + /* Server reg entries count from 1, + * Combo boxes count from 0 */ dwDefault--; SendMessageW(hList, @@ -99,11 +99,11 @@ SetNTPServer(HWND hwnd) uSel = (UINT)SendMessageW(hList, CB_GETCURSEL, 0, 0); - /* server reg entries count from 1, - * combo boxes count from 0 */ + /* Server reg entries count from 1, + * Combo boxes count from 0 */ uSel++; - /* convert to wide char */ + /* Convert to wide char */ _itow(uSel, szSel, 10); lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, @@ -130,7 +130,7 @@ SetNTPServer(HWND hwnd) } -/* get the domain name from the registry */ +/* Get the domain name from the registry */ static BOOL GetNTPServerAddress(LPWSTR *lpAddress) { @@ -199,7 +199,7 @@ fail: } -/* request the time from the current NTP server */ +/* Request the time from the current NTP server */ static ULONG GetTimeFromServer(VOID) { @@ -230,7 +230,7 @@ UpdateSystemTime(ULONG ulTime) LARGE_INTEGER li; SYSTEMTIME stNew; - /* time at 1st Jan 1900 */ + /* Time at 1st Jan 1900 */ stNew.wYear = 1900; stNew.wMonth = 1; stNew.wDay = 1; @@ -239,19 +239,19 @@ UpdateSystemTime(ULONG ulTime) stNew.wSecond = 0; stNew.wMilliseconds = 0; - /* convert to a file time */ + /* Convert to a file time */ if (!SystemTimeToFileTime(&stNew, &ftNew)) { DisplayWin32Error(GetLastError()); return; } - /* add on the time passed since 1st Jan 1900 */ + /* Add on the time passed since 1st Jan 1900 */ li = *(LARGE_INTEGER *)&ftNew; li.QuadPart += (LONGLONG)10000000 * ulTime; ftNew = * (FILETIME *)&li; - /* convert back to a system time */ + /* Convert back to a system time */ if (!FileTimeToSystemTime(&ftNew, &stNew)) { DisplayWin32Error(GetLastError()); diff --git a/reactos/dll/cpl/timedate/lang/nl-NL.rc b/reactos/dll/cpl/timedate/lang/nl-NL.rc index d4f58e520bb..02f80802202 100644 --- a/reactos/dll/cpl/timedate/lang/nl-NL.rc +++ b/reactos/dll/cpl/timedate/lang/nl-NL.rc @@ -1,5 +1,6 @@ -//update jansssens -LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL //vertaald door Lionel Lowie +// Vertaald door Lionel Lowie +// Update jansssens +LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION diff --git a/reactos/dll/cpl/timedate/monthcal.c b/reactos/dll/cpl/timedate/monthcal.c index 3936ce1b57b..0d71e8a22dc 100644 --- a/reactos/dll/cpl/timedate/monthcal.c +++ b/reactos/dll/cpl/timedate/monthcal.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/monthcal.c + * FILE: dll/cpl/timedate/monthcal.c * PURPOSE: Calander implementation * COPYRIGHT: Copyright 2006 Thomas Weidenmueller * @@ -76,7 +76,7 @@ MonthCalNotifyControlParent(IN PMONTHCALWND infoPtr, } /* - * for the year range 1..9999 + * For the year range 1..9999 * return 1 if is leap year otherwise 0 */ static WORD LeapYear(IN WORD Year) @@ -100,7 +100,7 @@ MonthCalMonthLength(IN WORD Month, { #ifdef WITH_1752 if ((Year == 1752) && (Month == 9)) - return 19; // special case: September 1752 has no 3rd-13th + return 19; // Special case: September 1752 has no 3rd-13th else #endif return MonthDays[Month - 1]; @@ -180,7 +180,7 @@ MonthCalUpdate(IN PMONTHCALWND infoPtr) RepaintHeader = TRUE; } - /* update the days layout of the current month */ + /* Update the days layout of the current month */ ZeroMemory(infoPtr->Days, sizeof(infoPtr->Days)); @@ -199,7 +199,7 @@ MonthCalUpdate(IN PMONTHCALWND infoPtr) *(pDay++) = (BYTE)++d; } - /* repaint the control */ + /* Repaint the control */ if (RepaintHeader) { InvalidateRect(infoPtr->hSelf, @@ -227,10 +227,10 @@ MonthCalSetupDayTimer(IN PMONTHCALWND infoPtr) SYSTEMTIME LocalTime = {0}; UINT uElapse; - /* update the current date */ + /* Update the current date */ GetLocalTime(&LocalTime); - /* calculate the number of remaining milliseconds until midnight */ + /* Calculate the number of remaining milliseconds until midnight */ uElapse = 1000 - (UINT)LocalTime.wMilliseconds; uElapse += (59 - (UINT)LocalTime.wSecond) * 1000; uElapse += (59 - (UINT)LocalTime.wMinute) * 60 * 1000; @@ -241,7 +241,7 @@ MonthCalSetupDayTimer(IN PMONTHCALWND infoPtr) else uElapse += 100; /* Add a delay of 0.1 seconds */ - /* setup the new timer */ + /* Setup the new timer */ if (SetTimer(infoPtr->hSelf, ID_DAYTIMER, uElapse, @@ -263,7 +263,7 @@ MonthCalReload(IN PMONTHCALWND infoPtr) 0, 0); - /* cache the configuration */ + /* Cache the configuration */ infoPtr->FirstDayOfWeek = MonthCalFirstDayOfWeek(); infoPtr->hbHeader = GetSysColorBrush(infoPtr->Enabled ? MONTHCAL_HEADERBG : MONTHCAL_DISABLED_HEADERBG); @@ -281,7 +281,7 @@ MonthCalReload(IN PMONTHCALWND infoPtr) } } - /* update the control */ + /* Update the control */ MonthCalUpdate(infoPtr); } @@ -317,7 +317,7 @@ MonthCalChange(IN PMONTHCALWND infoPtr) { infoPtr->Changed = TRUE; - /* kill the day timer */ + /* Kill the day timer */ if (infoPtr->DayTimerSet) { KillTimer(infoPtr->hSelf, @@ -343,12 +343,12 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr, sc.NewMonth = Month; sc.NewYear = Year; - /* notify the parent */ + /* Notify the parent */ if (!MonthCalNotifyControlParent(infoPtr, MCCN_SELCHANGE, &sc)) { - /* check if we actually need to update */ + /* Check if we actually need to update */ if (infoPtr->Month != sc.NewMonth || infoPtr->Year != sc.NewYear) { @@ -358,7 +358,7 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr, MonthCalChange(infoPtr); - /* repaint the entire control */ + /* Repaint the entire control */ MonthCalUpdate(infoPtr); Ret = TRUE; @@ -375,7 +375,7 @@ MonthCalSetDate(IN PMONTHCALWND infoPtr, sc.OldDay, &rcUpdate)) { - /* repaint the day cells that need to be updated */ + /* Repaint the day cells that need to be updated */ InvalidateRect(infoPtr->hSelf, &rcUpdate, TRUE); @@ -419,7 +419,7 @@ MonthCalSetLocalTime(IN PMONTHCALWND infoPtr, } } - /* kill the day timer */ + /* Kill the day timer */ if (infoPtr->DayTimerSet) { KillTimer(infoPtr->hSelf, @@ -427,7 +427,7 @@ MonthCalSetLocalTime(IN PMONTHCALWND infoPtr, infoPtr->DayTimerSet = FALSE; } - /* setup the new day timer */ + /* Setup the new day timer */ MonthCalSetupDayTimer(infoPtr); if (Time != NULL) @@ -488,7 +488,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr, { RECT rcHeader; - /* paint the header */ + /* Paint the header */ rcHeader.left = prcUpdate->left; rcHeader.top = rcCell.top; rcHeader.right = prcUpdate->right; @@ -508,7 +508,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr, rcCell.left = x * infoPtr->CellSize.cx; rcCell.right = rcCell.left + infoPtr->CellSize.cx; - /* write the first letter of each weekday */ + /* Write the first letter of each weekday */ DrawTextW(hDC, &infoPtr->Week[x], 1, @@ -536,7 +536,7 @@ MonthCalPaint(IN PMONTHCALWND infoPtr, rcCell.left = x * infoPtr->CellSize.cx; rcCell.right = rcCell.left + infoPtr->CellSize.cx; - /* write the day number */ + /* Write the day number */ if (Day != 0 && Day < 100) { WCHAR szDay[3]; @@ -588,14 +588,14 @@ MonthCalPaint(IN PMONTHCALWND infoPtr, goto FailNoHighlight; } - /* highlight the selected day */ + /* Highlight the selected day */ crOldText = SetTextColor(hDC, GetSysColor(infoPtr->Enabled ? MONTHCAL_SELFG : MONTHCAL_DISABLED_SELFG)); } else { FailNoHighlight: - /* don't change the text color, we're not highlighting it... */ + /* Don't change the text color, we're not highlighting it... */ crOldText = CLR_INVALID; } @@ -764,7 +764,7 @@ MonthCalWndProc(IN HWND hwnd, infoPtr->Year); } - /* fall through */ + /* Fall through */ } case WM_MBUTTONDOWN: @@ -822,7 +822,7 @@ MonthCalWndProc(IN HWND hwnd, } } - /* update the selection */ + /* Update the selection */ if (NewDay != 0) { MonthCalSetDate(infoPtr, @@ -843,7 +843,7 @@ MonthCalWndProc(IN HWND hwnd, { case VK_TAB: { - /* change the UI status */ + /* Change the UI status */ SendMessageW(GetAncestor(hwnd, GA_PARENT), WM_CHANGEUISTATE, @@ -972,18 +972,18 @@ MonthCalWndProc(IN HWND hwnd, { case ID_DAYTIMER: { - /* kill the timer */ + /* Kill the timer */ KillTimer(hwnd, ID_DAYTIMER); infoPtr->DayTimerSet = FALSE; if (!infoPtr->Changed) { - /* update the system time and setup the new day timer */ + /* Update the system time and setup the new day timer */ MonthCalSetLocalTime(infoPtr, NULL); - /* update the control */ + /* Update the control */ MonthCalUpdate(infoPtr); } break; @@ -1007,7 +1007,7 @@ MonthCalWndProc(IN HWND hwnd, infoPtr->CellSize.cx = infoPtr->ClientSize.cx / 7; infoPtr->CellSize.cy = infoPtr->ClientSize.cy / 7; - /* repaint the control */ + /* Repaint the control */ InvalidateRect(hwnd, NULL, TRUE); diff --git a/reactos/dll/cpl/timedate/ntpclient.c b/reactos/dll/cpl/timedate/ntpclient.c index b52d4ff0d7c..8651999b258 100644 --- a/reactos/dll/cpl/timedate/ntpclient.c +++ b/reactos/dll/cpl/timedate/ntpclient.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/ntpclient.c + * FILE: dll/cpl/timedate/ntpclient.c * PURPOSE: Queries the NTP server * COPYRIGHT: Copyright 2006 Ged Murphy * @@ -40,13 +40,13 @@ InitConnection(PINFO pInfo, if (pInfo->Sock == INVALID_SOCKET) return FALSE; - /* setup server info */ + /* Setup server info */ he = gethostbyname(lpAddress); if (he != NULL) { - /* setup server socket info */ + /* Setup server socket info */ ZeroMemory(&pInfo->ntpAddr, sizeof(SOCKADDR_IN)); - pInfo->ntpAddr.sin_family = AF_INET; //he->h_addrtype; + pInfo->ntpAddr.sin_family = AF_INET; // he->h_addrtype; pInfo->ntpAddr.sin_port = htons(NTPPORT); pInfo->ntpAddr.sin_addr = *((struct in_addr *)he->h_addr); } @@ -71,7 +71,7 @@ GetTransmitTime(PTIMEPACKET ptp) } -/* send some data to wake the server up */ +/* Send some data to wake the server up */ static BOOL SendData(PINFO pInfo) { @@ -106,15 +106,15 @@ RecieveData(PINFO pInfo) INT Ret; ULONG ulTime = 0; - /* monitor socket for incomming connections */ + /* Monitor socket for incomming connections */ FD_ZERO(&readFDS); FD_SET(pInfo->Sock, &readFDS); - /* set timeout values */ + /* Set timeout values */ timeVal.tv_sec = TIMEOUT / 1000; timeVal.tv_usec = TIMEOUT % 1000; - /* check for data on the socket for TIMEOUT millisecs*/ + /* Check for data on the socket for TIMEOUT millisecs */ Ret = select(0, &readFDS, NULL, NULL, &timeVal); if ((Ret != SOCKET_ERROR) && (Ret != 0)) diff --git a/reactos/dll/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c index 246ca3b1f86..a74db407eef 100644 --- a/reactos/dll/cpl/timedate/timedate.c +++ b/reactos/dll/cpl/timedate/timedate.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/timedate.c + * FILE: dll/cpl/timedate/timedate.c * PURPOSE: ReactOS Timedate Control Panel * COPYRIGHT: Copyright 2004-2005 Eric Kohl * Copyright 2006 Ged Murphy diff --git a/reactos/dll/cpl/timedate/timezone.c b/reactos/dll/cpl/timedate/timezone.c index b15a3421883..cf727c9e952 100644 --- a/reactos/dll/cpl/timedate/timezone.c +++ b/reactos/dll/cpl/timedate/timezone.c @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Timedate Control Panel * LICENSE: GPL - See COPYING in the top level directory - * FILE: lib/cpl/timedate/timezone.c + * FILE: dll/cpl/timedate/timezone.c * PURPOSE: Time Zone property page * COPYRIGHT: Copyright 2004-2005 Eric Kohl * Copyright 2006 Ged Murphy @@ -331,7 +331,7 @@ GetAutoDaylightInfo(HWND hwnd) &hKey)) return; - /* if the call fails (non zero), the reg value isn't available, + /* If the call fails (non zero), the reg value isn't available, * which means it shouldn't be disabled, so we should check the button. */ if (RegQueryValueExW(hKey, diff --git a/reactos/dll/cpl/usrmgr/groups.c b/reactos/dll/cpl/usrmgr/groups.c index 75020190a90..ba94fec923f 100644 --- a/reactos/dll/cpl/usrmgr/groups.c +++ b/reactos/dll/cpl/usrmgr/groups.c @@ -275,7 +275,7 @@ GroupDelete(HWND hwndDlg) szGroupName, UNLEN); - /* Display a warning message because the delete operation cannot be reverted */ + /* Display a warning message, because the delete operation cannot be reverted */ wsprintf(szText, TEXT("Dou you really want to delete the user group \"%s\"?"), szGroupName); if (MessageBox(NULL, szText, TEXT("User Groups"), MB_ICONWARNING | MB_YESNO) == IDNO) return FALSE; diff --git a/reactos/subsystems/win32/win32k/ntddraw/d3d.c b/reactos/subsystems/win32/win32k/ntddraw/d3d.c index f30f08cdae9..af9f8c990c8 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/d3d.c +++ b/reactos/subsystems/win32/win32k/ntddraw/d3d.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/d3d.c + * FILE: subsystems/win32/win32k/ntddraw/d3d.c * PROGRAMER: Magnus olsen (magnus@greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen @@ -271,7 +271,7 @@ NtGdiDdCreateD3DBuffer(HANDLE hDirectDraw, if (pfnDdCreateD3DBuffer == NULL) { - DPRINT1("Warning no pfnDdCreateD3DBuffer"); + DPRINT1("Warning: no pfnDdCreateD3DBuffer"); return DDHAL_DRIVER_NOTHANDLED; } @@ -293,7 +293,7 @@ NtGdiDdDestroyD3DBuffer(HANDLE hSurface) if (pfnDdDestroyD3DBuffer == NULL) { - DPRINT1("Warning no pfnDdDestroyD3DBuffer"); + DPRINT1("Warning: no pfnDdDestroyD3DBuffer"); return DDHAL_DRIVER_NOTHANDLED; } diff --git a/reactos/subsystems/win32/win32k/ntddraw/dd.c b/reactos/subsystems/win32/win32k/ntddraw/dd.c index a1207ed33a2..e4665cddd5e 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dd.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dd.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/dd.c + * FILE: subsystems/win32/win32k/ntddraw/dd.c * PROGRAMER: Magnus Olsen (greatlord@reactos.org) * REVISION HISTORY: * 19/1-2006 Magnus Olsen @@ -102,8 +102,8 @@ NtGdiDdGetScanLine(HANDLE hDirectDrawLocal, /************************************************************************/ -/* This is not part of the ddsurface interface but it have */ -/* deal with the surface */ +/* This is not part of the ddsurface interface but it */ +/* deals with the surface */ /************************************************************************/ /************************************************************************/ diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index 604c150fc2e..53cc47d928a 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/ddraw.c + * FILE: subsystems/win32/win32k/ntddraw/ddraw.c * PROGRAMER: Magnus olsen (magnus@greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen @@ -39,7 +39,7 @@ intEnableReactXDriver(HDC hdc) PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = NULL; BOOL success = FALSE; - /* FIXME get the process data */ + /* FIXME: Get the process data */ /* Do not try load dxg.sys when it have already been load once */ if (gpfnStartupDxGraphics == NULL) @@ -47,7 +47,7 @@ intEnableReactXDriver(HDC hdc) Status = DxDdStartupDxGraphics(0,NULL,0,NULL,NULL, Proc); if (!NT_SUCCESS(Status)) { - DPRINT1("Warning : Failed to create the directx interface\n"); + DPRINT1("Warning: Failed to create the directx interface\n"); return FALSE; } } @@ -55,13 +55,13 @@ intEnableReactXDriver(HDC hdc) pDC = DC_LockDc(hdc); if (pDC == NULL) { - DPRINT1("Warning : Failed to lock hdc\n"); + DPRINT1("Warning: Failed to lock hdc\n"); return FALSE; } pDev = pDC->ppdev; - /* test see if drv got a dx interface or not */ + /* Test and see if drv got a DX interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || ( pDev->DriverFunctions.EnableDirectDraw == NULL)) { @@ -70,7 +70,7 @@ intEnableReactXDriver(HDC hdc) else { - /* CHeck see if dx have been enable or not */ + /* Check and see if DX has been enabled or not */ if ( pDev->pEDDgpl->pvmList == NULL) { pDev->pEDDgpl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); @@ -85,7 +85,8 @@ intEnableReactXDriver(HDC hdc) else { DPRINT1(" call to pfnDdEnableDirectDraw \n "); - /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ + + /* Note: it is the hdev struct it wants, not the drv hPDev aka pdc->PDev */ success = pfnDdEnableDirectDraw(pDC->ppdev, TRUE); dump_edd_directdraw_global(pDev->pEDDgpl); @@ -111,7 +112,7 @@ intEnableReactXDriver(HDC hdc) /************************************************************************/ /************************************************************************/ -/* DirectX graphic/video driver loading and cleanup start here */ +/* DirectX graphic/video driver loading and cleanup starts here */ /************************************************************************/ NTSTATUS APIENTRY @@ -127,16 +128,16 @@ DxDdStartupDxGraphics( ULONG ulc1, NTSTATUS Status = STATUS_PROCEDURE_NOT_FOUND; - /* FIXME setup of gaEngFuncs driver export list + /* FIXME: Setup of gaEngFuncs driver export list * but not in this api, we can add it here tempary until we figout where * no code have been writen for it yet */ - /* FIXME ReactOS does not loading the dxapi.sys or import functions from it yet */ + /* FIXME: ReactOS does not loading the dxapi.sys or import functions from it yet */ // DxApiGetVersion() - /* Loading the kernel interface of directx for win32k */ + /* Loading the kernel interface of DirectX for win32k */ DPRINT1("Warning: trying loading xp/2003/windows7/reactos dxg.sys\n"); ghDxGraphics = EngLoadImage(L"\\SystemRoot\\System32\\drivers\\dxg.sys"); @@ -147,7 +148,7 @@ DxDdStartupDxGraphics( ULONG ulc1, } else { - /* import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */ + /* Import DxDdStartupDxGraphics and DxDdCleanupDxGraphics */ gpfnStartupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdStartupDxGraphics"); gpfnCleanupDxGraphics = EngFindImageProcAddress(ghDxGraphics,"DxDdCleanupDxGraphics"); @@ -167,7 +168,7 @@ DxDdStartupDxGraphics( ULONG ulc1, Proc ); } - /* check if we manger loading the data and execute the dxStartupDxGraphics and it susscess */ + /* Check if we manage loading the data and execute the dxStartupDxGraphics if it is successful */ if (!NT_SUCCESS(Status)) { gpfnStartupDxGraphics = NULL; @@ -181,8 +182,8 @@ DxDdStartupDxGraphics( ULONG ulc1, } else { - /* Sort the drv functions list in index order, this allown us doing, smaller optimze - * in api that are redirect to dx.sys + /* Sort the drv functions list in index order, this allows us doing, smaller optimize + * in API that are redirect to dx.sys */ PDRVFN lstDrvFN = DxgDrv.pdrvfn; @@ -196,7 +197,7 @@ DxDdStartupDxGraphics( ULONG ulc1, DPRINT1("DirectX interface is activated\n"); } - /* return the status */ + /* Return the status */ } return Status; @@ -217,18 +218,18 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) if (hdc == NULL) { - DPRINT1("Warning : hdc is NULL\n"); + DPRINT1("Warning: hdc is NULL\n"); return 0; } - /* FIXME This should be alloc for each drv and use it from each drv, not global for whole win32k */ + /* FIXME: This should be alloc for each drv and use it from each drv, not global for whole win32k */ if (intEnableReactXDriver(hdc) == FALSE) { - DPRINT1("Warning : Failed to start the directx interface from the graphic driver\n"); + DPRINT1("Warning: Failed to start the DirectX interface from the graphic driver\n"); return DDHAL_DRIVER_NOTHANDLED; } - /* get the pfnDdCreateDirectDrawObject after we load the drv */ + /* Get the pfnDdCreateDirectDrawObject after we load the drv */ pfnDdCreateDirectDrawObject = (PGD_DDCREATEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdCreateDirectDrawObject].pfn; if (pfnDdCreateDirectDrawObject == NULL) @@ -247,7 +248,7 @@ NtGdiDdCreateDirectDrawObject(HDC hdc) * @implemented * * The function NtGdiDxgGenericThunk redirects DirectX calls to another function. -* It redirects to dxg.sys in windows XP/2003, dxkrnl.sys in vista and is fully implemented in win32k.sys in windows 2000 and below +* It redirects to dxg.sys in Windows XP/2003, dxkrnl.sys in Vista and is fully implemented in win32k.sys in Windows 2000 and below * * @param ULONG_PTR ulIndex * The functions we want to redirect @@ -401,7 +402,7 @@ NtGdiDdDeleteSurfaceObject(HANDLE hSurface) DPRINT1("Warning: no pfnDdDeleteSurfaceObject\n"); return DDHAL_DRIVER_NOTHANDLED; } - /* try see if the handle is vaidl */ + /* Try and see if the handle is valid */ DPRINT1("Calling dxg.sys DdDeleteSurfaceObject\n"); return pfnDdDeleteSurfaceObject(hSurface); @@ -664,7 +665,7 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw, } -/* internal debug api */ +/* Internal debug API */ void dump_edd_directdraw_global(EDD_DIRECTDRAW_GLOBAL *pEddgbl) { DPRINT1("0x%08lx 0x000 PEDD_DIRECTDRAW_GLOBAL->dhpdev : 0x%08lx\n",FIELD_OFFSET(EDD_DIRECTDRAW_GLOBAL, dhpdev), pEddgbl->dhpdev); diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c b/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c index ae46f887e11..a114a41b54d 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/dd.c + * FILE: subsystems/win32/win32k/ntddraw/ddsurf.c * PROGRAMER: Magnus Olsen (greatlord@reactos.org) * REVISION HISTORY: * 19/7-2006 Magnus Olsen @@ -22,7 +22,7 @@ NtGdiDdDestroySurface(HANDLE hSurface, BOOL bRealDestroy) if (pfnDdDestroySurface == NULL) { - DPRINT1("Warring no pfnDdDestroySurface"); + DPRINT1("Warning: no pfnDdDestroySurface"); return DDHAL_DRIVER_NOTHANDLED; } @@ -45,7 +45,7 @@ NtGdiDdFlip(HANDLE hSurfaceCurrent, if (pfnDdDdFlip == NULL) { - DPRINT1("Warring no pfnDdDdFlip"); + DPRINT1("Warning: no pfnDdDdFlip"); return DDHAL_DRIVER_NOTHANDLED; } @@ -66,7 +66,7 @@ NtGdiDdLock(HANDLE hSurface, if (pfnDdLock == NULL) { - DPRINT1("Warring no pfnDdLock"); + DPRINT1("Warning: no pfnDdLock"); return DDHAL_DRIVER_NOTHANDLED; } @@ -86,7 +86,7 @@ NtGdiDdUnlock(HANDLE hSurface, if (pfnDdUnlock == NULL) { - DPRINT1("Warring no pfnDdUnlock"); + DPRINT1("Warning: no pfnDdUnlock"); return DDHAL_DRIVER_NOTHANDLED; } @@ -107,7 +107,7 @@ NtGdiDdBlt(HANDLE hSurfaceDest, if (pfnDdBlt == NULL) { - DPRINT1("Warring no pfnDdBlt"); + DPRINT1("Warning: no pfnDdBlt"); return DDHAL_DRIVER_NOTHANDLED; } @@ -127,7 +127,7 @@ NtGdiDdSetColorKey(HANDLE hSurface, if (pfnDdSetColorKey == NULL) { - DPRINT1("Warring no pfnDdSetColorKey"); + DPRINT1("Warning: no pfnDdSetColorKey"); return DDHAL_DRIVER_NOTHANDLED; } @@ -150,7 +150,7 @@ NtGdiDdAddAttachedSurface(HANDLE hSurface, if (pfnDdAddAttachedSurface == NULL) { - DPRINT1("Warring no pfnDdAddAttachedSurface"); + DPRINT1("Warning: no pfnDdAddAttachedSurface"); return DDHAL_DRIVER_NOTHANDLED; } @@ -170,7 +170,7 @@ NtGdiDdGetBltStatus(HANDLE hSurface, if (pfnDdGetBltStatus == NULL) { - DPRINT1("Warring no pfnDdGetBltStatus"); + DPRINT1("Warning: no pfnDdGetBltStatus"); return DDHAL_DRIVER_NOTHANDLED; } @@ -190,7 +190,7 @@ NtGdiDdGetFlipStatus(HANDLE hSurface, if (pfnDdGetFlipStatus == NULL) { - DPRINT1("Warring no pfnDdGetFlipStatus"); + DPRINT1("Warning: no pfnDdGetFlipStatus"); return DDHAL_DRIVER_NOTHANDLED; } @@ -211,7 +211,7 @@ NtGdiDdUpdateOverlay(HANDLE hSurfaceDestination, if (pfnDdUpdateOverlay == NULL) { - DPRINT1("Warring no pfnDdUpdateOverlay"); + DPRINT1("Warning: no pfnDdUpdateOverlay"); return DDHAL_DRIVER_NOTHANDLED; } @@ -233,7 +233,7 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, if (pfnDdSetOverlayPosition == NULL) { - DPRINT1("Warring no pfnDdSetOverlayPosition"); + DPRINT1("Warning: no pfnDdSetOverlayPosition"); return DDHAL_DRIVER_NOTHANDLED; } @@ -242,8 +242,8 @@ NtGdiDdSetOverlayPosition(HANDLE hSurfaceSource, } /************************************************************************/ -/* This is not part of the ddsurface interface but it have */ -/* deal with the surface */ +/* This is not part of the ddsurface interface but it */ +/* deals with the surface */ /************************************************************************/ @@ -260,7 +260,7 @@ NtGdiDdAlphaBlt(HANDLE hSurfaceDest, if (pfnDdAlphaBlt == NULL) { - DPRINT1("Warring no pfnDdAlphaBlt"); + DPRINT1("Warning: no pfnDdAlphaBlt"); return DDHAL_DRIVER_NOTHANDLED; } @@ -281,7 +281,7 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom, if (pfnDdAttachSurface == NULL) { - DPRINT1("Warring no pfnDdAttachSurface"); + DPRINT1("Warning: no pfnDdAttachSurface"); return DDHAL_DRIVER_NOTHANDLED; } @@ -292,9 +292,9 @@ NtGdiDdAttachSurface(HANDLE hSurfaceFrom, /************************************************************************/ /* NtGdiDdUnattachSurface */ /************************************************************************/ -/* Note : msdn protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached) +/* Note: MSDN protypes is VOID APIENTRY NtGdiDdUnattachSurface(HANDLE hSurface, HANDLE hSurfaceAttached) But it say it return either DDHAL_DRIVER_NOTHANDLED or DDHAL_DRIVER_HANDLED - so I guess it is a typo in MSDN for this protypes for the info talk against it self + so I guess it is a typo in MSDN for this prototype for the info contradicts itself. */ DWORD APIENTRY @@ -304,12 +304,10 @@ NtGdiDdUnattachSurface(HANDLE hSurface, PGD_DXDDUNATTACHSURFACE pfnDdUnattachSurface = (PGD_DXDDUNATTACHSURFACE)gpDxFuncs[DXG_INDEX_DxDdUnattachSurface].pfn; if (pfnDdUnattachSurface == NULL) { - DPRINT1("Warring no pfnDdUnattachSurface"); + DPRINT1("Warning: no pfnDdUnattachSurface"); return DDHAL_DRIVER_NOTHANDLED; } DPRINT1("Calling on dxg.sys pfnDdUnattachSurface"); return pfnDdUnattachSurface(hSurface,hSurfaceAttached); } - - diff --git a/reactos/subsystems/win32/win32k/ntddraw/dvp.c b/reactos/subsystems/win32/win32k/ntddraw/dvp.c index a03be0fa30c..4dddb94fcd0 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dvp.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dvp.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/dvd.c + * FILE: subsystems/win32/win32k/ntddraw/dvp.c * PROGRAMER: Magnus olsen (magnus@greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c index ff7f7060eb2..d30871a32f4 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c @@ -473,8 +473,8 @@ DxEngGetDCState(HDC hDC, break; } default: - /* if a valid type is not found, zero is returned */ - DPRINT1("Warning did not find type %d\n",type); + /* If a valid type is not found, zero is returned */ + DPRINT1("Warning: did not find type %d\n",type); break; } DC_UnlockDc(pDC); @@ -593,12 +593,12 @@ DxEngReferenceHdev(HDEV hDev) /* DxEngNUIsTermSrv */ /************************************************************************/ -/* Notes : Check see if termal server got a connections or not */ +/* Notes: Check if terminal server got connections or not */ BOOLEAN APIENTRY DxEngNUIsTermSrv() { - /* FIXME ReactOS does not suport terminal server yet, we can not check if we got a connections or not */ + /* FIXME: ReactOS does not suport terminal server yet, we can not check if we got connections or not */ UNIMPLEMENTED; return FALSE; } @@ -607,7 +607,7 @@ DxEngNUIsTermSrv() /* DxEngRedrawDesktop */ /************************************************************************/ -/* Notes : it always returns TRUE, and it updates whole screen +/* Notes: it always returns TRUE, and it updates whole screen (redraws current desktop) */ BOOLEAN APIENTRY @@ -623,7 +623,7 @@ ULONG gulVisRgnUniqueness; // Increase count everytime client region is updated. /************************************************************************/ /* DxEngVisRgnUniq */ /************************************************************************/ -/* Notes : returns the VisRgnUniq counter for win32k */ +/* Notes: returns the VisRgnUniq counter for win32k */ ULONG APIENTRY DxEngVisRgnUniq() @@ -641,7 +641,7 @@ HDEV * APIENTRY DxEngEnumerateHdev(HDEV *hdev) { - /* FIXME Enumerate all drivers in win32k */ + /* FIXME: Enumerate all drivers in win32k */ UNIMPLEMENTED; return FALSE; } @@ -663,7 +663,7 @@ DWORD APIENTRY DxEngScreenAccessCheck() { UNIMPLEMENTED; - /* we cheating here and tell dxg.sys it have always premitions to access the screen */ + /* We're cheating here and telling dxg.sys it has always had permissions to access the screen */ return TRUE; } @@ -673,7 +673,7 @@ DWORD APIENTRY DxEngScreenAccessCheck() BOOLEAN APIENTRY DxEngIsHdevLockedByCurrentThread(HDEV hDev) -{ // base on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. +{ // Based on EngIsSemaphoreOwnedByCurrentThread w/o the Ex call. PERESOURCE pSem = ((PPDEVOBJ)hDev)->hsemDevLock; return pSem->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)PsGetCurrentThread(); } diff --git a/reactos/subsystems/win32/win32k/ntddraw/eng.c b/reactos/subsystems/win32/win32k/ntddraw/eng.c index f55525a6b51..529ada6b4c0 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/eng.c +++ b/reactos/subsystems/win32/win32k/ntddraw/eng.c @@ -1,10 +1,8 @@ - - /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Native DirectDraw implementation - * FILE: subsys/win32k/ntddraw/dvd.c + * FILE: subsystems/win32/win32k/ntddraw/eng.c * PROGRAMER: Magnus olsen (magnus@greatlord.com) * REVISION HISTORY: * 19/1-2006 Magnus Olsen