Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 65445: [WIN32K] - In XFORMOBJ_bApplyXform do not overwrite the data in the input buffer - Make XFORMOBJ_bXformFixPoints return VOID instead of BOOL
by tkreuzer＠svn.reactos.org 22 Nov '14

22 Nov '14

Author: tkreuzer Date: Sat Nov 22 09:07:33 2014 New Revision: 65445 URL: http://svn.reactos.org/svn/reactos?rev=65445&view=rev Log: [WIN32K] - In XFORMOBJ_bApplyXform do not overwrite the data in the input buffer - Make XFORMOBJ_bXformFixPoints return VOID instead of BOOL Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c trunk/reactos/win32ss/gdi/ntgdi/xformobj.c Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/th… ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sat Nov 22 09:07:33 2014 @@ -309,7 +309,7 @@ sizeof(ThreadInfo), NULL); if (!NT_SUCCESS(Status)) return Status; - if (ThreadInfo == TRUE) return STATUS_THREAD_IS_TERMINATING; + if (ThreadInfo) return STATUS_THREAD_IS_TERMINATING; /* Insert it into the Regular List */ InsertTailList(&Process->ThreadList, &Thread->Link); Modified: trunk/reactos/win32ss/gdi/ntgdi/xformobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/xformobj… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/xformobj.c [iso-8859-1] Sat Nov 22 09:07:33 2014 @@ -297,10 +297,10 @@ return XFORMOBJ_UpdateAccel(pxoDst); } - -BOOL +static +VOID NTAPI -XFORMOBJ_bXformFixPoints( +XFORMOBJ_vXformFixPoints( IN XFORMOBJ *pxo, IN ULONG cPoints, IN PPOINTL pptIn, @@ -426,8 +426,6 @@ } while (--i >= 0); } - - return TRUE; } /** Public functions **********************************************************/ @@ -500,7 +498,7 @@ { MATRIX mx; XFORMOBJ xoInv; - POINTL *pptl; + PPOINTL pptlIn, pptlOut; INT i; /* Check parameters */ @@ -523,28 +521,29 @@ /* Convert POINTL to POINTFIX? */ if (iMode == XF_LTOFX || iMode == XF_LTOL || iMode == XF_INV_LTOL) { - pptl = pvIn; + pptlIn = pvIn; + pptlOut = pvOut; for (i = cPoints - 1; i >= 0; i--) { - pptl[i].x = LONG2FIX(pptl[i].x); - pptl[i].y = LONG2FIX(pptl[i].y); - } + pptlOut[i].x = LONG2FIX(pptlIn[i].x); + pptlOut[i].y = LONG2FIX(pptlIn[i].y); + } + + /* The input is in the out buffer now! */ + pvIn = pvOut; } /* Do the actual fixpoint transformation */ - if (!XFORMOBJ_bXformFixPoints(pxo, cPoints, pvIn, pvOut)) - { - return FALSE; - } + XFORMOBJ_vXformFixPoints(pxo, cPoints, pvIn, pvOut); /* Convert POINTFIX to POINTL? */ if (iMode == XF_INV_FXTOL || iMode == XF_INV_LTOL || iMode == XF_LTOL) { - pptl = pvOut; + pptlOut = pvOut; for (i = cPoints - 1; i >= 0; i--) { - pptl[i].x = FIX2LONG(pptl[i].x); - pptl[i].y = FIX2LONG(pptl[i].y); + pptlOut[i].x = FIX2LONG(pptlOut[i].x); + pptlOut[i].y = FIX2LONG(pptlOut[i].y); } }

1 0

[akhaldi] 65444: [TRANSLATIONS][WDMAUD] * Reactos/ReactOs => ReactOS.
by akhaldi＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: akhaldi Date: Fri Nov 21 18:57:46 2014 New Revision: 65444 URL: http://svn.reactos.org/svn/reactos?rev=65444&view=rev Log: [TRANSLATIONS][WDMAUD] * Reactos/ReactOs => ReactOS. Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/sv-SE.rc trunk/reactos/base/setup/welcome/lang/da-DK.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/explorer/explorer-el.rc trunk/reactos/base/shell/explorer/explorer-zh.rc trunk/reactos/dll/cpl/access/lang/bg-BG.rc trunk/reactos/dll/cpl/access/lang/cs-CZ.rc trunk/reactos/dll/cpl/access/lang/el-GR.rc trunk/reactos/dll/cpl/access/lang/en-US.rc trunk/reactos/dll/cpl/access/lang/es-ES.rc trunk/reactos/dll/cpl/access/lang/fr-FR.rc trunk/reactos/dll/cpl/access/lang/he-IL.rc trunk/reactos/dll/cpl/access/lang/hu-HU.rc trunk/reactos/dll/cpl/access/lang/id-ID.rc trunk/reactos/dll/cpl/access/lang/nl-NL.rc trunk/reactos/dll/cpl/access/lang/no-NO.rc trunk/reactos/dll/cpl/access/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/sk-SK.rc trunk/reactos/dll/cpl/access/lang/sq-AL.rc trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rc Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -405,7 +405,7 @@ BEGIN MENUITEM "Emner i hjelp", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT + MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/applications/calc/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sv-SE.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -412,7 +412,7 @@ BEGIN MENUITEM "Visa hjÃ¤lp", IDM_HELP_HELP MENUITEM SEPARATOR - MENUITEM "Om Reactos Kalkylator", IDM_HELP_ABOUT + MENUITEM "Om ReactOS Kalkylator", IDM_HELP_ABOUT END END Modified: trunk/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/da… ============================================================================== --- trunk/reactos/base/setup/welcome/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/welcome/lang/da-DK.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -7,7 +7,7 @@ BEGIN IDS_APPTITLE "ReactOS - Velkommen" IDS_DEFAULTTOPICTITLE "ReactOS" - IDS_DEFAULTTOPICDESC "Velkommen til ReactOs operativ System.\n\nKlik pÃ¥ et emne til venstre." + IDS_DEFAULTTOPICDESC "Velkommen til ReactOS operativ System.\n\nKlik pÃ¥ et emne til venstre." // IDS_CHECKTEXT "Vis denne dialog igen ved opstart" // IDS_CLOSETEXT "Afslut" END @@ -46,7 +46,7 @@ STRINGTABLE BEGIN IDS_TOPICDESC0 "Opret en ny ReactOS installation pÃ¥ din computer eller opgradere en eksisterende installation." - IDS_TOPICDESC1 "Gennemse Reactos Installations Cdrom" + IDS_TOPICDESC1 "Gennemse ReactOS Installations Cdrom" IDS_TOPICDESC2 "Klik pÃ¥ Afslut for at lukke." // IDS_TOPICDESC3 "Topic description 3.\n\nDescribe topic 3 here." // IDS_TOPICDESC4 "Topic description 4.\n\nDescribe topic 4 here." Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/no-NO.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -411,7 +411,7 @@ Skriv VERIFY uten parametre for Ã¥ vise gjeldende VERIFY innstillinger.\n" STRING_VERIFY_HELP2 "VERIFY er %s.\n" STRING_VERIFY_HELP3 "MÃ¥ spesifisere ON eller OFF." - STRING_VERSION_HELP1 "Vis Reactos versjonen\n\n\ + STRING_VERSION_HELP1 "Vis ReactOS versjonen\n\n\ VER [/C][/R][/W]\n\n\ /C Vis anerkjennelse.\n\ /R Vis videreformidlingsinformasjon.\n\ Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… ============================================================================== --- trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/lang/sv-SE.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -411,7 +411,7 @@ Skriv VERIFY uten parametre fÃ¶r att visa aktuell VERIFY instÃ¤llninar.\n" STRING_VERIFY_HELP2 "VERIFY Ã¤r %s.\n" STRING_VERIFY_HELP3 "MÃ¥ ange ON eller OFF." - STRING_VERSION_HELP1 "Vis Reactos versjonen\n\n\ + STRING_VERSION_HELP1 "Vis ReactOS versjonen\n\n\ VER [/C][/R][/W]\n\n\ /C Vis anerkjennelse.\n\ /R Vis videreformidlingsinformasjon.\n\ Modified: trunk/reactos/base/shell/explorer/explorer-el.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-el.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-el.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -39,7 +39,7 @@ BEGIN MENUITEM "Åîåñåýíçóç &FAQ...", ID_EXPLORER_FAQ MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER - MENUITEM "&Ó÷åôéêÜ ìå ôï Reactos", ID_ABOUT_WINDOWS + MENUITEM "&Ó÷åôéêÜ ìå ôï ReactOS", ID_ABOUT_WINDOWS END END @@ -102,7 +102,7 @@ BEGIN MENUITEM "Åîåñåýíçóç &FAQ", ID_EXPLORER_FAQ MENUITEM "&Ó÷åôéêÜ ìå ôïí åîåñåõíçôÞ", ID_ABOUT_EXPLORER - MENUITEM "&Ó÷åôéêÜ ìå ôï Reactos", ID_ABOUT_WINDOWS + MENUITEM "&Ó÷åôéêÜ ìå ôï ReactOS", ID_ABOUT_WINDOWS END END Modified: trunk/reactos/base/shell/explorer/explorer-zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer-zh.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer-zh.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -232,7 +232,7 @@ STRINGTABLE BEGIN - IDS_TITLE "Reactos æµè§å¨" + IDS_TITLE "ReactOS æµè§å¨" IDS_START "å¼å§" IDS_LOGOFF "æ³¨é..." IDS_SHUTDOWN "å³é..." Modified: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/bg-BG.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "High Contrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.", + LTEXT "Use this option if you want ReactOS to use colors and fonts designed for easy reading.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Use High Contrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Settings", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/cs-CZ.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/cs-CZ.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Funkce VysokÃ½ kontrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Vyberte tuto moÅ¾nost pokud chcete, aby Reactos pouÅ¾Ãval barvy a pÃsma urÄenÃ© pro snadnou Äitelnost.", + LTEXT "Vyberte tuto moÅ¾nost pokud chcete, aby ReactOS pouÅ¾Ãval barvy a pÃsma urÄenÃ© pro snadnou Äitelnost.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&PouÅ¾Ãt funkci VysokÃ½ kontrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&NastavenÃ", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/el-GR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/el-GR.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -11,7 +11,7 @@ AUTOCHECKBOX "×ñÞóç &Áóýã÷ñïíùí ðëÞêôñùí", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ñõèìßóåéò", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "Ößëôñï ðëÞêôñùí", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "×ñçóéìïðïéÞóôå ôï Ößëôñï ðëÞêôñùí, áí èÝëåôå ôï Reactos íá áãíïÞóåé ôçí åðáíÜëçøç ÷áñáêôÞñùí, Þ áí ìåéþóåé ôï ñõèìü åðáíÜëçøçò.", + LTEXT "×ñçóéìïðïéÞóôå ôï Ößëôñï ðëÞêôñùí, áí èÝëåôå ôï ReactOS íá áãíïÞóåé ôçí åðáíÜëçøç ÷áñáêôÞñùí, Þ áí ìåéþóåé ôï ñõèìü åðáíÜëçøçò.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "×ñÞóç &Ößëôñïõ ðëÞêôñùí", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Ñ&õèìßóåéò", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÏðôéêÞ Ýíäåéîç Þ÷ïõ", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "×ñçóéìïðïéÞóôå ôçí ÏðôéêÞ Ýíäåéîç Þ÷ïõ, áí èÝëåôå ôï Reactos íá ÷ñçóéìïðïéåß ïðôéêÝò åíäåßîåéò üôáí ôï óýóôçìÜ óáò ðáñÜãåé Þ÷ï.", + LTEXT "×ñçóéìïðïéÞóôå ôçí ÏðôéêÞ Ýíäåéîç Þ÷ïõ, áí èÝëåôå ôï ReactOS íá ÷ñçóéìïðïéåß ïðôéêÝò åíäåßîåéò üôáí ôï óýóôçìÜ óáò ðáñÜãåé Þ÷ï.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "×ñÞóç ÏðôéêÞò Ýíäåéîçò Þ÷ïõ", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "ÅðéëïãÞ ïðôéêÞò ðñïåéäïðïßçóçò", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "ÁíôéèÝóåéò", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "×ñçóéìïðïéÞóôå áõôÞí ôçí åðéëïãÞ, áí èÝëåôå ôï Reactos íá ÷ñçóéìïðïéåß ÷ñþìáìôá êáé ãñáììáôïóåéñÝò ó÷åäéáóìÝíá ãéá åýêïëç áíÜãíùóç.", + LTEXT "×ñçóéìïðïéÞóôå áõôÞí ôçí åðéëïãÞ, áí èÝëåôå ôï ReactOS íá ÷ñçóéìïðïéåß ÷ñþìáìôá êáé ãñáììáôïóåéñÝò ó÷åäéáóìÝíá ãéá åýêïëç áíÜãíùóç.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Ìå áíôéèÝóåéò", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Ñõèìßóåéò", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/en-US.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/en-US.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -11,7 +11,7 @@ AUTOCHECKBOX "&Use StickyKeys", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Settings", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.", + LTEXT "Use FilterKeys if you want ReactOS to ignore brief or repeated keystrokes, or slow the repeat rate.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "S&ettings", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "SoundSentry", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.", + LTEXT "Use SoundSentry if you want ReactOS to generate visual warnings when your system makes a sound.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &SoundSentry", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Use the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "High Contrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.", + LTEXT "Use this option if you want ReactOS to use colors and fonts designed for easy reading.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Use High Contrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Settings", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/es-ES.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/es-ES.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -13,7 +13,7 @@ AUTOCHECKBOX "Utilizar &StickyKeys ", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Configuración", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Use FilterKeys si desea que Reactos omita la pulsaciones repetidas o breves, o reducir la velocidad de repetición.", + LTEXT "Use FilterKeys si desea que ReactOS omita la pulsaciones repetidas o breves, o reducir la velocidad de repetición.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Utilizar &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Co&nfiguración", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Vigilante Auditivo ", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Use el Vigilante Auditivo si desea que Reactos genere avisos visuales cuando el sistema emita un sonido.", + LTEXT "Use el Vigilante Auditivo si desea que ReactOS genere avisos visuales cuando el sistema emita un sonido.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Utilizar Vigilante Auditivo", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Elija la advertencia visual:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Contraste alto ", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Use esta opción si desea que Reactos use colores y letras diseñadas para una lectura más cómoda.", + LTEXT "Use esta opción si desea que ReactOS use colores y letras diseñadas para una lectura más cómoda.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Utilizar Contraste alto", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "C&onfiguración", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/fr-FR.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/fr-FR.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Sons visuels", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Utilisez les sons visuels si vous voulez que Reactos génère un avertissement visuel lorsque votre système émet un son.", + LTEXT "Utilisez les sons visuels si vous voulez que ReactOS génère un avertissement visuel lorsque votre système émet un son.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Utiliser les &sons visuels", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Utiliser l'avertissement suivant :", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) Modified: trunk/reactos/dll/cpl/access/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/he-IL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/he-IL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -13,7 +13,7 @@ AUTOCHECKBOX "××©×ª××© ×××§×©×× ××××§××", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "××××¨××ª", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.", + LTEXT "Use FilterKeys if you want ReactOS to ignore brief or repeated keystrokes, or slow the repeat rate.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "××××¨××ª", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "×©×××¨ ×§×××", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.", + LTEXT "Use SoundSentry if you want ReactOS to generate visual warnings when your system makes a sound.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "××©×ª××© ××©×××¨ ××§×××", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "××©×ª××© ×××××¨××ª ×××××ª:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "× ×××××××ª ×××××", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.", + LTEXT "Use this option if you want ReactOS to use colors and fonts designed for easy reading.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "××©×ª××© ×× ×××××××ª ×××××", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "××××¨××ª", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/hu-HU.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/hu-HU.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -13,7 +13,7 @@ AUTOCHECKBOX "&Beragadó billentyûk használata", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Beállítások", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.", + LTEXT "Use FilterKeys if you want ReactOS to ignore brief or repeated keystrokes, or slow the repeat rate.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "B&eállítások", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "HangFigyelõ", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Ezt a funkciót akkor használja, ha szeretné, hogy a Reactos látható figyelmeztetéseket küldjön olyankor, amikor a rendszer hangjelzést ad.", + LTEXT "Ezt a funkciót akkor használja, ha szeretné, hogy a ReactOS látható figyelmeztetéseket küldjön olyankor, amikor a rendszer hangjelzést ad.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&HangFigyelõ használata", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Nagy kontraszt", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Ha azt szeretné, hogy a Reactos olyan színeket használjon, amelyek a könnyû olvasást teszik lehetõvé, akkor válassza ki ezt a lehetõséget.", + LTEXT "Ha azt szeretné, hogy a ReactOS olyan színeket használjon, amelyek a könnyû olvasást teszik lehetõvé, akkor válassza ki ezt a lehetõséget.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Nagy kontraszt használata", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Bellítások", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/id-ID.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/id-ID.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -13,7 +13,7 @@ AUTOCHECKBOX "&Gunakan StickyKeys", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Setelan", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Gunakan FilterKeys jika anda ingin Reactos untuk mengabaikan atau tombol berulang, atau rata-rata ulangan lambat.", + LTEXT "Gunakan FilterKeys jika anda ingin ReactOS untuk mengabaikan atau tombol berulang, atau rata-rata ulangan lambat.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Gunakan &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "S&etelan", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -32,7 +32,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "SoundSentry", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Gunakan SoundSentry jika anda ingin Reactos untuk membuat peringatan visual ketika sistem anda membuat suara.", + LTEXT "Gunakan SoundSentry jika anda ingin ReactOS untuk membuat peringatan visual ketika sistem anda membuat suara.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Gunakan &SoundSentry", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "User the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -50,7 +50,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontras Tinggi", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Gunakan opsi ini jika anda ingin Reactos untuk memakai warna dan font yang didesain guna memudahkan pembacaan.", + LTEXT "Gunakan opsi ini jika anda ingin ReactOS untuk memakai warna dan font yang didesain guna memudahkan pembacaan.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Gunakan Kontras Tinggi", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Setelan", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/nl-NL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/nl-NL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -15,7 +15,7 @@ AUTOCHECKBOX "&Plaktoetsen Gebruiken", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH_NL - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Instellingen...", IDC_STICKY_BUTTON, PROPSHEETWIDTH_NL - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "Filtertoetsen", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH_NL - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "U kunt Filtertoetsen gebruiken als u wilt dat Reactos korte of herhaalde toetsaanslagen negeert, of als u de herhaalsnelheid wilt verlagen.", + LTEXT "U kunt Filtertoetsen gebruiken als u wilt dat ReactOS korte of herhaalde toetsaanslagen negeert, of als u de herhaalsnelheid wilt verlagen.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH_NL - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Filtertoetsen gebruiken", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH_NL - PROPSHEETPADDING(20), 14 PUSHBUTTON "Inst&ellingen...", IDC_FILTER_BUTTON, PROPSHEETWIDTH_NL - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Geluidswaarschuwingen", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH_NL - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Schakel Geluidswaarschuwingen gebruiken in als u wilt dat Reactos een visuele waarschuwing weergeeft wanneer het systeem een geluid laat horen.", + LTEXT "Schakel Geluidswaarschuwingen gebruiken in als u wilt dat ReactOS een visuele waarschuwing weergeeft wanneer het systeem een geluid laat horen.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH_NL - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Geluidswaarschuwingen gebruiken", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Use the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -52,7 +52,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Hoog Contrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH_NL - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "U kunt deze optie gebruiken als u wilt dat Reactos kleuren en lettertypen zodanig instelt dat deze gemakkelijk te lezen zijn.", + LTEXT "U kunt deze optie gebruiken als u wilt dat ReactOS kleuren en lettertypen zodanig instelt dat deze gemakkelijk te lezen zijn.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH_NL - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Hoog contrast gebruiken", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH_NL - PROPSHEETPADDING(20), 14 PUSHBUTTON "I&nstellingen...", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH_NL - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/no-NO.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/no-NO.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -11,7 +11,7 @@ AUTOCHECKBOX "&Bruk Trege taster", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Innstillinger", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "Filtertaster", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Bruk filtertaster hvis du vil at Reactos skal ignorere lette eller gjentatte tastetrykk, eller senke repetisjonshastigheten.", + LTEXT "Bruk filtertaster hvis du vil at ReactOS skal ignorere lette eller gjentatte tastetrykk, eller senke repetisjonshastigheten.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Bruk &filtertaster", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "I&nnstillinger", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -30,7 +30,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Skjermsignal", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Bruk skjermsignal hvis du vil at Reactos skal gi en visuell varsling når systemet lager lyd.", + LTEXT "Bruk skjermsignal hvis du vil at ReactOS skal gi en visuell varsling når systemet lager lyd.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Bruk &skjermsignal", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Velg følgende varsling:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -48,7 +48,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Høykontrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Velg dette alternativet hvis du vil at Reactos skal bruke farger og skrifter som er laget for å gjøre det lett leselig.", + LTEXT "Velg dette alternativet hvis du vil at ReactOS skal bruke farger og skrifter som er laget for å gjøre det lett leselig.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Bruk høykontrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Innstillinger", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/pl-PL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/pl-PL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -54,7 +54,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Wysoki Kontrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "UÅ¼yj tej funkcji, jeÅli chcesz, Å¼eby Reactos uÅ¼ywaÅ kolorÃ³w i czcionek zaprojektowanych do Åatwego czytania", + LTEXT "UÅ¼yj tej funkcji, jeÅli chcesz, Å¼eby ReactOS uÅ¼ywaÅ kolorÃ³w i czcionek zaprojektowanych do Åatwego czytania", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&UÅ¼yj funkcji Wysoki Kontrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "U&stawienia", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/sk-SK.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/sk-SK.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -15,7 +15,7 @@ AUTOCHECKBOX "&Use StickyKeys", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Settings", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Use FilterKeys if you want Reactos to ignore brief or repeated keystrokes, or slow the repeat rate.", + LTEXT "Use FilterKeys if you want ReactOS to ignore brief or repeated keystrokes, or slow the repeat rate.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "S&ettings", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "SoundSentry", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Use SoundSentry if you want Reactos to generate visual warnings when your system makes a sound.", + LTEXT "Use SoundSentry if you want ReactOS to generate visual warnings when your system makes a sound.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Use &SoundSentry", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Use the following warning:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -52,7 +52,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Vysoký kontrast", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "Use this option if you want Reactos to use colors and fonts designed for easy reading.", + LTEXT "Use this option if you want ReactOS to use colors and fonts designed for easy reading.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "&Use High Contrast", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "&Settings", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/access/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/sq-AL.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/sq-AL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -15,7 +15,7 @@ AUTOCHECKBOX "&Perdor StickyKeys", IDC_STICKY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Konfigurime", IDC_STICKY_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 GROUPBOX "FilterKeys", -1, PROPSHEETPADDING(1), LABELLINE(8) + 5, PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(7) + 2 - LTEXT "Perdp FilterKeys nese doni Reactos te injorohe ose perserise keystrokes, ose te ngadalsoje kohen e perseritjes.", + LTEXT "Perdp FilterKeys nese doni ReactOS te injorohe ose perserise keystrokes, ose te ngadalsoje kohen e perseritjes.", -1, PROPSHEETPADDING(2), LABELLINE(10) - 3, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Perdor &FilterKeys", IDC_FILTER_BOX, PROPSHEETPADDING(2), LABELLINE(13) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Konfigurime", IDC_FILTER_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(13) + 2, PROPSHEETPADDING(15), 14 @@ -34,7 +34,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "SoundSentry", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(10) + PROPSHEETPADDING(1) - LTEXT "Perdor SoundSentry nese doni qe Reactos te gjeneroj gabime vizuale kur sistemi juaj jep nje zÃ«.", + LTEXT "Perdor SoundSentry nese doni qe ReactOS te gjeneroj gabime vizuale kur sistemi juaj jep nje zÃ«.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Perdor &SoundSentry", IDC_SENTRY_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 LTEXT "Perdor gabimet e metejshme:", IDC_SENTRY_TEXT, PROPSHEETPADDING(2), LABELLINE(8) - 2, PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(1) @@ -52,7 +52,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Kontrast i lartÃ«", -1, PROPSHEETPADDING(1), LABELLINE(1), PROPSHEETWIDTH - PROPSHEETPADDING(2), LABELLINE(6) + PROPSHEETPADDING(1) - LTEXT "PÃ«rdoreni kÃ«tÃ« mundÃ«si nÃ«se doni Reactos tÃ« pÃ«rdorni ngjyrat dhe gÃ«rmat projektuar pÃ«r leximin e lehtÃ«.", + LTEXT "PÃ«rdoreni kÃ«tÃ« mundÃ«si nÃ«se doni ReactOS tÃ« pÃ«rdorni ngjyrat dhe gÃ«rmat projektuar pÃ«r leximin e lehtÃ«.", -1, PROPSHEETPADDING(2), LABELLINE(2), PROPSHEETWIDTH - PROPSHEETPADDING(4), LABELLINE(3) AUTOCHECKBOX "Perdor kontrast te larte", IDC_CONTRAST_BOX, PROPSHEETPADDING(2), LABELLINE(5) + 2, PROPSHEETWIDTH - PROPSHEETPADDING(20), 14 PUSHBUTTON "Konfigurime", IDC_CONTRAST_BUTTON, PROPSHEETWIDTH - PROPSHEETPADDING(17), LABELLINE(5) + 2, PROPSHEETPADDING(15), 14 Modified: trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/nl-NL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -27,7 +27,7 @@ CAPTION "Geluiden" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Een geluidsschema is een verzameling geluiden die worden toegepast op Reactos- en programmagebeurtenissen. U kunt een bestaand schema slecteren of een aangepast schema opslaan.", -1, 8, 7, 230, 40 + LTEXT "Een geluidsschema is een verzameling geluiden die worden toegepast op ReactOS- en programmagebeurtenissen. U kunt een bestaand schema slecteren of een aangepast schema opslaan.", -1, 8, 7, 230, 40 LTEXT "Geluid&sschema:", -1, 8, 42, 150, 17 COMBOBOX IDC_SOUND_SCHEME, 8, 53, 230, 46, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Opslaan als...", IDC_SAVEAS_BTN, 104, 70, 65, 15 Modified: trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/nl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/nl-NL.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -5,8 +5,8 @@ CAPTION "ReactOS Setup" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Welkom bij de Reactos installatiewizard.", IDC_WELCOMETITLE, 115, 8, 195, 24 - LTEXT "Deze wizard zal Reactos op je computer installeren. De wizard heeft informatie over jou en jouw computer nodig om Reactos correct in te stellen.", IDC_STATIC, 115, 40, 195, 100 + LTEXT "Welkom bij de ReactOS installatiewizard.", IDC_WELCOMETITLE, 115, 8, 195, 24 + LTEXT "Deze wizard zal ReactOS op je computer installeren. De wizard heeft informatie over jou en jouw computer nodig om ReactOS correct in te stellen.", IDC_STATIC, 115, 40, 195, 100 LTEXT "Klik op Volgende om voort te gaan met de installatie.", IDC_STATIC, 115, 169, 195, 17 END Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.rc [iso-8859-1] Fri Nov 21 18:57:46 2014 @@ -1,5 +1,5 @@ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "Reactos audio mapper driver" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS audio mapper driver" #define REACTOS_STR_INTERNAL_NAME "wdmaud" #define REACTOS_STR_ORIGINAL_FILENAME "wdmaud.sys" #include <reactos/version.rc>

1 0

[akhaldi] 65443: [NTOS:PNPMGR] * Attempt to address Timo's review about coding style changes.
by akhaldi＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: akhaldi Date: Fri Nov 21 18:45:18 2014 New Revision: 65443 URL: http://svn.reactos.org/svn/reactos?rev=65443&view=rev Log: [NTOS:PNPMGR] * Attempt to address Timo's review about coding style changes. Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Fri Nov 21 18:45:18 2014 @@ -199,7 +199,10 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - if (Name.Buffer) ExFreePool(Name.Buffer); + if (Name.Buffer) + { + ExFreePool(Name.Buffer); + } Status = _SEH2_GetExceptionCode(); } _SEH2_END;

1 0

[hbelusca] 65442: [NTVDM:DOS]: Don't forget to update CommandInfo.Env otherwise we would use the old environment buffer that is now invalid, hence corrupting the heap and doing other nasty things :...
by hbelusca＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: hbelusca Date: Fri Nov 21 15:55:39 2014 New Revision: 65442 URL: http://svn.reactos.org/svn/reactos?rev=65442&view=rev Log: [NTVDM:DOS]: Don't forget to update CommandInfo.Env otherwise we would use the old environment buffer that is now invalid, hence corrupting the heap and doing other nasty things :P Debugged by V. Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dem.c… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dem.c [iso-8859-1] Fri Nov 21 15:55:39 2014 @@ -236,7 +236,7 @@ { /* Expand the environment size */ EnvSize = CommandInfo.EnvLen; - Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); + CommandInfo.Env = Env = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Env, EnvSize); /* Repeat the request */ goto Command;

1 0

[aandrejevic] 65441: [FAST486] Attempt to write the value to the stack before subtracting from the actual ESP register in Fast486StackPush.
by aandrejevic＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: aandrejevic Date: Fri Nov 21 09:46:57 2014 New Revision: 65441 URL: http://svn.reactos.org/svn/reactos?rev=65441&view=rev Log: [FAST486] Attempt to write the value to the stack before subtracting from the actual ESP register in Fast486StackPush. Modified: trunk/reactos/lib/fast486/common.inl Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Fri Nov 21 09:46:57 2014 @@ -317,15 +317,19 @@ return FALSE; } + /* Store the value in SS:[ESP - 4] */ + if (!Fast486WriteMemory(State, + FAST486_REG_SS, + State->GeneralRegs[FAST486_REG_ESP].Long - sizeof(ULONG), + &Value, + sizeof(ULONG))) + { + /* Exception occurred */ + return FALSE; + } + /* Subtract ESP by 4 */ State->GeneralRegs[FAST486_REG_ESP].Long -= sizeof(ULONG); - - /* Store the value in SS:ESP */ - return Fast486WriteMemory(State, - FAST486_REG_SS, - State->GeneralRegs[FAST486_REG_ESP].Long, - &Value, - sizeof(ULONG)); } else { @@ -339,16 +343,22 @@ return FALSE; } + /* Store the value in SS:[SP - 2] */ + if (!Fast486WriteMemory(State, + FAST486_REG_SS, + LOWORD(State->GeneralRegs[FAST486_REG_ESP].LowWord - sizeof(USHORT)), + &ShortValue, + sizeof(USHORT))) + { + /* Exception occurred */ + return FALSE; + } + /* Subtract SP by 2 */ State->GeneralRegs[FAST486_REG_ESP].LowWord -= sizeof(USHORT); - - /* Store the value in SS:SP */ - return Fast486WriteMemory(State, - FAST486_REG_SS, - State->GeneralRegs[FAST486_REG_ESP].LowWord, - &ShortValue, - sizeof(USHORT)); - } + } + + return TRUE; } FORCEINLINE

1 0

[jimtabor] 65440: [NtUser] - Synchronize mouse messages. Best way to do this, just post the move message while it occurs and just update it with recurrent information. The other way was to check ti...
by jimtabor＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: jimtabor Date: Fri Nov 21 03:15:27 2014 New Revision: 65440 URL: http://svn.reactos.org/svn/reactos?rev=65440&view=rev Log: [NtUser] - Synchronize mouse messages. Best way to do this, just post the move message while it occurs and just update it with recurrent information. The other way was to check time stamps and that was a hackish headache. Then the scorn and reticule would erupt. So it was easier to just post to the queue, update and if a mouse down up was captured than it would be in the order as it was received. - See CORE-8779 #resolve, CORE-8394, CORE-7797, CORE-7447. Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/ntuser/timer.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Fri Nov 21 03:15:27 2014 @@ -858,17 +858,6 @@ return TRUE; } - if ((ProcessMask & QS_MOUSE) && - co_MsqPeekMouseMove( pti, - RemoveMessages, - Window, - MsgFilterMin, - MsgFilterMax, - Msg )) - { - return TRUE; - } - /* Check for hardware events. */ if ((ProcessMask & QS_INPUT) && co_MsqPeekHardwareMessage( pti, Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Fri Nov 21 03:15:27 2014 @@ -35,44 +35,6 @@ 256); return(STATUS_SUCCESS); -} - -PWND FASTCALL -IntChildrenWindowFromPoint(PWND pWndTop, INT x, INT y) -{ - PWND pWnd, pWndChild; - - if ( !pWndTop ) - { - pWndTop = UserGetDesktopWindow(); - if ( !pWndTop ) return NULL; - } - - if (!(pWndTop->style & WS_VISIBLE)) return NULL; - if ((pWndTop->style & WS_DISABLED)) return NULL; - if (!IntPtInWindow(pWndTop, x, y)) return NULL; - - if (RECTL_bPointInRect(&pWndTop->rcClient, x, y)) - { - for (pWnd = pWndTop->spwndChild; - pWnd != NULL; - pWnd = pWnd->spwndNext) - { - if (pWnd->state2 & WNDS2_INDESTROY || pWnd->state & WNDS_DESTROYED ) - { - TRACE("The Window is in DESTROY!\n"); - continue; - } - - pWndChild = IntChildrenWindowFromPoint(pWnd, x, y); - - if (pWndChild) - { - return pWndChild; - } - } - } - return pWndTop; } PWND FASTCALL @@ -446,9 +408,16 @@ } if (MessageBits & QS_MOUSEMOVE) // ReactOS hard coded. { // Account for tracking mouse moves.. - if (--pti->nCntsQBits[QSRosMouseMove] == 0) ClrMask |= QS_MOUSEMOVE; + if (pti->nCntsQBits[QSRosMouseMove]) + { + pti->nCntsQBits[QSRosMouseMove] = 0; // Throttle down count. Up to > 3:1 entries are ignored. + } // Handle mouse move bits here. - if (Queue->MouseMoved) ClrMask |= QS_MOUSEMOVE; + if (Queue->MouseMoved) + { + ClrMask |= QS_MOUSEMOVE; + Queue->MouseMoved = FALSE; + } } if (MessageBits & QS_MOUSEBUTTON) { @@ -502,12 +471,34 @@ ClearMsgBitsMask(pti, QS_PAINT); } +/* + Post Mouse Move. + */ VOID FASTCALL MsqPostMouseMove(PTHREADINFO pti, MSG* Msg) { - pti->MessageQueue->MouseMoveMsg = *Msg; - pti->MessageQueue->MouseMoved = TRUE; - MsqWakeQueue(pti, QS_MOUSEMOVE, TRUE); + PUSER_MESSAGE Message; + PLIST_ENTRY ListHead; + PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; + + ListHead = &MessageQueue->HardwareMessagesListHead; + + MessageQueue->MouseMoved = TRUE; + + if (!IsListEmpty(ListHead->Flink)) + { // Look at the end of the list, + Message = CONTAINING_RECORD(ListHead->Blink, USER_MESSAGE, ListEntry); + // If the mouse move message is existing, + if (Message->Msg.message == WM_MOUSEMOVE) + { + TRACE("Post Old MM Message in Q\n"); + Message->Msg = *Msg; // Overwrite the message with updated data! + MsqWakeQueue(pti, QS_MOUSEMOVE, TRUE); + return; + } + } + TRACE("Post New MM Message to Q\n"); + MsqPostMessage(pti, Msg, TRUE, QS_MOUSEMOVE, 0); } VOID FASTCALL @@ -581,13 +572,14 @@ { pti = pwnd->head.pti; MessageQueue = pti->MessageQueue; - // MessageQueue->ptiMouse = pti; - - if ( pti->TIF_flags & TIF_INCLEANUP || MessageQueue->QF_flags & QF_INDESTROY) + + if (MessageQueue->QF_flags & QF_INDESTROY) { - ERR("Mouse is over the Window Thread is Dead!\n"); + ERR("Mouse is over a Window with a Dead Message Queue!\n"); return; } + + MessageQueue->ptiMouse = pti; if (Msg->message == WM_MOUSEMOVE) { @@ -642,6 +634,7 @@ { // ERR("ptiLastInput is set\n"); // ptiLastInput = pti; // Once this is set during Reboot or Shutdown, this prevents the exit window having foreground. + // Find all the Move Mouse calls and fix mouse set active focus issues...... } TRACE("Posting mouse message to hwnd=%p!\n", UserHMGetHandle(pwnd)); MsqPostMessage(pti, Msg, TRUE, QS_MOUSEBUTTON, 0); @@ -1677,51 +1670,6 @@ return TRUE; } -BOOL APIENTRY -co_MsqPeekMouseMove(IN PTHREADINFO pti, - IN BOOL Remove, - IN PWND Window, - IN UINT MsgFilterLow, - IN UINT MsgFilterHigh, - OUT MSG* pMsg) -{ - BOOL AcceptMessage; - MSG msg; - PUSER_MESSAGE_QUEUE MessageQueue = pti->MessageQueue; - - if(!(MessageQueue->MouseMoved)) - return FALSE; - - if (!MessageQueue->ptiSysLock) - { - MessageQueue->ptiSysLock = pti; - pti->pcti->CTI_flags |= CTI_THREADSYSLOCK; - } - - if (MessageQueue->ptiSysLock != pti) - { - ERR("MsqPeekMouseMove: Thread Q is locked to another pti!\n"); - return FALSE; - } - - msg = MessageQueue->MouseMoveMsg; - - AcceptMessage = co_IntProcessMouseMessage(&msg, &Remove, MsgFilterLow, MsgFilterHigh); - - if(AcceptMessage) - *pMsg = msg; - - if(Remove) - { - ClearMsgBitsMask(pti, QS_MOUSEMOVE); - MessageQueue->MouseMoved = FALSE; - } - - MessageQueue->ptiSysLock = NULL; - pti->pcti->CTI_flags &= ~CTI_THREADSYSLOCK; - return AcceptMessage; -} - /* check whether a message filter contains at least one potential hardware message */ static INT FASTCALL filter_contains_hw_range( UINT first, UINT last ) Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Fri Nov 21 03:15:27 2014 @@ -54,8 +54,6 @@ /* True if a WM_MOUSEMOVE is pending */ BOOLEAN MouseMoved; /* Current WM_MOUSEMOVE message */ - MSG MouseMoveMsg; - /* Last click message for translating double clicks */ MSG msgDblClk; /* Current capture window for this queue. */ PWND spwndCapture; @@ -142,13 +140,6 @@ IN UINT MsgFilterHigh, IN UINT QSflags, OUT MSG* pMsg); -BOOL APIENTRY -co_MsqPeekMouseMove(IN PTHREADINFO pti, - IN BOOL Remove, - IN PWND Window, - IN UINT MsgFilterLow, - IN UINT MsgFilterHigh, - OUT MSG* pMsg); BOOLEAN FASTCALL MsqInitializeMessageQueue(PTHREADINFO, PUSER_MESSAGE_QUEUE); PUSER_MESSAGE_QUEUE FASTCALL MsqCreateMessageQueue(PTHREADINFO); VOID FASTCALL MsqCleanupThreadMsgs(PTHREADINFO); Modified: trunk/reactos/win32ss/user/ntuser/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/timer.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/timer.c [iso-8859-1] Fri Nov 21 03:15:27 2014 @@ -315,7 +315,7 @@ if ( pDesk->dwDTFlags & DF_TME_HOVER && pWnd == pDesk->spwndTrack ) { - Point = pWnd->head.pti->MessageQueue->MouseMoveMsg.pt; + Point = gpsi->ptCursor; if ( RECTL_bPointInRect(&pDesk->rcMouseHover, Point.x, Point.y) ) { if (pDesk->htEx == HTCLIENT) // In a client area.

1 0

[hbelusca] 65439: [URTL]: Fix whitespace plus misspelling.
by hbelusca＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: hbelusca Date: Fri Nov 21 02:35:38 2014 New Revision: 65439 URL: http://svn.reactos.org/svn/reactos?rev=65439&view=rev Log: [URTL]: Fix whitespace plus misspelling. Modified: trunk/reactos/lib/sdk/nt/entry_point.c Modified: trunk/reactos/lib/sdk/nt/entry_point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/nt/entry_point.c?r… ============================================================================== --- trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] Fri Nov 21 02:35:38 2014 @@ -33,27 +33,27 @@ static VOID FASTCALL EnvironmentStringToUnicodeString (PWCHAR wsIn, PUNICODE_STRING usOut) { - if (wsIn) - { - PWCHAR CurrentChar = wsIn; - - while (*CurrentChar) - { - while(*CurrentChar++); - } - /* double nullterm at end */ - CurrentChar++; - - usOut->Buffer = wsIn; - /* FIXME: the last (double) nullterm should perhaps not be included in Length - * but only in MaximumLength. -Gunnar */ - usOut->MaximumLength = usOut->Length = (CurrentChar-wsIn) * sizeof(WCHAR); - } - else - { - usOut->Buffer = NULL; - usOut->Length = usOut->MaximumLength = 0; - } + if (wsIn) + { + PWCHAR CurrentChar = wsIn; + + while (*CurrentChar) + { + while(*CurrentChar++); + } + /* double nullterm at end */ + CurrentChar++; + + usOut->Buffer = wsIn; + /* FIXME: the last (double) nullterm should perhaps not be included in Length + * but only in MaximumLength. -Gunnar */ + usOut->MaximumLength = usOut->Length = (CurrentChar-wsIn) * sizeof(WCHAR); + } + else + { + usOut->Buffer = NULL; + usOut->Length = usOut->MaximumLength = 0; + } } @@ -91,9 +91,9 @@ ArgumentList = RtlAllocateHeap(RtlGetProcessHeap(), 0, 512 * sizeof(PCHAR)); if (!ArgumentList) { - DPRINT1("ERR: no mem!"); - Status = STATUS_NO_MEMORY; - goto fail; + DPRINT1("ERR: no mem!"); + Status = STATUS_NO_MEMORY; + goto fail; } /* Use a null pointer as default */ @@ -117,8 +117,8 @@ Status = RtlUnicodeStringToAnsiString(&AnsiCmdLine, CmdLineString, TRUE); if (!NT_SUCCESS(Status)) { - DPRINT1("ERR: no mem(guess)\n"); - goto fail; + DPRINT1("ERR: no mem(guess)\n"); + goto fail; } /* Save parameters for parsing */ @@ -130,12 +130,12 @@ { /* Allocate a buffer for the destination */ Destination = RtlAllocateHeap(RtlGetProcessHeap(), 0, Length + sizeof(WCHAR)); - if (!Destination) - { - DPRINT1("ERR: no mem!"); - Status = STATUS_NO_MEMORY; - goto fail; - } + if (!Destination) + { + DPRINT1("ERR: no mem!"); + Status = STATUS_NO_MEMORY; + goto fail; + } /* Start parsing */ while (*Source) @@ -164,33 +164,33 @@ /* Null terminate the token pointer list */ *ArgumentList++ = NULL; - /* Now handle the enviornment, point the envp at our current list location. */ + /* Now handle the environment, point the envp at our current list location. */ envp = ArgumentList; if (ProcessParameters->Environment) { - EnvironmentStringToUnicodeString(ProcessParameters->Environment, &UnicodeEnvironment); - Status = RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ERR: no mem(guess)\n"); - goto fail; - } - - ASSERT(AnsiEnvironment.Buffer); - - Source = AnsiEnvironment.Buffer; - while (*Source) - { - /* Save a pointer to this token */ - *ArgumentList++ = Source; - - /* Keep looking for another variable */ - while (*Source++); - } - - /* Null terminate the list again */ - *ArgumentList++ = NULL; + EnvironmentStringToUnicodeString(ProcessParameters->Environment, &UnicodeEnvironment); + Status = RtlUnicodeStringToAnsiString (& AnsiEnvironment, & UnicodeEnvironment, TRUE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("ERR: no mem(guess)\n"); + goto fail; + } + + ASSERT(AnsiEnvironment.Buffer); + + Source = AnsiEnvironment.Buffer; + while (*Source) + { + /* Save a pointer to this token */ + *ArgumentList++ = Source; + + /* Keep looking for another variable */ + while (*Source++); + } + + /* Null terminate the list again */ + *ArgumentList++ = NULL; } /* Breakpoint if we were requested to do so */ if (ProcessParameters->DebugFlags) DbgBreakPoint();

1 0

[hbelusca] 65438: [NTVDM]: Make the environment strings list optional for some Dos app start functions.
by hbelusca＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: hbelusca Date: Fri Nov 21 02:26:53 2014 New Revision: 65438 URL: http://svn.reactos.org/svn/reactos?rev=65438&view=rev Log: [NTVDM]: Make the environment strings list optional for some Dos app start functions. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri Nov 21 02:26:53 2014 @@ -403,40 +403,60 @@ Mcb->OwnerPsp = NewOwner; } -static WORD DosCopyEnvironmentBlock(LPCSTR Environment, LPCSTR ProgramName) +static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, + LPCSTR ProgramName) { PCHAR Ptr, DestBuffer = NULL; ULONG TotalSize = 0; WORD DestSegment; - Ptr = (PCHAR)Environment; - - /* Calculate the size of the environment block */ - while (*Ptr) Ptr += strlen(Ptr) + 1; - TotalSize = (ULONG_PTR)Ptr - (ULONG_PTR)Environment + 1; // Add final NULL-terminator + /* If we have an environment strings list, compute its size */ + if (Environment) + { + /* Calculate the size of the environment block */ + Ptr = (PCHAR)Environment; + while (*Ptr) Ptr += strlen(Ptr) + 1; + TotalSize = (ULONG_PTR)Ptr - (ULONG_PTR)Environment; + } + else + { + /* Empty environment string */ + TotalSize = 1; + } + /* Add the final environment block NULL-terminator */ + TotalSize++; + + /* Add the two bytes for the program name tag */ + TotalSize += 2; /* Add the string buffer size */ TotalSize += strlen(ProgramName) + 1; - - /* Add the two extra bytes */ - TotalSize += 2; /* Allocate the memory for the environment block */ DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); if (!DestSegment) return 0; - Ptr = (PCHAR)Environment; - DestBuffer = (PCHAR)SEG_OFF_TO_PTR(DestSegment, 0); - while (*Ptr) - { - /* Copy the string and NULL-terminate it */ - strcpy(DestBuffer, Ptr); - DestBuffer += strlen(Ptr); + + /* If we have an environment strings list, copy it */ + if (Environment) + { + Ptr = (PCHAR)Environment; + while (*Ptr) + { + /* Copy the string and NULL-terminate it */ + strcpy(DestBuffer, Ptr); + DestBuffer += strlen(Ptr); + *(DestBuffer++) = '\0'; + + /* Move to the next string */ + Ptr += strlen(Ptr) + 1; + } + } + else + { + /* Empty environment string */ *(DestBuffer++) = '\0'; - - /* Move to the next string */ - Ptr += strlen(Ptr) + 1; } /* NULL-terminate the environment block */ *(DestBuffer++) = '\0'; @@ -900,7 +920,7 @@ DWORD DosLoadExecutable(IN DOS_EXEC_TYPE LoadType, IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN LPCSTR Environment, + IN LPCSTR Environment OPTIONAL, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL) { @@ -920,7 +940,7 @@ LoadType, ExecutablePath, CommandLine, - Environment, + Environment ? Environment : "n/a", StackLocation, EntryPoint); @@ -1144,7 +1164,7 @@ DWORD DosStartProcess(IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN LPCSTR Environment) + IN LPCSTR Environment OPTIONAL) { DWORD Result; Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Fri Nov 21 02:26:53 2014 @@ -224,7 +224,7 @@ IN DOS_EXEC_TYPE LoadType, IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN LPCSTR Environment, + IN LPCSTR Environment OPTIONAL, OUT PDWORD StackLocation OPTIONAL, OUT PDWORD EntryPoint OPTIONAL ); @@ -236,7 +236,7 @@ DWORD DosStartProcess( IN LPCSTR ExecutablePath, IN LPCSTR CommandLine, - IN LPCSTR Environment + IN LPCSTR Environment OPTIONAL ); VOID DosTerminateProcess(WORD Psp, BYTE ReturnCode); BOOLEAN DosHandleIoctl(BYTE ControlCode, WORD FileHandle);

1 0

[hbelusca] 65437: [NTVDM] - Add stubs for VDDReserve/ReleaseIrqLine; - Add stub implementation for Direct Memory Access; - Add corresponding exports.
by hbelusca＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: hbelusca Date: Fri Nov 21 00:22:48 2014 New Revision: 65437 URL: http://svn.reactos.org/svn/reactos?rev=65437&view=rev Log: [NTVDM] - Add stubs for VDDReserve/ReleaseIrqLine; - Add stub implementation for Direct Memory Access; - Add corresponding exports. Added: trunk/reactos/subsystems/ntvdm/hardware/dma.c (with props) trunk/reactos/subsystems/ntvdm/hardware/dma.h (with props) Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt trunk/reactos/subsystems/ntvdm/emulator.c trunk/reactos/subsystems/ntvdm/hardware/pic.c trunk/reactos/subsystems/ntvdm/ntvdm.spec Modified: trunk/reactos/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/CMakeList… ============================================================================== --- trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -19,6 +19,7 @@ cpu/cpu.c cpu/registers.c hardware/cmos.c + hardware/dma.c hardware/keyboard.c hardware/mouse.c hardware/pic.c Modified: trunk/reactos/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/emulator.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -22,6 +22,7 @@ #include "clock.h" #include "bios/rom.h" #include "hardware/cmos.h" +#include "hardware/dma.h" #include "hardware/keyboard.h" #include "hardware/mouse.h" #include "hardware/pic.h" @@ -626,6 +627,7 @@ CpuInitialize(); /* Initialize DMA */ + DmaInitialize(); /* Initialize the PIC, the PIT, the CMOS and the PC Speaker */ PicInitialize(); @@ -705,6 +707,8 @@ CmosCleanup(); // PitCleanup(); // PicCleanup(); + + // DmaCleanup(); CpuCleanup(); Added: trunk/reactos/subsystems/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/dma.c (added) +++ trunk/reactos/subsystems/ntvdm/hardware/dma.c [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -0,0 +1,462 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dma.c + * PURPOSE: Direct Memory Access Controller emulation - + * i8237A compatible with 74LS612 Memory Mapper extension + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +/* INCLUDES *******************************************************************/ + +#define NDEBUG + +#include "emulator.h" +#include "io.h" +#include "dma.h" + +/* PRIVATE VARIABLES **********************************************************/ + +/* + * DMA Controller 0 (Channels 0..3): Slave controller + * DMA Controller 1 (Channels 4..7): Master controller + */ +static DMA_CONTROLLER DmaControllers[DMA_CONTROLLERS]; + +/* External page registers for each channel of the two DMA controllers */ +static DMA_PAGE_REGISTER DmaPageRegisters[DMA_CONTROLLERS * DMA_CONTROLLER_CHANNELS]; + +/* PRIVATE FUNCTIONS **********************************************************/ + +#define READ_ADDR(CtrlIndex, ChanIndex, Data) \ +do { \ + (Data) = \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].CurrAddress + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)); \ + DmaControllers[(CtrlIndex)].FlipFlop ^= 1; \ +} while(0) + +#define READ_CNT(CtrlIndex, ChanIndex, Data) \ +do { \ + (Data) = \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].CurrWordCnt + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)); \ + DmaControllers[(CtrlIndex)].FlipFlop ^= 1; \ +} while(0) + +static BYTE WINAPI DmaReadPort(USHORT Port) +{ + BYTE ReadValue = 0xFF; + + switch (Port) + { + /* Start Address Registers */ + { + case 0x00: + READ_ADDR(0, 0, ReadValue); + return ReadValue; + case 0x02: + READ_ADDR(0, 1, ReadValue); + return ReadValue; + case 0x04: + READ_ADDR(0, 2, ReadValue); + return ReadValue; + case 0x06: + READ_ADDR(0, 3, ReadValue); + return ReadValue; + case 0xC0: + READ_ADDR(1, 0, ReadValue); + return ReadValue; + case 0xC4: + READ_ADDR(1, 1, ReadValue); + return ReadValue; + case 0xC8: + READ_ADDR(1, 2, ReadValue); + return ReadValue; + case 0xCC: + READ_ADDR(1, 3, ReadValue); + return ReadValue; + } + + /* Count Address Registers */ + { + case 0x01: + READ_CNT(0, 0, ReadValue); + return ReadValue; + case 0x03: + READ_CNT(0, 1, ReadValue); + return ReadValue; + case 0x05: + READ_CNT(0, 2, ReadValue); + return ReadValue; + case 0x07: + READ_CNT(0, 3, ReadValue); + return ReadValue; + case 0xC2: + READ_CNT(1, 0, ReadValue); + return ReadValue; + case 0xC6: + READ_CNT(1, 1, ReadValue); + return ReadValue; + case 0xCA: + READ_CNT(1, 2, ReadValue); + return ReadValue; + case 0xCE: + READ_CNT(1, 3, ReadValue); + return ReadValue; + } + + /* Status Registers */ + { + case 0x08: + return DmaControllers[0].Status; + case 0xD0: + return DmaControllers[1].Status; + } + + /* DMA Intermediate (Temporary) Registers */ + { + case 0x0D: + return DmaControllers[0].TempReg; + case 0xDA: + return DmaControllers[1].TempReg; + } + } + + return 0x00; +} + +#define WRITE_ADDR(CtrlIndex, ChanIndex, Data) \ +do { \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].BaseAddress + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)) = (Data); \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].CurrAddress + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)) = (Data); \ + DmaControllers[(CtrlIndex)].FlipFlop ^= 1; \ +} while(0) + +#define WRITE_CNT(CtrlIndex, ChanIndex, Data) \ +do { \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].BaseWordCnt + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)) = (Data); \ + *((PBYTE)&DmaControllers[(CtrlIndex)].DmaChannel[(ChanIndex)].CurrWordCnt + \ + (DmaControllers[(CtrlIndex)].FlipFlop & 0x01)) = (Data); \ + DmaControllers[(CtrlIndex)].FlipFlop ^= 1; \ +} while(0) + +static VOID WINAPI DmaWritePort(USHORT Port, BYTE Data) +{ + switch (Port) + { + /* Start Address Registers */ + { + case 0x00: + WRITE_ADDR(0, 0, Data); + break; + case 0x02: + WRITE_ADDR(0, 1, Data); + break; + case 0x04: + WRITE_ADDR(0, 2, Data); + break; + case 0x06: + WRITE_ADDR(0, 3, Data); + break; + case 0xC0: + WRITE_ADDR(1, 0, Data); + break; + case 0xC4: + WRITE_ADDR(1, 1, Data); + break; + case 0xC8: + WRITE_ADDR(1, 2, Data); + break; + case 0xCC: + WRITE_ADDR(1, 3, Data); + break; + } + + /* Count Address Registers */ + { + case 0x01: + WRITE_CNT(0, 0, Data); + break; + case 0x03: + WRITE_CNT(0, 1, Data); + break; + case 0x05: + WRITE_CNT(0, 2, Data); + break; + case 0x07: + WRITE_CNT(0, 3, Data); + break; + case 0xC2: + WRITE_CNT(1, 0, Data); + break; + case 0xC6: + WRITE_CNT(1, 1, Data); + break; + case 0xCA: + WRITE_CNT(1, 2, Data); + break; + case 0xCE: + WRITE_CNT(1, 3, Data); + break; + } + + /* Command Registers */ + { + case 0x08: + DmaControllers[0].Command = Data; + break; + case 0xD0: + DmaControllers[1].Command = Data; + break; + } + + /* Request Registers */ + { + case 0x09: + DmaControllers[0].Request = Data; + break; + case 0xD2: + DmaControllers[1].Request = Data; + break; + } + + /* Flip-Flop Reset */ + { + case 0x0C: + DmaControllers[0].FlipFlop = 0; + break; + case 0xD8: + DmaControllers[1].FlipFlop = 0; + break; + } + + /* DMA Master Reset */ + { + case 0x0D: + DmaControllers[0].Command = 0x00; + DmaControllers[0].Status = 0x00; + DmaControllers[0].Request = 0x00; + DmaControllers[0].TempReg = 0x00; + DmaControllers[0].FlipFlop = 0; + DmaControllers[0].Mask = 0x0F; + break; + case 0xDA: + DmaControllers[1].Command = 0x00; + DmaControllers[1].Status = 0x00; + DmaControllers[1].Request = 0x00; + DmaControllers[1].TempReg = 0x00; + DmaControllers[1].FlipFlop = 0; + DmaControllers[1].Mask = 0x0F; + break; + } + } +} + +/* Page Address Registers */ + +static BYTE WINAPI DmaPageReadPort(USHORT Port) +{ + switch (Port) + { + case 0x87: + return DmaPageRegisters[0].Page; + case 0x83: + return DmaPageRegisters[1].Page; + case 0x81: + return DmaPageRegisters[2].Page; + case 0x82: + return DmaPageRegisters[3].Page; + case 0x8F: + return DmaPageRegisters[4].Page; + case 0x8B: + return DmaPageRegisters[5].Page; + case 0x89: + return DmaPageRegisters[6].Page; + case 0x8A: + return DmaPageRegisters[7].Page; + } + + return 0x00; +} + +static VOID WINAPI DmaPageWritePort(USHORT Port, BYTE Data) +{ + switch (Port) + { + case 0x87: + DmaPageRegisters[0].Page = Data; + break; + case 0x83: + DmaPageRegisters[1].Page = Data; + break; + case 0x81: + DmaPageRegisters[2].Page = Data; + break; + case 0x82: + DmaPageRegisters[3].Page = Data; + break; + case 0x8F: + DmaPageRegisters[4].Page = Data; + break; + case 0x8B: + DmaPageRegisters[5].Page = Data; + break; + case 0x89: + DmaPageRegisters[6].Page = Data; + break; + case 0x8A: + DmaPageRegisters[7].Page = Data; + break; + } +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +VOID DmaInitialize(VOID) +{ + /* Register the I/O Ports */ + + /* Channels 0(Reserved)..3 */ + RegisterIoPort(0x00, NULL, DmaWritePort); /* Start Address Register 0 (Reserved) */ + RegisterIoPort(0x01, NULL, DmaWritePort); /* Count Address Register 0 (Reserved) */ + RegisterIoPort(0x02, NULL, DmaWritePort); /* Start Address Register 1 */ + RegisterIoPort(0x03, NULL, DmaWritePort); /* Count Address Register 1 */ + RegisterIoPort(0x04, NULL, DmaWritePort); /* Start Address Register 2 */ + RegisterIoPort(0x05, NULL, DmaWritePort); /* Count Address Register 2 */ + RegisterIoPort(0x06, NULL, DmaWritePort); /* Start Address Register 3 */ + RegisterIoPort(0x07, NULL, DmaWritePort); /* Count Address Register 3 */ + + RegisterIoPort(0x08, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ + RegisterIoPort(0x09, NULL, DmaWritePort); /* Request Register */ + RegisterIoPort(0x0A, NULL, DmaWritePort); /* Single Channel Mask Register */ + RegisterIoPort(0x0B, NULL, DmaWritePort); /* Mode Register */ + RegisterIoPort(0x0C, NULL, DmaWritePort); /* Flip-Flop Reset Register */ + RegisterIoPort(0x0D, DmaReadPort, DmaWritePort); /* Intermediate (Read) / Master Reset (Write) Registers */ + RegisterIoPort(0x0E, NULL, DmaWritePort); /* Mask Reset Register */ + RegisterIoPort(0x0F, DmaReadPort, DmaWritePort); /* Multi-Channel Mask Reset Register */ + + + /* Channels 4(Reserved)..7 */ + RegisterIoPort(0xC0, NULL, DmaWritePort); /* Start Address Register 4 (Reserved) */ + RegisterIoPort(0xC2, NULL, DmaWritePort); /* Count Address Register 4 (Reserved) */ + RegisterIoPort(0xC4, NULL, DmaWritePort); /* Start Address Register 5 */ + RegisterIoPort(0xC6, NULL, DmaWritePort); /* Count Address Register 5 */ + RegisterIoPort(0xC8, NULL, DmaWritePort); /* Start Address Register 6 */ + RegisterIoPort(0xCA, NULL, DmaWritePort); /* Count Address Register 6 */ + RegisterIoPort(0xCC, NULL, DmaWritePort); /* Start Address Register 7 */ + RegisterIoPort(0xCE, NULL, DmaWritePort); /* Count Address Register 7 */ + + RegisterIoPort(0xD0, DmaReadPort, DmaWritePort); /* Status (Read) / Command (Write) Registers */ + RegisterIoPort(0xD2, NULL, DmaWritePort); /* Request Register */ + RegisterIoPort(0xD4, NULL, DmaWritePort); /* Single Channel Mask Register */ + RegisterIoPort(0xD6, NULL, DmaWritePort); /* Mode Register */ + RegisterIoPort(0xD8, NULL, DmaWritePort); /* Flip-Flop Reset Register */ + RegisterIoPort(0xDA, DmaReadPort, DmaWritePort); /* Intermediate (Read) / Master Reset (Write) Registers */ + RegisterIoPort(0xDC, NULL, DmaWritePort); /* Mask Reset Register */ + RegisterIoPort(0xDE, DmaReadPort, DmaWritePort); /* Multi-Channel Mask Reset Register */ + + + /* Channels Page Address Registers */ + RegisterIoPort(0x87, DmaPageReadPort, DmaPageWritePort); /* Channel 0 (Reserved) */ + RegisterIoPort(0x83, DmaPageReadPort, DmaPageWritePort); /* Channel 1 */ + RegisterIoPort(0x81, DmaPageReadPort, DmaPageWritePort); /* Channel 2 */ + RegisterIoPort(0x82, DmaPageReadPort, DmaPageWritePort); /* Channel 3 */ + RegisterIoPort(0x8F, DmaPageReadPort, DmaPageWritePort); /* Channel 4 (Reserved) */ + RegisterIoPort(0x8B, DmaPageReadPort, DmaPageWritePort); /* Channel 5 */ + RegisterIoPort(0x89, DmaPageReadPort, DmaPageWritePort); /* Channel 6 */ + RegisterIoPort(0x8A, DmaPageReadPort, DmaPageWritePort); /* Channel 7 */ +} + + + +DWORD +WINAPI +VDDRequestDMA(IN HANDLE hVdd, + IN WORD iChannel, + IN OUT PVOID Buffer, + IN DWORD length) +{ + UNREFERENCED_PARAMETER(hVdd); + + if (iChannel >= DMA_CONTROLLERS * DMA_CONTROLLER_CHANNELS) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + UNIMPLEMENTED; + return 0; +} + +BOOL +WINAPI +VDDQueryDMA(IN HANDLE hVdd, + IN WORD iChannel, + IN PVDD_DMA_INFO pDmaInfo) +{ + PDMA_CONTROLLER pDcp; + WORD Channel; + + UNREFERENCED_PARAMETER(hVdd); + + if (iChannel >= DMA_CONTROLLERS * DMA_CONTROLLER_CHANNELS) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + pDcp = &DmaControllers[iChannel / DMA_CONTROLLER_CHANNELS]; + Channel = iChannel % DMA_CONTROLLER_CHANNELS; + + pDmaInfo->addr = pDcp->DmaChannel[Channel].CurrAddress; + pDmaInfo->count = pDcp->DmaChannel[Channel].CurrWordCnt; + + // pDmaInfo->page = DmaPageRegisters[iChannel].Page; + pDmaInfo->status = pDcp->Status; + pDmaInfo->mode = pDcp->DmaChannel[Channel].Mode; + pDmaInfo->mask = pDcp->Mask; + + return TRUE; +} + +BOOL +WINAPI +VDDSetDMA(IN HANDLE hVdd, + IN WORD iChannel, + IN WORD fDMA, + IN PVDD_DMA_INFO pDmaInfo) +{ + PDMA_CONTROLLER pDcp; + WORD Channel; + + UNREFERENCED_PARAMETER(hVdd); + + if (iChannel >= DMA_CONTROLLERS * DMA_CONTROLLER_CHANNELS) + { + SetLastError(ERROR_INVALID_ADDRESS); + return FALSE; + } + + pDcp = &DmaControllers[iChannel / DMA_CONTROLLER_CHANNELS]; + Channel = iChannel % DMA_CONTROLLER_CHANNELS; + + if (fDMA & VDD_DMA_ADDR) + pDcp->DmaChannel[Channel].CurrAddress = pDmaInfo->addr; + + if (fDMA & VDD_DMA_COUNT) + pDcp->DmaChannel[Channel].CurrWordCnt = pDmaInfo->count; + + // if (fDMA & VDD_DMA_PAGE) + // DmaPageRegisters[iChannel].Page = pDmaInfo->page; + + if (fDMA & VDD_DMA_STATUS) + pDcp->Status = pDmaInfo->status; + + return TRUE; +} + +/* EOF */ Propchange: trunk/reactos/subsystems/ntvdm/hardware/dma.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/subsystems/ntvdm/hardware/dma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/dma.h (added) +++ trunk/reactos/subsystems/ntvdm/hardware/dma.h [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -0,0 +1,64 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: dma.h + * PURPOSE: Direct Memory Access Controller emulation - + * i8237A compatible with 74LS612 Memory Mapper extension + * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) + */ + +#ifndef _DMA_H_ +#define _DMA_H_ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +/* DEFINES ********************************************************************/ + +#define DMA_CONTROLLERS 2 +#define DMA_CONTROLLER_CHANNELS 4 // Each DMA controller has 4 channels + +typedef struct _DMA_CHANNEL +{ + WORD BaseAddress; + WORD BaseWordCnt; + WORD CurrAddress; + WORD CurrWordCnt; + BYTE Mode; +} DMA_CHANNEL, *PDMA_CHANNEL; + +typedef struct _DMA_CONTROLLER +{ + DMA_CHANNEL DmaChannel[DMA_CONTROLLER_CHANNELS]; + + WORD TempAddress; + WORD TempWordCnt; + + BYTE TempReg; + + BYTE Command; + BYTE Request; + BYTE Mask; + BYTE Status; + + BOOLEAN FlipFlop; // 0: LSB ; 1: MSB + +} DMA_CONTROLLER, *PDMA_CONTROLLER; + +/* 74LS612 Memory Mapper extension */ +typedef struct _DMA_PAGE_REGISTER +{ + BYTE Page; +} DMA_PAGE_REGISTER, *PDMA_PAGE_REGISTER; + +// The 74LS612 contains 16 bytes, each of them being a page register. +// They are accessible via ports 0x80 through 0x8F . + +/* FUNCTIONS ******************************************************************/ + +VOID DmaInitialize(VOID); + +#endif // _DMA_H_ + +/* EOF */ Propchange: trunk/reactos/subsystems/ntvdm/hardware/dma.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -349,4 +349,24 @@ } } +WORD +WINAPI +VDDReserveIrqLine(IN HANDLE hVdd, + IN WORD IrqLine) +{ + UNIMPLEMENTED; + SetLastError(ERROR_INVALID_PARAMETER); + return 0xFFFF; +} + +BOOL +WINAPI +VDDReleaseIrqLine(IN HANDLE hVdd, + IN WORD IrqLine) +{ + UNIMPLEMENTED; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; +} + /* EOF */ Modified: trunk/reactos/subsystems/ntvdm/ntvdm.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.spe… ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.spec [iso-8859-1] Fri Nov 21 00:22:48 2014 @@ -1,6 +1,6 @@ -;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; NTVDM Registers exports ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;; +;; NTVDM Registers ;; +;;;;;;;;;;;;;;;;;;;;; @ stdcall getAF() @ stdcall getAH() @@ -90,9 +90,9 @@ @ stdcall setZF(long) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; NTVDM CCPU MIPS exports ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; NTVDM CCPU MIPS Compatibility ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @ stdcall c_getAF() getAF @ stdcall c_getAH() getAH @@ -179,9 +179,9 @@ @ stdcall c_setZF(long) setZF -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; NTVDM DOS-32 Emulation exports ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; NTVDM DOS-32 Emulation ;; +;;;;;;;;;;;;;;;;;;;;;;;;;;;; @ stdcall demClientErrorEx(long long long) @ stdcall demFileDelete(ptr) @@ -200,9 +200,9 @@ ;@ stdcall demWOWLFNInit -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; NTVDM Miscellaneous exports ;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;;;;;;;;;;;;;;;;;;;;;;;; +;; NTVDM Miscellaneous ;; +;;;;;;;;;;;;;;;;;;;;;;;;; @ stdcall MGetVdmPointer(long long long) @ stdcall Sim32pGetVDMPointer(long long) @@ -212,8 +212,15 @@ ;@ stdcall VdmUnmapFlat(long long ptr long) ; Not exported on x86 @ stdcall call_ica_hw_interrupt(long long long) +@ stdcall VDDReserveIrqLine(long long) +@ stdcall VDDReleaseIrqLine(long long) + @ stdcall VDDInstallIOHook(long long ptr ptr) @ stdcall VDDDeInstallIOHook(long long ptr) + +@ stdcall VDDRequestDMA(long long ptr long) +@ stdcall VDDQueryDMA(long long ptr) +@ stdcall VDDSetDMA(long long long ptr) @ stdcall VDDSimulate16() @ stdcall host_simulate() VDDSimulate16

1 0

[hbelusca] 65436: [DDK] Add few VDD API prototypes: - VDDReserve/ReleaseIrqLine to get a "lock" on an IRQ line (so that VDDs can check whether some IRQs are free or not). - Add DMA services.
by hbelusca＠svn.reactos.org 21 Nov '14

21 Nov '14

Author: hbelusca Date: Fri Nov 21 00:13:51 2014 New Revision: 65436 URL: http://svn.reactos.org/svn/reactos?rev=65436&view=rev Log: [DDK] Add few VDD API prototypes: - VDDReserve/ReleaseIrqLine to get a "lock" on an IRQ line (so that VDDs can check whether some IRQs are free or not). - Add DMA services. Modified: trunk/reactos/include/ddk/nt_vdd.h Modified: trunk/reactos/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/nt_vdd.h?rev=6… ============================================================================== --- trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/nt_vdd.h [iso-8859-1] Fri Nov 21 00:13:51 2014 @@ -39,6 +39,27 @@ VOID WINAPI VDDTerminateVDM(VOID); + + +/* + * IRQ services + */ + +WORD +WINAPI +VDDReserveIrqLine +( + IN HANDLE hVdd, + IN WORD IrqLine +); + +BOOL +WINAPI +VDDReleaseIrqLine +( + IN HANDLE hVdd, + IN WORD IrqLine +); /* @@ -76,19 +97,69 @@ WINAPI VDDInstallIOHook ( - HANDLE hVdd, - WORD cPortRange, - PVDD_IO_PORTRANGE pPortRange, - PVDD_IO_HANDLERS IOhandler + IN HANDLE hVdd, + IN WORD cPortRange, + IN PVDD_IO_PORTRANGE pPortRange, + IN PVDD_IO_HANDLERS IOhandler ); VOID WINAPI VDDDeInstallIOHook ( - HANDLE hVdd, - WORD cPortRange, - PVDD_IO_PORTRANGE pPortRange + IN HANDLE hVdd, + IN WORD cPortRange, + IN PVDD_IO_PORTRANGE pPortRange +); + + +/* + * DMA services + */ + +typedef struct _VDD_DMA_INFO +{ + WORD addr; + WORD count; + WORD page; + BYTE status; + BYTE mode; + BYTE mask; +} VDD_DMA_INFO, *PVDD_DMA_INFO; + +#define VDD_DMA_ADDR 0x01 +#define VDD_DMA_COUNT 0x02 +#define VDD_DMA_PAGE 0x04 +#define VDD_DMA_STATUS 0x08 +#define VDD_DMA_ALL (VDD_DMA_ADDR | VDD_DMA_COUNT | VDD_DMA_PAGE | VDD_DMA_STATUS) + +DWORD +WINAPI +VDDRequestDMA +( + IN HANDLE hVdd, + IN WORD iChannel, + IN OUT PVOID Buffer, + IN DWORD length +); + +BOOL +WINAPI +VDDQueryDMA +( + IN HANDLE hVdd, + IN WORD iChannel, + IN PVDD_DMA_INFO pDmaInfo +); + +BOOL +WINAPI +VDDSetDMA +( + IN HANDLE hVdd, + IN WORD iChannel, + IN WORD fDMA, + IN PVDD_DMA_INFO pDmaInfo );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs