Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[hbelusca] 59682: Fix formatting, no code changes.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 18:55:35 2013 New Revision: 59682 URL: http://svn.reactos.org/svn/reactos?rev=59682&view=rev Log: Fix formatting, no code changes. Modified: branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/ps2.h branches/ntvdm/subsystems/ntvdm/timer.h branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -120,4 +120,6 @@ BYTE FillAttribute ); -#endif +#endif // _BIOS_H_ + +/* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -133,7 +133,6 @@ VOID DosBreakInterrupt(LPWORD Stack); BOOLEAN DosInitialize(VOID); -#endif +#endif // _DOS_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -184,7 +184,6 @@ VOID EmulatorCleanup(); VOID EmulatorSetA20(BOOLEAN Enabled); -#endif +#endif // _EMULATOR_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -35,6 +35,6 @@ VOID DisplayMessage(LPCWSTR Format, ...); -#endif +#endif // _NTVDM_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -52,6 +52,6 @@ VOID PicWriteData(BYTE Port, BYTE Value); VOID PicInterruptRequest(BYTE Number); -#endif +#endif // _PIC_H_ /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -30,4 +30,6 @@ VOID KeyboardWriteData(BYTE Data); VOID CheckForInputEvents(); -#endif +#endif // _PS2_H_ + +/* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/timer.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -50,7 +50,6 @@ VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); -#endif +#endif // _TIMER_H_ /* EOF */ - Modified: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.h [iso-8859-1] Fri Aug 9 18:55:35 2013 @@ -195,6 +195,6 @@ VOID VgaWritePort(WORD Port, BYTE Data); VOID VgaInitialize(HANDLE TextHandle); -#endif +#endif // _VGA_H_ /* EOF */

11 years, 4 months

[hbelusca] 59681: [NTVDM] Simplify code.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 14:01:43 2013 New Revision: 59681 URL: http://svn.reactos.org/svn/reactos?rev=59681&view=rev Log: [NTVDM] Simplify code. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Aug 9 14:01:43 2013 @@ -569,7 +569,7 @@ COORD VgaGetDisplayResolution(VOID) { COORD Resolution; - BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); + BYTE MaximumScanLine = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); /* The low 8 bits are in the display registers */ Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; @@ -597,15 +597,10 @@ /* The horizontal resolution is halved in 8-bit mode */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) Resolution.X /= 2; - - /* Divide the vertical resolution by the maximum scan line */ - Resolution.Y /= ((DWORD)VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F) + 1; - } - else - { - /* Divide the number of scanlines by the font size */ - Resolution.Y /= TextSize; - } + } + + /* Divide the vertical resolution by the maximum scan line (== font size in text mode) */ + Resolution.Y /= MaximumScanLine; /* Return the resolution */ return Resolution;

11 years, 4 months

[aandrejevic] 59680: Fix one file that wasn't merged correctly.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Aug 9 13:33:17 2013 New Revision: 59680 URL: http://svn.reactos.org/svn/reactos?rev=59680&view=rev Log: Fix one file that wasn't merged correctly. Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… ============================================================================== --- branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ branches/ntvdm/dll/win32/kernel32/client/proc.c [iso-8859-1] Fri Aug 9 13:33:17 2013 @@ -49,7 +49,6 @@ RegisterWaitForInputIdle(WaitForInputIdleType lpfnRegisterWaitForInputIdle); #define CMD_STRING L"cmd /c " -#define NTVDM_STRING L"\\ntvdm.exe" /* FUNCTIONS ****************************************************************/ @@ -2327,7 +2326,6 @@ ANSI_STRING AnsiEnv; UNICODE_STRING UnicodeEnv, PathName; BOOLEAN SearchRetry, QuotesNeeded, CmdLineIsAppName, HasQuotes; - WCHAR VdmPath[MAX_PATH]; // // Variables used for Fusion/SxS (Side-by-Side Assemblies)

11 years, 4 months

[aandrejevic] 59679: Sync with trunk.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Aug 9 13:26:07 2013 New Revision: 59679 URL: http://svn.reactos.org/svn/reactos?rev=59679&view=rev Log: Sync with trunk. Added: branches/ntvdm/base/applications/rapps/lang/zh-TW.rc - copied unchanged from r59678, trunk/reactos/base/applications/rapps/lang/zh-TW.rc branches/ntvdm/dll/win32/kernel32/client/file/disk.c - copied unchanged from r59678, trunk/reactos/dll/win32/kernel32/client/file/disk.c branches/ntvdm/dll/win32/kernel32/client/file/mntpoint.c - copied unchanged from r59678, trunk/reactos/dll/win32/kernel32/client/file/mntpoint.c branches/ntvdm/drivers/sac/CMakeLists.txt - copied unchanged from r59678, trunk/reactos/drivers/sac/CMakeLists.txt branches/ntvdm/drivers/sac/driver/CMakeLists.txt - copied unchanged from r59678, trunk/reactos/drivers/sac/driver/CMakeLists.txt Removed: branches/ntvdm/cmake/Platform/Windows-cl.cmake Modified: branches/ntvdm/ (props changed) branches/ntvdm/base/applications/rapps/lang/zh-CN.rc branches/ntvdm/base/applications/rapps/rapps/mpc.txt branches/ntvdm/base/applications/rapps/rsrc.rc branches/ntvdm/boot/bootdata/hivesys.inf branches/ntvdm/boot/bootdata/txtsetup.sif branches/ntvdm/dll/win32/kernel32/CMakeLists.txt branches/ntvdm/dll/win32/kernel32/client/file/volume.c branches/ntvdm/dll/win32/kernel32/client/path.c branches/ntvdm/dll/win32/kernel32/client/proc.c branches/ntvdm/dll/win32/kernel32/client/vdm.c branches/ntvdm/dll/win32/kernel32/include/kernel32.h branches/ntvdm/dll/win32/syssetup/classinst.c branches/ntvdm/dll/win32/syssetup/syssetup.spec branches/ntvdm/drivers/CMakeLists.txt branches/ntvdm/drivers/hid/hidparse/ (props changed) branches/ntvdm/drivers/hid/hidusb/ (props changed) branches/ntvdm/drivers/sac/driver/chanmgr.c branches/ntvdm/drivers/sac/driver/channel.c branches/ntvdm/drivers/sac/driver/concmd.c branches/ntvdm/drivers/sac/driver/conmgr.c branches/ntvdm/drivers/sac/driver/data.c branches/ntvdm/drivers/sac/driver/dispatch.c branches/ntvdm/drivers/sac/driver/init.c branches/ntvdm/drivers/sac/driver/memory.c branches/ntvdm/drivers/sac/driver/rawchan.c branches/ntvdm/drivers/sac/driver/sacdrv.h branches/ntvdm/drivers/sac/driver/sacdrv.rc branches/ntvdm/drivers/sac/driver/util.c branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbohci/ (props changed) branches/ntvdm/include/crt/sec_api/time_s.h branches/ntvdm/include/crt/sec_api/wchar_s.h branches/ntvdm/include/crt/time.h branches/ntvdm/include/ndk/iotypes.h branches/ntvdm/include/ndk/pstypes.h branches/ntvdm/include/psdk/wincrypt.h branches/ntvdm/include/psdk/wininet.h branches/ntvdm/include/reactos/mc/CMakeLists.txt branches/ntvdm/include/reactos/mc/sacmsg.mc branches/ntvdm/lib/drivers/libusb/common_interfaces.h (props changed) branches/ntvdm/lib/drivers/libusb/hcd_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.cpp (props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (props changed) branches/ntvdm/lib/drivers/libusb/memory_manager.cpp (props changed) branches/ntvdm/lib/drivers/libusb/misc.cpp (props changed) branches/ntvdm/lib/drivers/libusb/purecall.cpp (props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (props changed) branches/ntvdm/ntoskrnl/io/iomgr/iorsrce.c branches/ntvdm/ntoskrnl/io/pnpmgr/pnpmgr.c branches/ntvdm/ntoskrnl/ps/process.c branches/ntvdm/win32ss/user/winsrv/consrv/condrv/console.c branches/ntvdm/win32ss/user/winsrv/consrv/console.c branches/ntvdm/win32ss/user/winsrv/consrv/handle.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/l… Modified: branches/ntvdm/base/applications/rapps/rapps/mpc.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/base/applications/rapps/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/r… Modified: branches/ntvdm/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/bootdata/hivesys.inf… Modified: branches/ntvdm/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/bootdata/txtsetup.si… Removed: branches/ntvdm/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/Platform/Windows-cl… Modified: branches/ntvdm/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/CMakeL… Modified: branches/ntvdm/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/path.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/includ… Modified: branches/ntvdm/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/syssetup/classi… Modified: branches/ntvdm/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/syssetup/sysset… Modified: branches/ntvdm/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/CMakeLists.txt?re… Modified: branches/ntvdm/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/chanmg… Modified: branches/ntvdm/drivers/sac/driver/channel.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/channe… Modified: branches/ntvdm/drivers/sac/driver/concmd.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/concmd… Modified: branches/ntvdm/drivers/sac/driver/conmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/conmgr… Modified: branches/ntvdm/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/data.c… Modified: branches/ntvdm/drivers/sac/driver/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/dispat… Modified: branches/ntvdm/drivers/sac/driver/init.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/init.c… Modified: branches/ntvdm/drivers/sac/driver/memory.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/memory… Modified: branches/ntvdm/drivers/sac/driver/rawchan.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/rawcha… Modified: branches/ntvdm/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/sacdrv… Modified: branches/ntvdm/drivers/sac/driver/sacdrv.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/sacdrv… Modified: branches/ntvdm/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/sac/driver/util.c… Modified: branches/ntvdm/include/crt/sec_api/time_s.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/sec_api/time_… Modified: branches/ntvdm/include/crt/sec_api/wchar_s.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/sec_api/wchar… Modified: branches/ntvdm/include/crt/time.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/time.h?rev=59… Modified: branches/ntvdm/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ndk/iotypes.h?rev… Modified: branches/ntvdm/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ndk/pstypes.h?rev… Modified: branches/ntvdm/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/wincrypt.h?r… Modified: branches/ntvdm/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/wininet.h?re… Modified: branches/ntvdm/include/reactos/mc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/mc/CMakeL… Modified: branches/ntvdm/include/reactos/mc/sacmsg.mc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/mc/sacmsg… Modified: branches/ntvdm/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/io/iomgr/iorsrce… Modified: branches/ntvdm/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/io/pnpmgr/pnpmgr… Modified: branches/ntvdm/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ps/process.c?rev… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/condrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/console.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr… Modified: branches/ntvdm/win32ss/user/winsrv/consrv/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr…

11 years, 4 months

[aandrejevic] 59678: [NTVDM] - Enable TESTING by default until the correct way to load ntvdm is found. - Calculate the character height instead of hardcoding in the BDA.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Aug 9 13:14:56 2013 New Revision: 59678 URL: http://svn.reactos.org/svn/reactos?rev=59678&view=rev Log: [NTVDM] - Enable TESTING by default until the correct way to load ntvdm is found. - Calculate the character height instead of hardcoding in the BDA. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Aug 9 13:14:56 2013 @@ -306,7 +306,10 @@ Bda->VideoPage = 0; Bda->VideoPageSize = BIOS_PAGE_SIZE; Bda->VideoPageOffset = 0; - Bda->CharacterHeight = 16; + + /* Get the character height */ + VgaWritePort(VGA_CRTC_INDEX, VGA_CRTC_MAX_SCAN_LINE_REG); + Bda->CharacterHeight = 1 + (VgaReadPort(VGA_CRTC_DATA) & 0x1F); Resolution = VgaGetDisplayResolution(); Bda->ScreenColumns = Resolution.X; Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Aug 9 13:14:56 2013 @@ -23,7 +23,7 @@ * Activate this line if you want to be able to test NTVDM with: * ntvdm.exe <program> */ -// #define TESTING +#define TESTING /* PUBLIC VARIABLES ***********************************************************/

11 years, 4 months

[hbelusca] 59677: [NTVDM] Implement INT 10h, function 04h (Query Light Pen) (deprecated)

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 13:06:01 2013 New Revision: 59677 URL: http://svn.reactos.org/svn/reactos?rev=59677&view=rev Log: [NTVDM] Implement INT 10h, function 04h (Query Light Pen) (deprecated) Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Aug 9 13:06:01 2013 @@ -667,6 +667,17 @@ break; } + /* Query Light Pen */ + case 0x04: + { + /* + * On modern BIOSes, this function returns 0 + * so that we can ignore the other registers. + */ + EmulatorSetRegister(EMULATOR_REG_AX, 0); + break; + } + /* Select Active Display Page */ case 0x05: {

11 years, 4 months

[hbelusca] 59676: Fix the fix.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 11:55:31 2013 New Revision: 59676 URL: http://svn.reactos.org/svn/reactos?rev=59676&view=rev Log: Fix the fix. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Aug 9 11:55:31 2013 @@ -408,8 +408,8 @@ VgaInitialize(BiosConsoleOutput); /* Update the cursor position */ - BiosSetCursorPosition(BiosSavedBufferInfo.dwCursorPosition.X, - BiosSavedBufferInfo.dwCursorPosition.Y, + BiosSetCursorPosition(BiosSavedBufferInfo.dwCursorPosition.Y, + BiosSavedBufferInfo.dwCursorPosition.X, 0); /* Set the console input mode */

11 years, 4 months

[hbelusca] 59675: [NTVDM] Fix cursor position.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 11:41:13 2013 New Revision: 59675 URL: http://svn.reactos.org/svn/reactos?rev=59675&view=rev Log: [NTVDM] Fix cursor position. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Aug 9 11:41:13 2013 @@ -408,7 +408,7 @@ VgaInitialize(BiosConsoleOutput); /* Update the cursor position */ - BiosSetCursorPosition(BiosSavedBufferInfo.dwCursorPosition.Y, + BiosSetCursorPosition(BiosSavedBufferInfo.dwCursorPosition.X, BiosSavedBufferInfo.dwCursorPosition.Y, 0);

11 years, 4 months

[aandrejevic] 59674: [NTVDM] Calculate the text height instead of using a hardcoded value.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Aug 9 09:24:40 2013 New Revision: 59674 URL: http://svn.reactos.org/svn/reactos?rev=59674&view=rev Log: [NTVDM] Calculate the text height instead of using a hardcoded value. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Aug 9 09:24:40 2013 @@ -569,6 +569,7 @@ COORD VgaGetDisplayResolution(VOID) { COORD Resolution; + BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); /* The low 8 bits are in the display registers */ Resolution.X = VgaCrtcRegisters[VGA_CRTC_END_HORZ_DISP_REG]; @@ -603,7 +604,7 @@ else { /* Divide the number of scanlines by the font size */ - Resolution.Y /= 16; + Resolution.Y /= TextSize; } /* Return the resolution */

11 years, 4 months

[hbelusca] 59673: [NTVDM] - Fix usage of the console framebuffer mutex (used only with graphics screen buffers). - Do not check for text/graphics mode when updating each scan line, in VgaUpdateFram...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Aug 9 00:13:54 2013 New Revision: 59673 URL: http://svn.reactos.org/svn/reactos?rev=59673&view=rev Log: [NTVDM] - Fix usage of the console framebuffer mutex (used only with graphics screen buffers). - Do not check for text/graphics mode when updating each scan line, in VgaUpdateFramebuffer. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Fri Aug 9 00:13:54 2013 @@ -265,11 +265,15 @@ static VOID VgaLeaveGraphicsMode(VOID) { + /* Release the console framebuffer mutex if needed */ + ReleaseMutex(ConsoleMutex); + /* Switch back to the text buffer */ SetConsoleActiveScreenBuffer(TextConsoleBuffer); /* Cleanup the video data */ CloseHandle(ConsoleMutex); + ConsoleMutex = NULL; CloseHandle(GraphicsConsoleBuffer); GraphicsConsoleBuffer = NULL; } @@ -350,17 +354,22 @@ DWORD Address = (VgaCrtcRegisters[VGA_CRTC_START_ADDR_HIGH_REG] << 8) + VgaCrtcRegisters[VGA_CRTC_START_ADDR_LOW_REG]; DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; - PCHAR_INFO CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; - PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; - - /* Loop through the scanlines */ - for (i = 0; i < Resolution.Y; i++) - { - /* Check if this is text mode or graphics mode */ - if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) - { - /* Graphics mode */ - + + /* Check if this is text mode or graphics mode */ + if (VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA) + { + /* Graphics mode */ + PBYTE GraphicsBuffer = (PBYTE)ConsoleFramebuffer; + + /* + * Synchronize access to the graphics framebuffer + * with the console framebuffer mutex. + */ + WaitForSingleObject(ConsoleMutex, INFINITE); + + /* Loop through the scanlines */ + for (i = 0; i < Resolution.Y; i++) + { /* Loop through the pixels */ for (j = 0; j < Resolution.X; j++) { @@ -460,11 +469,25 @@ VgaMarkForUpdate(i, j); } } - } - else - { - /* Text mode */ - + + /* Move to the next scanline */ + Address += ScanlineSize; + } + + /* + * Release the console framebuffer mutex + * so that we allow for repainting. + */ + ReleaseMutex(ConsoleMutex); + } + else + { + /* Text mode */ + PCHAR_INFO CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; + + /* Loop through the scanlines */ + for (i = 0; i < Resolution.Y; i++) + { /* Loop through the characters */ for (j = 0; j < Resolution.X; j++) { @@ -488,10 +511,10 @@ VgaMarkForUpdate(i, j); } } - } - - /* Move to the next scanline */ - Address += ScanlineSize; + + /* Move to the next scanline */ + Address += ScanlineSize; + } } }

11 years, 4 months

← Newer
1
...
23
24
25
26
27
28
29
...
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 August 2013