Ros-diffs June 2008

ros-diffs@reactos.org

23 participants
435 discussions

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jun 29 16:18:31 2008 New Revision: 34196 URL: http://svn.reactos.org/svn/reactos?rev=34196&view=rev Log: Attempt to fix build Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sun Jun 29 16:18:31 2008 @@ -698,703 +698,3 @@ IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce (angloamerické)" IDS_WEIGHT_OUNCES_TROY "Unce (trojské/lékárenské)" END -/* FILE: base/applications/calc/lang/cs-CZ.rc - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-06-28 - */ - -LANGUAGE LANG_CZECH, SUBLANG_DEFAULT - -// Dialog - -IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 -STYLE WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS kalkulaèka" -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^3",IDC_BUTTON_Xe3,64,121,24,17,BS_CENTER | BS_VCENTER | - BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "x^2",IDC_BUTTON_Xe2,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 "pí",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 "Or",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 "And",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 "Byte",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT - WS_VISIBLE,272,24,30,10 - CONTROL "Stupnì",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, - 42,10 - CONTROL "Radiány",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, - 24,42,10 - CONTROL "Grady",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 "Zpìt",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 WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulaèka" -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 "Zpìt",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 "Sqrt",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 WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "ReactOS Kalkulaèka" -MENU IDR_MENU_STANDARD -FONT 8, "MS Shell Dlg" -BEGIN - PUSHBUTTON "Pøevést",IDC_BUTTON_CONVERT,35,105,76,17 - COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Kategorie:",IDC_STATIC,4,20,56,8 - COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "Pøevést z:",IDC_STATIC,4,49,56,8 - COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | - WS_TABSTOP | CBS_SORT - LTEXT "Na:",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 "Zpìt",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 "Sqrt",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_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "O ReactOS Kalkulaèce" -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 "ReactOS Kalkulaèka",IDC_STATIC,120,12,132,8, - SS_CENTERIMAGE - LTEXT "Verze ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE - LTEXT "Autor: 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 WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Statistické výpoèty" -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 "Úpravy" - BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vloit\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "Zobrazit" - BEGIN - MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vìdecká", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Pøevody", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "estnáctkovì\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Desítkovì\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Osmièkovì\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binárnì\tF8", IDM_VIEW_BIN, CHECKED - MENUITEM SEPARATOR - MENUITEM "Stupnì\tF2", IDM_VIEW_DEG, CHECKED - MENUITEM "Radiány\tF3", IDM_VIEW_RAD, CHECKED - MENUITEM "Grady\tF4", IDM_VIEW_GRAD, CHECKED - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Témata nápovìdy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O ReactOS kalkulaèce", IDM_HELP_ABOUT - END -END - -IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE -BEGIN - POPUP "Úpravy" - BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vloit\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "Zobrazit" - BEGIN - MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vìdecká", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Pøevody", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "estnáctkovì\tF5", IDM_VIEW_HEX, CHECKED - MENUITEM "Desítkovì\tF6", IDM_VIEW_DEC, CHECKED - MENUITEM "Osmièkovì\tF7", IDM_VIEW_OCT, CHECKED - MENUITEM "Binárnì\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 "Byte\tF4", IDM_VIEW_BYTE, CHECKED - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Témata nápovìdy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O ReactOS kalkulaèce", IDM_HELP_ABOUT - END -END - -IDR_MENU_STANDARD MENU DISCARDABLE -BEGIN - POPUP "Úpravy" - BEGIN - MENUITEM "Kopírovat\tCTRL-C", IDM_EDIT_COPY - MENUITEM "Vloit\tCTRL-V", IDM_EDIT_PASTE - END - POPUP "View" - BEGIN - MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED - MENUITEM "Vìdecká", IDM_VIEW_SCIENTIFIC, CHECKED - MENUITEM "Pøevody", IDM_VIEW_CONVERSION - MENUITEM SEPARATOR - MENUITEM "Seskupování èíslic", IDM_VIEW_GROUP, CHECKED - END - POPUP "Help" - BEGIN - MENUITEM "Témata nápovìdy", IDM_HELP_HELP - MENUITEM SEPARATOR - MENUITEM "O ReactOS kalkulaèce", IDM_HELP_ABOUT - END -END - -// String Tables - -STRINGTABLE DISCARDABLE -BEGIN - IDS_STRING_LICENSE "ReactOS kalkulaèka je svobodný software vydaný pod licencí GNU GPL.\r\n\r\nZde najdete znìní GNU GPL licence:\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nZde také najdete pøeklad GNU GPL licence:\r\nhttp://www.gnu.org/licenses/translations.html" - IDS_MATH_ERROR "Chyba" - IDS_QUICKHELP "Rychlá nápovìda" -END - -// types of conversion -STRINGTABLE DISCARDABLE -BEGIN - IDS_CONV_LENGTH "Délka" - IDS_CONV_ENERGY "Energie" - IDS_CONV_WEIGHT "Hmotnost" - IDS_CONV_CURRENCY "Mìna" - IDS_CONV_VOLUME "Objem" - IDS_CONV_AREA "Plocha" - IDS_CONV_VELOCITY "Rychlost" - IDS_CONV_CONSUMPTION "Spotøeba (motory)" - IDS_CONV_TEMPERATURE "Teplota" - IDS_CONV_PRESSURE "Tlak" - IDS_CONV_POWER "Výkon" -END - -// TYPES OF AREAS -STRINGTABLE DISCARDABLE -BEGIN - IDS_AREA_ACRES "Akry" - IDS_AREA_ACRES_BRAZIL "Akry (Brazílie)" - IDS_AREA_ACRES_FRANCE "Akry (Francie)" - IDS_AREA_ACRES_SCOTS "Akry (Skotsko)" - IDS_AREA_ACRES_US "Akry (USA)" - IDS_AREA_ARES "Ary" - IDS_AREA_CHOU "Chou" - IDS_AREA_SQUARE_CENTIMETERS "Ètvereèní centimetry" - IDS_AREA_SQUARE_CHR "Ètvereèní chr" - IDS_AREA_SQUARE_FATHOMS "Ètvereèní fathomy" - IDS_AREA_SQUARE_FATHOMS_HUNGARY "Ètvereèní fathomy (Maïarsko)" - IDS_AREA_SQUARE_FEET "Ètvereèní stopy" - IDS_AREA_SQUARE_INCHES "Ètvereèní palce" - IDS_AREA_SQUARE_KILOMETERS "Ètvereèní kilometry" - IDS_AREA_SQUARE_LAR "Ètvereèní lar" - IDS_AREA_SQUARE_METER "Ètvereèní metry" - IDS_AREA_SQUARE_MILES "Ètvereèní míle" - IDS_AREA_SQUARE_MILLIMETERS "Ètvereèní milimetry" - IDS_AREA_SQUARE_SHAKU "Ètvereèní shaku" - IDS_AREA_SQUARE_TSUEN "Ètvereèní tsuen" - IDS_AREA_SQUARE_VA "Ètvereèní va" - IDS_AREA_SQUARE_YARD "Ètvereèní yardy" - IDS_AREA_DANBO "Danbo" - IDS_AREA_HECTARES "Hektary" - IDS_AREA_JEONGBO "Jeongbo" - IDS_AREA_MORGEN_HUNGARY "Morgen (Maïarsko)" - 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_TAN "Tan" - IDS_AREA_TSUBO "Tsubo" -END - -// TYPES OF COMSUMPTIONS -STRINGTABLE DISCARDABLE -BEGIN - IDS_CONSUMPTION_KM_PER_L "Kilometry/litr" - IDS_CONSUMPTION_L_PER_100_KM "Litry/100 kilometrù" - IDS_CONSUMPTION_MILES_GALLON_UK "Míle/galon (UK)" - IDS_CONSUMPTION_MILES_GALLON_US "Míle/galon (USA)" -END - -// TYPES OF CURRENCIES -STRINGTABLE DISCARDABLE -BEGIN - - IDS_CURRENCY_BELGIAN_FRANC "Belgický frank" - IDS_CURRENCY_EURO "Euro" - IDS_CURRENCY_FINNISH_MARKKA "Finská marka" - IDS_CURRENCY_FRENCH_FRANC "Francouzský frank" - IDS_CURRENCY_IRISH_POUND "Irská libra" - IDS_CURRENCY_ITALIAN_LIRA "Italská lira" - IDS_CURRENCY_CYPRIOT_POUND "Kyperská libra" - IDS_CURRENCY_LUXEMBOURG_FRANC "Lucemburský frank" - IDS_CURRENCY_MALTESE_LIRA "Maltská lira" - IDS_CURRENCY_DEUTSCHE_MARK "Nìmecká marka" - IDS_CURRENCY_DUTCH_GUILDER "Nizozemský gulden" - IDS_CURRENCY_PORTOGUESE_ESCUDO "Portugalské escudo" - IDS_CURRENCY_AUSTRIAN_SCHILLING "Rakouský ilink" - IDS_CURRENCY_GREEK_DRACHMA "Øecká drachma" - IDS_CURRENCY_SLOVENIAN_TOLAR "Slovinský tolar" - IDS_CURRENCY_SPANISH_PESETA "panìlská peseta" -END - -// TYPES OF ENERGIES -STRINGTABLE DISCARDABLE -BEGIN - IDS_ENERGY_15_C_CALORIES "15 ^C kalorie" - IDS_ENERGY_ERGS "Ergy" - IDS_ENERGY_JOULES "Jouly" - IDS_ENERGY_KILOJOULES "Kilojouly" - IDS_ENERGY_KILOWATT_HOURS "Kilowatt hodiny" - IDS_ENERGY_IT_CALORIES "Mezinárodní kalorie" - IDS_ENERGY_NUTRITION_CALORIES "Nutrièní kalorie" - IDS_ENERGY_TH_CALORIES "Termochemické kalorie" -END - -// TYPES OF LENGTHS -STRINGTABLE DISCARDABLE -BEGIN - IDS_LENGTH_ANGSTROMS "Angströmy" - IDS_LENGTH_ASTRONOMILA_UNITS "Astronomické jednotky" - IDS_LENGTH_BARLEYCORNS "Barleycorny" - IDS_LENGTH_CENTIMETERS "Centimetry" - IDS_LENGTH_CHAINS_UK "Chains (Gunter's chains) (UK)" - IDS_LENGTH_CHI "Chi" - IDS_LENGTH_CHOU "Chou" - IDS_LENGTH_CHR "Chr" - IDS_LENGTH_CUN "Cun" - IDS_LENGTH_FATHOMS "Fathomy" - IDS_LENGTH_FATHOMS_HUNGARY "Fathomy (Maïarsko)" - IDS_LENGTH_FURLONGS "Furlongy" - IDS_LENGTH_GAN "Gan" - IDS_LENGTH_HANDS "Hands (dlanì)" - IDS_LENGTH_HUNH "Hunh" - IDS_LENGTH_JA "Ja" - IDS_LENGTH_JEONG "Jeong" - IDS_LENGTH_KABIET "Kabiet" - IDS_LENGTH_KEN "Ken" - IDS_LENGTH_KEUB "Keub" - IDS_LENGTH_KILOMETERS "Kilometry" - IDS_LENGTH_LAR "Lar" - IDS_LENGTH_LINKS_UK "Links (UK)" - IDS_LENGTH_METERS "Metry" - IDS_LENGTH_MILES "Míle" - IDS_LENGTH_MILLIMETERS "Milimetry" - IDS_LENGTH_NAUTICAL_MILES "Námoøní míle" - IDS_LENGTH_NIEU "Nieu" - IDS_LENGTH_INCHES "Palce" - IDS_LENGTH_PARSECS "Parseky" - IDS_LENGTH_PICAS "Picas" - IDS_LENGTH_RI_JAPAN "Ri (Japonsko)" - IDS_LENGTH_RI_KOREA "Ri (Korea)" - IDS_LENGTH_SAWK "Sawk" - IDS_LENGTH_SEN "Sen" - IDS_LENGTH_SHAKU "Shaku" - IDS_LENGTH_SPAN "Span" - IDS_LENGTH_FEET "Stopy" - IDS_LENGTH_SUN "Sun" - IDS_LENGTH_LIGHT_YEARS "Svìtelné roky" - IDS_LENGTH_TSUEN "Tsuen" - IDS_LENGTH_VA "Va" - IDS_LENGTH_YARDS "Yardy" - IDS_LENGTH_YOTE "Yote" - IDS_LENGTH_ZHANG "Zhang" -END - -// TYPES OF POWERS -STRINGTABLE DISCARDABLE -BEGIN - IDS_POWER_HORSEPOWER "Koòské síly" - IDS_POWER_KILOWATTS "Kilowatty" - IDS_POWER_MEGAWATTS "Megawatty" - IDS_POWER_WATTS "Watty" -END - -// TYPE OF PRESSURES -STRINGTABLE DISCARDABLE -BEGIN - IDS_PRESSURE_ATMOSPHERES "Atmosféry" - IDS_PRESSURE_BARS "Bary" - IDS_PRESSURE_PSI "Libry na ètvercový palec" - IDS_PRESSURE_MM_OF_MERCURY "Milimetry rtuového sloupce" - IDS_PRESSURE_PASCALS "Pascaly" -END - -// TYPES OF TEMPERATURES -STRINGTABLE DISCARDABLE -BEGIN - IDS_TEMPERATURE_CELSIUS "Celsia" - IDS_TEMPERATURE_FAHRENHEIT "Fahrenheita" - IDS_TEMPERATURE_KELVIN "Kelvina" - IDS_TEMPERATURE_RANKINE "Rankina" -END - -// TYPES OF VELOCITIES -STRINGTABLE DISCARDABLE -BEGIN - IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/hodinu" - IDS_VELOCITY_MACH "Machy" - IDS_VELOCITY_METERS_SECOND "Metry/sekundu" - IDS_VELOCITY_MILES_HOUR "Míle/hodinu" - IDS_VELOCITY_FEET_HOUR "Stopy/hodinu" - IDS_VELOCITY_KNOTS "Uzly" -END - -// TYPES OF VOLUMES -STRINGTABLE DISCARDABLE -BEGIN - IDS_VOLUME_BARRELS_UK "Barely (UK)" - IDS_VOLUME_BARRELS_OIL "Barely ropy" - IDS_VOLUME_BUN "Bun" - IDS_VOLUME_BUSHELS_UK "Buly (UK)" - IDS_VOLUME_BUSHELS_US "Buly (USA)" - IDS_VOLUME_QUARTS_UK "Ètvrtky (UK)" - IDS_VOLUME_QUARTS_DRY_US "Ètvrtky, suché (USA)" - IDS_VOLUME_QUARTS_LIQUID_US "Ètvrtky, tekuté (USA)" - IDS_VOLUME_DOE "Doe" - IDS_VOLUME_GALLONS_UK "Galony (UK)" - IDS_VOLUME_GALLONS_DRY_US "Galony, suché (USA)" - IDS_VOLUME_GALLONS_LIQUID_US "Galony, tekuté (USA)" - IDS_VOLUME_GOU "Gou" - IDS_VOLUME_HOP "Hop" - IDS_VOLUME_ICCE "Icce" - IDS_VOLUME_CUBIC_CENTIMETERS "Krychlové centimetry" - IDS_VOLUME_CUBIC_FEET "Krychlové stopy" - IDS_VOLUME_CUBIC_INCHES "Krychlové palce" - IDS_VOLUME_CUBIC_METERS "Krychlové metry" - IDS_VOLUME_CUBIC_YARDS "Krychlové yardy" - IDS_VOLUME_KWIAN "Kwian" - IDS_VOLUME_LITERS "Litry" - IDS_VOLUME_MAL "Mal" - IDS_VOLUME_MILLILITERS "Mililitry" - IDS_VOLUME_PINTS_UK "Pinty (UK)" - IDS_VOLUME_PINTS_DRY_US "Pinty, suché (USA)" - IDS_VOLUME_PINTS_LIQUID_US "Pinty, tekuté (USA)" - IDS_VOLUME_SEKI "Seki" - IDS_VOLUME_SYOU "Syou" - IDS_VOLUME_TANANLOUNG "Tananloung" - IDS_VOLUME_TANG "Tang" - IDS_VOLUME_TO "To" - IDS_VOLUME_FLUID_OUNCES_UK "Unce (UK)" - IDS_VOLUME_FLUID_OUNCES_US "Unce (USA)" -END - -// TYPES OF WEIGHTS -STRINGTABLE DISCARDABLE -BEGIN - IDS_WEIGHT_BAHT "Baht" - IDS_WEIGHT_QUINTAL_METRIC "Centy (metrické)" - IDS_WEIGHT_CHUNG "Chung" - IDS_WEIGHT_DON "Don" - IDS_WEIGHT_GEUN "Geun" - IDS_WEIGHT_GRAMS "Gramy" - IDS_WEIGHT_GWAN "Gwan" - IDS_WEIGHT_HARB "Harb" - IDS_WEIGHT_JIN_CHINA "Jin (Èína)" - IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" - IDS_WEIGHT_KAN "Kan" - IDS_WEIGHT_CARATS "Karáty" - IDS_WEIGHT_KILOGRAMS "Kilogramy" - IDS_WEIGHT_KIN "Kin" - IDS_WEIGHT_LIANG_CHINA "Liang (China)" - IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" - IDS_WEIGHT_POUNDS "Libry" - IDS_WEIGHT_MONME "Monme" - IDS_WEIGHT_SALOUNG "Saloung" - IDS_WEIGHT_STONES "Stones" - IDS_WEIGHT_TAMLUNG "Tamlung" - IDS_WEIGHT_TONNES "Tuny (metrické)" - IDS_WEIGHT_TONS_UK "Tuny (UK)" - IDS_WEIGHT_TONS_US "Tuny (USA)" - IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Unce (angloamerické)" - IDS_WEIGHT_OUNCES_TROY "Unce (trojské/lékárenské)" -END

16 years, 5 months

[cfinck] 34195: Remove all non-working applications from "downloader.xml"

by cfinck＠svn.reactos.org

Author: cfinck Date: Sun Jun 29 16:00:42 2008 New Revision: 34195 URL: http://svn.reactos.org/svn/reactos?rev=34195&view=rev Log: Remove all non-working applications from "downloader.xml" Modified: branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml Modified: branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_5/rosapps/downlo… ============================================================================== --- branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_5/rosapps/downloader/downloader.xml [iso-8859-1] Sun Jun 29 16:00:42 2008 @@ -14,13 +14,6 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/latest-2.0/win…</location> </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.26</version> - <description>The most popular and one of the best free Web Browsers out there.</description> - <location>http://mirror.nwps.ws/opera/win/926/en/Opera_9.26_Classic_Setup.exe</location> - </application> <application name="Thunderbird 1.5"> <regname>Mozilla Thunderbird (1.5)</regname> <licence>MPL/GPL/LGPL</licence> @@ -34,12 +27,6 @@ <version>2.0.0.14</version> <description>The most popular and one of the best free Mail Clients out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/w…</location> - </application> - <application name="SeaMonkey"> - <regname>SeaMonkey (1.1.9)</regname> - <version>1.1.9</version> - <description>Mozilla Suite is alive. This is the one and only Browser, Mail, Chat, and Composer bundle you will ever need.</description> - <location>http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/1.1.9/seamon…</location> </application> <application name="Mozilla ActiveX Control"> <regname>Mozilla ActiveX Control v1.7.12 (ReactOS special)</regname> @@ -69,13 +56,6 @@ <description>Open source multiprotocol instant messaging application - May not work completely.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> </application> - <application name="Putty"> - <regname>PuTTY version 0.60</regname> - <licence>MIT</licence> - <version>0.60</version> - <description>A free SSH, Telnet, rlogin, and raw TCP client.</description> - <location>http://the.earth.li/~sgtatham/putty/latest/x86/putty-0.60-installer.exe</location> - </application> </category> <category name="Office" icon="2"> <application name="Abiword"> @@ -84,31 +64,8 @@ <description>Word processor.</description> <location>http://www.abiword.org/downloads/abiword/2.6.2/Windows/abiword-setup-2.6.2.…</location> </application> - <application name="OpenOffice"> - <regname>OpenOffice.org 2.4</regname> - <version>2.4.0</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice-extended/stable/2.4.0/OOo_2.4.0_Wi…</location> - </application> </category> <category name="Graphics" icon="3"> - <application name="IrfanView"> - <regname>IrfanView (remove only)</regname> - <version>4.10</version> - <description>Viewer for all kinds of graphics/audio files/video files.</description> - <location>http://gd.tuwien.ac.at/graphics/irfanview/iview410_setup.exe</location> - </application> - <application name="IrfanView Plugins"> - <version>4.10</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_410_setup.exe</location> - </application> - <application name="TuxPaint"> - <regname>Tux Paint 0.9.19</regname> - <version>0.9.19</version> - <description>An Open Source bitmap graphics editor geared towards young children.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.19-win32-in…</location> - </application> <application name="zeckensack's glide wrapper"> <regname>GlidewrapZbag</regname> <version>0.84c</version> @@ -116,21 +73,7 @@ <location>http://www.zeckensack.de/glide/archive/GlideWrapper084c.exe</location> </application> </category> - <category name="Multimedia" icon="4"> - </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.2</regname> - <version>1.2</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location> - </application> - <application name="MinGW"> - <regname>MinGW 5.1.3</regname> - <version>5.1.3</version> - <description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location> - </application> <application name="FreeBASIC"> <regname>FreeBASIC 0.18.4b</regname> <version>0.18.4b</version> @@ -139,12 +82,6 @@ </application> </category> <category name="Games & Fun" icon="6"> - <application name="ScummVM"> - <regname>ScummVM 0.11.1</regname> - <version>0.11.1</version> - <description>SamNMax, Day of Tentacle, etc on ReactOS</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/scummvm/scummvm-0.11.1-win32.exe</location> - </application> <application name="Diablo 2 Shareware"> <regname>Diablo II Shareware</regname> <version>1.4</version> @@ -157,30 +94,6 @@ <description>Nice Clone of Chip's Challenge originally made for the Atari Lynx. Includes free CCLP2 Graphics Pack, so you dont need the copyrighted Original.</description> <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> </application> - <application name="OpenTTD"> - <regname>OpenTTD 0.6.0</regname> - <version>0.6.0</version> - <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> - </application> - <application name="LBreakout2"> - <regname>LBreakout2 2.4.1</regname> - <version>2.4.1</version> - <description>Breakout Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lbreakout2-2.4.1-win32.exe</location> - </application> - <application name="LGeneral"> - <regname>LGeneral 1.1</regname> - <version>1.1</version> - <description>Panzer General Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lgeneral-1.1-win32.exe</location> - </application> - <application name="LMarbles"> - <regname>LMarbles 1.0.6</regname> - <version>1.0.6</version> - <description>Atomix Clone using SDL libs.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/lgames/lmarbles-1.0.6-win32.exe</location> - </application> <application name="WinBoard"> <regname>WinBoard 4.2.7b</regname> <version>4.2.7b</version> @@ -188,12 +101,6 @@ <description>WinBoard is a graphical chessboard for the Windows/ReactOS that can serve as a user interface for GNU Chess, Crafty, and other chess engines, for the Internet Chess Servers, and for electronic mail correspondence chess.</description> <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> </application> - </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> </category> <category name="Tools" icon="7"> <application name="7-Zip"> @@ -207,12 +114,6 @@ <version>1.7.7</version> <description>Small and fast BitTorrent Client.</description> <location>http://download.utorrent.com/1.7.7/utorrent.exe</location> - </application> - <application name="Audio Grabber"> - <regname>Audiograbber 1.83 SE</regname> - <version>1.83 SE</version> - <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location> </application> </category> <category name="Others" icon="8">

16 years, 5 months

[mkupfer] 34194: Radek Liska <radekliska AT gmail DOT com> - Czech translation patch for several parts - See issue #3413 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jun 29 15:36:47 2008 New Revision: 34194 URL: http://svn.reactos.org/svn/reactos?rev=34194&view=rev Log: Radek Liska <radekliska AT gmail DOT com> - Czech translation patch for several parts - See issue #3413 for more details. Added: trunk/reactos/base/applications/calc/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/netid/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/serialui/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/shdocvw/Cs.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/user32/lang/cs-CZ.rc (with props) trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc (with props) trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shdocvw/shdocvw.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shimgvw/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc trunk/reactos/dll/win32/user32/user32.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/subsystems/ntvdm/rsrc.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… Added: trunk/reactos/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/cs-C… Added: trunk/reactos/dll/win32/msgina/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/cs-C… Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… Added: trunk/reactos/dll/win32/netid/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/cs-CZ… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Added: trunk/reactos/dll/win32/newdev/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/cs-C… Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… Added: trunk/reactos/dll/win32/serialui/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/cs… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Added: trunk/reactos/dll/win32/shdocvw/Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Cs.rc?re… Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… Added: trunk/reactos/dll/win32/shimgvw/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/cs-… Modified: trunk/reactos/dll/win32/shimgvw/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/rsrc.rc?… Modified: trunk/reactos/dll/win32/syssetup/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/cs… Added: trunk/reactos/dll/win32/user32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/cs-C… Modified: trunk/reactos/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rc… Added: trunk/reactos/dll/win32/userenv/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/cs-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Added: trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/cs-C… Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r…

16 years, 5 months

[mkupfer] 34193: Nicolas Sapa < reactos AT byme DOT at> - Patch to fix build of rosapps. - See issue #3420 for more details.

by mkupfer＠svn.reactos.org

Author: mkupfer Date: Sun Jun 29 15:12:42 2008 New Revision: 34193 URL: http://svn.reactos.org/svn/reactos?rev=34193&view=rev Log: Nicolas Sapa < reactos AT byme DOT at> - Patch to fix build of rosapps. - See issue #3420 for more details. Modified: trunk/rosapps/net/netreg/netreg.rbuild trunk/rosapps/roshttpd/roshttpd.rbuild trunk/rosapps/sysutils/lsdd/lsdd.rbuild trunk/rosapps/sysutils/pedump/pedump.rbuild trunk/rosapps/sysutils/regexpl/regexpl.rbuild Modified: trunk/rosapps/net/netreg/netreg.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/net/netreg/netreg.rbuild?r… ============================================================================== --- trunk/rosapps/net/netreg/netreg.rbuild [iso-8859-1] (original) +++ trunk/rosapps/net/netreg/netreg.rbuild [iso-8859-1] Sun Jun 29 15:12:42 2008 @@ -6,6 +6,7 @@ <library>kernel32</library> <library>user32</library> <library>ws2_32</library> + <library>advapi32</library> <file>netreg.cpp</file> <file>netreg.rc</file> Modified: trunk/rosapps/roshttpd/roshttpd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/roshttpd/roshttpd.rbuild?r… ============================================================================== --- trunk/rosapps/roshttpd/roshttpd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/roshttpd/roshttpd.rbuild [iso-8859-1] Sun Jun 29 15:12:42 2008 @@ -8,7 +8,7 @@ <define name="_WIN32_WINNT">0x501</define> <library>kernel32</library> <library>ws2_32</library> - <library>kernel32</library> + <library>user32</library> <file>config.cpp</file> <file>error.cpp</file> <file>http.cpp</file> Modified: trunk/rosapps/sysutils/lsdd/lsdd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/lsdd/lsdd.rbuild?… ============================================================================== --- trunk/rosapps/sysutils/lsdd/lsdd.rbuild [iso-8859-1] (original) +++ trunk/rosapps/sysutils/lsdd/lsdd.rbuild [iso-8859-1] Sun Jun 29 15:12:42 2008 @@ -1,5 +1,4 @@ <module name="lsdd" type="win32cui" installbase="system32" installname="lsdd.exe"> - <linkerflag>--numeric-sort</linkerflag> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/sysutils/pedump/pedump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/pedump/pedump.rbu… ============================================================================== --- trunk/rosapps/sysutils/pedump/pedump.rbuild [iso-8859-1] (original) +++ trunk/rosapps/sysutils/pedump/pedump.rbuild [iso-8859-1] Sun Jun 29 15:12:42 2008 @@ -1,5 +1,4 @@ <module name="pedump" type="win32cui" installbase="system32" installname="pedump.exe"> - <linkerflag>--numeric-sort</linkerflag> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/rosapps/sysutils/regexpl/regexpl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/sysutils/regexpl/regexpl.r… ============================================================================== --- trunk/rosapps/sysutils/regexpl/regexpl.rbuild [iso-8859-1] (original) +++ trunk/rosapps/sysutils/regexpl/regexpl.rbuild [iso-8859-1] Sun Jun 29 15:12:42 2008 @@ -3,6 +3,7 @@ <define name="__USE_W32API" /> <library>kernel32</library> <library>user32</library> + <library>advapi32</library> <file>ArgumentParser.cpp</file> <file>Console.cpp</file>

16 years, 5 months

[janderwald] 34192: If there is no process name passed in, try to obtain the console title. If that does not work either, use default of cmd.exe as a title. - fixes bug 3397

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jun 29 12:26:38 2008 New Revision: 34192 URL: http://svn.reactos.org/svn/reactos?rev=34192&view=rev Log: If there is no process name passed in, try to obtain the console title. If that does not work either, use default of cmd.exe as a title. - fixes bug 3397 Modified: trunk/reactos/dll/cpl/console/console.c Modified: trunk/reactos/dll/cpl/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/console.c?… ============================================================================== --- trunk/reactos/dll/cpl/console/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/console.c [iso-8859-1] Sun Jun 29 12:26:38 2008 @@ -168,6 +168,7 @@ PROPSHEETHEADER psh; INT i=0; PConsoleInfo pConInfo; + WCHAR szTitle[100]; PConsoleInfo pSharedInfo = (PConsoleInfo)wParam; UNREFERENCED_PARAMETER(uMsg); @@ -222,17 +223,24 @@ ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); psh.dwSize = sizeof(PROPSHEETHEADER); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_NOAPPLYNOW; - if(_tcslen(pConInfo->szProcessName)) { psh.dwFlags |= PSH_PROPTITLE; psh.pszCaption = pConInfo->szProcessName; - } + } + else + { + if (!GetConsoleTitleW(szTitle, sizeof(szTitle)/sizeof(WCHAR))) + { + _tcscpy(szTitle, _T("cmd.exe")); + } + szTitle[(sizeof(szTitle)/sizeof(WCHAR))-1] = _T('\0'); + psh.pszCaption = szTitle; + } psh.hwndParent = hwnd; psh.hInstance = hApplet; psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); - psh.pszCaption = 0; psh.nPages = 4; psh.nStartPage = 0; psh.ppsp = psp;

16 years, 5 months

[hpoussin] 34191: Fix typo

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 29 10:45:18 2008 New Revision: 34191 URL: http://svn.reactos.org/svn/reactos?rev=34191&view=rev Log: Fix typo Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jun 29 10:45:18 2008 @@ -1590,7 +1590,7 @@ string linkerScriptArgument; if ( module.linkerScript != NULL ) - linkerScriptArgument = ssprintf ( " -T=%s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); + linkerScriptArgument = ssprintf ( " -T %s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); else linkerScriptArgument = "";

16 years, 5 months

[hpoussin] 34190: NTOSKRNL_SHARED should not contain linker parameters in compiler form

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 29 10:11:16 2008 New Revision: 34190 URL: http://svn.reactos.org/svn/reactos?rev=34190&view=rev Log: NTOSKRNL_SHARED should not contain linker parameters in compiler form Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-i386.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=341… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Sun Jun 29 10:11:16 2008 @@ -42,7 +42,7 @@ <include>include/reactos/arm</include> <property name="WINEBUILD_FLAGS" value="--kill-at"/> - <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> <if property="SARCH" value="versatile"> <define name="BOARD_CONFIG_VERSATILE"/> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=34… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Sun Jun 29 10:11:16 2008 @@ -13,7 +13,7 @@ <define name="_X86_" /> <define name="__i386__" /> - <property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/> + <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> <if property="OPTIMIZE" value="1"> <compilerflag>-Os</compilerflag>

16 years, 5 months

[hpoussin] 34189: Move some more linker args to temp file, so command line is not too long Fix link of C++ kernel mode dlls/drivers

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 29 08:49:39 2008 New Revision: 34189 URL: http://svn.reactos.org/svn/reactos?rev=34189&view=rev Log: Move some more linker args to temp file, so command line is not too long Fix link of C++ kernel mode dlls/drivers Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jun 29 08:49:39 2008 @@ -1603,21 +1603,25 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.output->name ); - fprintf ( fMakefile, "\t@echo $(subst $(SEP),/,%s) > %s\n", + /* HACK: if we have C++ in kernel, link it with some user mode dlls (kernel32 + msvcrt) ... */ + static const string libsCppKernel = " \"$(shell ${TARGET_CC} -print-file-name=libkernel32.a)\" \"$(shell ${TARGET_CC} -print-file-name=libmsvcrt.a)\""; + + fprintf ( fMakefile, "\t@echo $(subst $(SEP),/,%s)%s%s $(subst $(SEP),/,%s) > %s\n", objectsMacro.c_str (), + module.cplusplus ? " $(PROJECT_LPPFLAGS)" : "", + module.cplusplus && (module.type == KernelModeDLL || module.type == KernelModeDriver) ? libsCppKernel.c_str () : "", + libsMacro.c_str (), backend->GetFullName ( temp_obj ).c_str () ); CLEAN_FILE ( temp_obj ); if ( !module.IsDLL () ) { fprintf ( fMakefile, - "\t%s %s%s @%s %s%s %s -o %s\n", + "\t%s %s%s @%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_obj ).c_str (), - module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", - libsMacro.c_str (), GetLinkerMacro ().c_str (), target_macro.c_str () ); } @@ -1637,14 +1641,12 @@ module.underscoreSymbols ? " --add-underscore" : "" ); fprintf ( fMakefile, - "\t%s %s%s %s @%s %s%s %s -o %s\n", + "\t%s %s%s %s @%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_exp ).c_str (), backend->GetFullName ( temp_obj ).c_str (), - module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", - libsMacro.c_str (), GetLinkerMacro ().c_str (), target_macro.c_str () ); @@ -1666,13 +1668,11 @@ //printf ( "%s will have all its functions exported\n", // module.target->name.c_str () ); fprintf ( fMakefile, - "\t%s %s%s @%s %s%s %s -o %s\n", + "\t%s %s%s @%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_obj ).c_str (), - module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", - libsMacro.c_str (), GetLinkerMacro ().c_str (), target_macro.c_str () ); }

16 years, 5 months

[jimtabor] 34188: Sorry fixed Ellipse, see bug 3337.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sun Jun 29 08:23:08 2008 New Revision: 34188 URL: http://svn.reactos.org/svn/reactos?rev=34188&view=rev Log: Sorry fixed Ellipse, see bug 3337. Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c Modified: trunk/reactos/subsystems/win32/win32k/objects/fillshap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/fillshap.c [iso-8859-1] Sun Jun 29 08:23:08 2008 @@ -222,10 +222,16 @@ * Check the parameters. */ DPRINT("nLeftRect: %d, nTopRect: %d, nRightRect: %d, nBottomRect: %d\n",nLeftRect,nTopRect,nRightRect,nBottomRect); - if (nRightRect <= nLeftRect || nTopRect <= nBottomRect) - { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - return FALSE; + + if ((nLeftRect == nRightRect) || (nTopRect == nBottomRect)) return TRUE; + + if (nRightRect < nLeftRect) + { + INT tmp = nRightRect; nRightRect = nLeftRect; nLeftRect = tmp; + } + if (nBottomRect < nTopRect) + { + INT tmp = nBottomRect; nBottomRect = nTopRect; nTopRect = tmp; } /* @@ -294,15 +300,23 @@ DPRINT("2: Left: %d, Top: %d, Right: %d, Bottom: %d\n", RectBounds.left,RectBounds.top,RectBounds.right,RectBounds.bottom); - RadiusX = (RectBounds.right - RectBounds.left)/2; - RadiusY = (RectBounds.bottom - RectBounds.top)/2; + RadiusX = max((RectBounds.right - RectBounds.left) >> 1, 1); + RadiusY = max((RectBounds.bottom - RectBounds.top) >> 1, 1); CenterX = RectBounds.left + RadiusX; CenterY = RectBounds.top + RadiusY; DPRINT("3: RadiusX: %d, RadiusY: %d, CenterX: %d, CenterY: %d\n", RadiusX,RadiusY,CenterX,CenterY); - nx = RadiusX; - ny = -RadiusY; + if (RadiusX > RadiusY) + { + nx = RadiusX; + ny = RadiusY; + } + else + { + nx = RadiusY; + ny = RadiusX; + } da = -1; db = 0xFFFF; ix = 0;

16 years, 5 months

[hpoussin] 34187: Link C++ programs against target libraries, not host ones Remove most of <linkerflag> usage

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sun Jun 29 07:47:22 2008 New Revision: 34187 URL: http://svn.reactos.org/svn/reactos?rev=34187&view=rev Log: Link C++ programs against target libraries, not host ones Remove most of <linkerflag> usage Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/base/system/smss/smss.rbuild trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild trunk/reactos/dll/win32/crtdll/crtdll.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/lpk/lpk.rbuild trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild trunk/reactos/dll/win32/samsrv/samsrv.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/drivers/filesystems/ext2/ext2.rbuild trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild trunk/reactos/drivers/storage/class/disk/disk.rbuild trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -3,9 +3,9 @@ <module name="sol" type="win32gui" installbase="system32" installname="sol.exe" unicode="no" allowwarnings="true"> <include base="sol">.</include> <include base="sol">cardlib</include> - <linkerflag>-lstdc++</linkerflag> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> + <library>advapi32</library> <library>kernel32</library> <library>user32</library> <library>gdi32</library> Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -9,7 +9,6 @@ <define name="_DISABLE_TIDENTS" /> <define name="_WIN32_WINNT">0x0502</define> <define name="__NO_CTYPE_INLINES" /> - <linkerflag>-lgcc</linkerflag> <library>zlib</library> <library>inflib</library> <library>ext2lib</library> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -1,16 +1,15 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true"> - <linkerflag>-fexceptions</linkerflag> +<module name="explorer" type="win32gui" installname="explorer.exe" allowwarnings="true" unicode="yes"> <compilerflag compiler="cpp">-Wno-non-virtual-dtor</compilerflag> <include base="explorer">.</include> - <define name="UNICODE" /> <define name="WIN32" /> <define name="_WIN32_IE">0x0600</define> <define name="_WIN32_WINNT">0x0501</define> <define name="WINVER">0x0500</define> <define name="__WINDRES__" /> + <library>advapi32</library> <library>kernel32</library> <library>gdi32</library> <library>user32</library> Modified: trunk/reactos/base/system/smss/smss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.rbui… ============================================================================== --- trunk/reactos/base/system/smss/smss.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -7,7 +7,6 @@ <library>nt</library> <library>smlib</library> <library>ntdll</library> - <linkerflag>-lgcc</linkerflag> <pch>smss.h</pch> <compilationunit name="unit.c"> <file>client.c</file> Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="mesa32" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_MESA32}" installbase="system32" installname="mesa32.dll" allowwarnings="true"> <importlibrary definition="src/drivers/windows/icd/mesa.def" /> - <linkerflag>-Wl,--enable-stdcall-fixup</linkerflag> <library>ntdll</library> <library>kernel32</library> <library>msvcrt</library> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -16,9 +16,6 @@ <library>ntdllsys</library> <library>libcntpr</library> <library>pseh</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-nostartfiles</linkerflag> <dependency>ntstatus</dependency> <directory name="csr"> <file>api.c</file> Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -1,9 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cfgmgr32" type="win32dll" baseaddress="${BASEADDRESS_CFGMGR32}" entrypoint="0" installbase="system32" installname="cfgmgr32.dll"> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> <importlibrary definition="cfgmgr32.def" /> <file>cfgmgr32.rc</file> </module> Modified: trunk/reactos/dll/win32/crtdll/crtdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.rb… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -1,6 +1,4 @@ <module name="crtdll" type="win32dll" baseaddress="${BASEADDRESS_CRTDLL}" mangledsymbols="true" installbase="system32" installname="crtdll.dll"> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-lgcc</linkerflag> <importlibrary definition="crtdll.def" /> <include base="crtdll">.</include> <include base="crt">include</include> Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -50,8 +50,5 @@ <file>utils.c</file> <file>path.c</file> </directory> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <file>gdi32.rc</file> </module> Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -131,9 +131,6 @@ <library>wine</library> <library>pseh</library> <library>ntdll</library> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <file>kernel32.rc</file> </module> </group> Modified: trunk/reactos/dll/win32/lpk/lpk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lpk/lpk.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lpk/lpk.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -13,8 +13,5 @@ <file>dllmain.c</file> <file>stub.c</file> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <file>lpk.rc</file> </module> Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.rb… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -4,8 +4,6 @@ <include base="lsa_server">.</include> <define name="WINVER">0x600</define> <define name="_WIN32_WINNT">0x0600</define> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <library>lsa_server</library> <library>ntdll</library> <library>kernel32</library> Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -1,8 +1,4 @@ <module name="msvcrt" type="win32dll" baseaddress="${BASEADDRESS_MSVCRT}" mangledsymbols="true" installbase="system32" installname="msvcrt.dll"> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>--enable-stdcall-fixup</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> <importlibrary definition="msvcrt.def" /> <include base="msvcrt">.</include> <include base="crt">include</include> Modified: trunk/reactos/dll/win32/samsrv/samsrv.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rb… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -3,8 +3,6 @@ <module name="samsrv" type="win32dll" baseaddress="${BASEADDRESS_SAMSRV}" entrypoint="0" installbase="system32" installname="samsrv.dll" unicode="yes"> <importlibrary definition="samsrv.def" /> <include base="samsrv">.</include> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <library>ntdll</library> <library>kernel32</library> <file>samsrv.c</file> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -74,8 +74,5 @@ <file>window.c</file> <file>winpos.c</file> </directory> - <linkerflag>-lgcc</linkerflag> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> <file>user32.rc</file> </module> Modified: trunk/reactos/drivers/filesystems/ext2/ext2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/e… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/ext2.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -3,7 +3,6 @@ <module name="ext2fs" type="kernelmodedriver" installbase="system32/drivers" installname="ext2.sys" allowwarnings="true"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="ext2fs">inc</include> - <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <directory name="src"> Modified: trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -3,7 +3,6 @@ <module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <include base="fastfat">.</include> - <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <file>blockdev.c</file> Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -2,7 +2,6 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="ramdisk" type="kernelmodedriver" installbase="system32/drivers" installname="ramdisk.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <library>class2</library> Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -20,6 +20,4 @@ <file>ros_glue.cpp</file> <file>ros_glue_asm.s</file> </directory> - - <linkerflag>-lgcc</linkerflag> </module> Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -9,7 +9,6 @@ --> <module name="mpu401" type="kernelmodedriver" installbase="system32/drivers" installname="mpu401.sys" allowwarnings="true" entrypoint="DriverEntry"> - <linkerflag>-Wl,--entry,_DriverEntry@8</linkerflag> <include base="mpu401">.</include> <include base="mpu401">..</include> <library>ntoskrnl</library> Modified: trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.r… ============================================================================== --- trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/bzip2/bzip2.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -4,7 +4,6 @@ <importlibrary definition="unbzip2.def" /> <define name="BZ_NO_STDIO" /> <define name="BZ_DECOMPRESS_ONLY" /> - <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library> <file>bzlib.c</file> Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -458,8 +458,5 @@ <file>wmi.c</file> </directory> <file>ntoskrnl.rc</file> - <linkerflag>-nostartfiles</linkerflag> - <linkerflag>-nostdlib</linkerflag> - <linkerflag>-lgcc</linkerflag> <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript> </group> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -526,8 +526,9 @@ fprintf ( fMakefile, "PROJECT_RCFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); - fprintf ( fMakefile, "PROJECT_LFLAGS := %s\n", + fprintf ( fMakefile, "PROJECT_LFLAGS := \"$(shell ${TARGET_CC} -print-libgcc-file-name)\" %s\n", GenerateProjectLFLAGS ().c_str () ); + fprintf ( fMakefile, "PROJECT_LPPFLAGS := \"$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libgcc.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)\" \"$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)\"\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -743,10 +743,9 @@ size_t i; bool generateAssignment; + generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0; if ( generatingCompilerMacro ) - generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0 || data.compilerFlags.size () > 0; - else - generateAssignment = (use_pch && module.pch != NULL ) || data.includes.size () > 0 || data.defines.size () > 0; + generateAssignment |= data.compilerFlags.size () > 0; if ( generateAssignment ) { fprintf ( fMakefile, @@ -1581,7 +1580,8 @@ { const FileLocation *target_file = GetTargetFilename ( module, NULL ); const FileLocation *definitionFilename = GetDefinitionFilename (); - string linker = module.cplusplus ? "${gpp}" : "${gcc}"; + const FileLocation temp_obj ( TemporaryDirectory, "", module.name + ".temp.ld" ); + string linker = "${ld}"; string objectsMacro = GetObjectsMacro ( module ); string libsMacro = GetLibsMacro (); @@ -1590,7 +1590,7 @@ string linkerScriptArgument; if ( module.linkerScript != NULL ) - linkerScriptArgument = ssprintf ( " -Wl,-T,%s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); + linkerScriptArgument = ssprintf ( " -T=%s", backend->GetFullName ( *module.linkerScript->file ).c_str () ); else linkerScriptArgument = ""; @@ -1603,17 +1603,23 @@ fprintf ( fMakefile, "\t$(ECHO_LD)\n" ); string targetName ( module.output->name ); + fprintf ( fMakefile, "\t@echo $(subst $(SEP),/,%s) > %s\n", + objectsMacro.c_str (), + backend->GetFullName ( temp_obj ).c_str () ); + CLEAN_FILE ( temp_obj ); + if ( !module.IsDLL () ) { fprintf ( fMakefile, - "\t%s %s%s -o %s %s %s %s\n", + "\t%s %s%s @%s %s%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target_macro.c_str (), - objectsMacro.c_str (), + backend->GetFullName ( temp_obj ).c_str (), + module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", libsMacro.c_str (), - GetLinkerMacro ().c_str () ); + GetLinkerMacro ().c_str (), + target_macro.c_str () ); } else if ( module.HasImportLibrary () ) { @@ -1631,15 +1637,16 @@ module.underscoreSymbols ? " --add-underscore" : "" ); fprintf ( fMakefile, - "\t%s %s%s %s -o %s %s %s %s\n", + "\t%s %s%s %s @%s %s%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), backend->GetFullName ( temp_exp ).c_str (), - target_macro.c_str (), - objectsMacro.c_str (), + backend->GetFullName ( temp_obj ).c_str (), + module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", libsMacro.c_str (), - GetLinkerMacro ().c_str () ); + GetLinkerMacro ().c_str (), + target_macro.c_str () ); fprintf ( fMakefile, "\t$(Q)$(PEFIXUP_TARGET) %s -exports%s\n", @@ -1659,14 +1666,15 @@ //printf ( "%s will have all its functions exported\n", // module.target->name.c_str () ); fprintf ( fMakefile, - "\t%s %s%s -o %s %s %s %s\n", + "\t%s %s%s @%s %s%s %s -o %s\n", linker.c_str (), linkerParameters.c_str (), linkerScriptArgument.c_str (), - target_macro.c_str (), - objectsMacro.c_str (), + backend->GetFullName ( temp_obj ).c_str (), + module.cplusplus ? "$(PROJECT_LPPFLAGS) " : "", libsMacro.c_str (), - GetLinkerMacro ().c_str () ); + GetLinkerMacro ().c_str (), + target_macro.c_str () ); } GenerateBuildMapCode (); @@ -2529,7 +2537,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s", + string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s", module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (), module.baseaddress.c_str () ); @@ -2652,7 +2660,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", + string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2701,7 +2709,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", + string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2749,7 +2757,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib -shared", + string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2797,7 +2805,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -nostdlib", + string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2922,7 +2930,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", + string linkerParameters = ssprintf ( "-subsystem=console -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2964,7 +2972,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -shared", + string linkerParameters = ssprintf ( "-subsystem=console -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -3013,7 +3021,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + string linkerParameters = ssprintf ( "-subsystem=console -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -3062,7 +3070,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,windows -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + string linkerParameters = ssprintf ( "-subsystem=windows -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -3684,7 +3692,7 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,--subsystem,console -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000", + string linkerParameters = ssprintf ( "-subsystem=console -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000", module.GetEntryPoint(true).c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h [iso-8859-1] Sun Jun 29 07:47:22 2008 @@ -250,7 +250,6 @@ MingwKernelModeDLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } void AddImplicitLibraries ( Module& module ); private: void GenerateKernelModeDLLModuleTarget (); @@ -264,7 +263,6 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTDRIVER__"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } void AddImplicitLibraries ( Module& module ); private: void GenerateKernelModeDriverModuleTarget (); @@ -277,7 +275,6 @@ MingwNativeDLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } void AddImplicitLibraries ( Module& module ); private: void GenerateNativeDLLModuleTarget (); @@ -291,7 +288,6 @@ virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); std::string TypeSpecificCFlags() { return "-D__NTAPP__"; } - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } void AddImplicitLibraries ( Module& module ); private: void GenerateNativeCUIModuleTarget (); @@ -304,7 +300,6 @@ MingwWin32DLLModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32DLLModuleTarget (); @@ -317,7 +312,6 @@ MingwWin32OCXModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32OCXModuleTarget (); @@ -330,7 +324,6 @@ MingwWin32CUIModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32CUIModuleTarget (); @@ -343,7 +336,6 @@ MingwWin32GUIModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return module.cplusplus ? "-nostartfiles -lgcc" : "-nostartfiles -nostdlib -lgcc"; } void AddImplicitLibraries ( Module& module ); private: void GenerateWin32GUIModuleTarget (); @@ -431,7 +423,6 @@ MingwTestModuleHandler ( const Module& module ); virtual HostType DefaultHost() { return HostFalse; } virtual void Process (); - std::string TypeSpecificLinkerFlags() { return "-nostartfiles -nostdlib"; } protected: virtual void GetModuleSpecificCompilationUnits ( std::vector<CompilationUnit*>& compilationUnits ); private:

16 years, 5 months

← Newer
1
2
3
4
5
6
7
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2008