Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 19496: Detect Bad graphic Bios, Some graphice card report VBE 2.0 when the are VBE 1.2. For the manufactures have use wrong version and do not set the OemVendoerPtr. When that happen it is VBE 1.2 on the Graphic card
by greatlrd＠svn.reactos.com 23 Nov '05

23 Nov '05

Detect Bad graphic Bios, Some graphice card report VBE 2.0 when the are VBE 1.2. For the manufactures have use wrong version and do not set the OemVendoerPtr. When that happen it is VBE 1.2 on the Graphic card Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c _____ Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 19:29:38 UTC (rev 19495) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c 2005-11-23 19:35:44 UTC (rev 19496) @@ -241,6 +241,13 @@ &VBEDeviceExtension->VbeInfo, sizeof(VBEDeviceExtension->VbeInfo)); + /* Dectect Bad VBE BIOS some Graphice card report 0x200 when they are VBE 1.2 */ + if (VBEDeviceExtension->VbeInfo.OemVendorNamePtr == 0 && VBEDeviceExtension->VbeInfo.Version == 0x200) + { + VBEDeviceExtension->VbeInfo.Version = 0x102; + } + + DPRINT("VBE BIOS Present (%d.%d, %8ld Kb)\n", VBEDeviceExtension->VbeInfo.Version / 0x100, VBEDeviceExtension->VbeInfo.Version & 0xFF,

1 0

[hpoussin] 19495: Don't check if user is admin before installing a device, as we're running DevInstallW in SYSTEM context (this would change one day...)
by hpoussin＠svn.reactos.com 23 Nov '05

23 Nov '05

Don't check if user is admin before installing a device, as we're running DevInstallW in SYSTEM context (this would change one day...) Modified: trunk/reactos/lib/newdev/newdev.c _____ Modified: trunk/reactos/lib/newdev/newdev.c --- trunk/reactos/lib/newdev/newdev.c 2005-11-23 18:44:02 UTC (rev 19494) +++ trunk/reactos/lib/newdev/newdev.c 2005-11-23 19:29:38 UTC (rev 19495) @@ -873,11 +873,14 @@ DWORD config_flags; /*TCHAR buf[128];*/ - if (!IsUserAdmin()) - { - /* XP kills the process... */ - ExitProcess(ERROR_ACCESS_DENIED); - } + /* FIXME: Nov 2005. umpnpmgr.exe is directly calling DevInstallW in + * SYSTEM context, which is not member of the Administrators group. + * So, just ignore the test at the moment... */ + //if (!IsUserAdmin()) + //{ + // /* XP kills the process... */ + // ExitProcess(ERROR_ACCESS_DENIED); + //} /* Clear devinst data */ ZeroMemory(&DevInstData, sizeof(DEVINSTDATA));

1 0

[fireball] 19494: Translation of newdev by unC0Rr, proofread by me.
by fireball＠svn.reactos.com 23 Nov '05

23 Nov '05

Translation of newdev by unC0Rr, proofread by me. Added: trunk/reactos/lib/newdev/Ru.rc Modified: trunk/reactos/lib/newdev/newdev.rc _____ Added: trunk/reactos/lib/newdev/Ru.rc --- trunk/reactos/lib/newdev/Ru.rc 2005-11-23 18:33:01 UTC (rev 19493) +++ trunk/reactos/lib/newdev/Ru.rc 2005-11-23 18:44:02 UTC (rev 19494) @@ -0,0 +1,74 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ë±?ÓÝ¯ÔÛÓ ¯ß¯¾õ¯ÔÓÝÞ " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "?Ó± ´ÞÔÕ?±?Ô¾Õ? ýÓ±?Õ ¾±?ÓÝ¯ÔÛÞ Ý¯Ô¯Ò¯ ¯ß¯¾õ¯ÔÓÝÞ ",IDC_WELCOMETITLE,120,8,195,24 + LTEXT "¦?¯? ýÓ±?Õ ¾±?ÓÝÓÔÙÞÔÓÕ? õÓÚÔÕ õÙ :", + IDC_STATIC,120,40,195,16 + LTEXT "?Ù ´¯õ¯ÙµÕÝÞ ÝÓµýÞ?Õ ÛÝ¯´Û¾ ""? ÓÙÕÕ"".",IDC_STATIC,120,169,195,17 + LTEXT "?ÕÞþÔÕ±?Ý¯Õ ¾±?¯Ú±?Ô¯",IDC_DEVICE,134,55,164,11 + CONTROL "Ë±?ÓÝ¯ÔÞ?³ õÓÚÔÕ ÓÔ?¯ýÓ?Þ¸Õ± ÛÞ",IDC_RADIO_AUTO,"Button", + BS_AUTORADIOBUTTON,120,112,178,13 + CONTROL "Ë±?ÓÝ¯ÔÞ?³ õÓÚÔÕ Þþ ¾ÛÓþÓÝÝ¯Ò¯ ýÕ± ?Ó",IDC_RADIO_MANUAL, + "Button",BS_AUTORADIOBUTTON,120,133,164,14 +END + +IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ë±?ÓÝ¯ÔÛÓ ¯ß¯¾õ¯ÔÓÝÞ " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ë±?ÓÝ¯ÔÛÓ ÝÕ ¾õÓÙÓ±³",IDC_FINISHTITLE,120,8,195,24 + LTEXT "Ë±?¯Ú±?Ô¯ ÝÕ ¾±?ÓÝ¯ÔÙÕÝ¯, ´¯?¯ý¾ ¸?¯ õÓÚÔÕ ÝÕ ÝÓÚõÕÝ.", + IDC_STATIC,120,40,195,19 + LTEXT "?ÓµýÞ?Õ ÛÝ¯´Û¾ ""?ÓþÓõ"", Õ±ÙÞ ¾ ?Ó± Õ±?³ ¾±?ÓÝ¯Ô¯ ¸Ý¹Ú õÞ±Û ± õÓÚÔÕ¯ý, ÞÙÞ ¸?¯ß¹ ¾ÛÓþÓ?³ ýÕ±?¯´¯Ù¯µÕÝÞÕ õÓÚÔÕÓ", + IDC_STATIC,120,98,181,24 + CONTROL "?Õ ´¯ÛÓþ¹ÔÓ?³ ²?¯? õÞÓÙ¯Ò Ô ß¾õ¾¨Õý",IDC_DONOTSHOWDLG,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 +END + +IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ë±?ÓÝ¯ÔÛÓ ¯ß¯¾õ¯ÔÓÝÞ " +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "?±ÛÓ?³ ´¯ ²?Þý ´¾? ý",IDC_RADIO_SEARCHHERE,"Button", + BS_AUTORADIOBUTTON,27,11,239,13 + CONTROL "?¹ßÓ?³ õÓÚÔÕ Ô¾¸Ý¾ ?",IDC_RADIO_CHOOSE,"Button", + BS_AUTORADIOBUTTON,27,98,171,12 + CONTROL "?±ÛÓ?³ ÝÓ ±ýÕÝÝ¹§ Ý¯±Þ?ÕÙ §",IDC_CHECK_MEDIA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,47,33,163,9 + CONTROL "?ÛÙ?¸Þ?³ ²?¯? ´¾ ?³",IDC_CHECK_PATH,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,47,54,162,10 + PUSHBUTTON "?ßþ¯",IDC_BROWSE,248,69,50,14 + COMBOBOX IDC_COMBO_PATH,61,71,176,12,CBS_DROPDOWN | CBS_SORT | + WS_VSCROLL | WS_TABSTOP +END + +IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Ë±?ÓÝ¯ÔÛÓ ¯ß¯¾õ¯ÔÓÝÞ " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "?ÕÞþÔÕ±?Ý¯Õ ¾±?¯Ú±?Ô¯",IDC_DEVICE,51,20,169,16 +END + +IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU +CAPTION "Ë±?ÓÝ¯ÔÛÓ ¯ß¯¾õ¯ÔÓÝÞ " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Ë±?ÓÝ¯ÔÛÓ þÓÔÕ°ÕÝÓ",IDC_FINISHTITLE,120,8,195,11 + LTEXT "?Ó±?Õ þÓÛ¯Ý¸ÞÙ ¾±?ÓÝ¯ÔÛ¾ õÓÚÔÕÓ õÙ :", + IDC_STATIC,120,32,195,19 + LTEXT "?Ù Ô¹§¯õÓ Þþ ýÓ±?ÕÓ ÝÓµýÞ?Õ ÛÝ¯´Û¾ ""?¯?¯Ô ¯"".",IDC_STATIC,120,174, + 179,11 + LTEXT "?ÕÞþÔÕ±?Ý¯Õ ¾±?¯Ú±?Ô¯",IDC_DEVICE,148,53,147,12 +END + Property changes on: trunk/reactos/lib/newdev/Ru.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/newdev/newdev.rc --- trunk/reactos/lib/newdev/newdev.rc 2005-11-23 18:33:01 UTC (rev 19493) +++ trunk/reactos/lib/newdev/newdev.rc 2005-11-23 18:44:02 UTC (rev 19494) @@ -9,3 +9,4 @@ #include "En.rc" #include "Es.rc" #include "De.rc" +#include "Ru.rc"

1 0

[fireball] 19493: Translation of vmwinst by unC0Rr, modified by me.
by fireball＠svn.reactos.com 23 Nov '05

23 Nov '05

Translation of vmwinst by unC0Rr, modified by me. Added: trunk/reactos/subsys/system/vmwinst/Ru.rc Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc _____ Added: trunk/reactos/subsys/system/vmwinst/Ru.rc --- trunk/reactos/subsys/system/vmwinst/Ru.rc 2005-11-23 17:53:08 UTC (rev 19492) +++ trunk/reactos/subsys/system/vmwinst/Ru.rc 2005-11-23 18:33:01 UTC (rev 19493) @@ -0,0 +1,131 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_WELCOMEPAGE DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ¯ßÝÓ¾µÞÙÓ, ¸?¯ ReactOS Óß¯?ÓÕ? ´¯õ ¾´ÓÔÙÕÝÞÕý ÔÞ?¾ÓÙ³Ý¯Ú ýÓ°ÞÝ¹ VMware(r).", -1, 100, 8, 160, 24 + LTEXT "?Ù ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware(r) ÝÓµýÞ?Õ ÛÝ¯´Û¾ ""? ÓÙÕÕ"", ÞÝÓ¸Õ ÝÓµýÞ?Õ ""??ýÕÝÓ"".", -1, 100, 140, 160, 17 +END + +IDD_INSERT_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ReactOS ÝÕ ÔÛÙ?¸ÓÕ? Ô ±Õß SVGA-õÓÚÔÕ VMware(r).\n\nÐÙÕõ¾Ú?Õ Ô ýÕÝ? 'VM' ´¯ÒÓýý¹ VMware(r) Workstation Þ Ô¹ßÕÞ?Õ 'Install VMware tools...'\n\n\n?Ù ´¯õ¯ÙµÕÝÞ ÝÓµýÞ?Õ ÛÝ¯´Û¾ ""?ÓÙÕÕ"", ÞÙÞ ""??ýÕÝÓ"", ¸?¯ß¹ ´¯´¾±?Þ?³ ¾±?ÓÝ¯ÔÛ¾ SVGA-õÓÚÔÕÓ.",-1,25,25,225,85 +END + +IDD_INSTALLING_VMWARE_TOOLS DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "{STATUS}",IDC_INSTALLINGSTATUS,25,68,225,8 + CONTROL "", IDC_INSTALLINGPROGRESS, "msctls_progress32", PBS_MARQUEE | WS_CHILD | WS_VISIBLE | WS_BORDER, 25, 80, 225, 8 +END + +IDD_CONFIG DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Ë±?ÓÝ¯ÔÛÓ SVGA-õÓÚÔÕÓ VMware(r) þÓÔÕ°ÕÝÓ ¾±´Õ°Ý¯. ?¹ßÕÞ?Õ ´Õõ´¯¸?Þ?ÕÙ³Ý¯Õ ÓþÕ°ÕÝÞÕ ²ÛÓÝÓ:",-1,25,5,225,20 + PUSHBUTTON "640x480", 540, 25, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "800x600", 1400, 25, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1024x768", 1792, 25, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1152x864", 2016, 25, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x960", 2240, 110, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1280x1024", 2304, 110, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1400x1050", 2450, 110, 60, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1600x1200", 2800, 110, 75, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1792x1344", 3136, 195, 30, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1856x1392", 3248, 195, 45, 65, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "1920x1440", 3360, 195, 60, 50, 15, BS_AUTORADIOBUTTON + LTEXT "?¹ßÕÞ?Õ ÛÓ¸Õ±?Ô¯ ´ÕÕõÓ¸Þ ÷ÔÕ?Ó:", -1, 25, 93, 225, 12 + COMBOBOX IDC_COLORQUALITY, 25, 105, 75, 80, CBS_DROPDOWNLIST | WS_TABSTOP +END + +IDD_INSTALLATION_FAILED DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ReactOS ÝÕ ±ý¯ÒÙÓ ¾±?ÓÝ¯ÔÞ?³ SVGA-õÓÚÔÕ VMware(r).\n\n\n?ÓµýÞ?Õ ÛÝ¯´Û¾ ""ÃÓÔÕ°Þ?³"" õÙ ´¯õ¯ÙµÕÝÞ ´¯÷Õ±±Ó ¾± ?ÓÝ¯ÔÛÞ.",-1,25,25,225,85 +END + +IDD_CHOOSEACTION DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "SVGA-õÓÚÔÕ VMware(r) ¾µÕ ¾±?ÓÝ¯ÔÙÕÝ.\n\n?¹ßÕÞ?Õ õÓÙ³ÝÕÚ°ÕÕ õÕÚ±?ÔÞÕ:",-1,25,5,225,30 + PUSHBUTTON "?Ó±?¯Þ?³ ´ÓÓýÕ?¹ ²ÛÓÝÓ", IDC_CONFIGSETTINGS, 25, 40, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "Ë±?ÓÝ¯ÔÞ?³ õ¾Ò¯Ú ÒÓ¶Þ¸Õ±ÛÞÚ õÓÚÔÕ", IDC_USEOTHERDRIVER, 25, 55, 200, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ËõÓÙÞ?³ SVGA-õÓÚÔÕ VMware(r)", IDC_UNINSTALL, 25, 70, 200, 15, BS_AUTORADIOBUTTON + LTEXT "?ÓµýÞ?Õ ÛÝ¯´Û¾ ""?ÓÙÕÕ"" õÙ ´¯õ¯ÙµÕÝÞ ÞÙÞ ""??ýÕÝÓ"" õÙ Ô¹§¯õÓ Þþ ýÓ±?ÕÓ ¾±?ÓÝ¯ÔÛÞ.", -1, 25, 93, 225, 20 +END + +IDD_SELECTDRIVER DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "?¹ßÕÞ?Õ ÒÓ¶Þ¸Õ±ÛÞÚ õÓÚÔÕ, Û¯?¯¹Ú ?¹ §¯?ÕÙÞ ß¹ Þ±´¯Ù³þ¯ ÔÓ?³:",-1,25,25,225,15 + PUSHBUTTON "ReactOS VGA õÓÚÔÕ", IDC_VGA, 25, 40, 225, 15, BS_AUTORADIOBUTTON + PUSHBUTTON "ReactOS VBE õÓÚÔÕ (SVGA)", IDC_VBE, 25, 55, 225, 15, BS_AUTORADIOBUTTON + LTEXT "?ÓµýÞ?Õ ÛÝ¯´Û¾ ""ÃÓÔÕ°Þ?³"" õÙ Ô¹´¯ÙÝÕÝÞ ¯´ÕÓ÷ÞÞ ÞÙÞ ""? ?ýÕÝÓ"" õÙ Ô¹§¯õÓ Þþ ´¯ÒÓýý¹ ¾±?ÓÝ¯ÔÛÞ ßÕþ ±¯§ÓÝÕÝÞ ÞþýÕÝÕÝÞÚ.", -1, 25, 93, 225, 30 +END + +IDD_DOUNINSTALL DIALOGEX 0, 0, PROPSHEETWIDTH, PROPSHEETHEIGHT +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Ë±?ÓÝ¯ÔÛÓ ÔÞõÕ¯õÓÚÔÕÓ" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ?Ð ReactOS Ò¯?¯ÔÓ ´¯ÞþÔÕ±?Þ ¾õÓÙÕÝÞÕ SVGA-õÓÚÔÕÓ VMWare(r)!\n\n\n?ÓµýÞ?Õ ÛÝ¯´Û¾ ""ÃÓÔÕ°Þ?³"" õÙ ¾õÓÙÕÝÞ õÓÚÔÕÓ ÞÙÞ ""??ýÕÝÓ"" ¸?¯ß¹ ¯±?ÓÔÞ?³ õÓÚÔÕ.",-1,25,25,225,85 +END + +STRINGTABLE +BEGIN + IDS_WIZARD_NAME "?ßÝÓ¾µÕÝ VMware(r)" + IDS_FAILEDTOLOCATEDRIVERS "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ReactOS ÝÕ ±ý¯ÒÙÓ ÝÓÚ?Þ ÝÕ¯ß§¯õÞý¹Õ ¶ÓÚÙ¹.\nËßÕõÞ?Õ±³, ¸?¯ VMware(r) tools CD-ROM Ô±?ÓÔÙÕÝ Ô ´ÞÔ¯õ." + IDS_FAILEDTOCOPYFILES "¤¯ÒÓýýÓ ¾±?ÓÝ¯ÔÛÞ ReactOS ÝÕ ±ý¯ÒÙÓ ±Û¯´Þ¯ÔÓ?³ ÝÕ¯ß§¯õÞý¹Õ ¶ÓÚÙ¹.\nËßÕõÞ?Õ±³, ¸?¯ VMware(r) tools CD-ROM Ô± ?ÓÔÙÕÝ Ô ´ÞÔ¯õ.\n" + IDS_FAILEDTOACTIVATEDRIVER "?Õ ¾õÓÙ¯±³ þÓ´¾±?Þ?³ SVGA-õÓÚÔÕ VMware(r)!" + IDS_FAILEDTOSELVGADRIVER "?Õ ¾õÓÙ¯±³ þÓ´¾±?Þ?³ ReactOS VGA õÓÚÔÕ!" + IDS_FAILEDTOSELVBEDRIVER "?Õ ¾õÓÙ¯±³ þÓ´¾±?Þ?³ ReactOS VBE õÓÚÔÕ!" + IDS_UNINSTNOTICE "ÈÓÚÙ¹ SVGA-õÓÚÔÕÓ VMware(r) ÝÕ ß¹ÙÞ ¾õÓÙÕÝ¹.\nËõÓÙÞ?Õ Þ§ ±Óý¯±?¯ ?ÕÙ³Ý¯ ´¯±ÙÕ ´ÕÕþÓÒ¾þÛÞ ±Þ±?Õý¹." + IDS_FAILEDTOADDREGENTRIES "?Õ ¾õÓÙ¯±³ ±¯þõÓ?³ þÓ´Þ±Þ Ô ÕÕ±?Õ õÙ SVGA-õÓÚÔÕÓ VMware(r)!" +END + +STRINGTABLE +BEGIN + 10001 "?ÞþÛ¯Õ (8BPP)" + 10002 "ÐÕõÝÕÕ (16BPP)" + 10003 "ÐÓý¯Õ Ô¹±¯Û¯Õ (32BPP)" +END + +STRINGTABLE +BEGIN + IDS_SEARCHINGFORCDROM "¤¯Þ±Û Û¯ý´ÓÛ?-õÞ±ÛÓ VMware(r) Tools..." + IDS_COPYINGFILES "?¯´Þ¯ÔÓÝÞÕ ¶ÓÚÙ¯Ô..." + IDS_ENABLINGDRIVER "ÃÓ´¾±Û SVGA-õÓÚÔÕÓ VMware(r)..." +END + +STRINGTABLE +BEGIN + IDD_INSERT_VMWARE_TOOLSTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_INSERT_VMWARE_TOOLSSUBTITLE "?±?ÓÔ³?Õ õÞ±Û VMware tools." + IDD_INSTALLING_VMWARE_TOOLSTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_INSTALLING_VMWARE_TOOLSSUBTITLE "¤¯Þ±Û Þ Û¯´Þ¯ÔÓÝÞÕ SVGA-õÓÚÔÕÓ VMware (r)." + IDD_CONFIGTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_CONFIGSUBTITLE "?¹ßÕÞ?Õ ´Õõ´¯¸Þ?ÓÕý¯Õ ÓþÕ°ÕÝÞÕ ²ÛÓÝÓ." + IDD_INSTALLATION_FAILEDTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_INSTALLATION_FAILEDSUBTITLE "Ë±?ÓÝ¯ÔÛÓ SVGA-õÓÚÔÕÓ VMware (r) ÝÕ ¾õÓÙÓ±³." + IDD_CHOOSEACTIONTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_CHOOSEACTIONSUBTITLE "?¹ßÕÞ?Õ õÕÚ±?ÔÞÕ." + IDD_SELECTDRIVERTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_SELECTDRIVERSUBTITLE "?¹ßÕÞ?Õ õÓÚÔÕ." + IDD_DOUNINSTALLTITLE "?Ó±?Õ ¾±?ÓÝ¯ÔÛÞ SVGA-õÓÚÔÕÓ VMware (r)" + IDD_DOUNINSTALLSUBTITLE "ËõÓÙÕÝÞÕ õÓÚÔÕÓ." +END Property changes on: trunk/reactos/subsys/system/vmwinst/Ru.rc ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/vmwinst/vmwinst.rc --- trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-11-23 17:53:08 UTC (rev 19492) +++ trunk/reactos/subsys/system/vmwinst/vmwinst.rc 2005-11-23 18:33:01 UTC (rev 19493) @@ -31,4 +31,5 @@ #include "Dk.rc" #include "Es.rc" #include "Ja.rc" +#include "Ru.rc"

1 0

[sedwards] 19492: Identifier '__value' changed everywhere to '__val' to avoid clashes with Microsoft's 'managed C++' keyword
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

Identifier '__value' changed everywhere to '__val' to avoid clashes with Microsoft's 'managed C++' keyword Modified: trunk/reactos/lib/crt/include/internal/mbstring.h Modified: trunk/reactos/lib/crt/math/atan2.c Modified: trunk/reactos/lib/crt/math/fmod.c Modified: trunk/reactos/lib/crt/math/ldexp.c Modified: trunk/reactos/lib/crt/math/log10.c Modified: trunk/reactos/lib/crt/math/pow.c _____ Modified: trunk/reactos/lib/crt/include/internal/mbstring.h --- trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/include/internal/mbstring.h 2005-11-23 17:53:08 UTC (rev 19492) @@ -13,7 +13,9 @@ #define _M_ _KNJ_M /* Non-puntuation in Kana-set */ #define _P_ _KNJ_P /* Punctuation of Kana-set */ #define _12 (_1_|__2) +#ifndef _M2 #define _M2 (_M_|__2) +#endif #define _P2 (_P_|__2) _____ Modified: trunk/reactos/lib/crt/math/atan2.c --- trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/atan2.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -8,14 +8,14 @@ */ double atan2 (double __y, double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fpatan\n\t" "fld %%st(0)" - : "=t" (__value) : "0" (__x), "u" (__y)); + : "=t" (__val) : "0" (__x), "u" (__y)); #else - __value = linkme_atan2(__x, __y); + __val = linkme_atan2(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/fmod.c --- trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/fmod.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,16 +24,16 @@ double fmod (double __x, double __y) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("1: fprem\n\t" "fstsw %%ax\n\t" "sahf\n\t" "jp 1b" - : "=t" (__value) : "0" (__x), "u" (__y) : "ax", "cc"); + : "=t" (__val) : "0" (__x), "u" (__y) : "ax", "cc"); #else - __value = linkme_fmod(__x, __y); + __val = linkme_fmod(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/ldexp.c --- trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/ldexp.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,13 +24,13 @@ double ldexp (double __x, int __y) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__x), "u" ((double) __y)); + : "=t" (__val) : "0" (__x), "u" ((double) __y)); #else - __value = linkme_ldexp(__x, __y); + __val = linkme_ldexp(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/log10.c --- trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/log10.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -24,15 +24,15 @@ double log10 (double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fldlg2\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); #else - __value = linkme_log10(__x); + __val = linkme_log10(__x); #endif /*__GNUC__*/ - return __value; + return __val; } _____ Modified: trunk/reactos/lib/crt/math/pow.c --- trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:31:28 UTC (rev 19491) +++ trunk/reactos/lib/crt/math/pow.c 2005-11-23 17:53:08 UTC (rev 19492) @@ -26,18 +26,18 @@ double __log2 (double __x) { - register double __value; + register double __val; #ifdef __GNUC__ __asm __volatile__ ("fld1\n\t" "fxch\n\t" "fyl2x" - : "=t" (__value) : "0" (__x)); + : "=t" (__val) : "0" (__x)); #else //__value = linkme_log2(__x); - __value = 0; + __val = 0; #endif /*__GNUC__*/ - return __value; + return __val; } /* @@ -45,7 +45,7 @@ */ double pow (double __x, double __y) { - register double __value; + register double __val; #ifdef __GNUC__ register double __exponent; long __p = (long) __y; @@ -80,15 +80,15 @@ "fxch\n\t" "fsub %%st(1) # fract(y * log2(x))\n\t" "f2xm1 # 2^(fract(y * log2(x))) - 1\n\t" - : "=t" (__value), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); - __value += 1.0; + : "=t" (__val), "=u" (__exponent) : "0" (__log2 (__x)), "1" (__y)); + __val += 1.0; __asm __volatile__ ("fscale" - : "=t" (__value) : "0" (__value), "u" (__exponent)); + : "=t" (__val) : "0" (__val), "u" (__exponent)); #else - __value = linkme_pow(__x, __y); + __val = linkme_pow(__x, __y); #endif /*__GNUC__*/ - return __value; + return __val; } long double powl (long double __x,long double __y)

1 0

[chorns] 19491: ReactOS Sin Custom Revision Action (Revision ISO Creator)
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

ReactOS Sin Custom Revision Action (Revision ISO Creator) Added: trunk/cis/ReactOS.CustomRevisionAction/ Added: trunk/cis/ReactOS.CustomRevisionAction/App.config Added: trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs Added: trunk/cis/ReactOS.CustomRevisionAction/Default.build Added: trunk/cis/ReactOS.CustomRevisionAction/Main.cs Added: trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs _____ Added: trunk/cis/ReactOS.CustomRevisionAction/App.config --- trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/App.config 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="publishPath" value="c:\iso" /> + <add key="smtpServer" value="localhost" /> + <add key="errorEmail" value="mailbox@somewhere-on-the-net" /> + <add key="makeParameters" value="" /> + <add key="fastDisk" value="" /> + </appSettings> +</configuration> _____ Added: trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs --- trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/AssemblyInfo.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,14 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("ReactOS Sin Custom Revision Action")] +[assembly: AssemblyDescription("ReactOS Sin Custom Revision Action")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("ReactOS Project")] +[assembly: AssemblyProduct("React Operating System")] +[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] _____ Added: trunk/cis/ReactOS.CustomRevisionAction/Default.build --- trunk/cis/ReactOS.CustomRevisionAction/Default.build 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/Default.build 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<project name="ReactOS.CustomRevisionAction" default="build"> + + <property name="output.dir" value="bin" /> + + <target name="build" description="Build component"> + <mkdir dir="${output.dir}" /> + <csc target="exe" + output="${output.dir}\ReactOS.CustomRevisionAction.exe" + optimize="true" + debug="true" + doc="${output.dir}\ReactOS.CustomRevisionAction.xml" + warninglevel="0"> + <sources> + <include name="*.cs" /> + </sources> + </csc> + </target> + +</project> _____ Added: trunk/cis/ReactOS.CustomRevisionAction/Main.cs --- trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/Main.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,254 @@ +using System; +using System.IO; +using System.Diagnostics; +using System.Configuration; +using System.Web.Mail; + +namespace ReactOS.CustomRevisionAction +{ + public class MainClass + { + /// <summary> + /// Path to store published binaries at. + /// </summary> + private static string publishPath; + + /// <summary> + /// Run the application. + /// </summary> + /// <param name="script">Script to run.</param> + /// <param name="args">Arguments to pass to script.</param> + /// <param name="workingDirectory">Working directory.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns> + /// Exit code. + /// </returns> + private static int RunScript(string script, + string args, + string workingDirectory, + out string standardOutput, + out string standardError) + { + ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script, + args); + scriptProcessStartInfo.CreateNoWindow = true; + /* + * All standard streams must be redirected. + * Otherwise DuplicateHandle() will fail. + */ + scriptProcessStartInfo.RedirectStandardInput = true; + scriptProcessStartInfo.RedirectStandardError = true; + scriptProcessStartInfo.RedirectStandardOutput = true; + scriptProcessStartInfo.UseShellExecute = false; + scriptProcessStartInfo.WorkingDirectory = workingDirectory; + RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo); + standardOutput = redirectableProcess.ProcessOutput; + standardError = redirectableProcess.ProcessError; + return redirectableProcess.ExitCode; + } + + /// <summary> + /// Retrieve value of configuration from configuration file. + /// </summary> + /// <param name="name">Name of configuration option.</param> + /// <param name="defaultValue"> + /// Default value to be returned if the option does not exist. + /// </param> + /// <returns> + /// Value of configuration option or null if the option does not + /// exist and no default value is provided. + /// </returns> + private static string GetConfigurationOption(string name, + string defaultValue) + { + if (ConfigurationSettings.AppSettings[name] != null) + return ConfigurationSettings.AppSettings[name]; + else + return defaultValue; + } + + /// <summary> + /// Send an email. + /// </summary> + /// <param name="subject">Subject of the email.</param> + /// <param name="body">Content of the email.</param> + private static void SendErrorMail(string subject, string body) + { + try + { + string smtpServer = GetConfigurationOption("smtpServer", "localhost"); + string toEmail = GetConfigurationOption("errorEmail", null); + if (toEmail == null) + return; + string fromEmail = GetConfigurationOption("fromEmail", null); + if (fromEmail == null) + fromEmail = toEmail; + MailMessage mm = new MailMessage(); + mm.Priority = MailPriority.Normal; + mm.From = toEmail; + mm.To = toEmail; + mm.Subject = subject; + mm.Body += body; + mm.Body += "<br>"; + mm.BodyFormat = MailFormat.Html; + SmtpMail.SmtpServer = smtpServer; + SmtpMail.Send(mm); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.Message); + } + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="revision">Repository revision.</param> + /// <param name="text">Error message.</param> + private static void Fail(int revision, + string text) + { + Console.WriteLine(text); + Console.Error.WriteLine(text); + SendErrorMail(String.Format("[{0}] ReactOS Publish Error", revision), text); + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="text">Error message.</param> + private static void Fail(string text) + { + Console.WriteLine(text); + Console.Error.WriteLine(text); + SendErrorMail("ReactOS Publish Error", text); + } + + /// <summary> + /// Generate filename of distribution. + /// </summary> + /// <param name="branch">Branch.</param> + /// <param name="revision">Revision.</param> + private static string GetDistributionFilename(string branch, + int revision) + { + return String.Format("ReactOS-{0}-r{1}.iso", + branch, + revision); + } + + /// <summary> + /// Copy ISO to the destination. + /// </summary> + /// <param name="sourceFilename">Name of source ISO file to copy.</param> + /// <param name="branch">Branch.</param> + /// <param name="revision">Revision.</param> + /// <remarks> + /// Structure is <branch>\ReactOS-<branch>-r<revision>.iso. + /// </remarks> + private static void CopyISOToDestination(string sourceFilename, + string branch, + int revision) + { + string distributionFilename = GetDistributionFilename(branch, + revision); + string destinationDirectory = Path.Combine(publishPath, + branch); + string destinationFilename = Path.Combine(destinationDirectory, + distributionFilename); + if (!Directory.Exists(destinationDirectory)) + Directory.CreateDirectory(destinationDirectory); + File.Copy(sourceFilename, + destinationFilename); + } + + /// <summary> + /// Publish a revision of ReactOS. + /// </summary> + /// <param name="text">Error message.</param> + private static int Publish(string branch, + int revision, + string workingDirectory) + { + string make = "mingw32-make"; + string makeParameters = GetConfigurationOption("makeParameters", ""); + string reactosDirectory = Path.Combine(workingDirectory, + "reactos"); + Console.WriteLine(String.Format("ReactOS directory is {0}", + reactosDirectory)); + string standardOutput; + string standardError; + int exitCode = RunScript(make, + makeParameters + " bootcd", + reactosDirectory, + out standardOutput, + out standardError); + if (exitCode != 0) + { + Fail(revision, + String.Format("make bootcd failed: (error: {0}) {1}", + standardError, + standardOutput)); + return exitCode; + } + + string sourceFilename = Path.Combine(reactosDirectory, + "ReactOS.iso"); + if (File.Exists(sourceFilename)) + CopyISOToDestination(sourceFilename, + branch, + revision); + else + { + Fail(revision, + "make bootcd produced no ReactOS.iso"); + return exitCode; + } + + return exitCode; + } + + /// <summary> + /// Program entry point. + /// </summary> + /// <param name="args">Arguments from command line.</param> + /// <remarks> + /// If exit code is 0, then the commit was processed successfully. + /// If exit code is 1, then the commit was not processed successfully. + /// </remarks> + public static void Main(string[] args) + { + try + { + System.Environment.ExitCode = 1; + + publishPath = ConfigurationSettings.AppSettings["publishPath"]; + if (publishPath == null) + { + Fail("PublishPath option not set."); + return; + } + + if (args.Length < 3) + { + Fail("Usage: ReactOS.CustomRevisionAction action branch revision"); + return; + } + + string action = args[0]; /* bootcd */ + string branch = args[1]; + int revision = Int32.Parse(args[2]); + + System.Environment.ExitCode = Publish(branch, + revision, + System.Environment.CurrentDirectory); + } + catch (Exception ex) + { + Fail(String.Format("Exception: {0}", ex)); + System.Environment.ExitCode = 1; + } + } + } +} _____ Added: trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs --- trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs 2005-11-23 17:25:55 UTC (rev 19490) +++ trunk/cis/ReactOS.CustomRevisionAction/RedirectableProcess.cs 2005-11-23 17:31:28 UTC (rev 19491) @@ -0,0 +1,145 @@ +/* + * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of + * the parent and child process blocking due to a race condition. This class handles the + * problem. + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/h tml/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtop ic.asp + */ +using System; +using System.IO; +using System.Threading; +using System.Diagnostics; + +namespace ReactOS.CustomRevisionAction +{ + /// <summary> + /// Process that redirects standard output and standard error streams. + /// </summary> + public class RedirectableProcess + { + /// <summary> + /// Process. + /// </summary> + private Process process; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + private string processError; + + /// <summary> + /// Redirected standard output stream. + /// </summary> + private string processOutput; + + /// <summary> + /// Exit code. + /// </summary> + private int exitCode; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + public string ProcessError + { + get + { + return processError; + } + } + + /// <summary> + /// Redirected standard output stream. + /// </summary> + public string ProcessOutput + { + get + { + return processOutput; + } + } + + /// <summary> + /// Exit code. + /// </summary> + public int ExitCode + { + get + { + return exitCode; + } + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo) + { + Run(processStartInfo, null); + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo, string input) + { + Run(processStartInfo, input); + } + + private void Run(ProcessStartInfo processStartInfo, string input) + { + process = new Process(); + process.StartInfo = processStartInfo; + process.Start(); + if (processStartInfo.RedirectStandardInput && input != null) + { + process.StandardInput.AutoFlush = true; + process.StandardInput.WriteLine(input); + } + Thread readStandardError = null; + if (processStartInfo.RedirectStandardError) + { + readStandardError = new Thread(new ThreadStart(ReadStandardError)); + readStandardError.Start(); + } + Thread readStandardOutput = null; + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput)); + readStandardOutput.Start(); + } + if (processStartInfo.RedirectStandardError) + { + readStandardError.Join(); + } + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput.Join(); + } + process.WaitForExit(); + exitCode = process.ExitCode; + process = null; + } + + /// <summary> + /// Read standard error thread entry-point. + /// </summary> + private void ReadStandardError() + { + if (process != null) + { + processError = process.StandardError.ReadToEnd(); + } + } + + /// <summary> + /// Read standard output thread entry-point. + /// </summary> + private void ReadStandardOutput() + { + if (process != null) + { + processOutput = process.StandardOutput.ReadToEnd(); + } + } + } +}

1 0

[chorns] 19490: ReactOS Sin Verifier
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

ReactOS Sin Verifier Added: trunk/cis/ReactOS.Verify/ Added: trunk/cis/ReactOS.Verify/App.config Added: trunk/cis/ReactOS.Verify/AssemblyInfo.cs Added: trunk/cis/ReactOS.Verify/Default.build Added: trunk/cis/ReactOS.Verify/Main.cs Added: trunk/cis/ReactOS.Verify/RedirectableProcess.cs _____ Added: trunk/cis/ReactOS.Verify/App.config --- trunk/cis/ReactOS.Verify/App.config 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/App.config 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8" ?> +<configuration> + <appSettings> + <add key="smtpServer" value="localhost" /> + <add key="errorEmail" value="mailbox@somewhere-on-the-net" /> + <add key="makeParameters" value="" /> + <add key="fastDisk" value="" /> + </appSettings> +</configuration> _____ Added: trunk/cis/ReactOS.Verify/AssemblyInfo.cs --- trunk/cis/ReactOS.Verify/AssemblyInfo.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/AssemblyInfo.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,14 @@ +using System.Reflection; +using System.Runtime.CompilerServices; + +[assembly: AssemblyTitle("ReactOS Sin Verifier")] +[assembly: AssemblyDescription("ReactOS Sin Verifier")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("ReactOS Project")] +[assembly: AssemblyProduct("React Operating System")] +[assembly: AssemblyCopyright("Copyright 2005 ReactOS Project")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyDelaySign(false)] +[assembly: AssemblyKeyFile("")] _____ Added: trunk/cis/ReactOS.Verify/Default.build --- trunk/cis/ReactOS.Verify/Default.build 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/Default.build 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,20 @@ +<?xml version="1.0"?> +<project name="ReactOS.Verify" default="build"> + + <property name="output.dir" value="bin" /> + + <target name="build" description="Build component"> + <mkdir dir="${output.dir}" /> + <csc target="exe" + output="${output.dir}\ReactOS.Verify.exe" + optimize="true" + debug="true" + doc="${output.dir}\ReactOS.Verify.xml" + warninglevel="0"> + <sources> + <include name="*.cs" /> + </sources> + </csc> + </target> + +</project> _____ Added: trunk/cis/ReactOS.Verify/Main.cs --- trunk/cis/ReactOS.Verify/Main.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/Main.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,279 @@ +using System; +using System.IO; +using System.Diagnostics; +using System.Configuration; +using System.Web.Mail; +using System.Collections; +using System.Collections.Specialized; + +namespace ReactOS.Verify +{ + public class MainClass + { + /// <summary> + /// Run the application. + /// </summary> + /// <param name="script">Script to run.</param> + /// <param name="args">Arguments to pass to script.</param> + /// <param name="workingDirectory">Working directory.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns> + /// Exit code. + /// </returns> + private static int RunScript(string script, + string args, + string workingDirectory, + StringDictionary environmentVarables, + out string standardOutput, + out string standardError) + { + ProcessStartInfo scriptProcessStartInfo = new ProcessStartInfo(script, + args); + scriptProcessStartInfo.CreateNoWindow = true; + /* + * All standard streams must be redirected. + * Otherwise DuplicateHandle() will fail. + */ + scriptProcessStartInfo.RedirectStandardInput = true; + scriptProcessStartInfo.RedirectStandardError = true; + scriptProcessStartInfo.RedirectStandardOutput = true; + scriptProcessStartInfo.UseShellExecute = false; + scriptProcessStartInfo.WorkingDirectory = workingDirectory; + if (environmentVarables != null) + { + foreach (DictionaryEntry de in environmentVarables) + scriptProcessStartInfo.EnvironmentVariables.Add(de.Key as string, de.Value as string); + } + RedirectableProcess redirectableProcess = new RedirectableProcess(scriptProcessStartInfo); + standardOutput = redirectableProcess.ProcessOutput; + standardError = redirectableProcess.ProcessError; + return redirectableProcess.ExitCode; + } + + /// <summary> + /// Retrieve value of configuration from configuration file. + /// </summary> + /// <param name="name">Name of configuration option.</param> + /// <param name="defaultValue"> + /// Default value to be returned if the option does not exist. + /// </param> + /// <returns> + /// Value of configuration option or null if the option does not + /// exist and no default value is provided. + /// </returns> + private static string GetConfigurationOption(string name, + string defaultValue) + { + if (ConfigurationSettings.AppSettings[name] != null) + { + string s = ConfigurationSettings.AppSettings[name].Trim(); + return s.Equals(String.Empty) ? defaultValue : s; + } + else + return defaultValue; + } + + /// <summary> + /// Send an email. + /// </summary> + /// <param name="subject">Subject of the email.</param> + /// <param name="body">Content of the email.</param> + private static void SendErrorMail(string subject, string body) + { + try + { + string smtpServer = GetConfigurationOption("smtpServer", "localhost"); + string email = GetConfigurationOption("errorEmail", null); + if (email == null) + return; + MailMessage mm = new MailMessage(); + mm.Priority = MailPriority.Normal; + mm.From = email; + mm.To = email; + mm.Subject = subject; + mm.Body += body; + mm.Body += "<br>"; + mm.BodyFormat = MailFormat.Html; + SmtpMail.SmtpServer = smtpServer; + SmtpMail.Send(mm); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.Message); + } + } + + /// <summary> + /// Fail with an error message. + /// </summary> + /// <param name="text">Error message.</param> + private static void Fail(string text) + { + Console.WriteLine(text); + } + + /// <summary> + /// Paths to fast disk for temporary files. + /// </summary> + private static string TemporaryFastDisk + { + get + { + string temporaryFastDisk = GetConfigurationOption("temporaryFastDisk", null); + if (temporaryFastDisk == null || temporaryFastDisk.Trim().Equals(String.Empty)) + return null; + return temporaryFastDisk.Trim(); + } + } + + /// <summary> + /// Paths to fast disk for intermediate files. + /// </summary> + private static string IntermediateFastDisk + { + get + { + string intermediateFastDisk = GetConfigurationOption("intermediateFastDisk", null); + if (intermediateFastDisk == null || intermediateFastDisk.Trim().Equals(String.Empty)) + return null; + return intermediateFastDisk.Trim(); + } + } + + /// <summary> + /// Paths to fast disk for output files. + /// </summary> + private static string OutputFastDisk + { + get + { + string outputFastDisk = GetConfigurationOption("outputFastDisk", null); + if (outputFastDisk == null || outputFastDisk.Trim().Equals(String.Empty)) + return null; + return outputFastDisk.Trim(); + } + } + + /// <summary> + /// Return collection of environment variables. + /// </summary> + /// <returns>Collection of environment variables or null if there is none.</returns> + private static StringDictionary GetEnvironmentVarables() + { + StringDictionary environmentVarables = new StringDictionary(); + if (TemporaryFastDisk != null) + environmentVarables.Add("ROS_TEMPORARY", TemporaryFastDisk); + if (IntermediateFastDisk != null) + environmentVarables.Add("ROS_INTERMEDIATE", IntermediateFastDisk); + if (OutputFastDisk != null) + environmentVarables.Add("ROS_OUTPUT", OutputFastDisk); + return environmentVarables; + } + + /// <summary> + /// Run make. + /// </summary> + /// <param name="arguments">Arguments.</param> + /// <param name="standardOutput">Receives standard output.</param> + /// <param name="standardError">Receives standard error.</param> + /// <returns>Make exit code.</returns> + private static int RunMake(string arguments, + out string standardOutput, + out string standardError) + { + string make = "mingw32-make"; + string makeParameters = GetConfigurationOption("makeParameters", ""); + string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory, + "reactos"); + return RunScript(make, + makeParameters + " " + arguments, + reactosDirectory, + GetEnvironmentVarables(), + out standardOutput, + out standardError); + } + + /// <summary> + /// Verify a revision of ReactOS by building it all. + /// </summary> + private static int VerifyFull() + { + string standardOutput; + string standardError; + int exitCode = RunMake("bootcd", + out standardOutput, + out standardError); + if (exitCode != 0) + { + Fail(String.Format("make bootcd failed: (error: {0}) {1}", + standardError, + standardOutput)); + return exitCode; + } + + string reactosDirectory = Path.Combine(System.Environment.CurrentDirectory, + "reactos"); + string isoFilename = Path.Combine(reactosDirectory, + "ReactOS.iso"); + if (!File.Exists(isoFilename)) + Fail("make bootcd produced no ReactOS.iso"); + + return exitCode; + } + + /// <summary> + /// Verify a revision of ReactOS by building parts. + /// </summary> + /// <param name="components">Comma separated list of components to build.</param> + private static int VerifyPartial(string components) + { + string standardOutput; + string standardError; + string componentParameters = "\"" + components.Replace(",", "\" \"") + "\""; + int exitCode = RunMake(componentParameters, + out standardOutput, + out standardError); + if (exitCode != 0) + Fail(String.Format("make failed for targets {0}: (error: {1}) {2}", + componentParameters, + standardError, + standardOutput)); + return exitCode; + } + + /// <summary> + /// Verify a revision of ReactOS. + /// </summary> + /// <param name="args">Arguments from command line.</param> + private static int Verify(string[] args) + { + if (args.Length > 0) + return VerifyPartial(args[0]); + else + return VerifyFull(); + } + + /// <summary> + /// Program entry point. + /// </summary> + /// <param name="args">Arguments from command line.</param> + /// <remarks> + /// If exit code is 0, then the commit was processed successfully. + /// If exit code is 1, then the commit was not processed successfully. + /// </remarks> + public static void Main(string[] args) + { + try + { + System.Environment.ExitCode = Verify(args); + } + catch (Exception ex) + { + string text = String.Format("Exception: {0}", ex); + SendErrorMail("ReactOS Verify Error", text); + System.Environment.ExitCode = 1; + } + } + } +} _____ Added: trunk/cis/ReactOS.Verify/RedirectableProcess.cs --- trunk/cis/ReactOS.Verify/RedirectableProcess.cs 2005-11-23 16:57:00 UTC (rev 19489) +++ trunk/cis/ReactOS.Verify/RedirectableProcess.cs 2005-11-23 17:25:55 UTC (rev 19490) @@ -0,0 +1,145 @@ +/* + * When using the ProcessStartInfo.RedirectStandardXxx properties there is a chance of + * the parent and child process blocking due to a race condition. This class handles the + * problem. + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/h tml/frlrfsystemdiagnosticsprocessstartinfoclassredirectstandardoutputtop ic.asp + */ +using System; +using System.IO; +using System.Threading; +using System.Diagnostics; + +namespace ReactOS.Verify +{ + /// <summary> + /// Process that redirects standard output and standard error streams. + /// </summary> + public class RedirectableProcess + { + /// <summary> + /// Process. + /// </summary> + private Process process; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + private string processError; + + /// <summary> + /// Redirected standard output stream. + /// </summary> + private string processOutput; + + /// <summary> + /// Exit code. + /// </summary> + private int exitCode; + + /// <summary> + /// Redirected standard error stream. + /// </summary> + public string ProcessError + { + get + { + return processError; + } + } + + /// <summary> + /// Redirected standard output stream. + /// </summary> + public string ProcessOutput + { + get + { + return processOutput; + } + } + + /// <summary> + /// Exit code. + /// </summary> + public int ExitCode + { + get + { + return exitCode; + } + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo) + { + Run(processStartInfo, null); + } + + /// <summary> + /// Run an excutable and redirect standard error and/or standard output safely. + /// </summary> + public RedirectableProcess(ProcessStartInfo processStartInfo, string input) + { + Run(processStartInfo, input); + } + + private void Run(ProcessStartInfo processStartInfo, string input) + { + process = new Process(); + process.StartInfo = processStartInfo; + process.Start(); + if (processStartInfo.RedirectStandardInput && input != null) + { + process.StandardInput.AutoFlush = true; + process.StandardInput.WriteLine(input); + } + Thread readStandardError = null; + if (processStartInfo.RedirectStandardError) + { + readStandardError = new Thread(new ThreadStart(ReadStandardError)); + readStandardError.Start(); + } + Thread readStandardOutput = null; + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput = new Thread(new ThreadStart(ReadStandardOutput)); + readStandardOutput.Start(); + } + if (processStartInfo.RedirectStandardError) + { + readStandardError.Join(); + } + if (processStartInfo.RedirectStandardOutput) + { + readStandardOutput.Join(); + } + process.WaitForExit(); + exitCode = process.ExitCode; + process = null; + } + + /// <summary> + /// Read standard error thread entry-point. + /// </summary> + private void ReadStandardError() + { + if (process != null) + { + processError = process.StandardError.ReadToEnd(); + } + } + + /// <summary> + /// Read standard output thread entry-point. + /// </summary> + private void ReadStandardOutput() + { + if (process != null) + { + processOutput = process.StandardOutput.ReadToEnd(); + } + } + } +}

1 0

[sedwards] 19489: really remove the offending header this time
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

really remove the offending header this time Modified: trunk/reactos/apps/utils/net/tracert/tracert.c _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 15:52:21 UTC (rev 19488) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 16:57:00 UTC (rev 19489) @@ -28,7 +28,6 @@ */ -//#include <windows.h> #include <winsock2.h> #include <tchar.h> #include <stdio.h>

1 0

[fireball] 19488: Translation by unC0Rr (slightly amended by me).
by fireball＠svn.reactos.com 23 Nov '05

23 Nov '05

Translation by unC0Rr (slightly amended by me). Modified: trunk/reactos/lib/aclui/aclui.rc Added: trunk/reactos/lib/aclui/aclui_Ru.rc _____ Modified: trunk/reactos/lib/aclui/aclui.rc --- trunk/reactos/lib/aclui/aclui.rc 2005-11-23 15:16:18 UTC (rev 19487) +++ trunk/reactos/lib/aclui/aclui.rc 2005-11-23 15:52:21 UTC (rev 19488) @@ -16,3 +16,4 @@ #include "aclui_Sv.rc" #include "aclui_Es.rc" #include "aclui_Pl.rc" +#include "aclui_Ru.rc" _____ Added: trunk/reactos/lib/aclui/aclui_Ru.rc --- trunk/reactos/lib/aclui/aclui_Ru.rc 2005-11-23 15:16:18 UTC (rev 19487) +++ trunk/reactos/lib/aclui/aclui_Ru.rc 2005-11-23 15:52:21 UTC (rev 19488) @@ -0,0 +1,28 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_SECPAGE DIALOGEX 0, 0, 227, 215 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE | WS_CAPTION +CAPTION "?Õþ¯´Ó±Ý¯±?³" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "&?ý Ò¾´´¹ ÞÙÞ ´¯Ù³þ¯ÔÓ?ÕÙ :", -1, 7, 7, 105, 8 + CONTROL "", IDC_PRINCIPALS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 7, 17, 213, 66, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE + PUSHBUTTON "?¯&ßÓÔÞ?³...", IDC_ADD_PRINCIPAL, 116, 87, 50, 14 + PUSHBUTTON "&ËõÓÙÞ?³", IDC_REMOVE_PRINCIPAL, 170, 87, 50, 14 + LTEXT "", IDC_LABEL_PERMISSIONS_FOR, 7, 107, 105, 8, SS_LEFT | SS_NOPREFIX + LTEXT "ðÓþÕ°Þ?³", IDC_LABEL_ALLOW, 130, 107, 40, 8, SS_CENTER + LTEXT "ÃÓ´Õ?Þ?³", IDC_LABEL_DENY, 176, 107, 40, 8, SS_CENTER + CONTROL "", IDC_ACE_CHECKLIST, "CHECKLIST_ACLUI", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 117, 213, 72, WS_EX_CLIENTEDGE + LTEXT "Î?¯ß¹ þÓõÓ?³ ¯±¯ß¹Õ ÓþÕ°ÕÝÞ ÞÙÞ ´ÓÓýÕ?¹, ÝÓµýÞ?Õ ²?¾ ÛÝ¯´Û¾:", IDC_LABEL_ADVANCED, 7, 194, 153, 16, SS_LEFT + PUSHBUTTON "?¯&´¯ÙÝÞ?ÕÙ³Ý¯", IDC_ADVANCED, 160, 194, 60, 14 +END + +STRINGTABLE DISCARDABLE +{ + IDS_PSP_TITLE "ðÓþÕ°ÕÝÞ õÙ %1" + IDS_UNKNOWN "?ÕÞþÔÕ±?Ý¹Ú" + IDS_SPECIAL_PERMISSIONS "?±¯ß¹Õ ÓþÕ°ÕÝÞ " + IDS_PERMISSIONS_FOR "ðÓþÕ°ÕÝÞ õÙ %1" + IDS_PERMISSIONS "ðÓþÕ°ÕÝÞ " +} + Property changes on: trunk/reactos/lib/aclui/aclui_Ru.rc ___________________________________________________________________ Name: svn:eol-style + native

1 0

[chorns] 19487: Fix building rbuild tests
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

Fix building rbuild tests Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp _____ Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp --- trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void CDFileTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/cdfile.xml" ); - Project project( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 3, project.cdfiles.size () ); CDFile& cdfile1 = *project.cdfiles[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/compilationunittest.cpp --- trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/compilationunittest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void CompilationUnitTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/compilationunit.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/data/compilationunit.xml --- trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/data/compilationunit.xml 2005-11-23 15:16:18 UTC (rev 19487) @@ -2,7 +2,7 @@ <project name="Project" makefile="Makefile"> <directory name="dir1"> <module name="module1" type="buildtool"> - <compilationunit> + <compilationunit name="module1_unit.c"> <file>file1.c</file> <file>file2.c</file> </compilationunit> _____ Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp --- trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void DefineTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/define.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.non_if_data.defines.size()); Define& define1 = *project.non_if_data.defines[0]; ARE_EQUAL("define1", define1.name); _____ Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp --- trunk/reactos/tools/rbuild/tests/iftest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/iftest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -60,7 +60,8 @@ IfTest::Run () { string projectFilename ( RBUILD_BASE "tests/data/if.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); TestProjectIf ( project ); TestModuleIf ( project ); _____ Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp --- trunk/reactos/tools/rbuild/tests/includetest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/includetest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void IncludeTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/include.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.non_if_data.includes.size()); Include& include1 = *project.non_if_data.includes[0]; ARE_EQUAL("include1", include1.directory); _____ Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp --- trunk/reactos/tools/rbuild/tests/invoketest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/invoketest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void InvokeTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/invoke.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.modules.size()); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp --- trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void LinkerFlagTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/linkerflag.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(1, project.linkerFlags.size()); LinkerFlag& linkerFlag1 = *project.linkerFlags[0]; ARE_EQUAL("-lgcc1", linkerFlag1.flag); _____ Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp --- trunk/reactos/tools/rbuild/tests/moduletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/moduletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void ModuleTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/module.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(2, project.modules.size()); Module& module1 = *project.modules[0]; _____ Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp --- trunk/reactos/tools/rbuild/tests/projecttest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/projecttest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,6 +22,7 @@ void ProjectTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/project.xml" ); - Project project( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL(2, project.modules.size()); } _____ Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp --- trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -51,7 +51,9 @@ void SourceFileTest::IncludeTest () { - const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml" ); + const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency_include.xml"; + Configuration configuration; + Project project ( configuration, projectFilename ); AutomaticDependency automaticDependency ( project ); automaticDependency.ParseFiles (); ARE_EQUAL( 4, automaticDependency.sourcefile_map.size () ); @@ -64,7 +66,9 @@ void SourceFileTest::FullParseTest () { - const Project project ( RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml" ); + const string projectFilename = RBUILD_BASE "tests" SSEP "data" SSEP "automaticdependency.xml"; + Configuration configuration; + Project project ( configuration, projectFilename ); AutomaticDependency automaticDependency ( project ); automaticDependency.ParseFiles (); ARE_EQUAL( 5, automaticDependency.sourcefile_map.size () ); _____ Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp --- trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-11-23 15:05:53 UTC (rev 19486) +++ trunk/reactos/tools/rbuild/tests/symboltest.cpp 2005-11-23 15:16:18 UTC (rev 19487) @@ -22,7 +22,8 @@ void SymbolTest::Run() { string projectFilename ( RBUILD_BASE "tests/data/symbol.xml" ); - Project project ( projectFilename ); + Configuration configuration; + Project project ( configuration, projectFilename ); ARE_EQUAL ( 1, project.modules.size () ); Module& module1 = *project.modules[0];

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