Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 52368: patch by Song Fuchang (0xfc) <sfc_0 AT yahoo DOT com DOT cn>: - [TRANSLATIONS] add Simplified Chinese translation for calc - #pragma code_page(65001) added in zh-CN.rc (needs to be...
by mkupfer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: mkupfer Date: Sun Jun 19 16:34:58 2011 New Revision: 52368 URL: http://svn.reactos.org/svn/reactos?rev=52368&view=rev Log: patch by Song Fuchang (0xfc) <sfc_0 AT yahoo DOT com DOT cn>: - [TRANSLATIONS] add Simplified Chinese translation for calc - #pragma code_page(65001) added in zh-CN.rc (needs to be reviewed) - See issue #6319 for details. Added: trunk/reactos/base/applications/calc/lang/zh-CN.rc (with props) Modified: trunk/reactos/base/applications/calc/resource.rc Added: trunk/reactos/base/applications/calc/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/zh-CN.rc (added) +++ trunk/reactos/base/applications/calc/lang/zh-CN.rc [iso-8859-1] Sun Jun 19 16:34:58 2011 @@ -1,0 +1,740 @@ +/* + * Simplified Chinese translation for calc + * + * By: Song Fuchang (0xfc) <sfc_0(a)yahoo.com.cn> + */ + +#pragma code_page(65001) + +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED + +// Dialog + +IDD_DIALOG_SCIENTIFIC DIALOGEX 0, 0, 316, 161 +STYLE DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "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 "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 "åå",IDC_RADIO_QWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,148,24,37,10 + CONTROL "åå",IDC_RADIO_DWORD,"Button",BS_AUTORADIOBUTTON | + NOT WS_VISIBLE,188,24,37,10 + CONTROL "å",IDC_RADIO_WORD,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,232,24,33,10 + CONTROL "åè",IDC_RADIO_BYTE,"Button",BS_AUTORADIOBUTTON | NOT + WS_VISIBLE,272,24,30,10 + CONTROL "è§åº¦",IDC_RADIO_DEG,"Button",BS_AUTORADIOBUTTON,148,24, + 42,10 + CONTROL "å¼§åº¦",IDC_RADIO_RAD,"Button",BS_AUTORADIOBUTTON,192, + 24,42,10 + CONTROL "æ¢¯åº¦",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 "Back",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 "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 "Back",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 DS_SHELLFONT | WS_MINIMIZEBOX | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS è®¡ç®å¨" +MENU IDR_MENU_STANDARD +FONT 8, "MS Shell Dlg" +BEGIN + PUSHBUTTON "è½¬æ¢",IDC_BUTTON_CONVERT,35,105,76,17 + COMBOBOX IDC_COMBO_CATEGORY,4,31,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ç±»å«:",IDC_STATIC,4,20,56,8 + COMBOBOX IDC_COMBO_FROM,4,60,140,168,CBS_DROPDOWNLIST | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "ä»...è½¬æ¢:",IDC_STATIC,4,49,56,8 + COMBOBOX IDC_COMBO_TO,4,87,140,168,CBS_DROPDOWNLIST | WS_VSCROLL | + WS_TABSTOP | CBS_SORT + LTEXT "è½¬æ¢ä¸º:",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 "Back",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_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "å³äº ReactOS è®¡ç®å¨" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "ç¡®å®",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 è®¡ç®å¨",IDC_STATIC,120,12,132,8, + SS_CENTERIMAGE + LTEXT "çæ¬ ",IDC_TEXT_VERSION,120,20,132,8,SS_CENTERIMAGE + LTEXT "ä½è 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 "ç»è®¡æ¡" +FONT 8, "MS Shell Dlg" +BEGIN + LISTBOX IDC_LIST_STAT,4,4,156,40,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "è¿å",IDC_BUTTON_RET,4,48,36,16 + PUSHBUTTON "å è½½",IDC_BUTTON_LOAD,44,48,36,16 + PUSHBUTTON "æ¸é¤",IDC_BUTTON_CD,84,48,36,16 + PUSHBUTTON "å¨æ¸",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 "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "åè¿å¶\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "å«è¿å¶\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "äºè¿å¶\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "è§åº¦\tF2", IDM_VIEW_DEG, CHECKED + MENUITEM "å¼§åº¦\tF3", IDM_VIEW_RAD, CHECKED + MENUITEM "æ¢¯åº¦\tF4", IDM_VIEW_GRAD, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +IDR_MENU_SCIENTIFIC_2 MENU DISCARDABLE +BEGIN + POPUP "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "ååè¿å¶\tF5", IDM_VIEW_HEX, CHECKED + MENUITEM "åè¿å¶\tF6", IDM_VIEW_DEC, CHECKED + MENUITEM "å«è¿å¶\tF7", IDM_VIEW_OCT, CHECKED + MENUITEM "äºè¿å¶\tF8", IDM_VIEW_BIN, CHECKED + MENUITEM SEPARATOR + MENUITEM "åå\tF12", IDM_VIEW_QWORD, CHECKED + MENUITEM "åå\tF2", IDM_VIEW_DWORD, CHECKED + MENUITEM "å\tF3", IDM_VIEW_WORD, CHECKED + MENUITEM "åè\tF4", IDM_VIEW_BYTE, CHECKED + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +IDR_MENU_STANDARD MENU DISCARDABLE +BEGIN + POPUP "ç¼è¾" + BEGIN + MENUITEM "å¤å¶\tCtrl+C", IDM_EDIT_COPY + MENUITEM "ç²è´´\tCtrl+V", IDM_EDIT_PASTE + END + POPUP "æ¥ç" + BEGIN + MENUITEM "æ åå", IDM_VIEW_STANDARD, CHECKED + MENUITEM "ç§å¦å", IDM_VIEW_SCIENTIFIC, CHECKED + MENUITEM "è½¬æ¢", IDM_VIEW_CONVERSION + MENUITEM SEPARATOR + MENUITEM "æ°ååç»", IDM_VIEW_GROUP, CHECKED + END + POPUP "å¸®å©" + BEGIN + MENUITEM "å¸®å©ä¸»é¢", IDM_HELP_HELP + MENUITEM SEPARATOR + MENUITEM "å³äº ReactOS è®¡ç®å¨", IDM_HELP_ABOUT + END +END + +// String Tables + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STRING_LICENSE "ReactOS è®¡ç®å¨æ¯å¨ GNU GPL åè®®ä¸åè¡çèªç±è½¯ä»¶ã\r\n\r\nä½ å¯ä»¥ä»è¿å¿åå¾ä¸ä»½ GNU GPL åè®®çå¯æ¬ï¼\r\nhttp://www.gnu.org/licenses/gpl.html\r\n\r\nä½ ä¹å¯ä»¥ä»è¿å¿åå¾å¶ç¿»è¯ï¼\r\nhttp://www.gnu.org/licenses/translations.html" + IDS_MATH_ERROR "éè¯¯" + IDS_QUICKHELP "å¿«éå¸®å©" +END + +// Types of conversion +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONV_ANGLE "è§" + IDS_CONV_AREA "é¢ç§¯" + IDS_CONV_CONSUMPTION "æ²¹è (å¼æ)" + IDS_CONV_CURRENCY "è´§å¸" + IDS_CONV_ENERGY "è½é" + IDS_CONV_LENGTH "é¿åº¦" + IDS_CONV_POWER "åç" + IDS_CONV_PRESSURE "åå" + IDS_CONV_TEMPERATURE "æ¸©åº¦" + IDS_CONV_TIME "æ¶é´" + IDS_CONV_VELOCITY "éåº¦" + IDS_CONV_VOLUME "ä½ç§¯" + IDS_CONV_WEIGHT "è´¨é" +END + +// TYPES OF ANGLES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ANGLE_DEGREES "è§åº¦" + IDS_ANGLE_GRADIANS "æ¢¯åº¦" + IDS_ANGLE_RADIANS "å¼§åº¦" +END + +// TYPES OF AREAS +STRINGTABLE DISCARDABLE +BEGIN + IDS_AREA_ACRES "è±äº©" + IDS_AREA_ACRES_BRAZIL "è±äº© (å·´è¥¿)" + IDS_AREA_ACRES_FRANCE "è±äº© (æ³å½)" + IDS_AREA_ACRES_SCOTS "è±äº© (èæ ¼å°)" + IDS_AREA_ACRES_US "è±äº© (ç¾å½)" + IDS_AREA_ARES "å¬äº©" + IDS_AREA_CHOU "ç´" + IDS_AREA_DANBO "å¤§äº©" + IDS_AREA_HECTARES "å¬é¡·" + IDS_AREA_JEONGBO "Jeongbo" + IDS_AREA_MORGEN_HUNGARY "æ©æ ¹ (åçå©)" + IDS_AREA_MU "äº©" + IDS_AREA_PING "åª" + IDS_AREA_PYEONG "åª (é©å½)" + IDS_AREA_PYEONGBANGJA "Pyeongbangja" + IDS_AREA_RAI "è±" + IDS_AREA_SE "äº© (æ¥æ¬)" + IDS_AREA_SQUARE_CENTIMETERS "å¹³æ¹åç±³" + IDS_AREA_SQUARE_CHR "Square chr" + IDS_AREA_SQUARE_FATHOMS "å¹³æ¹è±å¯»" + IDS_AREA_SQUARE_FATHOMS_HUNGARY "å¹³æ¹è±å¯» (åçå©)" + IDS_AREA_SQUARE_FEET "å¹³æ¹è±å°º" + IDS_AREA_SQUARE_INCHES "å¹³æ¹è±å¯¸" + IDS_AREA_SQUARE_KILOMETERS "å¹³æ¹åç±³" + IDS_AREA_SQUARE_LAR "å¹³æ¹æå°" + IDS_AREA_SQUARE_METER "å¹³æ¹ç±³" + IDS_AREA_SQUARE_MILES "å¹³æ¹è±é" + IDS_AREA_SQUARE_MILLIMETERS "å¹³æ¹æ¯«ç±³" + IDS_AREA_SQUARE_SHAKU "å¹³æ¹å°º" + IDS_AREA_SQUARE_TSUEN "å¹³æ¹å¯¸" + IDS_AREA_SQUARE_VA "Square va" + IDS_AREA_SQUARE_YARD "å¹³æ¹ç " + IDS_AREA_TAN "æ®µ" + IDS_AREA_TSUBO "åª (æ¥æ¬)" +END + +// TYPES OF COMSUMPTIONS +STRINGTABLE DISCARDABLE +BEGIN + IDS_CONSUMPTION_KM_PER_L "åç±³/å" + IDS_CONSUMPTION_L_PER_100_KM "å/100 åç±³" + IDS_CONSUMPTION_MILES_GALLON_UK "è±é/å ä» (è±å½)" + IDS_CONSUMPTION_MILES_GALLON_US "è±é/å ä» (ç¾å½)" +END + +// TYPES OF CURRENCIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURRENCY_AUSTRIAN_SCHILLING "å¥¥å°å©åä»¤" + IDS_CURRENCY_BELGIAN_FRANC "æ¯å©æ¶æ³é" + IDS_CURRENCY_CYPRIOT_POUND "å¡æµ¦è·¯æ¯é" + IDS_CURRENCY_CZECH_KORUNA "æ·ååæ" + IDS_CURRENCY_DEUTSCHE_MARK "å¾·å½é©¬å" + IDS_CURRENCY_DUTCH_GUILDER "è·å°ç¾" + IDS_CURRENCY_EURO "æ¬§å" + IDS_CURRENCY_FINNISH_MARKKA "è¬å°é©¬å" + IDS_CURRENCY_FRENCH_FRANC "æ³é" + IDS_CURRENCY_GREEK_DRACHMA "å¸èå¾·æåé©¬" + IDS_CURRENCY_IRISH_POUND "ç±å°å°é" + IDS_CURRENCY_ITALIAN_LIRA "æå¤§å©éæ" + IDS_CURRENCY_LUXEMBOURG_FRANC "å¢æ£®å ¡æ³é" + IDS_CURRENCY_MALTESE_LIRA "é©¬è³ä»éæ" + IDS_CURRENCY_PORTOGUESE_ESCUDO "è¡èçåæ¯åºå¤" + IDS_CURRENCY_SLOVAK_KORUNA "æ¯æ´ä¼ååæ" + IDS_CURRENCY_SLOVENIAN_TOLAR "æ¯æ´æå°¼äºææ" + IDS_CURRENCY_SPANISH_PESETA "è¥¿ççæ¯å¡å¡" +END + +// TYPES OF ENERGIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_ENERGY_15_C_CALORIES "15 Â°C å¡è·¯é" + IDS_ENERGY_BTUS "è±å¶çéåä½" + IDS_ENERGY_ERGS "å°æ ¼" + IDS_ENERGY_EVS "çµåä¼ç¹" + IDS_ENERGY_FOOT_POUNDS "è±å°º-ç£" + IDS_ENERGY_IT_CALORIES "å½éè¸æ±½è¡¨å¡è·¯é" + IDS_ENERGY_IT_KILOCALORIES "å½éè¸æ±½è¡¨åå¡è·¯é" + IDS_ENERGY_JOULES "ç¦è³" + IDS_ENERGY_KILOJOULES "åç¦" + IDS_ENERGY_KILOWATT_HOURS "åç¦æ¶" + IDS_ENERGY_NUTRITION_CALORIES "è¥å»å¡è·¯é" + IDS_ENERGY_TH_CALORIES "çåå¦å¡è·¯é" +END + +// TYPES OF LENGTHS +STRINGTABLE DISCARDABLE +BEGIN + IDS_LENGTH_ANGSTROMS "å" + IDS_LENGTH_ASTRONOMICAL_UNITS "å¤©æåä½" + IDS_LENGTH_BARLEYCORNS "å·´å©è¯" + IDS_LENGTH_CENTIMETERS "åç±³" + IDS_LENGTH_CHAINS_UK "é¾ (è±å½)" + IDS_LENGTH_CHI "å°º" + IDS_LENGTH_CHOU "ç´" + IDS_LENGTH_CHR "Chr" + IDS_LENGTH_CUN "å¯¸" + IDS_LENGTH_FATHOMS "è±å¯»" + IDS_LENGTH_FATHOMS_HUNGARY "è±å¯» (åçå©)" + IDS_LENGTH_FEET "è±å°º" + IDS_LENGTH_FURLONGS "æµª" + IDS_LENGTH_GAN "æ" + IDS_LENGTH_HANDS "æå®½" + IDS_LENGTH_HUNH "Hunh" + IDS_LENGTH_INCHES "è±å°º" + IDS_LENGTH_JA "å°º (é©å½)" + IDS_LENGTH_JEONG "Jeong" + IDS_LENGTH_KABIET "Kabiet" + IDS_LENGTH_KEN "Ken" + IDS_LENGTH_KEUB "Keub" + IDS_LENGTH_KILOMETERS "åç±³" + IDS_LENGTH_LAR "æå°" + IDS_LENGTH_LIGHT_YEARS "åå¹´" + IDS_LENGTH_LINKS_UK "Links (UK)" + IDS_LENGTH_METERS "ç±³" + IDS_LENGTH_MICRONS "å¾®ç±³" + IDS_LENGTH_MILES "è±é" + IDS_LENGTH_MILLIMETERS "æ¯«ç±³" + IDS_LENGTH_NAUTICAL_MILES "æµ·é" + IDS_LENGTH_NIEU "Nieu" + IDS_LENGTH_PARSECS "Parsecs" + IDS_LENGTH_PICAS "Picas" + IDS_LENGTH_RI_JAPAN "é (æ¥æ¬)" + IDS_LENGTH_RI_KOREA "é (é©å½)" + IDS_LENGTH_RODS "æ" + IDS_LENGTH_SAWK "Sawk" + IDS_LENGTH_SEN "Sen" + IDS_LENGTH_SHAKU "å°º (æ¥æ¬)" + IDS_LENGTH_SPAN "Span" + IDS_LENGTH_SUN "å¯¸ (æ¥æ¬)" + IDS_LENGTH_TSUEN "å¯¸" + IDS_LENGTH_VA "Va" + IDS_LENGTH_YARDS "ç " + IDS_LENGTH_YOTE "çº¦ç¹" + IDS_LENGTH_ZHANG "ä¸" +END + +// TYPES OF POWERS +STRINGTABLE DISCARDABLE +BEGIN + IDS_POWER_BTUS_PER_MINUTE "è±å¶çéåä½æ¯åé" + IDS_POWER_FPS_PER_MINUTE "è±å°º-ç£æ¯åé" + IDS_POWER_HORSEPOWER "é©¬å" + IDS_POWER_KILOWATTS "åç¦" + IDS_POWER_MEGAWATTS "åç¦" + IDS_POWER_WATTS "ç¦" +END + +// TYPE OF PRESSURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_PRESSURE_ATMOSPHERES "å¤§æ°å" + IDS_PRESSURE_BARS "å·´" + IDS_PRESSURE_HECTOPASCALS "ç¾å¸" + IDS_PRESSURE_KILOPASCALS "åå¸" + IDS_PRESSURE_MM_OF_MERCURY "æ¯«ç±³æ±æ±" + IDS_PRESSURE_PASCALS "å¸" + IDS_PRESSURE_PSI "è±ç£-åæ¯å¹³æ¹è±å°º" +END + +// TYPES OF TEMPERATURES +STRINGTABLE DISCARDABLE +BEGIN + IDS_TEMPERATURE_CELSIUS "ææ°åº¦" + IDS_TEMPERATURE_FAHRENHEIT "åæ°åº¦" + IDS_TEMPERATURE_KELVIN "å¼å°æ" + IDS_TEMPERATURE_RANKINE "å°éåº¦" +END + +// TYPES OF TIME +STRINGTABLE DISCARDABLE +BEGIN + IDS_TIME_DAYS "æ¥" + IDS_TIME_HOURS "å°æ¶" + IDS_TIME_NANOSECONDS "çº³ç§" + IDS_TIME_MICROSECONDS "å¾®ç§" + IDS_TIME_MILLISECONDS "æ¯«ç§" + IDS_TIME_MINUTES "å" + IDS_TIME_SECONDS "ç§" + IDS_TIME_WEEKS "å¨" + IDS_TIME_YEARS "å¹´" +END + +// TYPES OF VELOCITIES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VELOCITY_CMS_SECOND "åç±³/å°æ¶" + IDS_VELOCITY_FEET_HOUR "è±å°º/å°æ¶" + IDS_VELOCITY_FEET_SECOND "è±å°º/ç§" + IDS_VELOCITY_KILOMETERS_HOUR "åç±³/å°æ¶" + IDS_VELOCITY_KNOTS "è" + IDS_VELOCITY_MACH "é©¬èµ«" + IDS_VELOCITY_METERS_SECOND "ç±³/ç§" + IDS_VELOCITY_MILES_HOUR "è±é/å°æ¶" +END + +// TYPES OF VOLUMES +STRINGTABLE DISCARDABLE +BEGIN + IDS_VOLUME_BARRELS_UK "æ¡¶ (è±å½)" + IDS_VOLUME_BARRELS_OIL "æ¡¶æ²¹" + IDS_VOLUME_BUN "Bun" + IDS_VOLUME_BUSHELS_UK "è²å¼è³ (è±å½)" + IDS_VOLUME_BUSHELS_US "è²å¼è³ (ç¾å½)" + IDS_VOLUME_CUBIC_CENTIMETERS "ç«æ¹åç±³" + IDS_VOLUME_CUBIC_FEET "ç«æ¹è±å°º" + IDS_VOLUME_CUBIC_INCHES "ç«æ¹è±å¯¸" + IDS_VOLUME_CUBIC_METERS "ç«æ¹ç±³" + IDS_VOLUME_CUBIC_YARDS "ç«æ¹ç " + IDS_VOLUME_DOE "Doe" + IDS_VOLUME_FLUID_OUNCES_UK "æ¶²çå¸ (è±å½)" + IDS_VOLUME_FLUID_OUNCES_US "æ¶²çå¸ (ç¾å½)" + IDS_VOLUME_GALLONS_UK "å ä» (è±å½)" + IDS_VOLUME_GALLONS_DRY_US "å¹²éå ä» (ç¾å½)" + IDS_VOLUME_GALLONS_LIQUID_US "æ¶²å ä» (ç¾å½)" + IDS_VOLUME_GOU "å" + IDS_VOLUME_HOP "Hop" + IDS_VOLUME_ICCE "Icce" + IDS_VOLUME_KWIAN "Kwian" + IDS_VOLUME_LITERS "å" + IDS_VOLUME_MAL "Mal" + IDS_VOLUME_MILLILITERS "æ¯«å" + IDS_VOLUME_PINTS_UK "åè± (è±å½)" + IDS_VOLUME_PINTS_DRY_US "å¹²éåè± (ç¾å½)" + IDS_VOLUME_PINTS_LIQUID_US "æ¶²åè± (ç¾å½)" + IDS_VOLUME_QUARTS_UK "å¤¸è± (è±å½)" + IDS_VOLUME_QUARTS_DRY_US "å¹²éå¤¸è± (ç¾å½)" + IDS_VOLUME_QUARTS_LIQUID_US "æ¶²å¤¸è± (ç¾å½)" + IDS_VOLUME_SEKI "Seki" + IDS_VOLUME_SYOU "Syou" + IDS_VOLUME_TANANLOUNG "Tananloung" + IDS_VOLUME_TANG "Tang" + IDS_VOLUME_TO "æ (æ¥æ¬)" +END + +// TYPES OF WEIGHTS +STRINGTABLE DISCARDABLE +BEGIN + IDS_WEIGHT_BAHT "é¢" + IDS_WEIGHT_CARATS "åæ" + IDS_WEIGHT_CHUNG "Chung" + IDS_WEIGHT_DON "Don" + IDS_WEIGHT_GEUN "Geun" + IDS_WEIGHT_GRAMS "å" + IDS_WEIGHT_GWAN "Gwan" + IDS_WEIGHT_HARB "Harb" + IDS_WEIGHT_JIN_CHINA "æ¤ (ä¸å½)" + IDS_WEIGHT_JIN_TAIWAN "æ¤ (ä¸å½å°æ¹¾)" + IDS_WEIGHT_KAN "è´¯ (æ¥æ¬)" + IDS_WEIGHT_KILOGRAMS "åå" + IDS_WEIGHT_KIN "æ¤ (æ¥æ¬)" + IDS_WEIGHT_LIANG_CHINA "ä¸¤ (ä¸å½)" + IDS_WEIGHT_LIANG_TAIWAN "ä¸¤ (ä¸å½å°æ¹¾)" + IDS_WEIGHT_MONME "ä¸¤ (æ¥æ¬)" + IDS_WEIGHT_OUNCES_AVOIRDUPOIS "å¸¸è¡¡çå¸" + IDS_WEIGHT_OUNCES_TROY "éè¡¡çå¸" + IDS_WEIGHT_POUNDS "è±ç£" + IDS_WEIGHT_QUINTAL_METRIC "å¬æ" + IDS_WEIGHT_SALOUNG "Saloung" + IDS_WEIGHT_STONES "ç³" + IDS_WEIGHT_TAMLUNG "Tamlung" + IDS_WEIGHT_TONNES "å¨" + IDS_WEIGHT_TONS_UK "å¨ (è±å½)" + IDS_WEIGHT_TONS_US "å¨ (ç¾å½)" +END Propchange: trunk/reactos/base/applications/calc/lang/zh-CN.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] Sun Jun 19 16:34:58 2011 @@ -59,6 +59,7 @@ #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" +#include "lang/zh-CN.rc" // UTF-8

1 0

[jgardou] 52367: [NOTSKRNL] - Addendum to 52366: get back old code, thanks to Alex
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 13:59:33 2011 New Revision: 52367 URL: http://svn.reactos.org/svn/reactos?rev=52367&view=rev Log: [NOTSKRNL] - Addendum to 52366: get back old code, thanks to Alex Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sun Jun 19 13:59:33 2011 @@ -1510,7 +1510,7 @@ /* Set thread fields */ Thread->TrapFrame = TrapFrame; - Thread->PreviousMode = KiUserTrap(TrapFrame) ? UserMode : KernelMode; + Thread->PreviousMode = KiUserTrap(TrapFrame); /* Enable interrupts */ _enable();

1 0

[gadamopoulos] 52366: [NTOSKRNL] - Fix incorrect KiUserTrap which returned 3 for UserMode traps. Kind-of spotted by Jerome, but fixed in the wrong place...ReactOS-style, as always. -Patch by Alex I...
by gadamopoulos＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gadamopoulos Date: Sun Jun 19 13:55:28 2011 New Revision: 52366 URL: http://svn.reactos.org/svn/reactos?rev=52366&view=rev Log: [NTOSKRNL] - Fix incorrect KiUserTrap which returned 3 for UserMode traps. Kind-of spotted by Jerome, but fixed in the wrong place...ReactOS-style, as always. -Patch by Alex Ionescu Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sun Jun 19 13:55:28 2011 @@ -34,7 +34,7 @@ KiUserTrap(IN PKTRAP_FRAME TrapFrame) { /* Anything else but Ring 0 is Ring 3 */ - return (TrapFrame->SegCs & MODE_MASK); + return !!(TrapFrame->SegCs & MODE_MASK); } //

1 0

[jgardou] 52365: [GDI32] - remove useless check.
by jgardou＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: jgardou Date: Sun Jun 19 13:11:39 2011 New Revision: 52365 URL: http://svn.reactos.org/svn/reactos?rev=52365&view=rev Log: [GDI32] - remove useless check. Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c Modified: trunk/reactos/dll/win32/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/bi… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/bitmap.c [iso-8859-1] Sun Jun 19 13:11:39 2011 @@ -679,31 +679,27 @@ #endif cjBmpScanSize = DIB_BitmapMaxBitsSize((LPBITMAPINFO)lpbmi, ScanLines); - if ( Bits ) - { - pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); - if (pvSafeBits) - { - _SEH2_TRY - { - RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END - - if (Hit) - { - // We don't die, we continue on with a allocated safe pointer to kernel - // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); - } - DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); - } - - } + pvSafeBits = RtlAllocateHeap(GetProcessHeap(), 0, cjBmpScanSize); + if (pvSafeBits) + { + _SEH2_TRY + { + RtlCopyMemory( pvSafeBits, Bits, cjBmpScanSize); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END + + if (Hit) + { + // We don't die, we continue on with a allocated safe pointer to kernel + // space..... + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); + } + DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); + } if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) {

1 0

[gedmurphy] 52364: [BROWSEUI] - Set the prototypes to be long instead of LONG. This only worked in rbuild previously because WIDL incorrectly generates a LONG for long types. - define SHANDLE_PTR a...
by gedmurphy＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gedmurphy Date: Sun Jun 19 12:46:15 2011 New Revision: 52364 URL: http://svn.reactos.org/svn/reactos?rev=52364&view=rev Log: [BROWSEUI] - Set the prototypes to be long instead of LONG. This only worked in rbuild previously because WIDL incorrectly generates a LONG for long types. - define SHANDLE_PTR and use it in IWebBrowserApp::get_HWND - Along with fixing WIDL, __WINESRC__ and __ROS_LONG64__ should be removed as part of a future fix. - Should now build with both rbuild and msvc Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/include/psdk/basetsd.h trunk/reactos/include/psdk/exdisp.idl Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -124,8 +124,6 @@ "language='*'\"") #endif // __GNUC__ -#define SHANDLE_PTR LONG - struct categoryCacheHeader { long dwSize; // size of header only @@ -154,7 +152,6 @@ // temporary extern HRESULT CreateInternetToolbar(REFIID riid, void **ppv); - #ifdef SetWindowLongPtr @@ -556,19 +553,29 @@ virtual HRESULT STDMETHODCALLTYPE get_Document(IDispatch **ppDisp); virtual HRESULT STDMETHODCALLTYPE get_TopLevelContainer(VARIANT_BOOL *pBool); virtual HRESULT STDMETHODCALLTYPE get_Type(BSTR *Type); - virtual HRESULT STDMETHODCALLTYPE get_Left(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Left(LONG Left); - virtual HRESULT STDMETHODCALLTYPE get_Top(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Top(LONG Top); - virtual HRESULT STDMETHODCALLTYPE get_Width(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Width(LONG Width); - virtual HRESULT STDMETHODCALLTYPE get_Height(LONG *pl); - virtual HRESULT STDMETHODCALLTYPE put_Height(LONG Height); + +// WIDL temp hack : when the interface contains 'long' WIDL writes it out as a 'LONG' +// Setting the prototype to LONG in this class breaks building with MSVC so we use +// the correct 'long' type here and temp hack it for WIDL generated prototypes. +#ifdef __WIDL_EXDISP_H +#define long LONG +#endif + virtual HRESULT STDMETHODCALLTYPE get_Left(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Left(long Left); + virtual HRESULT STDMETHODCALLTYPE get_Top(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Top(long Top); + virtual HRESULT STDMETHODCALLTYPE get_Width(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Width(long Width); + virtual HRESULT STDMETHODCALLTYPE get_Height(long *pl); + virtual HRESULT STDMETHODCALLTYPE put_Height(long Height); +#ifdef __WIDL_EXDISP_H +#undef long +#endif virtual HRESULT STDMETHODCALLTYPE get_LocationName(BSTR *LocationName); virtual HRESULT STDMETHODCALLTYPE get_LocationURL(BSTR *LocationURL); virtual HRESULT STDMETHODCALLTYPE get_Busy(VARIANT_BOOL *pBool); - // *** IWebBrowser2 methods *** + // *** IWebBrowserApp methods *** virtual HRESULT STDMETHODCALLTYPE Quit(); virtual HRESULT STDMETHODCALLTYPE ClientToWindow(int *pcx, int *pcy); virtual HRESULT STDMETHODCALLTYPE PutProperty(BSTR Property, VARIANT vtValue); @@ -2546,47 +2553,51 @@ { return E_NOTIMPL; } - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Left(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Left(LONG Left) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Top(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Top(LONG Top) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Width(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Width(LONG Width) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::get_Height(LONG *pl) -{ - return E_NOTIMPL; -} - -HRESULT STDMETHODCALLTYPE CShellBrowser::put_Height(LONG Height) -{ - return E_NOTIMPL; -} - +#ifdef __WIDL_EXDISP_H +#define long LONG +#endif +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Left(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Left(long Left) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Top(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Top(long Top) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Width(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Width(long Width) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::get_Height(long *pl) +{ + return E_NOTIMPL; +} + +HRESULT STDMETHODCALLTYPE CShellBrowser::put_Height(long Height) +{ + return E_NOTIMPL; +} +#ifdef __WIDL_EXDISP_H +#undef long +#endif HRESULT STDMETHODCALLTYPE CShellBrowser::get_LocationName(BSTR *LocationName) { return E_NOTIMPL; Modified: trunk/reactos/include/psdk/basetsd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/basetsd.h?rev… ============================================================================== --- trunk/reactos/include/psdk/basetsd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/basetsd.h [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -77,10 +77,18 @@ #if defined(_WIN64) #define __int3264 __int64 +typedef __int64 SHANDLE_PTR; +typedef unsigned __int64 HANDLE_PTR; +typedef unsigned int UHALF_PTR, *PUHALF_PTR; +typedef int HALF_PTR, *PHALF_PTR; #define ADDRESS_TAG_BIT 0x40000000000UI64 #else /* !_WIN64 */ #define __int3264 __int32 #define ADDRESS_TAG_BIT 0x80000000UL +typedef unsigned short UHALF_PTR, *PUHALF_PTR; +typedef short HALF_PTR, *PHALF_PTR; +typedef long SHANDLE_PTR; +typedef unsigned long HANDLE_PTR; #define HandleToUlong( h ) ((ULONG)(ULONG_PTR)(h) ) #define HandleToLong( h ) ((LONG)(LONG_PTR) (h) ) #define ULongToHandle( h) ((HANDLE)(ULONG_PTR) (h)) @@ -183,14 +191,6 @@ typedef unsigned long ULONG_PTR, *PULONG_PTR; #endif -typedef unsigned short UHALF_PTR, *PUHALF_PTR; -typedef short HALF_PTR, *PHALF_PTR; - -#ifndef HANDLE_PTR_DEFINED -#define HANDLE_PTR_DEFINED - typedef unsigned long HANDLE_PTR; -#endif - #endif /* !_WIN64 */ typedef ULONG_PTR SIZE_T, *PSIZE_T; Modified: trunk/reactos/include/psdk/exdisp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/exdisp.idl?re… ============================================================================== --- trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/exdisp.idl [iso-8859-1] Sun Jun 19 12:46:15 2011 @@ -224,7 +224,7 @@ [id(302)] HRESULT PutProperty([in] BSTR Property, [in] VARIANT vtValue); [id(303)] HRESULT GetProperty([in] BSTR Property, [out, retval] VARIANT *pvtValue); [id(0), propget] HRESULT Name([out, retval] BSTR* Name); - [id(DISPID_HWND), propget] HRESULT HWND([out, retval] long *pHWND); + [id(DISPID_HWND), propget] HRESULT HWND([out, retval] SHANDLE_PTR *pHWND); [id(400), propget] HRESULT FullName([out, retval] BSTR* FullName); [id(401), propget] HRESULT Path([out, retval] BSTR* Path); [id(402), propget] HRESULT Visible([out, retval] VARIANT_BOOL* pBool);

1 0

[tkreuzer] 52363: [OBJ2BIN] Fix handling of empty sections
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 11:53:10 2011 New Revision: 52363 URL: http://svn.reactos.org/svn/reactos?rev=52363&view=rev Log: [OBJ2BIN] Fix handling of empty sections Modified: trunk/reactos/tools/obj2bin/obj2bin.c Modified: trunk/reactos/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/obj2bin/obj2bin.c?re… ============================================================================== --- trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] (original) +++ trunk/reactos/tools/obj2bin/obj2bin.c [iso-8859-1] Sun Jun 19 11:53:10 2011 @@ -63,14 +63,12 @@ { char *pszSourceFile; char *pszDestFile; - unsigned long nFileSize, nBaseAddress, nOffsetSectionHeaders; + unsigned long nFileSize, nBaseAddress; FILE *pSourceFile, *pDestFile; IMAGE_FILE_HEADER *pFileHeader; IMAGE_SECTION_HEADER *pSectionHeader; unsigned int i; - size_t nSize; char *pData; - PIMAGE_RELOCATION pReloc; PIMAGE_SYMBOL pSymbols; if ((argc != 4) || (strcmp(argv[1], "--help") == 0)) @@ -129,11 +127,9 @@ /* Loop all sections */ for (i = 0; i < pFileHeader->NumberOfSections; i++) { - /* Skip empty sections */ - if (pSectionHeader->SizeOfRawData == 0) continue; - /* Check if this is '.text' section */ - if (strcmp(pSectionHeader->Name, ".text") == 0) + if ((strcmp(pSectionHeader->Name, ".text") == 0) && + (pSectionHeader->SizeOfRawData != 0)) { RelocateSection(pData, pSectionHeader,

1 0

[gadamopoulos] 52362: [rpcrt4] - Improve hacky definition of __ASM_DEFINE_FUNC to reduce build errors with msvc
by gadamopoulos＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: gadamopoulos Date: Sun Jun 19 10:44:26 2011 New Revision: 52362 URL: http://svn.reactos.org/svn/reactos?rev=52362&view=rev Log: [rpcrt4] - Improve hacky definition of __ASM_DEFINE_FUNC to reduce build errors with msvc Modified: trunk/reactos/include/reactos/wine/config.h Modified: trunk/reactos/include/reactos/wine/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/confi… ============================================================================== --- trunk/reactos/include/reactos/wine/config.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/config.h [iso-8859-1] Sun Jun 19 10:44:26 2011 @@ -1020,6 +1020,8 @@ #else #define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.def " #name suffix "; .scl 2; .type 32; .endef\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc"); #endif +#else +#define __ASM_DEFINE_FUNC(name,suffix,code) #endif /* Define to a macro to generate an assembly function directive */

1 0

[cfinck] 52361: [USBDRIVER] No objections on the mailing list, so I'm excluding "usbdriver" from build. It should still stay as a reference in the tree till the new USB drivers are finalized and me...
by cfinck＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: cfinck Date: Sun Jun 19 10:13:59 2011 New Revision: 52361 URL: http://svn.reactos.org/svn/reactos?rev=52361&view=rev Log: [USBDRIVER] No objections on the mailing list, so I'm excluding "usbdriver" from build. It should still stay as a reference in the tree till the new USB drivers are finalized and merged back to Trunk. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/drivers/usb/CMakeLists.txt trunk/reactos/drivers/usb/directory.rbuild Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -540,7 +540,7 @@ ;drivers\usb\miniport\usbuhci\usbuhci.sys 2 ;drivers\usb\usbhub\usbhub.sys 2 ;drivers\usb\usbport\usbport.sys 2 -drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys 2 drivers\video\displays\vga\vgaddi.dll 1 drivers\video\displays\framebuf\framebuf.dll 1 Modified: trunk/reactos/drivers/usb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/CMakeLists.txt… ============================================================================== --- trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/CMakeLists.txt [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -1,5 +1,5 @@ -add_subdirectory(nt4compat) +#add_subdirectory(nt4compat) add_subdirectory(usbd) #add_subdirectory(usbehci) The USB branch has usbehci_new #add_subdirectory(usbhub) Compiles, just skipped in trunk Modified: trunk/reactos/drivers/usb/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/directory.rbui… ============================================================================== --- trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/directory.rbuild [iso-8859-1] Sun Jun 19 10:13:59 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <directory name="nt4compat"> +  <directory name="usbd"> <xi:include href="usbd/usbd.rbuild" /> </directory>

1 0

[tkreuzer] 52360: [FREELDR] - Fix MSVC linkerflags for setupldr - Move stack from 78000 to 98000 to fix conflicts with freeldr code, which is larger when built with MSVC - MSVC compiled setupldr wo...
by tkreuzer＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tkreuzer Date: Sun Jun 19 10:03:45 2011 New Revision: 52360 URL: http://svn.reactos.org/svn/reactos?rev=52360&view=rev Log: [FREELDR] - Fix MSVC linkerflags for setupldr - Move stack from 78000 to 98000 to fix conflicts with freeldr code, which is larger when built with MSVC - MSVC compiled setupldr works now! Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -117,9 +117,6 @@ list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S arch/i386/multiboot.S) - else() - list(APPEND FREELDR_COMMON_SOURCE - arch/i386/realmode.S) endif() elseif(ARCH MATCHES amd64) list(APPEND FREELDR_COMMON_SOURCE @@ -217,7 +214,7 @@ if(NOT MSVC) set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") else() - set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/DRIVER /SECTION:.text,ERWP,ALIGN=0x1000" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") + set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") endif() set_image_base(setupldr_pe 0x10000) Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -140,7 +140,7 @@ } TimeOut = GetTimeOut(); - if (!UiInitialize(TimeOut)) + if (!UiInitialize(TimeOut != 0)) { UiMessageBoxCritical("Unable to initialize UI."); return; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/x86common.h [iso-8859-1] Sun Jun 19 10:03:45 2011 @@ -8,13 +8,14 @@ #define BSS_START HEX(6F00) #define FREELDR_BASE HEX(F800) #define FREELDR_PE_BASE HEX(10000) -#define STACK32ADDR HEX(78000) /* The 32-bit stack top will be at 7000:8000, or 0x78000 */ -#define BIOSCALLBUFFER HEX(78000) /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFSEGMENT HEX(7800) /* Buffer to store temporary data for any Int386() call */ -#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ +#define STACK32ADDR HEX(98000) /* The 32-bit stack top will be at 9000:8000, or 0xA8000 */ +#define BIOSCALLBUFFER HEX(98000) /* Buffer to store temporary data for any Int386() call */ #define FILESYSBUFFER HEX(80000) /* Buffer to store file system data (e.g. cluster buffer for FAT) */ #define DISKREADBUFFER HEX(90000) /* Buffer to store data read in from the disk via the BIOS */ #define DISKREADBUFFER_SIZE 512 + +#define BIOSCALLBUFSEGMENT (BIOSCALLBUFFER/16) /* Buffer to store temporary data for any Int386() call */ +#define BIOSCALLBUFOFFSET HEX(0000) /* Buffer to store temporary data for any Int386() call */ /* These addresses specify the realmode "BSS section" layout */ #define BSS_RealModeEntry (BSS_START + 0)

1 0

[tfaber] 52359: [KMTESTS] - add the proper testing framework functions for winetest-like feel - remove thereby obsolete Log* functions - update example test to show usage of the new macros
by tfaber＠svn.reactos.org 19 Jun '11

19 Jun '11

Author: tfaber Date: Sun Jun 19 09:23:03 2011 New Revision: 52359 URL: http://svn.reactos.org/svn/reactos?rev=52359&view=rev Log: [KMTESTS] - add the proper testing framework functions for winetest-like feel - remove thereby obsolete Log* functions - update example test to show usage of the new macros Removed: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -11,7 +11,6 @@ # list(APPEND KMTEST_DRV_SOURCE kmtest_drv/kmtest_drv.c - kmtest_drv/log.c kmtest_drv/testlist.c example/Example.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -7,10 +7,15 @@ #include <ntddk.h> #include <kmt_test.h> -#include <kmt_log.h> VOID Test_Example(VOID) { - /* TODO: this should be trace(), as in winetests */ - LogPrint("Message from kernel\n"); + KIRQL Irql; + + ok(1, "This test should succeed.\n"); + ok(0, "This test should fail.\n"); + trace("Message from kernel, low-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + KeRaiseIrql(HIGH_LEVEL, &Irql); + trace("Message from kernel, high-irql. %s. %ls.\n", "Format strings work", L"Even with Unicode"); + KeLowerIrql(Irql); } Removed: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_log.h (removed) @@ -1,21 +1,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver logging function declarations - * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> - */ - -#ifndef _KMTEST_LOG_H_ -#define _KMTEST_LOG_H_ - -#include <ntddk.h> - -NTSTATUS LogInit(VOID); -VOID LogFree(VOID); - -VOID LogPrint(IN PCSTR Message); -VOID LogPrintF(IN PCSTR Format, ...); -VOID LogVPrintF(IN PCSTR Format, va_list Arguments); -SIZE_T LogRead(OUT PVOID Buffer, IN SIZE_T BufferSize); - -#endif /* !defined _KMTEST_LOG_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -1,8 +1,13 @@ /* * PROJECT: ReactOS kernel-mode tests * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite test declarations + * PURPOSE: Kernel-Mode Test Suite test framework declarations * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +/* Inspired by Wine C unit tests, Copyright (C) 2002 Alexandre Julliard + * Inspired by ReactOS kernel-mode regression tests, + * Copyright (C) Aleksey Bragin, Filip Navara */ #ifndef _KMTEST_TEST_H_ @@ -32,6 +37,18 @@ extern PKMT_RESULTBUFFER ResultBuffer; +#define KMT_STRINGIZE(x) #x +#define ok(test, ...) ok_(test, __FILE__, __LINE__, __VA_ARGS__) +#define trace(...) trace_( __FILE__, __LINE__, __VA_ARGS__) + +#define ok_(test, file, line, ...) KmtOk(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) +#define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) + +VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments); +VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...); +VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments); +VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...); + #if defined KMT_DEFINE_TEST_FUNCTIONS PKMT_RESULTBUFFER ResultBuffer = NULL; @@ -55,6 +72,8 @@ #endif /* defined KMT_USER_MODE */ #define KmtMemCpy memcpy +#define KmtStrLen strlen +#define KmtAssert assert static VOID KmtAddToLogBuffer(PKMT_RESULTBUFFER Buffer, PCSTR String, SIZE_T Length) { @@ -82,6 +101,104 @@ #define KmtVSNPrintF vsnprintf #endif /* defined KMT_USER_MODE */ +static SIZE_T KmtXVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, va_list Arguments) +{ + SIZE_T BufferLength = 0; + SIZE_T Length; + + if (Prepend1) + { + SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend1)); + KmtMemCpy(Buffer, Prepend1, Length); + Buffer += Length; + BufferLength += Length; + BufferMaxLength -= Length; + } + if (Prepend2) + { + SIZE_T Length = min(BufferMaxLength, KmtStrLen(Prepend2)); + KmtMemCpy(Buffer, Prepend2, Length); + Buffer += Length; + BufferLength += Length; + BufferMaxLength -= Length; + } + Length = KmtVSNPrintF(Buffer, BufferMaxLength, Format, Arguments); + /* vsnprintf can return more than maxLength, we don't want to do that */ + BufferLength += min(Length, BufferMaxLength); + return BufferLength; +} + +static SIZE_T KmtXSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Prepend1, PCSTR Prepend2, PCSTR Format, ...) +{ + SIZE_T BufferLength; + va_list Arguments; + va_start(Arguments, Format); + BufferLength = KmtXVSNPrintF(Buffer, BufferMaxLength, Prepend1, Prepend2, Format, Arguments); + va_end(Arguments); + return BufferLength; +} + +VOID KmtFinishTest(PCSTR TestName) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, NULL, NULL, + "%s: %d tests executed (0 marked as todo, %d failures), 0 skipped.\n", + TestName, + ResultBuffer->Successes + ResultBuffer->Failures, + ResultBuffer->Failures); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); +} + +VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + if (Condition) + { + InterlockedIncrement(&ResultBuffer->Successes); + + if (0/*KmtReportSuccess*/) + { + MessageLength = KmtXSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test succeeded\n", ""); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); + } + } + else + { + InterlockedIncrement(&ResultBuffer->Failures); + MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test failed: ", Format, Arguments); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); + } +} + +VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) +{ + va_list Arguments; + va_start(Arguments, Format); + KmtVOk(Condition, FileAndLine, Format, Arguments); + va_end(Arguments); +} + +VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) +{ + CHAR MessageBuffer[512]; + SIZE_T MessageLength; + + MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": ", Format, Arguments); + KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); +} + +VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...) +{ + va_list Arguments; + va_start(Arguments, Format); + KmtVTrace(FileAndLine, Format, Arguments); + va_end(Arguments); +} + #endif /* defined KMT_DEFINE_TEST_FUNCTIONS */ #endif /* !defined _KMTEST_TEST_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/kmtest.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -73,6 +73,8 @@ error = GetLastError(); goto cleanup; } + + KmtFinishTest(testName); if (!WriteConsoleA(GetStdHandle(STD_OUTPUT_HANDLE), ResultBuffer->LogBuffer, ResultBuffer->LogBufferLength, &bytesWritten, NULL)) { Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -4,13 +4,37 @@ <library>ntdll</library> <library>hal</library> <library>pseh</library> + <library>kmtest_printf</library> <define name="KMT_KERNEL_MODE" /> <directory name="kmtest_drv"> <file>kmtest_drv.c</file> - <file>log.c</file> <file>testlist.c</file> </directory> <directory name="example"> <file>Example.c</file> </directory> </module> +<module name="kmtest_printf" type="staticlibrary"> + <include base="crt">include</include> + <define name="_LIBCNT_" /> + <define name="_USER32_WSPRINTF" /> + <define name="wctomb">KmtWcToMb</define> + <directory name="kmtest_drv"> + <file>printf_stubs.c</file> + </directory> + <directory name=".."> + <directory name=".."> + <directory name=".."> + <directory name="lib"> + <directory name="sdk"> + <directory name="crt"> + <directory name="printf"> + <file>streamout.c</file> + </directory> + </directory> + </directory> + </directory> + </directory> + </directory> + </directory> +</module> Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_drv.c [iso-8859-1] Sun Jun 19 09:23:03 2011 @@ -14,7 +14,7 @@ #include <debug.h> #include <kmt_public.h> -#include <kmt_log.h> +#define KMT_DEFINE_TEST_FUNCTIONS #include <kmt_test.h> /* Prototypes */ @@ -58,11 +58,6 @@ UNREFERENCED_PARAMETER(RegistryPath); DPRINT("DriverEntry\n"); - - Status = LogInit(); - - if (!NT_SUCCESS(Status)) - goto cleanup; RtlInitUnicodeString(&DeviceName, L"\\Device\\Kmtest"); Status = IoCreateDevice(DriverObject, sizeof(DEVICE_EXTENSION), &DeviceName, @@ -119,8 +114,6 @@ ASSERT(!ResultBuffer); IoDeleteDevice(MainDeviceObject); } - - LogFree(); } /** Removed: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/log.c (removed) @@ -1,102 +1,0 @@ -/* - * PROJECT: ReactOS kernel-mode tests - * LICENSE: GPLv2+ - See COPYING in the top level directory - * PURPOSE: Kernel-Mode Test Suite Driver logging functions - * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> - */ - -#include <ntddk.h> -#include <ntstrsafe.h> - -#include <kmt_log.h> -#define KMT_DEFINE_TEST_FUNCTIONS -#include <kmt_test.h> - -/** - * @name LogInit - * - * Initialize logging mechanism. Call from DriverEntry. - * - * @return Status - */ -NTSTATUS LogInit(VOID) -{ - NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - - return Status; -} - -/** - * @name LogFree - * - * Clean up logging mechanism. Call from Unload. - * - * @return None - */ -VOID LogFree(VOID) -{ - PAGED_CODE(); -} - -/** - * @name LogPrint - * - * Print a log message. - * - * @param Message - * Ansi string to be logged - * - * @return None - */ -VOID LogPrint(IN PCSTR Message) -{ - size_t MessageLength; - ASSERT(NT_SUCCESS(RtlStringCbLengthA(Message, 512, &MessageLength))); - - KmtAddToLogBuffer(ResultBuffer, Message, MessageLength); -} - -/** - * @name LogPrintF - * - * Print a formatted log message. - * - * @param Format - * printf-like format string - * @param ... - * Arguments corresponding to the format - * - * @return None - */ -VOID LogPrintF(IN PCSTR Format, ...) -{ - va_list Arguments; - PAGED_CODE(); - va_start(Arguments, Format); - LogVPrintF(Format, Arguments); - va_end(Arguments); -} - -/** - * @name LogVPrintF - * - * Print a formatted log message. - * - * @param Format - * printf-like format string - * @param Arguments - * Arguments corresponding to the format - * - * @return None - */ -VOID LogVPrintF(IN PCSTR Format, va_list Arguments) -{ - CHAR Buffer[512]; - /* TODO: make this work from any IRQL */ - PAGED_CODE(); - - RtlStringCbVPrintfA(Buffer, sizeof Buffer, Format, Arguments); - - LogPrint(Buffer); -}

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