Ros-diffs November 2013

ros-diffs@reactos.org

16 participants
348 discussions

[aandrejevic] 60919: [NTVDM] Remove unnecessary indentation and clarify the code a bit.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Nov 10 18:14:40 2013 New Revision: 60919 URL: http://svn.reactos.org/svn/reactos?rev=60919&view=rev Log: [NTVDM] Remove unnecessary indentation and clarify the code a bit. Modified: branches/ntvdm/subsystems/ntvdm/int32.c Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sun Nov 10 18:14:40 2013 @@ -130,40 +130,38 @@ { LPDWORD IntVecTable = (LPDWORD)BaseAddress; LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); - USHORT i; WORD CommonStub, BopSeqOffset, Offset; - CommonStub = Offset = 0x00; + CommonStub = Offset = 0; /* Write the common stub code */ - { + // BOP_SEQ: - BiosCode[Offset++] = 0xF8; // clc + BiosCode[Offset++] = 0xF8; // clc - BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence - BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); - BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP - BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher + BiosCode[Offset++] = LOBYTE(EMULATOR_BOP); // BOP sequence + BiosCode[Offset++] = HIBYTE(EMULATOR_BOP); + BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP + BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher - BiosCode[Offset++] = 0x73; // jnc EXIT (offset +4) - BiosCode[Offset++] = 0x04; + BiosCode[Offset++] = 0x73; // jnc EXIT (offset +4) + BiosCode[Offset++] = 0x04; - BiosCode[Offset++] = 0xFB; // sti + BiosCode[Offset++] = 0xFB; // sti - // HACK: The following instruction should be HLT! - BiosCode[Offset++] = 0x90; // nop + // HACK: The following instruction should be HLT! + BiosCode[Offset++] = 0x90; // nop - BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -11) - BiosCode[Offset++] = 0xF5; + BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -11) + BiosCode[Offset++] = 0xF5; // EXIT: - BiosCode[Offset++] = 0x83; // add sp, 4 - BiosCode[Offset++] = 0xC4; - BiosCode[Offset++] = 0x04; + BiosCode[Offset++] = 0x83; // add sp, 4 + BiosCode[Offset++] = 0xC4; + BiosCode[Offset++] = 0x04; - BiosCode[Offset++] = 0xCF; // iret - } + BiosCode[Offset++] = 0xCF; // iret /* Generate ISR stubs and fill the IVT */ for (i = 0x00; i <= 0xFF; i++) @@ -178,12 +176,11 @@ BiosCode[Offset++] = 0x6A; // push 0 BiosCode[Offset++] = 0x00; - BopSeqOffset = CommonStub - Offset - 3; + BopSeqOffset = CommonStub - (Offset + 3); - BiosCode[Offset+0] = 0xE9; // jmp near BOP_SEQ - BiosCode[Offset+1] = LOBYTE(BopSeqOffset); - BiosCode[Offset+2] = HIBYTE(BopSeqOffset); - Offset+=3; + BiosCode[Offset++] = 0xE9; // jmp near BOP_SEQ + BiosCode[Offset++] = LOBYTE(BopSeqOffset); + BiosCode[Offset++] = HIBYTE(BopSeqOffset); } }

10 years, 10 months

[spetreolle] 60918: [DESK.CPL] IDC_FONTSIZE_COSTOM=> IDC_FONTSIZE_CUSTOM Fix French controls sizes & positions.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Nov 10 17:19:08 2013 New Revision: 60918 URL: http://svn.reactos.org/svn/reactos?rev=60918&view=rev Log: [DESK.CPL] IDC_FONTSIZE_COSTOM=> IDC_FONTSIZE_CUSTOM Fix French controls sizes & positions. Modified: trunk/reactos/dll/cpl/desk/general.c trunk/reactos/dll/cpl/desk/lang/bg-BG.rc trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc trunk/reactos/dll/cpl/desk/lang/de-DE.rc trunk/reactos/dll/cpl/desk/lang/el-GR.rc trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/he-IL.rc trunk/reactos/dll/cpl/desk/lang/hu-HU.rc trunk/reactos/dll/cpl/desk/lang/id-ID.rc trunk/reactos/dll/cpl/desk/lang/it-IT.rc trunk/reactos/dll/cpl/desk/lang/ja-JP.rc trunk/reactos/dll/cpl/desk/lang/nl-NL.rc trunk/reactos/dll/cpl/desk/lang/no-NO.rc trunk/reactos/dll/cpl/desk/lang/pl-PL.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ru-RU.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/desk/lang/sv-SE.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/desk/lang/uk-UA.rc trunk/reactos/dll/cpl/desk/lang/zh-CN.rc trunk/reactos/dll/cpl/desk/resource.h Modified: trunk/reactos/dll/cpl/desk/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/general.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/general.c [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -50,7 +50,7 @@ if ((int)dwValue == ci) { SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); - SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_COSTOM), Desc); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); } } } Modified: trunk/reactos/dll/cpl/desk/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/bg-BG.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/bg-BG.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -155,7 +155,7 @@ GROUPBOX "ÐÐºÑÐ°Ð½", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ Ð½Ð° ÑÑÐ¸ÑÑÐ°", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Ð¡ÑÐ²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑ", -1, 7, 67, 237, 97 LTEXT "ÐÑÐºÐ¾Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½ÑÐ¼Ð° Ð´Ð° ÑÐ°Ð±Ð¾ÑÑÑ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¾, Ð°ÐºÐ¾ Ð½Ðµ Ð¿ÑÐµÐ·Ð°Ð¿ÑÑÐ½ÐµÑÐµ ÐºÐ¾Ð¼Ð¿ÑÑÑÑÐ°, ÑÐ»ÐµÐ´ ÐºÐ°ÑÐ¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ ÑÐ²ÐµÑÐ¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸.\r\nÐ¡Ð»ÐµÐ´ ÐºÐ°ÑÐ¾ Ð¿ÑÐ¾Ð¼ÐµÐ½Ñ ÑÐ²ÐµÑÐ¾Ð²Ð¸ÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&ÐÑÐµÐ·Ð°Ð¿ÑÑÐº Ð¿ÑÐµÐ´Ð¸ Ð¿ÑÐ¸Ð»Ð°Ð³Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð¸ÑÐµ ÑÐ²ÐµÑÐ¾Ð²Ð¸ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/cs-CZ.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -159,7 +159,7 @@ GROUPBOX "Obrazovka", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Velikost pÃsma", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97 LTEXT "NÄkterÃ© programy nefungujÃ sprÃ¡vnÄ, pokud nenÃ poÄÃtaÄ restartovÃ¡n po zmÄnÄ nastavenÃ barev.\r\n\nPo zmÄnÄnÃ nastavenÃ barev", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restartovat poÄÃtaÄ pÅed aplikovÃ¡nÃm novÃ©ho nastavenÃ barev.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/de-DE.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "Anzeige", -1, 7, 6, 237, 56, WS_GROUP LTEXT "SchriftgrÃ¶Ãe", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "KompatibilitÃ¤t", -1, 7, 67, 237, 97 LTEXT "Einige Programme kÃ¶nnten fehlerhaft arbeiten, wenn nach Ãnderung der Farbeinstellungen nicht neugestartet wird.\r\n\nNach Ãnderung der Farbeinstellungen", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Computer vor dem Anwenden der Farbeinstellungen neustarten.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/el-GR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/el-GR.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,9 +153,9 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 - LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 + LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 AUTORADIOBUTTON "Apply the new color settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 AUTORADIOBUTTON "Ask me before applying the new color settings.", IDC_ASKME_RB, 14, 146, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -161,7 +161,7 @@ GROUPBOX "Pantalla ", -1, 7, 6, 237, 56, WS_GROUP LTEXT "TamaÃ±o de la fuente", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilidad ", -1, 7, 67, 237, 97 LTEXT "Es posible que algunos programas no funcionen correctamente si no reinicia el equipo despuÃ©s de cambiar la configuraciÃ³n de pantalla", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Reiniciar el equipo antes de aplicar la nueva configuraciÃ³n.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -44,7 +44,7 @@ GROUPBOX "G&estion de l'alimentation du moniteur", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 LTEXT "Pour modifier les paramÃ¨tres de l'alimentation du moniteur, cliquez sur Gestion de l'alimentation.", IDC_STATIC, 14, 166, 146, 27 - PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 + PUSHBUTTON "&Gestion de l'alimentation...", IDC_SCREENS_POWER_BUTTON, 135, 176, 91, 13 END IDD_APPEARANCE DIALOGEX 0, 0, 246, 234 @@ -139,7 +139,7 @@ CONTROL "",IDC_SETTINGS_RESOLUTION,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 LTEXT "Moins",1815,9,137,25,9,NOT WS_GROUP - LTEXT "Plus",1816,93,137,25,9,NOT WS_GROUP + LTEXT "Plus",1816,93,137,15,9,NOT WS_GROUP LTEXT "",IDC_SETTINGS_RESOLUTION_TEXT,10,157,100,10,NOT WS_GROUP | SS_CENTER GROUPBOX "&Couleurs",1817,125,127,115,43 COMBOBOX IDC_SETTINGS_BPP,131,137,103,80,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | @@ -148,20 +148,20 @@ PUSHBUTTON "A&vancÃ©...",IDC_SETTINGS_ADVANCED,170,174,70,14 END -IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 +IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 299, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "GÃ©nÃ©ral" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Affichage", -1, 7, 6, 237, 56, WS_GROUP + GROUPBOX "Affichage", -1, 7, 6, 285, 56, WS_GROUP LTEXT "Taille de la police", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 - GROUPBOX "CompatibilitÃ©", -1, 7, 67, 237, 97 - LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redÃ©marrez pas votre ordinateur aprÃ¨s que vous ayiez changÃ© les paramÃ¨tres des couleurs.\r\n\nAprÃ¨s que j'ai changÃ© les paramÃ¨tres des couleurs", -1, 12, 78, 228, 34 - AUTORADIOBUTTON "&RedÃ©marrer l'ordinateur avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_RESTART_RB, 14, 116, 228, 10 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 + GROUPBOX "CompatibilitÃ©", -1, 7, 67, 285, 97 + LTEXT "Quelques programmes peuvent mal fonctionner si vous ne redÃ©marrez pas votre ordinateur aprÃ¨s que vous ayiez changÃ© les paramÃ¨tres des couleurs.\r\n\nAprÃ¨s que j'ai changÃ© les paramÃ¨tres des couleurs", -1, 12, 78, 270, 40 + AUTORADIOBUTTON "&RedÃ©marrer l'ordinateur avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_RESTART_RB, 14, 116, 273, 10 AUTORADIOBUTTON "Appliquer les nouveaux paramÃ¨tres des couleurs sans redÃ©marrer.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 - AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_ASKME_RB, 14, 146, 228, 10 + AUTORADIOBUTTON "Me demander avant d'appliquer les nouveaux paramÃ¨tres des couleurs.", IDC_ASKME_RB, 14, 146, 243, 10 END IDR_PREVIEW_MENU MENU Modified: trunk/reactos/dll/cpl/desk/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/he-IL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/he-IL.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "×ª×¦×××", -1, 7, 6, 237, 56, WS_GROUP LTEXT "×××× ×××¤×", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "×ª×××××ª", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/hu-HU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/hu-HU.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -154,7 +154,7 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/id-ID.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/id-ID.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/it-IT.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/it-IT.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "Monitor", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Dimensione font", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "CompatibilitÃ ", -1, 7, 67, 237, 97 LTEXT "Alcuni programmi potrebbero funzionare in modo irregolare se non riavviate il computer dopo una modifica delle impostazioni dei colori.\r\n\nDopo la modifica delle impostazioni dei colori", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Riavviare il computer prima di applicare le nuove impostazioni.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ja-JP.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ja-JP.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "è¡¨ç¤º", -1, 7, 6, 237, 56, WS_GROUP LTEXT "ãã©ã³ã ãµã¤ãº:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "äºææ§", -1, 7, 67, 237, 97 LTEXT "è²ã®è¨å®ãå¤æ´ããå¾ã«ã³ã³ãã¥ã¼ã¿ãåèµ·åããªãã¨ãããã°ã©ã ãæ£å¸¸ã«åä½ããªããã¨ãããã¾ãã\r\n\nè²ã®è¨å®ãå¤æ´ããå¾ã®åä½:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "æ°ããè²ã®è¨å®ãé©ç¨ããåã«ãã³ã³ãã¥ã¼ã¿ãåèµ·åãã(&R)", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/nl-NL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/nl-NL.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -155,7 +155,7 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/no-NO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/no-NO.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "Vis", -1, 7, 6, 237, 56, WS_GROUP LTEXT "SkriftstÃ¸rrelse", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilitet", -1, 7, 67, 237, 97 LTEXT "Noen programmer fungerer kanskje ikke skikkelig hvis du ikke starter datamaskinen pÃ¥ nytt etter Ã¥ ha endret skjerminnstillingene.\r\n\nGjÃ¸r fÃ¸lgende etter at skjerminnstillingene er endret", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Start maskinen pÃ¥ nytt fÃ¸r de nye skjerminnstillingene tas i bruk.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/pl-PL.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/pl-PL.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -162,7 +162,7 @@ GROUPBOX "Ekran", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Rozmiar czcionek", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Tryb zgodnoÅci", -1, 7, 67, 237, 97 LTEXT "NiektÃ³re programy mogÄ dziaÅaÄ niepoprawnie, jeÅli po zmianie ustawieÅ ekranu nie zrestartujesz systemu.\r\n\nPo zmianie ustawieÅ ekranu", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Zrestartuj system przed wprowadzeniem zmian.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -154,7 +154,7 @@ GROUPBOX "AfiÈare", -1, 7, 6, 237, 56, WS_GROUP LTEXT "MÄrime font", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibilitate", -1, 7, 67, 237, 97 LTEXT "Unele programe pot funcÈiona anormal dacÄ sunt aduse modificÄri Ã®n configuraÈia culorilor fÄrÄ a reporni apoi calculatorul.\r\n\nDupÄ efectuarea unor modificÄri:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&ReporneÈte calculatorul pentru a aplica noua configuraÈie", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ru-RU.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ru-RU.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -153,7 +153,7 @@ GROUPBOX "ÐÐºÑÐ°Ð½", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Ð Ð°Ð·Ð¼ÐµÑ ÑÑÐ¸ÑÑÐ°", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Ð¡Ð¾Ð²Ð¼ÐµÑÑÐ¸Ð¼Ð¾ÑÑÑ", -1, 7, 67, 237, 97 LTEXT "ÐÐµÐºÐ¾ÑÐ¾ÑÑÐµ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ñ Ð¼Ð¾Ð³ÑÑ ÑÐ°Ð±Ð¾ÑÐ°ÑÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, ÐµÑÐ»Ð¸ Ð²Ñ Ð½Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð³ÑÑÐ·Ð¸ÑÐµ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ð¿Ð¾ÑÐ»Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐºÑÐ°Ð½Ð°.\r\n\nÐÐ¾ÑÐ»Ðµ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐºÑÐ°Ð½Ð° ÑÐ»ÐµÐ´ÑÐµÑ", -1, 12, 78, 228, 34 AUTORADIOBUTTON "ÐÐµÑÐµ&Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ Ñ Ð½Ð¾Ð²ÑÐ¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÑÐºÑÐ°Ð½Ð°", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sk-SK.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -161,7 +161,7 @@ GROUPBOX "Zobrazenie", -1, 7, 6, 237, 56, WS_GROUP // Display=viac vÃ½znamov LTEXT "VeÄ¾kosÅ¥ pÃsma", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Kompatibilita", -1, 7, 67, 237, 97 LTEXT "NiektorÃ© programy nemusia pracovaÅ¥ sprÃ¡vne, ak po zmene nastavenÃ farieb nereÅ¡tartujete poÄÃtaÄ.\r\n\nPo zmene nastavenÃ farieb", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&ReÅ¡tartovaÅ¥ poÄÃtaÄ pred pouÅ¾itÃm novÃ½ch nastavenÃ farieb.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sv-SE.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/sv-SE.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -156,7 +156,7 @@ GROUPBOX "Display", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Font Size", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Compatibility", -1, 7, 67, 237, 97 LTEXT "Some programs operate improperly if you do not restart your computer after you change color settings.\r\n\nAfter I change color settings", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&Restart the computer before applying the new color settings.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/tr-TR.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -157,7 +157,7 @@ GROUPBOX "GÃ¶rÃ¼ntÃ¼", -1, 7, 6, 237, 56, WS_GROUP LTEXT "YazÄ± TÃ¼rÃ¼ Boyutu", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Uyumluluk", -1, 7, 67, 237, 97 LTEXT "BirtakÄ±m Ã§izeylemler, renk ayarlarÄ±nÄ± deÄiÅtirdikten sonra yeniden baÅlatÄ±lmazsa tam olarak Ã§alÄ±Åmayabilir.\r\n\nRenk ayarlarÄ± deÄiÅtirildikten sonra:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&yeni renk ayarlarÄ± uygulanmadan Ã¶nce bilgisayar yeniden baÅlatÄ±lsÄ±n.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/uk-UA.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/uk-UA.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -161,7 +161,7 @@ GROUPBOX "ÐÐºÑÐ°Ð½", -1, 7, 6, 237, 56, WS_GROUP LTEXT "Ð Ð¾Ð·Ð¼ÑÑ ÑÑÐ¸ÑÑÑ", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "Ð¡ÑÐ¼ÑÑÐ½ÑÑÑÑ", -1, 7, 67, 237, 97 LTEXT "ÐÐµÑÐºÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸ Ð¿ÑÐ°ÑÑÐ²Ð°ÑÐ¸Ð¼ÑÑÑ Ð½ÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½Ð¾, ÑÐºÑÐ¾ Ð²Ð¸ Ð½Ðµ Ð¿ÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐµ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ Ð¿ÑÑÐ»Ñ Ð·Ð¼ÑÐ½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² ÐºÐ¾Ð»ÑÐ¾ÑÑ.\r\n\nÐÑÑÐ»Ñ Ð·Ð¼ÑÐ½Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑÐ² ÐºÐ¾Ð»ÑÐ¾ÑÑ ÑÐ»ÑÐ´", -1, 12, 78, 228, 34 AUTORADIOBUTTON "&ÐÐµÑÐµÐ·Ð°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ ÐºÐ¾Ð¼Ð¿'ÑÑÐµÑ ÑÐ· Ð½Ð¾Ð²Ð¸Ð¼Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ°Ð¼Ð¸ ÐºÐ¾Ð»ÑÐ¾ÑÑ.", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/zh-CN.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/zh-CN.rc [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -160,7 +160,7 @@ GROUPBOX "æ¾ç¤º", -1, 7, 6, 237, 56, WS_GROUP LTEXT "åä½å¤§å°:", -1, 14, 20, 222, 9 COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "", IDC_FONTSIZE_COSTOM, 14, 46, 223, 12 + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 GROUPBOX "å¼å®¹æ§", -1, 7, 67, 237, 97 LTEXT "å¦æå¨æ´æ¹é¢è²è®¾ç½®åä¸ç«å³éæ°å¯å¨è®¡ç®æºï¼æäºç¨åºå¯è½æ æ³æ£å¸¸å·¥ä½ã\r\n\næ´æ¹æ¾ç¤ºè®¾ç½®å:", -1, 12, 78, 228, 34 AUTORADIOBUTTON "å¨åºç¨æ°çæ¾ç¤ºè®¾ç½®ä¹åéæ°å¯å¨è®¡ç®æº(&R)", IDC_RESTART_RB, 14, 116, 228, 10 Modified: trunk/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resource.h?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/resource.h [iso-8859-1] Sun Nov 10 17:19:08 2013 @@ -182,7 +182,7 @@ /* Advanced General Dialog */ #define IDC_FONTSIZE_COMBO 5000 -#define IDC_FONTSIZE_COSTOM 5001 +#define IDC_FONTSIZE_CUSTOM 5001 #define IDC_RESTART_RB 5002 #define IDC_WITHOUTREBOOT_RB 5003 #define IDC_ASKME_RB 5004

10 years, 10 months

[hbelusca] 60917: [NTVDM] Instead of reassembling each time the very same common stub code for each interrupt, do it once, and then assemble just a little part for each interrupt and jump to the co...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 10 16:22:33 2013 New Revision: 60917 URL: http://svn.reactos.org/svn/reactos?rev=60917&view=rev Log: [NTVDM] Instead of reassembling each time the very same common stub code for each interrupt, do it once, and then assemble just a little part for each interrupt and jump to the common stub. Now the 4DOS Ctrl-C exception bug changes, but I have an idea what's happening in there... Modified: branches/ntvdm/subsystems/ntvdm/int32.c Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sun Nov 10 16:22:33 2013 @@ -128,25 +128,16 @@ VOID WINAPI InitializeInt32(WORD BiosSegment) { + LPDWORD IntVecTable = (LPDWORD)BaseAddress; + LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); + USHORT i; - WORD Offset = 0; + WORD CommonStub, BopSeqOffset, Offset; - LPDWORD IntVecTable = (LPDWORD)BaseAddress; - LPBYTE BiosCode = (LPBYTE)SEG_OFF_TO_PTR(BiosSegment, 0); + CommonStub = Offset = 0x00; - /* Generate ISR stubs and fill the IVT */ - for (i = 0x00; i <= 0xFF; i++) + /* Write the common stub code */ { - IntVecTable[i] = MAKELONG(Offset, BiosSegment); - - BiosCode[Offset++] = 0xFA; // cli - - BiosCode[Offset++] = 0x6A; // push i - BiosCode[Offset++] = (UCHAR)i; - - BiosCode[Offset++] = 0x6A; // push 0 - BiosCode[Offset++] = 0x00; - // BOP_SEQ: BiosCode[Offset++] = 0xF8; // clc @@ -173,6 +164,27 @@ BiosCode[Offset++] = 0xCF; // iret } + + /* Generate ISR stubs and fill the IVT */ + for (i = 0x00; i <= 0xFF; i++) + { + IntVecTable[i] = MAKELONG(Offset, BiosSegment); + + BiosCode[Offset++] = 0xFA; // cli + + BiosCode[Offset++] = 0x6A; // push i + BiosCode[Offset++] = (UCHAR)i; + + BiosCode[Offset++] = 0x6A; // push 0 + BiosCode[Offset++] = 0x00; + + BopSeqOffset = CommonStub - Offset - 3; + + BiosCode[Offset+0] = 0xE9; // jmp near BOP_SEQ + BiosCode[Offset+1] = LOBYTE(BopSeqOffset); + BiosCode[Offset+2] = HIBYTE(BopSeqOffset); + Offset+=3; + } } VOID WINAPI RegisterInt32(BYTE IntNumber, EMULATOR_INT32_PROC IntHandler)

10 years, 10 months

[ekohl] 60916: [KBDTUQ] Fix turkish keyboard layout. Patch by Erdem Ersoy. CORE-7423 #resolve #comment Applied in r60916. Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 10 15:31:12 2013 New Revision: 60916 URL: http://svn.reactos.org/svn/reactos?rev=60916&view=rev Log: [KBDTUQ] Fix turkish keyboard layout. Patch by Erdem Ersoy. CORE-7423 #resolve #comment Applied in r60916. Thanks a lot! Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c Modified: trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdtuq/kbdtuq… ============================================================================== --- trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdtuq/kbdtuq.c [iso-8859-1] Sun Nov 10 15:31:12 2013 @@ -200,22 +200,22 @@ }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - { VK_OEM_3, 0, {'\"', 0x00e9, '<' } }, - { '1', 0, {'1', '!', '>' } }, - { '3', 0, {'3', WCH_DEAD, '#' } }, - { 0xff, 0, {WCH_NONE, '^', WCH_NONE} }, - { '4', 0, {'4', '+', '$' } }, - { '5', 0, {'5', '%', 0x00bd } }, - { '7', 0, {'7', '/', '{' } }, - { '8', 0, {'8', '(', '[' } }, - { '9', 0, {'9', ')', ']' } }, - { '0', 0, {'0', '=', '}' } }, - { VK_OEM_8, 0, {'*', '?', '\\' } }, - { 'Q', CAPLOK, {'q', 'Q', '@' } }, - { 'E', CAPLOK, {'e', 'E', 0x20ac } }, - { 'S', CAPLOK, {'s', 'S', 0x00df } }, - { VK_OEM_1, CAPLOK, {0x015f, 0x015e, WCH_DEAD} }, - { 0xff, 0, {WCH_NONE, WCH_NONE, 0x00b4 } }, + { VK_OEM_3, 0, {'\"', 0x00e9, '<' } }, + { '1', 0, {'1', '!', '>' } }, + { '3', 0, {'3', WCH_DEAD, '#' } }, + { 0xff, 0, {WCH_NONE, '^', WCH_NONE} }, + { '4', 0, {'4', '+', '$' } }, + { '5', 0, {'5', '%', 0x00bd } }, + { '7', 0, {'7', '/', '{' } }, + { '8', 0, {'8', '(', '[' } }, + { '9', 0, {'9', ')', ']' } }, + { '0', 0, {'0', '=', '}' } }, + { VK_OEM_MINUS, 0, {'*', '?', '\\' } }, + { 'Q', CAPLOK, {'q', 'Q', '@' } }, + { 'E', CAPLOK, {'e', 'E', 0x20ac } }, + { 'S', CAPLOK, {'s', 'S', 0x00df } }, + { VK_OEM_1, CAPLOK, {0x015f, 0x015e, WCH_DEAD} }, + { 0xff, 0, {WCH_NONE, WCH_NONE, 0x00b4 } }, { 0, 0 } }; @@ -238,7 +238,7 @@ ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { { '2', 0, {'2', '\'', 0x00a3, WCH_NONE, 0x0000} }, { '6', 0, {'6', '&', WCH_NONE, WCH_NONE, 0x001e} }, - { VK_OEM_MINUS, 0, {'-', '_', '|', WCH_NONE, 0x001f} }, + { VK_OEM_PLUS, 0, {'-', '_', '|', WCH_NONE, 0x001f} }, { 0, 0 } };

10 years, 10 months

[ekohl] 60915: [TRANSLATIONS] Apply turkish translations. Patch by Erdem Ersoy. Fixed typo in dll\cpl\inetcpl\lang\tr-TR.rc. CORE-7408 #comment Turkish translations applied in r60915. Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 10 14:47:03 2013 New Revision: 60915 URL: http://svn.reactos.org/svn/reactos?rev=60915&view=rev Log: [TRANSLATIONS] Apply turkish translations. Patch by Erdem Ersoy. Fixed typo in dll\cpl\inetcpl\lang\tr-TR.rc. CORE-7408 #comment Turkish translations applied in r60915. Thanks a lot! Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/access/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/console/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/input/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/intl/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/joy/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/main/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc (with props) trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc (with props) trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc (with props) trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc (with props) trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/credui/lang/credui_Tr.rc (with props) Modified: trunk/reactos/base/applications/charmap/lang/tr-TR.rc trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc trunk/reactos/base/applications/games/spider/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/system/winlogon/lang/tr-TR.rc trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc trunk/reactos/dll/cpl/console/rsrc.rc trunk/reactos/dll/cpl/desk/lang/tr-TR.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/input/rsrc.rc trunk/reactos/dll/cpl/intl/rsrc.rc trunk/reactos/dll/cpl/joy/rsrc.rc trunk/reactos/dll/cpl/liccpa/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/rsrc.rc trunk/reactos/dll/cpl/powercfg/rsrc.rc trunk/reactos/dll/cpl/sysdm/rsrc.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc trunk/reactos/dll/shellext/deskadp/rsrc.rc trunk/reactos/dll/shellext/deskmon/rsrc.rc trunk/reactos/dll/shellext/slayer/rsrc.rc trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc trunk/reactos/dll/win32/avifil32/rsrc.rc trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc trunk/reactos/dll/win32/comctl32/rsrc.rc trunk/reactos/dll/win32/credui/credui.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Added: trunk/reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/system/winlogon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/boot/freeldr/fdebug/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/t… Added: trunk/reactos/dll/cpl/access/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/appwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/tr-TR.… Added: trunk/reactos/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR… Modified: trunk/reactos/dll/cpl/console/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/rsrc.rc?re… Modified: trunk/reactos/dll/cpl/desk/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/tr-TR.rc… Added: trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… Added: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… Added: trunk/reactos/dll/cpl/input/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/input/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/intl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/intl/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/rsrc.rc?rev=6… Added: trunk/reactos/dll/cpl/joy/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/tr-TR.rc?… Modified: trunk/reactos/dll/cpl/joy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/rsrc.rc?rev=60… Added: trunk/reactos/dll/cpl/liccpa/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/tr-TR.… Modified: trunk/reactos/dll/cpl/liccpa/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=6… Added: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/mmsys/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… Modified: trunk/reactos/dll/cpl/powercfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/rsrc.rc?r… Added: trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/sysdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/rsrc.rc?rev=… Added: trunk/reactos/dll/cpl/telephon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/tr-T… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Added: trunk/reactos/dll/cpl/wined3dcfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/tr… Modified: trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/rsrc.rc… Added: trunk/reactos/dll/shellext/deskadp/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/lang/… Modified: trunk/reactos/dll/shellext/deskadp/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskadp/rsrc.… Added: trunk/reactos/dll/shellext/deskmon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/lang/… Modified: trunk/reactos/dll/shellext/deskmon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/deskmon/rsrc.… Added: trunk/reactos/dll/shellext/slayer/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/lang/t… Modified: trunk/reactos/dll/shellext/slayer/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/slayer/rsrc.r… Modified: trunk/reactos/dll/win32/avifil32/lang/avifile_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/lang/av… Modified: trunk/reactos/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/rsrc.rc… Modified: trunk/reactos/dll/win32/comctl32/lang/comctl_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/lang/co… Modified: trunk/reactos/dll/win32/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rsrc.rc… Modified: trunk/reactos/dll/win32/credui/credui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/credui.rc… Added: trunk/reactos/dll/win32/credui/lang/credui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/credui/lang/cred…

10 years, 10 months

[ekohl] 60914: [USETUP] Apply turkish ranslation. Patch by Erdem Ersoy. CORE-7408 #comment Usetup translation applied in r60914. Thanks a lot!

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Nov 10 14:16:05 2013 New Revision: 60914 URL: http://svn.reactos.org/svn/reactos?rev=60914&view=rev Log: [USETUP] Apply turkish ranslation. Patch by Erdem Ersoy. CORE-7408 #comment Usetup translation applied in r60914. Thanks a lot! Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/muilanguages.h Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Sun Nov 10 14:16:05 2013 @@ -1,3 +1,7 @@ +/* + * TRANSLATOR: 2013 - Erdem Ersoy (eersoy93) (erdemersoy(a)live.com) + */ + #pragma once MUI_LAYOUTS trTRLayouts[] = @@ -7,3 +11,1673 @@ { L"0409", L"00000409" }, { NULL, NULL } }; + +static MUI_ENTRY trTRLanguagePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Dil Seimi", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Kurulum srasnda kullanlacak dili seiniz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " Ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Bu dil, kurulacak dizgenin ntanml dili olacaktr.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRWelcomePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Kur'a hogeldiniz.", + TEXT_STYLE_HIGHLIGHT + }, + { + 6, + 11, + "Kurulumun bu aamas, ReactOS ktklerini bilgisayara oa§ltr", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "ve kurulumun ikinci aamasn anklar.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 ReactOS'u kurmak iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 ReactOS'u onarmak vey ykseltmek iin R d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 ReactOS Ruhsat Koullar'n grntlemek iin L d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 ReactOS'u kurmadan kmak iin F3 d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "Daha ok bilgi iin buraya gidiniz:", + TEXT_STYLE_NORMAL + }, + { + 6, + 24, + "http://www.reactos.org", + TEXT_STYLE_HIGHLIGHT + }, + { + 0, + 0, + "Giri = Srdr R = Onar vey Ykselt L = Ruhsat Koullar F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRIntroPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Kur, n gelitirme evresinde oldu§undan daha", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "her trl ilevi desteklemez.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Desteklenmeyen ilevler unlardr:", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "- Kur, bir diskte birden fazla birincil blm ynetemez.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "- Kur, bir diskte, geniletilmi bir blm oldu§u srece", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " o diskteki birincil blm silemez.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "- Kur, bir diskte, di§er geniletilmi blmlerin oldu§u srece", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + " o diskteki ilk geniletilmi blm silemez.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "- Kur, yalnzca FAT ktk dizgelerini destekler.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "- Ktk dizgesi denetimi daha bitirilmemitir.", + TEXT_STYLE_NORMAL + }, + { + 8, + 23, + "\x07 ReactOS'u kurmak iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "\x07 ReactOS'u kurmadan kmak iin F3 d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRLicensePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + "Ruhsat Koullar:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 8, + "ReactOS, GNU GPL'nin yansra X11, BSD ve", + TEXT_STYLE_NORMAL + }, + { + 8, + 9, + "GNU LPGL gibi di§er uygun ruhsatlardan alnan", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "dzgleri ieren blmlerin koullaryla ruhsatlanmtr.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "Bu yzden ReactOS'un tm paralar, GNU GPL ile birlikte", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "di§er zgn ruhsatlarla yaynlanr.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "Bu yazlm, mahall ve uluslararas yasalarn uygunlu§u asndan", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "hibir gvenceyle ve hibir kstlamayla gelmez.", + TEXT_STYLE_NORMAL + }, + { + 8, + 16, + "ReactOS'un ruhsatlanmas, yalnzca nc kiilere da§tmay kapsar.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "E§er birtakm nedenlerle ReactOS ile birlikte GNU Umm", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "Kamu Ruhsat'n elde edememiseniz buraya gidiniz:", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "http://www.gnu.org/licenses/licenses.html", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 21, + "Gvence:", + TEXT_STYLE_HIGHLIGHT + }, + { + 8, + 23, + "Bu bir cretsiz yazlmdr, o§altma koullar iin kayna§a baknz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 24, + "Burada hibir gvence YOKTUR, hele hele SATILABLRLK vey", + TEXT_STYLE_NORMAL + }, + { + 8, + 25, + "BELRL BR AMACA UYGUNLUK asndan.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Geri Dn", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRDevicePageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Aa§daki dizelge, imdiki aygt ayarlarn gsterir.", + TEXT_STYLE_NORMAL + }, + { + 24, + 11, + "Bilgisayar Tr:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 12, + "Grnt Ayarlar:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 13, + "D§me Takm Tr:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 14, + "D§me Takm Dzeni:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 24, + 16, + "Onayla:", + TEXT_STYLE_NORMAL | TEXT_ALIGN_RIGHT + }, + { + 25, + 16, + "Bu aygt ayarlarn onayla.", + TEXT_STYLE_NORMAL + }, + { + 6, + 19, + "Aygt ayarlarn, bir seene§i semek iin yukar vey aa§ d§melerine", + TEXT_STYLE_NORMAL + }, + { + 6, + 20, + "basarak de§itirebilirsiniz. Setikten sonra giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 6, + 22, + "De§itirme ileminden sonra \"Bu aygt ayarlarn onayla.\"", + TEXT_STYLE_NORMAL + }, + { + 6, + 23, + "seene§ini seiniz, ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRRepairPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "ReactOS Kur, n gelitirme evresinde oldu§undan daha", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "her trl ilevi desteklemez.", + TEXT_STYLE_NORMAL + }, + { + 6, + 12, + "Onarma ilevi daha bitirilmemitir.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 letim dizgesini ykseltmek iin U d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Kurtarma Konsolu iin R d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 19, + "\x07 Bir nceki sayfaya geri dnmek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Bilgisayar yeniden balatmak iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "k = Geri Dn U = Ykselt R = Kurtar Giri = Bilgisayar Yeniden Balat", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRComputerPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kurulum yaplacak bilgisayarn trn seiniz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Semek istedi§iniz bilgisyar trn yukar ve aa§ d§meleriyle", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " seiniz, ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Bilgisayar trnde hibir de§iiklik yaplmadan bir nceki sayfaya", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " geri dnmek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRFlushPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "Dizge, imdi diskteki tm verileri onaylyor.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "Bu ilem bir dakka srebilir.", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "?lem bitti§inde bilgisayar yeniden balayacaktr.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "nbellek temizleniyor...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRQuitPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS, btnyle kurulmad.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "A: srcsndeki disketi ve", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "tm CD srclerindeki CD-ROM'lar kartnz.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Bilgisayar yeniden balatmak iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Ltfen bekleyiniz...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG, + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRDisplayPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kurulum yaplacak bilgisayarn grnt ayarlarn seiniz.", + TEXT_STYLE_NORMAL + }, + { 8, + 10, + "\x07 Semek istedi§iniz grnt ayarlarn yukar ve aa§ d§meleriyle", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " seiniz, ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 Grnt ayarlarnda hibir de§iiklik yaplmadan bir nceki sayfaya", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " geri dnmek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRSuccessPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 10, + 6, + "ReactOS'un ana bileenleri baarl bir ekilde kuruldu.", + TEXT_STYLE_NORMAL + }, + { + 10, + 8, + "A: srcsndeki disketi ve", + TEXT_STYLE_NORMAL + }, + { + 10, + 9, + "tm CD srclerindeki CD-ROM'lar kartnz.", + TEXT_STYLE_NORMAL + }, + { + 10, + 11, + "Bilgisayar yeniden balatmak iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Bilgisayar Yeniden Balat", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRBootPageEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, diske nykleyiciyi kuramad.", + TEXT_STYLE_NORMAL + }, + { + 6, + 13, + "A: srcsne biimlendirilmi bir disk taknz, ardndan", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "giri d§mesine basnz.", + TEXT_STYLE_NORMAL, + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } + +}; + +static MUI_ENTRY trTRSelectPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Aa§daki dizelge, var olan blmlerle yeni blmler oluturmak iin", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "kullanlmayan bolu§u gsterir.", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + "\x07 Bir §eyi semek iin yukar vey aa§ d§melerine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 ReactOS'u seili blme yklemek iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "\x07 Seili boluktan yeni bir blm oluturmak iin C d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 17, + "\x07 Seili blm silmek iin D d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Ltfen bekleyiniz...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRFormatPartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, imdi seti§iniz blm biimlendirecek.", + TEXT_STYLE_NORMAL + }, + { + 6, + 10, + "Srdrmek iin giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + TEXT_STYLE_NORMAL + } +}; + +static MUI_ENTRY trTRInstallDirectoryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, seili blme ReactOS ktklerini ykleyecek. ReactOS'un yklenece§i", + TEXT_STYLE_NORMAL + }, + { + 6, + 9, + "dizini seiniz.", + TEXT_STYLE_NORMAL + }, + { + 6, + 14, + "nerilen dizini de§itirmek iin geri d§mesi ile damgalar siliniz,", + TEXT_STYLE_NORMAL + }, + { + 6, + 15, + "ardndan ReactOS'un kurulaca§ yeni dizini yaznz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRFileCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "Kur, ReactOS'un kurulaca§ dizine ktkleri o§altrken ltfen bekleyiniz.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "Bu ilem birka dakka srebilir.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 50, + 0, + "\xB3 Ltfen bekleyiniz...", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRBootLoaderEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, imdi nykleyiciyi kuracak.", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "nykleyiciyi diskin MBR'sine ve VBR'sine kur.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "nykleyiciyi diskin yalnzca VBR'sine kur.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "nykleyiciyi bir diskete kur.", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + "nykleyiciyi kurma.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kurulum yaplacak bilgisayarn d§me takm trn seiniz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Semek istedi§iniz d§me takm trn yukar ve aa§ d§meleriyle", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " seiniz, ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 D§me takm trnde hibir de§iiklik yaplmadan bir nceki sayfaya", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " geri dnmek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kurulum yaplacak bilgisayarn d§me takm dzenini seiniz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 Semek istedi§iniz d§me takm dzenini yukar ve aa§", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " d§meleriyle seiniz, ardndan giri d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "\x07 D§me takm dzeninde hibir de§iiklik yaplmadan bir nceki", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " sayfaya geri dnmek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "Giri = Srdr k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY trTRPrepareCopyEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, bilgisayar ReactOS ktklerinin o§altlmasna anklyor.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "o§altma dizelgesi oluturuluyor...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +static MUI_ENTRY trTRSelectFSEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 17, + "Aa§daki ktk dizgelerinden birini seiniz.", + 0 + }, + { + 8, + 19, + "\x07 Bir §eyi semek iin yukar vey aa§ d§melerine basnz.", + 0 + }, + { + 8, + 21, + "\x07 Blm biimlendirmek iin giri d§mesine basnz.", + 0 + }, + { + 8, + 23, + "\x07 Baka bir blm semek iin k d§mesine basnz.", + 0 + }, + { + 0, + 0, + "Giri = Srdr k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRDeletePartitionEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Blm silmeye karar verdiniz.", + TEXT_STYLE_NORMAL + }, + { + 8, + 18, + "\x07 Blm silmek iin D d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 11, + 19, + "UYARI: Bu blmdeki tm bilgiler silinecektir!", + TEXT_STYLE_NORMAL + }, + { + 8, + 21, + "\x07 Silme ileminden vazgemek iin k d§mesine basnz.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "D = Blm Sil k = ptal F3 = k", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY trTRRegistryEntries[] = +{ + { + 4, + 3, + " ReactOS " KERNEL_VERSION_STR " Kur ", + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "Kur, dizge yaplandrmasn imdikiletiriyor.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "De§er y§nlar oluturuluyor...", + TEXT_TYPE_STATUS | TEXT_PADDING_BIG + }, + { + 0, + 0, + NULL, + 0 + }, + +}; + +MUI_ERROR trTRErrorEntries[] = +{ + { + //ERROR_NOT_INSTALLED + "ReactOS, bilgisayara btnyle kurulmad.\n" + "E§er Kur'dan karsanz ReactOS'u kurmak\n" + "iin Kur'u yeniden altrmalsnz.\n" + "\n" + " \x07 Kurulumu srdrmek iin giri d§mesine basnz.\n" + " \x07 Kur'dan kmak iin F3 d§mesine basnz.", + "F3 = k Giri = Srdr" + }, + { + //ERROR_NO_HDD + "Kur, bir disk alglayamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_NO_SOURCE_DRIVE + "Kur, kaynak srcy alglayamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_LOAD_TXTSETUPSIF + "Kur, TXTSETUP.SIF kt§n ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CORRUPT_TXTSETUPSIF + "Kur, bozuk bir TXTSETUP.SIF kt§ buldu.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_SIGNATURE_TXTSETUPSIF, + "Kur, TXTSETUP.SIF kt§nde geersiz bir imz buldu.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_DRIVE_INFORMATION + "Kur, dizge srcs bilgisini ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_WRITE_BOOT, + "Kur, dizge srcsne FAT nykleme dzgsn kuramad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_LOAD_COMPUTER, + "Kur, bilgisayar tr dizelgesini ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_LOAD_DISPLAY, + "Kur, grnt ayarlar dizelgesini ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_LOAD_KEYBOARD, + "Kur, d§me takm tr dizelgesini ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_LOAD_KBLAYOUT, + "Kur, d§me takm dzeni dizelgesini ykleyemedi.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_WARN_PARTITION, + "Kur, en az bir diskte, uyumsuz bir blm buldu.\n" + "\n" + "Bir blm silmek vey bir blm oluturmak byle bir blm yok edebilir.\n" + "\n" + " \x07 Kur'dan kmak iin F3 d§mesine basnz.\n" + " \x07 Srdrmek iin giri d§mesine basnz.", + "F3 = k Giri = Srdr" + }, + { + //ERROR_NEW_PARTITION, + "Var olan bir blmn iine yeni\n" + "bir blm oluturulamaz!\n" + "\n" + " * Srdrmek iin bir d§meye basnz.", + NULL + }, + { + //ERROR_DELETE_SPACE, + "Kullanlmayan disk bolu§u silinemez!\n" + "\n" + " * Srdrmek iin bir d§meye basnz.", + NULL + }, + { + //ERROR_INSTALL_BOOTCODE, + "Kur, dizge srcsne FAT nykleme dzgsn kuramad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_NO_FLOPPY, + "A: srcsnde disk yok.", + "Giri = Srdr" + }, + { + //ERROR_UPDATE_KBSETTINGS, + "Kur, d§me takm dzeni ayarlarn imdikiletiremedi.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_UPDATE_DISPLAY_SETTINGS, + "Kur, grnt ayarlarn imdikiletiremedi.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_IMPORT_HIVE, + "Kur, bir y§n dosyasndan bir ey alamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_FIND_REGISTRY + "Kur, de§er ktklerini bulamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CREATE_HIVE, + "Kur, de§er y§nlarn oluturamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_INITIALIZE_REGISTRY, + "Kur, De§er Defteri'ni balatamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_INVALID_CABINET_INF, + "Dolabn geerli bir yaplandrma kt§ yok.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CABINET_MISSING, + "Dolap bulunamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CABINET_SCRIPT, + "Dolabn kurulum beti§i yok.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_COPY_QUEUE, + "Kur, ktk o§altma srasn aamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CREATE_DIR, + "Kur, kurulum dizinlerini oluturamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_TXTSETUP_SECTION, + "Kur, TXTSETUP.SIF kt§nde \"Directories\"\n" + "blmn bulamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CABINET_SECTION, + "Kur, dolapta \"Directories\"\n" + "blmn bulamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_CREATE_INSTALL_DIR + "Kur, kurulum dizinini oluturamad.", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_FIND_SETUPDATA, + "Kur, TXTSETUP.SIF kt§nde \"SetupData\"\n" + "blmn bulamad.\n", + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_WRITE_PTABLE, + "Kur, blm bilgilerini yazamad.\n" + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_ADDING_CODEPAGE, + "Kur, De§er Defteri'ne dzg sayfas bilgisini ekleyemedi.\n" + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_UPDATE_LOCALESETTINGS, + "Kur, dizge mahall ayrn yapamad.\n" + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_ADDING_KBLAYOUTS, + "Kur, De§er Defteri'ne d§me takm dzenlerini ekleyemedi.\n" + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_UPDATE_GEOID, + "Kur, co§rf konumu ayarlayamad.\n" + "Giri = Bilgisayar Yeniden Balat" + }, + { + //ERROR_INSUFFICIENT_DISKSPACE, + "Seili blmde yeteri kadar bo alan yok.\n" + " * Srdrmek iin bir d§meye basnz.", + NULL + }, + { + NULL, + NULL + } +}; + +MUI_PAGE trTRPages[] = +{ + { + LANGUAGE_PAGE, + trTRLanguagePageEntries + }, + { + START_PAGE, + trTRWelcomePageEntries + }, + { + INSTALL_INTRO_PAGE, + trTRIntroPageEntries + }, + { + LICENSE_PAGE, + trTRLicensePageEntries + }, + { + DEVICE_SETTINGS_PAGE, + trTRDevicePageEntries + }, + { + REPAIR_INTRO_PAGE, + trTRRepairPageEntries + }, + { + COMPUTER_SETTINGS_PAGE, + trTRComputerPageEntries + }, + { + DISPLAY_SETTINGS_PAGE, + trTRDisplayPageEntries + }, + { + FLUSH_PAGE, + trTRFlushPageEntries + }, + { + SELECT_PARTITION_PAGE, + trTRSelectPartitionEntries + }, + { + SELECT_FILE_SYSTEM_PAGE, + trTRSelectFSEntries + }, + { + FORMAT_PARTITION_PAGE, + trTRFormatPartitionEntries + }, + { + DELETE_PARTITION_PAGE, + trTRDeletePartitionEntries + }, + { + INSTALL_DIRECTORY_PAGE, + trTRInstallDirectoryEntries + }, + { + PREPARE_COPY_PAGE, + trTRPrepareCopyEntries + }, + { + FILE_COPY_PAGE, + trTRFileCopyEntries + }, + { + KEYBOARD_SETTINGS_PAGE, + trTRKeyboardSettingsEntries + }, + { + BOOT_LOADER_PAGE, + trTRBootLoaderEntries + }, + { + LAYOUT_SETTINGS_PAGE, + trTRLayoutSettingsEntries + }, + { + QUIT_PAGE, + trTRQuitPageEntries + }, + { + SUCCESS_PAGE, + trTRSuccessPageEntries + }, + { + BOOT_LOADER_FLOPPY_PAGE, + trTRBootPageEntries + }, + { + REGISTRY_PAGE, + trTRRegistryEntries + }, + { + -1, + NULL + } +}; + +MUI_STRING trTRStrings[] = +{ + {STRING_PLEASEWAIT, + " Ltfen bekleyiniz..."}, + {STRING_INSTALLCREATEPARTITION, + " Giri = Kur C = Blm Olutur F3 = k"}, + {STRING_INSTALLDELETEPARTITION, + " Giri = Kur D = Blm Sil F3 = k"}, + {STRING_PARTITIONSIZE, + "Bykl§ giriniz:"}, + {STRING_CHOOSENEWPARTITION, + "Yeni bir blm oluturmay setiniz."}, + {STRING_HDDSIZE, + "Oluturulacak blmn bykl§n megaoklu olarak giriniz."}, + {STRING_CREATEPARTITION, + " Giri = Blm Olutur k = ptal F3 = k"}, + {STRING_PARTFORMAT, + "Bu blm ileride biimlendirilecektir."}, + {STRING_NONFORMATTEDPART, + "ReactOS'u yeni ve biimlendirilmemi bir blme kurmay setiniz."}, + {STRING_INSTALLONPART, + "Kur, ReactOS'u bir blme kurar."}, + {STRING_CHECKINGPART, + "Kur, imdi seili blm gzden geiriyor."}, + {STRING_QUITCONTINUE, + "F3 = k Giri = Srdr"}, + {STRING_REBOOTCOMPUTER, + "Giri = Bilgisayar Yeniden Balat"}, + {STRING_TXTSETUPFAILED, + "Kur, TXTSETUP.SIF kt§ndeki \"%S\" blmn\nbulamad.\n"}, + {STRING_COPYING, + " Ktk o§altlyor: %S..."}, + {STRING_SETUPCOPYINGFILES, + "Kur, ktkleri o§altyor..."}, + {STRING_REGHIVEUPDATE, + " De§er y§nlar imdikiletiriliyor..."}, + {STRING_IMPORTFILE, + " Ktkten alnyor: %S..."}, + {STRING_DISPLAYETTINGSUPDATE, + " Grnt ayarlarnn de§erleri imdikiletiriliyor..."}, + {STRING_LOCALESETTINGSUPDATE, + " Mahall ayarlar imdikiletiriliyor..."}, + {STRING_KEYBOARDSETTINGSUPDATE, + " D§me takm dzeni ayarlarnn de§erleri imdikiletiriliyor..."}, + {STRING_CODEPAGEINFOUPDATE, + " De§er Defteri'ne dzg sayfas bilgisi ekleniyor..."}, + {STRING_DONE, + " Bitti!"}, + {STRING_REBOOTCOMPUTER2, + " Giri = Bilgisayar Yeniden Balat"}, + {STRING_CONSOLEFAIL1, + "Konsol alamad.\r\n\r\n"}, + {STRING_CONSOLEFAIL2, + "Bunun en bilinen nedeni, bir USB d§me takm kullanlmasdr.\r\n"}, + {STRING_CONSOLEFAIL3, + "USB d§me takm, daha tam olarak desteklenmemektedir.\r\n"}, + {STRING_FORMATTINGDISK, + "Kur, diski biimlendiriyor."}, + {STRING_CHECKINGDISK, + "Kur, diski gzden geiriyor."}, + {STRING_FORMATDISK1, + " Blm %S ktk dizgesiyle hzl biimlendir. "}, + {STRING_FORMATDISK2, + " Blm %S ktk dizgesiyle biimlendir. "}, + {STRING_KEEPFORMAT, + " Blm biimlendirme. Hibir de§iiklik olmayacak. "}, + {STRING_HDINFOPARTCREATE, + "%I64u %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu), %wZ zerinde."}, + {STRING_HDDINFOUNK1, + "%I64u %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu)."}, + {STRING_HDDINFOUNK2, + " %c%c Tr %lu %I64u %s"}, + {STRING_HDINFOPARTDELETE, + "zerinde: %I64u %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu), %wZ zerinde."}, + {STRING_HDDINFOUNK3, + "zerinde: %I64u %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu)."}, + {STRING_HDINFOPARTZEROED, + "Disk %lu (%I64u %s), Giri=%hu, Veri Yolu=%hu, Kimlik=%hu, %wZ zerinde."}, + {STRING_HDDINFOUNK4, + "%c%c Tr %lu %I64u %s"}, + {STRING_HDINFOPARTEXISTS, + "zerinde: Disk %lu (%I64u %s), Giri=%hu, Veri Yolu=%hu, Kimlik=%hu, %wZ zerinde."}, + {STRING_HDDINFOUNK5, + "%c%c Tr %-3u %6lu %s"}, + {STRING_HDINFOPARTSELECT, + "%6lu %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu), %S zerinde"}, + {STRING_HDDINFOUNK6, + "%6lu %s Disk %lu (Giri=%hu, Veri Yolu=%hu, Kimlik=%hu)"}, + {STRING_NEWPARTITION, + "Kur, u blm oluturdu:"}, + {STRING_UNPSPACE, + " Kullanlmayan Boluk %6lu %s"}, + {STRING_MAXSIZE, + "MB (En ok %lu MB)"}, + {STRING_UNFORMATTED, + "Yeni (Biimlendirilmemi)"}, + {STRING_FORMATUNUSED, + "Kullanlmayan"}, + {STRING_FORMATUNKNOWN, + "Bilinmeyen"}, + {STRING_KB, + "KB"}, + {STRING_MB, + "MB"}, + {STRING_GB, + "GB"}, + {STRING_ADDKBLAYOUTS, + "D§me takm dzenleri ekleniyor..."}, + {0, 0} +}; Modified: trunk/reactos/base/setup/usetup/muilanguages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/muilangu… ============================================================================== --- trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/muilanguages.h [iso-8859-1] Sun Nov 10 14:16:05 2013 @@ -805,7 +805,7 @@ {L"0000041E", L"874", L"874", L"10021", L"Thai", L"1", enUSPages, enUSErrorEntries, enUSStrings, UnicodeFonts, thTHLayouts }, #endif #ifdef LANGUAGE_TR_TR - {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"90", enUSPages, enUSErrorEntries, enUSStrings, LatinFonts, trTRLayouts }, + {L"0000041F", L"1254", L"857", L"10081", L"Turkish", L"90", trTRPages, trTRErrorEntries, trTRStrings, LatinFonts, trTRLayouts }, #endif #ifdef LANGUAGE_UK_UA {L"00000422", L"1251", L"866", L"10017", L"Ukrainian", L"380", ukUAPages, ukUAErrorEntries, ukUAStrings, CyrillicFonts, ukUALayouts },

10 years, 10 months

[hbelusca] 60913: [NTVDM] - BIOS: Reorganize a bit the header, and close the input thread before closing the input handle (and not after). - INT32: Fix a comment. - CMOS: Put CMOS data into a struc...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Nov 10 13:12:02 2013 New Revision: 60913 URL: http://svn.reactos.org/svn/reactos?rev=60913&view=rev Log: [NTVDM] - BIOS: Reorganize a bit the header, and close the input thread before closing the input handle (and not after). - INT32: Fix a comment. - CMOS: Put CMOS data into a structure called CMOS_MEMORY, introduce READ/WRITE_CMOS_DATA macros for simplifying code. Save CMOS memory into a file (à la Windows' NTVDM), which is loaded at startup. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/cmos.c branches/ntvdm/subsystems/ntvdm/cmos.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/int32.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -568,6 +568,9 @@ VOID BiosCleanup(VOID) { + /* Close the input thread handle */ + if (InputThread != NULL) CloseHandle(InputThread); + /* Restore the old screen buffer */ SetConsoleActiveScreenBuffer(BiosConsoleOutput); @@ -577,9 +580,6 @@ /* Close the console handles */ if (BiosConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleOutput); if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); - - /* Close the input thread handle */ - if (InputThread != NULL) CloseHandle(InputThread); } WORD BiosPeekCharacter(VOID) Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -15,8 +15,8 @@ /* DEFINES ********************************************************************/ -#define ROM_AREA_START 0xE0000 -#define ROM_AREA_END 0xFFFFF +#define ROM_AREA_START 0xE0000 +#define ROM_AREA_END 0xFFFFF #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 @@ -34,13 +34,15 @@ #define CONSOLE_FONT_HEIGHT 8 #define BIOS_KBD_BUFFER_SIZE 16 #define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now + #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 #define BIOS_PAGE_SIZE 0x1000 #define BIOS_MAX_VIDEO_MODE 0x13 -#define DEFAULT_ATTRIBUTE 0x07 -#define GRAPHICS_VIDEO_SEG 0xA000 -#define TEXT_VIDEO_SEG 0xB800 +#define DEFAULT_ATTRIBUTE 0x07 + +#define GRAPHICS_VIDEO_SEG 0xA000 +#define TEXT_VIDEO_SEG 0xB800 #define BDA_KBDFLAG_RSHIFT (1 << 0) #define BDA_KBDFLAG_LSHIFT (1 << 1) @@ -67,8 +69,6 @@ SCROLL_DIRECTION_RIGHT }; -#pragma pack(push, 1) - /* * BIOS Data Area at 0040:XXXX * @@ -76,6 +76,7 @@ * and: http://www.bioscentral.com/misc/bda.htm * for more information. */ +#pragma pack(push, 1) typedef struct { WORD SerialPorts[4]; // 0x00 @@ -142,10 +143,9 @@ BYTE Reserved17[15]; // 0x121 BYTE Reserved18[3]; // 0x130 } BIOS_DATA_AREA, *PBIOS_DATA_AREA; +#pragma pack(pop) C_ASSERT(sizeof(BIOS_DATA_AREA) == 0x133); - -#pragma pack(pop) /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.c [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -15,11 +15,10 @@ /* PRIVATE VARIABLES **********************************************************/ +static HANDLE hCmosRam = INVALID_HANDLE_VALUE; +static CMOS_MEMORY CmosMemory; + static BOOLEAN NmiEnabled = TRUE; -static BYTE StatusRegA = CMOS_DEFAULT_STA; -static BYTE StatusRegB = CMOS_DEFAULT_STB; -static BYTE StatusRegC = 0; -static BYTE AlarmHour, AlarmMinute, AlarmSecond; static CMOS_REGISTERS SelectedRegister = CMOS_REG_STATUS_D; /* PUBLIC FUNCTIONS ***********************************************************/ @@ -59,45 +58,29 @@ switch (SelectedRegister) { case CMOS_REG_SECONDS: - { - return (StatusRegB & CMOS_STB_BINARY) - ? CurrentTime.wSecond - : BINARY_TO_BCD(CurrentTime.wSecond); - } + return READ_CMOS_DATA(CmosMemory, CurrentTime.wSecond); case CMOS_REG_ALARM_SEC: - { - return (StatusRegB & CMOS_STB_BINARY) - ? AlarmSecond - : BINARY_TO_BCD(AlarmSecond); - } + return READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmSecond); case CMOS_REG_MINUTES: - { - return (StatusRegB & CMOS_STB_BINARY) - ? CurrentTime.wMinute - : BINARY_TO_BCD(CurrentTime.wMinute); - } + return READ_CMOS_DATA(CmosMemory, CurrentTime.wMinute); case CMOS_REG_ALARM_MIN: - { - return (StatusRegB & CMOS_STB_BINARY) - ? AlarmMinute - : BINARY_TO_BCD(AlarmMinute); - } + return READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmMinute); case CMOS_REG_HOURS: { BOOLEAN Afternoon = FALSE; BYTE Value = CurrentTime.wHour; - if (!(StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) { Value -= 12; Afternoon = TRUE; } - if (!(StatusRegB & CMOS_STB_BINARY)) Value = BINARY_TO_BCD(Value); + Value = READ_CMOS_DATA(CmosMemory, Value); /* Convert to 12-hour */ if (Afternoon) Value |= 0x80; @@ -108,15 +91,15 @@ case CMOS_REG_ALARM_HRS: { BOOLEAN Afternoon = FALSE; - BYTE Value = AlarmHour; - - if (!(StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) + BYTE Value = CmosMemory.AlarmHour; + + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) { Value -= 12; Afternoon = TRUE; } - if (!(StatusRegB & CMOS_STB_BINARY)) Value = BINARY_TO_BCD(Value); + Value = READ_CMOS_DATA(CmosMemory, Value); /* Convert to 12-hour */ if (Afternoon) Value |= 0x80; @@ -125,70 +108,42 @@ } case CMOS_REG_DAY_OF_WEEK: - { - return (StatusRegB & CMOS_STB_BINARY) - ? CurrentTime.wDayOfWeek - : BINARY_TO_BCD(CurrentTime.wDayOfWeek); - } + /* + * The CMOS value is 1-based but the + * GetLocalTime API value is 0-based. + * Correct it. + */ + return READ_CMOS_DATA(CmosMemory, CurrentTime.wDayOfWeek + 1); case CMOS_REG_DAY: - { - return (StatusRegB & CMOS_STB_BINARY) - ? CurrentTime.wDay - :BINARY_TO_BCD(CurrentTime.wDay); - } + return READ_CMOS_DATA(CmosMemory, CurrentTime.wDay); case CMOS_REG_MONTH: - { - return (StatusRegB & CMOS_STB_BINARY) - ? CurrentTime.wMonth - : BINARY_TO_BCD(CurrentTime.wMonth); - } + return READ_CMOS_DATA(CmosMemory, CurrentTime.wMonth); case CMOS_REG_YEAR: - { - return (StatusRegB & CMOS_STB_BINARY) - ? (CurrentTime.wYear % 100) - : BINARY_TO_BCD(CurrentTime.wYear % 100); - } - - case CMOS_REG_STATUS_A: - { - return StatusRegA; - } - - case CMOS_REG_STATUS_B: - { - return StatusRegB; - } + return READ_CMOS_DATA(CmosMemory, CurrentTime.wYear % 100); case CMOS_REG_STATUS_C: { - BYTE Value = StatusRegC; + BYTE Value = CmosMemory.StatusRegC; /* Clear status register C */ - StatusRegC = 0; + CmosMemory.StatusRegC = 0x00; /* Return the old value */ return Value; } + case CMOS_REG_STATUS_A: + case CMOS_REG_STATUS_B: case CMOS_REG_STATUS_D: - { - /* Our CMOS battery works perfectly forever */ - return CMOS_BATTERY_OK; - } - case CMOS_REG_DIAGNOSTICS: - { - /* Diagnostics found no errors */ - return 0; - } - + case CMOS_REG_SHUTDOWN_STATUS: default: { - /* Read ignored */ - return 0; + // ASSERT(SelectedRegister < CMOS_REG_MAX); + return CmosMemory.Regs[SelectedRegister]; } } @@ -209,38 +164,26 @@ case CMOS_REG_SECONDS: { ChangeTime = TRUE; - CurrentTime.wSecond = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CurrentTime.wSecond = WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_ALARM_SEC: { - AlarmSecond = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CmosMemory.AlarmSecond = WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_MINUTES: { ChangeTime = TRUE; - CurrentTime.wMinute = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CurrentTime.wMinute = WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_ALARM_MIN: { - AlarmMinute = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CmosMemory.AlarmMinute = WRITE_CMOS_DATA(CmosMemory, Value); break; } @@ -250,15 +193,13 @@ ChangeTime = TRUE; - if (!(StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) { Value &= ~0x80; Afternoon = TRUE; } - CurrentTime.wHour = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); + CurrentTime.wHour = WRITE_CMOS_DATA(CmosMemory, Value); /* Convert to 24-hour format */ if (Afternoon) CurrentTime.wHour += 12; @@ -270,18 +211,16 @@ { BOOLEAN Afternoon = FALSE; - if (!(StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) + if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value & 0x80)) { Value &= ~0x80; Afternoon = TRUE; } - AlarmHour = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); + CmosMemory.AlarmHour = WRITE_CMOS_DATA(CmosMemory, Value); /* Convert to 24-hour format */ - if (Afternoon) AlarmHour += 12; + if (Afternoon) CmosMemory.AlarmHour += 12; break; } @@ -289,30 +228,27 @@ case CMOS_REG_DAY_OF_WEEK: { ChangeTime = TRUE; - CurrentTime.wDayOfWeek = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + /* + * The CMOS value is 1-based but the + * SetLocalTime API value is 0-based. + * Correct it. + */ + Value -= 1; + CurrentTime.wDayOfWeek = WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_DAY: { ChangeTime = TRUE; - CurrentTime.wDay = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CurrentTime.wDay = WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_MONTH: { ChangeTime = TRUE; - CurrentTime.wMonth = (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CurrentTime.wMonth = WRITE_CMOS_DATA(CmosMemory, Value); break; } @@ -323,28 +259,30 @@ /* Clear everything except the century */ CurrentTime.wYear = (CurrentTime.wYear / 100) * 100; - CurrentTime.wYear += (StatusRegB & CMOS_STB_BINARY) - ? Value - : BCD_TO_BINARY(Value); - + CurrentTime.wYear += WRITE_CMOS_DATA(CmosMemory, Value); break; } case CMOS_REG_STATUS_A: { - StatusRegA = Value; + CmosMemory.StatusRegA = Value & 0x7F; // Bit 7 is read-only break; } case CMOS_REG_STATUS_B: { - StatusRegB = Value; - break; - } + CmosMemory.StatusRegB = Value; + break; + } + + case CMOS_REG_STATUS_C: + case CMOS_REG_STATUS_D: + // Status registers C and D are read-only + break; default: { - /* Write ignored */ + CmosMemory.Regs[SelectedRegister] = Value; } } @@ -356,7 +294,7 @@ DWORD RtcGetTicksPerSecond(VOID) { - BYTE RateSelect = StatusRegB & 0x0F; + BYTE RateSelect = CmosMemory.StatusRegB & 0x0F; if (RateSelect == 0) { @@ -373,12 +311,12 @@ VOID RtcPeriodicTick(VOID) { /* Set PF */ - StatusRegC |= CMOS_STC_PF; + CmosMemory.StatusRegC |= CMOS_STC_PF; /* Check if there should be an interrupt on a periodic timer tick */ - if (StatusRegB & CMOS_STB_INT_PERIODIC) - { - StatusRegC |= CMOS_STC_IRQF; + if (CmosMemory.StatusRegB & CMOS_STB_INT_PERIODIC) + { + CmosMemory.StatusRegC |= CMOS_STC_IRQF; /* Interrupt! */ PicInterruptRequest(RTC_IRQ_NUMBER); @@ -394,26 +332,91 @@ GetLocalTime(&CurrentTime); /* Set UF */ - StatusRegC |= CMOS_STC_UF; + CmosMemory.StatusRegC |= CMOS_STC_UF; /* Check if the time matches the alarm time */ - if ((CurrentTime.wHour == AlarmHour) - && (CurrentTime.wMinute == AlarmMinute) - && (CurrentTime.wSecond == AlarmSecond)) + if ((CurrentTime.wHour == CmosMemory.AlarmHour ) && + (CurrentTime.wMinute == CmosMemory.AlarmMinute) && + (CurrentTime.wSecond == CmosMemory.AlarmSecond)) { /* Set the alarm flag */ - StatusRegC |= CMOS_STC_AF; + CmosMemory.StatusRegC |= CMOS_STC_AF; /* Set IRQF if there should be an interrupt */ - if (StatusRegB & CMOS_STB_INT_ON_ALARM) StatusRegC |= CMOS_STC_IRQF; + if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_ALARM) CmosMemory.StatusRegC |= CMOS_STC_IRQF; } /* Check if there should be an interrupt on update */ - if (StatusRegB & CMOS_STB_INT_ON_UPDATE) StatusRegC |= CMOS_STC_IRQF; - - if (StatusRegC & CMOS_STC_IRQF) + if (CmosMemory.StatusRegB & CMOS_STB_INT_ON_UPDATE) CmosMemory.StatusRegC |= CMOS_STC_IRQF; + + if (CmosMemory.StatusRegC & CMOS_STC_IRQF) { /* Interrupt! */ PicInterruptRequest(RTC_IRQ_NUMBER); } } + +BOOLEAN CmosInitialize(VOID) +{ + DWORD CmosSize = sizeof(CmosMemory); + + /* File must not be opened before */ + ASSERT(hCmosRam == INVALID_HANDLE_VALUE); + + /* Clear the CMOS memory */ + ZeroMemory(&CmosMemory, sizeof(CmosMemory)); + + /* Always open (and if needed, create) a RAM file with exclusive access */ + SetLastError(0); // For debugging purposes + hCmosRam = CreateFileW(L"cmos.ram", + GENERIC_READ | GENERIC_WRITE, + 0, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + DPRINT1("CMOS opening %s ; GetLastError() = %u\n", hCmosRam != INVALID_HANDLE_VALUE ? "succeeded" : "failed", GetLastError()); + + if (hCmosRam != INVALID_HANDLE_VALUE) + { + BOOL Success = FALSE; + + /* Attempt to fill the CMOS memory with the RAM file */ + SetLastError(0); // For debugging purposes + Success = ReadFile(hCmosRam, &CmosMemory, CmosSize, &CmosSize, NULL); + if (CmosSize != sizeof(CmosMemory)) + { + /* Bad CMOS Ram file. Reinitialize the CMOS memory. */ + DPRINT1("Invalid CMOS file, read bytes %u, expected bytes %u\n", CmosSize, sizeof(CmosMemory)); + ZeroMemory(&CmosMemory, sizeof(CmosMemory)); + } + DPRINT1("CMOS loading %s ; GetLastError() = %u\n", Success ? "succeeded" : "failed", GetLastError()); + SetFilePointer(hCmosRam, 0, NULL, FILE_BEGIN); + } + + /* Overwrite some registers with default values */ + CmosMemory.StatusRegA = CMOS_DEFAULT_STA; + CmosMemory.StatusRegB = CMOS_DEFAULT_STB; + CmosMemory.StatusRegC = 0x00; + CmosMemory.StatusRegD = CMOS_BATTERY_OK; // Our CMOS battery works perfectly forever. + CmosMemory.Diagnostics = 0x00; // Diagnostics must not find any errors. + CmosMemory.ShutdownStatus = 0x00; + + return TRUE; +} + +VOID CmosCleanup(VOID) +{ + DWORD CmosSize = sizeof(CmosMemory); + + if (hCmosRam == INVALID_HANDLE_VALUE) return; + + /* Flush the CMOS memory back to the RAM file and close it */ + SetFilePointer(hCmosRam, 0, NULL, FILE_BEGIN); + WriteFile(hCmosRam, &CmosMemory, CmosSize, &CmosSize, NULL); + + CloseHandle(hCmosRam); + hCmosRam = INVALID_HANDLE_VALUE; +} + +/* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/cmos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/cmos.h [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: cmos.h - * PURPOSE: Real Time Clock emulation (header file) + * PURPOSE: CMOS Real Time Clock emulation * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -43,6 +43,12 @@ #define BINARY_TO_BCD(x) (((x / 10) << 4) | (x % 10)) #define BCD_TO_BINARY(x) (((x >> 4) * 10) + (x & 0x0F)) +#define WRITE_CMOS_DATA(Cmos, Value) \ + ((Cmos).StatusRegB & CMOS_STB_BINARY) ? (Value) : BCD_TO_BINARY(Value) + +#define READ_CMOS_DATA(Cmos, Value) \ + ((Cmos).StatusRegB & CMOS_STB_BINARY) ? (Value) : BINARY_TO_BCD(Value) + typedef enum _CMOS_REGISTERS { CMOS_REG_SECONDS, @@ -60,8 +66,62 @@ CMOS_REG_STATUS_C, CMOS_REG_STATUS_D, CMOS_REG_DIAGNOSTICS, - CMOS_REG_MAX + CMOS_REG_SHUTDOWN_STATUS, + CMOS_REG_MAX = 0x40 } CMOS_REGISTERS, *PCMOS_REGISTERS; + + +/* + * CMOS Memory Map + * + * See the following documentation for more information: + * http://www.intel-assembler.it/portale/5/cmos-memory-map-123/cmos-memory-map… + * http://wiki.osdev.org/CMOS + * http://www.bioscentral.com/misc/cmosmap.htm + */ +#pragma pack(push, 1) +typedef struct +{ + BYTE Second; // 0x00 + BYTE AlarmSecond; // 0x01 + BYTE Minute; // 0x02 + BYTE AlarmMinute; // 0x03 + BYTE Hour; // 0x04 + BYTE AlarmHour; // 0x05 + BYTE DayOfWeek; // 0x06 + BYTE Day; // 0x07 + BYTE Month; // 0x08 + BYTE Year; // 0x09 + + BYTE StatusRegA; // 0x0a + BYTE StatusRegB; // 0x0b +} CMOS_CLOCK, *PCMOS_CLOCK; + +typedef struct +{ + union + { + struct + { + CMOS_CLOCK; // 0x00 - 0x0b + BYTE StatusRegC; // 0x0c + BYTE StatusRegD; // 0x0d + BYTE Diagnostics; // 0x0e + BYTE ShutdownStatus; // 0x0f + }; + BYTE Regs1[0x10]; // 0x00 - 0x0f + BYTE Regs [0x40]; // 0x00 - 0x3f + }; + + /* + * Extended information 0x40 - 0x7f + */ +} CMOS_MEMORY, *PCMOS_MEMORY; +#pragma pack(pop) + +C_ASSERT(sizeof(CMOS_MEMORY) == 0x40); + +/* FUNCTIONS ******************************************************************/ BOOLEAN IsNmiEnabled(VOID); VOID CmosWriteAddress(BYTE Value); @@ -70,7 +130,10 @@ DWORD RtcGetTicksPerSecond(VOID); VOID RtcPeriodicTick(VOID); VOID RtcTimeUpdate(VOID); - + +BOOLEAN CmosInitialize(VOID); +VOID CmosCleanup(VOID); + #endif // _CMOS_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -11,6 +11,7 @@ #define NDEBUG #include "emulator.h" +#include "cmos.h" #include "bios.h" #include "bop.h" #include "dos.h" @@ -19,7 +20,6 @@ #include "pic.h" #include "ps2.h" #include "timer.h" -#include "cmos.h" /* PRIVATE VARIABLES **********************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -163,7 +163,7 @@ // HACK: The following instruction should be HLT! BiosCode[Offset++] = 0x90; // nop - BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -10) + BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -11) BiosCode[Offset++] = 0xF5; // EXIT: Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Sun Nov 10 13:12:02 2013 @@ -12,6 +12,7 @@ #include "ntvdm.h" #include "emulator.h" +#include "cmos.h" #include "bios.h" #include "speaker.h" #include "vga.h" @@ -19,7 +20,6 @@ #include "timer.h" #include "pic.h" #include "ps2.h" -#include "cmos.h" /* * Activate this line if you want to be able to test NTVDM with: @@ -117,6 +117,13 @@ goto Cleanup; } + /* Initialize the CMOS */ + if (!CmosInitialize()) + { + wprintf(L"FATAL: Failed to initialize the VDM CMOS.\n"); + goto Cleanup; + } + /* Initialize the system BIOS */ if (!BiosInitialize()) { @@ -227,6 +234,7 @@ Cleanup: SpeakerCleanup(); BiosCleanup(); + CmosCleanup(); EmulatorCleanup(); DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n");

10 years, 10 months

[aandrejevic] 60912: [FAST486] The number of bit places in a shift operation is ANDed by the width of the type when it is in a register, so (1 << c), when c is 32, is actually 1, and not 0. Fix the...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Nov 10 03:11:56 2013 New Revision: 60912 URL: http://svn.reactos.org/svn/reactos?rev=60912&view=rev Log: [FAST486] The number of bit places in a shift operation is ANDed by the width of the type when it is in a register, so (1 << c), when c is 32, is actually 1, and not 0. Fix the calculation of MaxValue by using SignFlag | (SignFlag - 1) instead. Modified: branches/ntvdm/lib/fast486/opgroups.c Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sun Nov 10 03:11:56 2013 @@ -43,7 +43,7 @@ { ULONG Result; ULONG SignFlag = 1 << (Bits - 1); - ULONG MaxValue = (1 << Bits) - 1; + ULONG MaxValue = (SignFlag - 1) | SignFlag; /* Make sure the values don't exceed the maximum for their size */ FirstValue &= MaxValue;

10 years, 10 months

[aandrejevic] 60911: [NTVDM] Fix the jump instruction offset. Spotted by Hermes Belusca-Maito.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Nov 10 01:19:50 2013 New Revision: 60911 URL: http://svn.reactos.org/svn/reactos?rev=60911&view=rev Log: [NTVDM] Fix the jump instruction offset. Spotted by Hermes Belusca-Maito. Modified: branches/ntvdm/subsystems/ntvdm/int32.c Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sun Nov 10 01:19:50 2013 @@ -155,8 +155,8 @@ BiosCode[Offset++] = EMULATOR_CTRL_BOP; // Control BOP BiosCode[Offset++] = CTRL_BOP_INT32; // 32-bit Interrupt dispatcher - BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) - BiosCode[Offset++] = 0x03; + BiosCode[Offset++] = 0x73; // jnc EXIT (offset +4) + BiosCode[Offset++] = 0x04; BiosCode[Offset++] = 0xFB; // sti

10 years, 10 months

[aandrejevic] 60910: [NTVDM] Don't enable interrupts unless it's necessary in the interrupt handler. [FAST486] When handling interrupt signals, make sure at least one instruction is executed, to pr...

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Nov 10 00:53:05 2013 New Revision: 60910 URL: http://svn.reactos.org/svn/reactos?rev=60910&view=rev Log: [NTVDM] Don't enable interrupts unless it's necessary in the interrupt handler. [FAST486] When handling interrupt signals, make sure at least one instruction is executed, to prevent the CPU from being completely blocked by interrupt signals. Modified: branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/subsystems/ntvdm/int32.c Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sun Nov 10 00:53:05 2013 @@ -63,18 +63,9 @@ * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if ((State->IntStatus == FAST486_INT_EXECUTE) - || (State->Flags.If - && (State->IntAckCallback != NULL) - && (State->IntStatus == FAST486_INT_SIGNAL))) + if (State->IntStatus == FAST486_INT_EXECUTE) { FAST486_IDT_ENTRY IdtEntry; - - if (State->IntStatus == FAST486_INT_SIGNAL) - { - /* Acknowledge the interrupt to get the number */ - State->PendingIntNum = State->IntAckCallback(State); - } /* Get the interrupt vector */ if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) @@ -88,6 +79,16 @@ /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; + } + else if (State->Flags.If + && (State->IntAckCallback != NULL) + && (State->IntStatus == FAST486_INT_SIGNAL)) + { + /* Acknowledge the interrupt to get the number */ + State->PendingIntNum = State->IntAckCallback(State); + + /* Set the interrupt status to execute on the next instruction */ + State->IntStatus = FAST486_INT_EXECUTE; } } Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/int32.c [iso-8859-1] Sun Nov 10 00:53:05 2013 @@ -139,7 +139,7 @@ { IntVecTable[i] = MAKELONG(Offset, BiosSegment); - BiosCode[Offset++] = 0xFB; // sti + BiosCode[Offset++] = 0xFA; // cli BiosCode[Offset++] = 0x6A; // push i BiosCode[Offset++] = (UCHAR)i; @@ -158,11 +158,13 @@ BiosCode[Offset++] = 0x73; // jnc EXIT (offset +3) BiosCode[Offset++] = 0x03; + BiosCode[Offset++] = 0xFB; // sti + // HACK: The following instruction should be HLT! BiosCode[Offset++] = 0x90; // nop BiosCode[Offset++] = 0xEB; // jmp BOP_SEQ (offset -10) - BiosCode[Offset++] = 0xF6; + BiosCode[Offset++] = 0xF5; // EXIT: BiosCode[Offset++] = 0x83; // add sp, 4

10 years, 10 months

← Newer
1
...
22
23
24
25
26
27
28
...
35
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 November 2013