Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 59277: [NTVDM] Use local time instead of system time for the clock. Implement the "set system date" and "set system time" DOS functions.
by aandrejevic＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: aandrejevic Date: Fri Jun 21 22:14:07 2013 New Revision: 59277 URL: http://svn.reactos.org/svn/reactos?rev=59277&view=rev Log: [NTVDM] Use local time instead of system time for the clock. Implement the "set system date" and "set system time" DOS functions. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Fri Jun 21 22:14:07 2013 @@ -570,7 +570,7 @@ /* Get system date */ case 0x2A: { - GetSystemTime(&SystemTime); + GetLocalTime(&SystemTime); EmulatorSetRegister(EMULATOR_REG_CX, (Ecx & 0xFFFF0000) | SystemTime.wYear); EmulatorSetRegister(EMULATOR_REG_DX, @@ -581,11 +581,33 @@ (Eax & 0xFFFFFF00) | SystemTime.wDayOfWeek); break; } + + /* Set system date */ + case 0x2B: + { + GetLocalTime(&SystemTime); + SystemTime.wYear = LOWORD(Ecx); + SystemTime.wMonth = HIBYTE(Edx); + SystemTime.wDay = LOBYTE(Edx); + + if (SetLocalTime(&SystemTime)) + { + /* Return success */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax & 0xFFFFFF00); + } + else + { + /* Return failure */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); + } + + break; + } /* Get system time */ case 0x2C: { - GetSystemTime(&SystemTime); + GetLocalTime(&SystemTime); EmulatorSetRegister(EMULATOR_REG_CX, (Ecx & 0xFFFF0000) | (SystemTime.wHour << 8) @@ -594,6 +616,29 @@ (Edx & 0xFFFF0000) | (SystemTime.wSecond << 8) | (SystemTime.wMilliseconds / 10)); + break; + } + + /* Set system time */ + case 0x2D: + { + GetLocalTime(&SystemTime); + SystemTime.wHour = HIBYTE(Ecx); + SystemTime.wMinute = LOBYTE(Ecx); + SystemTime.wSecond = HIBYTE(Edx); + SystemTime.wMilliseconds = LOBYTE(Edx) * 10; + + if (SetLocalTime(&SystemTime)) + { + /* Return success */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax & 0xFFFFFF00); + } + else + { + /* Return failure */ + EmulatorSetRegister(EMULATOR_REG_AX, Eax | 0xFF); + } + break; }

1 0

[aandrejevic] 59276: [NTVDM] Implement the keyboard IRQ.
by aandrejevic＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: aandrejevic Date: Fri Jun 21 21:25:01 2013 New Revision: 59276 URL: http://svn.reactos.org/svn/reactos?rev=59276&view=rev Log: [NTVDM] Implement the keyboard IRQ. Modified: branches/ntvdm/subsystems/ntvdm/hardware.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -49,6 +49,52 @@ static PIC MasterPic, SlavePic; static PIT_CHANNEL PitChannels[PIT_CHANNELS]; +static BYTE KeyboardQueue[KEYBOARD_BUFFER_SIZE]; +static BOOLEAN KeyboardQueueEmpty = TRUE; +static UINT KeyboardQueueStart = 0; +static UINT KeyboardQueueEnd = 0; + +static BOOLEAN KeyboardQueuePush(BYTE ScanCode) +{ + /* Check if the keyboard queue is full */ + if (!KeyboardQueueEmpty && (KeyboardQueueStart == KeyboardQueueEnd)) + { + return FALSE; + } + + /* Insert the value in the queue */ + KeyboardQueue[KeyboardQueueEnd] = ScanCode; + KeyboardQueueEnd++; + KeyboardQueueEnd %= KEYBOARD_BUFFER_SIZE; + + /* Since we inserted a value, it's not empty anymore */ + KeyboardQueueEmpty = FALSE; + + return TRUE; +} + +#if 0 +static BOOLEAN KeyboardQueuePop(BYTE *ScanCode) +{ + /* Make sure the keyboard queue is not empty */ + if (KeyboardQueueEmpty) return FALSE; + + /* Get the scan code */ + *ScanCode = KeyboardQueue[KeyboardQueueStart]; + + /* Remove the value from the queue */ + KeyboardQueueStart++; + KeyboardQueueStart %= KEYBOARD_BUFFER_SIZE; + + /* Check if the queue is now empty */ + if (KeyboardQueueStart == KeyboardQueueEnd) + { + KeyboardQueueEmpty = TRUE; + } + + return TRUE; +} +#endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -451,3 +497,48 @@ } } +VOID CheckForInputEvents() +{ + PINPUT_RECORD Buffer; + HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); + DWORD i, j, Count, TotalEvents; + BYTE ScanCode; + + /* Get the number of input events */ + if (!GetNumberOfConsoleInputEvents(ConsoleInput, &Count)) return; + if (Count == 0) return; + + /* Allocate the buffer */ + Buffer = (PINPUT_RECORD)HeapAlloc(GetProcessHeap(), 0, Count * sizeof(INPUT_RECORD)); + if (Buffer == NULL) return; + + /* Peek the input events */ + if (!ReadConsoleInput(ConsoleInput, Buffer, Count, &TotalEvents)) goto Cleanup; + + for (i = 0; i < TotalEvents; i++) + { + /* Check if this is a key event */ + if (Buffer[i].EventType != KEY_EVENT) continue; + + /* Get the scan code */ + ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; + + /* If this is a key release, set the highest bit in the scan code */ + if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; + + /* Push the scan code onto the keyboard queue */ + for (j = 0; j < Buffer[i].Event.KeyEvent.wRepeatCount; j++) + { + KeyboardQueuePush(ScanCode); + } + + /* Yes, IRQ 1 */ + PicInterruptRequest(1); + + /* Stop the loop */ + break; + } + +Cleanup: + HeapFree(GetProcessHeap(), 0, Buffer); +} Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -144,6 +144,9 @@ for (i = 0; i < TimerTicks; i++) PitDecrementCount(); LastTimerTick = Counter; + /* Check for console input events */ + CheckForInputEvents(); + /* Continue CPU emulation */ EmulatorStep(); } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Jun 21 21:25:01 2013 @@ -66,6 +66,11 @@ #define PIC_OCW2_SL (1 << 6) #define PIC_OCW3 (1 << 3) #define PIC_OCW3_READ_ISR 0x0B + +/* 8042 PS/2 controller */ +#define KEYBOARD_BUFFER_SIZE 32 +#define PS2_DATA_PORT 0x60 +#define PS2_CONTROL_PORT 0x64 #define EMULATOR_FLAG_CF (1 << 0) #define EMULATOR_FLAG_PF (1 << 2) @@ -219,6 +224,7 @@ BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); VOID PitDecrementCount(); +VOID CheckForInputEvents(); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number);

1 0

[tfaber] 59275: [MSHTML_WINETEST] - Fix warnings about missing sprintf
by tfaber＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: tfaber Date: Fri Jun 21 17:28:53 2013 New Revision: 59275 URL: http://svn.reactos.org/svn/reactos?rev=59275&view=rev Log: [MSHTML_WINETEST] - Fix warnings about missing sprintf Modified: trunk/rostests/winetests/mshtml/activex.c trunk/rostests/winetests/mshtml/events.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/script.c Modified: trunk/rostests/winetests/mshtml/activex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/activex.… ============================================================================== --- trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/activex.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/events.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/events.c… ============================================================================== --- trunk/rostests/winetests/mshtml/events.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/events.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h" Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Fri Jun 21 17:28:53 2013 @@ -21,7 +21,7 @@ #include <wine/test.h> //#include <stdarg.h> -//#include <stdio.h> +#include <stdio.h> //#include "windef.h" //#include "winbase.h"

1 0

[tfaber] 59274: [APITESTS] - Avoid warnings
by tfaber＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: tfaber Date: Fri Jun 21 17:22:46 2013 New Revision: 59274 URL: http://svn.reactos.org/svn/reactos?rev=59274&view=rev Log: [APITESTS] - Avoid warnings Modified: trunk/rostests/apitests/gdi32/GetObject.c trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c trunk/rostests/apitests/user32/desktop.c Modified: trunk/rostests/apitests/gdi32/GetObject.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/gdi32/GetObject.… ============================================================================== --- trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] (original) +++ trunk/rostests/apitests/gdi32/GetObject.c [iso-8859-1] Fri Jun 21 17:22:46 2013 @@ -433,6 +433,7 @@ EXTLOGPEN extlogpen; DWORD dwStyles[50]; } elpUserStyle; + int i; SetLastError(ERROR_SUCCESS); ok(GetObjectA((HANDLE)GDI_OBJECT_TYPE_EXTPEN, 0, NULL) == 0, "\n"); @@ -496,9 +497,8 @@ hPen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 5, &logbrush, 16, (CONST DWORD*)&dwStyles); ok(GetObject(hPen, 0, NULL) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); ok(GetObject(hPen, sizeof(EXTLOGPEN) + 15*sizeof(DWORD), &elpUserStyle) == sizeof(EXTLOGPEN) + 15*sizeof(DWORD), "\n"); - ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[0] == 0, "\n"); - ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[1] == 1, "\n"); - ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[15] == 15, "\n"); + for (i = 0; i <= 15; i++) + ok(((EXTLOGPEN*)&elpUserStyle)->elpStyleEntry[i] == i, "%d\n", i); DeleteObject(hPen); } Modified: trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtAllocate… ============================================================================== --- trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtAllocateVirtualMemory.c [iso-8859-1] Fri Jun 21 17:22:46 2013 @@ -32,6 +32,8 @@ AllocationSize = ((PSIZE_T)UserBuffer)[-2]; DataSize = ((PSIZE_T)UserBuffer)[-1]; + ASSERT(AllocationSize != 0); + ASSERT(AllocationSize % PAGE_SIZE == 0); ASSERT(DataSize != 0); ASSERT(((SIZE_T)UserBuffer + DataSize) % PAGE_SIZE == 0); } Modified: trunk/rostests/apitests/user32/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/user32/desktop.c… ============================================================================== --- trunk/rostests/apitests/user32/desktop.c [iso-8859-1] (original) +++ trunk/rostests/apitests/user32/desktop.c [iso-8859-1] Fri Jun 21 17:22:46 2013 @@ -32,8 +32,8 @@ void do_InitialDesktop_child(int i) { - HDESK hdesktop; - HWINSTA hwinsta; + HDESK hdesktop; + HWINSTA hwinsta; WCHAR buffer[100]; DWORD size; BOOL ret; @@ -47,12 +47,14 @@ IsGUIThread(TRUE); hdesktop = GetThreadDesktop(GetCurrentThreadId()); - hwinsta = GetProcessWindowStation(); + hwinsta = GetProcessWindowStation(); ret = GetUserObjectInformationW( hwinsta, UOI_NAME, buffer, sizeof(buffer), &size ); + ok(ret == TRUE, "ret = %d\n", ret); ok(wcscmp(buffer, TestResults[i].ExpectedWinsta) == 0, "Wrong winsta %S insted of %S\n", buffer, TestResults[i].ExpectedWinsta); ret = GetUserObjectInformationW( hdesktop, UOI_NAME, buffer, sizeof(buffer), &size ); + ok(ret == TRUE, "ret = %d\n", ret); ok(wcscmp(buffer, TestResults[i].ExpectedDesktp) == 0, "Wrong desktop %S insted of %S\n", buffer, TestResults[i].ExpectedDesktp); } @@ -107,12 +109,11 @@ void Test_InitialDesktop(char *argv0) { HWINSTA hwinsta = NULL, hwinstaInitial; - HDESK hdesktop = NULL, hdeskInitial; + HDESK hdesktop = NULL; BOOL ret; hwinstaInitial = GetProcessWindowStation(); - hdeskInitial = GetThreadDesktop(GetCurrentThreadId()); - + test_CreateProcessWithDesktop(0, argv0, NULL, 0); test_CreateProcessWithDesktop(1, argv0, "Default", 0); test_CreateProcessWithDesktop(2, argv0, "WinSta0\\Default", 0); @@ -158,7 +159,7 @@ hDeskInput2 = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); ok(hDeskInput2 != NULL, "Second call to OpenInputDesktop failed\n"); - ok(hDeskInput2 != hDeskInput, "Second call to OpenInputDesktop returned same handle\n"); + ok(hDeskInput2 != hDeskInput, "Second call to OpenInputDesktop returned same handle\n"); ok(CloseDesktop(hDeskInput2) != 0, "CloseDesktop failed\n"); @@ -176,10 +177,10 @@ hwinsta = CreateWindowStationW(L"TestWinsta", 0, WINSTA_ALL_ACCESS, NULL); ok(hwinsta != 0, "CreateWindowStationW failed\n"); - + ret = SetProcessWindowStation(hwinsta); ok(ret != 0, "SetProcessWindowStation failed\n"); - + hDeskInput = OpenInputDesktop(0, FALSE, DESKTOP_ALL_ACCESS); ok(hDeskInput == 0, "OpenInputDesktop should fail\n"); @@ -188,7 +189,7 @@ ret = SetProcessWindowStation(hwinstaInitial); ok(ret != 0, "SetProcessWindowStation failed\n"); - + ret = CloseWindowStation(hwinsta); ok(ret != 0, "CloseWindowStation failed\n"); @@ -211,7 +212,7 @@ do_InitialDesktop_child( arg ); return; } - + Test_InitialDesktop(test_argv[0]); - Test_OpenInputDesktop(); -} + Test_OpenInputDesktop(); +}

1 0

[aandrejevic] 59273: [NTVDM] Change the PIT code to use only one thread, to avoid race conditions. Implement PIT counter reading and latch command.
by aandrejevic＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: aandrejevic Date: Fri Jun 21 13:55:31 2013 New Revision: 59273 URL: http://svn.reactos.org/svn/reactos?rev=59273&view=rev Log: [NTVDM] Change the PIT code to use only one thread, to avoid race conditions. Implement PIT counter reading and latch command. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/hardware.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Jun 21 13:55:31 2013 @@ -76,7 +76,9 @@ PicWriteData(PIC_MASTER_DATA, 0x00); PicWriteData(PIC_SLAVE_DATA, 0x00); - PitInitialize(); + PitWriteCommand(0x34); + PitWriteData(0, 0x00); + PitWriteData(0, 0x00); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Fri Jun 21 13:55:31 2013 @@ -24,64 +24,31 @@ BOOLEAN ReadIsr; } PIC, *PPIC; +enum +{ + PIT_MODE_INT_ON_TERMINAL_COUNT, + PIT_MODE_HARDWARE_ONE_SHOT, + PIT_MODE_RATE_GENERATOR, + PIT_MODE_SQUARE_WAVE, + PIT_MODE_SOFTWARE_STROBE, + PIT_MODE_HARDWARE_STROBE +}; + typedef struct _PIT_CHANNEL { - BOOLEAN RateGenerator; + WORD ReloadValue; + WORD CurrentValue; + WORD LatchedValue; + INT Mode; BOOLEAN Pulsed; - BOOLEAN FlipFlop; + BOOLEAN LatchSet; + BOOLEAN InputFlipFlop; + BOOLEAN OutputFlipFlop; BYTE AccessMode; - WORD ReloadValue; } PIT_CHANNEL, *PPIT_CHANNEL; static PIC MasterPic, SlavePic; static PIT_CHANNEL PitChannels[PIT_CHANNELS]; - -static DWORD WINAPI PitThread(PVOID Parameter) -{ - LARGE_INTEGER Frequency, CurrentTime, LastTickTime; - LONGLONG Elapsed, Milliseconds, TicksNeeded; - UNREFERENCED_PARAMETER(Parameter); - - /* Get the performance counter frequency */ - if (!QueryPerformanceFrequency(&Frequency)) return EXIT_FAILURE; - if (!QueryPerformanceCounter(&LastTickTime)) return EXIT_FAILURE; - - while (VdmRunning) - { - if (!QueryPerformanceCounter(&CurrentTime)) return EXIT_FAILURE; - - /* Calculate the elapsed time, in PIT ticks */ - Elapsed = ((CurrentTime.QuadPart - LastTickTime.QuadPart) - * PIT_BASE_FREQUENCY) - / Frequency.QuadPart; - - /* A reload value of 0 indicates 65536 */ - if (PitChannels[0].ReloadValue) TicksNeeded = PitChannels[0].ReloadValue; - else TicksNeeded = 65536; - - if (Elapsed < TicksNeeded) - { - /* Get the number of milliseconds */ - Milliseconds = (Elapsed * 1000LL) / PIT_BASE_FREQUENCY; - - /* If this number is non-zero, put the thread in the waiting state */ - if (Milliseconds > 0LL) Sleep((DWORD)Milliseconds); - - continue; - } - - LastTickTime = CurrentTime; - - /* Do the IRQ */ - if (PitChannels[0].RateGenerator || !PitChannels[0].Pulsed) - { - PitChannels[0].Pulsed = TRUE; - PicInterruptRequest(0); - } - } - - return EXIT_SUCCESS; -} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -275,39 +242,110 @@ BYTE Channel = Value >> 6; BYTE Mode = (Value >> 1) & 0x07; - /* Set the access mode and reset flip-flop */ - // TODO: Support latch command! + /* Check if this is a counter latch command */ + if (((Value >> 4) & 3) == 0) + { + PitChannels[Channel].LatchSet = TRUE; + PitChannels[Channel].LatchedValue = PitChannels[Channel].CurrentValue; + return; + } + + /* Set the access mode and reset flip-flops */ PitChannels[Channel].AccessMode = (Value >> 4) & 3; - PitChannels[Channel].FlipFlop = FALSE; + PitChannels[Channel].Pulsed = FALSE; + PitChannels[Channel].LatchSet = FALSE; + PitChannels[Channel].InputFlipFlop = FALSE; + PitChannels[Channel].OutputFlipFlop = FALSE; switch (Mode) { case 0: - case 4: - { - PitChannels[Channel].RateGenerator = FALSE; - break; - } - + case 1: case 2: case 3: - { - PitChannels[Channel].RateGenerator = TRUE; + case 4: + case 5: + { + PitChannels[Channel].Mode = Mode; break; } - } + + case 6: + { + PitChannels[Channel].Mode = PIT_MODE_RATE_GENERATOR; + break; + } + + case 7: + { + PitChannels[Channel].Mode = PIT_MODE_SQUARE_WAVE; + break; + } + } +} + +BYTE PitReadData(BYTE Channel) +{ + WORD CurrentValue = PitChannels[Channel].CurrentValue; + BYTE AccessMode = PitChannels[Channel].AccessMode; + + /* Check if the value was latched */ + if (PitChannels[Channel].LatchSet) + { + CurrentValue = PitChannels[Channel].LatchedValue; + + if (AccessMode == 1 || AccessMode == 2) + { + /* The latched value was read as one byte */ + PitChannels[Channel].LatchSet = FALSE; + } + } + + /* Use the flip-flop for access mode 3 */ + if (AccessMode == 3) + { + AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; + PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; + + /* Check if this was the last read for the latched value */ + if (!PitChannels[Channel].InputFlipFlop) + { + /* Yes, the latch value was read as two bytes */ + PitChannels[Channel].LatchSet = FALSE; + } + } + + switch (AccessMode) + { + case 1: + { + /* Low byte */ + return CurrentValue & 0x00FF; + } + + case 2: + { + /* High byte */ + return CurrentValue >> 8; + } + } + + /* Shouldn't get here */ + return 0; } VOID PitWriteData(BYTE Channel, BYTE Value) { + BYTE AccessMode = PitChannels[Channel].AccessMode; + /* Use the flip-flop for access mode 3 */ if (PitChannels[Channel].AccessMode == 3) { - PitChannels[Channel].AccessMode = PitChannels[Channel].FlipFlop ? 1 : 2; - PitChannels[Channel].FlipFlop = !PitChannels[Channel].FlipFlop; - } - - switch (PitChannels[Channel].AccessMode) + AccessMode = PitChannels[Channel].InputFlipFlop ? 1 : 2; + PitChannels[Channel].InputFlipFlop = !PitChannels[Channel].InputFlipFlop; + } + + switch (AccessMode) { case 1: { @@ -326,20 +364,90 @@ } } -VOID PitInitialize() -{ - HANDLE ThreadHandle; - - /* Set up channel 0 */ - PitChannels[0].ReloadValue = 0; - PitChannels[0].RateGenerator = TRUE; - PitChannels[0].Pulsed = FALSE; - PitChannels[0].AccessMode = 3; - PitChannels[0].FlipFlop = FALSE; - - /* Create the PIT timer thread */ - ThreadHandle = CreateThread(NULL, 0, PitThread, NULL, 0, NULL); - - /* We don't need the handle */ - CloseHandle(ThreadHandle); -} +VOID PitDecrementCount() +{ + INT i; + + for (i = 0; i < PIT_CHANNELS; i++) + { + switch (PitChannels[i].Mode) + { + case PIT_MODE_INT_ON_TERMINAL_COUNT: + { + /* Decrement the value */ + PitChannels[i].CurrentValue--; + + /* Did it fall to the terminal count? */ + if (PitChannels[i].CurrentValue == 0 && !PitChannels[i].Pulsed) + { + /* Yes, raise the output line */ + if (i == 0) PicInterruptRequest(0); + PitChannels[i].Pulsed = TRUE; + } + break; + } + + case PIT_MODE_RATE_GENERATOR: + { + /* Decrement the value */ + PitChannels[i].CurrentValue--; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue != 0) break; + + /* Yes, raise the output line and reload */ + if (i == 0) PicInterruptRequest(0); + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + + break; + } + + case PIT_MODE_SQUARE_WAVE: + { + /* Decrement the value by 2 */ + PitChannels[i].CurrentValue -= 2; + + /* Did it fall to zero? */ + if (PitChannels[i].CurrentValue != 0) break; + + /* Yes, toggle the flip-flop */ + PitChannels[i].OutputFlipFlop = !PitChannels[i].OutputFlipFlop; + + /* Did this create a rising edge in the signal? */ + if (PitChannels[i].OutputFlipFlop) + { + /* Yes, IRQ 0 if this is channel 0 */ + if (i == 0) PicInterruptRequest(0); + } + + /* Reload the value, but make sure it's even */ + if (PitChannels[i].ReloadValue % 2) + { + /* It's odd, reduce it by 1 */ + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue - 1; + } + else + { + /* It was even */ + PitChannels[i].CurrentValue = PitChannels[i].ReloadValue; + } + + break; + } + + case PIT_MODE_SOFTWARE_STROBE: + { + // TODO: NOT IMPLEMENTED + break; + } + + case PIT_MODE_HARDWARE_ONE_SHOT: + case PIT_MODE_HARDWARE_STROBE: + { + /* These modes do not work on x86 PCs */ + break; + } + } + } +} + Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Fri Jun 21 13:55:31 2013 @@ -57,6 +57,8 @@ INT i; BOOLEAN PrintUsage = TRUE; CHAR CommandLine[128]; + LARGE_INTEGER Frequency, LastTimerTick, Counter; + LONGLONG TimerTicks; /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); @@ -96,6 +98,13 @@ } if (!EmulatorInitialize()) return 1; + + /* Initialize the performance counter (needed for hardware timers) */ + if (!QueryPerformanceFrequency(&Frequency)) + { + wprintf(L"FATAL: Performance counter not available\n"); + goto Cleanup; + } /* Initialize the system BIOS */ if (!BiosInitialize()) @@ -117,9 +126,27 @@ DisplayMessage(L"Could not start program: %S", CommandLine); return -1; } + + /* Set the last timer tick to the current time */ + QueryPerformanceCounter(&LastTimerTick); /* Main loop */ - while (VdmRunning) EmulatorStep(); + while (VdmRunning) + { + /* Get the current time */ + QueryPerformanceCounter(&Counter); + + /* Get the number of PIT ticks that have passed */ + TimerTicks = ((Counter.QuadPart - LastTimerTick.QuadPart) + * PIT_BASE_FREQUENCY) / Frequency.QuadPart; + + /* Update the PIT */ + for (i = 0; i < TimerTicks; i++) PitDecrementCount(); + LastTimerTick = Counter; + + /* Continue CPU emulation */ + EmulatorStep(); + } Cleanup: EmulatorCleanup(); Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Jun 21 13:55:31 2013 @@ -216,7 +216,9 @@ VOID PicInterruptRequest(BYTE Number); VOID PitInitialize(); VOID PitWriteCommand(BYTE Value); +BYTE PitReadData(BYTE Channel); VOID PitWriteData(BYTE Channel, BYTE Value); +VOID PitDecrementCount(); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number);

1 0

[aandrejevic] 59272: [NTVDM] Fix the PIC IRQ code. Interrupt requests only occur when no higher-priority IRQ is busy.
by aandrejevic＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: aandrejevic Date: Fri Jun 21 01:44:56 2013 New Revision: 59272 URL: http://svn.reactos.org/svn/reactos?rev=59272&view=rev Log: [NTVDM] Fix the PIC IRQ code. Interrupt requests only occur when no higher-priority IRQ is busy. Modified: branches/ntvdm/subsystems/ntvdm/hardware.c Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Fri Jun 21 01:44:56 2013 @@ -219,17 +219,21 @@ } VOID PicInterruptRequest(BYTE Number) -{ +{ + BYTE i; + if (Number >= 0 && Number < 8) { - /* Check if the interrupt is busy, in a cascade or masked */ - if (MasterPic.CascadeRegister & (1 << Number) - || MasterPic.InServiceRegister & (1 << Number) - || MasterPic.MaskRegister & (1 << Number)) - { - return; - } - + /* Check if any of the higher-priorirty interrupts are busy */ + for (i = 0; i <= Number ; i++) + { + if (MasterPic.InServiceRegister & (1 << Number)) return; + } + + /* Check if the interrupt is masked */ + if (MasterPic.MaskRegister & (1 << Number)) return; + + /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; EmulatorInterrupt(MasterPic.IntOffset + Number); } @@ -246,22 +250,21 @@ { return; } - - /* Check the if the slave PIC is busy or masked */ - if (MasterPic.InServiceRegister & (1 << 2) - || MasterPic.MaskRegister & (1 << 2)) return; + + /* Check if any of the higher-priorirty interrupts are busy */ + if (MasterPic.InServiceRegister != 0) return; + for (i = 0; i <= Number ; i++) + { + if (SlavePic.InServiceRegister & (1 << Number)) return; + } + + /* Check if the interrupt is masked */ + if (SlavePic.MaskRegister & (1 << Number)) return; /* Set the IRQ 2 bit in the master ISR */ if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; - - /* Check if the interrupt is busy, in a cascade or masked */ - if (SlavePic.CascadeRegister & (1 << Number) - || SlavePic.InServiceRegister & (1 << Number) - || SlavePic.MaskRegister & (1 << Number)) - { - return; - } - + + /* Set the appropriate bit in the ISR and interrupt the CPU */ if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; EmulatorInterrupt(SlavePic.IntOffset + Number); }

1 0

[aandrejevic] 59271: [NTVDM] Implement Programmable Interval Timer (PIT) emulation. Fix bugs in interrupts and PIC emulation.
by aandrejevic＠svn.reactos.org 21 Jun '13

21 Jun '13

Author: aandrejevic Date: Fri Jun 21 00:47:07 2013 New Revision: 59271 URL: http://svn.reactos.org/svn/reactos?rev=59271&view=rev Log: [NTVDM] Implement Programmable Interval Timer (PIT) emulation. Fix bugs in interrupts and PIC emulation. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/hardware.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Fri Jun 21 00:47:07 2013 @@ -71,6 +71,12 @@ /* Make sure the PIC is in 8086 mode */ PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086); PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086); + + /* Clear the masks for both PICs */ + PicWriteData(PIC_MASTER_DATA, 0x00); + PicWriteData(PIC_SLAVE_DATA, 0x00); + + PitInitialize(); return TRUE; } @@ -251,4 +257,9 @@ } } +VOID BiosHandleIrq(BYTE IrqNumber) +{ + PicWriteCommand(PIC_MASTER_CMD, PIC_OCW2_EOI); +} + /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Fri Jun 21 00:47:07 2013 @@ -56,12 +56,58 @@ static VOID EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { - // TODO: NOT IMPLEMENTED! + switch (Address) + { + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + *Buffer = PicReadCommand(Address); + break; + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + *Buffer = PicReadData(Address); + break; + } + } } static VOID EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { - // TODO: NOT IMPLEMENTED! + BYTE Byte = *Buffer; + + switch (Address) + { + case PIT_COMMAND_PORT: + { + PitWriteCommand(Byte); + break; + } + + case PIT_DATA_PORT(0): + case PIT_DATA_PORT(1): + case PIT_DATA_PORT(2): + { + PitWriteData(Address - PIT_DATA_PORT(0), Byte); + break; + } + + case PIC_MASTER_CMD: + case PIC_SLAVE_CMD: + { + PicWriteCommand(Address, Byte); + break; + } + + case PIC_MASTER_DATA: + case PIC_SLAVE_DATA: + { + PicWriteData(Address, Byte); + break; + } + } } static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number) @@ -100,6 +146,18 @@ /* Stop the VDM */ VdmRunning = FALSE; return; + } + + /* Check if this was an PIC IRQ */ + if (IntNum >= BIOS_PIC_MASTER_INT && IntNum < BIOS_PIC_MASTER_INT + 8) + { + /* It was an IRQ from the master PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_MASTER_INT); + } + else if (IntNum >= BIOS_PIC_SLAVE_INT && IntNum < BIOS_PIC_SLAVE_INT + 8) + { + /* It was an IRQ from the slave PIC */ + BiosHandleIrq(IntNum - BIOS_PIC_SLAVE_INT + 8); } switch (IntNum) @@ -183,7 +241,7 @@ VOID EmulatorInterrupt(BYTE Number) { - LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); + LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); UINT Segment, Offset; /* Get the segment and offset */ Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Fri Jun 21 00:47:07 2013 @@ -24,7 +24,64 @@ BOOLEAN ReadIsr; } PIC, *PPIC; +typedef struct _PIT_CHANNEL +{ + BOOLEAN RateGenerator; + BOOLEAN Pulsed; + BOOLEAN FlipFlop; + BYTE AccessMode; + WORD ReloadValue; +} PIT_CHANNEL, *PPIT_CHANNEL; + static PIC MasterPic, SlavePic; +static PIT_CHANNEL PitChannels[PIT_CHANNELS]; + +static DWORD WINAPI PitThread(PVOID Parameter) +{ + LARGE_INTEGER Frequency, CurrentTime, LastTickTime; + LONGLONG Elapsed, Milliseconds, TicksNeeded; + UNREFERENCED_PARAMETER(Parameter); + + /* Get the performance counter frequency */ + if (!QueryPerformanceFrequency(&Frequency)) return EXIT_FAILURE; + if (!QueryPerformanceCounter(&LastTickTime)) return EXIT_FAILURE; + + while (VdmRunning) + { + if (!QueryPerformanceCounter(&CurrentTime)) return EXIT_FAILURE; + + /* Calculate the elapsed time, in PIT ticks */ + Elapsed = ((CurrentTime.QuadPart - LastTickTime.QuadPart) + * PIT_BASE_FREQUENCY) + / Frequency.QuadPart; + + /* A reload value of 0 indicates 65536 */ + if (PitChannels[0].ReloadValue) TicksNeeded = PitChannels[0].ReloadValue; + else TicksNeeded = 65536; + + if (Elapsed < TicksNeeded) + { + /* Get the number of milliseconds */ + Milliseconds = (Elapsed * 1000LL) / PIT_BASE_FREQUENCY; + + /* If this number is non-zero, put the thread in the waiting state */ + if (Milliseconds > 0LL) Sleep((DWORD)Milliseconds); + + continue; + } + + LastTickTime = CurrentTime; + + /* Do the IRQ */ + if (PitChannels[0].RateGenerator || !PitChannels[0].Pulsed) + { + PitChannels[0].Pulsed = TRUE; + PicInterruptRequest(0); + } + } + + return EXIT_SUCCESS; +} /* PUBLIC FUNCTIONS ***********************************************************/ @@ -165,14 +222,15 @@ { if (Number >= 0 && Number < 8) { - /* Check if the interrupt is busy or in a cascade */ + /* Check if the interrupt is busy, in a cascade or masked */ if (MasterPic.CascadeRegister & (1 << Number) - || MasterPic.InServiceRegister & (1 << Number)) + || MasterPic.InServiceRegister & (1 << Number) + || MasterPic.MaskRegister & (1 << Number)) { return; } - MasterPic.InServiceRegister |= 1 << Number; + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << Number; EmulatorInterrupt(MasterPic.IntOffset + Number); } else if (Number >= 8 && Number < 16) @@ -189,20 +247,96 @@ return; } - /* Check the if the slave PIC is busy */ - if (MasterPic.InServiceRegister & (1 << 2)) return; + /* Check the if the slave PIC is busy or masked */ + if (MasterPic.InServiceRegister & (1 << 2) + || MasterPic.MaskRegister & (1 << 2)) return; /* Set the IRQ 2 bit in the master ISR */ - MasterPic.InServiceRegister |= 1 << 2; - - /* Check if the interrupt is busy or in a cascade */ + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; + + /* Check if the interrupt is busy, in a cascade or masked */ if (SlavePic.CascadeRegister & (1 << Number) - || SlavePic.InServiceRegister & (1 << Number)) + || SlavePic.InServiceRegister & (1 << Number) + || SlavePic.MaskRegister & (1 << Number)) { return; } - SlavePic.InServiceRegister |= 1 << Number; + if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; EmulatorInterrupt(SlavePic.IntOffset + Number); } } + +VOID PitWriteCommand(BYTE Value) +{ + BYTE Channel = Value >> 6; + BYTE Mode = (Value >> 1) & 0x07; + + /* Set the access mode and reset flip-flop */ + // TODO: Support latch command! + PitChannels[Channel].AccessMode = (Value >> 4) & 3; + PitChannels[Channel].FlipFlop = FALSE; + + switch (Mode) + { + case 0: + case 4: + { + PitChannels[Channel].RateGenerator = FALSE; + break; + } + + case 2: + case 3: + { + PitChannels[Channel].RateGenerator = TRUE; + break; + } + } +} + +VOID PitWriteData(BYTE Channel, BYTE Value) +{ + /* Use the flip-flop for access mode 3 */ + if (PitChannels[Channel].AccessMode == 3) + { + PitChannels[Channel].AccessMode = PitChannels[Channel].FlipFlop ? 1 : 2; + PitChannels[Channel].FlipFlop = !PitChannels[Channel].FlipFlop; + } + + switch (PitChannels[Channel].AccessMode) + { + case 1: + { + /* Low byte */ + PitChannels[Channel].ReloadValue &= 0xFF00; + PitChannels[Channel].ReloadValue |= Value; + break; + } + + case 2: + { + /* High byte */ + PitChannels[Channel].ReloadValue &= 0x00FF; + PitChannels[Channel].ReloadValue |= Value << 8; + } + } +} + +VOID PitInitialize() +{ + HANDLE ThreadHandle; + + /* Set up channel 0 */ + PitChannels[0].ReloadValue = 0; + PitChannels[0].RateGenerator = TRUE; + PitChannels[0].Pulsed = FALSE; + PitChannels[0].AccessMode = 3; + PitChannels[0].FlipFlop = FALSE; + + /* Create the PIT timer thread */ + ThreadHandle = CreateThread(NULL, 0, PitThread, NULL, 0, NULL); + + /* We don't need the handle */ + CloseHandle(ThreadHandle); +} Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Fri Jun 21 00:47:07 2013 @@ -208,11 +208,15 @@ VOID DosInt21h(WORD CodeSegment); VOID DosBreakInterrupt(); VOID BiosVideoService(); +VOID BiosHandleIrq(BYTE IrqNumber); BYTE PicReadCommand(BYTE Port); VOID PicWriteCommand(BYTE Port, BYTE Value); BYTE PicReadData(BYTE Port); VOID PicWriteData(BYTE Port, BYTE Value); VOID PicInterruptRequest(BYTE Number); +VOID PitInitialize(); +VOID PitWriteCommand(BYTE Value); +VOID PitWriteData(BYTE Channel, BYTE Value); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number);

1 0

[ekohl] 59270: [NETAPI32] NetUserSetInfo: Implement usriX_acct_expires for levels 2, 3, 4 and 1017.
by ekohl＠svn.reactos.org 20 Jun '13

20 Jun '13

Author: ekohl Date: Thu Jun 20 21:54:42 2013 New Revision: 59270 URL: http://svn.reactos.org/svn/reactos?rev=59270&view=rev Log: [NETAPI32] NetUserSetInfo: Implement usriX_acct_expires for levels 2, 3, 4 and 1017. Modified: trunk/reactos/dll/win32/netapi32/user.c Modified: trunk/reactos/dll/win32/netapi32/user.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/user.c?… ============================================================================== --- trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/user.c [iso-8859-1] Thu Jun 20 21:54:42 2013 @@ -1323,6 +1323,7 @@ PUSER_INFO_1012 UserInfo1012; PUSER_INFO_1013 UserInfo1013; PUSER_INFO_1014 UserInfo1014; + PUSER_INFO_1017 UserInfo1017; PUSER_INFO_1024 UserInfo1024; PUSER_INFO_1025 UserInfo1025; PUSER_INFO_1051 UserInfo1051; @@ -1460,7 +1461,18 @@ // usri2_last_logon ignored // usri2_last_logoff ignored -// UserInfo2->usri2_acct_expires; + if (UserInfo2->usri2_acct_expires == TIMEQ_FOREVER) + { + UserAllInfo.AccountExpires.LowPart = 0; + UserAllInfo.AccountExpires.HighPart = 0; + } + else + { + RtlSecondsSince1970ToTime(UserInfo2->usri2_acct_expires, + &UserAllInfo.AccountExpires); + } + UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; + // UserInfo2->usri2_max_storage; // UserInfo2->usri2_units_per_week; // UserInfo2->usri2_logon_hours; @@ -1550,7 +1562,18 @@ // usri3_last_logon ignored // usri3_last_logoff ignored -// UserInfo3->usri3_acct_expires; + if (UserInfo3->usri3_acct_expires == TIMEQ_FOREVER) + { + UserAllInfo.AccountExpires.LowPart = 0; + UserAllInfo.AccountExpires.HighPart = 0; + } + else + { + RtlSecondsSince1970ToTime(UserInfo3->usri3_acct_expires, + &UserAllInfo.AccountExpires); + } + UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; + // UserInfo3->usri3_max_storage; // UserInfo3->usri3_units_per_week; // UserInfo3->usri3_logon_hours; @@ -1662,7 +1685,18 @@ // usri4_last_logon ignored // usri4_last_logoff ignored -// UserInfo3->usri4_acct_expires; + if (UserInfo4->usri4_acct_expires == TIMEQ_FOREVER) + { + UserAllInfo.AccountExpires.LowPart = 0; + UserAllInfo.AccountExpires.HighPart = 0; + } + else + { + RtlSecondsSince1970ToTime(UserInfo4->usri4_acct_expires, + &UserAllInfo.AccountExpires); + } + UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; + // UserInfo3->usri4_max_storage; // UserInfo3->usri4_units_per_week; // UserInfo3->usri4_logon_hours; @@ -1802,7 +1836,22 @@ } break; -// case 1017: + case 1017: + UserInfo1017 = (PUSER_INFO_1017)UserInfo; + + if (UserInfo1017->usri1017_acct_expires == TIMEQ_FOREVER) + { + UserAllInfo.AccountExpires.LowPart = 0; + UserAllInfo.AccountExpires.HighPart = 0; + } + else + { + RtlSecondsSince1970ToTime(UserInfo1017->usri1017_acct_expires, + &UserAllInfo.AccountExpires); + } + UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; + break; + // case 1018: // case 1020:

1 0

[aandrejevic] 59269: [NTVDM] Make sure bit 2 in the ISR of the master PIC is set when an IRQ in the slave PIC occurs.
by aandrejevic＠svn.reactos.org 20 Jun '13

20 Jun '13

Author: aandrejevic Date: Thu Jun 20 19:43:29 2013 New Revision: 59269 URL: http://svn.reactos.org/svn/reactos?rev=59269&view=rev Log: [NTVDM] Make sure bit 2 in the ISR of the master PIC is set when an IRQ in the slave PIC occurs. Modified: branches/ntvdm/subsystems/ntvdm/hardware.c Modified: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Thu Jun 20 19:43:29 2013 @@ -188,6 +188,12 @@ { return; } + + /* Check the if the slave PIC is busy */ + if (MasterPic.InServiceRegister & (1 << 2)) return; + + /* Set the IRQ 2 bit in the master ISR */ + MasterPic.InServiceRegister |= 1 << 2; /* Check if the interrupt is busy or in a cascade */ if (SlavePic.CascadeRegister & (1 << Number)

1 0

[aandrejevic] 59268: [NTVDM] Implement 8259 Programmable Interrupt Controller emulation.
by aandrejevic＠svn.reactos.org 20 Jun '13

20 Jun '13

Author: aandrejevic Date: Thu Jun 20 19:00:07 2013 New Revision: 59268 URL: http://svn.reactos.org/svn/reactos?rev=59268&view=rev Log: [NTVDM] Implement 8259 Programmable Interrupt Controller emulation. Added: branches/ntvdm/subsystems/ntvdm/hardware.c (with props) Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/CMakeLists.txt [iso-8859-1] Thu Jun 20 19:00:07 2013 @@ -5,6 +5,7 @@ bios.c dos.c emulator.c + hardware.c ntvdm.c ntvdm.rc) Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Thu Jun 20 19:00:07 2013 @@ -55,6 +55,22 @@ CursorRow = ConsoleInfo.dwCursorPosition.Y; ConsoleWidth = ConsoleInfo.dwSize.X; ConsoleHeight = ConsoleInfo.dwSize.Y; + + /* Initialize the PIC */ + PicWriteCommand(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); + PicWriteCommand(PIC_SLAVE_CMD, PIC_ICW1 | PIC_ICW1_ICW4); + + /* Set the interrupt offsets */ + PicWriteData(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT); + PicWriteData(PIC_SLAVE_DATA, BIOS_PIC_SLAVE_INT); + + /* Tell the master PIC there is a slave at IRQ 2 */ + PicWriteData(PIC_MASTER_DATA, 1 << 2); + PicWriteData(PIC_SLAVE_DATA, 2); + + /* Make sure the PIC is in 8086 mode */ + PicWriteData(PIC_MASTER_DATA, PIC_ICW4_8086); + PicWriteData(PIC_SLAVE_DATA, PIC_ICW4_8086); return TRUE; } Added: branches/ntvdm/subsystems/ntvdm/hardware.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware.c (added) +++ branches/ntvdm/subsystems/ntvdm/hardware.c [iso-8859-1] Thu Jun 20 19:00:07 2013 @@ -0,0 +1,202 @@ +/* + * COPYRIGHT: GPL - See COPYING in the top level directory + * PROJECT: ReactOS Virtual DOS Machine + * FILE: hardware.c + * PURPOSE: Minimal hardware emulation + * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + */ + +/* INCLUDES *******************************************************************/ + +#include "ntvdm.h" + +typedef struct _PIC +{ + BOOLEAN Initialization; + BYTE MaskRegister; + BYTE InServiceRegister; + BYTE IntOffset; + BYTE ConfigRegister; + BYTE CascadeRegister; + BOOLEAN CascadeRegisterSet; + BOOLEAN AutoEoi; + BOOLEAN Slave; + BOOLEAN ReadIsr; +} PIC, *PPIC; + +static PIC MasterPic, SlavePic; + +/* PUBLIC FUNCTIONS ***********************************************************/ + +BYTE PicReadCommand(BYTE Port) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_CMD) Pic = &MasterPic; + else Pic = &SlavePic; + + if (Pic->ReadIsr) + { + /* Read the in-service register */ + Pic->ReadIsr = FALSE; + return Pic->InServiceRegister; + } + else + { + /* The IRR is always 0, as the emulated CPU receives the interrupt instantly */ + return 0; + } +} + +VOID PicWriteCommand(BYTE Port, BYTE Value) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_CMD) Pic = &MasterPic; + else Pic = &SlavePic; + + if (Value & PIC_ICW1) + { + /* Start initialization */ + Pic->Initialization = TRUE; + Pic->IntOffset = 0xFF; + Pic->CascadeRegisterSet = FALSE; + Pic->ConfigRegister = Value; + return; + } + + if (Value & PIC_OCW3) + { + /* This is an OCR3 */ + if (Value == PIC_OCW3_READ_ISR) + { + /* Return the ISR on next read from command port */ + Pic->ReadIsr = TRUE; + } + + return; + } + + /* This is an OCW2 */ + if (Value & PIC_OCW2_EOI) + { + if (Value & PIC_OCW2_SL) + { + /* If the SL bit is set, clear a specific IRQ */ + Pic->InServiceRegister &= ~(1 << (Value & PIC_OCW2_NUM_MASK)); + } + else + { + /* Otherwise, clear all of them */ + Pic->InServiceRegister = 0; + } + } +} + +BYTE PicReadData(BYTE Port) +{ + /* Read the mask register */ + if (Port == PIC_MASTER_DATA) return MasterPic.MaskRegister; + else return SlavePic.MaskRegister; +} + +VOID PicWriteData(BYTE Port, BYTE Value) +{ + PPIC Pic; + + /* Which PIC are we accessing? */ + if (Port == PIC_MASTER_DATA) Pic = &MasterPic; + else Pic = &SlavePic; + + /* Is the PIC ready? */ + if (!Pic->Initialization) + { + /* Yes, this is an OCW1 */ + Pic->MaskRegister = Value; + return; + } + + /* Has the interrupt offset been set? */ + if (Pic->IntOffset == 0xFF) + { + /* This is an ICW2, set the offset (last three bits always zero) */ + Pic->IntOffset = Value & 0xF8; + + /* Check if we are in single mode and don't need an ICW4 */ + if ((Pic->ConfigRegister & PIC_ICW1_SINGLE) + && !(Pic->ConfigRegister & PIC_ICW1_ICW4)) + { + /* Yes, done initializing */ + Pic->Initialization = FALSE; + } + return; + } + + /* Check if we are in cascade mode and the cascade register was not set */ + if (!(Pic->ConfigRegister & PIC_ICW1_SINGLE) && !Pic->CascadeRegisterSet) + { + /* This is an ICW3 */ + Pic->CascadeRegister = Value; + Pic->CascadeRegisterSet = TRUE; + + /* Check if we need an ICW4 */ + if (!(Pic->ConfigRegister & PIC_ICW1_ICW4)) + { + /* No, done initializing */ + Pic->Initialization = FALSE; + } + return; + } + + /* This must be an ICW4, we will ignore the 8086 bit (assume always set) */ + if (Value & PIC_ICW4_AEOI) + { + /* Use automatic end-of-interrupt */ + Pic->AutoEoi = TRUE; + } + + /* Done initializing */ + Pic->Initialization = FALSE; +} + +VOID PicInterruptRequest(BYTE Number) +{ + if (Number >= 0 && Number < 8) + { + /* Check if the interrupt is busy or in a cascade */ + if (MasterPic.CascadeRegister & (1 << Number) + || MasterPic.InServiceRegister & (1 << Number)) + { + return; + } + + MasterPic.InServiceRegister |= 1 << Number; + EmulatorInterrupt(MasterPic.IntOffset + Number); + } + else if (Number >= 8 && Number < 16) + { + Number -= 8; + + /* + * The slave PIC is connected to IRQ 2, always! If the master PIC + * was misconfigured, don't do anything. + */ + if (!(MasterPic.CascadeRegister & (1 << 2)) + || SlavePic.CascadeRegister != 2) + { + return; + } + + /* Check if the interrupt is busy or in a cascade */ + if (SlavePic.CascadeRegister & (1 << Number) + || SlavePic.InServiceRegister & (1 << Number)) + { + return; + } + + SlavePic.InServiceRegister |= 1 << Number; + EmulatorInterrupt(SlavePic.IntOffset + Number); + } +} Propchange: branches/ntvdm/subsystems/ntvdm/hardware.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Thu Jun 20 19:00:07 2013 @@ -23,6 +23,8 @@ #define MAX_ADDRESS TO_LINEAR(MAX_SEGMENT, MAX_OFFSET) #define ROM_AREA_START 0xC0000 #define ROM_AREA_END 0xFFFFF +#define BIOS_PIC_MASTER_INT 0x08 +#define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 #define VIDEO_BIOS_INTERRUPT 0x10 #define SPECIAL_INT_NUM 0xFF @@ -42,6 +44,28 @@ #define CONSOLE_FONT_HEIGHT 8 #define CONSOLE_VIDEO_MEM_START 0xB8000 #define CONSOLE_VIDEO_MEM_END 0xBFFFF + +/* Programmable interval timer (PIT) */ +#define PIT_CHANNELS 3 +#define PIT_BASE_FREQUENCY 1193182LL +#define PIT_DATA_PORT(x) (0x40 + (x)) +#define PIT_COMMAND_PORT 0x43 + +/* Programmable interrupt controller (PIC) */ +#define PIC_MASTER_CMD 0x20 +#define PIC_MASTER_DATA 0x21 +#define PIC_SLAVE_CMD 0xA0 +#define PIC_SLAVE_DATA 0xA1 +#define PIC_ICW1 0x10 +#define PIC_ICW1_ICW4 (1 << 0) +#define PIC_ICW1_SINGLE (1 << 1) +#define PIC_ICW4_8086 (1 << 0) +#define PIC_ICW4_AEOI (1 << 1) +#define PIC_OCW2_NUM_MASK 0x07 +#define PIC_OCW2_EOI (1 << 5) +#define PIC_OCW2_SL (1 << 6) +#define PIC_OCW3 (1 << 3) +#define PIC_OCW3_READ_ISR 0x0B #define EMULATOR_FLAG_CF (1 << 0) #define EMULATOR_FLAG_PF (1 << 2) @@ -184,6 +208,11 @@ VOID DosInt21h(WORD CodeSegment); VOID DosBreakInterrupt(); VOID BiosVideoService(); +BYTE PicReadCommand(BYTE Port); +VOID PicWriteCommand(BYTE Port, BYTE Value); +BYTE PicReadData(BYTE Port); +VOID PicWriteData(BYTE Port, BYTE Value); +VOID PicInterruptRequest(BYTE Number); VOID EmulatorSetStack(WORD Segment, WORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs