Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[spetreolle] 69437: Fix 0x%lu specifier in our skeleton service and its only user tcpsvcs.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Oct 3 22:38:05 2015 New Revision: 69437 URL: http://svn.reactos.org/svn/reactos?rev=69437&view=rev Log: Fix 0x%lu specifier in our skeleton service and its only user tcpsvcs. Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c trunk/rosapps/templates/skel_service/ServiceMain.c Modified: trunk/reactos/base/services/tcpsvcs/tcpsvcs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/tcps… ============================================================================== --- trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] (original) +++ trunk/reactos/base/services/tcpsvcs/tcpsvcs.c [iso-8859-1] Sat Oct 3 22:38:05 2015 @@ -50,7 +50,7 @@ _snwprintf(szSet, 49, - L"Service state 0x%lu, CheckPoint %lu", + L"Service state 0x%lx, CheckPoint %lu", pServInfo->servStatus.dwCurrentState, pServInfo->servStatus.dwCheckPoint); LogEvent(szSet, 0, 0, LOG_FILE); Modified: trunk/rosapps/templates/skel_service/ServiceMain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/skel_service/Ser… ============================================================================== --- trunk/rosapps/templates/skel_service/ServiceMain.c [iso-8859-1] (original) +++ trunk/rosapps/templates/skel_service/ServiceMain.c [iso-8859-1] Sat Oct 3 22:38:05 2015 @@ -54,7 +54,7 @@ _sntprintf(szSet, 49, - _T("Service state 0x%lu, CheckPoint %lu"), + _T("Service state 0x%lx, CheckPoint %lu"), pServInfo->servStatus.dwCurrentState, pServInfo->servStatus.dwCheckPoint); LogEvent(szSet, 0, 0, LOG_FILE);

8 years, 11 months

[spetreolle] 69436: [ROSTESTS] Fix 0x%lu specifier. Add cmake file for notificationtest.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Oct 3 22:21:19 2015 New Revision: 69436 URL: http://svn.reactos.org/svn/reactos?rev=69436&view=rev Log: [ROSTESTS] Fix 0x%lu specifier. Add cmake file for notificationtest. Added: trunk/rostests/win32/CMakeLists.txt (with props) Modified: trunk/rostests/tests/apc/apc.c trunk/rostests/tests/subclass/subclass.c trunk/rostests/win32/kernel32/queuetest/queuetest.c Modified: trunk/rostests/tests/apc/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/apc/apc.c?rev=69436… ============================================================================== --- trunk/rostests/tests/apc/apc.c [iso-8859-1] (original) +++ trunk/rostests/tests/apc/apc.c [iso-8859-1] Sat Oct 3 22:21:19 2015 @@ -63,7 +63,7 @@ if (FileHandle == INVALID_HANDLE_VALUE) { - printf("Open failed last err 0x%lu\n",GetLastError()); + printf("Open failed last err 0x%lx\n",GetLastError()); return 0; } @@ -82,7 +82,7 @@ if (!NT_SUCCESS(Status)) { - printf("Read failed status 0x%lu\n",Status); + printf("Read failed status 0x%lx\n",Status); } printf("Waiting\n"); WaitForSingleObjectEx(EventHandle, INFINITE, TRUE); Modified: trunk/rostests/tests/subclass/subclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/subclass/subclass.c… ============================================================================== --- trunk/rostests/tests/subclass/subclass.c [iso-8859-1] (original) +++ trunk/rostests/tests/subclass/subclass.c [iso-8859-1] Sat Oct 3 22:21:19 2015 @@ -31,7 +31,7 @@ wc.cbWndExtra = 0; if (RegisterClassW(&wc) == 0) { - fprintf(stderr, "RegisterClassW failed (last error 0x%lu)\n", + fprintf(stderr, "RegisterClassW failed (last error 0x%lx)\n", GetLastError()); return 1; } @@ -50,7 +50,7 @@ NULL); if (hWnd == NULL) { - fprintf(stderr, "CreateWindowA failed (last error 0x%lu)\n", + fprintf(stderr, "CreateWindowA failed (last error 0x%lx)\n", GetLastError()); return 1; } @@ -60,7 +60,7 @@ printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lx)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); @@ -68,7 +68,7 @@ printf("Calling GetWindowTextA\n"); if (! GetWindowTextA(hWnd, WindowTextA, sizeof(WindowTextA) / sizeof(WindowTextA[0]))) { - fprintf(stderr, "GetWindowTextA failed (last error 0x%lu)\n", GetLastError()); + fprintf(stderr, "GetWindowTextA failed (last error 0x%lx)\n", GetLastError()); return 1; } printf("GetWindowTextA returned Ansi string \"%s\"\n", WindowTextA); @@ -89,7 +89,7 @@ printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lx)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); @@ -104,7 +104,7 @@ printf("Calling GetWindowTextW\n"); if (! GetWindowTextW(hWnd, WindowTextW, sizeof(WindowTextW) / sizeof(WindowTextW[0]))) { - fprintf(stderr, "GetWindowTextW failed (last error 0x%lu)\n", GetLastError()); + fprintf(stderr, "GetWindowTextW failed (last error 0x%lx)\n", GetLastError()); return 1; } printf("GetWindowTextW returned Unicode string \"%S\"\n", WindowTextW); Added: trunk/rostests/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/CMakeLists.txt?rev=… ============================================================================== --- trunk/rostests/win32/CMakeLists.txt (added) +++ trunk/rostests/win32/CMakeLists.txt [iso-8859-1] Sat Oct 3 22:21:19 2015 @@ -0,0 +1 @@ +add_subdirectory(kernel32) Propchange: trunk/rostests/win32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/win32/CMakeLists.txt ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/rostests/win32/kernel32/queuetest/queuetest.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/kernel32/queuetest/… ============================================================================== --- trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] (original) +++ trunk/rostests/win32/kernel32/queuetest/queuetest.c [iso-8859-1] Sat Oct 3 22:21:19 2015 @@ -15,7 +15,7 @@ #define TestProc(n) \ DWORD CALLBACK TestProc##n(void *ctx)\ {\ - printf("TestProc%d thread 0x%lu context 0x%p\n", n, GetCurrentThreadId(), ctx);\ + printf("TestProc%d thread 0x%lx context 0x%p\n", n, GetCurrentThreadId(), ctx);\ return 0;\ }

8 years, 11 months

[akhaldi] 69435: [NTVDM] Improve the PCH situation.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 3 21:47:46 2015 New Revision: 69435 URL: http://svn.reactos.org/svn/reactos?rev=69435&view=rev Log: [NTVDM] Improve the PCH situation. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/clock.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h trunk/reactos/subsystems/mvdm/ntvdm/int32.c trunk/reactos/subsystems/mvdm/ntvdm/int32.h trunk/reactos/subsystems/mvdm/ntvdm/io.c trunk/reactos/subsystems/mvdm/ntvdm/io.h trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h trunk/reactos/subsystems/mvdm/ntvdm/utils.c trunk/reactos/subsystems/mvdm/ntvdm/utils.h trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,24 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/callback.h" -#include "cpu/bop.h" - -#include "bios.h" -#include "bios32/bios32.h" -#include "rom.h" -#include "umamgr.h" - -#include "io.h" -#include "hardware/cmos.h" #include <stdlib.h> Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,11 +8,6 @@ #ifndef _BIOS_H_ #define _BIOS_H_ - -/* INCLUDES *******************************************************************/ - -#include "kbdbios.h" -#include "vidbios.h" /* DEFINES ********************************************************************/ @@ -165,6 +160,4 @@ VOID BiosCleanup(VOID); -#endif // _BIOS_H_ - -/* EOF */ +#endif /* _BIOS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,38 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" - -/* BIOS Version number and Copyright */ -#include <reactos/buildno.h> -#include <reactos/version.h> #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/cpu.h" // for EMULATOR_FLAG_CF -#include "cpu/bop.h" -#include "int32.h" -#include <isvbop.h> - -#include <bios/bios.h> -#include <bios/rom.h> -#include "bios32.h" -#include "bios32p.h" -#include "dskbios32.h" -#include "kbdbios32.h" -#include "vidbios32.h" -#include "moubios32.h" - -#include "memory.h" -#include "io.h" -#include "hardware/cmos.h" -#include "hardware/pic.h" -#include "hardware/pit.h" -#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ @@ -165,7 +137,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static VOID BiosCharPrint(CHAR Character) +static VOID Bios32CharPrint(CHAR Character) { /* Save AX and BX */ USHORT AX = getAX(); @@ -534,7 +506,7 @@ static VOID WINAPI BiosRomBasic(LPWORD Stack) { - PrintMessageAnsi(BiosCharPrint, "FATAL: INT18: BOOT FAILURE."); + PrintMessageAnsi(Bios32CharPrint, "FATAL: INT18: BOOT FAILURE."); /* ROM Basic is unsupported, display a message to the user */ DisplayMessage(L"NTVDM doesn't support ROM Basic. The VDM is closing."); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@ #ifndef _BIOS32_H_ #define _BIOS32_H_ - -/* INCLUDES *******************************************************************/ - -// #include <bios/bios.h> /* DEFINES ********************************************************************/ @@ -41,6 +37,4 @@ BOOLEAN Bios32Initialize(VOID); VOID Bios32Cleanup(VOID); -#endif // _BIOS32_H_ - -/* EOF */ +#endif /* _BIOS32_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32p.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,12 +8,6 @@ #ifndef _BIOS32P_H_ #define _BIOS32P_H_ - -/* INCLUDES *******************************************************************/ - -#include <bios/bios.h> - -/**/ #include "int32.h" /**/ /* DEFINES ********************************************************************/ @@ -42,6 +36,4 @@ VOID EnableHwIRQ(UCHAR hwirq, EMULATOR_INT32_PROC func); VOID PicIRQComplete(BYTE IntNum); -#endif // _BIOS32P_H_ - -/* EOF */ +#endif /* _BIOS32P_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,25 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -// #include "../../memory.h" -// #include "cpu/bop.h" -#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF -#include "int32.h" - -#include "dskbios32.h" -// #include <bios/dskbios.h> -#include "bios32p.h" - -#include "hardware/disk.h" - /* DEFINES ********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,5 +21,3 @@ VOID DiskBios32Cleanup(VOID); #endif /* _DSKBIOS32_H_ */ - -/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,21 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "kbdbios32.h" -#include <bios/kbdbios.h> -#include "bios32p.h" - -#include "int32.h" -#include "cpu/cpu.h" // for EMULATOR_FLAG_ZF -#include "io.h" -#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -39,5 +39,3 @@ VOID KbdBios32Post(VOID); #endif /* _KBDBIOS32_H_ */ - -/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -9,22 +9,10 @@ * NOTE: Based from VirtualBox OSE ROM BIOS, and SeaBIOS. */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/cpu.h" // for EMULATOR_FLAG_CF - -#include "moubios32.h" -#include "bios32p.h" - -#include "io.h" -#include "hardware/mouse.h" -#include "hardware/ps2.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -20,5 +20,3 @@ VOID MouseBios32Cleanup(VOID); #endif /* _MOUBIOS32_H_ */ - -/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/cpu.h" - -#include "vbe.h" - -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,8 +8,6 @@ #ifndef _VBE_H_ #define _VBE_H_ - -#include "hardware/video/svga.h" /* DEFINITIONS ****************************************************************/ @@ -105,4 +103,4 @@ VOID WINAPI VbeService(LPWORD Stack); BOOLEAN VbeInitialize(VOID); -#endif // _VBE_H_ +#endif /* _VBE_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,20 +8,10 @@ * NOTE: All of the real code is in bios/vidbios.c */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/bop.h" -#include "int32.h" - -#include "vidbios32.h" -#include <bios/vidbios.h> -#include "bios32p.h" /* DEFINES ********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,5 +21,3 @@ VOID VidBios32Cleanup(VOID); #endif /* _VIDBIOS32_H_ */ - -/* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/bop.h" -#include "int32.h" - -#include "bios.h" -// #include "kbdbios.h" /* DEFINES ********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -20,6 +20,4 @@ BOOLEAN KbdBiosInitialize(VOID); VOID KbdBiosCleanup(VOID); -#endif // _KBDBIOS_H_ - -/* EOF */ +#endif /* _KBDBIOS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "memory.h" -#include "cpu/callback.h" -#include "rom.h" - -#include "utils.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -43,6 +43,4 @@ VOID SearchAndInitRoms(IN PCALLBACK16 Context); -#endif // _ROM_H_ - -/* EOF */ +#endif /* _ROM_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -9,17 +9,10 @@ * indirectly by the DOS EMS Driver, and by VDD memory management functions. */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "memory.h" - -#include "umamgr.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -29,6 +29,4 @@ BOOLEAN UmaMgrInitialize(VOID); VOID UmaMgrCleanup(VOID); -#endif // _UMAMGR_H_ - -/* EOF */ +#endif /* _UMAMGR_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,31 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -/* BIOS Version number and Copyright */ -#include <reactos/buildno.h> -#include <reactos/version.h> - -#include "emulator.h" -#include "cpu/cpu.h" -#include "cpu/bop.h" -#include "memory.h" - -#include "bios.h" -#include "bios32/bios32p.h" -#include "rom.h" -#include "bios32/vbe.h" -// #include "vidbios.h" -#include "bios32/vidbios32.h" - -#include "io.h" -#include "hardware/video/svga.h" /* MACROS *********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -113,6 +113,4 @@ BOOLEAN VidBiosInitialize(VOID); VOID VidBiosCleanup(VOID); -#endif // _VIDBIOS_H_ - -/* EOF */ +#endif /* _VIDBIOS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,22 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "clock.h" - -#include "cpu/cpu.h" -#include "hardware/cmos.h" -#include "hardware/ps2.h" -#include "hardware/pit.h" -#include "hardware/video/svga.h" -#include "hardware/mouse.h" /* DEFINES ********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -50,6 +50,4 @@ VOID ClockUpdate(VOID); BOOLEAN ClockInitialize(VOID); -#endif // _CLOCK_H_ - -/* EOF */ +#endif /* _CLOCK_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,15 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "bop.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -23,6 +23,4 @@ VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler); VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); -#endif // _BOP_H_ - -/* EOF */ +#endif /* _BOP_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -15,19 +15,10 @@ | with the CPU registers is 100% prone to bugs!! \******************************************************************************/ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "callback.h" - -#include "cpu.h" -#include "bop.h" -#include <isvbop.h> /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -58,6 +58,4 @@ IN SIZE_T CallbackSize, OUT PSIZE_T CodeSize OPTIONAL); -#endif // _CALLBACK_H_ - -/* EOF */ +#endif /* _CALLBACK_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,33 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu.h" - -#include "memory.h" -#include "callback.h" -#include "bop.h" -#include <isvbop.h> - -#include "clock.h" -#include "bios/rom.h" -#include "hardware/cmos.h" -#include "hardware/keyboard.h" -#include "hardware/mouse.h" -#include "hardware/pic.h" -#include "hardware/ps2.h" -#include "hardware/sound/speaker.h" -#include "hardware/pit.h" -#include "hardware/video/svga.h" - -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@ #ifndef _CPU_H_ #define _CPU_H_ - -/* INCLUDES *******************************************************************/ - -#include <fast486.h> /* DEFINES ********************************************************************/ @@ -74,6 +70,4 @@ BOOLEAN CpuInitialize(VOID); VOID CpuCleanup(VOID); -#endif // _CPU_H_ - -/* EOF */ +#endif /* _CPU_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,11 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> -#include "emulator.h" -#include "cpu.h" #include "x86context.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -116,6 +116,4 @@ #endif -#endif // _REGISTERS_H_ - -/* EOF */ +#endif /* _REGISTERS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/x86context.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -134,6 +134,4 @@ } X86CONTEXT; #include "poppack.h" -#endif // __X86CONTEXT_H__ - -/* EOF */ +#endif /* __X86CONTEXT_H__ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -10,29 +10,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include <isvbop.h> - -#include "utils.h" - -#include "dem.h" -#include "dos/dos32krnl/device.h" -#include "dos/dos32krnl/memory.h" -#include "dos/dos32krnl/process.h" -#include "cpu/bop.h" -#include "cpu/cpu.h" - -#include "bios/bios.h" -#include "mouse32.h" - -#include "vddsup.h" /* * EXPERIMENTAL! Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -12,10 +12,6 @@ #ifndef _DEM_H_ #define _DEM_H_ - -/* INCLUDES *******************************************************************/ - -#include "dos32krnl/dos.h" /* DEFINES ********************************************************************/ @@ -101,6 +97,4 @@ OUT PUCHAR DriveNumber ); -#endif // _DEM_H_ - -/* EOF */ +#endif /* _DEM_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,22 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "int32.h" - -#include "../dem.h" -#include "dos.h" -#include "dosfiles.h" -#include "handle.h" -#include "memory.h" -#include "bios/bios.h" // This is needed because on UNICODE this symbol is redirected to // GetEnvironmentStringsW whereas on ANSI it corresponds to the real Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,19 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" - -#include "dos.h" -#include "dos/dem.h" - -#include "bios/bios.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -9,17 +9,10 @@ * For other languages, please use COUNTRY.SYS */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" - -#include "country.h" -#include "memory.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -96,4 +96,4 @@ BOOLEAN DosCountryInitialize(VOID); -#endif +#endif /* _COUNTRY_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,20 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/bop.h" -#include "device.h" - -#include "dos.h" -#include "dos/dem.h" -#include "memory.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -208,6 +208,4 @@ VOID DeviceInterruptBop(VOID); DWORD DosLoadDriver(LPCSTR DriverFile); -#endif // _DEVICE_H_ - -/* EOF */ +#endif /* _DEVICE_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,33 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/cpu.h" -#include "int32.h" - -#include "dos.h" -#include "dos/dem.h" -#include "country.h" -#include "device.h" -#include "handle.h" -#include "dosfiles.h" -#include "memory.h" -#include "process.h" -#include "himem.h" - -#include "bios/bios.h" - -#include "io.h" -#include "hardware/ps2.h" - -#include "emsdrv.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,12 +8,6 @@ #ifndef _DOS_H_ #define _DOS_H_ - -/* INCLUDES *******************************************************************/ - -#include "device.h" - -/**/ #include "int32.h" /**/ /* DEFINES ********************************************************************/ @@ -333,6 +327,4 @@ */ BOOLEAN DosKRNLInitialize(VOID); -#endif // _DOS_H_ - -/* EOF */ +#endif /* _DOS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,23 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "../../memory.h" - -#include "dos.h" -#include "dos/dem.h" -#include "dosfiles.h" -#include "handle.h" -#include "process.h" - -#include "bios/bios.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Files Support * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once /* DEFINES ********************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -9,22 +9,10 @@ * LIM EMS v4.0: http://www.phatcode.net/res/218/files/limems40.txt */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "../../memory.h" -#include "bios/umamgr.h" - -#include "dos.h" -#include "dos/dem.h" -#include "device.h" - -#include "emsdrv.h" #define EMS_DEVICE_NAME "EMMXXXX0" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -100,6 +100,4 @@ BOOLEAN EmsDrvInitialize(USHORT Segment, ULONG TotalPages); VOID EmsDrvCleanup(VOID); -#endif // _EMSDRV_H_ - -/* EOF */ +#endif /* _EMSDRV_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,21 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" - -#include "dos.h" -#include "dos/dem.h" -#include "dosfiles.h" -#include "handle.h" -#include "memory.h" -#include "process.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Handles (Job File Table) * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once /* DEFINITIONS ****************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -44,20 +44,10 @@ * of the internal Upper Memory Area Manager, in umamgr.c */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/bop.h" -#include "../../memory.h" -#include "bios/umamgr.h" - -#include "device.h" -#include "himem.h" #define XMS_DEVICE_NAME "XMSXXXX0" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -65,6 +65,4 @@ VOID XmsInitialize(VOID); VOID XmsCleanup(VOID); -#endif // _HIMEM_H_ - -/* EOF */ +#endif /* _HIMEM_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,22 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" - -#include "bios/umamgr.h" // HACK until we correctly call XMS services for UMBs. - -#include "dos.h" -#include "dos/dem.h" -#include "memory.h" -#include "process.h" -#include "himem.h" // FIXME: Should be dynamically initialized! #define FIRST_MCB_SEGMENT (SYSTEM_ENV_BLOCK + 0x200) // old value: 0x1000 Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -50,6 +50,4 @@ VOID DosInitializeUmb(VOID); VOID DosInitializeMemory(VOID); -#endif // _DOS_MEMORY_H_ - -/* EOF */ +#endif /* _DOS_MEMORY_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,29 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cpu/cpu.h" - -#include "dos.h" -#include "dos/dem.h" -#include "dosfiles.h" -#include "handle.h" -#include "process.h" -#include "memory.h" - -#include "bios/bios.h" - -#include "io.h" -#include "hardware/ps2.h" - -#include "vddsup.h" /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -5,6 +5,8 @@ * PURPOSE: DOS32 Processes * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ + +#pragma once /* DEFINITIONS ****************************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,33 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -/* Driver Version number and Copyright */ -#include <reactos/buildno.h> -#include <reactos/version.h> - -#include "emulator.h" - -#include "cpu/cpu.h" -#include "int32.h" -#include "hardware/mouse.h" -#include "hardware/ps2.h" -#include "hardware/pic.h" -#include "hardware/video/svga.h" - -#include "mouse32.h" -#include "bios/bios.h" -#include "bios/bios32/bios32p.h" - -#include "memory.h" -#include "io.h" -#include "dos32krnl/memory.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -78,6 +78,4 @@ BOOLEAN DosMouseInitialize(VOID); VOID DosMouseCleanup(VOID); -#endif // _MOUSE32_H_ - -/* EOF */ +#endif /* _MOUSE32_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,39 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "memory.h" - -#include "cpu/callback.h" -#include "cpu/cpu.h" -#include "cpu/bop.h" -#include <isvbop.h> - -#include "int32.h" - -#include "clock.h" -#include "bios/rom.h" -#include "hardware/cmos.h" -#include "hardware/disk.h" -#include "hardware/dma.h" -#include "hardware/keyboard.h" -#include "hardware/mouse.h" -#include "hardware/pic.h" -#include "hardware/pit.h" -#include "hardware/ppi.h" -#include "hardware/ps2.h" -#include "hardware/sound/speaker.h" -#include "hardware/video/svga.h" - -#include "vddsup.h" -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,10 +8,6 @@ #ifndef _EMULATOR_H_ #define _EMULATOR_H_ - -/* INCLUDES *******************************************************************/ - -#include <fast486.h> /* DEFINES ********************************************************************/ @@ -121,6 +117,4 @@ BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput); VOID EmulatorCleanup(VOID); -#endif // _EMULATOR_H_ - -/* EOF */ +#endif /* _EMULATOR_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "cmos.h" - -#include "io.h" -#include "pic.h" -#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -151,6 +151,4 @@ VOID CmosInitialize(VOID); VOID CmosCleanup(VOID); -#endif // _CMOS_H_ - -/* EOF */ +#endif /* _CMOS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -18,21 +18,10 @@ * in little endian) *MUST* be fixed! */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "disk.h" - -// #include "io.h" -#include "memory.h" - -#include "utils.h" - /**************** HARD DRIVES -- VHD FIXED DISK FORMAT SUPPORT ****************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -88,6 +88,4 @@ BOOLEAN DiskCtrlInitialize(VOID); VOID DiskCtrlCleanup(VOID); -#endif // _DISK_H_ - -/* EOF */ +#endif /* _DISK_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,18 +7,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "dma.h" - -#include "io.h" -#include "memory.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -59,6 +59,4 @@ VOID DmaInitialize(VOID); -#endif // _DMA_H_ - -/* EOF */ +#endif /* _DMA_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "keyboard.h" -#include "ps2.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -22,4 +22,4 @@ VOID KeyboardEventHandler(PKEY_EVENT_RECORD KeyEvent); BOOLEAN KeyboardInit(BYTE PS2Connector); -#endif // _KEYBOARD_H_ +#endif /* _KEYBOARD_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,18 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "mouse.h" -#include "ps2.h" - -#include "clock.h" -#include "video/svga.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -66,4 +66,4 @@ VOID MouseGetDataFast(PCOORD CurrentPosition, PBYTE CurrentButtonState); BOOLEAN MouseInit(BYTE PS2Connector); -#endif // _MOUSE_H_ +#endif /* _MOUSE_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,17 +7,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "pic.h" - -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -37,6 +37,4 @@ VOID PicInitialize(VOID); -#endif // _PIC_H_ - -/* EOF */ +#endif /* _PIC_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -8,19 +8,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "pit.h" - -#include "io.h" -#include "pic.h" -#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -77,6 +77,4 @@ VOID PitInitialize(VOID); -#endif // _PIT_H_ - -/* EOF */ +#endif /* _PIT_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -11,20 +11,10 @@ * - This controller is here only for having ports 61h and 62h working. */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "ppi.h" - -#include "hardware/pit.h" -#include "hardware/sound/speaker.h" - -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -21,6 +21,4 @@ VOID PpiInitialize(VOID); -#endif // _PPI_H_ - -/* EOF */ +#endif /* _PPI_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -11,20 +11,10 @@ * http://www.computer-engineering.org/ps2keyboard/ */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "ps2.h" - -#include "memory.h" -#include "io.h" -#include "pic.h" -#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -57,6 +57,4 @@ BOOLEAN PS2Initialize(VOID); VOID PS2Cleanup(VOID); -#endif // _PS2_H_ - -/* EOF */ +#endif /* _PS2_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "speaker.h" -#include "hardware/pit.h" /* Extra PSDK/NDK Headers */ #include <ndk/iofuncs.h> Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -16,6 +16,4 @@ VOID SpeakerInitialize(VOID); VOID SpeakerCleanup(VOID); -#endif // _SPEAKER_H_ - -/* EOF */ +#endif /* _SPEAKER_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,20 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "svga.h" -#include <bios/vidbios.h> - -#include "memory.h" -#include "io.h" -#include "clock.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -385,6 +385,4 @@ BOOLEAN VgaInitialize(HANDLE TextHandle); VOID VgaCleanup(VOID); -#endif // _SVGA_H_ - -/* EOF */ +#endif /* _SVGA_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,18 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "int32.h" - -#include "cpu/bop.h" -#include <isvbop.h> /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -9,10 +9,6 @@ #ifndef _INT32_H_ #define _INT32_H_ - -/* INCLUDES *******************************************************************/ - -#include "cpu/callback.h" /* DEFINES ********************************************************************/ @@ -60,6 +56,4 @@ VOID InitializeInt32(VOID); -#endif // _INT32_H_ - -/* EOF */ +#endif /* _INT32_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.c… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -7,15 +7,10 @@ * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "io.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.h… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -103,6 +103,4 @@ UCHAR DataSize ); -#endif // _IO_H_ - -/* EOF */ +#endif /* _IO_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,15 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "memory.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -92,6 +92,4 @@ PBOOLEAN Hooked ); -#endif // _MEMORY_H_ - -/* EOF */ +#endif /* _MEMORY_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,19 +6,10 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" - -#include "bios/bios.h" -#include "cpu/cpu.h" - -#include "dos/dem.h" #include "resource.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -44,6 +44,58 @@ /* PSEH for SEH Support */ #include <pseh/pseh2.h> + +#include <reactos/buildno.h> +#include <reactos/version.h> + +#include <fast486.h> +#include <isvbop.h> + +#include "bios/bios32/bios32.h" +#include "bios/bios32/dskbios32.h" +#include "bios/bios32/kbdbios32.h" +#include "bios/bios32/moubios32.h" +#include "bios/bios32/vidbios32.h" +#include "bios/vidbios.h" +#include "bios/bios.h" +#include "bios/kbdbios.h" +#include "bios/umamgr.h" +#include "cpu/callback.h" +#include "bios/rom.h" +#include "clock.h" +#include "cpu/bop.h" +#include "cpu/cpu.h" +#include "dos/dem.h" +#include "dos/mouse32.h" +#include "dos/dos32krnl/country.h" +#include "dos/dos32krnl/device.h" +#include "dos/dos32krnl/dos.h" +#include "dos/dos32krnl/dosfiles.h" +#include "dos/dos32krnl/emsdrv.h" +#include "dos/dos32krnl/handle.h" +#include "dos/dos32krnl/himem.h" +#include "dos/dos32krnl/process.h" +#include "emulator.h" +#include "hardware/cmos.h" +#include "hardware/disk.h" +#include "hardware/dma.h" +#include "hardware/keyboard.h" +#include "hardware/mouse.h" +#include "hardware/pic.h" +#include "hardware/pit.h" +#include "hardware/ppi.h" +#include "hardware/ps2.h" +#include "hardware/sound/speaker.h" +#include "hardware/video/svga.h" +#include "bios/bios32/vbe.h" +#include "int32.h" +#include "bios/bios32/bios32p.h" +#include "io.h" +#include "utils.h" +#include "vddsup.h" + +#include "memory.h" +#include "dos/dos32krnl/memory.h" /* * Activate this line if you want to run NTVDM in standalone mode with: @@ -106,6 +158,4 @@ VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent); -#endif // _NTVDM_H_ - -/* EOF */ +#endif /* _NTVDM_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/util… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,14 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -/* PRIVATE FUNCTIONS **********************************************************/ /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/utils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/util… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/utils.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/utils.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -24,6 +24,4 @@ IN ULONG FileSize, OUT PULONG BytesRead); -#endif // _UTILS_H_ - -/* EOF */ +#endif /* _UTILS_H_ */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vdds… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -6,18 +6,10 @@ * PROGRAMMERS: Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *******************************************************************/ - #include "ntvdm.h" #define NDEBUG #include <debug.h> - -#include "emulator.h" -#include "vddsup.h" - -#include "cpu/bop.h" -#include <isvbop.h> typedef VOID (WINAPI *VDD_PROC)(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vdds… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.h [iso-8859-1] Sat Oct 3 21:47:46 2015 @@ -18,6 +18,4 @@ VOID VDDSupInitialize(VOID); -#endif // _VDDSUP_H_ - -/* EOF */ +#endif /* _VDDSUP_H_ */

8 years, 11 months

[spetreolle] 69434: [user32_apitest] 0x%lu does not mean anything correct.

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sat Oct 3 21:41:10 2015 New Revision: 69434 URL: http://svn.reactos.org/svn/reactos?rev=69434&view=rev Log: [user32_apitest] 0x%lu does not mean anything correct. Modified: trunk/rostests/apitests/user32/SetCursorPos.c Modified: trunk/rostests/apitests/user32/SetCursorPos.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/SetCursor… ============================================================================== --- trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/SetCursorPos.c [iso-8859-1] Sat Oct 3 21:41:10 2015 @@ -180,13 +180,13 @@ ret = GetCursorPos(&curPoint); ok(ret == FALSE, "GetCursorPos should fail\n"); - ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED got 0x%lu\n", GetLastError()); + ok(GetLastError() == ERROR_ACCESS_DENIED, "Expected ERROR_ACCESS_DENIED got 0x%lx\n", GetLastError()); SetLastError(0xdeadbeef); ret = SetCursorPos(2,2); ok(ret == FALSE, "SetCursorPos should fail\n"); - ok(GetLastError() == 0xdeadbeef, "Wrong last error, got 0x%lu\n", GetLastError()); + ok(GetLastError() == 0xdeadbeef, "Wrong last error, got 0x%lx\n", GetLastError()); ret = GetCursorPos(&curPoint); ok(ret == FALSE, "GetCursorPos should fail\n"); @@ -202,4 +202,4 @@ { Test_DesktopAccess(); Test_SetCursorPos(); -} +}

8 years, 11 months

[akhaldi] 69433: [NTVDM] Fix PCH w.r.t. using the debug routines. The PCH use here in itself could use *a lot* of improvements but that's another story.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 3 19:17:55 2015 New Revision: 69433 URL: http://svn.reactos.org/svn/reactos?rev=69433&view=rev Log: [NTVDM] Fix PCH w.r.t. using the debug routines. The PCH use here in itself could use *a lot* of improvements but that's another story. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/clock.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/int32.c trunk/reactos/subsystems/mvdm/ntvdm/io.c trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h trunk/reactos/subsystems/mvdm/ntvdm/utils.c trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/callback.h" #include "cpu/bop.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,13 +9,15 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG +#include "ntvdm.h" /* BIOS Version number and Copyright */ #include <reactos/buildno.h> #include <reactos/version.h> -#include "ntvdm.h" +#define NDEBUG +#include <debug.h> + #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF #include "cpu/bop.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" // #include "../../memory.h" // #include "cpu/bop.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,10 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> #include "kbdbios32.h" #include <bios/kbdbios.h> Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -10,9 +10,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "int32.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "int32.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "memory.h" #include "cpu/callback.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "memory.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,13 +9,15 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> /* BIOS Version number and Copyright */ #include <reactos/buildno.h> #include <reactos/version.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" #include "cpu/bop.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "clock.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "bop.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -10,16 +10,18 @@ /******************************************************************************\ | WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! | -| Callbacks support supposes implicitely that the callbacks are used +| Callbacks support supposes implicitly that the callbacks are used | in the SAME thread as the CPU thread, otherwise messing in parallel | with the CPU registers is 100% prone to bugs!! \******************************************************************************/ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "callback.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu.h" #include "x86context.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -12,9 +12,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include <isvbop.h> Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "int32.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "dos.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "country.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu/bop.h" #include "device.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu/cpu.h" #include "int32.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "../../memory.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "../../memory.h" #include "bios/umamgr.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "dos.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -46,9 +46,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu/bop.h" #include "../../memory.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "bios/umamgr.h" // HACK until we correctly call XMS services for UMBs. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cpu/cpu.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,13 +8,15 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> /* Driver Version number and Copyright */ #include <reactos/buildno.h> #include <reactos/version.h> -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "memory.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "cmos.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -20,9 +20,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "disk.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "dma.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "keyboard.h" #include "ps2.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "mouse.h" #include "ps2.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "pic.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -10,9 +10,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "pit.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -13,9 +13,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include <debug.h> -#include "ntvdm.h" #include "emulator.h" #include "ppi.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -13,9 +13,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "ps2.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "speaker.h" #include "hardware/pit.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "svga.h" #include <bios/vidbios.h> Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "int32.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.c… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "io.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "memory.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "bios/bios.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -44,8 +44,6 @@ /* PSEH for SEH Support */ #include <pseh/pseh2.h> - -#include <debug.h> /* * Activate this line if you want to run NTVDM in standalone mode with: Modified: trunk/reactos/subsystems/mvdm/ntvdm/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/util… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/utils.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,10 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> /* PRIVATE FUNCTIONS **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vdds… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c [iso-8859-1] Sat Oct 3 19:17:55 2015 @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG - -#include "ntvdm.h" +#include <debug.h> + #include "emulator.h" #include "vddsup.h"

8 years, 11 months

[hbelusca] 69432: [NTVDM] - French translation fix. - Add PCH support. - Properly track RC files dependencies. CORE-9806

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 3 18:57:06 2015 New Revision: 69432 URL: http://svn.reactos.org/svn/reactos?rev=69432&view=rev Log: [NTVDM] - French translation fix. - Add PCH support. - Properly track RC files dependencies. CORE-9806 Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc Modified: trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/CMak… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/CMakeLists.txt [iso-8859-1] Sat Oct 3 18:57:06 2015 @@ -67,10 +67,12 @@ utils.c vddsup.c ntvdm.c - ntvdm.rc + ntvdm.h ${CMAKE_CURRENT_BINARY_DIR}/ntvdm.def) -add_executable(ntvdm ${SOURCE}) +add_rc_deps(ntvdm.rc ${CMAKE_CURRENT_SOURCE_DIR}/res/ntvdm.ico) +add_executable(ntvdm ${SOURCE} ntvdm.rc) +add_pch(ntvdm ntvdm.h SOURCE) set_module_type(ntvdm win32cui UNICODE IMAGEBASE 0x0F000000) target_link_libraries(ntvdm fast486 ${PSEH_LIB}) add_importlibs(ntvdm user32 gdi32 advapi32 comdlg32 msvcrt kernel32 ntdll) Modified: trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/lang… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/lang/fr-FR.rc [iso-8859-1] Sat Oct 3 18:57:06 2015 @@ -13,10 +13,10 @@ IDS_VDM_DUMPMEM_BIN , "Vidage MÃ©moire (&Binaire)" IDS_VDM_MOUNT_FLOPPY, "InsÃ©rer une disquette dans le lecteur %d <%s>..." IDS_VDM_EJECT_FLOPPY, "Ãjecter la disquette du lecteur %d" - IDS_VDM_QUIT , "&Quitter la ReactOS VDM" + IDS_VDM_QUIT , "&Quitter ReactOS VDM" END STRINGTABLE BEGIN - IDS_NO_MEDIA, "No media" + IDS_NO_MEDIA, "Aucun mÃ©dia" END

8 years, 11 months

[hbelusca] 69431: [NTVDM] Usability fixes (part 2): - Properly keep the mouse show state across screenbuffer switches. - Use unicode strings for the disk menu items. See r69428.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 3 15:06:24 2015 New Revision: 69431 URL: http://svn.reactos.org/svn/reactos?rev=69431&view=rev Log: [NTVDM] Usability fixes (part 2): - Properly keep the mouse show state across screenbuffer switches. - Use unicode strings for the disk menu items. See r69428. Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -961,12 +961,9 @@ { ASSERT(ScreenBuffer); - /* Set the active buffer */ + /* Set the active buffer and reattach the VDM UI to it */ SetConsoleActiveScreenBuffer(ScreenBuffer); - - /* Reinitialize the VDM menu */ - DestroyVdmMenu(); - CreateVdmMenu(ScreenBuffer); + ConsoleReattach(ScreenBuffer); } static BOOL VgaEnterGraphicsMode(PCOORD Resolution) Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -163,19 +163,20 @@ UpdateVdmMenuDisks(VOID) { UINT_PTR ItemID; + UNICODE_STRING ValueString; USHORT i; - CHAR szNoMedia[100]; - CHAR szMenuString1[256], szMenuString2[256]; + WCHAR szNoMedia[100]; + WCHAR szMenuString1[256], szMenuString2[256]; /* Update the disks menu items */ - LoadStringA(GetModuleHandle(NULL), + LoadStringW(GetModuleHandle(NULL), IDS_NO_MEDIA, szNoMedia, ARRAYSIZE(szNoMedia)); - LoadStringA(GetModuleHandle(NULL), + LoadStringW(GetModuleHandle(NULL), IDS_VDM_MOUNT_FLOPPY, szMenuString1, ARRAYSIZE(szMenuString1)); @@ -188,10 +189,15 @@ GlobalSettings.FloppyDisks[i].Buffer && GlobalSettings.FloppyDisks[i].Buffer != '\0') { + /* Convert the ANSI string to UNICODE */ + RtlAnsiStringToUnicodeString(&ValueString, &GlobalSettings.FloppyDisks[i], TRUE); + /* Update item text */ - _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; - ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, ValueString.Buffer); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + RtlFreeUnicodeString(&ValueString); /* Enable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); @@ -199,9 +205,9 @@ else { /* Update item text */ - _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; - ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + ModifyMenuW(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); /* Disable the eject item */ EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_GRAYED); @@ -209,46 +215,27 @@ } } -static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) -{ - if (ShowPtr) - { - /* Be sure the cursor will be shown */ - while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; - } - else - { - /* Be sure the cursor will be hidden */ - while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; - } -} - static VOID UpdateVdmMenu(VOID) { - // This is a temporary HACK until I find the most elegant way - // to synchronize mouse cursor display with console screenbuffer switches. - ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); - UpdateVdmMenuMouse(); UpdateVdmMenuDisks(); } -/*static*/ VOID +static VOID CreateVdmMenu(HANDLE ConOutHandle) { HMENU hVdmSubMenu; - UINT_PTR ItemID = ID_VDM_DRIVES; + UINT_PTR ItemID; UINT Pos; + USHORT i; WCHAR szNoMedia[100]; WCHAR szMenuString1[256], szMenuString2[256]; hConsoleMenu = ConsoleMenuControl(ConOutHandle, ID_SHOWHIDE_MOUSE, - ID_VDM_DRIVES + 4); + ID_VDM_DRIVES + (2 * ARRAYSIZE(GlobalSettings.FloppyDisks))); if (hConsoleMenu == NULL) return; - - CurrentConsoleOutput = ConOutHandle; /* Get the position where we are going to insert our menu items */ VdmMenuPos = GetMenuItemCount(hConsoleMenu); @@ -273,30 +260,32 @@ szMenuString1, ARRAYSIZE(szMenuString1)); - /* Drive 0 -- Mount */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 0, szMenuString2); - - /* Drive 1 -- Mount */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1, szNoMedia); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 2, szMenuString2); + /* Drive 'x' -- Mount */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + /* Add the item */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID, szMenuString2); + } LoadStringW(GetModuleHandle(NULL), IDS_VDM_EJECT_FLOPPY, szMenuString1, ARRAYSIZE(szMenuString1)); - /* Drive 0 -- Eject */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 0); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1, szMenuString2); - - /* Drive 1 -- Eject */ - _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, 1); - szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; - InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3, szMenuString2); + /* Drive 'x' -- Eject */ + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + /* Add the item */ + _snwprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; + InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 1, szMenuString2); + } /* Refresh the menu state */ UpdateVdmMenu(); @@ -304,7 +293,7 @@ } } -/*static*/ VOID +static VOID DestroyVdmMenu(VOID) { UINT i = 0; @@ -317,8 +306,20 @@ } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); DrawMenuBar(hConsoleWnd); - - CurrentConsoleOutput = INVALID_HANDLE_VALUE; +} + +static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) +{ + if (ShowPtr) + { + /* Be sure the cursor will be shown */ + while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; + } + else + { + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + } } static VOID EnableExtraHardware(HANDLE ConsoleInput) @@ -867,6 +868,17 @@ SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); } +VOID +ConsoleReattach(HANDLE ConOutHandle) +{ + DestroyVdmMenu(); + CurrentConsoleOutput = ConOutHandle; + CreateVdmMenu(ConOutHandle); + + /* Synchronize mouse cursor display with console screenbuffer switches */ + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); +} + static BOOL ConsoleInit(VOID) { Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 15:06:24 2015 @@ -100,14 +100,11 @@ IN LPCSTR Format, ...); /*static*/ VOID -CreateVdmMenu(HANDLE ConOutHandle); -/*static*/ VOID -DestroyVdmMenu(VOID); -/*static*/ VOID UpdateVdmMenuDisks(VOID); BOOL ConsoleAttach(VOID); VOID ConsoleDetach(VOID); +VOID ConsoleReattach(HANDLE ConOutHandle); VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);

8 years, 11 months

[hbelusca] 69430: [WIN32SS:GDI] Convert COLOR16 values to byte range before calling XLATEOBJ_iXlate. This fixes gradient colors in some applications, as for example in Code::Blocks. Patch by Vort. ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 3 13:30:15 2015 New Revision: 69430 URL: http://svn.reactos.org/svn/reactos?rev=69430&view=rev Log: [WIN32SS:GDI] Convert COLOR16 values to byte range before calling XLATEOBJ_iXlate. This fixes gradient colors in some applications, as for example in Code::Blocks. Patch by Vort. This is a fix for code written in revision r8117, so old !! CORE-8652 #comment Committed in r69430, thanks guys! Modified: trunk/reactos/win32ss/gdi/eng/gradient.c Modified: trunk/reactos/win32ss/gdi/eng/gradient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/gradient.c… ============================================================================== --- trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/gradient.c [iso-8859-1] Sat Oct 3 13:30:15 2015 @@ -161,7 +161,7 @@ do { RECTL FillRect; - ULONG Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red, v1->Green, v1->Blue)); + ULONG Color = XLATEOBJ_iXlate(pxlo, RGB(v1->Red >> 8, v1->Green >> 8, v1->Blue >> 8)); EnumMore = CLIPOBJ_bEnum(pco, (ULONG) sizeof(RectEnum), (PVOID) &RectEnum); for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= rcSG.bottom; i++)

8 years, 11 months

[akhaldi] 69429: [RAPPS] Fix SSL certificate pinning, allow HTTPS links, add URL args support, some UX fixes, comment improvements and fix stopping the download process when pressing cancel. By Ism...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Oct 3 08:39:05 2015 New Revision: 69429 URL: http://svn.reactos.org/svn/reactos?rev=69429&view=rev Log: [RAPPS] Fix SSL certificate pinning, allow HTTPS links, add URL args support, some UX fixes, comment improvements and fix stopping the download process when pressing cancel. By Ismael Ferreras Morezuelas. CORE-9060 CORE-10289 Modified: trunk/reactos/base/applications/rapps/loaddlg.c Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sat Oct 3 08:39:05 2015 @@ -29,6 +29,7 @@ #include "rapps.h" #include <wininet.h> #include <shellapi.h> +#include <windowsx.h> static PAPPLICATION_INFO AppInfo; @@ -39,6 +40,7 @@ HWND hDialog; BOOL *pbCancelled; BOOL UrlHasBeenCopied; + WCHAR ProgressText[MAX_PATH]; } IBindStatusCallbackImpl; static @@ -117,7 +119,20 @@ Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_PROGRESS); if (Item && ulProgressMax) { - SendMessageW(Item, PBM_SETPOS, ((ULONGLONG)ulProgress * 100) / ulProgressMax, 0); + WCHAR szProgress[100]; + WCHAR szProgressMax[100]; + UINT uiPercentage = ((ULONGLONG)ulProgress * 100) / ulProgressMax; + + /* send the current progress to the progress bar */ + SendMessageW(Item, PBM_SETPOS, uiPercentage, 0); + + /* format the bits and bytes into pretty and accesible units... */ + StrFormatByteSizeW(ulProgress, szProgress, sizeof(szProgress)); + StrFormatByteSizeW(ulProgressMax, szProgressMax, sizeof(szProgressMax)); + + /* ...and post all of it to our subclassed progress bar text subroutine */ + swprintf(This->ProgressText, L"%u%% â %s / %s", uiPercentage, szProgress, szProgressMax); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM)This->ProgressText); } Item = GetDlgItem(This->hDialog, IDC_DOWNLOAD_STATUS); @@ -227,15 +242,15 @@ BOOL Ret = FALSE; INTERNET_CERTIFICATE_INFOW certInfo; - hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); + hConnect = InternetConnectW(hInternet, lpszHostName, INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, INTERNET_FLAG_SECURE, 0); if (hConnect) { hRequest = HttpOpenRequestW(hConnect, L"HEAD", NULL, NULL, NULL, NULL, INTERNET_FLAG_SECURE, 0); if (hRequest != NULL) - { + { Ret = HttpSendRequestW(hRequest, L"", 0, NULL, 0); - if (Ret) - { + if (Ret) + { certInfoLength = sizeof(INTERNET_CERTIFICATE_INFOW); Ret = InternetQueryOptionW(hRequest, INTERNET_OPTION_SECURITY_CERTIFICATE_STRUCT, @@ -243,7 +258,7 @@ &certInfoLength); if (Ret) { - if (certInfo.lpszEncryptionAlgName) + if (certInfo.lpszEncryptionAlgName) LocalFree(certInfo.lpszEncryptionAlgName); if (certInfo.lpszIssuerInfo) { @@ -251,11 +266,11 @@ Ret = FALSE; LocalFree(certInfo.lpszIssuerInfo); } - if (certInfo.lpszProtocolName) + if (certInfo.lpszProtocolName) LocalFree(certInfo.lpszProtocolName); - if (certInfo.lpszSignatureAlgName) + if (certInfo.lpszSignatureAlgName) LocalFree(certInfo.lpszSignatureAlgName); - if (certInfo.lpszSubjectInfo) + if (certInfo.lpszSubjectInfo) { if (strcmp((LPSTR)certInfo.lpszSubjectInfo, CERT_SUBJECT_INFO) != 0) Ret = FALSE; @@ -276,7 +291,7 @@ { IBindStatusCallback *dl = NULL; WCHAR path[MAX_PATH]; - LPWSTR p; + PWSTR p, q; HWND Dlg = (HWND) Context; DWORD dwContentLen, dwBytesWritten, dwBytesRead, dwStatus; DWORD dwCurrentBytesRead = 0; @@ -290,45 +305,58 @@ unsigned char lpBuffer[4096]; const LPWSTR lpszAgent = L"RApps/1.0"; URL_COMPONENTS urlComponents; - size_t urlLength; - - /* built the path for the download */ + size_t urlLength, filenameLength; + + /* build the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); - + q = wcsrchr(AppInfo->szUrlDownload, L'?'); + + /* do we have a final slash separator? */ if (!p) goto end; - if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) - { - bCab = TRUE; - if (!GetStorageDirectory(path, sizeof(path) / sizeof(path[0]))) - goto end; - } - else - { - if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) - goto end; - } - - + /* prepare the tentative length of the filename, maybe we've to remove part of it later on */ + filenameLength = wcslen(p) * sizeof(WCHAR); + + /* do we have query arguments in the target URL after the filename? account for them + (e.g. https://example.org/myfile.exe?no_adware_plz) */ + if (q && q > p && (q - p) > 0) + filenameLength -= wcslen(q - 1) * sizeof(WCHAR); + + /* is this URL an update package for RAPPS? if so store it in a different place */ + if (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) + { + bCab = TRUE; + if (!GetStorageDirectory(path, _countof(path))) + goto end; + } + else + { + if (FAILED(StringCbCopyW(path, sizeof(path), SettingsInfo.szDownloadDir))) + goto end; + } + + /* is the path valid? can we access it? */ if (GetFileAttributesW(path) == INVALID_FILE_ATTRIBUTES) { if (!CreateDirectoryW(path, NULL)) goto end; } + /* append a \ to the provided file system path, and the filename portion from the URL after that */ if (FAILED(StringCbCatW(path, sizeof(path), L"\\"))) goto end; - if (FAILED(StringCbCatW(path, sizeof(path), p + 1))) - goto end; - - /* download it */ + if (FAILED(StringCbCatNW(path, sizeof(path), p + 1, filenameLength))) + goto end; + + /* create an async download context for it */ bTempfile = TRUE; dl = CreateDl(Context, &bCancelled); if (dl == NULL) goto end; + /* FIXME: this should just be using the system-wide proxy settings */ switch(SettingsInfo.Proxy) { case 0: /* preconfig */ @@ -348,7 +376,7 @@ if (!hOpen) goto end; - hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); + hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE | INTERNET_FLAG_KEEP_CONNECTION, 0); if (!hFile) goto end; @@ -373,15 +401,15 @@ if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; - + urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); urlComponents.dwHostNameLength = urlLength*sizeof(WCHAR); urlComponents.lpszHostName = malloc(urlComponents.dwHostNameLength); - + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; - + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwStatus, 0); @@ -389,14 +417,17 @@ dwContentLen = FtpGetFileSize(hFile, &dwStatus); #ifdef USE_CERT_PINNING - if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && (!CertIsValid(hOpen, urlComponents.lpszHostName))) + /* are we using HTTPS to download the RAPPS update package? check if the certificate is original */ + if ((urlComponents.nScheme == INTERNET_SCHEME_HTTPS) && + (wcscmp(AppInfo->szUrlDownload, APPLICATION_DATABASE_URL) == 0) && + (!CertIsValid(hOpen, urlComponents.lpszHostName))) { WCHAR szMsgText[MAX_STR_LEN]; if (!LoadStringW(hInst, IDS_CERT_DOES_NOT_MATCH, szMsgText, sizeof(szMsgText) / sizeof(WCHAR))) goto end; - MessageBoxW(hMainWnd, szMsgText, NULL, MB_OK | MB_ICONERROR); + MessageBoxW(Dlg, szMsgText, NULL, MB_OK | MB_ICONERROR); goto end; } #endif @@ -416,7 +447,7 @@ dwCurrentBytesRead += dwBytesRead; IBindStatusCallback_OnProgress(dl, dwCurrentBytesRead, dwContentLen, 0, AppInfo->szUrlDownload); } - while (dwBytesRead); + while (dwBytesRead && !bCancelled); CloseHandle(hOut); hOut = INVALID_HANDLE_VALUE; @@ -451,15 +482,88 @@ return 0; } + +LRESULT CALLBACK +DownloadProgressProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, UINT_PTR uIdSubclass, DWORD_PTR dwRefData) +{ + static WCHAR szProgressText[MAX_STR_LEN] = {0}; + + switch (uMsg) + { + case WM_SETTEXT: + { + if (lParam) + wcscpy(szProgressText, (WCHAR *)lParam); + } + + case WM_ERASEBKGND: + case WM_PAINT: + { + PAINTSTRUCT ps; + HDC hDC = BeginPaint(hWnd, &ps), hdcMem; + HBITMAP hbmMem; + HANDLE hOld; + RECT myRect; + UINT win_width, win_height; + + GetClientRect(hWnd, &myRect); + + /* grab the progress bar rect size */ + win_width = myRect.right - myRect.left; + win_height = myRect.bottom - myRect.top; + + /* create an off-screen DC for double-buffering */ + hdcMem = CreateCompatibleDC(hDC); + hbmMem = CreateCompatibleBitmap(hDC, win_width, win_height); + + hOld = SelectObject(hdcMem, hbmMem); + + /* call the original draw code and redirect it to our memory buffer */ + DefSubclassProc(hWnd, uMsg, (WPARAM)hdcMem, lParam); + + /* draw our nifty progress text over it */ + SelectFont(hdcMem, GetStockFont(DEFAULT_GUI_FONT)); + DrawShadowText(hdcMem, szProgressText, wcslen(szProgressText), + &myRect, + DT_CENTER | DT_VCENTER | DT_NOPREFIX | DT_SINGLELINE, + GetSysColor(COLOR_CAPTIONTEXT), + GetSysColor(COLOR_3DSHADOW), + 1, 1); + + /* transfer the off-screen DC to the screen */ + BitBlt(hDC, 0, 0, win_width, win_height, hdcMem, 0, 0, SRCCOPY); + + /* free the off-screen DC */ + SelectObject(hdcMem, hOld); + DeleteObject(hbmMem); + DeleteDC(hdcMem); + + EndPaint(hWnd, &ps); + return 0; + } + + /* Raymond Chen says that we should safely unsubclass all the things! + (http://blogs.msdn.com/b/oldnewthing/archive/2003/11/11/55653.aspx) */ + case WM_NCDESTROY: + { + ZeroMemory(szProgressText, MAX_STR_LEN); + RemoveWindowSubclass(hWnd, DownloadProgressProc, uIdSubclass); + } + + default: + return DefSubclassProc(hWnd, uMsg, wParam, lParam); + } +} + static INT_PTR CALLBACK -DownloadDlgProc(HWND Dlg, UINT Msg, WPARAM wParam, LPARAM lParam) +DownloadDlgProc(HWND Dlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { HANDLE Thread; DWORD ThreadId; HWND Item; - switch (Msg) + switch (uMsg) { case WM_INITDIALOG: { @@ -478,16 +582,25 @@ Item = GetDlgItem(Dlg, IDC_DOWNLOAD_PROGRESS); if (Item) { + /* initialize the default values for our nifty progress bar + and subclass it so that it learns to print a status text */ SendMessageW(Item, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageW(Item, PBM_SETPOS, 0, 0); + + SetWindowSubclass(Item, DownloadProgressProc, 0, 0); } + /* add a neat placeholder until the download URL is retrieved */ + Item = GetDlgItem(Dlg, IDC_DOWNLOAD_STATUS); + SendMessageW(Item, WM_SETTEXT, 0, (LPARAM) L"â¢ â¢ â¢"); + Thread = CreateThread(NULL, 0, ThreadFunc, Dlg, 0, &ThreadId); - if (!Thread) return FALSE; + if (!Thread) + return FALSE; + CloseHandle(Thread); return TRUE; } - case WM_COMMAND: if (wParam == IDCANCEL) {

8 years, 11 months

[hbelusca] 69428: [NTVDM] Usability fixes: - Update the menu each time the user chooses to show or hide the mouse pointer. - Keep the mouse show state across screenbuffer switches (text/graphics) (...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Oct 3 02:36:35 2015 New Revision: 69428 URL: http://svn.reactos.org/svn/reactos?rev=69428&view=rev Log: [NTVDM] Usability fixes: - Update the menu each time the user chooses to show or hide the mouse pointer. - Keep the mouse show state across screenbuffer switches (text/graphics) (half-hackish at the moment; will be elegantly fixed later on). - Update the floppy disk menu items each time the user mounts / ejects a disk; display the disk image file name currently mounted (CHAR strings used at the moment, WCHAR conversion will follow soon). Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -414,39 +414,69 @@ #define OFN_EX_NOPLACESBAR 0x00000001 #endif // (_WIN32_WINNT >= 0x0500) - OPENFILENAMEA ofn; - CHAR szFile[MAX_PATH] = ""; + OPENFILENAMEW ofn; + WCHAR szFile[MAX_PATH] = L""; + UNICODE_STRING ValueString; + + ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); RtlZeroMemory(&ofn, sizeof(ofn)); ofn.lStructSize = sizeof(ofn); ofn.hwndOwner = hConsoleWnd; - ofn.lpstrTitle = "Select a virtual floppy image"; + ofn.lpstrTitle = L"Select a virtual floppy image"; ofn.Flags = OFN_EXPLORER | OFN_ENABLESIZING | OFN_LONGNAMES | OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; // ofn.FlagsEx = OFN_EX_NOPLACESBAR; - ofn.lpstrFilter = "Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd;*.img;*.ima;*.dsk\0All files (*.*)\0*.*\0\0"; - ofn.lpstrDefExt = "vfd"; + ofn.lpstrFilter = L"Virtual floppy images (*.vfd;*.img;*.ima;*.dsk)\0*.vfd;*.img;*.ima;*.dsk\0All files (*.*)\0*.*\0\0"; + ofn.lpstrDefExt = L"vfd"; ofn.nFilterIndex = 0; ofn.lpstrFile = szFile; ofn.nMaxFile = ARRAYSIZE(szFile); - if (!GetOpenFileNameA(&ofn)) + if (!GetOpenFileNameW(&ofn)) { DPRINT1("CommDlgExtendedError = %d\n", CommDlgExtendedError()); return; } - // TODO: Refresh the menu state - - if (!MountDisk(FLOPPY_DISK, DiskNumber, szFile, !!(ofn.Flags & OFN_READONLY))) + /* Free the old string */ + if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + + /* Convert the UNICODE string to ANSI and store it */ + RtlInitEmptyUnicodeString(&ValueString, szFile, wcslen(szFile) * sizeof(WCHAR)); + ValueString.Length = ValueString.MaximumLength; + RtlUnicodeStringToAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], &ValueString, TRUE); + + /* Mount the disk */ + if (!MountDisk(FLOPPY_DISK, DiskNumber, GlobalSettings.FloppyDisks[DiskNumber].Buffer, !!(ofn.Flags & OFN_READONLY))) + { DisplayMessage(L"An error happened when mounting disk %d", DiskNumber); + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + return; + } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); } VOID EjectFloppy(IN ULONG DiskNumber) { - // TODO: Refresh the menu state - + ASSERT(DiskNumber < ARRAYSIZE(GlobalSettings.FloppyDisks)); + + /* Unmount the disk */ if (!UnmountDisk(FLOPPY_DISK, DiskNumber)) DisplayMessage(L"An error happened when ejecting disk %d", DiskNumber); + + /* Free the old string */ + if (GlobalSettings.FloppyDisks[DiskNumber].Buffer) + { + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[DiskNumber]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[DiskNumber], NULL, 0); + } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); } @@ -560,7 +590,12 @@ GlobalSettings.FloppyDisks[i].Buffer && GlobalSettings.FloppyDisks[i].Buffer != '\0') { - MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE); + if (!MountDisk(FLOPPY_DISK, i, GlobalSettings.FloppyDisks[i].Buffer, FALSE)) + { + DPRINT1("Failed to mount floppy disk file '%Z'.\n", &GlobalSettings.FloppyDisks[i]); + RtlFreeAnsiString(&GlobalSettings.FloppyDisks[i]); + RtlInitEmptyAnsiString(&GlobalSettings.FloppyDisks[i], NULL, 0); + } } } @@ -576,12 +611,15 @@ { if (!MountDisk(HARD_DISK, i, GlobalSettings.HardDisks[i].Buffer, FALSE)) { - wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings); + wprintf(L"FATAL: Failed to mount hard disk file '%Z'.\n", &GlobalSettings.HardDisks[i]); EmulatorCleanup(); return FALSE; } } } + + /* Refresh the menu state */ + UpdateVdmMenuDisks(); /* Initialize the software callback system and register the emulator BOPs */ InitializeInt32(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -22,6 +22,8 @@ /* VARIABLES ******************************************************************/ +static HANDLE CurrentConsoleOutput = INVALID_HANDLE_VALUE; + static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; @@ -35,7 +37,7 @@ HWND hConsoleWnd = NULL; static HMENU hConsoleMenu = NULL; static INT VdmMenuPos = -1; -static BOOLEAN ShowPointer = FALSE; +static BOOLEAN ShowPointer = TRUE; /* * Those menu helpers were taken from the GUI frontend in winsrv.dll @@ -141,6 +143,97 @@ return FALSE; } +static VOID +UpdateVdmMenuMouse(VOID) +{ + WCHAR szMenuString[256]; + + /* Update "Hide/Show mouse" menu item */ + if (LoadStringW(GetModuleHandle(NULL), + (!ShowPointer ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), + szMenuString, + ARRAYSIZE(szMenuString)) > 0) + { + ModifyMenuW(hConsoleMenu, ID_SHOWHIDE_MOUSE, + MF_BYCOMMAND, ID_SHOWHIDE_MOUSE, szMenuString); + } +} + +/*static*/ VOID +UpdateVdmMenuDisks(VOID) +{ + UINT_PTR ItemID; + USHORT i; + + CHAR szNoMedia[100]; + CHAR szMenuString1[256], szMenuString2[256]; + + /* Update the disks menu items */ + + LoadStringA(GetModuleHandle(NULL), + IDS_NO_MEDIA, + szNoMedia, + ARRAYSIZE(szNoMedia)); + + LoadStringA(GetModuleHandle(NULL), + IDS_VDM_MOUNT_FLOPPY, + szMenuString1, + ARRAYSIZE(szMenuString1)); + + for (i = 0; i < ARRAYSIZE(GlobalSettings.FloppyDisks); ++i) + { + ItemID = ID_VDM_DRIVES + (2 * i); + + if (GlobalSettings.FloppyDisks[i].Length != 0 && + GlobalSettings.FloppyDisks[i].Buffer && + GlobalSettings.FloppyDisks[i].Buffer != '\0') + { + /* Update item text */ + _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, GlobalSettings.FloppyDisks[i].Buffer); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; + ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + /* Enable the eject item */ + EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_ENABLED); + } + else + { + /* Update item text */ + _snprintf(szMenuString2, ARRAYSIZE(szMenuString2), szMenuString1, i, szNoMedia); + szMenuString2[ARRAYSIZE(szMenuString2) - 1] = ANSI_NULL; + ModifyMenuA(hConsoleMenu, ItemID, MF_BYCOMMAND | MF_STRING, ItemID, szMenuString2); + + /* Disable the eject item */ + EnableMenuItem(hConsoleMenu, ItemID + 1, MF_BYCOMMAND | MF_GRAYED); + } + } +} + +static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) +{ + if (ShowPtr) + { + /* Be sure the cursor will be shown */ + while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; + } + else + { + /* Be sure the cursor will be hidden */ + while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; + } +} + +static VOID +UpdateVdmMenu(VOID) +{ + // This is a temporary HACK until I find the most elegant way + // to synchronize mouse cursor display with console screenbuffer switches. + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + + UpdateVdmMenuMouse(); + UpdateVdmMenuDisks(); +} + /*static*/ VOID CreateVdmMenu(HANDLE ConOutHandle) { @@ -155,6 +248,8 @@ ID_VDM_DRIVES + 4); if (hConsoleMenu == NULL) return; + CurrentConsoleOutput = ConOutHandle; + /* Get the position where we are going to insert our menu items */ VdmMenuPos = GetMenuItemCount(hConsoleMenu); @@ -203,9 +298,8 @@ szMenuString2[ARRAYSIZE(szMenuString2) - 1] = UNICODE_NULL; InsertMenuW(hVdmSubMenu, Pos++, MF_STRING | MF_BYPOSITION, ItemID + 3, szMenuString2); - // TODO: Refresh the menu state - - /* Refresh the menu */ + /* Refresh the menu state */ + UpdateVdmMenu(); DrawMenuBar(hConsoleWnd); } } @@ -223,31 +317,8 @@ } while (!(Items[i].uID == 0 && Items[i].SubMenu == NULL && Items[i].uCmdID == 0)); DrawMenuBar(hConsoleWnd); -} - -static VOID ShowHideMousePointer(HANDLE ConOutHandle, BOOLEAN ShowPtr) -{ - WCHAR szMenuString[256]; - - if (ShowPtr) - { - /* Be sure the cursor will be shown */ - while (ShowConsoleCursor(ConOutHandle, TRUE) < 0) ; - } - else - { - /* Be sure the cursor will be hidden */ - while (ShowConsoleCursor(ConOutHandle, FALSE) >= 0) ; - } - - if (LoadStringW(GetModuleHandle(NULL), - (!ShowPtr ? IDS_SHOW_MOUSE : IDS_HIDE_MOUSE), - szMenuString, - ARRAYSIZE(szMenuString)) > 0) - { - ModifyMenu(hConsoleMenu, ID_SHOWHIDE_MOUSE, - MF_BYCOMMAND, ID_SHOWHIDE_MOUSE, szMenuString); - } + + CurrentConsoleOutput = INVALID_HANDLE_VALUE; } static VOID EnableExtraHardware(HANDLE ConsoleInput) @@ -859,8 +930,9 @@ switch (MenuEvent->dwCommandId) { case ID_SHOWHIDE_MOUSE: - ShowHideMousePointer(ConsoleOutput, ShowPointer); ShowPointer = !ShowPointer; + ShowHideMousePointer(CurrentConsoleOutput, ShowPointer); + UpdateVdmMenuMouse(); break; case ID_VDM_DUMPMEM_TXT: Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Sat Oct 3 02:36:35 2015 @@ -103,6 +103,8 @@ CreateVdmMenu(HANDLE ConOutHandle); /*static*/ VOID DestroyVdmMenu(VOID); +/*static*/ VOID +UpdateVdmMenuDisks(VOID); BOOL ConsoleAttach(VOID); VOID ConsoleDetach(VOID);

8 years, 11 months

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 2015