Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 27285: The last commit. Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #2344.
by dgorbachev＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: dgorbachev Date: Wed Jun 27 03:31:01 2007 New Revision: 27285 URL: http://svn.reactos.org/svn/reactos?rev=27285&view=rev Log: The last commit. Bulgarian translations by CCTAHEB (sstpr [at] narod [dot] ru). Bug #2344. Added: trunk/reactos/base/applications/cacls/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Modified: trunk/reactos/base/applications/cacls/rsrc.rc trunk/reactos/base/applications/calc/rsrc.rc trunk/reactos/dll/cpl/desk/desk.rc Added: trunk/reactos/base/applications/cacls/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… ============================================================================== --- trunk/reactos/base/applications/cacls/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/cacls/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,74 @@ +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + +IDS_HELP, "Ïîêàçâà èëè èçìåíÿ ñïèñúöèòå çà äîñòúï (ACL èëè ÑçÄ) äî ôàéëîâåòå\n\n\ +CACLS ôàéëîâî_èìå [/T] [/E] [/C] [/G ïîòðåáèòåë:ïðàâà [...]] [/R ïîòðåáèòåë [...]]\n\ + [/P ïîòðåáèòåë:ïðàâà [...]] [/D èìå [...]]\n\ + ôàéëîâî_èìå Ïîêàçâàíå íà ÑçÄ.\n\ + /T Ïðîìåíÿ ÑçÄ íà óêàçàíèòå ôàéëîâå â\n\ + òåêóùàòà ïàïêà è âñè÷êè ïîäïàïêè. \n\ + /E Ïðîìÿíà íà ÑçÄ, âìåñòî çàìÿíà.\n\ + /C Ïðîäúëæàâàíå ïîðàäè ãðåøêè ïîðàäè îòêàç íà äîñòúï.\n\ + /G ïîòðåáèòåë:ïðàâà Ïðåäîñòàâÿíå íà ïðàâà íà äîñòúï íà óêàçàíèÿ ïîòðåáèòåë.\n\ + Ïðàâàòà ìîãà äà ñà: R ×åòåíå\n\ + W Ïèñàíå\n\ + C Ïðîìÿíà (ïèñàíå)\n\ + F Âñè÷êè ïðàâà\n\ + /R ïîòðåáèòåë Revoke specified user's access rights (only valid with /E).\n\ + /P ïîòðåáèòåë:ïðàâà Çàìÿíà íà ïðàâàòà çà äîñòúï íà ïîòðåáèòåëÿ.\n\ + Ïðàâàòà ìîãàò äà ñà: N Áåç ïðàâî íà äîñòúï\n\ + R ×åòåíå\n\ + W Ïèñàíå\n\ + C Ïðîìÿíà (ïèñàíå)\n\ + F Âñè÷êè ïðàâà \n\ + /D ïîòðåáèòåë Ëèøàâàíå íà ïîòðåáèòåë îò äîñòúï.\n\ +Ìîãàò äà ñå èçïîëçâàò çàìåñòâàùè çíàöè (* è ?) çà óêàçâàíå íà ïîâå÷å îò åäèí ôàéë..\n\n\ +Ñúêðàùåíèÿ:\n\ + CI Îíàñëåäÿâàíå íà ñúäúðæàòåëè.\n\ + ACE ùå áúäå îíàñëåäåí îò ïàïêèòå.\n\ + OI Îíàñëåäÿâàíå íà ïðåäìåòè (îáåêòè).\n\ + ACE ùå áúäå íàñëåäåí îò ôàéëîâåòå.\n\ + IO - Inherit Only.\n\ + Íÿìà äà ñå ïðèëàãà ACE âúðõó òåêóùèÿ ôàéë/ ïàïêà.\n" + +IDS_ABBR_CI, "(CI)" +IDS_ABBR_OI, "(OI)" +IDS_ABBR_IO, "(IO)" +IDS_ABBR_FULL, "F" +IDS_ABBR_READ, "R" +IDS_ABBR_WRITE, "W" +IDS_ABBR_CHANGE, "C" +IDS_ABBR_NONE, "N" +IDS_ALLOW, "" +IDS_DENY, "(DENY)" +IDS_SPECIAL_ACCESS, "(èçâúíðåäíè ïðàâà:)" +IDS_GENERIC_READ, "GENERIC_READ" +IDS_GENERIC_WRITE, "GENERIC_WRITE" +IDS_GENERIC_EXECUTE, "GENERIC_EXECUTE" +IDS_GENERIC_ALL, "GENERIC_ALL" +IDS_FILE_GENERIC_EXECUTE, "FILE_GENERIC_EXECUTE" +IDS_FILE_GENERIC_READ, "FILE_GENERIC_READ" +IDS_FILE_GENERIC_WRITE, "FILE_GENERIC_WRITE" +IDS_FILE_READ_DATA, "FILE_READ_DATA" +IDS_FILE_WRITE_DATA, "FILE_WRITE_DATA" +IDS_FILE_APPEND_DATA, "FILE_APPEND_DATA" +IDS_FILE_READ_EA, "FILE_READ_EA" +IDS_FILE_WRITE_EA, "FILE_WRITE_EA" +IDS_FILE_EXECUTE, "FILE_EXECUTE" +IDS_FILE_DELETE_CHILD, "FILE_DELETE_CHILD" +IDS_FILE_READ_ATTRIBUTES, "FILE_READ_ATTRIBUTES" +IDS_FILE_WRITE_ATTRIBUTES, "FILE_WRITE_ATTRIBUTES" +IDS_MAXIMUM_ALLOWED, "MAXIMUM_ALLOWED" +IDS_ACCESS_SYSTEM_SECURITY, "ACCESS_SYSTEM_SECURITY" +IDS_SPECIFIC_RIGHTS_ALL, "SPECIFIC_RIGHTS_ALL" +IDS_STANDARD_RIGHTS_REQUIRED, "STANDARD_RIGHTS_REQUIRED" +IDS_SYNCHRONIZE, "SYNCHRONIZE" +IDS_WRITE_OWNER, "WRITE_OWNER" +IDS_WRITE_DAC, "WRITE_DAC" +IDS_READ_CONTROL, "READ_CONTROL" +IDS_DELETE, "DELETE" +IDS_STANDARD_RIGHTS_ALL, "STANDARD_RIGHTS_ALL" +} + Modified: trunk/reactos/base/applications/cacls/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/rs… ============================================================================== --- trunk/reactos/base/applications/cacls/rsrc.rc (original) +++ trunk/reactos/base/applications/cacls/rsrc.rc Wed Jun 27 03:31:01 2007 @@ -8,6 +8,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* include localised resources */ +#include "lang/bg-BG.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/fr-FR.rc" Added: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc (added) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,141 @@ +#include "winecalc.h" + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Èç÷èñëèòåë" + + IDS_COPYRIGHT1, "Calculator 5.0. Licensed under LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Èçÿä" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "êîðåí 2" + IDS_BTN_DEGREES, "Ãðàäóñè" + IDS_BTN_RADIANS, "Ðàäèàíè" + IDS_BTN_GRADS, "Ãðàäîâå" + IDS_BTN_SHRT_HEX "Øåñòí." + IDS_BTN_SHRT_DEC "Äåñòí." + IDS_BTN_SHRT_OCT "Îñì." + IDS_BTN_SHRT_BIN "Äâîè÷." + IDS_ERR_INVALID_INPUT, "Íåïðàâèëíè âõîäíè äàííè." + IDS_ERR_DIVIDE_BY_ZERO, "Äåëåíåòî íà íóëà å íåâúçìîæíî." + IDS_ERR_UNDEFINED, "Èç÷èñëåíèåòî å íåâúçìîæíî." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíè Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâè Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíÿíå Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâÿíå Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Øåñòí.\tF5", ID_CALC_NS_HEX + MENUITEM "Äåñòí.\tF6", ID_CALC_NS_DEC + MENUITEM "Îñì.\tF7", ID_CALC_NS_OCT + MENUITEM "Äâîè÷.\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "Ãðàäóñè\tF2", ID_CALC_MS_DEGREES + MENUITEM "Ðàäèàíè\tF3", ID_CALC_MS_RADIANS + MENUITEM "Ãðàäîâå\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "&Îáðàáîòêà" { + MENUITEM "&Çàïîìíÿíå Ctrl+C", IDM_COPY + MENUITEM "&Ïîñòàâÿíå Ctrl+V", IDM_PASTE + } + POPUP "&Èçãëåä" { + MENUITEM "Îáèêíîâåí", IDM_MODE_STANDARD + MENUITEM "Íàó÷åí", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Øåñòíàäåñåòè÷åí\tF5", ID_CALC_NS_HEX + MENUITEM "Äåñåòè÷åí\tF6", ID_CALC_NS_DEC + MENUITEM "Îñìè÷åí\tF7", ID_CALC_NS_OCT + MENUITEM "Äâîè÷åí\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "×äóìà\tF12", ID_CALC_WS_QWORD + MENUITEM "Ääóìà\tF2", ID_CALC_WS_DWORD + MENUITEM "Äóìà\tF3", ID_CALC_WS_WORD + MENUITEM "Áàéò\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Ðàçäåëÿíå íà õèëÿäèòå", IDM_DIGIT_GROUPING + } + POPUP "&Ïîìîù" { + MENUITEM "Ïîìîù", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "Çà ïðèëîæåíèåòî", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Çà GNU winecalc" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "Äîáðå", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Êàêâî å òîâà?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "Ñòàòèñòèêà" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END + Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Wed Jun 27 03:31:01 2007 @@ -23,6 +23,7 @@ IDI_CALCICON ICON "calculator.ico" +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc (original) +++ trunk/reactos/dll/cpl/desk/desk.rc Wed Jun 27 03:31:01 2007 @@ -14,6 +14,7 @@ IDC_DESK_ICON2 ICON "resources/applet.ico" IDC_MONITOR BITMAP "resources/monitor.bmp" +#include "lang/bg-BG.rc" #include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/el-GR.rc" Added: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc Wed Jun 27 03:31:01 2007 @@ -1,0 +1,189 @@ +/* Bulgarian translation by ÑÑÒÀÍÅÂ (sstpr AT narod DOT ru) 25.VI.2007 */ + +LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT + +IDD_BACKGROUND DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ðàáîòíà ïëîù" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70,WS_EX_STATICEDGE + CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | + WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Èçáåðåòå èçîáðàæåíèå, êîåòî äà èçïîëçâàòå êàòî óêðàñà íà ðàáîòíàòà ñè ïëîù:", + IDC_STATIC, 8, 103, 180, 9 + PUSHBUTTON "&Îáçîð...", IDC_BROWSE_BUTTON, 188, 114, 50, 15 + PUSHBUTTON "&Öâÿò...", IDC_COLOR_BUTTON, 188, 177, 50, 15 + LTEXT "Ðàçïîëîæåíèå:", IDC_STATIC, 188, 138, 36, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 50, 54, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP +END + + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Åêðàíåí ïðåäïàçèòåë" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, + 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "&Åêðàíåí ïðåäïàçèòåë",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Íà&ñòðîéêè",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Ïðå&ãëåä",IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Èç÷àêâàíå",IDC_WAITTEXT, 14, 125, 16, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | + WS_BORDER | WS_GROUP, 54, 123, 12, 13 + LTEXT "ìèíóòè", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Èñêàíå íà ïàðîëà ïðè âðúùàíå êúì ðàáîòà.",IDC_SCREENS_USEPASSCHK,"button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 104, 19 + GROUPBOX "&Åíåðãîñïåñòÿâàùè âúçìîæíîñòè íà ìîíèòîðà âè", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", + IDC_STATIC, 14, 166, 146 ,20 + PUSHBUTTON "Çàõðàíâàíå...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 +END + + +IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Îáëèê" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "Öâåòîâè íàáîð", IDC_STATIC, 7, 140, 64, 7 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Îùå", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 250, 239 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Ðàçøèðåí îáëèê" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", + WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + + LTEXT "×àñò:", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Ðàçìåð", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 21, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + + LTEXT "&Ïúðâè öâÿò:", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "&Âòîðè öâÿò:", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + + LTEXT "Øðèôò:", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "Ðàçìåð íà øðèôòà:", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + + LTEXT "Öâÿò:", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 20, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + + AUTOCHECKBOX "Ï", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "Ê ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + + PUSHBUTTON "Îòêàç", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "Äîáðå", IDOK, 137, 220, 50, 14 +END + +IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Íàñòðîéêè" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "&Åêðàí:",1820,3,100,30,8 + LTEXT "<íÿìà>",IDC_SETTINGS_DEVICE,9,109,224,8 + GROUPBOX "&Åêðàííà îáëàñò",1818,3,120,115,43 + CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", + TBS_AUTOTICKS | WS_TABSTOP, 30, 130, 58, 17 + LTEXT "Ïî- ìàëêî",1815,9,130,15,8,NOT WS_GROUP + LTEXT "Ïîâå÷å",1816,93,130,21,8,NOT WS_GROUP + LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,150,100,10,NOT WS_GROUP | SS_CENTER + GROUPBOX "&Öâåòîâå",1817,125,120,115,43 + COMBOBOX IDC_SETTINGS_BPP,131,130,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP + CONTROL "",1813,"Static",SS_BITMAP | SS_CENTERIMAGE | SS_SUNKEN, + 131,148,103,9 + PUSHBUTTON "Ðàç&øèðåíè...",IDC_SETTINGS_ADVANCED,306,165,56,14 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Îáèêíîâåíî", ID_MENU_NORMAL + MENUITEM "Èçêëþ÷åíî", ID_MENU_DISABLED + MENUITEM "Èçáðàíî", ID_MENU_SELECTED +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Åêðàí" + IDS_CPLDESCRIPTION "Íàñòðîéêè íà ðàáîòíàòà ïëîù è åêðàííèÿ ïðåäïàçèòåë." + IDS_NONE "(Íÿìà)" + IDS_CENTER "Â ñðåäàòà" + IDS_STRETCH "Ðàçòåãíàòî" + IDS_TILE "Íàñòåëåíî" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_COLOR_4BIT "16 öâÿòà" + IDS_COLOR_8BIT "256 öâÿòà" + IDS_COLOR_16BIT "Ìíîãîöâåòíî (16 áèòà)" + IDS_COLOR_24BIT "Ïúëíîöâåòíî (24 áèòà)" + IDS_COLOR_32BIT "Ïúëíîöâåòíî (32 áèòà)" + IDS_PIXEL "%lux%lu òî÷êè" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Èçîáðàæåíèÿ (*.bmp;*.dib)\0*.bmp;*.dib\0" + IDS_SUPPORTED_EXT "*.bmp;*.dib" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_INACTWIN "Íåòåêóù ïðîçîðåä" + IDS_ACTWIN "Òåêóù ïðîçîðåä" + IDS_WINTEXT "Òåêñò íà ïðîçðöèòå" + IDS_MESSBOX "Êóòèÿ çà ñúîáùåíèÿ" + IDS_MESSTEXT "Òåêñò íà ñúîáùåíèÿòà" + IDS_BUTTEXT "Äîáðå" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ELEMENT_1 "Ðàáîòíà ïëîù" + IDS_ELEMENT_2 "Íàäïèñâàíèÿ íà íåòåêóùèòå ïðîçîðöè" + IDS_ELEMENT_3 "Ðàìêà íà íåòåêóùèòå ïðîçîðöè" + IDS_ELEMENT_4 "Íàäïèñâàíèÿ íà òåêóùèòå ïðîçîðöè" + IDS_ELEMENT_5 "Ðàìêà íà òåêóùèòå ïðîçîðöè" + IDS_ELEMENT_6 "Ìåíþ" + IDS_ELEMENT_7 "Ïîäñêàçêè" + IDS_ELEMENT_8 "Ïðîçîðöè" + IDS_ELEMENT_9 "Ïëúçãà÷è" + IDS_ELEMENT_10 "Òðèìåðíè ïðåäìåòè" + IDS_ELEMENT_11 "Öâÿò íà çàãëàâèÿòà" + IDS_ELEMENT_12 "Ñèìâîëíî çàãëàâèå" + IDS_ELEMENT_13 "Íàäïèñíà ëåíòà" + IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_15 "Âúïðîñèòåëåí ïðîçîðåö" + IDS_ELEMENT_16 "Scrollbar controls" + IDS_ELEMENT_17 "Ïîäêðàñêà íà ïðèëîæåíèÿòà" + IDS_ELEMENT_18 "Ïîäçàãëàâèÿ" + IDS_ELEMENT_19 "Âîäîðàâíà ðàçðåäêà" + IDS_ELEMENT_20 "Îòâåñíà ðàçðåäêà" + IDS_ELEMENT_21 "Áúðçè ñâåäåíèÿ" + IDS_ELEMENT_22 "Ñèìâîë" +END

1 0

[fireball] 27284: - Do some "hardware detection" for OLPC (so the kernel doesn't crash with CONFIG_INITIALIZATION_FAILED bugcheck).
by fireball＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: fireball Date: Wed Jun 27 00:46:34 2007 New Revision: 27284 URL: http://svn.reactos.org/svn/reactos?rev=27284&view=rev Log: - Do some "hardware detection" for OLPC (so the kernel doesn't crash with CONFIG_INITIALIZATION_FAILED bugcheck). Added: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c (with props) Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/hwpci.c Wed Jun 27 00:46:34 2007 @@ -139,7 +139,7 @@ } -static VOID +VOID DetectPciIrqRoutingTable(FRLDRHKEY BusKey) { PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/macholpc.c Wed Jun 27 00:46:34 2007 @@ -287,11 +287,6 @@ return 1; } -VOID OlpcHwDetect() -{ - ofwprintf("OlpcHwDetect\n"); -} - /* Strategy: * * For now, it'll be easy enough to use the boot command line as our boot path. Added: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c (added) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c Wed Jun 27 00:46:34 2007 @@ -1,0 +1,142 @@ +/* $Id: olpchw.c 21339 2006-03-18 22:09:16Z peterw $ + * + * FreeLoader + * + * 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. + */ + +#include <freeldr.h> + +#define NDEBUG +#include <debug.h> + +VOID +DetectPciIrqRoutingTable(FRLDRHKEY BusKey); + +VOID +OlpcDetectPciBios(FRLDRHKEY SystemKey, ULONG *BusNumber) +{ + PCM_FULL_RESOURCE_DESCRIPTOR FullResourceDescriptor; + WCHAR Buffer[80]; + FRLDRHKEY BiosKey; + ULONG Size; + LONG Error; + + /* Report the PCI BIOS */ + if (TRUE/*FindPciBios(&BusData)*/) + { + /* Create new bus key */ + swprintf(Buffer, + L"MultifunctionAdapter\\%u", *BusNumber); + Error = RegCreateKey(SystemKey, + Buffer, + &BiosKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Component Information' */ + SetComponentInformation(BiosKey, + 0x0, + 0x0, + 0xFFFFFFFF); + + /* Increment bus number */ + (*BusNumber)++; + + /* Set 'Identifier' value */ + Error = RegSetValue(BiosKey, + L"Identifier", + REG_SZ, + (PCHAR)L"PCI BIOS", + 9 * sizeof(WCHAR)); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegSetValue() failed (Error %u)\n", (int)Error)); + return; + } + + /* Set 'Configuration Data' value */ + Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR); + FullResourceDescriptor = MmAllocateMemory(Size); + if (FullResourceDescriptor == NULL) + { + DbgPrint((DPRINT_HWDETECT, + "Failed to allocate resource descriptor\n")); + return; + } + + /* Initialize resource descriptor */ + memset(FullResourceDescriptor, 0, Size); + FullResourceDescriptor->InterfaceType = PCIBus; + FullResourceDescriptor->BusNumber = 0; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 1; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeBusNumber; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareDeviceExclusive; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Start = 0; + FullResourceDescriptor->PartialResourceList.PartialDescriptors[0].u.BusNumber.Length = 1; + + /* Set 'Configuration Data' value */ + Error = RegSetValue(BiosKey, + L"Configuration Data", + REG_FULL_RESOURCE_DESCRIPTOR, + (PCHAR) FullResourceDescriptor, + Size); + MmFreeMemory(FullResourceDescriptor); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, + "RegSetValue(Configuration Data) failed (Error %u)\n", + (int)Error)); + return; + } + + DetectPciIrqRoutingTable(BiosKey); + } +} + + + +VOID OlpcHwDetect() +{ + FRLDRHKEY SystemKey; + ULONG BusNumber = 0; + LONG Error; + + ofwprintf("OlpcHwDetect()\n"); + + /* Create the 'System' key */ + Error = RegCreateKey(NULL, + L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System", + &SystemKey); + if (Error != ERROR_SUCCESS) + { + DbgPrint((DPRINT_HWDETECT, "RegCreateKey() failed (Error %u)\n", (int)Error)); + return; + } + + /* Detect buses */ + OlpcDetectPciBios(SystemKey, &BusNumber); + //DetectApmBios(SystemKey, &BusNumber); + //DetectPnpBios(SystemKey, &BusNumber); + //DetectIsaBios(SystemKey, &BusNumber); + //DetectAcpiBios(SystemKey, &BusNumber); + + ofwprintf("DetectHardware() Done\n"); +} Propchange: branches/olpc/boot/freeldr/freeldr/arch/i386/olpchw.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 27283: - Give each VM it's own DataSet instead of maintaining separate DataRows. Fixes a bug where by VM config files were loading up multiple images - Drop the ArrayList as we can rely on the ListView for storing our objects now - Add some primitive error handling
by gedmurphy＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: gedmurphy Date: Tue Jun 26 19:15:33 2007 New Revision: 27283 URL: http://svn.reactos.org/svn/reactos?rev=27283&view=rev Log: - Give each VM it's own DataSet instead of maintaining separate DataRows. Fixes a bug where by VM config files were loading up multiple images - Drop the ArrayList as we can rely on the ListView for storing our objects now - Add some primitive error handling Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMDataBase.cs trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?… Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…

1 0

[gedmurphy] 27282: - change the new explorer rbuild files to stop the IRC users from going insane. - just remove the comment in shell.rbuild to build (just don't expect a fully working shell)
by gedmurphy＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: gedmurphy Date: Tue Jun 26 17:30:53 2007 New Revision: 27282 URL: http://svn.reactos.org/svn/reactos?rev=27282&view=rev Log: - change the new explorer rbuild files to stop the IRC users from going insane. - just remove the comment in shell.rbuild to build (just don't expect a fully working shell) Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild trunk/reactos/base/shell/shell.rbuild Modified: trunk/reactos/base/shell/explorer-new/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rbuild Tue Jun 26 17:30:53 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="explorer" type="win32gui" installname="explorer2.exe" unicode="true"> - <include base="explorer">.</include> + <module name="explorer_new" type="win32gui" installname="explorer_new.exe" unicode="true"> + <include base="explorer_new">.</include> <define name="WIN32" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0600</define> Modified: trunk/reactos/base/shell/shell.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/shell.rbuild?re… ============================================================================== --- trunk/reactos/base/shell/shell.rbuild (original) +++ trunk/reactos/base/shell/shell.rbuild Tue Jun 26 17:30:53 2007 @@ -7,5 +7,10 @@ <directory name="explorer"> <xi:include href="explorer/explorer.rbuild" /> </directory> + </group> </rbuild>

1 0

[gedmurphy] 27281: populate the general page in the settings dialog
by gedmurphy＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: gedmurphy Date: Tue Jun 26 14:17:37 2007 New Revision: 27281 URL: http://svn.reactos.org/svn/reactos?rev=27281&view=rev Log: populate the general page in the settings dialog Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx trunk/tools/RosTE/GUI/VMConfig.xsd trunk/tools/RosTE/GUI/VMConfig.xsx trunk/tools/RosTE/GUI/VirtualMachine.cs [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?… Modified: trunk/tools/RosTE/GUI/VMConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsd?rev=2… Modified: trunk/tools/RosTE/GUI/VMConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMConfig.xsx?rev=2… Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?…

1 0

[dreimer] 27280: - Translate the Strings in the German Solitaire RC File, which were added a while ago. - Add a German RC File to th new Explorer. Its my first commit in Trunk, if I broke something, kill me ; -)
by dreimer＠svn.reactos.org 26 Jun '07

26 Jun '07

Author: dreimer Date: Tue Jun 26 11:55:08 2007 New Revision: 27280 URL: http://svn.reactos.org/svn/reactos?rev=27280&view=rev Log: - Translate the Strings in the German Solitaire RC File, which were added a while ago. - Add a German RC File to th new Explorer. Its my first commit in Trunk, if I broke something, kill me ;-) Added: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/explorer.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Tue Jun 26 11:55:08 2007 @@ -34,9 +34,9 @@ STRINGTABLE BEGIN - IDS_SOL_NAME "Solitaire" - IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." - IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_NAME "Solitär" + IDS_SOL_ABOUT "Solitär von J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "Laufendes Spiel beenden?" END Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… ============================================================================== --- trunk/reactos/base/shell/explorer-new/explorer.rc (original) +++ trunk/reactos/base/shell/explorer-new/explorer.rc Tue Jun 26 11:55:08 2007 @@ -14,6 +14,7 @@ IDB_STARTMENU BITMAP DISCARDABLE res/logov.bmp #include "lang/en-US.rc" +#include "lang/de-DE.rc" #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… ============================================================================== --- trunk/reactos/base/shell/explorer-new/lang/de-DE.rc (added) +++ trunk/reactos/base/shell/explorer-new/lang/de-DE.rc Tue Jun 26 11:55:08 2007 @@ -1,0 +1,59 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDM_TRAYWND MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Taskbar fi&xieren", ID_LOCKTASKBAR + MENUITEM "E&igenschaften", ID_SHELL_CMD_PROPERTIES + END +END + +IDM_STARTMENU MENUEX DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "", -1, MFT_SEPARATOR + POPUP "&Programme", IDM_PROGRAMS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "F&avoriten", IDM_FAVORITES + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Dokumente", IDM_DOCUMENTS + BEGIN + MENUITEM "(Empty)", -1, MFT_STRING, MFS_GRAYED + END + POPUP "&Einstellungen", IDM_SETTINGS + BEGIN + MENUITEM "S&ystemsteuerung", IDM_CONTROLPANEL, MFT_STRING, MFS_GRAYED + MENUITEM SEPARATOR + MENUITEM "&Sicherheit...", IDM_SECURITY, MFT_STRING, MFS_ENABLED + MENUITEM "&Netzwerkverbindungen", IDM_NETWORKCONNECTIONS, MFT_STRING, MFS_ENABLED + MENUITEM "&Drucker und Faxgeräte", IDM_PRINTERSANDFAXES, MFT_STRING, MFS_ENABLED + MENUITEM "&Taskbar und Startmenü", IDM_TASKBARANDSTARTMENU, MFT_STRING, MFS_ENABLED + END + POPUP "Sear&ch", IDM_SEARCH + BEGIN + MENUITEM SEPARATOR + END + MENUITEM "&Hilfe und Support", IDM_HELPANDSUPPORT, MFT_STRING, MFS_ENABLED + MENUITEM "A&usführen...", IDM_RUN, MFT_STRING, MFS_ENABLED + MENUITEM "", 450, MFT_SEPARATOR, MFS_ENABLED + MENUITEM "S&ynchronisieren", IDM_SYNCHRONIZE, MFT_STRING, MFS_ENABLED + MENUITEM "Ab&melden %s...", IDM_LOGOFF, MFT_STRING, MFS_ENABLED + MENUITEM "T&rennen...", IDM_DISCONNECT, MFT_STRING, MFS_ENABLED + MENUITEM "Comput&er undocken", IDM_UNDOCKCOMPUTER, MFT_STRING, MFS_ENABLED + MENUITEM "He&runterfahren...", IDM_SHUTDOWN, MFT_STRING, MFS_ENABLED + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_START "Start" + IDS_PROPERTIES "E&igenschaften" + IDS_OPEN_ALL_USERS "Öffnen &Alle Benutzer" + IDS_EXPLORE_ALL_USERS "Explorer A&lle Benutzer" +END

1 0

[gedmurphy] 27279: - implement deleting of existing images - add a few public properties for virtual machines
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Tue Jun 26 02:48:23 2007 New Revision: 27279 URL: http://svn.reactos.org/svn/reactos?rev=27279&view=rev Log: - implement deleting of existing images - add a few public properties for virtual machines Modified: trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Tue Jun 26 02:48:23 2007 @@ -139,6 +139,12 @@ if (delFrm.ShowDialog() == DialogResult.OK) { + if (delFrm.DeleteFullVM) + { + VirtualMachine vm = (VirtualMachine)lvi.Tag; + Directory.Delete(vm.DefDir, true); + } + mainConf.DeleteVirtMach(lvi.Index/*lvi.Tag*/); VirtMachListView.Items.Remove(lvi); vmConfigs.Remove(lvi.Tag); Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Tue Jun 26 02:48:23 2007 @@ -10,14 +10,13 @@ { private Data data; private DataRow dataRow; - private string machine; - private string cdrom; - private char boot; - private string snapshot; - private int memory; - private int processors; - private bool localTime; - private bool fullScreen; + + #region Virtual machine properties + + public int VirtMachID + { + get { return (int)dataRow["VirtMachID"]; } + } public string Name { @@ -25,73 +24,85 @@ set { dataRow["Name"] = value; } } + public string MachType + { + get { return (string)dataRow["MachType"]; } + set { dataRow["MachType"] = value; } + } + public string DefDir { get { return (string)dataRow["DefDir"]; } - } - - public string Machine - { - get { return machine; } - set { machine = value; } - } - - - public string Cdrom - { - get { return cdrom; } - set { cdrom = value; } - } - public string Boot - { - get - { - switch (boot) - { - case 'a': return "floppy"; - case 'c': return "harddisk"; - case 'd': return "cdrom"; - case 'n': return "network"; - default: throw new ArgumentException("Boot"); - } - } - set - { - switch (value) - { - case "floppy": boot = 'a'; break; - case "harddisk": boot = 'c'; break; - case "cdrom": boot = 'd'; break; - case "network": boot = 'n'; break; - default: throw new ArgumentException("Boot"); - } - } - } - public string SnapShot - { - get { return snapshot; } - set { snapshot = value; } - } - public int Memory - { - get { return memory; } - set { memory = value; } - } - public int Processors - { - get { return processors; } - set { processors = value; } - } - public bool LocalTime - { - get { return localTime; } - set { localTime = value; } - } - public bool FullScreen - { - get { return fullScreen; } - set { fullScreen = value; } - } + set { dataRow["DefDir"] = value; } + } + + public int MemSize + { + get { return (int)dataRow["MemSize"]; } + set { dataRow["MemSize"] = value; } + } + + public bool CdRomEnable + { + get { return (bool)dataRow["CdRomEnable"]; } + set { dataRow["CdRomEnable"] = value; } + } + + public bool CdRomUsePhys + { + get { return (bool)dataRow["CdRomUsePhys"]; } + set { dataRow["CdRomUsePhys"] = value; } + } + + public string CdRomPhysDrv + { + get { return (string)dataRow["CdRomPhysDrv"]; } + set { dataRow["CdRomPhysDrv"] = value; } + } + + public bool CdRomUseIso + { + get { return (bool)dataRow["CdRomUseIso"]; } + set { dataRow["CdRomUseIso"] = value; } + } + + public string CdRomIsoImg + { + get { return (string)dataRow["CdRomIsoImg"]; } + set { dataRow["CdRomIsoImg"] = value; } + } + + public bool FloppyEnable + { + get { return (bool)dataRow["FloppyEnable"]; } + set { dataRow["FloppyEnable"] = value; } + } + + public bool FloppyUsePhys + { + get { return (bool)dataRow["FloppyUsePhys"]; } + set { dataRow["FloppyUsePhys"] = value; } + } + + public string FloppyPhysDrv + { + get { return (string)dataRow["FloppyPhysDrv"]; } + set { dataRow["FloppyPhysDrv"] = value; } + } + + public bool FloppyUseIso + { + get { return (bool)dataRow["FloppyUseIso"]; } + set { dataRow["FloppyUseIso"] = value; } + } + + public string FloppyIsoImg + { + get { return (string)dataRow["FloppyIsoImg"]; } + set { dataRow["FloppyIsoImg"] = value; } + } + + #endregion public override string ToString() {

1 0

[gedmurphy] 27278: add basic code for saving and reloading individual image config files via the ADO database
by gedmurphy＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: gedmurphy Date: Tue Jun 26 00:10:19 2007 New Revision: 27278 URL: http://svn.reactos.org/svn/reactos?rev=27278&view=rev Log: add basic code for saving and reloading individual image config files via the ADO database Modified: trunk/tools/RosTE/GUI/MainConfig.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (original) +++ trunk/tools/RosTE/GUI/MainConfig.cs Tue Jun 26 00:10:19 2007 @@ -27,20 +27,38 @@ // and remove the need for LoadExistingImages / AddVirtMach / DeleteVirtMach } - public int GetNumberOfVms() + public bool LoadMainConfig() { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; + bool ret = false; + string fileName = "Config.xml"; + + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + ret = true; + } + + return ret; } - public VirtualMachine GetExistingImage(int index) + public void SaveMainConfig() + { + string fileName = "Config.xml"; + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } + + public string GetExistingImage(int index) { DataTable dt = data.DataSet.Tables["MainConfig"]; DataRow dr = dt.Rows[index]; - VirtualMachine vm = new VirtualMachine(data); - vm.LoadVirtMach((string)dr["Path"]); - return vm; + return (string)dr["Path"]; } public int AddVirtMach(string Path) @@ -62,30 +80,10 @@ dt.Rows.RemoveAt(index); } - public void SaveMainConfig() + public int GetNumberOfVms() { - string fileName = "Config.xml"; - FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); - XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); - data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); - xtw.Close(); - } - - public bool LoadMainConfig() - { - bool ret = false; - string fileName = "Config.xml"; - - if (File.Exists(fileName)) - { - FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); - XmlTextReader xtr = new XmlTextReader(fs); - data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); - xtr.Close(); - ret = true; - } - - return ret; + DataTable dt = data.DataSet.Tables["MainConfig"]; + return dt.Rows.Count; } } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Tue Jun 26 00:10:19 2007 @@ -47,9 +47,13 @@ int num = mainConf.GetNumberOfVms(); for (int i = 0; i < num; i++) { - VirtualMachine vm = mainConf.GetExistingImage(i); - ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); - lvi.Tag = vm; + string image = mainConf.GetExistingImage(i); + VirtualMachine vm = new VirtualMachine(vmData); + if (vm.LoadVMConfig(image)) + { + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.Tag = vm; + } } } } @@ -145,6 +149,12 @@ private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { mainConf.SaveMainConfig(); + + for (int i = 0; i < vmConfigs.Count; i++) + { + VirtualMachine vm = (VirtualMachine)vmConfigs[i]; + vm.SaveVMConfig(); + } } } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Tue Jun 26 00:10:19 2007 @@ -1,12 +1,8 @@ using System; using System.IO; -using System.Collections.Generic; using System.Collections.Specialized; -using System.ComponentModel; using System.Data; -using System.Drawing; -using System.Text; -using System.Windows.Forms; +using System.Xml; namespace RosTEGUI { @@ -15,8 +11,6 @@ private Data data; private DataRow dataRow; private string machine; - private StringCollection floppy; - private StringCollection hardDisk; private string cdrom; private char boot; private string snapshot; @@ -27,14 +21,13 @@ public string Name { - get - { - return (string)dataRow["Name"]; - } - set - { - dataRow["Name"] = value; - } + get { return (string)dataRow["Name"]; } + set { dataRow["Name"] = value; } + } + + public string DefDir + { + get { return (string)dataRow["DefDir"]; } } public string Machine @@ -42,16 +35,8 @@ get { return machine; } set { machine = value; } } - public StringCollection Floppy - { - get { return floppy; } - // no set, use Floppy.Add() - } - public StringCollection HardDisk - { - get { return hardDisk; } - // no set, use HardDisk.Add() - } + + public string Cdrom { get { return cdrom; } @@ -116,9 +101,6 @@ public VirtualMachine(Data dataIn) { data = dataIn; - - DataTable dt = data.DataSet.Tables["VMConfig"]; - dataRow = dt.NewRow(); } // default @@ -148,21 +130,62 @@ dir = di.FullName; } + DataTable dt = data.DataSet.Tables["VMConfig"]; + int i = dt.Rows.Count + 1; + dataRow = dt.NewRow(); + dataRow["VirtMachID"] = i; + dataRow["Name"] = name; + dataRow["MachType"] = "test"; + dataRow["DefDir"] = dir; + dataRow["MemSize"] = memSize; + dataRow["CdRomEnable"] = true; + dataRow["CdRomUsePhys"] = false; + dataRow["CdRomPhyDrv"] = "R:"; + dataRow["CdRomUseIso"] = true; + dataRow["CdRomIsoImg"] = "err"; + dataRow["FloppyEnable"] = true; + dataRow["FloppyUsePhys"] = true; + dataRow["FloppyPhyDrive"] = "A:"; + dataRow["FloppyUseImg"] = false; + dataRow["FloppyIsoImg"] = "err"; + + dt.Rows.Add(dataRow); + Name = name; - - MessageBox.Show(name + " " + dir + " " + diskSize + " " + existImg + " " + memSize); return ret; } - public bool LoadVirtMach(string path) + public bool LoadVMConfig(string path) { bool ret = false; + string fileName = path + "\\Config.xml"; + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.DataSet.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + + DataTable dt = data.DataSet.Tables["VMConfig"]; + dataRow = dt.Rows[0]; + + ret = true; + } return ret; } + public void SaveVMConfig() + { + string fileName = DefDir + "\\Config.xml"; + Directory.CreateDirectory(DefDir); + FileStream fs = new FileStream(fileName, FileMode.Create, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } } }

1 0

[fireball] 27277: - Map the framebuffer to 0xEE000000 in the freeldr, since 0xFF000000+ virtual addresses are used by the kernel for different purposes. - Add solid color fill. - Add VGA palette lookup for colors passed to the bootvid.dll. - Add support for transparent background in letters (color 16).
by fireball＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: fireball Date: Mon Jun 25 22:02:59 2007 New Revision: 27277 URL: http://svn.reactos.org/svn/reactos?rev=27277&view=rev Log: - Map the framebuffer to 0xEE000000 in the freeldr, since 0xFF000000+ virtual addresses are used by the kernel for different purposes. - Add solid color fill. - Add VGA palette lookup for colors passed to the bootvid.dll. - Add support for transparent background in letters (color 16). Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c branches/olpc/drivers/base/bootvid/vid.c branches/olpc/drivers/base/bootvid/vid_fb.c Modified: branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/boot/freeldr/freeldr/arch/… ============================================================================== --- branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ branches/olpc/boot/freeldr/freeldr/arch/i386/loader.c Mon Jun 25 22:02:59 2007 @@ -49,7 +49,7 @@ extern PAGE_DIRECTORY_X86 framebuffer_pagetable; #define FRAMEBUFFER_PHYS 0xFD000000 -#define FRAMEBUFFER_VIRT 0xFF000000 +#define FRAMEBUFFER_VIRT 0xEE000000 #define FRAMEBUFFER_SIZE 2 * 1024 * 1024 PVOID Modified: branches/olpc/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid.c… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid.c (original) +++ branches/olpc/drivers/base/bootvid/vid.c Mon Jun 25 22:02:59 2007 @@ -40,7 +40,7 @@ 900 - 1 }; -ULONG TextColor = 0xFFFF; +ULONG TextColor = 0xF; ULONG curr_x = 0, curr_y = 0; BOOLEAN NextLine = FALSE; Modified: branches/olpc/drivers/base/bootvid/vid_fb.c URL: http://svn.reactos.org/svn/reactos/branches/olpc/drivers/base/bootvid/vid_f… ============================================================================== --- branches/olpc/drivers/base/bootvid/vid_fb.c (original) +++ branches/olpc/drivers/base/bootvid/vid_fb.c Mon Jun 25 22:02:59 2007 @@ -31,9 +31,27 @@ extern UCHAR BitmapFont8x16[256 * 16]; extern UCHAR BitmapFont10x18[256 * 18 * 2]; - -//static BOOLEAN VidpInitialized = FALSE; -static PUCHAR VidpMemory = (VOID *)0xFF000000; +USHORT VgaPalette[] = { + 0x0000, /* 0 black */ + 0xA800, /* 1 blue */ + 0x0540, /* 2 green */ + 0xAD40, /* 3 cyan */ + 0x0015, /* 4 red */ + 0xA815, /* 5 magenta */ + 0x02B5, /* 6 brown */ + 0xAD55, /* 7 light gray */ + 0x52AA, /* 8 dark gray */ + 0xFAAA, /* 9 bright blue */ + 0x57EA, /* 10 bright green */ + 0xFFEA, /* 11 bright cyan */ + 0x52BF, /* 12 bright red */ + 0xFABF, /* 13 bright magenta */ + 0x57FF, /* 14 bright yellow */ + 0xFFFF /* 15 bright white */ +}; + +static BOOLEAN VidpInitialized = FALSE; +static PUCHAR VidpMemory = (VOID *)0xEE000000; #define CHAR_WIDTH 10 #define CHAR_HEIGHT 18 @@ -60,10 +78,16 @@ unsigned Line; unsigned Col; UCHAR BytesPerChar = (CHAR_WIDTH < 8) ? 1 : 2; - - //HACK - Color = 0xFFFF; - BackTextColor = 0; + BOOLEAN Transparent = FALSE; + + /* Transform from VGA palette to RGB565 */ + if (Color < 16) + Color = VgaPalette[Color]; + + if (BackTextColor < 16) + BackTextColor = VgaPalette[BackTextColor]; + else + Transparent = TRUE; FontPtr = (PUSHORT)(BitmapFont10x18 + Character * CHAR_HEIGHT * BytesPerChar); @@ -74,7 +98,11 @@ Mask = (1 << (CHAR_WIDTH-1)); for (Col = 0; Col < CHAR_WIDTH; Col++) { - Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor); + if (!Transparent) + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : BackTextColor); + else + Pixel[Col] = (0 != (FontPtr[Line] & Mask) ? Color : Pixel[Col]); // transparent background + Mask = Mask >> 1; } Pixel = (WORD *) ((char *) Pixel + Stride); @@ -150,7 +178,6 @@ VidFbInitialize( IN BOOLEAN SetMode) { -#if 0 PHYSICAL_ADDRESS PhysicalAddress; if (!VidpInitialized) @@ -160,12 +187,9 @@ if (VidpMemory == NULL) return FALSE; - memset(VidpMemory, 0x00, 0x200000); - //memset((VOID *)0xFF000000, 0x90, 1024*1024); - VidpInitialized = TRUE; } -#endif + DPRINT1("VidFbInitialize(SetMode %d)\n", SetMode); return TRUE; } @@ -218,6 +242,27 @@ IN ULONG Bottom, IN ULONG Color) { + ULONG Line, Col; + PUSHORT p; + + /* Sanity checks */ + if (Top > Bottom) + return; + if (Left > Right) + return; + + /* Translate color to the VGA palette */ + if (Color < 16) + Color = VgaPalette[Color]; + + for (Line = Top; Line <= Bottom; Line++) + { + p = (PUSHORT)(VidpMemory + (Line * DISPLAY_WIDTH * BytesPerPixel) + Left * BytesPerPixel); + for (Col = 0; Col < (Right-Left); Col++) + { + *p++ = Color; + } + } } static VOID NTAPI

1 0

[weiden] 27276: Fix the build system, accidently broke it with r27269
by weiden＠svn.reactos.org 25 Jun '07

25 Jun '07

Author: weiden Date: Mon Jun 25 21:56:54 2007 New Revision: 27276 URL: http://svn.reactos.org/svn/reactos?rev=27276&view=rev Log: Fix the build system, accidently broke it with r27269 Modified: trunk/reactos/ReactOS.rbuild trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=27276&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Mon Jun 25 21:56:54 2007 @@ -62,7 +62,7 @@ <include>.</include> <include>include</include> <include>include/psdk</include> - <include base="__intermediate">include/psdk</include> + <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include> Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr… ============================================================================== --- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild (original) +++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.ocx.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <importlibrary definition="hhctrl.ocx.spec.def" /> <include base="hhctrl">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS" root="intermediate">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> <define name="__USE_W32API" /> Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild Mon Jun 25 21:56:54 2007 @@ -2,6 +2,7 @@ <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec.def" /> <include base="ole32">.</include> + <include base="ole32" root="intermediate">.</include> <include base="ReactOS">include/reactos/wine</include> <define name="__REACTOS__" /> <define name="__WINESRC__" /> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Jun 25 21:56:54 2007 @@ -684,9 +684,9 @@ Include& include = *includes[i]; if ( parameters.length () > 0 ) parameters += " "; - if ( include.baseValue == "__intermediate" ) + if ( include.root == "intermediate" ) path_prefix = backend->intermediateDirectory->name + cSep; - else if (include.baseValue == "__output" ) + else if (include.root == "output" ) path_prefix = backend->outputDirectory->name + cSep; else path_prefix = ""; @@ -797,7 +797,7 @@ for ( i = 0; i < data.includes.size(); i++ ) { const Include& include = *data.includes[i]; - string includeDirectory; + string includeDirectory, path_prefix; if ( include.baseModule != NULL && ( include.baseModule->type == RpcServer || include.baseModule->type == RpcClient || @@ -806,9 +806,18 @@ backend->intermediateDirectory ); else includeDirectory = include.directory; + + if ( include.root == "intermediate" ) + path_prefix = backend->intermediateDirectory->name + cSep; + else if (include.root == "output" ) + path_prefix = backend->outputDirectory->name + cSep; + else + path_prefix = ""; + fprintf ( fMakefile, - " -I%s", + " -I%s%s", + path_prefix.c_str(), includeDirectory.c_str() ); } for ( i = 0; i < data.defines.size(); i++ ) Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Jun 25 21:56:54 2007 @@ -52,7 +52,6 @@ { this->directory = NormalizeFilename ( basePath + sSep + directory ); this->basePath = NormalizeFilename ( basePath ); - this->baseValue = basePath; } Include::~Include () @@ -67,18 +66,12 @@ if ( att ) { bool referenceResolved = false; - baseValue = att->value; if ( !module ) { - if ( att->value == "__intermediate" || att->value == "__output" ) - referenceResolved = true; - else - { - throw XMLInvalidBuildFileException ( - node->location, - "'base' attribute illegal from global <include>" ); - } + throw XMLInvalidBuildFileException ( + node->location, + "'base' attribute illegal from global <include>" ); } if ( !referenceResolved ) @@ -109,4 +102,18 @@ } else directory = NormalizeFilename ( node->value ); + + att = node->GetAttribute ( "root", false ); + if ( att ) + { + if ( att->value != "intermediate" && att->value != "output" ) + { + throw InvalidAttributeValueException ( + node->location, + "root", + att->value ); + } + + root = att->value; + } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Jun 25 21:56:54 2007 @@ -366,7 +366,7 @@ const Module* baseModule; std::string directory; std::string basePath; - std::string baseValue; + std::string root; Include ( const Project& project, const XMLElement* includeNode );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs