Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[dchapyshev] 31058: - Update Russian Translation for servman - Add rasdlg to bootcd - Delete unused icons for main.cpl - Update English and Russian Translation for console.dll - Small fix Russian Translation for kernel32 - Update Russian Translation for shell32

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Dec 7 20:05:46 2007 New Revision: 31058 URL: http://svn.reactos.org/svn/reactos?rev=31058&view=rev Log: - Update Russian Translation for servman - Add rasdlg to bootcd - Delete unused icons for main.cpl - Update English and Russian Translation for console.dll - Small fix Russian Translation for kernel32 - Update Russian Translation for shell32 Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/cpl/main/resources/folder_closed.ico trunk/reactos/dll/cpl/main/resources/folder_open.ico trunk/reactos/dll/win32/console/lang/en-US.rc trunk/reactos/dll/win32/console/lang/ru-RU.rc trunk/reactos/dll/win32/kernel32/nls/rus.nls trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -117,19 +117,19 @@ FONT 8, "MS Shell Dlg",0,0 STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP BEGIN - EDITTEXT IDC_CREATE_SERVNAME, 72, 12, 150, 11, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE - EDITTEXT IDC_CREATE_DISPNAME, 72, 31, 150, 11, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 13, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_DESC, 10, 97, 210, 48, WS_CHILD | WS_VISIBLE - EDITTEXT IDC_CREATE_OPTIONS, 10, 162, 210, 13, WS_CHILD | WS_VISIBLE - LTEXT "*Èìÿ ñëóæáû :", IDC_STATIC, 12, 12, 54, 9 - LTEXT "*Îòîáðàæàåìîå èìÿ :", IDC_STATIC, 12, 33, 54, 9 - LTEXT "*Èñïîëíÿåìûé ôàéë :", IDC_STATIC, 10, 51, 68, 9 - LTEXT "Îïèñàíèå :", IDC_STATIC, 12, 86, 44, 9 - PUSHBUTTON "OK", IDOK, 126, 192, 44, 13 - PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 13 - LTEXT "Äîïîëíèòåëüíûå îïöèè (íàæìèòå ñïðàâêó äëÿ óòî÷íåíèÿ)", IDC_STATIC, 10, 151, 134, 9 - PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 6, 192, 44, 13 + EDITTEXT IDC_CREATE_SERVNAME, 71, 9, 150, 14, WS_CHILD | WS_VISIBLE | WS_EX_CLIENTEDGE + EDITTEXT IDC_CREATE_DISPNAME, 87, 29, 134, 14, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_PATH, 8, 62, 214, 14, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_DESC, 8, 97, 210, 48, WS_CHILD | WS_VISIBLE + EDITTEXT IDC_CREATE_OPTIONS, 8, 162, 210, 14, WS_CHILD | WS_VISIBLE + LTEXT "*Èìÿ ñëóæáû:", IDC_STATIC, 8, 12, 59, 9 + LTEXT "*Îòîáðàæàåìîå èìÿ:", IDC_STATIC, 8, 33, 78, 9 + LTEXT "*Èñïîëíÿåìûé ôàéë:", IDC_STATIC, 8, 51, 96, 9 + LTEXT "Îïèñàíèå:", IDC_STATIC, 8, 86, 58, 9 + PUSHBUTTON "OK", IDOK, 126, 192, 44, 14 + PUSHBUTTON "Îòìåíà", IDCANCEL, 176, 192, 46, 14 + LTEXT "Äîïîëíèòåëíî (íàæìèòå ""Ñïðàâêà"" äëÿ óòî÷íåíèÿ)", IDC_STATIC, 8, 151, 206, 9 + PUSHBUTTON "Ñïðàâêà", ID_CREATE_HELP, 8, 192, 44, 14 END IDD_DLG_DELETE DIALOGEX 6,6,185,148 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Fri Dec 7 20:05:46 2007 @@ -224,6 +224,7 @@ dll\win32\psapi\psapi.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\rasapi32\rasapi32.dll 1 +dll\win32\rasdlg\rasdlg.dll 1 dll\win32\riched20\riched20.dll 1 dll\win32\riched32\riched32.dll 1 dll\win32\rpcrt4\rpcrt4.dll 1 Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_open.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/console/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/en-US.rc (original) +++ trunk/reactos/dll/win32/console/lang/en-US.rc Fri Dec 7 20:05:46 2007 @@ -2,7 +2,7 @@ * * PROJECT: ReactOS Console Configuration DLL * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/en.rc + * FILE: dll/win32/console/lang/en-US.rc * PURPOSE: English resource file * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) */ @@ -11,141 +11,139 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Options" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Cursor Size", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 -GROUPBOX "Display Options", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "Command History:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "&Buffer Size", -1, 25, 100, 60, 15 -EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&Number of Buffers:", -1, 25, 120, 80, 15 -EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 -CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 - - -GROUPBOX "Edit Options", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Cursor Size", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Small", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&Medium", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Large", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Display Options", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Window", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "F&ull Screen", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "Command History", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Buffer Size:", -1, 14, 101, 70, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "&Number of Buffers:", -1, 14, 124, 70, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Discard Old Duplicates", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "Edit Options", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&QuickEdit Mode", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Insert Mode", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Font" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 -LTEXT "Size", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 -LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Font", -1, 10, 105, 35, 10 -CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 -LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL -GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Each character is:", -1, 130, 165, 75, 10 -LTEXT "screen pixel wide\nscreen pixel high", -1, 140, 180, 65, 20 -LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + LTEXT "Window Preview:", -1, 10, 10, 94, 10 + LTEXT "Size:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "&Font:", -1, 10, 105, 33, 10 + CHECKBOX "&Bold fonts", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Each character is:", -1, 124, 166, 75, 10 + LTEXT "screen pixel wide\nscreen pixel high", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Layout" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Window Preview", -1, 10, 7, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Screen Buffer Size", -1, 130, 15, 115, 40 -LTEXT "&Width:", -1, 135, 30, 25, 10 -LTEXT "&Height:", -1, 135, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Size", -1, 130, 60, 115, 40 -LTEXT "&W&idth:", -1, 135, 70, 25, 10 -LTEXT "&H&eight:", -1, 135, 80, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 130, 105, 115, 55 -LTEXT "&Left:", -1, 135, 120, 25, 10 -LTEXT "&Top:", -1, 135, 130, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 + LTEXT "Window Preview:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Screen Buffer Size", -1, 130, 12, 115, 50 + LTEXT "&Width:", -1, 140, 28, 40, 10 + LTEXT "&Height:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Window Size", -1, 130, 65, 115, 47 + LTEXT "&W&idth:", -1, 140, 78, 39, 10 + LTEXT "&H&eight:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "Window Position", -1, 130, 116, 115, 64 + LTEXT "&Left:", -1, 140, 132, 38, 10 + LTEXT "&Top:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "Let system &position window", IDC_CHECK_SYSTEM_POS_WINDOW, 137, 165, 104, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Colors" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Selected Color Values", -1, 120, 15, 90, 45 -LTEXT "&Red:", -1, 125, 25, 30, 10 -EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Green:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Blue:", -1, 125, 45, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Selected Screen Colors", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Selected Popup Colors", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 + CONTROL "Screen &Text", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "Screen &Background", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Popup Text", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Pop&up Background", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Selected Color Values", -1, 129, 7, 118, 73 + LTEXT "&Red:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "&Green:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "&Blue:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "Selected Screen Colors", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "Selected Popup Colors", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Apply Properties" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 -CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 -PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE -PUSHBUTTON "Cancel", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + CONTROL "&Apply Properties to current window only", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Save Properties for future windows with same title", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Cancel", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END STRINGTABLE BEGIN - IDS_CPLNAME "Console" - IDS_CPLDESCRIPTION "Configures console properties." - IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Raster Fonts" + IDS_CPLNAME "Console" + IDS_CPLDESCRIPTION "Configures console properties." + IDS_APPLY_SHORTCUT_ALL "Modify &shortcut that started this window" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" + IDS_RASTERFONTS "Raster Fonts" END Modified: trunk/reactos/dll/win32/console/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/console/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/console/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -1,152 +1,143 @@ // Russian language resource file (Dmitry Chapyshev, 2007-06-11) -/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ - * - * PROJECT: ReactOS Console Configuration DLL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/console/en.rc - * PURPOSE: English resource file - * PROGRAMMERS: Johannes Anderwald (johannes.anderwald(a)student.tugraz.at) - */ +/* $Id: en-US.rc 24928 2006-11-28 19:07:27Z janderwald $ */ #include <commctrl.h> LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEOPTIONS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION -CAPTION "Íàñòðîéêà" +CAPTION "Ïàðàìåòðû" FONT 8, "MS Shell Dlg" BEGIN -GROUPBOX "Ðàçìåð êóðñîðà", -1, 15, 15, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 90, 10 -CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 90, 10 -CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 55, 90, 10 -GROUPBOX "Ýêðàí", -1, 140, 15, 100, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 35, 70, 10 -CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 50, 70, 10 -GROUPBOX "Èñòîðèÿ êîìàíä:", -1, 15, 90, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP -LTEXT "&Ðàçìåð áóôåðà", -1, 25, 100, 60, 15 -EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 100, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 100, 12, 12 -LTEXT "&×èñëî áóôåðîâ:", -1, 25, 120, 80, 15 -EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 115, 120, 12, 12 -CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 25, 140, 100, 15 - - -GROUPBOX "Ðåäàêòèðîâàíèå", -1, 140, 90, 100, 70, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP -CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 150, 100, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP -CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 150, 120, 60, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Ðàçìåð êóðñîðà", -1, 7, 7, 120, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Áîëüøîé", IDC_RADIO_SMALL_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 20, 90, 10 + CONTROL "&Ñðåäíèé", IDC_RADIO_MEDIUM_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 40, 90, 10 + CONTROL "&Ìàëåíüêèé", IDC_RADIO_LARGE_CURSOR, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 60, 90, 10 + GROUPBOX "Ýêðàí", -1, 133, 7, 112, 70, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "&Îêíî", IDC_RADIO_DISPLAY_WINDOW, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 20, 70, 10 + CONTROL "&Ïîëíûé ýêðàí", IDC_RADIO_DISPLAY_FULL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 40, 70, 10 + GROUPBOX "Èñòîðèÿ êîìàíä", -1, 7, 84, 120, 77, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "&Ðàçìåð áóôåðà:", -1, 14, 101, 60, 12 + EDITTEXT IDC_EDIT_BUFFER_SIZE, 90, 97, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_BUFFER_SIZE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 97, 12, 15 + LTEXT "&×èñëî áóôåðîâ:", -1, 14, 124, 60, 12 + EDITTEXT IDC_EDIT_NUM_BUFFER, 90, 120, 30, 15, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_NUM_BUFFER, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 119, 120, 12, 15 + CHECKBOX "&Óáèðàòü ñòàðûå ýêçåìëÿðû", IDC_CHECK_DISCARD_DUPLICATES, 12, 140, 110, 15 + GROUPBOX "Ðåäàêòèðîâàíèå", -1, 133, 85, 112, 77, BS_GROUPBOX | WS_CHILD | WS_VISIBLE | WS_GROUP + CHECKBOX "&Áûñòðîå ðåäàêòèðîâàíèå", IDC_CHECK_QUICK_EDIT, 140, 97, 102, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "&Ðåæèì âñòàâêè", IDC_CHECK_INSERT_MODE, 140, 113, 76, 15, WS_CHILD | WS_VISIBLE | WS_TABSTOP END -IDD_PROPPAGEFONT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGEFONT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Øðèôò" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10 -LTEXT "Ðàçìåð", -1, 130, 10, 30, 10 -CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 115, 70 -LISTBOX IDC_LBOX_FONTS, 130, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL -LTEXT "&Øðèôò", -1, 10, 105, 35, 10 -CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 45, 105, 60, 10 -LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 50, LBS_DISABLENOSCROLL | WS_VSCROLL -GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 10, 155, 200, 50 -CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 95, 35 -LTEXT "Êàæäûé ñèìâîë:", -1, 130, 165, 75, 10 -LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 140, 180, 65, 20 -LTEXT "", IDC_FONT_SIZE_X, 125, 180, 10, 10 -LTEXT "", IDC_FONT_SIZE_Y, 125, 188, 10, 10 + LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 10, 10, 94, 10 + LTEXT "Ðàçìåð:", -1, 180, 10, 36, 10 + CONTROL "", IDC_STATIC_FONT_WINDOW_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 10, 20, 163, 74 + LISTBOX IDC_LBOX_FONTS, 181, 20, 55, 80, LBS_DISABLENOSCROLL | WS_VSCROLL + LTEXT "&Øðèôò:", -1, 10, 105, 33, 10 + CHECKBOX "&Æèðíûé", IDC_CHECK_BOLD_FONTS, 56, 105, 60, 10 + LISTBOX IDC_LBOX_TYPE, 10, 120, 110, 40, LBS_DISABLENOSCROLL | WS_VSCROLL + GROUPBOX "", IDC_GROUPBOX_FONT_NAME, 6, 156, 241, 50 + CONTROL "", IDC_STATIC_SELECT_FONT_PREVIEW, "Static", SS_OWNERDRAW | SS_SUNKEN, 16, 165, 95, 35 + LTEXT "Êàæäûé ñèìâîë:", -1, 124, 166, 75, 10 + LTEXT "øèðîêèå ïèêñåëû íà ýêðàíå\nâûñîêèå ïèêñåëû íà ýêðàíå", -1, 136, 180, 101, 20 + LTEXT "", IDC_FONT_SIZE_X, 120, 180, 10, 10 + LTEXT "", IDC_FONT_SIZE_Y, 120, 188, 10, 10 END -IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGELAYOUT DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Ðàñêëàäêà" FONT 8, "MS Shell Dlg" BEGIN -LTEXT "Îêíî ïðåäïðîñìîòðà", -1, 10, 7, 65, 10 -CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 10, 20, 115, 70 -GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 15, 115, 40 -LTEXT "&Øèðèíà:", -1, 135, 30, 25, 10 -LTEXT "&Âûñîòà:", -1, 135, 40, 25, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 165, 30, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 165, 40, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Ðàçìåð îêíà", -1, 130, 60, 115, 40 -LTEXT "Ø&èðèíà:", -1, 135, 70, 25, 10 -LTEXT "Â&ûñîòà:", -1, 135, 80, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 165, 70, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 165, 80, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -GROUPBOX "Window Position", -1, 130, 105, 115, 55 -LTEXT "&Îòñòóï:", -1, 135, 120, 25, 10 -LTEXT "&Âûñîòà:", -1, 135, 130, 25, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 165, 120, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 165, 130, 35, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 185, 30, 30, 10 -CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 135, 145, 100, 10 + LTEXT "Îêíî ïðåäïðîñìîòðà:", -1, 8, 6, 95, 10 + CONTROL "", IDC_STATIC_LAYOUT_WINDOW_PREVIEW, "Static", SS_SUNKEN | SS_OWNERDRAW, 8, 16, 115, 70 + GROUPBOX "Ðàçìåð áóôåðà ýêðàíà", -1, 130, 12, 115, 50 + LTEXT "&Øèðèíà:", -1, 140, 28, 40, 10 + LTEXT "&Âûñîòà:", -1, 140, 46, 39, 10 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_WIDTH, 203, 25, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 25, 13, 14 + EDITTEXT IDC_EDIT_SCREEN_BUFFER_HEIGHT, 203, 42, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_SCREEN_BUFFER_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 42, 13, 14 + GROUPBOX "Ðàçìåð îêíà", -1, 130, 65, 115, 47 + LTEXT "Ø&èðèíà:", -1, 140, 78, 39, 10 + LTEXT "Â&ûñîòà:", -1, 140, 95, 37, 10 + EDITTEXT IDC_EDIT_WINDOW_SIZE_WIDTH, 203, 75, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_WIDTH, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 75, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_SIZE_HEIGHT, 203, 92, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_SIZE_HEIGHT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 92, 13, 14 + GROUPBOX "Ïîëîæåíèå îêíà", -1, 130, 116, 115, 64 + LTEXT "&Îòñòóï:", -1, 140, 132, 38, 10 + LTEXT "&Âûñîòà:", -1, 140, 149, 40, 10 + EDITTEXT IDC_EDIT_WINDOW_POS_LEFT, 203, 128, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_LEFT, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 128, 13, 14 + EDITTEXT IDC_EDIT_WINDOW_POS_TOP, 203, 146, 35, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_WINDOW_POS_TOP, UPDOWN_CLASS, UDS_NOTHOUSANDS | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 238, 146, 13, 14 + CHECKBOX "&Ñèñòåìíàÿ ïîçèöèÿ îêíà", IDC_CHECK_SYSTEM_POS_WINDOW, 140, 165, 100, 10 END -IDD_PROPPAGECOLORS DIALOGEX 0, 0, 250, 220 +IDD_PROPPAGECOLORS DIALOGEX 0, 0, 253, 220 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_CAPTION CAPTION "Öâåòà" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 15, 90, 10 -CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 25, 90, 10 -CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 35, 90, 10 -CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 15, 45, 90, 10 -GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 120, 15, 90, 45 -LTEXT "&Êðàñíûé:", -1, 125, 25, 30, 10 -EDITTEXT IDC_EDIT_COLOR_RED, 150, 25, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 25, 30, 10 -LTEXT "&Çåëåíûé:", -1, 125, 35, 30, 10 -EDITTEXT IDC_EDIT_COLOR_GREEN, 150, 35, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 35, 30, 10 -LTEXT "&Ãîëóáîé:", -1, 125, 45, 30, 10 -EDITTEXT IDC_EDIT_COLOR_BLUE, 150, 45, 30, 10, ES_RIGHT | WS_GROUP -CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 165, 45, 30, 10 -CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 15, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 27, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 39, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 51, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 63, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 75, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 99, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 111, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 123, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 135, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 147, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 159, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 183, 90, 10, 10 -CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 195, 90, 10, 10 -GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 10, 110, 200, 40 -CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 120, 180, 20 -GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 10, 155, 200, 40 -CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 165, 180, 20 + CONTROL "&Òåêñò íà ýêðàíå", IDC_RADIO_SCREEN_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 12, 112, 10 + CONTROL "&Ôîí ýêðàíà", IDC_RADIO_SCREEN_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 30, 112, 10 + CONTROL "&Âñïëûâàþùèé òåêñò", IDC_RADIO_POPUP_TEXT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 48, 112, 10 + CONTROL "Â&ñïëûâàþùèé ôîí", IDC_RADIO_POPUP_BACKGROUND, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 67, 112, 10 + GROUPBOX "Âûáîð çíà÷åíèé öâåòîâ", -1, 129, 7, 118, 73 + LTEXT "&Êðàñíûé:", -1, 140, 25, 48, 10 + EDITTEXT IDC_EDIT_COLOR_RED, 210, 22, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_RED, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 22, 12, 14 + LTEXT "&Çåëåíûé:", -1, 140, 42, 48, 10 + EDITTEXT IDC_EDIT_COLOR_GREEN, 210, 39, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_GREEN, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 39, 12, 14 + LTEXT "&Ãîëóáîé:", -1, 140, 60, 48, 10 + EDITTEXT IDC_EDIT_COLOR_BLUE, 210, 56, 30, 14, ES_RIGHT | WS_GROUP + CONTROL "", IDC_UPDOWN_COLOR_BLUE, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 240, 56, 12, 14 + CONTROL "", IDC_STATIC_COLOR1, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 17, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR2, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 31, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR3, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 45, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR4, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 59, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR5, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 73, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR6, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 87, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR7, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 101, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR8, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 115, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR9, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 129, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR10, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 143, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR11, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 157, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR12, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 171, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR13, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 185, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR14, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 199, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR15, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 213, 90, 12, 12 + CONTROL "", IDC_STATIC_COLOR16, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 227, 90, 12, 12 + GROUPBOX "Âûáðàííûé öâåò ýêðàíà", -1, 7, 111, 240, 40 + CONTROL "", IDC_STATIC_SCREEN_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 124, 224, 20 + GROUPBOX "Âûáðàííûå âñïëûâàþùèå öâåòà", -1, 7, 162, 240, 40 + CONTROL "", IDC_STATIC_POPUP_COLOR, "Static", SS_OWNERDRAW | SS_SUNKEN, 15, 176, 224, 20 END -IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 100 +IDD_APPLYOPTIONS DIALOGEX 0, 0, 220, 79 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Ïðèìåíèòü ñâîéñòâà" FONT 8, "MS Shell Dlg" BEGIN -CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 25, 150, 10 -CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 25, 40, 185, 10 -PUSHBUTTON "OK", IDOK, 25, 80, 40, 15, WS_VISIBLE -PUSHBUTTON "Îòìåíà", IDCANCEL, 120, 80, 50, 15, WS_VISIBLE + CONTROL "&Ïðèìåíèòü ñâîéñòâà òîëüêî äëÿ ýòîãî îêíà", IDC_RADIO_APPLY_CURRENT, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 12, 207, 10 + CONTROL "&Ñîõðàíèòü ñâîéñòâà äëÿ âñåõ îêîí ñ òàêèì çàãîëîâêîì", IDC_RADIO_APPLY_ALL, "Button", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 12, 31, 207, 10 + PUSHBUTTON "OK", IDOK, 58, 58, 50, 14, WS_VISIBLE + PUSHBUTTON "Îòìåíà", IDCANCEL, 114, 58, 50, 14, WS_VISIBLE END STRINGTABLE BEGIN - IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà" - IDS_CPLDESCRIPTION "Íàñòðîéêà Êîìàíäíîé ñòðîêè." - IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî" - IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" - IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû" + IDS_CPLNAME "Êîìàíäíàÿ ñòðîêà" + IDS_CPLDESCRIPTION "Íàñòðîéêà êîìàíäíîé ñòðîêè." + IDS_APPLY_SHORTCUT_ALL "&Èçìåíèòü ÿðëûê, êîòîðûì áûëî çàïóùåíî ýòî îêíî" + IDS_SCREEN_TEXT "C:\ReactOS> dir\nSYSTEM <DIR> 10-01-07 5:00\nSYSTEM32 <DIR> 10-01-07 5:00" + IDS_RASTERFONTS "Ðàñòðîâûå øðèôòû" END Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/rus.nls (original) +++ trunk/reactos/dll/win32/kernel32/nls/rus.nls Fri Dec 7 20:05:46 2007 @@ -143,7 +143,7 @@ LGRPID_JAPANESE+LGRPID_RES_BASE "ßïîíñêèé" LGRPID_KOREAN+LGRPID_RES_BASE "Êîðåéñêèé" LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé òðàäèöèîííûé" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîù¸ííûé" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Êèòàéñêèé óïðîùåííûé" LGRPID_THAI+LGRPID_RES_BASE "Òàéñêèé" LGRPID_HEBREW+LGRPID_RES_BASE "Èâðèò" LGRPID_ARABIC+LGRPID_RES_BASE "Àðàáñêèé" Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Fri Dec 7 20:05:46 2007 @@ -72,7 +72,7 @@ MENUITEM "&Êîïèðîâàòü", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Ñîçäàòü &ÿðëûê", FCIDM_SHVIEW_CREATELINK - MENUITEM "&Óäàëìòü", FCIDM_SHVIEW_DELETE + MENUITEM "&Óäàëèòü", FCIDM_SHVIEW_DELETE MENUITEM "Ïåðåè&ìåíîâàòü", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "Ñâî&éñòâà", FCIDM_SHVIEW_PROPERTIES @@ -239,7 +239,7 @@ LTEXT "Àâòîðñêèå ïðàâà: ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 GROUPBOX "Äîïîëíèòåëüíûå ñâåäåíèÿ: ", 14006, 6, 70, 222, 115 - LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 50, 10 + LTEXT "Èìÿ ýëåìåíòà: ", 14007, 13, 82, 63, 10 LTEXT "Çíà÷åíèå: ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY

16 years, 9 months

[hpoussin] 31057: Better guess of the file path

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 7 20:00:21 2007 New Revision: 31057 URL: http://svn.reactos.org/svn/reactos?rev=31057&view=rev Log: Better guess of the file path Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Fri Dec 7 20:00:21 2007 @@ -877,6 +877,7 @@ PIMAGE_NT_HEADERS NtHeader; WCHAR PathToDrivers[] = L"\\SystemRoot\\System32\\drivers\\"; WCHAR PathToSystem32[] = L"\\SystemRoot\\System32\\"; + WCHAR PathSetup[] = L"\\SystemRoot\\"; CHAR DriverNameLow[256]; ULONG Base; @@ -1064,7 +1065,13 @@ LdrEntry->FullDllName.Buffer = BldrModuleStringsFull[i]; /* Guess the path */ - if (strstr(DriverNameLow, ".dll") || strstr(DriverNameLow, ".exe")) + if (LoaderBlock->SetupLdrBlock) + { + UNICODE_STRING TempString; + RtlInitUnicodeString(&TempString, PathSetup); + RtlAppendUnicodeStringToString(&LdrEntry->FullDllName, &TempString); + } + else if (strstr(DriverNameLow, ".dll") || strstr(DriverNameLow, ".exe")) { UNICODE_STRING TempString; RtlInitUnicodeString(&TempString, PathToSystem32);

16 years, 9 months

[fireball] 31056: - Fix LiveCD. - Move CmpQueryKeyName and CmpDeleteKeyObject to config, and actually make CmpDeleteKeyObject do something. - Partly implement CmpCloseKeyObject. - Rewrite CmpLinkHiveToMaster to use ObOpenObjectByName instead of Ob-hacks, and add proper call in new parse routine to handle link node creation. We don't use Ob hacks for this anymore! - Setup the CM_KEY_BODY when required. - Call (and partly implement) EnlistKeyBodyWithKCB when required.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 7 19:11:02 2007 New Revision: 31056 URL: http://svn.reactos.org/svn/reactos?rev=31056&view=rev Log: - Fix LiveCD. - Move CmpQueryKeyName and CmpDeleteKeyObject to config, and actually make CmpDeleteKeyObject do something. - Partly implement CmpCloseKeyObject. - Rewrite CmpLinkHiveToMaster to use ObOpenObjectByName instead of Ob-hacks, and add proper call in new parse routine to handle link node creation. We don't use Ob hacks for this anymore! - Setup the CM_KEY_BODY when required. - Call (and partly implement) EnlistKeyBodyWithKCB when required. Modified: trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cmkcbncb.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Dec 7 19:11:02 2007 @@ -815,56 +815,6 @@ return(STATUS_SUCCESS); } -VOID -NTAPI -CmpDeleteKeyObject(PVOID DeletedObject) -{ - PCM_KEY_BODY KeyObject; - REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; - REG_POST_OPERATION_INFORMATION PostOperationInfo; - NTSTATUS Status; - - DPRINT("Delete key object (%p)\n", DeletedObject); - - KeyObject = (PCM_KEY_BODY) DeletedObject; - - - PostOperationInfo.Object = (PVOID)KeyObject; - KeyHandleCloseInfo.Object = (PVOID)KeyObject; - Status = CmiCallRegisteredCallbacks(RegNtPreKeyHandleClose, &KeyHandleCloseInfo); - if (!NT_SUCCESS(Status)) - { - PostOperationInfo.Status = Status; - CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); - return; - } - - /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); - - ASSERT((KeyObject->KeyControlBlock->Delete) == FALSE); - - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); - PostOperationInfo.Status = STATUS_SUCCESS; - CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); -} - -NTSTATUS -NTAPI -CmpQueryKeyName(PVOID ObjectBody, - IN BOOLEAN HasName, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength, - IN KPROCESSOR_MODE PreviousMode) -{ - DPRINT1("CmpQueryKeyName() called\n"); - while (TRUE); - return STATUS_SUCCESS; -} - static NTSTATUS CmiGetLinkTarget(PCMHIVE RegistryHive, PCM_KEY_NODE KeyCell, Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c Fri Dec 7 19:11:02 2007 @@ -812,7 +812,12 @@ EnlistKeyBodyWithKCB(IN PCM_KEY_BODY KeyBody, IN ULONG Flags) { - ASSERT(FALSE); -} - - + /* Sanity check */ + ASSERT(KeyBody->KeyControlBlock != NULL); + + /* Initialize the list entry */ + InitializeListHead(&KeyBody->KeyBodyList); + + /* FIXME: Implement once we don't link parents to children anymore */ +} + Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Dec 7 19:11:02 2007 @@ -165,7 +165,11 @@ 0, Object); if (!NT_SUCCESS(Status)) goto Quickie; + + /* Setup the key body */ KeyBody = (PCM_KEY_BODY)(*Object); + KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->KeyControlBlock = NULL; /* Check if we had a class */ if (ParseContext->Class.Length > 0) @@ -232,7 +236,12 @@ ASSERT(Kcb->RefCount == 1); /* Now fill out the Cm object */ + KeyBody->NotifyBlock = NULL; + KeyBody->ProcessID = PsGetCurrentProcessId(); KeyBody->KeyControlBlock = Kcb; + + /* Link it with the KCB */ + EnlistKeyBodyWithKCB(KeyBody, 0); Quickie: /* Check if we got here because of failure */ @@ -484,6 +493,12 @@ /* Get the key body and fill it out */ KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; + KeyBody->Type = TAG('k', 'y', '0', '2'); + KeyBody->ProcessID = PsGetCurrentProcessId(); + KeyBody->NotifyBlock = NULL; + + /* Link to the KCB */ + EnlistKeyBodyWithKCB(KeyBody, 0); } else { @@ -703,6 +718,7 @@ /* Update the timestamp */ KeQuerySystemTime(&TimeStamp); KeyNode->LastWriteTime = TimeStamp; + KeyBody->KeyControlBlock->ParentKcb->KcbLastWriteTime = TimeStamp; /* Check if we need to update name maximum */ if (KeyNode->MaxNameLen < Name.Length) @@ -718,6 +734,14 @@ /* Update it */ KeyNode->MaxClassLen = Context->Class.Length; } + + /* Release the cell */ + HvReleaseCell(Hive, Cell); + } + else + { + /* Release the link cell */ + HvReleaseCell(Hive, LinkCell); } Exit: @@ -986,11 +1010,22 @@ /* Check if this was the last key for a create */ if ((Last) && (ParseContext)) { + PCM_KEY_BODY KeyBody; + /* Check if we're doing a link node */ if (ParseContext->CreateLink) { /* The only thing we should see */ - DPRINT1("Expected: Creating new link\n"); + Status = CmpCreateLinkNode(Hive, + Cell, + AccessState, + NextName, + AccessMode, + Attributes, + ParseContext, + ParentKcb, + Object); + DPRINT1("Link created: %lx\n", Status); } else { @@ -998,6 +1033,14 @@ DPRINT1("Unexpected: Creating new child\n"); while (TRUE); } + + /* Check for reparse (in this case, someone beat us) */ + if (Status == STATUS_REPARSE) break; + + /* ReactOS Hack: Link this key to the parent */ + KeyBody = (PCM_KEY_BODY)*Object; + InsertTailList(&ParentKcb->KeyBodyListHead, + &KeyBody->KeyBodyList); /* Update disposition */ ParseContext->Disposition = REG_CREATED_NEW_KEY; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Dec 7 19:11:02 2007 @@ -72,6 +72,96 @@ return (PVOID)((MdBlock->BasePage << PAGE_SHIFT) | KSEG0_BASE); } +VOID +NTAPI +CmpDeleteKeyObject(PVOID DeletedObject) +{ + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)DeletedObject; + PCM_KEY_CONTROL_BLOCK Kcb; + REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; + REG_POST_OPERATION_INFORMATION PostOperationInfo; + NTSTATUS Status; + PAGED_CODE(); + + /* First off, prepare the handle close information callback */ + PostOperationInfo.Object = KeyBody; + KeyHandleCloseInfo.Object = KeyBody; + Status = CmiCallRegisteredCallbacks(RegNtPreKeyHandleClose, + &KeyHandleCloseInfo); + if (!NT_SUCCESS(Status)) + { + /* If we failed, notify the post routine */ + PostOperationInfo.Status = Status; + CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); + return; + } + + /* Acquire hive lock */ + CmpLockRegistry(); + + /* Make sure this is a valid key body */ + if (KeyBody->Type == TAG('k', 'y', '0', '2')) + { + /* Get the KCB */ + Kcb = KeyBody->KeyControlBlock; + if (Kcb) + { + /* Delist the key (once new parse routines are used) */ + //DelistKeyBodyFromKCB(KeyBody, FALSE); + } + + /* Dereference the KCB */ + CmpDelayDerefKeyControlBlock(Kcb); + + } + + /* Release the registry lock */ + CmpUnlockRegistry(); + + /* Do the post callback */ + PostOperationInfo.Status = STATUS_SUCCESS; + CmiCallRegisteredCallbacks(RegNtPostKeyHandleClose, &PostOperationInfo); +} + +VOID +NTAPI +CmpCloseKeyObject(IN PEPROCESS Process OPTIONAL, + IN PVOID Object, + IN ACCESS_MASK GrantedAccess, + IN ULONG ProcessHandleCount, + IN ULONG SystemHandleCount) +{ + PCM_KEY_BODY KeyBody = (PCM_KEY_BODY)Object; + PAGED_CODE(); + + /* Don't do anything if we're not the last handle */ + if (SystemHandleCount > 1) return; + + /* Make sure we're a valid key body */ + if (KeyBody->Type == TAG('k', 'y', '0', '2')) + { + /* Don't do anything if we don't have a notify block */ + if (!KeyBody->NotifyBlock) return; + + /* This shouldn't happen yet */ + ASSERT(FALSE); + } +} + +NTSTATUS +NTAPI +CmpQueryKeyName(IN PVOID ObjectBody, + IN BOOLEAN HasName, + IN OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, + IN KPROCESSOR_MODE PreviousMode) +{ + DPRINT1("CmpQueryKeyName() called\n"); + while (TRUE); + return STATUS_SUCCESS; +} + NTSTATUS NTAPI CmpInitHiveFromFile(IN PCUNICODE_STRING HiveName, @@ -491,14 +581,10 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING RemainingPath; - PCM_KEY_BODY ParentKey; - PCM_KEY_BODY NewKey; NTSTATUS Status; - UNICODE_STRING ObjectName; - OBJECT_CREATE_INFORMATION ObjectCreateInfo; CM_PARSE_CONTEXT ParseContext = {0}; HANDLE KeyHandle; + PCM_KEY_BODY KeyBody; PAGED_CODE(); /* Setup the object attributes */ @@ -533,83 +619,22 @@ KEY_READ | KEY_WRITE, (PVOID)&ParseContext, &KeyHandle); - - /* Capture all the info */ - Status = ObpCaptureObjectAttributes(&ObjectAttributes, - KernelMode, - FALSE, - &ObjectCreateInfo, - &ObjectName); if (!NT_SUCCESS(Status)) return Status; - - /* Do the parse */ - Status = CmFindObject(&ObjectCreateInfo, - &ObjectName, - (PVOID*)&ParentKey, - &RemainingPath, - CmpKeyObjectType, - NULL, - NULL); - - /* Let go of captured attributes and name */ - ObpReleaseCapturedAttributes(&ObjectCreateInfo); - if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - - /* Get out of here if we failed */ - if (!NT_SUCCESS(Status)) return Status; - - /* Scan for no name */ - if (!(RemainingPath.Length) || (RemainingPath.Buffer[0] == UNICODE_NULL)) - { - /* Fail */ - ObDereferenceObject(ParentKey); - return STATUS_OBJECT_NAME_NOT_FOUND; - } - - /* Scan for leading backslash */ - while ((RemainingPath.Length) && - (*RemainingPath.Buffer == OBJ_NAME_PATH_SEPARATOR)) - { - /* Ignore it */ - RemainingPath.Length -= sizeof(WCHAR); - RemainingPath.MaximumLength -= sizeof(WCHAR); - RemainingPath.Buffer++; - } - - /* Create the link node */ - Status = CmpCreateLinkNode(ParentKey->KeyControlBlock->KeyHive, - ParentKey->KeyControlBlock->KeyCell, - NULL, - RemainingPath, - KernelMode, - 0, - &ParseContext, - ParentKey->KeyControlBlock, - (PVOID*)&NewKey); - if (!NT_SUCCESS(Status)) - { - /* Failed */ - DPRINT1("CmpLinkHiveToMaster failed: %lx\n", Status); - ObDereferenceObject(ParentKey); - return Status; - } - - /* Free the create information */ - ObpFreeAndReleaseCapturedAttributes(OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo); - OBJECT_TO_OBJECT_HEADER(NewKey)->ObjectCreateInfo = NULL; /* Mark the hive as clean */ RegistryHive->Hive.DirtyFlag = FALSE; - /* Update KCB information */ - NewKey->KeyControlBlock->KeyCell = RegistryHive->Hive.BaseBlock->RootCell; - NewKey->KeyControlBlock->KeyHive = &RegistryHive->Hive; - - /* Reference the new key */ - ObReferenceObject(NewKey); - - /* Link this key to the parent */ - InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyList); + /* ReactOS Hack: Keep alive */ + Status = ObReferenceObjectByHandle(KeyHandle, + 0, + CmpKeyObjectType, + KernelMode, + (PVOID*)&KeyBody, + NULL); + ASSERT(NT_SUCCESS(Status)); + + /* Close the extra handle */ + ZwClose(KeyHandle); return STATUS_SUCCESS; } @@ -767,7 +792,7 @@ ObjectTypeInitializer.ParseProcedure = CmpParseKey; ObjectTypeInitializer.SecurityProcedure = CmpSecurityMethod; ObjectTypeInitializer.QueryNameProcedure = CmpQueryKeyName; - //ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; + ObjectTypeInitializer.CloseProcedure = CmpCloseKeyObject; ObjectTypeInitializer.SecurityRequired = TRUE; /* Create it */ @@ -892,9 +917,12 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; - RootKey->Type = TAG('k', 'v', '0', '2'); + RootKey->Type = TAG('k', 'y', '0', '2'); RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); + + /* Link with KCB */ + EnlistKeyBodyWithKCB(RootKey, 0); /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, @@ -928,7 +956,7 @@ PKEY_VALUE_PARTIAL_INFORMATION ValueInfo; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE"); UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); - ULONG BufferSize,ResultSize; + ULONG BufferSize, ResultSize; /* Check if we are booted in setup */ if (ExpInTextModeSetup) @@ -1056,7 +1084,8 @@ &CmHive, &CmpMachineHiveList[i].Allocate, 0); - if (!(NT_SUCCESS(Status)) || !(CmHive->FileHandles[HFILE_TYPE_LOG])) + if (!(NT_SUCCESS(Status)) || + (!(CmHive->FileHandles[HFILE_TYPE_LOG]) && !(CmpMiniNTBoot))) // hak { /* We failed or couldn't get a log file, raise a hard error */ ErrorParameters = &FileName;

16 years, 9 months

[hpoussin] 31055: Remove useless files

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Fri Dec 7 17:23:40 2007 New Revision: 31055 URL: http://svn.reactos.org/svn/reactos?rev=31055&view=rev Log: Remove useless files Removed: trunk/reactos/hal/halppc/generic/ipi.c trunk/reactos/hal/halppc/generic/kdbg.c trunk/reactos/hal/halppc/generic/mca.c trunk/reactos/hal/halppc/generic/pwroff.c trunk/reactos/hal/halppc/generic/resource.c trunk/reactos/hal/halppc/generic/sysbus.c trunk/reactos/hal/halppc/generic/systimer.S trunk/reactos/hal/halppc/generic/time.c trunk/reactos/hal/halx86/generic/irql.c Removed: trunk/reactos/hal/halppc/generic/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/ipi.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/ipi.c (original) +++ trunk/reactos/hal/halppc/generic/ipi.c (removed) @@ -1,24 +1,0 @@ -/* $Id: ipi.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/ipi.c - * PURPOSE: Miscellaneous hardware functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalRequestIpi(ULONG ProcessorNo) -{ - DPRINT("HalRequestIpi(ProcessorNo %lu)\n", ProcessorNo); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/kdbg.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/kdbg.c (original) +++ trunk/reactos/hal/halppc/generic/kdbg.c (removed) @@ -1,547 +1,0 @@ -/* $Id: kdbg.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/kdbg.c - * PURPOSE: Serial i/o functions for the kernel debugger. - * PROGRAMMER: Emanuele Aliberti - * Eric Kohl - * UPDATE HISTORY: - * Created 05/09/99 - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -#define DEFAULT_BAUD_RATE 19200 - - -/* MACROS *******************************************************************/ - -#define SER_RBR(x) ((x)+0) -#define SER_THR(x) ((x)+0) -#define SER_DLL(x) ((x)+0) -#define SER_IER(x) ((x)+1) -#define SR_IER_ERDA 0x01 -#define SR_IER_ETHRE 0x02 -#define SR_IER_ERLSI 0x04 -#define SR_IER_EMS 0x08 -#define SR_IER_ALL 0x0F -#define SER_DLM(x) ((x)+1) -#define SER_IIR(x) ((x)+2) -#define SER_FCR(x) ((x)+2) -#define SR_FCR_ENABLE_FIFO 0x01 -#define SR_FCR_CLEAR_RCVR 0x02 -#define SR_FCR_CLEAR_XMIT 0x04 -#define SER_LCR(x) ((x)+3) -#define SR_LCR_CS5 0x00 -#define SR_LCR_CS6 0x01 -#define SR_LCR_CS7 0x02 -#define SR_LCR_CS8 0x03 -#define SR_LCR_ST1 0x00 -#define SR_LCR_ST2 0x04 -#define SR_LCR_PNO 0x00 -#define SR_LCR_POD 0x08 -#define SR_LCR_PEV 0x18 -#define SR_LCR_PMK 0x28 -#define SR_LCR_PSP 0x38 -#define SR_LCR_BRK 0x40 -#define SR_LCR_DLAB 0x80 -#define SER_MCR(x) ((x)+4) -#define SR_MCR_DTR 0x01 -#define SR_MCR_RTS 0x02 -#define SR_MCR_OUT1 0x04 -#define SR_MCR_OUT2 0x08 -#define SR_MCR_LOOP 0x10 -#define SER_LSR(x) ((x)+5) -#define SR_LSR_DR 0x01 -#define SR_LSR_TBE 0x20 -#define SER_MSR(x) ((x)+6) -#define SR_MSR_CTS 0x10 -#define SR_MSR_DSR 0x20 -#define SER_SCR(x) ((x)+7) - - -/* GLOBAL VARIABLES *********************************************************/ - -#define KdComPortInUse _KdComPortInUse -ULONG KdComPortInUse = 0; - -/* STATIC VARIABLES *********************************************************/ - -static ULONG ComPort = 0; -static ULONG BaudRate = 0; -static PUCHAR PortBase = (PUCHAR)0; - -/* The com port must only be initialized once! */ -static BOOLEAN PortInitialized = FALSE; - - -/* STATIC FUNCTIONS *********************************************************/ - -static BOOLEAN -KdpDoesComPortExist (PUCHAR BaseAddress) -{ - BOOLEAN found; - UCHAR mcr; - UCHAR msr; - - found = FALSE; - - /* save Modem Control Register (MCR) */ - mcr = READ_PORT_UCHAR (SER_MCR(BaseAddress)); - - /* enable loop mode (set Bit 4 of the MCR) */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* clear all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x10); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0x00) - { - /* set all modem output bits */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), 0x1F); - - /* read the Modem Status Register */ - msr = READ_PORT_UCHAR (SER_MSR(BaseAddress)); - - /* - * the upper nibble of the MSR (modem output bits) must be - * equal to the lower nibble of the MCR (modem input bits) - */ - if ((msr & 0xF0) == 0xF0) - { - /* - * setup a resonable state for the port: - * enable fifo and clear recieve/transmit buffers - */ - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), - (SR_FCR_ENABLE_FIFO | SR_FCR_CLEAR_RCVR | SR_FCR_CLEAR_XMIT)); - WRITE_PORT_UCHAR (SER_FCR(BaseAddress), 0); - READ_PORT_UCHAR (SER_RBR(BaseAddress)); - WRITE_PORT_UCHAR (SER_IER(BaseAddress), 0); - found = TRUE; - } - } - - /* restore MCR */ - WRITE_PORT_UCHAR (SER_MCR(BaseAddress), mcr); - - return (found); -} - - -/* FUNCTIONS ****************************************************************/ - -/* HAL.KdPortInitialize */ -BOOLEAN -STDCALL -KdPortInitialize ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInitialized == FALSE) - { - if (PortInformation->BaudRate != 0) - { - BaudRate = PortInformation->BaudRate; - } - else - { - BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[2])) - { - PortBase = (PUCHAR)BaseArray[2]; - ComPort = 2; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else if (KdpDoesComPortExist ((PUCHAR)BaseArray[1])) - { - PortBase = (PUCHAR)BaseArray[1]; - ComPort = 1; - PortInformation->BaseAddress = (ULONG)PortBase; - PortInformation->ComPort = ComPort; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No COM port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - PortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - ComPort = PortInformation->ComPort; - PortInformation->BaseAddress = (ULONG)PortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - ComPort, - (ULONG)PortBase); - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: No serial port found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - PortInitialized = TRUE; - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(PortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(PortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(PortBase), lcr); - - /* set baud rate */ - divisor = 115200 / BaudRate; - WRITE_PORT_UCHAR (SER_DLL(PortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(PortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(PortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(PortBase)); - - /* - * set global info - */ - KdComPortInUse = (ULONG)PortBase; - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - ComPort, - (ULONG)PortBase, - BaudRate); - - HalDisplayString (buffer); - - return TRUE; -} - - -/* HAL.KdPortInitializeEx */ -BOOLEAN -STDCALL -KdPortInitializeEx ( - PKD_PORT_INFORMATION PortInformation, - ULONG Unknown1, - ULONG Unknown2 - ) -{ - ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8}; - PUCHAR ComPortBase; - char buffer[80]; - ULONG divisor; - UCHAR lcr; - - if (PortInformation->BaudRate == 0) - { - PortInformation->BaudRate = DEFAULT_BAUD_RATE; - } - - if (PortInformation->ComPort == 0) - { - return FALSE; - } - else - { - if (KdpDoesComPortExist ((PUCHAR)BaseArray[PortInformation->ComPort])) - { - ComPortBase = (PUCHAR)BaseArray[PortInformation->ComPort]; - PortInformation->BaseAddress = (ULONG)ComPortBase; -#ifndef NDEBUG - sprintf (buffer, - "\nSerial port COM%ld found at 0x%lx\n", - PortInformation->ComPort, - (ULONG)ComPortBase]; - HalDisplayString (buffer); -#endif /* NDEBUG */ - } - else - { - sprintf (buffer, - "\nKernel Debugger: Serial port not found!!!\n\n"); - HalDisplayString (buffer); - return FALSE; - } - } - - /* - * set baud rate and data format (8N1) - */ - - /* turn on DTR and RTS */ - WRITE_PORT_UCHAR (SER_MCR(ComPortBase), SR_MCR_DTR | SR_MCR_RTS); - - /* set DLAB */ - lcr = READ_PORT_UCHAR (SER_LCR(ComPortBase)) | SR_LCR_DLAB; - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), lcr); - - /* set baud rate */ - divisor = 115200 / PortInformation->BaudRate; - WRITE_PORT_UCHAR (SER_DLL(ComPortBase), (UCHAR)(divisor & 0xff)); - WRITE_PORT_UCHAR (SER_DLM(ComPortBase), (UCHAR)((divisor >> 8) & 0xff)); - - /* reset DLAB and set 8N1 format */ - WRITE_PORT_UCHAR (SER_LCR(ComPortBase), - SR_LCR_CS8 | SR_LCR_ST1 | SR_LCR_PNO); - - /* read junk out of the RBR */ - lcr = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - -#ifndef NDEBUG - - /* - * print message to blue screen - */ - sprintf (buffer, - "\nKernel Debugger: COM%ld (Port 0x%lx) BaudRate %ld\n\n", - PortInformation->ComPort, - (ULONG)ComPortBase, - PortInformation->BaudRate); - - HalDisplayString (buffer); - -#endif /* NDEBUG */ - - return TRUE; -} - - -/* HAL.KdPortGetByte */ -BOOLEAN -STDCALL -KdPortGetByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - if ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortGetByteEx */ -BOOLEAN -STDCALL -KdPortGetByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - if ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR)) - { - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - return TRUE; - } - - return FALSE; -} - - -/* HAL.KdPortPollByte */ -BOOLEAN -STDCALL -KdPortPollByte ( - PUCHAR ByteRecieved - ) -{ - if (PortInitialized == FALSE) - return FALSE; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(PortBase)); - - return TRUE; -} - - -/* HAL.KdPortPollByteEx */ -BOOLEAN -STDCALL -KdPortPollByteEx ( - PKD_PORT_INFORMATION PortInformation, - PUCHAR ByteRecieved - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_DR) == 0) - ; - - *ByteRecieved = READ_PORT_UCHAR (SER_RBR(ComPortBase)); - - return TRUE; -} - - - - -/* HAL.KdPortPutByte */ -VOID -STDCALL -KdPortPutByte ( - UCHAR ByteToSend - ) -{ - if (PortInitialized == FALSE) - return; - - while ((READ_PORT_UCHAR (SER_LSR(PortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(PortBase), ByteToSend); -} - -/* HAL.KdPortPutByteEx */ -VOID -STDCALL -KdPortPutByteEx ( - PKD_PORT_INFORMATION PortInformation, - UCHAR ByteToSend - ) -{ - PUCHAR ComPortBase = (PUCHAR)PortInformation->BaseAddress; - - while ((READ_PORT_UCHAR (SER_LSR(ComPortBase)) & SR_LSR_TBE) == 0) - ; - - WRITE_PORT_UCHAR (SER_THR(ComPortBase), ByteToSend); -} - - -/* HAL.KdPortRestore */ -VOID -STDCALL -KdPortRestore ( - VOID - ) -{ -} - - -/* HAL.KdPortSave */ -VOID -STDCALL -KdPortSave ( - VOID - ) -{ -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -STDCALL -KdPortDisableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -STDCALL -KdPortEnableInterrupts() -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR (SER_IER (PortBase)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR (SER_IER (PortBase), ch); - - ch = READ_PORT_UCHAR (SER_MCR (PortBase)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR (SER_MCR (PortBase), ch); - - return TRUE; -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/mca.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/mca.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/mca.c (original) +++ trunk/reactos/hal/halppc/generic/mca.c (removed) @@ -1,79 +1,0 @@ -/* - * ReactOS kernel - * Copyright (C) 2002 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id: mca.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/mca.c - * PURPOSE: Interfaces to the MicroChannel bus - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* - * TODO: - * What Adapter ID is read from an empty slot? - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* FUNCTIONS ****************************************************************/ - -ULONG STDCALL -HalpGetMicroChannelData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - PCM_MCA_POS_DATA PosData = (PCM_MCA_POS_DATA)Buffer; - - DPRINT("HalpGetMicroChannelData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - if ((BusNumber != 0) || - (SlotNumber == 0) || (SlotNumber > 8) || - (Length < sizeof(CM_MCA_POS_DATA))) - return(0); - - /* Enter Setup-Mode for given slot */ - WRITE_PORT_UCHAR((PUCHAR)0x96, (UCHAR)(((UCHAR)(SlotNumber - 1) & 0x07) | 0x08)); - - /* Read POS data */ - PosData->AdapterId = (READ_PORT_UCHAR((PUCHAR)0x101) << 8) + - READ_PORT_UCHAR((PUCHAR)0x100); - PosData->PosData1 = READ_PORT_UCHAR((PUCHAR)0x102); - PosData->PosData2 = READ_PORT_UCHAR((PUCHAR)0x103); - PosData->PosData3 = READ_PORT_UCHAR((PUCHAR)0x104); - PosData->PosData4 = READ_PORT_UCHAR((PUCHAR)0x105); - - /* Leave Setup-Mode for given slot */ - WRITE_PORT_UCHAR((PUCHAR)0x96, (UCHAR)((UCHAR)(SlotNumber - 1) & 0x07)); - - return(sizeof(CM_MCA_POS_DATA)); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/pwroff.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pwroff.… ============================================================================== --- trunk/reactos/hal/halppc/generic/pwroff.c (original) +++ trunk/reactos/hal/halppc/generic/pwroff.c (removed) @@ -1,121 +1,0 @@ -/* $Id: pwroff.c 23907 2006-09-04 05:52:23Z arty $ - * - * FILE : reactos/hal/x86/apm.c - * DESCRIPTION: Turn CPU off... - * PROJECT : ReactOS Operating System - * AUTHOR : D. Lindauer (July 11 1997) - * NOTE : This program is public domain - * REVISIONS : - * 1999-12-26 - */ - -#define APM_FUNCTION_AVAILABLE 0x5300 -#define APM_FUNCTION_CONNREAL 0x5301 -#define APM_FUNCTION_POWEROFF 0x5307 -#define APM_FUNCTION_ENABLECPU 0x530d -#define APM_FUNCTION_ENABLEAPM 0x530e - -#define APM_DEVICE_BIOS 0 -#define APM_DEVICE_ALL 1 - -#define APM_MODE_DISABLE 0 -#define APM_MODE_ENABLE 1 - - - -#if defined(__GNUC__) - -nopm db 'No power management functionality',10,13,'$' -errmsg db 'Power management error',10,13,'$' -wrongver db 'Need APM version 1.1 or better',10,13,'$' -; -; Entry point -; -go: - mov dx,offset nopm - jc error - cmp ax,101h ; See if version 1.1 or greater - mov dx,offset wrongver - jc error - - mov [ver],ax - mov ax,5301h ; Do a real mode connection - mov bx,0 ; device = BIOS - int 15h - jnc noconerr - - cmp ah,2 ; Pass if already connected - mov dx,offset errmsg ; else error - jnz error -noconerr: - mov ax,530eh ; Enable latest version of APM - mov bx,0 ; device = BIOS - mov cx,[ver] ; version - int 15h - mov dx,offset errmsg - jc error - - mov ax,530dh ; Now engage and enable CPU management - mov bx,1 ; device = all - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov ax,530fh - mov bx,1 ; device = ALL - mov cx,1 ; enable - int 15h - mov dx,offset errmsg - jc error - - mov dx,offset errmsg -error: - call print - mov ax,4c01h - int 21h - int 3 - end start - - -BOOLEAN -ApmCall ( - DWORD Function, - DWORD Device, - DWORD Mode - ) -{ - /* AX <== Function */ - /* BX <== Device */ - /* CX <== Mode */ - __asm__("int 21\n"); /* 0x15 */ -} - -#elif defined(_MSC_VER) -#else -#error Unknown compiler for inline assembler -#endif - - -BOOLEAN -HalPowerOff (VOID) -{ - ApmCall ( - APM_FUNCTION_AVAILABLE, - APM_DEVICE_BIOS, - 0 - ); - ApmCall ( - APM_FUNCTION_ENABLEAPM, - ); - /* Shutdown CPU */ - ApmCall ( - APM_FUNCTION_POWEROFF, - APM_DEVICE_ALL, - 3 - ); - return TRUE; -} - - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/resourc… ============================================================================== --- trunk/reactos/hal/halppc/generic/resource.c (original) +++ trunk/reactos/hal/halppc/generic/resource.c (removed) @@ -1,31 +1,0 @@ -/* $Id: resource.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: hal/halx86/generic/resource.c - * PURPOSE: Miscellaneous resource functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS ****************************************************************/ - -VOID STDCALL -HalReportResourceUsage(VOID) -{ - /* - * FIXME: Report all resources used by hal. - * Calls IoReportHalResourceUsage() - */ - - /* Initialize PCI bus. */ - HalpInitPciBus (); -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/sysbus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/sysbus.… ============================================================================== --- trunk/reactos/hal/halppc/generic/sysbus.c (original) +++ trunk/reactos/hal/halppc/generic/sysbus.c (removed) @@ -1,66 +1,0 @@ -/* $Id: sysbus.c 23907 2006-09-04 05:52:23Z arty $ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/sysbus.c - * PURPOSE: System bus handler functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * 09/04/2000 Created - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* FUNCTIONS ****************************************************************/ - -ULONG STDCALL -HalpGetSystemInterruptVector(PVOID BusHandler, - ULONG BusNumber, - ULONG BusInterruptLevel, - ULONG BusInterruptVector, - PKIRQL Irql, - PKAFFINITY Affinity) -{ - ULONG Vector = IRQ2VECTOR(BusInterruptVector); - *Irql = VECTOR2IRQL(Vector); - *Affinity = 0xFFFFFFFF; - return Vector; -} - - -BOOLEAN STDCALL -HalpTranslateSystemBusAddress(PBUS_HANDLER BusHandler, - ULONG BusNumber, - PHYSICAL_ADDRESS BusAddress, - PULONG AddressSpace, - PPHYSICAL_ADDRESS TranslatedAddress) -{ - ULONG BaseAddress = 0; - - if (*AddressSpace == 0) - { - /* memory space */ - - } - else if (*AddressSpace == 1) - { - /* io space */ - - } - else - { - /* other */ - return FALSE; - } - - TranslatedAddress->QuadPart = BusAddress.QuadPart + BaseAddress; - - return TRUE; -} - -/* EOF */ Removed: trunk/reactos/hal/halppc/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/systime… ============================================================================== --- trunk/reactos/hal/halppc/generic/systimer.S (original) +++ trunk/reactos/hal/halppc/generic/systimer.S (removed) @@ -1,48 +1,0 @@ -/* - * FILE: hal/halx86/generic/timer.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: System Timer Interrupt and Management - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -#include <internal/i386/asmmacro.S> -.intel_syntax noprefix - -/* FUNCTIONS *****************************************************************/ - -.globl _HalpClockInterrupt@0 -.func HalpClockInterrupt@0 -_HalpClockInterrupt@0: - - /* Enter trap */ - INT_PROLOG Hci, DoPushFakeErrorCode - - /* Push vector and make stack for IRQL */ - push 0x30 - sub esp, 4 - - /* Begin the interrupt */ - push esp - push 0x30 - push CLOCK2_LEVEL - call _HalBeginSystemInterrupt@12 - - /* Check if it's spurious */ - or al, al - jz Spurious - - /* Do a tick */ - mov eax, 100000 - jmp _KeUpdateSystemTime@0 - -Spurious: - - /* Exit the interrupt */ - add esp, 8 - mov esi, $ - jmp _Kei386EoiHelper@0 -.endfunc - Removed: trunk/reactos/hal/halppc/generic/time.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/time.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/time.c (original) +++ trunk/reactos/hal/halppc/generic/time.c (removed) @@ -1,102 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/time.c - * PURPOSE: Getting time information - * UPDATE HISTORY: - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - - -/* MACROS and CONSTANTS ******************************************************/ - -/* macro BCD_INT : convert bcd to int */ -#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) - -/* macro INT_BCD : convert int to bcd */ -#define INT_BCD(int) (((int / 10) << 4) + (int % 10)) - - -#define RTC_REGISTER_A 0x0A -#define RTC_REG_A_UIP 0x80 /* Update In Progress bit */ - -#define RTC_REGISTER_B 0x0B - -#define RTC_REGISTER_CENTURY 0x32 - -/* GLOBALS ******************************************************************/ - -/* FUNCTIONS *****************************************************************/ - -BOOLEAN STDCALL -HalQueryRealTimeClock(PTIME_FIELDS Time) -{ - return TRUE; -} - - -VOID STDCALL -HalSetRealTimeClock(PTIME_FIELDS Time) -{ -} - - -BOOLEAN STDCALL -HalGetEnvironmentVariable(PCH Name, - USHORT ValueLength, - PCH Value) -{ - strncpy(Value, "TRUE", ValueLength); - return TRUE; -} - - -BOOLEAN STDCALL -HalSetEnvironmentVariable(PCH Name, - PCH Value) -{ - return TRUE; -} - - -ULONG STDCALL -HalpGetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - DPRINT("HalpGetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - return 0; -} - - -ULONG STDCALL -HalpSetCmosData(PBUS_HANDLER BusHandler, - ULONG BusNumber, - ULONG SlotNumber, - PVOID Buffer, - ULONG Offset, - ULONG Length) -{ - DPRINT("HalpSetCmosData() called.\n"); - DPRINT(" BusNumber %lu\n", BusNumber); - DPRINT(" SlotNumber %lu\n", SlotNumber); - DPRINT(" Offset 0x%lx\n", Offset); - DPRINT(" Length 0x%lx\n", Length); - - return 0; -} - -/* EOF */ Removed: trunk/reactos/hal/halx86/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/irql.c (original) +++ trunk/reactos/hal/halx86/generic/irql.c (removed) @@ -1,570 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/hal/x86/irql.c - * PURPOSE: Implements IRQLs - * PROGRAMMER: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ******************************************************************/ - -/* - * FIXME: Use EISA_CONTROL STRUCTURE INSTEAD OF HARD-CODED OFFSETS -*/ - -typedef union -{ - USHORT both; - struct - { - UCHAR master; - UCHAR slave; - }; -} -PIC_MASK; - -/* - * PURPOSE: - Mask for HalEnableSystemInterrupt and HalDisableSystemInterrupt - * - At startup enable timer and cascade - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask = {.both = 0xFFFA}; -#else -static PIC_MASK pic_mask = { 0xFFFA }; -#endif - - -/* - * PURPOSE: Mask for disabling of acknowledged interrupts - */ -#if defined(__GNUC__) -static PIC_MASK pic_mask_intr = {.both = 0x0000}; -#else -static PIC_MASK pic_mask_intr = { 0 }; -#endif - -static ULONG HalpPendingInterruptCount[NR_IRQS]; - -#define DIRQL_TO_IRQ(x) (PROFILE_LEVEL - x) -#define IRQ_TO_DIRQL(x) (PROFILE_LEVEL - x) - -#ifdef _MSC_VER - -#define KiInterruptDispatch2(x, y) - -#else - -VOID STDCALL -KiInterruptDispatch2 (ULONG Irq, KIRQL old_level); - -#endif - -/* FUNCTIONS ****************************************************************/ - -#undef KeGetCurrentIrql -KIRQL STDCALL KeGetCurrentIrql (VOID) -/* - * PURPOSE: Returns the current irq level - * RETURNS: The current irq level - */ -{ - return(KeGetPcr()->Irql); -} - -VOID NTAPI HalpInitPICs(VOID) -{ - memset(HalpPendingInterruptCount, 0, sizeof(HalpPendingInterruptCount)); - - /* Initialization sequence */ - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x11); - WRITE_PORT_UCHAR((PUCHAR)0xa0, 0x11); - /* Start of hardware irqs (0x24) */ - WRITE_PORT_UCHAR((PUCHAR)0x21, IRQ_BASE); - WRITE_PORT_UCHAR((PUCHAR)0xa1, IRQ_BASE + 8); - /* 8259-1 is master */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x4); - /* 8259-2 is slave */ - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x2); - /* 8086 mode */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0x1); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0x1); - /* Enable interrupts */ - WRITE_PORT_UCHAR((PUCHAR)0x21, 0xFF); - WRITE_PORT_UCHAR((PUCHAR)0xa1, 0xFF); - - /* We can now enable interrupts */ - _enable(); -} - -VOID HalpEndSystemInterrupt(KIRQL Irql) -/* - * FUNCTION: Enable all irqs with higher priority. - */ -{ - const USHORT mask[] = - { - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, 0x8000, 0xc000, 0xe000, 0xf000, - 0xf800, 0xfc00, 0xfe00, 0xff00, 0xff80, 0xffc0, 0xffe0, 0xfff0, - 0xfff8, 0xfffc, 0xfffe, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, - }; - - /* Interrupts should be disable while enabling irqs of both pics */ - _disable(); - - pic_mask_intr.both &= mask[Irql]; - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - - /* restore ints */ - _enable(); -} - -VOID -HalpHardwareInt30(VOID) -{ - __asm__ __volatile__ ("int $0x30"); -} - -VOID -HalpHardwareInt31(VOID) -{ - __asm__ __volatile__ ("int $0x31"); -} - -VOID -HalpHardwareInt32(VOID) -{ - __asm__ __volatile__ ("int $0x32"); -} - -VOID -HalpHardwareInt33(VOID) -{ - __asm__ __volatile__ ("int $0x33"); -} - -VOID -HalpHardwareInt34(VOID) -{ - __asm__ __volatile__ ("int $0x34"); -} - -VOID -HalpHardwareInt35(VOID) -{ - __asm__ __volatile__ ("int $0x35"); -} - -VOID -HalpHardwareInt36(VOID) -{ - __asm__ __volatile__ ("int $0x36"); -} - -VOID -HalpHardwareInt37(VOID) -{ - __asm__ __volatile__ ("int $0x37"); -} - -VOID -HalpHardwareInt38(VOID) -{ - __asm__ __volatile__ ("int $0x38"); -} - -VOID -HalpHardwareInt39(VOID) -{ - __asm__ __volatile__ ("int $0x39"); -} - -VOID -HalpHardwareInt3A(VOID) -{ - __asm__ __volatile__ ("int $0x3A"); -} - -VOID -HalpHardwareInt3B(VOID) -{ - __asm__ __volatile__ ("int $0x3B"); -} - -VOID -HalpHardwareInt3C(VOID) -{ - __asm__ __volatile__ ("int $0x3C"); -} - -VOID -HalpHardwareInt3D(VOID) -{ - __asm__ __volatile__ ("int $0x3D"); -} - -VOID -HalpHardwareInt3E(VOID) -{ - __asm__ __volatile__ ("int $0x3E"); - while (TRUE); -} - -VOID -HalpHardwareInt3F(VOID) -{ - __asm__ __volatile__ ("int $0x3F"); -} - - -typedef VOID (*PHARDWARE_INT)(VOID); - -PHARDWARE_INT HalpHardwareInt[NR_IRQS] = -{ - HalpHardwareInt30, - HalpHardwareInt31, - HalpHardwareInt32, - HalpHardwareInt33, - HalpHardwareInt34, - HalpHardwareInt35, - HalpHardwareInt36, - HalpHardwareInt37, - HalpHardwareInt38, - HalpHardwareInt39, - HalpHardwareInt3A, - HalpHardwareInt3B, - HalpHardwareInt3C, - HalpHardwareInt3D, - HalpHardwareInt3E, - HalpHardwareInt3F -}; - -VOID -HalpExecuteIrqs(KIRQL NewIrql) -{ - ULONG IrqLimit, i; - IrqLimit = min(PROFILE_LEVEL - NewIrql, NR_IRQS); - - /* - * For each irq if there have been any deferred interrupts then now - * dispatch them. - */ - for (i = 0; i < IrqLimit; i++) - { - if (HalpPendingInterruptCount[i] > 0) - { - KeGetPcr()->Irql = (KIRQL)IRQ_TO_DIRQL(i); - - while (HalpPendingInterruptCount[i] > 0) - { - /* - * For each deferred interrupt execute all the handlers at DIRQL. - */ - HalpPendingInterruptCount[i]--; - HalpHardwareInt[i](); - } - //KeGetPcr()->Irql--; - //HalpEndSystemInterrupt(KeGetPcr()->Irql); - } - } - -} - -VOID -HalpLowerIrql(KIRQL NewIrql) -{ - if (NewIrql >= PROFILE_LEVEL) - { - KeGetPcr()->Irql = NewIrql; - return; - } - HalpExecuteIrqs(NewIrql); - if (NewIrql >= DISPATCH_LEVEL) - { - KeGetPcr()->Irql = NewIrql; - return; - } - KeGetPcr()->Irql = DISPATCH_LEVEL; - if (((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST]) - { - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; - KiDispatchInterrupt(); - } - KeGetPcr()->Irql = APC_LEVEL; - if (NewIrql == APC_LEVEL) - { - return; - } - if (KeGetCurrentThread() != NULL && - KeGetCurrentThread()->ApcState.KernelApcPending) - { - KiDeliverApc(KernelMode, NULL, NULL); - } - KeGetPcr()->Irql = PASSIVE_LEVEL; -} - -/********************************************************************** - * NAME EXPORTED - * KfLowerIrql - * - * DESCRIPTION - * Restores the irq level on the current processor - * - * ARGUMENTS - * NewIrql = Irql to lower to - * - * RETURN VALUE - * None - * - * NOTES - * Uses fastcall convention - */ -VOID FASTCALL -KfLowerIrql (KIRQL NewIrql) -{ - DPRINT("KfLowerIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql > KeGetPcr()->Irql) - { - DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", - __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); - KEBUGCHECK(0); - for(;;); - } - - HalpLowerIrql(NewIrql); -} - -/********************************************************************** - * NAME EXPORTED - * KfRaiseIrql - * - * DESCRIPTION - * Raises the hardware priority (irql) - * - * ARGUMENTS - * NewIrql = Irql to raise to - * - * RETURN VALUE - * previous irq level - * - * NOTES - * Uses fastcall convention - */ - -KIRQL FASTCALL -KfRaiseIrql (KIRQL NewIrql) -{ - KIRQL OldIrql; - - DPRINT("KfRaiseIrql(NewIrql %d)\n", NewIrql); - - if (NewIrql < KeGetPcr()->Irql) - { - DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", - __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); - KEBUGCHECK (0); - for(;;); - } - - OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = NewIrql; - return OldIrql; -} - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToDpcLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to DISPATCH level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToDpcLevel (VOID) -{ - return KfRaiseIrql (DISPATCH_LEVEL); -} - - -/********************************************************************** - * NAME EXPORTED - * KeRaiseIrqlToSynchLevel - * - * DESCRIPTION - * Raises the hardware priority (irql) to CLOCK2 level - * - * ARGUMENTS - * None - * - * RETURN VALUE - * Previous irq level - * - * NOTES - * Calls KfRaiseIrql - */ - -KIRQL STDCALL -KeRaiseIrqlToSynchLevel (VOID) -{ - return KfRaiseIrql (DISPATCH_LEVEL); -} - - -BOOLEAN STDCALL -HalBeginSystemInterrupt (KIRQL Irql, - ULONG Vector, - PKIRQL OldIrql) -{ - ULONG irq; - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - { - return(FALSE); - } - irq = Vector - IRQ_BASE; - pic_mask_intr.both |= ((1 << irq) & 0xfffe); // do not disable the timer interrupt - - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - WRITE_PORT_UCHAR((PUCHAR)0x20, 0x20); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - /* Send EOI to the PICs */ - WRITE_PORT_UCHAR((PUCHAR)0x20,0x20); - WRITE_PORT_UCHAR((PUCHAR)0xa0,0x20); - } -#if 0 - if (KeGetPcr()->Irql >= Irql) - { - HalpPendingInterruptCount[irq]++; - return(FALSE); - } -#endif - *OldIrql = KeGetPcr()->Irql; - KeGetPcr()->Irql = Irql; - - return(TRUE); -} - - -VOID STDCALL HalEndSystemInterrupt (KIRQL Irql, ULONG Unknown2) -/* - * FUNCTION: Finish a system interrupt and restore the specified irq level. - */ -{ - HalpLowerIrql(Irql); - HalpEndSystemInterrupt(Irql); -} - -BOOLEAN -STDCALL -HalDisableSystemInterrupt( - ULONG Vector, - KIRQL Irql) -{ - ULONG irq; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - pic_mask.both |= (1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.slave)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } - - return TRUE; -} - - -BOOLEAN -STDCALL -HalEnableSystemInterrupt( - ULONG Vector, - KIRQL Irql, - KINTERRUPT_MODE InterruptMode) -{ - ULONG irq; - - if (Vector < IRQ_BASE || Vector >= IRQ_BASE + NR_IRQS) - return FALSE; - - irq = Vector - IRQ_BASE; - pic_mask.both &= ~(1 << irq); - if (irq < 8) - { - WRITE_PORT_UCHAR((PUCHAR)0x21, (UCHAR)(pic_mask.master|pic_mask_intr.master)); - } - else - { - WRITE_PORT_UCHAR((PUCHAR)0xa1, (UCHAR)(pic_mask.slave|pic_mask_intr.slave)); - } - - return TRUE; -} - - -VOID FASTCALL -HalRequestSoftwareInterrupt( - IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = TRUE; - break; - - case DISPATCH_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = TRUE; - break; - - default: - KEBUGCHECK(0); - } -} - -VOID FASTCALL -HalClearSoftwareInterrupt( - IN KIRQL Request) -{ - switch (Request) - { - case APC_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_APC_REQUEST] = FALSE; - break; - - case DISPATCH_LEVEL: - ((PKIPCR)KeGetPcr())->HalReserved[HAL_DPC_REQUEST] = FALSE; - break; - - default: - KEBUGCHECK(0); - } -} - -/* EOF */

16 years, 9 months

[dchapyshev] 31054: - Update Russian translation

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Fri Dec 7 13:59:53 2007 New Revision: 31054 URL: http://svn.reactos.org/svn/reactos?rev=31054&view=rev Log: - Update Russian translation Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Modified: trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… ============================================================================== --- trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc (original) +++ trunk/reactos/base/applications/games/winemine/lang/ru-RU.rc Fri Dec 7 13:59:53 2007 @@ -7,12 +7,12 @@ STRINGTABLE { IDS_APPNAME, "Ñàïåð" - IDS_SECONDS, "seconds" + IDS_SECONDS, "ñåêóíä" } MENU_WINEMINE MENU DISCARDABLE { - POPUP "&Game" { + POPUP "&Èãðà" { MENUITEM "&Íîâàÿ èãðà", IDM_NEW MENUITEM SEPARATOR MENUITEM "&Ìåòêè", IDM_MARKQ @@ -47,7 +47,7 @@ LTEXT "", IDC_NAME2, 132, 30, 55, 8 LTEXT "", IDC_NAME3, 132, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 127, 57, 50, 15 - PUSHBUTTON "&Reset Scores", IDRESET, 18, 57, 67, 15 + PUSHBUTTON "&Ñáðîñèòü", IDRESET, 18, 57, 67, 15 } DLG_CONGRATS DIALOGEX DISCARDABLE 0, 0, 160, 60

16 years, 9 months

[peterw] 31053: - Some formatting changes and cleanup.

by peterw＠svn.reactos.org

Author: peterw Date: Fri Dec 7 13:10:02 2007 New Revision: 31053 URL: http://svn.reactos.org/svn/reactos?rev=31053&view=rev Log: - Some formatting changes and cleanup. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/makefile Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Fri Dec 7 13:10:02 2007 @@ -104,44 +104,44 @@ goto :EOC :BUILD -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) -) goto :EOF :BUILDMULTI -:: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + :: + :: Get the number of CPUs in the system so we know how many jobs to execute. + :: To modify the number used alter the options used with cpucount: + :: No Option - Number of CPUs. + :: -x1 - Number of CPUs, plus 1. + :: -x2 - Number of CPUs, doubled. + :: + for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) -) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Fri Dec 7 13:10:02 2007 @@ -36,11 +36,11 @@ :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -set /p _1="Please enter a ReactOS source directory, or 'previous': " -if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC -) + set /p _1="Please enter a ReactOS source directory, or 'previous': " + if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC + ) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Fri Dec 7 13:10:02 2007 @@ -35,11 +35,11 @@ goto :EOC :INTERACTIVE -set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " -if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC -) + set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " + if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) goto :EOF :EOC Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Dec 7 13:10:02 2007 @@ -28,43 +28,43 @@ ) call :INTERACTIVE -:RADD2RLINE :: :: First get the ImageBase of the File. If its smaller than the given :: Parameter, everything is ok, because it was already added onto the :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -if "%_1%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC -) -if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC -) -echo %_1% -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i -if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" -) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" -) +:RADD2RLINE + if "%_1%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC + ) + if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC + ) + echo %_1% + for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i + if %%i lss %_2% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" + ) else ( + set /a baseaddr+=0x%_2% + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" + ) goto :EOC :: :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH -) -if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " -) + if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH + ) + if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " + ) goto :EOF :: Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Fri Dec 7 13:10:02 2007 @@ -36,10 +36,9 @@ !include "LogicLib.nsh" !include "x64.nsh" -;; MUI begin. - -;; -;; Read our custom page ini, remove previous version. +;; +;; Read our custom page ini, remove previous version and make sure only +;; one instance of the installer is running. ;; Function .onInit System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' @@ -91,7 +90,7 @@ !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.pdf" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.pdf" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !insertmacro MUI_PAGE_FINISH @@ -105,8 +104,6 @@ ;; ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English" - -;; MUI end. Section -BaseFiles SEC01 SetShellVarContext current Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/ma… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile Fri Dec 7 13:10:02 2007 @@ -47,4 +47,4 @@ $(STRIP) tee$(SUFFIX) clean: - del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe scut.exe tee.exe

16 years, 9 months

[fireball] 31052: - Replace KEY_OBJECT by real CM_KEY_BODY NT type.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Dec 7 00:11:57 2007 New Revision: 31052 URL: http://svn.reactos.org/svn/reactos?rev=31052&view=rev Log: - Replace KEY_OBJECT by real CM_KEY_BODY NT type. Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c trunk/reactos/ntoskrnl/cm/regobj.c trunk/reactos/ntoskrnl/config/cm.h trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cmparse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Fri Dec 7 00:11:57 2007 @@ -44,7 +44,7 @@ { UNICODE_STRING RemainingPath = {0}, ReturnedPath = {0}; ULONG LocalDisposition; - PKEY_OBJECT KeyObject, Parent; + PCM_KEY_BODY KeyObject, Parent; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; @@ -173,7 +173,7 @@ KeyObject->KeyControlBlock->ValueCache.Count = Node->ValueList.Count; /* Link child to parent */ - InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyEntry); + InsertTailList(&Parent->KeyControlBlock->KeyBodyListHead, &KeyObject->KeyBodyList); /* Create the actual handle to the object */ Status = CmpCreateHandle(KeyObject, @@ -217,7 +217,7 @@ { UNICODE_STRING RemainingPath = {0}; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PKEY_OBJECT Object = NULL; + PCM_KEY_BODY Object = NULL; HANDLE hKey = NULL; NTSTATUS Status = STATUS_SUCCESS; UNICODE_STRING ObjectName; Modified: trunk/reactos/ntoskrnl/cm/regobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regobj.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regobj.c (original) +++ trunk/reactos/ntoskrnl/cm/regobj.c Fri Dec 7 00:11:57 2007 @@ -441,9 +441,9 @@ CmiScanKeyList(PCM_KEY_CONTROL_BLOCK Parent, PCUNICODE_STRING KeyName, ULONG Attributes, - PKEY_OBJECT* ReturnedObject) + PCM_KEY_BODY* ReturnedObject) { - PKEY_OBJECT CurKey = NULL; + PCM_KEY_BODY CurKey = NULL; PCM_NAME_CONTROL_BLOCK Ncb; PLIST_ENTRY NextEntry; PWCHAR p, pp; @@ -455,7 +455,7 @@ while (NextEntry != &Parent->KeyBodyListHead) { /* Get the current ReactOS Key Object */ - CurKey = CONTAINING_RECORD(NextEntry, KEY_OBJECT, KeyBodyEntry); + CurKey = CONTAINING_RECORD(NextEntry, CM_KEY_BODY, KeyBodyList); /* Get the NCB */ Ncb = CurKey->KeyControlBlock->NameBlock; @@ -542,8 +542,8 @@ OUT PVOID *NextObject) { HCELL_INDEX BlockOffset; - PKEY_OBJECT FoundObject; - PKEY_OBJECT ParsedKey; + PCM_KEY_BODY FoundObject; + PCM_KEY_BODY ParsedKey; PCM_KEY_NODE SubKeyCell; NTSTATUS Status; PWSTR StartPtr; @@ -573,8 +573,6 @@ } ParsedKey = ParsedObject; - - VERIFY_KEY_OBJECT(ParsedKey); *NextObject = NULL; @@ -698,7 +696,7 @@ NULL, KernelMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, (PVOID*)&FoundObject); @@ -744,7 +742,7 @@ FoundObject->KeyControlBlock = Kcb; ASSERT(FoundObject->KeyControlBlock->KeyHive == ParsedKey->KeyControlBlock->KeyHive); - InsertTailList(&ParsedKey->KeyControlBlock->KeyBodyListHead, &FoundObject->KeyBodyEntry); + InsertTailList(&ParsedKey->KeyControlBlock->KeyBodyListHead, &FoundObject->KeyBodyList); DPRINT("Created object 0x%p\n", FoundObject); } else @@ -809,7 +807,6 @@ *Path = EndPtr; - VERIFY_KEY_OBJECT(FoundObject); *NextObject = FoundObject; @@ -822,14 +819,14 @@ NTAPI CmpDeleteKeyObject(PVOID DeletedObject) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_KEY_HANDLE_CLOSE_INFORMATION KeyHandleCloseInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; NTSTATUS Status; DPRINT("Delete key object (%p)\n", DeletedObject); - KeyObject = (PKEY_OBJECT) DeletedObject; + KeyObject = (PCM_KEY_BODY) DeletedObject; PostOperationInfo.Object = (PVOID)KeyObject; Modified: trunk/reactos/ntoskrnl/config/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cm.h?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/config/cm.h (original) +++ trunk/reactos/ntoskrnl/config/cm.h Fri Dec 7 00:11:57 2007 @@ -179,8 +179,7 @@ union { ULONG ValueList; - //struct _CM_KEY_CONTROL_BLOCK *RealKcb; - struct _KEY_OBJECT *RealKcb; + struct _CM_KEY_CONTROL_BLOCK *RealKcb; }; } CACHED_CHILD_LIST, *PCACHED_CHILD_LIST; @@ -490,11 +489,6 @@ // // BUGBUG Old Hive Stuff for Temporary Support // -typedef struct _KEY_OBJECT -{ - PCM_KEY_CONTROL_BLOCK KeyControlBlock; - LIST_ENTRY KeyBodyEntry; -} KEY_OBJECT, *PKEY_OBJECT; NTSTATUS NTAPI CmFindObject(POBJECT_CREATE_INFORMATION ObjectCreateInfo, @@ -884,13 +878,6 @@ IN ULONG Flags ); -VOID -NTAPI -EnlistKeyBodyWithKeyObject( - IN PKEY_OBJECT KeyObject, - IN ULONG Flags -); - NTSTATUS NTAPI CmpFreeKeyByCell( @@ -1364,7 +1351,7 @@ IN POBJECT_ATTRIBUTES TargetKey, IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, - IN PKEY_OBJECT KeyBody + IN PCM_KEY_BODY KeyBody ); // Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Fri Dec 7 00:11:57 2007 @@ -1170,7 +1170,7 @@ CmLoadKey(IN POBJECT_ATTRIBUTES TargetKey, IN POBJECT_ATTRIBUTES SourceFile, IN ULONG Flags, - IN PKEY_OBJECT KeyBody) + IN PCM_KEY_BODY KeyBody) { SECURITY_QUALITY_OF_SERVICE ServiceQos; SECURITY_CLIENT_CONTEXT ClientSecurityContext; Modified: trunk/reactos/ntoskrnl/config/cmparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmparse.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmparse.c (original) +++ trunk/reactos/ntoskrnl/config/cmparse.c Fri Dec 7 00:11:57 2007 @@ -89,7 +89,7 @@ OUT PVOID *Object) { NTSTATUS Status = STATUS_SUCCESS; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; HCELL_INDEX ClassCell = HCELL_NIL; PCM_KEY_NODE KeyNode; PCELL_DATA CellData; @@ -160,12 +160,12 @@ NULL, AccessMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, Object); if (!NT_SUCCESS(Status)) goto Quickie; - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); /* Check if we had a class */ if (ParseContext->Class.Length > 0) @@ -271,7 +271,7 @@ PCELL_DATA CellData; HCELL_INDEX KeyCell; ULONG ParentType; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; @@ -354,7 +354,7 @@ if (NT_SUCCESS(Status)) { /* Get the key body */ - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); /* Now add the subkey */ if (!CmpAddSubKey(Hive, Cell, KeyCell)) @@ -436,7 +436,7 @@ OUT PVOID *Object) { NTSTATUS Status; - PKEY_OBJECT KeyBody = NULL; + PCM_KEY_BODY KeyBody = NULL; PCM_KEY_CONTROL_BLOCK Kcb = NULL; /* Make sure the hive isn't locked */ @@ -475,14 +475,14 @@ NULL, AccessMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, Object); if (NT_SUCCESS(Status)) { /* Get the key body and fill it out */ - KeyBody = (PKEY_OBJECT)(*Object); + KeyBody = (PCM_KEY_BODY)(*Object); KeyBody->KeyControlBlock = Kcb; } else @@ -510,7 +510,7 @@ { NTSTATUS Status; HCELL_INDEX KeyCell, LinkCell, ChildCell; - PKEY_OBJECT KeyBody; + PCM_KEY_BODY KeyBody; LARGE_INTEGER TimeStamp; PCM_KEY_NODE KeyNode; PCM_KEY_CONTROL_BLOCK Kcb = ParentKcb; @@ -693,7 +693,7 @@ } /* Get the key body */ - KeyBody = (PKEY_OBJECT)*Object; + KeyBody = (PCM_KEY_BODY)*Object; /* Sanity checks */ ASSERT(KeyBody->KeyControlBlock->ParentKcb->KeyCell == Cell); @@ -849,7 +849,7 @@ } /* Grab the KCB */ - Kcb = ((PKEY_OBJECT)ParseObject)->KeyControlBlock; + Kcb = ((PCM_KEY_BODY)ParseObject)->KeyControlBlock; DPRINT1("KCB Parse: %p\n", Kcb); /* Lookup in the cache */ Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c Fri Dec 7 00:11:57 2007 @@ -492,8 +492,8 @@ { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING RemainingPath; - PKEY_OBJECT ParentKey; - PKEY_OBJECT NewKey; + PCM_KEY_BODY ParentKey; + PCM_KEY_BODY NewKey; NTSTATUS Status; UNICODE_STRING ObjectName; OBJECT_CREATE_INFORMATION ObjectCreateInfo; @@ -609,7 +609,7 @@ ObReferenceObject(NewKey); /* Link this key to the parent */ - InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyEntry); + InsertTailList(&ParentKey->KeyControlBlock->KeyBodyListHead, &NewKey->KeyBodyList); return STATUS_SUCCESS; } @@ -840,11 +840,7 @@ { UNICODE_STRING KeyName; OBJECT_ATTRIBUTES ObjectAttributes; -#if 0 PCM_KEY_BODY RootKey; -#else - PKEY_OBJECT RootKey; -#endif HCELL_INDEX RootIndex; NTSTATUS Status; PCM_KEY_NODE KeyCell; @@ -872,7 +868,7 @@ &ObjectAttributes, KernelMode, NULL, - sizeof(KEY_OBJECT), + sizeof(CM_KEY_BODY), 0, 0, (PVOID*)&RootKey); @@ -896,11 +892,9 @@ /* Initialize the object */ RootKey->KeyControlBlock = Kcb; -#if 0 RootKey->Type = TAG('k', 'v', '0', '2'); RootKey->NotifyBlock = NULL; RootKey->ProcessID = PsGetCurrentProcessId(); -#endif /* Insert the key into the namespace */ Status = ObInsertObject(RootKey, Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c Fri Dec 7 00:11:57 2007 @@ -22,7 +22,7 @@ NTAPI NtDeleteKey(IN HANDLE KeyHandle) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; NTSTATUS Status; REG_DELETE_KEY_INFORMATION DeleteKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; @@ -81,7 +81,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -142,7 +142,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -203,7 +203,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_QUERY_KEY_INFORMATION QueryKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -265,7 +265,7 @@ OUT PULONG ResultLength) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -328,7 +328,7 @@ IN ULONG DataSize) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; REG_SET_VALUE_KEY_INFORMATION SetValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; PAGED_CODE(); @@ -385,7 +385,7 @@ NtDeleteValueKey(IN HANDLE KeyHandle, IN PUNICODE_STRING ValueName) { - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; NTSTATUS Status; REG_DELETE_VALUE_KEY_INFORMATION DeleteValueKeyInfo; REG_POST_OPERATION_INFORMATION PostOperationInfo; @@ -433,7 +433,7 @@ NtFlushKey(IN HANDLE KeyHandle) { NTSTATUS Status; - PKEY_OBJECT KeyObject; + PCM_KEY_BODY KeyObject; PAGED_CODE(); /* Get the key object */ @@ -513,7 +513,7 @@ { NTSTATUS Status; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - PKEY_OBJECT KeyBody = NULL; + PCM_KEY_BODY KeyBody = NULL; PAGED_CODE(); /* Validate flags */

16 years, 9 months

[peterw] 31051: - Change title setting in Build.cmd.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Dec 6 22:57:46 2007 New Revision: 31051 URL: http://svn.reactos.org/svn/reactos?rev=31051&view=rev Log: - Change title setting in Build.cmd. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Thu Dec 6 22:57:46 2007 @@ -9,8 +9,6 @@ :: :: @echo off - -title Building... :: :: Check if config.template.rbuild is newer than config.rbuild, if it is then @@ -96,10 +94,11 @@ :: :: Check if we are using -j or not. :: -title Started: %TIMERAW%, Building... if "%1" == "multi" ( + title 'makex' parallel build started: %TIMERAW% call :BUILDMULTI %* ) else ( + title 'make' build started: %TIMERAW% call :BUILD %* ) goto :EOC

16 years, 9 months

[greatlrd] 31050: Fixed a bug for Main_DirectDraw_SetDisplayMode for DirectX 1 it did accepted to many param Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to found this bug

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu Dec 6 22:56:53 2007 New Revision: 31050 URL: http://svn.reactos.org/svn/reactos?rev=31050&view=rev Log: Fixed a bug for Main_DirectDraw_SetDisplayMode for DirectX 1 it did accepted to many param Thx Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) to found this bug Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw.h Thu Dec 6 22:56:53 2007 @@ -119,6 +119,13 @@ LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP); + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode2( + LPDDRAWI_DIRECTDRAW_INT This, + DWORD dwWidth, + DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags); Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Thu Dec 6 22:56:53 2007 @@ -109,8 +109,14 @@ } HRESULT WINAPI -Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) +Main_DirectDraw_SetDisplayMode (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP) +{ + return Main_DirectDraw_SetDisplayMode2 (This, dwWidth, dwHeight, dwBPP, 0, 0 ); +} + +HRESULT WINAPI +Main_DirectDraw_SetDisplayMode2 (LPDDRAWI_DIRECTDRAW_INT This, DWORD dwWidth, DWORD dwHeight, + DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { HRESULT ret = DD_OK; DX_WINDBG_trace(); Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw2_Vtable.c Thu Dec 6 22:56:53 2007 @@ -130,7 +130,7 @@ DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW2 iface, DWORD dwWidth, DWORD dwHeight, @@ -176,7 +176,7 @@ Main_DirectDraw_Initialize, Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_SetDisplayMode2, Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_GetAvailableVidMem }; Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw4_Vtable.c Thu Dec 6 22:56:53 2007 @@ -130,7 +130,7 @@ DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW4 iface, DWORD dwWidth, DWORD dwHeight, @@ -195,7 +195,7 @@ Main_DirectDraw_Initialize, Main_DirectDraw_RestoreDisplayMode, Main_DirectDraw_SetCooperativeLevel, - Main_DirectDraw_SetDisplayMode, + Main_DirectDraw_SetDisplayMode2, Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_GetAvailableVidMem4, Main_DirectDraw_GetSurfaceFromDC, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw7_Vtable.c Thu Dec 6 22:56:53 2007 @@ -134,7 +134,7 @@ DWORD cooplevel); HRESULT WINAPI -Main_DirectDraw_SetDisplayMode( +Main_DirectDraw_SetDisplayMode2( LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, @@ -210,7 +210,7 @@ Main_DirectDraw_Initialize, /* (Initialize done) */ Main_DirectDraw_RestoreDisplayMode, /* (RestoreDisplayMode testing / devloping) */ Main_DirectDraw_SetCooperativeLevel, /* (SetCooperativeLevel testing / devloping) */ - Main_DirectDraw_SetDisplayMode, /* (SetDisplayMode testing / devloping) */ + Main_DirectDraw_SetDisplayMode2, /* (SetDisplayMode testing / devloping) */ Main_DirectDraw_WaitForVerticalBlank, Main_DirectDraw_GetAvailableVidMem4, /* (GetAvailableVidMem4 done) */ Main_DirectDraw_GetSurfaceFromDC, Modified: trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Vtable/D… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c (original) +++ trunk/reactos/dll/directx/ddraw/Vtable/DirectDraw_Vtable.c Thu Dec 6 22:56:53 2007 @@ -134,9 +134,7 @@ LPDIRECTDRAW iface, DWORD dwWidth, DWORD dwHeight, - DWORD dwBPP, - DWORD dwRefreshRate, - DWORD dwFlags); + DWORD dwBPP); HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(

16 years, 9 months

[dreimer] 31049: Update German RC File

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Dec 6 22:56:11 2007 New Revision: 31049 URL: http://svn.reactos.org/svn/reactos?rev=31049&view=rev Log: Update German RC File Modified: trunk/reactos/base/applications/control/lang/de-DE.rc Modified: trunk/reactos/base/applications/control/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… ============================================================================== --- trunk/reactos/base/applications/control/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/control/lang/de-DE.rc Thu Dec 6 22:56:11 2007 @@ -28,10 +28,10 @@ STRINGTABLE BEGIN - IDS_WINDOW_TITLE "Control Panel" - IDS_ABOUT "Simple Control Panel (not Shell-namespace based)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rReleased under the GPL" - IDS_ABOUT_TITLE "About the Control Panel" - IDS_NO_ITEMS "No Items in ListView" + IDS_WINDOW_TITLE "Systemsteuerung" + IDS_ABOUT "Einfache Systemsteuerung (nicht Shell-namespace basiert)\rCopyright 2004 GkWare e.K.\rhttp://www.gkware.com\rVeröffentlicht unter der GPL" + IDS_ABOUT_TITLE "Über Systemsteuerung" + IDS_NO_ITEMS "Keine Items in ListView" IDS_NAME "Name" - IDS_COMMENT "Comment" + IDS_COMMENT "Kommentar" END

16 years, 9 months

← Newer
1
...
45
46
47
48
49
50
51
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007