Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[aandrejevic] 60681: [SOFT386] Implement the PUSH instruction in opcode group 0xFF.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 15 19:03:40 2013 New Revision: 60681 URL: http://svn.reactos.org/svn/reactos?rev=60681&view=rev Log: [SOFT386] Implement the PUSH instruction in opcode group 0xFF. Modified: branches/ntvdm/lib/soft386/opgroups.c Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Tue Oct 15 19:03:40 2013 @@ -1496,6 +1496,11 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 6) + { + /* Push the value on to the stack */ + return Soft386StackPush(State, Value); + } if (ModRegRm.Register <= 1) { @@ -1535,6 +1540,11 @@ Value--; State->Flags.Af = ((Value & 0x0F) == 0x0F); } + else if (ModRegRm.Register == 6) + { + /* Push the value on to the stack */ + return Soft386StackPush(State, Value); + } if (ModRegRm.Register <= 1) { @@ -1551,7 +1561,7 @@ } } - if (ModRegRm.Register > 1) + if ((ModRegRm.Register > 1) && (ModRegRm.Register != 6)) { UNIMPLEMENTED; return FALSE; // NOT IMPLEMENTED

11 years, 2 months

[aandrejevic] 60680: [SOFT386] Implement far returns (both versions in Soft386OpcodeRetFar).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 15 18:54:11 2013 New Revision: 60680 URL: http://svn.reactos.org/svn/reactos?rev=60680&view=rev Log: [SOFT386] Implement far returns (both versions in Soft386OpcodeRetFar). Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Tue Oct 15 18:54:11 2013 @@ -242,7 +242,7 @@ Soft386OpcodeGroupC7, Soft386OpcodeEnter, Soft386OpcodeLeave, - Soft386OpcodeRetFarImm, + Soft386OpcodeRetFar, Soft386OpcodeRetFar, Soft386OpcodeInt, Soft386OpcodeInt, @@ -5075,20 +5075,69 @@ } } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + ULONG Segment = 0; + ULONG Offset = 0; + USHORT BytesToPop = 0; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xCA); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Opcode == 0xCA) + { + /* Fetch the number of bytes to pop after the return */ + if (!Soft386FetchWord(State, &BytesToPop)) return FALSE; + } + + /* Pop the offset */ + if (!Soft386StackPop(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + + /* Pop the segment */ + if (!Soft386StackPop(State, &Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load new (E)IP, and if necessary, pop the parameters */ + if (Size) + { + State->InstPtr.Long = Offset; + State->GeneralRegs[SOFT386_REG_ESP].Long += BytesToPop; + } + else + { + State->InstPtr.LowWord = LOWORD(Offset); + State->GeneralRegs[SOFT386_REG_ESP].LowWord += BytesToPop; + } + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeInt)

11 years, 2 months

[aandrejevic] 60679: [SOFT386] Implement far jumps.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Tue Oct 15 17:27:23 2013 New Revision: 60679 URL: http://svn.reactos.org/svn/reactos?rev=60679&view=rev Log: [SOFT386] Implement far jumps. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Tue Oct 15 17:27:23 2013 @@ -5690,10 +5690,63 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + USHORT Segment = 0; + ULONG Offset = 0; + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xEA); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + + if (State->PrefixFlags & SOFT386_PREFIX_LOCK) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Fetch the offset */ + if (Size) + { + if (!Soft386FetchDword(State, &Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* Exception occurred */ + return FALSE; + } + } + + /* Fetch the segment */ + if (!Soft386FetchWord(State, &Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load the new CS */ + if (!Soft386LoadSegment(State, SOFT386_REG_CS, Segment)) + { + /* Exception occurred */ + return FALSE; + } + + /* Load new (E)IP */ + if (Size) State->InstPtr.Long = Offset; + else State->InstPtr.LowWord = LOWORD(Offset); + + return TRUE; } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovAlOffset)

11 years, 2 months

[hbelusca] 60678: [USETUP] - Fix translations of booloader installation menu (see rev.48703). ACHTUNG ACHTUNG!! Greek and Spanish people, please review the translation fix and provide patches if ne...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Tue Oct 15 16:45:52 2013 New Revision: 60678 URL: http://svn.reactos.org/svn/reactos?rev=60678&view=rev Log: [USETUP] - Fix translations of booloader installation menu (see rev.48703). ACHTUNG ACHTUNG!! Greek and Spanish people, please review the translation fix and provide patches if needed!! - Update French translation. CORE-7516 #resolve #comment Committed in revision r60678. Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/fr-FR.h Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Tue Oct 15 16:45:52 2013 @@ -1009,13 +1009,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "¡«á©«© «¦¬ bootloader ©«¦ ©¡¢¨æ å©¡¦ (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "¡«á©«© «¦¬ bootloader ©«¦ ©¡¢¨æ å©¡¦ (VBR only).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Tue Oct 15 16:45:52 2013 @@ -992,13 +992,13 @@ { 8, 12, - "Install bootloader on the harddisk (MBR and VBR).", + "Instalar cargador de arranque en el disco duro (MBR and VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Install bootloader on the harddisk (VBR only).", + "Instalar cargador de arranque en el disco duro (VBR only).", TEXT_STYLE_NORMAL }, { Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Tue Oct 15 16:45:52 2013 @@ -998,13 +998,13 @@ { 8, 12, - "Installer le chargeur de dmarrage sur le disque (MBR et VBR).", + "Installer le chargeur de dmarrage sur le disque dur (MBR et VBR).", TEXT_STYLE_NORMAL }, { 8, 13, - "Installer le chargeur de dmarrage sur le disque (VBR seulement).", + "Installer le chargeur de dmarrage sur le disque dur (VBR seulement).", TEXT_STYLE_NORMAL }, {

11 years, 2 months

[jimtabor] 60677: [Win32k] - Fix more wine msg test_hotkey tests, down to seven.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Oct 15 07:05:17 2013 New Revision: 60677 URL: http://svn.reactos.org/svn/reactos?rev=60677&view=rev Log: [Win32k] - Fix more wine msg test_hotkey tests, down to seven. Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Tue Oct 15 07:05:17 2013 @@ -195,7 +195,8 @@ if (pHotKey) { - TRACE("Hot key Found\n"); + TRACE("Hot key pressed (pWnd %p, id %d)\n", pHotKey->pWnd, pHotKey->id); + /* FIXME: See comment about "UserDebuggerHotKey" on top of this file. */ if (pHotKey->id == IDHK_SHIFTF12 || pHotKey->id == IDHK_F12) { @@ -210,8 +211,6 @@ /* Process hotkey if it is key up event */ if (!bIsDown) { - TRACE("Hot key pressed (pWnd %p, id %d)\n", pHotKey->pWnd, pHotKey->id); - /* WIN and F12 keys are not hardcoded here. See comments on top of this file. */ if (pHotKey->id == IDHK_WINKEY && bWinHotkeyActive == TRUE) { @@ -222,15 +221,27 @@ UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); //ptiLastInput = pWnd->head.pti; bWinHotkeyActive = FALSE; - return TRUE; + return FALSE; } } - + } + else + { /* The user pressed the win key */ + if (pHotKey->id == IDHK_WINKEY) + { + bWinHotkeyActive = TRUE; + return FALSE; + } + } + + if (bIsDown) + { if (!pHotKey->pWnd) { TRACE("UPTM Hot key Id %d Key %d\n",pHotKey->id, wVk ); UserPostThreadMessage(pHotKey->pti, WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); //ptiLastInput = pHotKey->pti; + return TRUE; /* Don't send any message */ } else { @@ -248,23 +259,22 @@ pWnd = pHotKey->pWnd; } if (pWnd) - { - if (pWnd == pWnd->head.rpdesk->pDeskInfo->spwndShell && pHotKey->id == SC_TASKLIST) + { // pWnd->head.rpdesk->pDeskInfo->spwndShell needs testing. + if (pWnd == ValidateHwndNoErr(InputWindowStation->ShellWindow) && pHotKey->id == SC_TASKLIST) { ERR("Sending to shell window w/o IDHK_WINKEY..\n"); UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); } else { + TRACE("UPM Hot key Id %d Key %d\n",pHotKey->id, wVk ); UserPostMessage(UserHMGetHandle(pWnd), WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); } //ptiLastInput = pWnd->head.pti; + return TRUE; /* Don't send any message */ } } - return TRUE; /* Don't send any message */ - } - else /* The user pressed the win key */ - if (pHotKey->id == IDHK_WINKEY) bWinHotkeyActive = TRUE; + } } return FALSE; } @@ -558,7 +568,7 @@ { PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; BOOL bRet = FALSE; - PWND pWnd; + PWND pWnd = NULL; TRACE("Enter NtUserUnregisterHotKey\n"); UserEnterExclusive();

11 years, 2 months

[jimtabor] 60676: - Return the right error if hot key registered outside of the thread.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 14 21:51:07 2013 New Revision: 60676 URL: http://svn.reactos.org/svn/reactos?rev=60676&view=rev Log: - Return the right error if hot key registered outside of the thread. Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Mon Oct 14 21:51:07 2013 @@ -512,6 +512,7 @@ /* Fix wine msg "Window on another thread" test_hotkey */ if (pWnd->head.pti != gptiCurrent) { + EngSetLastError(ERROR_WINDOW_OF_OTHER_THREAD); WARN("Must be from the same Thread.\n"); goto cleanup; }

11 years, 2 months

[hbelusca] 60675: [NTOS:HEADLESS] - Fix the name of a function. - Fix HdlspSendStringAtBaud (we started displaying string at its second character) and fix HdlspPutData (data was sent erroneous, shi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 14 21:29:17 2013 New Revision: 60675 URL: http://svn.reactos.org/svn/reactos?rev=60675&view=rev Log: [NTOS:HEADLESS] - Fix the name of a function. - Fix HdlspSendStringAtBaud (we started displaying string at its second character) and fix HdlspPutData (data was sent erroneous, shifted by 1). Fix SAC display. Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Mon Oct 14 21:29:17 2013 @@ -38,7 +38,7 @@ FORCEINLINE VOID -HdlspReleaselobalLock(IN KIRQL OldIrql) +HdlspReleaseGlobalLock(IN KIRQL OldIrql) { /* Only release the lock if we aren't bugchecking */ if (OldIrql != 0xFF) @@ -56,117 +56,10 @@ HdlspSendStringAtBaud(IN PUCHAR String) { /* Send every byte */ - while (*String++ != ANSI_NULL) - { - InbvPortPutByte(HeadlessGlobals->TerminalPort, *String); - } -} - -NTSTATUS -NTAPI -HdlspEnableTerminal(IN BOOLEAN Enable) -{ - /* Enable if requested, as long as this isn't a PCI serial port crashing */ - if ((Enable) && - !(HeadlessGlobals->TerminalEnabled) && - !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) - { - /* Initialize the COM port with cportlib */ - HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals-> - TerminalBaudRate, - HeadlessGlobals-> - TerminalPortNumber, - HeadlessGlobals-> - TerminalPortAddress, - &HeadlessGlobals-> - TerminalPort, - HeadlessGlobals-> - IsMMIODevice); - if (!HeadlessGlobals->TerminalEnabled) - { - DPRINT1("Failed to initialize port through cportlib\n"); - return STATUS_UNSUCCESSFUL; - } - - /* Cleanup the screen and reset the cursor */ - HdlspSendStringAtBaud((PUCHAR)"\x1B[2J"); - HdlspSendStringAtBaud((PUCHAR)"\x1B[H"); - - /* Enable FIFO */ - InbvPortEnableFifo(HeadlessGlobals->TerminalPort, TRUE); - } - else if (!Enable) - { - /* Specific case when headless is being disabled */ - InbvPortTerminate(HeadlessGlobals->TerminalPort); - HeadlessGlobals->TerminalPort = 0; - HeadlessGlobals->TerminalEnabled = FALSE; - } - - /* All done */ - return STATUS_SUCCESS; -} - -VOID -NTAPI -INIT_FUNCTION -HeadlessInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PHEADLESS_LOADER_BLOCK HeadlessBlock; - - /* Only initialize further if the loader found EMS enabled */ - HeadlessBlock = LoaderBlock->Extension->HeadlessLoaderBlock; - if (!HeadlessBlock) return; - - /* Ignore invalid EMS settings */ - if ((HeadlessBlock->PortNumber > 4) && (HeadlessBlock->UsedBiosSettings)) return; - - /* Allocate the global headless data */ - HeadlessGlobals = ExAllocatePoolWithTag(NonPagedPool, - sizeof(*HeadlessGlobals), - 'sldH'); - if (!HeadlessGlobals) return; - - /* Zero and copy loader data */ - RtlZeroMemory(HeadlessGlobals, sizeof(*HeadlessGlobals)); - HeadlessGlobals->TerminalPortNumber = HeadlessBlock->PortNumber; - HeadlessGlobals->TerminalPortAddress = HeadlessBlock->PortAddress; - HeadlessGlobals->TerminalBaudRate = HeadlessBlock->BaudRate; - HeadlessGlobals->TerminalParity = HeadlessBlock->Parity; - HeadlessGlobals->TerminalStopBits = HeadlessBlock->StopBits; - HeadlessGlobals->UsedBiosSettings = HeadlessBlock->UsedBiosSettings; - HeadlessGlobals->IsMMIODevice = HeadlessBlock->IsMMIODevice; - HeadlessGlobals->TerminalType = HeadlessBlock->TerminalType; - HeadlessGlobals->SystemGUID = HeadlessBlock->SystemGUID; - DPRINT1("EMS on Port %lu (0x%p) at %lu bps\n", - HeadlessGlobals->TerminalPortNumber, - HeadlessGlobals->TerminalPortAddress, - HeadlessGlobals->TerminalBaudRate); - - /* These two are opposites of each other */ - if (HeadlessGlobals->IsMMIODevice) HeadlessGlobals->IsNonLegacyDevice = TRUE; - - /* Check for a PCI device, warn that this isn't supported */ - if (HeadlessBlock->PciDeviceId != PCI_INVALID_VENDORID) - { - DPRINT1("PCI Serial Ports not supported\n"); - } - - /* Log entries are not yet supported */ - DPRINT1("FIXME: No Headless logging support\n"); - - /* Allocate temporary buffer */ - HeadlessGlobals->TmpBuffer = ExAllocatePoolWithTag(NonPagedPool, 80, 'sldH'); - if (!HeadlessGlobals->TmpBuffer) return; - - /* Windows seems to apply some special hacks for 9600 bps */ - if (HeadlessGlobals->TerminalBaudRate == 9600) - { - DPRINT1("Please use other baud rate than 9600bps for now\n"); - } - - /* Enable the terminal */ - HdlspEnableTerminal(TRUE); + while (*String != ANSI_NULL) + { + InbvPortPutByte(HeadlessGlobals->TerminalPort, *String++); + } } VOID @@ -177,7 +70,7 @@ ULONG i; for (i = 0; i < DataSize; i++) { - InbvPortPutByte(HeadlessGlobals->TerminalPort, Data[i]++); + InbvPortPutByte(HeadlessGlobals->TerminalPort, Data[i]); } } @@ -252,6 +145,113 @@ NTSTATUS NTAPI +HdlspEnableTerminal(IN BOOLEAN Enable) +{ + /* Enable if requested, as long as this isn't a PCI serial port crashing */ + if ((Enable) && + !(HeadlessGlobals->TerminalEnabled) && + !((HeadlessGlobals->IsMMIODevice) && (HeadlessGlobals->InBugCheck))) + { + /* Initialize the COM port with cportlib */ + HeadlessGlobals->TerminalEnabled = InbvPortInitialize(HeadlessGlobals-> + TerminalBaudRate, + HeadlessGlobals-> + TerminalPortNumber, + HeadlessGlobals-> + TerminalPortAddress, + &HeadlessGlobals-> + TerminalPort, + HeadlessGlobals-> + IsMMIODevice); + if (!HeadlessGlobals->TerminalEnabled) + { + DPRINT1("Failed to initialize port through cportlib\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Cleanup the screen and reset the cursor */ + HdlspSendStringAtBaud((PUCHAR)"\x1B[2J"); + HdlspSendStringAtBaud((PUCHAR)"\x1B[H"); + + /* Enable FIFO */ + InbvPortEnableFifo(HeadlessGlobals->TerminalPort, TRUE); + } + else if (!Enable) + { + /* Specific case when headless is being disabled */ + InbvPortTerminate(HeadlessGlobals->TerminalPort); + HeadlessGlobals->TerminalPort = 0; + HeadlessGlobals->TerminalEnabled = FALSE; + } + + /* All done */ + return STATUS_SUCCESS; +} + +VOID +NTAPI +INIT_FUNCTION +HeadlessInit(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PHEADLESS_LOADER_BLOCK HeadlessBlock; + + /* Only initialize further if the loader found EMS enabled */ + HeadlessBlock = LoaderBlock->Extension->HeadlessLoaderBlock; + if (!HeadlessBlock) return; + + /* Ignore invalid EMS settings */ + if ((HeadlessBlock->PortNumber > 4) && (HeadlessBlock->UsedBiosSettings)) return; + + /* Allocate the global headless data */ + HeadlessGlobals = ExAllocatePoolWithTag(NonPagedPool, + sizeof(*HeadlessGlobals), + 'sldH'); + if (!HeadlessGlobals) return; + + /* Zero and copy loader data */ + RtlZeroMemory(HeadlessGlobals, sizeof(*HeadlessGlobals)); + HeadlessGlobals->TerminalPortNumber = HeadlessBlock->PortNumber; + HeadlessGlobals->TerminalPortAddress = HeadlessBlock->PortAddress; + HeadlessGlobals->TerminalBaudRate = HeadlessBlock->BaudRate; + HeadlessGlobals->TerminalParity = HeadlessBlock->Parity; + HeadlessGlobals->TerminalStopBits = HeadlessBlock->StopBits; + HeadlessGlobals->UsedBiosSettings = HeadlessBlock->UsedBiosSettings; + HeadlessGlobals->IsMMIODevice = HeadlessBlock->IsMMIODevice; + HeadlessGlobals->TerminalType = HeadlessBlock->TerminalType; + HeadlessGlobals->SystemGUID = HeadlessBlock->SystemGUID; + DPRINT1("EMS on Port %lu (0x%p) at %lu bps\n", + HeadlessGlobals->TerminalPortNumber, + HeadlessGlobals->TerminalPortAddress, + HeadlessGlobals->TerminalBaudRate); + + /* These two are opposites of each other */ + if (HeadlessGlobals->IsMMIODevice) HeadlessGlobals->IsNonLegacyDevice = TRUE; + + /* Check for a PCI device, warn that this isn't supported */ + if (HeadlessBlock->PciDeviceId != PCI_INVALID_VENDORID) + { + DPRINT1("PCI Serial Ports not supported\n"); + } + + /* Log entries are not yet supported */ + DPRINT1("FIXME: No Headless logging support\n"); + + /* Allocate temporary buffer */ + HeadlessGlobals->TmpBuffer = ExAllocatePoolWithTag(NonPagedPool, 80, 'sldH'); + if (!HeadlessGlobals->TmpBuffer) return; + + /* Windows seems to apply some special hacks for 9600 bps */ + if (HeadlessGlobals->TerminalBaudRate == 9600) + { + DPRINT1("Please use other baud rate than 9600bps for now\n"); + } + + /* Enable the terminal */ + HdlspEnableTerminal(TRUE); +} + +NTSTATUS +NTAPI HdlspDispatch(IN HEADLESS_CMD Command, IN PVOID InputBuffer, IN SIZE_T InputBufferSize, @@ -277,13 +277,13 @@ if (HeadlessGlobals->ProcessingCmd) { - HdlspReleaselobalLock(OldIrql); + HdlspReleaseGlobalLock(OldIrql); return STATUS_UNSUCCESSFUL; } /* Don't allow these commands next time */ HeadlessGlobals->ProcessingCmd = TRUE; - HdlspReleaselobalLock(OldIrql); + HdlspReleaseGlobalLock(OldIrql); } /* Handle each command */

11 years, 2 months

[hbelusca] 60674: [NTOS:INBV]: Fix parameter name and type.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 14 20:50:44 2013 New Revision: 60674 URL: http://svn.reactos.org/svn/reactos?rev=60674&view=rev Log: [NTOS:INBV]: Fix parameter name and type. Modified: trunk/reactos/ntoskrnl/inbv/inbvport.c trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/ntoskrnl/inbv/inbvport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbvport.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbvport.c [iso-8859-1] Mon Oct 14 20:50:44 2013 @@ -35,11 +35,20 @@ BOOLEAN NTAPI -InbvPortGetByte(IN ULONG PortId, - OUT PUCHAR Char) +InbvPortGetByte(IN ULONG PortId, + OUT PUCHAR Byte) { /* Read a byte from the port */ - return CpGetByte(&Port[PortId], Char, TRUE, FALSE) == CP_GET_SUCCESS; + return CpGetByte(&Port[PortId], Byte, TRUE, FALSE) == CP_GET_SUCCESS; +} + +VOID +NTAPI +InbvPortPutByte(IN ULONG PortId, + IN UCHAR Byte) +{ + /* Send the byte */ + CpPutByte(&Port[PortId], Byte); } VOID @@ -49,15 +58,6 @@ { /* Set FIFO as requested */ CpEnableFifo(Port[PortId].Address, Enable); -} - -VOID -NTAPI -InbvPortPutByte(IN ULONG PortId, - IN BOOLEAN Output) -{ - /* Send the byte */ - CpPutByte(&Port[PortId], Output); } VOID Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Mon Oct 14 20:50:44 2013 @@ -84,11 +84,18 @@ IN BOOLEAN Enable ); +BOOLEAN +NTAPI +InbvPortGetByte( + IN ULONG PortId, + OUT PUCHAR Byte +); + VOID NTAPI InbvPortPutByte( IN ULONG PortId, - IN BOOLEAN Output + IN UCHAR Byte ); VOID @@ -113,11 +120,4 @@ IN ULONG PortId ); -BOOLEAN -NTAPI -InbvPortGetByte( - IN ULONG PortId, - OUT PUCHAR Char -); - extern BOOLEAN InbvBootDriverInstalled;

11 years, 2 months

[hbelusca] 60673: [FREELDR:HEADLESS]: Code formatting only.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 14 20:47:04 2013 New Revision: 60673 URL: http://svn.reactos.org/svn/reactos?rev=60673&view=rev Log: [FREELDR:HEADLESS]: Code formatting only. Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Mon Oct 14 20:47:04 2013 @@ -45,7 +45,7 @@ WinLdrLoadGUID(OUT PGUID SystemGuid) { PSYSID_UUID_ENTRY CurrentAddress; - + CurrentAddress = (PSYSID_UUID_ENTRY)0xE0000; while (CurrentAddress < (PSYSID_UUID_ENTRY)0x100000) { @@ -56,7 +56,7 @@ } CurrentAddress = (PSYSID_UUID_ENTRY)((ULONG_PTR)CurrentAddress + 1); } - + RtlZeroMemory(SystemGuid, SYSID_UUID_DATA_SIZE); } @@ -78,7 +78,7 @@ { switch (PortNumber) { - case 1: + case 1: PortAddress = (PUCHAR)0x3F8; break; @@ -111,7 +111,7 @@ PortNumber = 1; } } - + /* Not yet supported */ ASSERT(LoaderRedirectionInformation.IsMMIODevice == FALSE); @@ -128,22 +128,22 @@ return TRUE; } } - + return FALSE; } VOID WinLdrPortPutByte(IN ULONG PortId, - IN UCHAR Data) -{ - CpPutByte(&Port[PortId], Data); + IN UCHAR Byte) +{ + CpPutByte(&Port[PortId], Byte); } BOOLEAN -WinLdrPortGetByte(IN ULONG PortId, - OUT PUCHAR Data) -{ - return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; +WinLdrPortGetByte(IN ULONG PortId, + OUT PUCHAR Byte) +{ + return CpGetByte(&Port[PortId], Byte, TRUE, FALSE) == CP_GET_SUCCESS; } BOOLEAN @@ -156,7 +156,7 @@ VOID WinLdrEnableFifo(IN ULONG PortId, - IN BOOLEAN Enable) + IN BOOLEAN Enable) { CpEnableFifo(Port[PortId].Address, Enable); } @@ -168,11 +168,11 @@ PUCHAR PortAddress; PCHAR AnsiReset = "\x1B[m"; ULONG i; - + PortNumber = LoaderRedirectionInformation.PortNumber; PortAddress = LoaderRedirectionInformation.PortAddress; BaudRate = LoaderRedirectionInformation.BaudRate; - + /* Pick a port address */ if (PortNumber) { @@ -204,7 +204,7 @@ WinLdrTerminalConnected = FALSE; return; } - + /* Call arch code to initialize the port */ PortAddress = LoaderRedirectionInformation.PortAddress; WinLdrTerminalConnected = WinLdrPortInitialize( @@ -227,9 +227,9 @@ BaudRate = 9600; LoaderRedirectionInformation.BaudRate = BaudRate; } - + WinLdrTerminalDelay = (10 * 1000 * 1000) / (BaudRate / 10) / 6; - + /* Sent an ANSI reset sequence to get the terminal up and running */ for (i = 0; i < strlen(AnsiReset); i++) { @@ -277,7 +277,7 @@ } } } - + /* Use a direction baudrate if one was given */ RedirectPort = strstr(BootOptions, "/redirectbaudrate="); if (RedirectPort) @@ -299,7 +299,7 @@ LoaderRedirectionInformation.BaudRate = 9600; } } - + /* Enable headless support if parameters were found */ if (LoaderRedirectionInformation.PortNumber) { @@ -307,7 +307,9 @@ { LoaderRedirectionInformation.BaudRate = 9600; } - + WinLdrInitializeHeadlessPort(); } } + +/* EOF */

11 years, 2 months

[hbelusca] 60672: [NTOS]: Moaaar s/tabs/spaces/

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Oct 14 20:38:02 2013 New Revision: 60672 URL: http://svn.reactos.org/svn/reactos?rev=60672&view=rev Log: [NTOS]: Moaaar s/tabs/spaces/ Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/ntoskrnl/include/internal/hdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/hdl.h [iso-8859-1] Mon Oct 14 20:38:02 2013 @@ -12,12 +12,12 @@ // // Define this if you want debugging support // -#define _HDL_DEBUG_ 0x00 +#define _HDL_DEBUG_ 0x00 // // These define the Debug Masks Supported // -#define HDL_XXX_DEBUG 0x01 +#define HDL_XXX_DEBUG 0x01 // // Debug/Tracing support @@ -38,26 +38,26 @@ // typedef enum _HEADLESS_LOG_MESSAGE { - HeadlessLogDriverLoad = 1, - HeadlessLogDriverSuccess, - HeadlessLogDriverFailed, - HeadlessLogEventFailed, - HeadlessLogObjectFailed, - HeadlessLogDirectoryFailed, - HeadlessLogPnpFailed, - HeadlessLogPnpFailed2, - HeadlessLogBootDriversFailed, - HeadlessLogNtdllFailed, - HeadlessLogSystemDriversFailed, - HeadlessLogReassignSystemRootFailed, - HeadlessLogProtectSystemRootFailed, - HeadlessLogConvertSystemRootFailed, - HeadlessLogConvertDeviceNameFailed, - HeadlessLogGroupOrderListFailed, - HeadlessLogGroupTableFailed - // - // There are more, but not applicable to ReactOS, I believe - // + HeadlessLogDriverLoad = 1, + HeadlessLogDriverSuccess, + HeadlessLogDriverFailed, + HeadlessLogEventFailed, + HeadlessLogObjectFailed, + HeadlessLogDirectoryFailed, + HeadlessLogPnpFailed, + HeadlessLogPnpFailed2, + HeadlessLogBootDriversFailed, + HeadlessLogNtdllFailed, + HeadlessLogSystemDriversFailed, + HeadlessLogReassignSystemRootFailed, + HeadlessLogProtectSystemRootFailed, + HeadlessLogConvertSystemRootFailed, + HeadlessLogConvertDeviceNameFailed, + HeadlessLogGroupOrderListFailed, + HeadlessLogGroupTableFailed + // + // There are more, but not applicable to ReactOS, I believe + // } HEADLESS_LOG_MESSAGE; // @@ -65,8 +65,8 @@ // typedef struct _HEADLESS_LOG_ENTRY { - SYSTEM_TIMEOFDAY_INFORMATION TimeOfEntry; - PWCHAR String; + SYSTEM_TIMEOFDAY_INFORMATION TimeOfEntry; + PWCHAR String; } HEADLESS_LOG_ENTRY, *PHEADLESS_LOG_ENTRY; // @@ -83,42 +83,42 @@ // typedef struct _HEADLESS_GLOBALS { - KSPIN_LOCK SpinLock; - HANDLE PageLockHandle; - PHEADLESS_LOG_ENTRY LogEntries; - PUCHAR TmpBuffer; - PUCHAR InputBuffer; + KSPIN_LOCK SpinLock; + HANDLE PageLockHandle; + PHEADLESS_LOG_ENTRY LogEntries; + PUCHAR TmpBuffer; + PUCHAR InputBuffer; PHEADLESS_CMD_SET_BLUE_SCREEN_DATA BlueScreenData; - union - { - struct - { - ULONG TerminalEnabled:1; - ULONG InBugCheck:1; - ULONG NewLogEntryAdded:1; - ULONG UsedBiosSettings:1; - ULONG InputProcessing:1; - ULONG InputLineDone:1; - ULONG ProcessingCmd:1; - ULONG TerminalParity:1; - ULONG TerminalStopBits:1; - ULONG TerminalPortNumber:3; - ULONG IsNonLegacyDevice:1; - }; - ULONG AllFlags; - }; - ULONG TerminalBaudRate; - ULONG TerminalPort; - PUCHAR TerminalPortAddress; - LARGE_INTEGER DelayTime; - ULONG MicroSecondsDelayTime; - UCHAR TerminalType; - SIZE_T InputBufferIndex; - USHORT LogEntryLast; - USHORT LogEntryStart; - GUID SystemGUID; - BOOLEAN IsMMIODevice; - BOOLEAN IsLastCharCR; + union + { + struct + { + ULONG TerminalEnabled:1; + ULONG InBugCheck:1; + ULONG NewLogEntryAdded:1; + ULONG UsedBiosSettings:1; + ULONG InputProcessing:1; + ULONG InputLineDone:1; + ULONG ProcessingCmd:1; + ULONG TerminalParity:1; + ULONG TerminalStopBits:1; + ULONG TerminalPortNumber:3; + ULONG IsNonLegacyDevice:1; + }; + ULONG AllFlags; + }; + ULONG TerminalBaudRate; + ULONG TerminalPort; + PUCHAR TerminalPortAddress; + LARGE_INTEGER DelayTime; + ULONG MicroSecondsDelayTime; + UCHAR TerminalType; + SIZE_T InputBufferIndex; + USHORT LogEntryLast; + USHORT LogEntryStart; + GUID SystemGUID; + BOOLEAN IsMMIODevice; + BOOLEAN IsLastCharCR; } HEADLESS_GLOBALS, *PHEADLESS_GLOBALS; // @@ -126,43 +126,43 @@ // typedef enum _HEADLESS_CMD { - HeadlessCmdEnableTerminal = 1, - HeadlessCmdCheckForReboot, - HeadlessCmdPutString, - HeadlessCmdClearDisplay, - HeadlessCmdClearToEndOfDisplay, - HeadlessCmdClearToEndOfLine, - HeadlessCmdDisplayAttributesOff, - HeadlessCmdDisplayInverseVideo, - HeadlessCmdSetColor, - HeadlessCmdPositionCursor, - HeadlessCmdTerminalPoll, - HeadlessCmdGetByte, - HeadlessCmdGetLine, - HeadlessCmdStartBugCheck, - HeadlessCmdDoBugCheckProcessing, - HeadlessCmdQueryInformation, - HeadlessCmdAddLogEntry, - HeadlessCmdDisplayLog, - HeadlessCmdSetBlueScreenData, - HeadlessCmdSendBlueScreenData, - HeadlessCmdQueryGUID, - HeadlessCmdPutData + HeadlessCmdEnableTerminal = 1, + HeadlessCmdCheckForReboot, + HeadlessCmdPutString, + HeadlessCmdClearDisplay, + HeadlessCmdClearToEndOfDisplay, + HeadlessCmdClearToEndOfLine, + HeadlessCmdDisplayAttributesOff, + HeadlessCmdDisplayInverseVideo, + HeadlessCmdSetColor, + HeadlessCmdPositionCursor, + HeadlessCmdTerminalPoll, + HeadlessCmdGetByte, + HeadlessCmdGetLine, + HeadlessCmdStartBugCheck, + HeadlessCmdDoBugCheckProcessing, + HeadlessCmdQueryInformation, + HeadlessCmdAddLogEntry, + HeadlessCmdDisplayLog, + HeadlessCmdSetBlueScreenData, + HeadlessCmdSendBlueScreenData, + HeadlessCmdQueryGUID, + HeadlessCmdPutData } HEADLESS_CMD, *PHEADLESS_CMD; typedef enum _HEADLESS_TERM_PORT_TYPE { - HeadlessUndefinedPortType = 0, - HeadlessSerialPort + HeadlessUndefinedPortType = 0, + HeadlessSerialPort } HEADLESS_TERM_PORT_TYPE, *PHEADLESS_TERM_PORT_TYPE; typedef enum _HEADLESS_TERM_SERIAL_PORT { - SerialPortUndefined = 0, - ComPort1, - ComPort2, - ComPort3, - ComPort4 + SerialPortUndefined = 0, + ComPort1, + ComPort2, + ComPort3, + ComPort4 } HEADLESS_TERM_SERIAL_PORT, *PHEADLESS_TERM_SERIAL_PORT; typedef struct _HEADLESS_RSP_QUERY_INFO @@ -189,7 +189,7 @@ typedef struct _HEADLESS_CMD_PUT_STRING { - UCHAR String[1]; + UCHAR String[1]; } HEADLESS_CMD_PUT_STRING, *PHEADLESS_CMD_PUT_STRING; typedef struct _HEADLESS_RSP_GET_BYTE @@ -200,11 +200,11 @@ NTSTATUS NTAPI HeadlessDispatch( - IN HEADLESS_CMD Command, - IN PVOID InputBuffer, - IN SIZE_T InputBufferSize, - OUT PVOID OutputBuffer, - OUT PSIZE_T OutputBufferSize + IN HEADLESS_CMD Command, + IN PVOID InputBuffer, + IN SIZE_T InputBufferSize, + OUT PVOID OutputBuffer, + OUT PSIZE_T OutputBufferSize ); // Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Mon Oct 14 20:38:02 2013 @@ -76,35 +76,35 @@ InbvIndicateProgress( VOID ); - + VOID NTAPI InbvPortEnableFifo( - IN ULONG PortId, - IN BOOLEAN Enable + IN ULONG PortId, + IN BOOLEAN Enable ); VOID NTAPI InbvPortPutByte( - IN ULONG PortId, - IN BOOLEAN Output + IN ULONG PortId, + IN BOOLEAN Output ); VOID NTAPI InbvPortTerminate( - IN ULONG PortId + IN ULONG PortId ); BOOLEAN NTAPI InbvPortInitialize( - IN ULONG BaudRate, - IN ULONG PortNumber, - IN PUCHAR PortAddress, - OUT PULONG PortId, - IN BOOLEAN IsMMIODevice + IN ULONG BaudRate, + IN ULONG PortNumber, + IN PUCHAR PortAddress, + OUT PULONG PortId, + IN BOOLEAN IsMMIODevice ); BOOLEAN

11 years, 2 months

← Newer
1
...
11
12
13
14
15
16
17
...
33
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 October 2013