Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 40691: - We don't need these debug prints anymore
by cgutman＠svn.reactos.org 25 Apr '09

25 Apr '09

Author: cgutman Date: Sat Apr 25 07:47:30 2009 New Revision: 40691 URL: http://svn.reactos.org/svn/reactos?rev=40691&view=rev Log: - We don't need these debug prints anymore Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Apr 25 07:47:30 2009 @@ -1608,10 +1608,6 @@ return NdisStatus; } - - NDIS_DbgPrint(MIN_TRACE, ("Current lookahead is %ld\n", Adapter->NdisMiniportBlock.CurrentLookahead)); - NDIS_DbgPrint(MIN_TRACE, ("Maximum lookahead is %ld\n", Adapter->NdisMiniportBlock.MaximumLookahead)); - NdisStatus = MiniQueryInformation(Adapter, OID_GEN_MAXIMUM_SEND_PACKETS, sizeof(ULONG), &Adapter->NdisMiniportBlock.MaxSendPackets, &BytesWritten);

1 0

[dgorbachev] 40690: Romanian translation of ReactOS Calc by Petru Dimitriu (petrimetri *at* gmail *dot* com). Bug #4413.
by dgorbachev＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: dgorbachev Date: Sat Apr 25 03:47:00 2009 New Revision: 40690 URL: http://svn.reactos.org/svn/reactos?rev=40690&view=rev Log: Romanian translation of ReactOS Calc by Petru Dimitriu (petrimetri *at* gmail *dot* com). Bug #4413. Added: trunk/reactos/base/applications/calc/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc Added: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Sat Apr 25 03:47:00 2009 @@ -1,0 +1,735 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Calculatorul ReactOS" +MENU IDR_MENU_SCIENTIFIC_1 +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + GROUPBOX "",IDC_STATIC,4,16,132,21 + CONTROL "Hex",IDC_RADIO_HEX,"Button",BS_AUTORADIOBUTTON,8,24,29,10 + CONTROL "Dec",IDC_RADIO_DEC,"Button",BS_AUTORADIOBUTTON,40,24,29,10 + CONTROL "Oct",IDC_RADIO_OCT,"Button",BS_AUTORADIOBUTTON,72,24,27,10 + CONTROL "Bin",IDC_RADIO_BIN,"Button",BS_AUTORADIOBUTTON,100,24,26,10 + GROUPBOX "",IDC_STATIC,4,36,76,21 + CONTROL "Inv",IDC_CHECK_INV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,8,44,26,10 + CONTROL "Hyp",IDC_CHECK_HYP,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,40,44,29,10 + CTEXT "",IDC_TEXT_PARENT,84,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CTEXT "",IDC_TEXT_MEMORY,112,40,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "Sta",IDC_BUTTON_STA,4,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ave",IDC_BUTTON_AVE,4,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sum",IDC_BUTTON_SUM,4,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "s",IDC_BUTTON_S,4,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Dat",IDC_BUTTON_DAT,4,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | WS_DISABLED | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F-E",IDC_BUTTON_FE,38,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "dms",IDC_BUTTON_DMS,38,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "sin",IDC_BUTTON_SIN,38,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "cos",IDC_BUTTON_COS,38,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "tan",IDC_BUTTON_TAN,38,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "(",IDC_BUTTON_LEFTPAR,64,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Exp",IDC_BUTTON_EXP,64,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^y",IDC_BUTTON_XeY,64,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^2",IDC_BUTTON_Xe2,64,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "x^3",IDC_BUTTON_Xe3,64,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ")",IDC_BUTTON_RIGHTPAR,90,64,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "ln",IDC_BUTTON_LN,90,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "log",IDC_BUTTON_LOG,90,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "n!",IDC_BUTTON_NF,90,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,90,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MC",IDC_BUTTON_MC,124,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,124,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,124,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,124,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "pi",IDC_BUTTON_PI,124,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "7",IDC_BUTTON_7,158,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,158,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,158,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,158,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "A",IDC_BUTTON_A,158,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,184,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,184,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,184,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,184,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "B",IDC_BUTTON_B,184,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,210,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,210,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,210,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,210,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "C",IDC_BUTTON_C,210,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,236,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,236,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,236,102,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,236,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "D",IDC_BUTTON_D,236,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Mod",IDC_BUTTON_MOD,262,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Sau",IDC_BUTTON_OR,262,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Lsh",IDC_BUTTON_LSH,262,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,262,121,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "E",IDC_BUTTON_E,262,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Åi",IDC_BUTTON_AND,288,64,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Xor",IDC_BUTTON_XOR,288,83,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Not",IDC_BUTTON_NOT,288,102,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Int",IDC_BUTTON_INT,288,121,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "F",IDC_BUTTON_F,288,140,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + GROUPBOX "",IDC_STATIC,140,16,172,21 + CONTROL "Qword",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "Dword",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "Word",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "Octet",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "Grade",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "Radiani",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "Gradiani",IDC_RADIO_GRAD,"Button",BS_AUTORADIOBUTTON, + 236,24,44,10 + PUSHBUTTON "C",IDC_BUTTON_CANC,272,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,228,40,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ãnapoi",IDC_BUTTON_BACK,184,40,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,308,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_STANDARD DIALOGEX 0, 0, 172, 127 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Calculatorul ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg", 0, 0, 0x1 +BEGIN + PUSHBUTTON "C",IDC_BUTTON_CANC,128,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "CE",IDC_BUTTON_CE,84,24,40,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Ãnapoi",IDC_BUTTON_BACK,40,24,40,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + RTEXT "",IDC_TEXT_OUTPUT,4,4,164,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "7",IDC_BUTTON_7,40,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "4",IDC_BUTTON_4,40,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1",IDC_BUTTON_1,40,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "0",IDC_BUTTON_0,40,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "8",IDC_BUTTON_8,66,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "5",IDC_BUTTON_5,66,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "2",IDC_BUTTON_2,66,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+/-",IDC_BUTTON_SIGN,66,105,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "9",IDC_BUTTON_9,92,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "6",IDC_BUTTON_6,92,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "3",IDC_BUTTON_3,92,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON ",",IDC_BUTTON_DOT,92,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "/",IDC_BUTTON_DIV,118,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "*",IDC_BUTTON_MULT,118,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "-",IDC_BUTTON_SUB,118,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "+",IDC_BUTTON_ADD,118,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "Radical",IDC_BUTTON_SQRT,144,48,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "%",IDC_BUTTON_PERCENT,144,67,24,17,BS_CENTER | + BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "1/x",IDC_BUTTON_RX,144,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "=",IDC_BUTTON_EQU,144,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + CTEXT "",IDC_TEXT_MEMORY,4,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + PUSHBUTTON "MC",IDC_BUTTON_MC,4,48,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MR",IDC_BUTTON_MR,4,67,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "MS",IDC_BUTTON_MS,4,86,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + PUSHBUTTON "M+",IDC_BUTTON_MP,4,105,24,17,BS_CENTER | BS_VCENTER | + BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5, NOT WS_VISIBLE +END + +IDD_DIALOG_CONVERSION DIALOGEX 0, 0, 320, 130 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Calculatorul ReactOS" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "Conversie",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Categorie:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Conversie din:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "Conversie in:",IDC_STATIC,4,76,56,8 + CONTROL "C",IDC_BUTTON_CANC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,276,24,40,17 + CONTROL "CE",IDC_BUTTON_CE,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,232,24,40,17 + CONTROL "Ãnapoi",IDC_BUTTON_BACK,"Button",BS_OWNERDRAW | + BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,24, + 40,17 + RTEXT "",IDC_TEXT_OUTPUT,4,4,312,12,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "7",IDC_BUTTON_7,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,48,24,17 + CONTROL "4",IDC_BUTTON_4,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,67,24,17 + CONTROL "1",IDC_BUTTON_1,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,86,24,17 + CONTROL "0",IDC_BUTTON_0,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,188,105,24,17 + CONTROL "8",IDC_BUTTON_8,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,48,24,17 + CONTROL "5",IDC_BUTTON_5,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,67,24,17 + CONTROL "2",IDC_BUTTON_2,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,86,24,17 + CONTROL "+/-",IDC_BUTTON_SIGN,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,214,105,24,17 + CONTROL "9",IDC_BUTTON_9,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,48,24,17 + CONTROL "6",IDC_BUTTON_6,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,67,24,17 + CONTROL "3",IDC_BUTTON_3,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,86,24,17 + CONTROL ",",IDC_BUTTON_DOT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,240,105,24,17 + CONTROL "/",IDC_BUTTON_DIV,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,48,24,17 + CONTROL "*",IDC_BUTTON_MULT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,67,24,17 + CONTROL "-",IDC_BUTTON_SUB,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,86,24,17 + CONTROL "+",IDC_BUTTON_ADD,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,266,105,24,17 + CONTROL "Radical",IDC_BUTTON_SQRT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,48,24,17 + CONTROL "%",IDC_BUTTON_PERCENT,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,67,24,17 + CONTROL "1/x",IDC_BUTTON_RX,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,86,24,17 + CONTROL "=",IDC_BUTTON_EQU,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,292,105,24,17 + CTEXT "",IDC_TEXT_MEMORY,152,24,24,17,SS_CENTERIMAGE, + WS_EX_CLIENTEDGE + CONTROL "MC",IDC_BUTTON_MC,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,48,24,17 + CONTROL "MR",IDC_BUTTON_MR,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,67,24,17 + CONTROL "MS",IDC_BUTTON_MS,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,86,24,17 + CONTROL "M+",IDC_BUTTON_MP,"Button",BS_OWNERDRAW | BS_CENTER | + BS_VCENTER | BS_NOTIFY | WS_TABSTOP,152,105,24,17 + DEFPUSHBUTTON "",IDC_BUTTON_FOCUS,0,0,5,5,NOT WS_VISIBLE +END + +IDD_DIALOG_ABOUT DIALOGEX DISCARDABLE 0, 0, 264, 169 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Calc" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,105,148,52,16 + CONTROL IDB_BITMAP_ROS,IDC_STATIC,"Static",SS_BITMAP | SS_CENTERIMAGE | + SS_REALSIZEIMAGE | WS_BORDER,4,4,104,48 + LTEXT "Calculatorul ReactOS",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "Versiune ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "Scris de Carlo Bramini",IDC_STATIC,120,32,132,8, + SS_CENTERIMAGE + GROUPBOX "",IDC_STATIC,112,0,148,52 + GROUPBOX "",IDC_STATIC,4,56,256,88 + EDITTEXT IDC_EDIT_LICENSE,12,68,240,68,ES_MULTILINE | ES_READONLY | + WS_VSCROLL +END + +IDD_DIALOG_STAT DIALOGEX DISCARDABLE 0, 0, 163, 85 +STYLE DS_SHELLFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Statistics box" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "RET",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "LOAD",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "CD",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "CAD",IDC_BUTTON_CAD,124,48,36,16 + CTEXT "n=0",IDC_TEXT_NITEMS,4,68,156,12,SS_CENTERIMAGE | + SS_SUNKEN +END + +// Menus + +IDR_MENU_SCIENTIFIC_1 MENU DISCARDABLE +BEGIN + POPUP "Editare" + BEGIN + MENUITEM "Copiere\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Lipire\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vizualizare" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ÅtiinÅ£ific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversie", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Zecimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binar\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Grade\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "Radiani\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "Gradiani\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "Grupare cifre", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ajutor" + BEGIN + MENUITEM "Topici de ajutor", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Despre Calculatorul ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "Editare" + BEGIN + MENUITEM "Copiere\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Lipire\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vizualizare" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ÅtiinÅ£ific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversie", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "Zecimal\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "Octal\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "Binar\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "Qword\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "Dword\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "Word\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "Octet\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "Grupare cifre", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ajutor" + BEGIN + MENUITEM "Topici de ajutor", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Despre Calculatorul ReactOS", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "Editare" + BEGIN + MENUITEM "Copy\tCTRL-C", IDM_EDIT_COPY + MENUITEM "Paste\tCTRL-V", IDM_EDIT_PASTE + END + POPUP "Vizualizare" + BEGIN + MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ÅtiinÅ£ific", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "Conversie", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "Grupare cifre", IDM_VIEW_GROUP, CHECKED + END + POPUP "Ajutor" + BEGIN + MENUITEM "Topici de ajutor", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "Despre Calculatorul ReactOS", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS Calc este software liber sub licenÅ£a GNU GPL. \r\n\r\nGÄsiÅ£i o copie a acestei licenÅ£e aici:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nDe asemenea gÄsiÅ£i traduceri ale aceste licenÅ£e aici:\r\nhttp://www.gnu.org/licenses/translations.html\r\nTraducerea Ã®n limba romÃ¢nÄ de Petru Dimitriu." + IDS_MATH_ERROR "Eroare" + IDS_QUICKHELP "Ajutor rapid" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "Unghi" + IDS_CONV_AREA "SuprafaÅ£Ä" + IDS_CONV_CONSUMPTION "Consum (motoare)" + IDS_CONV_CURRENCY "ValutÄ" + IDS_CONV_ENERGY "Energie" + IDS_CONV_LENGTH "Lungimi" + IDS_CONV_POWER "Putere" + IDS_CONV_PRESSURE "Presiune" + IDS_CONV_TEMPERATURE "TemperaturÄ" + IDS_CONV_TIME "Timp" + IDS_CONV_VELOCITY "Velocitate" + IDS_CONV_VOLUME "Volum" + IDS_CONV_WEIGHT "MasÄ" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "Grade" + IDS_ANGLE_GRADIANS "Gradiani" + IDS_ANGLE_RADIANS "Radiani" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "Acri" + IDS_AREA_ACRES_BRAZIL "Acri (Brazilia)" + IDS_AREA_ACRES_FRANCE "Acri (FranÅ£a)" + IDS_AREA_ACRES_SCOTS "Acri (Scots)" + IDS_AREA_ACRES_US "Acri (SUA)" + IDS_AREA_ARES "Ares" + IDS_AREA_CHOU "Chou" + IDS_AREA_DANBO "Danbo" + IDS_AREA_HECTARES "Hectare" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "Morgen (Ungaria)" + IDS_AREA_MU "Mu" + IDS_AREA_PING "Ping" + IDS_AREA_PYEONG "Pyeong" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "Rai" + IDS_AREA_SE "Se" + IDS_AREA_SQUARE_CENTIMETERS "Centimetri pÄtraÅ£i" + IDS_AREA_SQUARE_CHR "Chr pÄtraÅ£i" + IDS_AREA_SQUARE_FATHOMS "Fathomi pÄtraÅ£i" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "Fathomi pÄtraÅ£i (Ungaria)" + IDS_AREA_SQUARE_FEET "Picioare pÄtrate" + IDS_AREA_SQUARE_INCHES "Å¢oli pÄtraÅ£i" + IDS_AREA_SQUARE_KILOMETERS "Kilometri pÄtraÅ£i" + IDS_AREA_SQUARE_LAR "Lar pÄtraÅ£i" + IDS_AREA_SQUARE_METER "Metri pÄtraÅ£i" + IDS_AREA_SQUARE_MILES "Mile pÄtrate" + IDS_AREA_SQUARE_MILLIMETERS "Milimetri pÄtraÅ£i" + IDS_AREA_SQUARE_SHAKU "Shaku pÄtraÅ£i" + IDS_AREA_SQUARE_TSUEN "Tsuen pÄtraÅ£i" + IDS_AREA_SQUARE_VA "Va pÄtraÅ£i" + IDS_AREA_SQUARE_YARD "Yarzi pÄtraÅ£i" + IDS_AREA_TAN "Tan" + IDS_AREA_TSUBO "Tsubo" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "Kilometri/litru" + IDS_CONSUMPTION_L_PER_100_KM "Litri/100 kilometri" + IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (Marea Britanie)" + IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (SUA)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "Åiling autriac" + IDS_CURRENCY_BELGIAN_FRANC "Franc belgian" + IDS_CURRENCY_CYPRIOT_POUND "LirÄ cipriotÄ" + IDS_CURRENCY_CZECH_KORUNA "CoroanÄ cehÄ" + IDS_CURRENCY_DEUTSCHE_MARK "MarcÄ nemÅ£eascÄ" + IDS_CURRENCY_DUTCH_GUILDER "Guilder olandez" + IDS_CURRENCY_EURO "Euro" + IDS_CURRENCY_FINNISH_MARKKA "MarcÄ finlandezÄ" + IDS_CURRENCY_FRENCH_FRANC "Franc framcez" + IDS_CURRENCY_GREEK_DRACHMA "DrahmÄ greceascÄ" + IDS_CURRENCY_IRISH_POUND "LirÄ irlandezÄ" + IDS_CURRENCY_ITALIAN_LIRA "LirÄ italianÄ" + IDS_CURRENCY_LUXEMBOURG_FRANC "Franc luxemburghez" + IDS_CURRENCY_MALTESE_LIRA "LitrÄ maltezÄ" + IDS_CURRENCY_PORTOGUESE_ESCUDO "Escudo portughez" + IDS_CURRENCY_SLOVAK_KORUNA "CoroanÄ slovacÄ" + IDS_CURRENCY_SLOVENIAN_TOLAR "Tolar sloven" + IDS_CURRENCY_SPANISH_PESETA "Peseta spaniolÄ" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "Calorii 15 Â°C" + IDS_ENERGY_BTUS "UnitÄÅ£i termale britanice" + IDS_ENERGY_ERGS "Ergs" + IDS_ENERGY_EVS "Electron-VolÅ£i" + IDS_ENERGY_FOOT_POUNDS "Picioare-LivrÄ" + IDS_ENERGY_IT_CALORIES "Calorii Tabel InternaÅ£ional" + IDS_ENERGY_IT_KILOCALORIES "Kilocalorii Tabel InternaÅ£ional" + IDS_ENERGY_JOULES "Jouli" + IDS_ENERGY_KILOJOULES "KiloJouli" + IDS_ENERGY_KILOWATT_HOURS "Kilowatt ore" + IDS_ENERGY_NUTRITION_CALORIES "Calorii nutriÅ£ie" + IDS_ENERGY_TH_CALORIES "Calorie termochimicÄ" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "ÃngstrÃ¶ms" + IDS_LENGTH_ASTRONOMICAL_UNITS "UnitÄÅ£i astronomice" + IDS_LENGTH_BARLEYCORNS "Barleycorns" + IDS_LENGTH_CENTIMETERS "Centimetri" + IDS_LENGTH_CHAINS_UK "Chains (Marea Britanie)" + IDS_LENGTH_CHI "Chi" + IDS_LENGTH_CHOU "Chou" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "Cun" + IDS_LENGTH_FATHOMS "Fathoms" + IDS_LENGTH_FATHOMS_HUNGARY "Fathoms (Ungaria)" + IDS_LENGTH_FEET "Picioare" + IDS_LENGTH_FURLONGS "Furlongs" + IDS_LENGTH_GAN "Gan" + IDS_LENGTH_HANDS "Hands" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "Incii (Å¢oli)" + IDS_LENGTH_JA "Ja" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "Kilometeri" + IDS_LENGTH_LAR "Lar" + IDS_LENGTH_LIGHT_YEARS "Ani luminÄ" + IDS_LENGTH_LINKS_UK "Links (Marea Britanie)" + IDS_LENGTH_METERS "Metri" + IDS_LENGTH_MICRONS "Microni" + IDS_LENGTH_MILES "Mile" + IDS_LENGTH_MILLIMETERS "Milimetri" + IDS_LENGTH_NAUTICAL_MILES "Mile nautice" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "Ri (Japonia)" + IDS_LENGTH_RI_KOREA "Ri (Corea)" + IDS_LENGTH_RODS "Rods" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "Shaku" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "Sun" + IDS_LENGTH_TSUEN "Tsuen" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "Yards" + IDS_LENGTH_YOTE "Yote" + IDS_LENGTH_ZHANG "Zhang" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "UnitÄÅ£i termice britanice pe minut" + IDS_POWER_FPS_PER_MINUTE "Picior-livre pe minut" + IDS_POWER_HORSEPOWER "Cai putere" + IDS_POWER_KILOWATTS "KilowaÅ£i" + IDS_POWER_MEGAWATTS "MegawaÅ£i" + IDS_POWER_WATTS "WaÅ£i" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "Atmosfere" + IDS_PRESSURE_BARS "Bari" + IDS_PRESSURE_HECTOPASCALS "Hectopascali" + IDS_PRESSURE_KILOPASCALS "Kilopascali" + IDS_PRESSURE_MM_OF_MERCURY "Milimetri coloanÄ de mercur" + IDS_PRESSURE_PASCALS "Pascali" + IDS_PRESSURE_PSI "Livre-forÅ£Ä pe Å£ol pÄtrat" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "Celsius" + IDS_TEMPERATURE_FAHRENHEIT "Fahrenheit" + IDS_TEMPERATURE_KELVIN "Kelvin" + IDS_TEMPERATURE_RANKINE "Rankine" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "Zile" + IDS_TIME_HOURS "Ore" + IDS_TIME_MICROSECONDS "Microsecunde" + IDS_TIME_MILLISECONDS "Milisecunde" + IDS_TIME_MINUTES "Minute" + IDS_TIME_SECONDS "Secunde" + IDS_TIME_WEEKS "SÄptÄmÃ¢ni" + IDS_TIME_YEARS "Ani" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "Centimetri/orÄ" + IDS_VELOCITY_FEET_HOUR "Picioare/orÄ" + IDS_VELOCITY_FEET_SECOND "Picioare/secundÄ" + IDS_VELOCITY_KILOMETERS_HOUR "Kilometri/ore" + IDS_VELOCITY_KNOTS "Nod" + IDS_VELOCITY_MACH "Mach" + IDS_VELOCITY_METERS_SECOND "Metri/secundÄ" + IDS_VELOCITY_MILES_HOUR "Mile/orÄ" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "Barili (Marea Britanie)" + IDS_VOLUME_BARRELS_OIL "Barili de petrol" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "Bushels (Marea Britanie)" + IDS_VOLUME_BUSHELS_US "Bushels (SUA)" + IDS_VOLUME_CUBIC_CENTIMETERS "Centrimetri cubi" + IDS_VOLUME_CUBIC_FEET "Picioare^3" + IDS_VOLUME_CUBIC_INCHES "Å¢oli cubi" + IDS_VOLUME_CUBIC_METERS "Metri cubi" + IDS_VOLUME_CUBIC_YARDS "Yarzi cubi" + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "Fluid ounces (Marea Britanie)" + IDS_VOLUME_FLUID_OUNCES_US "Fluid ounces (SUA)" + IDS_VOLUME_GALLONS_UK "Galoni (Marea Britanie)" + IDS_VOLUME_GALLONS_DRY_US "Galoni, uscat (SUA)" + IDS_VOLUME_GALLONS_LIQUID_US "Galoni, lichid (SUA)" + IDS_VOLUME_GOU "Gou" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "Litri" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "Mililitri" + IDS_VOLUME_PINTS_UK "Pints (Marea Britanie)" + IDS_VOLUME_PINTS_DRY_US "Pints, uscat (SUA)" + IDS_VOLUME_PINTS_LIQUID_US "Pints, lichid (SUA)" + IDS_VOLUME_QUARTS_UK "Quarts (Marea Britanie)" + IDS_VOLUME_QUARTS_DRY_US "Quarts, uscat (SUA)" + IDS_VOLUME_QUARTS_LIQUID_US "Quarts, lichid (SUA)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "To" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "Baht" + IDS_WEIGHT_CARATS "Carate" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "Grame" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "Jin (China)" + IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" + IDS_WEIGHT_KAN "Kan" + IDS_WEIGHT_KILOGRAMS "Kilograme" + IDS_WEIGHT_KIN "Kin" + IDS_WEIGHT_LIANG_CHINA "Liang (China)" + IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" + IDS_WEIGHT_MONME "Monme" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncii, avoirdupois" + IDS_WEIGHT_OUNCES_TROY "Uncii, troy" + IDS_WEIGHT_POUNDS "Livre" + IDS_WEIGHT_QUINTAL_METRIC "Chintale (metric)" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "Stones" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "Tonnes" + IDS_WEIGHT_TONS_UK "Tone (Marea Britanie)" + IDS_WEIGHT_TONS_US "Tone (SUA)" +END + +#pragma code_page(default) Propchange: trunk/reactos/base/applications/calc/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sat Apr 25 03:47:00 2009 @@ -56,6 +56,7 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc"

1 0

[cfinck] 40689: Merge r40600
by cfinck＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: cfinck Date: Sat Apr 25 02:21:48 2009 New Revision: 40689 URL: http://svn.reactos.org/svn/reactos?rev=40689&view=rev Log: Merge r40600 Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-CN.h [iso-8859-1] Sat Apr 25 02:21:48 2009 @@ -3,6 +3,7 @@ MUI_LAYOUTS zhCNLayouts[] = { + { L"0409", L"00000409" }, { L"0804", L"00000804" }, { L"0804", L"E00E0804" }, { L"0804", L"E0010804" }, Modified: branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/base/s… ============================================================================== --- branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/base/setup/usetup/lang/zh-TW.h [iso-8859-1] Sat Apr 25 02:21:48 2009 @@ -3,6 +3,7 @@ MUI_LAYOUTS zhTWLayouts[] = { + { L"0409", L"00000409" }, { L"0404", L"00000404" }, { L"0404", L"E0080404" }, { L"0404", L"E0010404" }, Modified: branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Sat Apr 25 02:21:48 2009 @@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls" Modified: branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_9/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/ros-branch-0_3_9/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Apr 25 02:21:48 2009 @@ -448,6 +448,9 @@ HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0403",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0804",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0c04",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1004",0x00000000,"l_intl.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","1404",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0405",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0406",0x00000000,"l_intl.nls" HKLM,"SYSTEM\CurrentControlSet\Control\NLS\Language","0407",0x00000000,"l_intl.nls"

1 0

[dgorbachev] 40688: Update Norwegian translations (translator: Lars Martin Hambro, bug #2482, bug #4325). This patch was already applied in r40315, but mistakenly reverted in r40564. Sorry.
by dgorbachev＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: dgorbachev Date: Sat Apr 25 02:19:41 2009 New Revision: 40688 URL: http://svn.reactos.org/svn/reactos?rev=40688&view=rev Log: Update Norwegian translations (translator: Lars Martin Hambro, bug #2482, bug #4325). This patch was already applied in r40315, but mistakenly reverted in r40564. Sorry. Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/win32/syssetup/lang/no-NO.rc trunk/reactos/dll/win32/userenv/lang/no-NO.rc Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -55,7 +55,7 @@ WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Fargevalg", IDC_STATIC, 7, 140, 64, 9 COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "&Effekter...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Avansert", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END @@ -100,24 +100,24 @@ IDD_EFFAPPEARANCE DIALOGEX DISCARDABLE 0, 0, 285, 185 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE -CAPTION "Effects" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "&Use the following transition effect for menus and tooltips:",IDC_EFFAPPEARANCE_ANIMATION,"button", +CAPTION "Effekter" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Bruk følgende overgang effekter for menyer og verktøytips:",IDC_EFFAPPEARANCE_ANIMATION,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP - CONTROL "U&se the following method to smooth edges of screen fonts:",IDC_EFFAPPEARANCE_SMOOTHING,"button", + CONTROL "B&ruk følgende metode for kantutjevning av skjerm skifter:",IDC_EFFAPPEARANCE_SMOOTHING,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 42, 285, 19 COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 80, 19 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP | WS_DISABLED - CONTROL "Us&e large icons",IDC_EFFAPPEARANCE_LARGEICONS,"button", + CONTROL "Br&uk store ikoner",IDC_EFFAPPEARANCE_LARGEICONS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 285, 19 - CONTROL "Show sh&adows under menus",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", + CONTROL "Vis sk&ygger under menyer",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 - CONTROL "Show &window contents while dragging",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", + CONTROL "Vis &vindu innholdet ved flytting",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 - CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", + CONTROL "&Skjul visning av understrekning for tastatur hurtigtast til jeg trykker på Alt tasten",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 285, 19 - PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 226, 165, 50, 14 DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 END @@ -134,7 +134,7 @@ CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Mindre",1815,9,137,21,8,NOT WS_GROUP - LTEXT "Mere",1816,93,137,21,8,NOT WS_GROUP + LTEXT "Større",1816,93,137,21,8,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Farger",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -171,7 +171,7 @@ POPUP "" BEGIN MENUITEM "&Attached", ID_MENU_ATTACHED - MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM "&Primær", ID_MENU_PRIMARY MENUITEM SEPARATOR MENUITEM "&Identify", ID_MENU_IDENTIFY MENUITEM "E&genskaper", ID_MENU_PROPERTIES @@ -180,14 +180,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_SLIDEEFFECT "Slide effect" - IDS_FADEEFFECT "Fade effect" -END - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STANDARDEFFECT "Standard" - IDS_CLEARTYPEEFFECT "ClearType" + IDS_SLIDEEFFECT "Slide effekter" + IDS_FADEEFFECT "Fade effekter" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STANDARDEFFECT "Vanlig" + IDS_CLEARTYPEEFFECT "Klartype" END STRINGTABLE @@ -228,8 +228,8 @@ IDS_INACTWIN "Uaktiv vindu" IDS_ACTWIN "Aktiv vindu" IDS_WINTEXT "Vindu tekst" - IDS_MESSBOX "Melding boks" - IDS_MESSTEXT "Melding tekst" + IDS_MESSBOX "Meldingboks" + IDS_MESSTEXT "Meldingtekst" IDS_BUTTEXT "OK" END @@ -244,18 +244,18 @@ IDS_ELEMENT_7 "Valgt enhet" IDS_ELEMENT_8 "Vindu" IDS_ELEMENT_9 "Scrollbars" - IDS_ELEMENT_10 "3D objects" + IDS_ELEMENT_10 "3D objekter" IDS_ELEMENT_11 "Palette title" - IDS_ELEMENT_12 "Symbol title" + IDS_ELEMENT_12 "Tegn tittel" IDS_ELEMENT_13 "Captionbar" - IDS_ELEMENT_14 "Deactivated menu elements" + IDS_ELEMENT_14 "Deaktivert meny elementer" IDS_ELEMENT_15 "Dialog" IDS_ELEMENT_16 "Scrollbar controls" - IDS_ELEMENT_17 "Application background" + IDS_ELEMENT_17 "Program bakgrunn" IDS_ELEMENT_18 "Small captionbar" - IDS_ELEMENT_19 "Symbol distance (horizontal)" - IDS_ELEMENT_20 "Symbol distance (vertical)" - IDS_ELEMENT_21 "Quickinfo" + IDS_ELEMENT_19 "Tegn avstand (horisontalt)" + IDS_ELEMENT_20 "Tegn avstand (vertikalt)" + IDS_ELEMENT_21 "Rask infomasjon" IDS_ELEMENT_22 "Symbol" END Modified: trunk/reactos/dll/win32/syssetup/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/no… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -201,8 +201,8 @@ BEGIN IDS_ACCESSORIES "Tilbehør" IDS_CMT_CALC "Start Kalkulator" - IDS_CMT_CMD "Åpne command prompt" - IDS_CMT_EXPLORER "Start Explorer" + IDS_CMT_CMD "Åpne Kommandolinje" + IDS_CMT_EXPLORER "Start Utforsker" IDS_CMT_NOTEPAD "Start Tekstredigering" IDS_CMT_REGEDIT "Start Registerredigering" IDS_CMT_WORDPAD "Start Dokument redigering" @@ -210,48 +210,48 @@ IDS_CMT_DEVMGMT "Start Enhetsbehandler" IDS_CMT_SERVMAN "Start Tjenestebehandler" IDS_CMT_RDESKTOP "Start Ekstern skrivebord" - IDS_CMT_EVENTVIEW "Launch Event Viewer" - IDS_CMT_MSCONFIG "Launch System Configuration program" -END - -STRINGTABLE -BEGIN - IDS_GAMES "Spill" - IDS_CMT_SOLITAIRE "Kabal" - IDS_CMT_WINEMINE "Minnesveiper" -END - -STRINGTABLE -BEGIN - IDS_SYS_TOOLS "System verktøy" - IDS_CMT_CHARMAP "Tegnkart" - IDS_CMT_KBSWITCH "Endre tastatur valg" - IDS_CMT_DXDIAG "Launch ReactX-Diagnostic program" -END - -STRINGTABLE -BEGIN - IDS_SYS_ACCESSIBILITY "Tilgjengelighet" - IDS_CMT_MAGNIFY "Forstørrelse" -END - -STRINGTABLE -BEGIN - IDS_SYS_ENTERTAINMENT "Entertainment" - IDS_CMT_MPLAY32 "Launch Multimedia Player" - IDS_CMT_SNDVOL32 "Launch Volume Control" -END - -STRINGTABLE -BEGIN - IDS_REACTOS_SETUP "ReactOS installasjon" + IDS_CMT_EVENTVIEW "Start Hendelseliste" + IDS_CMT_MSCONFIG "Start Systemkonfigurasjon" +END + +STRINGTABLE +BEGIN + IDS_GAMES "Spill" + IDS_CMT_SOLITAIRE "Kabal" + IDS_CMT_WINEMINE "Minnesveiper" +END + +STRINGTABLE +BEGIN + IDS_SYS_TOOLS "Systemverktøy" + IDS_CMT_CHARMAP "Tegnkart" + IDS_CMT_KBSWITCH "Endre tastaturvalg" + IDS_CMT_DXDIAG "Kjør ReactX-Diagnose program" +END + +STRINGTABLE +BEGIN + IDS_SYS_ACCESSIBILITY "Tilgjengelighet" + IDS_CMT_MAGNIFY "Forstørrelse" +END + +STRINGTABLE +BEGIN + IDS_SYS_ENTERTAINMENT "Underholdning" + IDS_CMT_MPLAY32 "Start Multimedia avspiller" + IDS_CMT_SNDVOL32 "Start Volumkontroll" +END + +STRINGTABLE +BEGIN + IDS_REACTOS_SETUP "ReactOS installasjon" IDS_UNKNOWN_ERROR "Ukjent feil" IDS_REGISTERING_COMPONENTS "Registrerer komponenter..." - IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: " - IDS_GETPROCADDR_FAILED "GetProcAddr feilet: " + IDS_LOADLIBRARY_FAILED "LoadLibrary feilet: " + IDS_GETPROCADDR_FAILED "GetProcAddr feilet: " IDS_REGSVR_FAILED "DllRegisterServer feilet: " - IDS_DLLINSTALL_FAILED "DllInstall feilet: " - IDS_TIMEOUT "Tidsavbrudd under registrering" + IDS_DLLINSTALL_FAILED "DllInstall feilet: " + IDS_TIMEOUT "Tidsavbrudd under registrering" IDS_REASON_UNKNOWN "" END @@ -282,13 +282,13 @@ STRINGTABLE BEGIN - IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn." - IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet." - IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn navn for datamaskinen." - IDS_WZD_PASSWORDEMPTY "Du må taste et passord!" - IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn på nytt." - IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet." - IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid." + IDS_WZD_NAME "Installasjonen kan ikke fortsette uten ditt navn." + IDS_WZD_SETCOMPUTERNAME "Installasjonen klarte ikke sette datamaskinnavnet." + IDS_WZD_COMPUTERNAME "Installasjonen kan ikke fortsette før du taster inn navn for datamaskinen." + IDS_WZD_PASSWORDEMPTY "Du må taste et passord!" + IDS_WZD_PASSWORDMATCH "Passordene du tastet er ikke like. Vennligst tast inn på nytt." + IDS_WZD_PASSWORDCHAR "Passordet du tastet inneholder ugyldige tegn. Vennligst tast inn et annet." + IDS_WZD_LOCALTIME "Installasjonen klarte ikke å sette lokal tid." END STRINGTABLE Modified: trunk/reactos/dll/win32/userenv/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/userenv/lang/no-NO.rc [iso-8859-1] Sat Apr 25 02:19:41 2009 @@ -23,7 +23,7 @@ STRINGTABLE BEGIN - IDS_PROFILEPATH "%SystemDrive%\\Documents and Settings" + IDS_PROFILEPATH "%SystemDrive%\\Dokumenter og innstillinger" IDS_APPDATA "Programdata" IDS_DESKTOP "Skrivebord" IDS_FAVORITES "Favoritter" @@ -31,21 +31,21 @@ IDS_PROGRAMS "Start-Meny\\Programmer" IDS_ADMINTOOLS "Start-Meny\\Programmer\\Administrative verktøy" IDS_STARTUP "Start-Meny\\Programmer\\Oppstart" - IDS_MYDOCUMENTS "Mine Dokumenter" - IDS_MYPICTURES "Mine Dokumenter\\Mine Bilder" - IDS_MYMUSIC "Mine Dokumenter\\Min Musikk" - IDS_MYVIDEOS "Mine Dokumenter\\Mine Filmer" + IDS_MYDOCUMENTS "Mine dokumenter" + IDS_MYPICTURES "Mine dokumenter\\Mine bilder" + IDS_MYMUSIC "Mine dokumenter\\Min musikk" + IDS_MYVIDEOS "Mine dokumenter\\Mine filmer" IDS_TEMPLATES "Templates" IDS_RECENT "Siste" - IDS_SENDTO "SendTo" + IDS_SENDTO "Send til" IDS_PRINTHOOD "PrintHood" IDS_NETHOOD "NetHood" IDS_LOCALSETTINGS "Lokale innstillinger" IDS_LOCALAPPDATA "Lokale innstillinger\\Programdata" - IDS_TEMP "Lokale innstillinger\\Temp" - IDS_CACHE "Lokale innstillinger\\Temporary Internet Files" + IDS_TEMP "Lokale innstillinger\\Midlertidig" + IDS_CACHE "Lokale innstillinger\\Midlertidig internett filer" IDS_HISTORY "Lokale innstillinger\\Logg" - IDS_COOKIES "Cookies" + IDS_COOKIES "Informasjonkapsel" IDS_PROGRAMFILES "%SystemDrive%\\Programfiler" IDS_COMMONFILES "Common Files" END

1 0

[hpoussin] 40687: WINLDR: Repair LiveCD boot
by hpoussin＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: hpoussin Date: Sat Apr 25 01:48:20 2009 New Revision: 40687 URL: http://svn.reactos.org/svn/reactos?rev=40687&view=rev Log: WINLDR: Repair LiveCD boot Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sat Apr 25 01:48:20 2009 @@ -469,6 +469,14 @@ return; } + /* Special case for LiveCD */ + if (!_strnicmp(FullPath, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, FullPath + strlen("LiveCD")); + MachDiskGetBootPath(FullPath, sizeof(FullPath)); + strcat(FullPath, BootPath); + } + /* Convert FullPath to SystemRoot */ PathSeparator = strstr(FullPath, "\\"); strcpy(SystemRoot, PathSeparator); @@ -479,14 +487,6 @@ { /* Nothing read, make the string empty */ strcpy(BootOptions, ""); - } - - /* Special case for LiveCD */ - if (!_strnicmp(SystemRoot, "LiveCD", strlen("LiveCD"))) - { - strcpy(BootPath, SystemRoot + strlen("LiveCD")); - MachDiskGetBootPath(SystemRoot, sizeof(SystemRoot)); - strcat(SystemRoot, BootPath); } /* Let user know we started loading */

1 0

[hpoussin] 40686: Implement ArcGetTime() and ArcGetRelativeTime()
by hpoussin＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: hpoussin Date: Sat Apr 25 00:35:11 2009 New Revision: 40686 URL: http://svn.reactos.org/svn/reactos?rev=40686&view=rev Log: Implement ArcGetTime() and ArcGetRelativeTime() Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/machine.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c trunk/reactos/include/reactos/arc/arc.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; + MachVtbl.GetTime = PcGetTime; MachVtbl.HwDetect = PcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -1,104 +1,5 @@ -/* $Id: pcrtc.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. - */ +/* No need to duplicate code ; import the i386 version */ -#include <freeldr.h> - -#define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) - -VOID -PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) -{ - REGS Regs; - - if (NULL != Year || NULL != Month || NULL != Day) - { - /* Some BIOSes, such es the 1998/07/25 system ROM - * in the Compaq Deskpro EP/SB, leave CF unchanged - * if successful, so CF should be cleared before - * calling this function. */ - __asm__ ("clc"); - - /* Int 1Ah AH=04h - * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) - * - * AH = 04h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = century (BCD) - * CL = year (BCD) - * DH = month (BCD) - * DL = day (BCD) - * CF set on error - */ - Regs.b.ah = 0x04; - Int386(0x1A, &Regs, &Regs); - - if (NULL != Year) - { - *Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); - } - if (NULL != Month) - { - *Month = BCD_INT(Regs.b.dh); - } - if (NULL != Day) - { - *Day = BCD_INT(Regs.b.dl); - } - } - - if (NULL != Hour || NULL != Minute || NULL != Second) - { - /* Some BIOSes leave CF unchanged if successful, - * so CF should be cleared before calling this function. */ - __asm__ ("clc"); - - /* Int 1Ah AH=02h - * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) - * - * AH = 02h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = hour (BCD) - * CL = minutes (BCD) - * DH = seconds (BCD) - * DL = daylight savings flag (00h standard time, 01h daylight time) - * CF set on error (i.e. clock not running or in middle of update) - */ - Regs.b.ah = 0x02; - Int386(0x1A, &Regs, &Regs); - - if (NULL != Hour) - { - *Hour = BCD_INT(Regs.b.ch); - } - if (NULL != Minute) - { - *Minute = BCD_INT(Regs.b.cl); - } - if (NULL != Second) - { - *Second = BCD_INT(Regs.b.dh); - } - } -} +#include "../i386/pcrtc.c" /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ MachVtbl.DiskGetPartitionEntry = DiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = PcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PcRTCGetCurrentDateTime; + MachVtbl.GetTime = PcGetTime; MachVtbl.HwDetect = PcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -57,7 +57,7 @@ MachVtbl.DiskGetPartitionEntry = XboxDiskGetPartitionEntry; MachVtbl.DiskGetDriveGeometry = XboxDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = XboxDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = XboxRTCGetCurrentDateTime; + MachVtbl.GetTime = XboxGetTime; MachVtbl.HwDetect = XboxHwDetect; /* Set LEDs to orange after init */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -21,84 +21,63 @@ #define BCD_INT(bcd) (((bcd & 0xf0) >> 4) * 10 + (bcd &0x0f)) -VOID -PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) +TIMEINFO* +PcGetTime(VOID) { - REGS Regs; + static TIMEINFO TimeInfo; + REGS Regs; - if (NULL != Year || NULL != Month || NULL != Day) - { - /* Some BIOSes, such es the 1998/07/25 system ROM - * in the Compaq Deskpro EP/SB, leave CF unchanged - * if successful, so CF should be cleared before - * calling this function. */ - __asm__ ("clc"); + /* Some BIOSes, such as the 1998/07/25 system ROM + * in the Compaq Deskpro EP/SB, leave CF unchanged + * if successful, so CF should be cleared before + * calling this function. */ + __asm__ ("clc"); - /* Int 1Ah AH=04h - * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) - * - * AH = 04h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = century (BCD) - * CL = year (BCD) - * DH = month (BCD) - * DL = day (BCD) - * CF set on error - */ - Regs.b.ah = 0x04; - Int386(0x1A, &Regs, &Regs); + /* Int 1Ah AH=04h + * TIME - GET REAL-TIME CLOCK DATE (AT,XT286,PS) + * + * AH = 04h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = century (BCD) + * CL = year (BCD) + * DH = month (BCD) + * DL = day (BCD) + * CF set on error + */ + Regs.b.ah = 0x04; + Int386(0x1A, &Regs, &Regs); - if (NULL != Year) - { - *Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); - } - if (NULL != Month) - { - *Month = BCD_INT(Regs.b.dh); - } - if (NULL != Day) - { - *Day = BCD_INT(Regs.b.dl); - } - } + TimeInfo.Year = 100 * BCD_INT(Regs.b.ch) + BCD_INT(Regs.b.cl); + TimeInfo.Month = BCD_INT(Regs.b.dh); + TimeInfo.Day = BCD_INT(Regs.b.dl); - if (NULL != Hour || NULL != Minute || NULL != Second) - { - /* Some BIOSes leave CF unchanged if successful, - * so CF should be cleared before calling this function. */ - __asm__ ("clc"); + /* Some BIOSes leave CF unchanged if successful, + * so CF should be cleared before calling this function. */ + __asm__ ("clc"); - /* Int 1Ah AH=02h - * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) - * - * AH = 02h - * CF clear to avoid bug - * Return: - * CF clear if successful - * CH = hour (BCD) - * CL = minutes (BCD) - * DH = seconds (BCD) - * DL = daylight savings flag (00h standard time, 01h daylight time) - * CF set on error (i.e. clock not running or in middle of update) - */ - Regs.b.ah = 0x02; - Int386(0x1A, &Regs, &Regs); + /* Int 1Ah AH=02h + * TIME - GET REAL-TIME CLOCK TIME (AT,XT286,PS) + * + * AH = 02h + * CF clear to avoid bug + * Return: + * CF clear if successful + * CH = hour (BCD) + * CL = minutes (BCD) + * DH = seconds (BCD) + * DL = daylight savings flag (00h standard time, 01h daylight time) + * CF set on error (i.e. clock not running or in middle of update) + */ + Regs.b.ah = 0x02; + Int386(0x1A, &Regs, &Regs); - if (NULL != Hour) - { - *Hour = BCD_INT(Regs.b.ch); - } - if (NULL != Minute) - { - *Minute = BCD_INT(Regs.b.cl); - } - if (NULL != Second) - { - *Second = BCD_INT(Regs.b.dh); - } - } + TimeInfo.Hour = BCD_INT(Regs.b.ch); + TimeInfo.Minute = BCD_INT(Regs.b.cl); + TimeInfo.Second = BCD_INT(Regs.b.dh); + + return &TimeInfo; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxrtc.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -37,46 +37,28 @@ return(Val); } -VOID -XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) +TIMEINFO* +XboxGetTime(VOID) { - while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP) + static TIMEINFO TimeInfo; + + while (HalpQueryCMOS (RTC_REGISTER_A) & RTC_REG_A_UIP) { - ; + ; } - if (NULL != Second) - { - *Second = BCD_INT(HalpQueryCMOS(0)); - } - if (NULL != Minute) - { - *Minute = BCD_INT(HalpQueryCMOS(2)); - } - if (NULL != Hour) - { - *Hour = BCD_INT(HalpQueryCMOS(4)); - } - if (NULL != Day) - { - *Day = BCD_INT(HalpQueryCMOS(7)); - } - if (NULL != Month) - { - *Month = BCD_INT(HalpQueryCMOS(8)); - } - if (NULL != Year) - { - *Year = BCD_INT(HalpQueryCMOS(9)); - if (*Year > 80) - { - *Year += 1900; - } - else - { - *Year += 2000; - } - } + TimeInfo.Second = BCD_INT(HalpQueryCMOS(0)); + TimeInfo.Minute = BCD_INT(HalpQueryCMOS(2)); + TimeInfo.Hour = BCD_INT(HalpQueryCMOS(4)); + TimeInfo.Day = BCD_INT(HalpQueryCMOS(7)); + TimeInfo.Month = BCD_INT(HalpQueryCMOS(8)); + TimeInfo.Year = BCD_INT(HalpQueryCMOS(9)); + if (TimeInfo.Year > 80) + TimeInfo.Year += 1900; + else + TimeInfo.Year += 2000; + + return &TimeInfo; } /* EOF */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -342,9 +342,12 @@ return 1; } -VOID PpcRTCGetCurrentDateTime( PULONG Hear, PULONG Month, PULONG Day, - PULONG Hour, PULONG Minute, PULONG Second ) { - //printf("RTCGeturrentDateTime\n"); +TIMEINFO* +PpcGetTime(VOID) +{ + static TIMEINFO TimeInfo; + //printf("PpcGetTime\n"); + return &TimeInfo; } VOID NarrowToWide(WCHAR *wide_name, char *name) @@ -534,7 +537,7 @@ MachVtbl.DiskGetDriveGeometry = PpcDiskGetDriveGeometry; MachVtbl.DiskGetCacheableBlockCount = PpcDiskGetCacheableBlockCount; - MachVtbl.RTCGetCurrentDateTime = PpcRTCGetCurrentDateTime; + MachVtbl.GetTime = PpcGetTime; MachVtbl.HwDetect = PpcHwDetect; } Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -79,7 +79,7 @@ CHAR SectionName[100]; CHAR BootDriveString[20]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -90,8 +90,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootDisk%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootDisk%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -122,7 +122,7 @@ CHAR BootDriveString[20]; CHAR BootPartitionString[20]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -139,8 +139,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootPartition%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootPartition%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -178,7 +178,7 @@ CHAR BootPartitionString[20]; CHAR BootSectorFileString[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -201,8 +201,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomBootSectorFile%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomBootSectorFile%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -248,7 +248,7 @@ CHAR ReactOSARCPath[200]; CHAR ReactOSOptions[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -277,8 +277,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomReactOS%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomReactOS%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) @@ -321,7 +321,7 @@ CHAR LinuxInitrdString[200]; CHAR LinuxCommandLineString[200]; ULONG SectionId; - ULONG Year, Month, Day, Hour, Minute, Second; + TIMEINFO* TimeInfo; RtlZeroMemory(SectionName, sizeof(SectionName)); RtlZeroMemory(BootDriveString, sizeof(BootDriveString)); @@ -356,8 +356,8 @@ } // Generate a unique section name - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - sprintf(SectionName, "CustomLinux%ld%ld%ld%ld%ld%ld", Year, Day, Month, Hour, Minute, Second); + TimeInfo = ArcGetTime(); + sprintf(SectionName, "CustomLinux%u%u%u%u%u%u", TimeInfo->Year, TimeInfo->Day, TimeInfo->Month, TimeInfo->Hour, TimeInfo->Minute, TimeInfo->Second); // Add the section if (!IniAddSection(SectionName, &SectionId)) Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/amd64/machpc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -55,7 +55,7 @@ BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -54,7 +54,7 @@ BOOLEAN PcDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG PcDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID PcRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* PcGetTime(VOID); PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -57,7 +57,7 @@ BOOLEAN XboxDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG XboxDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID XboxRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* XboxGetTime(VOID); PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/machine.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/machine.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -72,7 +72,8 @@ BOOLEAN (*DiskGetDriveGeometry)(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG (*DiskGetCacheableBlockCount)(ULONG DriveNumber); - VOID (*RTCGetCurrentDateTime)(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); + TIMEINFO* (*GetTime)(VOID); + ULONG (*GetRelativeTime)(VOID); PCONFIGURATION_COMPONENT_DATA (*HwDetect)(VOID); } MACHVTBL, *PMACHVTBL; @@ -115,7 +116,8 @@ BOOLEAN MachDiskGetPartitionEntry(ULONG DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN MachDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry); ULONG MachDiskGetCacheableBlockCount(ULONG DriveNumber); -VOID MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second); +TIMEINFO* ArcGetTime(VOID); +ULONG ArcGetRelativeTime(VOID); VOID MachHwDetect(VOID); VOID MachPrepareForReactOS(IN BOOLEAN Setup); @@ -147,7 +149,6 @@ #define MachDiskGetPartitionEntry(Drive, Part, Entry) MachVtbl.DiskGetPartitionEntry((Drive), (Part), (Entry)) #define MachDiskGetDriveGeometry(Drive, Geom) MachVtbl.DiskGetDriveGeometry((Drive), (Geom)) #define MachDiskGetCacheableBlockCount(Drive) MachVtbl.DiskGetCacheableBlockCount(Drive) -#define MachRTCGetCurrentDateTime(Y, Mo, D, H, Mi, S) MachVtbl.RTCGetCurrentDateTime((Y), (Mo), (D), (H), (Mi), (S)); #define MachHwDetect() MachVtbl.HwDetect() #endif /* __MACHINE_H_ */ Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -47,7 +47,6 @@ #undef MachDiskGetPartitionEntry #undef MachDiskGetDriveGeometry #undef MachDiskGetCacheableBlockCount -#undef MachRTCGetCurrentDateTime #undef MachHwDetect MACHVTBL MachVtbl; @@ -228,10 +227,24 @@ return MachVtbl.DiskGetCacheableBlockCount(DriveNumber); } -VOID -MachRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) -{ - MachVtbl.RTCGetCurrentDateTime(Year, Month, Day, Hour, Minute, Second); +TIMEINFO* +ArcGetTime(VOID) +{ + return MachVtbl.GetTime(); +} + +ULONG +ArcGetRelativeTime(VOID) +{ + TIMEINFO* TimeInfo; + ULONG ret; + + if (MachVtbl.GetRelativeTime) + return MachVtbl.GetRelativeTime(); + + TimeInfo = ArcGetTime(); + ret = ((TimeInfo->Hour * 24) + TimeInfo->Minute) * 60 + TimeInfo->Second; + return ret; } VOID Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -442,9 +442,8 @@ VOID TuiUpdateDateTime(VOID) { - ULONG Year, Month, Day; - ULONG Hour, Minute, Second; - CHAR DateString[40]; + TIMEINFO* TimeInfo; + char DateString[40]; CHAR TimeString[40]; CHAR TempString[20]; BOOLEAN PMHour = FALSE; @@ -452,27 +451,31 @@ /* Don't draw the time if this has been disabled */ if (!UiDrawTime) return; - MachRTCGetCurrentDateTime(&Year, &Month, &Day, &Hour, &Minute, &Second); - if (Year < 1 || 9999 < Year || Month < 1 || 12 < Month || Day < 1 || - 31 < Day || 23 < Hour || 59 < Minute || 59 < Second) + TimeInfo = ArcGetTime(); + if (TimeInfo->Year < 1 || 9999 < TimeInfo->Year || + TimeInfo->Month < 1 || 12 < TimeInfo->Month || + TimeInfo->Day < 1 || 31 < TimeInfo->Day || + 23 < TimeInfo->Hour || + 59 < TimeInfo->Minute || + 59 < TimeInfo->Second) { /* This happens on QEmu sometimes. We just skip updating */ return; } // Get the month name - strcpy(DateString, UiMonthNames[Month - 1]); + strcpy(DateString, UiMonthNames[TimeInfo->Month - 1]); // Get the day - _itoa(Day, TempString, 10); + _itoa(TimeInfo->Day, TempString, 10); // Get the day postfix - if (1 == Day || 21 == Day || 31 == Day) + if (1 == TimeInfo->Day || 21 == TimeInfo->Day || 31 == TimeInfo->Day) { strcat(TempString, "st"); } - else if (2 == Day || 22 == Day) + else if (2 == TimeInfo->Day || 22 == TimeInfo->Day) { strcat(TempString, "nd"); } - else if (3 == Day || 23 == Day) + else if (3 == TimeInfo->Day || 23 == TimeInfo->Day) { strcat(TempString, "rd"); } @@ -486,35 +489,35 @@ strcat(DateString, " "); // Get the year and add it to the date - _itoa(Year, TempString, 10); + _itoa(TimeInfo->Year, TempString, 10); strcat(DateString, TempString); // Draw the date TuiDrawText(UiScreenWidth-strlen(DateString)-2, 1, DateString, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); // Get the hour and change from 24-hour mode to 12-hour - if (Hour > 12) - { - Hour -= 12; + if (TimeInfo->Hour > 12) + { + TimeInfo->Hour -= 12; PMHour = TRUE; } - if (Hour == 0) - { - Hour = 12; - } - _itoa(Hour, TempString, 10); + if (TimeInfo->Hour == 0) + { + TimeInfo->Hour = 12; + } + _itoa(TimeInfo->Hour, TempString, 10); strcpy(TimeString, " "); strcat(TimeString, TempString); strcat(TimeString, ":"); - _itoa(Minute, TempString, 10); - if (Minute < 10) + _itoa(TimeInfo->Minute, TempString, 10); + if (TimeInfo->Minute < 10) { strcat(TimeString, "0"); } strcat(TimeString, TempString); strcat(TimeString, ":"); - _itoa(Second, TempString, 10); - if (Second < 10) + _itoa(TimeInfo->Second, TempString, 10); + if (TimeInfo->Second < 10) { strcat(TimeString, "0"); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tuimenu.c [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -23,6 +23,7 @@ UiMenuKeyPressFilterCallback KeyPressFilter) { UI_MENU_INFO MenuInformation; + ULONG InitialClockSecond; ULONG LastClockSecond; ULONG CurrentClockSecond; ULONG KeyPress; @@ -59,7 +60,7 @@ // // Get the current second of time // - MachRTCGetCurrentDateTime(NULL, NULL, NULL, NULL, NULL, &LastClockSecond); + InitialClockSecond = LastClockSecond = ArcGetRelativeTime(); // // Process keys @@ -87,17 +88,12 @@ // // Check if there is a countdown // - if (MenuInformation.MenuTimeRemaining) - { - // - // Get the updated time, seconds only - // - MachRTCGetCurrentDateTime(NULL, - NULL, - NULL, - NULL, - NULL, - &CurrentClockSecond); + if (MenuInformation.MenuTimeRemaining != -1) + { + // + // Get the updated time + // + CurrentClockSecond = ArcGetRelativeTime(); // // Check if more then a second has now elapsed @@ -108,7 +104,10 @@ // Update the time information // LastClockSecond = CurrentClockSecond; - MenuInformation.MenuTimeRemaining--; + MenuInformation.MenuTimeRemaining = + InitialClockSecond + MenuTimeOut - LastClockSecond; + if (MenuInformation.MenuTimeRemaining < 0) + MenuInformation.MenuTimeRemaining = 0; // // Update the menu @@ -117,7 +116,7 @@ VideoCopyOffScreenBufferToVRAM(); } } - else + else if (MenuInformation.MenuTimeRemaining == 0) { // // A time out occurred, exit this loop and return default OS Modified: trunk/reactos/include/reactos/arc/arc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?… ============================================================================== --- trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/arc/arc.h [iso-8859-1] Sat Apr 25 00:35:11 2009 @@ -121,6 +121,16 @@ MemoryMaximum } MEMORY_TYPE; +typedef struct _TIMEINFO +{ + USHORT Year; + USHORT Month; + USHORT Day; + USHORT Hour; + USHORT Minute; + USHORT Second; +} TIMEINFO; + typedef struct _MEMORY_DESCRIPTOR { MEMORY_TYPE MemoryType;

1 0

[fireball] 40685: - WINLDR: Fix SystemRoot path when booting in non-setup mode. - WINLDR: Change path buffers to be MAX_PATH sized instead of an arbitrary 512 bytes value.
by fireball＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: fireball Date: Fri Apr 24 23:03:10 2009 New Revision: 40685 URL: http://svn.reactos.org/svn/reactos?rev=40685&view=rev Log: - WINLDR: Fix SystemRoot path when booting in non-setup mode. - WINLDR: Change path buffers to be MAX_PATH sized instead of an arbitrary 512 bytes value. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Apr 24 23:03:10 2009 @@ -431,10 +431,10 @@ LoadAndBootWindows(PCSTR OperatingSystemName, USHORT OperatingSystemVersion) { CHAR MsgBuffer[256]; - CHAR SystemPath[512], SearchPath[512]; - CHAR FileName[512]; - CHAR BootPath[512]; + CHAR FullPath[MAX_PATH], SystemRoot[MAX_PATH], BootPath[MAX_PATH]; + CHAR FileName[MAX_PATH]; CHAR BootOptions[256]; + PCHAR PathSeparator; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; ULONG SectionId; @@ -463,12 +463,17 @@ UiDrawProgressBarCenter(1, 100, "Loading Windows..."); /* Make sure the system path is set in the .ini file */ - if (!IniReadSettingByName(SectionId, "SystemPath", SystemPath, sizeof(SystemPath))) + if (!IniReadSettingByName(SectionId, "SystemPath", FullPath, sizeof(FullPath))) { UiMessageBox("System path not specified for selected operating system."); return; } + /* Convert FullPath to SystemRoot */ + PathSeparator = strstr(FullPath, "\\"); + strcpy(SystemRoot, PathSeparator); + strcat(SystemRoot, "\\"); + /* Read booting options */ if (!IniReadSettingByName(SectionId, "Options", BootOptions, sizeof(BootOptions))) { @@ -477,23 +482,23 @@ } /* Special case for LiveCD */ - if (!_strnicmp(SystemPath, "LiveCD", strlen("LiveCD"))) - { - strcpy(BootPath, SystemPath + strlen("LiveCD")); - MachDiskGetBootPath(SystemPath, sizeof(SystemPath)); - strcat(SystemPath, BootPath); + if (!_strnicmp(SystemRoot, "LiveCD", strlen("LiveCD"))) + { + strcpy(BootPath, SystemRoot + strlen("LiveCD")); + MachDiskGetBootPath(SystemRoot, sizeof(SystemRoot)); + strcat(SystemRoot, BootPath); } /* Let user know we started loading */ UiDrawStatusText("Loading..."); /* append a backslash */ - strcpy(BootPath, SystemPath); + strcpy(BootPath, FullPath); if ((strlen(BootPath)==0) || BootPath[strlen(BootPath)] != '\\') strcat(BootPath, "\\"); - DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s'\n", BootPath); + DPRINTM(DPRINT_WINDOWS,"BootPath: '%s'\n", BootPath); /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); @@ -535,12 +540,12 @@ } /* Load all referenced DLLs for kernel, HAL and kdcom.dll */ - strcpy(SearchPath, BootPath); - strcat(SearchPath, "SYSTEM32\\"); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KernelDTE); - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, HalDTE); + strcpy(FileName, BootPath); + strcat(FileName, "SYSTEM32\\"); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KernelDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, HalDTE); if (KdComDTE) - WinLdrScanImportDescriptorTable(LoaderBlock, SearchPath, KdComDTE); + WinLdrScanImportDescriptorTable(LoaderBlock, FileName, KdComDTE); /* Load Hive, and then NLS data, OEM font, and prepare boot drivers list */ Status = WinLdrLoadAndScanSystemHive(LoaderBlock, BootPath); @@ -554,7 +559,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemPath, BootPath, OperatingSystemVersion); + WinLdrInitializePhase1(LoaderBlock, BootOptions, SystemRoot, BootPath, OperatingSystemVersion); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

1 0

[fireball] 40684: - Reenable partition table exploration, but switch off disk error reporting before doing it.
by fireball＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: fireball Date: Fri Apr 24 22:38:10 2009 New Revision: 40684 URL: http://svn.reactos.org/svn/reactos?rev=40684&view=rev Log: - Reenable partition table exploration, but switch off disk error reporting before doing it. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Fri Apr 24 22:38:10 2009 @@ -500,9 +500,7 @@ ULONG Signature; CHAR Identifier[20]; CHAR ArcName[256]; -#if 0 PARTITION_TABLE_ENTRY PartitionTableEntry; -#endif /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, (PVOID)DISKREADBUFFER)) @@ -538,9 +536,9 @@ sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)partition(0)", DriveNumber - 0x80); FsRegisterDevice(ArcName, &DiskVtbl); -#if 0 /* Add partitions */ i = 0; + DiskReportError(FALSE); while (MachDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) { if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) @@ -550,7 +548,7 @@ } i++; } -#endif + DiskReportError(TRUE); /* Convert checksum and signature to identifier string */ Identifier[0] = Hex[(Checksum >> 28) & 0x0F];

1 0

[fireball] 40683: - WINLDR: Pass boot options to the kernel when booting in setup mode (it was disabled for debugging reasons).
by fireball＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: fireball Date: Fri Apr 24 22:27:34 2009 New Revision: 40683 URL: http://svn.reactos.org/svn/reactos?rev=40683&view=rev Log: - WINLDR: Pass boot options to the kernel when booting in setup mode (it was disabled for debugging reasons). Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Fri Apr 24 22:27:34 2009 @@ -157,7 +157,6 @@ CHAR SystemPath[512], SearchPath[512]; CHAR FileName[512]; CHAR BootPath[512]; - CHAR LoadOptions[512]; LPCSTR BootOptions; PVOID NtosBase = NULL, HalBase = NULL, KdComBase = NULL; BOOLEAN Status; @@ -234,7 +233,7 @@ /* Construct the system path */ sprintf(SystemPath, "%s\\", SourcePath); - DPRINTM(DPRINT_WINDOWS,"SystemRoot: '%s', SystemPath: '%s'\n", BootPath, SystemPath); + DPRINTM(DPRINT_WINDOWS,"BootPath: '%s', SystemPath: '%s'\n", BootPath, SystemPath); /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); @@ -298,8 +297,7 @@ WinLdrSetupForNt(LoaderBlock, &GdtIdt, &PcrBasePage, &TssBasePage); /* Initialize Phase 1 - no drivers loading anymore */ - LoadOptions[0] = 0; - WinLdrInitializePhase1(LoaderBlock, LoadOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); + WinLdrInitializePhase1(LoaderBlock, (PCHAR)BootOptions, SystemPath, BootPath, _WIN32_WINNT_WS03); /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;

1 0

[fireball] 40682: - WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it.
by fireball＠svn.reactos.org 24 Apr '09

24 Apr '09

Author: fireball Date: Fri Apr 24 22:17:22 2009 New Revision: 40682 URL: http://svn.reactos.org/svn/reactos?rev=40682&view=rev Log: - WINLDR: Use SystemRoot path as it is because after recent Herve's changes there is no need to do additional operations with it. Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Fri Apr 24 22:17:22 2009 @@ -75,7 +75,7 @@ VOID WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, PCHAR Options, - PCHAR SystemPath, + PCHAR SystemRoot, PCHAR BootPath, USHORT VersionToBoot) { @@ -86,7 +86,6 @@ //CHAR ArcBoot[] = "multi(0)disk(0)rdisk(0)partition(1)"; CHAR HalPath[] = "\\"; - CHAR SystemRoot[256]; CHAR ArcBoot[256]; CHAR MiscFiles[256]; ULONG i, PathSeparator; @@ -95,11 +94,9 @@ LoaderBlock->u.I386.CommonDataArea = NULL; // Force No ABIOS support /* Construct SystemRoot and ArcBoot from SystemPath */ - PathSeparator = strstr(SystemPath, "\\") - SystemPath; - strncpy(ArcBoot, SystemPath, PathSeparator); + PathSeparator = strstr(BootPath, "\\") - BootPath; + strncpy(ArcBoot, BootPath, PathSeparator); ArcBoot[PathSeparator] = 0; - strcpy(SystemRoot, &SystemPath[PathSeparator]); - strcat(SystemRoot, "\\"); DPRINTM(DPRINT_WINDOWS, "ArcBoot: %s\n", ArcBoot); DPRINTM(DPRINT_WINDOWS, "SystemRoot: %s\n", SystemRoot);

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