Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 60769: [NTVDM]: Fix the callback prototypes.
by hbelusca＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: hbelusca Date: Sun Oct 27 12:17:06 2013 New Revision: 60769 URL: http://svn.reactos.org/svn/reactos?rev=60769&view=rev Log: [NTVDM]: Fix the callback prototypes. Modified: branches/ntvdm/subsystems/ntvdm/emulator.c 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] Sun Oct 27 12:17:06 2013 @@ -26,9 +26,9 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static VOID WINAPI EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) -{ - UNREFERENCED_PARAMETER(Context); +static VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -44,16 +44,16 @@ && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); - LPBYTE VgaBuffer = &Buffer[VgaAddress - Address]; + LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); /* Read from the VGA memory */ VgaReadMemory(VgaAddress, VgaBuffer, Size); } } -static VOID WINAPI EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) -{ - UNREFERENCED_PARAMETER(Context); +static VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) +{ + UNREFERENCED_PARAMETER(State); /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -72,31 +72,33 @@ && (Address < VgaGetVideoLimitAddress())) { DWORD VgaAddress = max(Address, VgaGetVideoBaseAddress()); - LPBYTE VgaBuffer = &Buffer[VgaAddress - Address]; + LPBYTE VgaBuffer = (LPBYTE)((ULONG_PTR)Buffer + VgaAddress - Address); /* Write to the VGA memory */ VgaWriteMemory(VgaAddress, VgaBuffer, Size); } } -static VOID WINAPI EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) -{ - UNREFERENCED_PARAMETER(Context); +static VOID WINAPI EmulatorReadIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +{ + LPBYTE Address = (LPBYTE)Buffer; + + UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Size); - switch (Address) + switch (Port) { case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { - *Buffer = PicReadCommand(Address); + *Address = PicReadCommand(Port); break; } case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { - *Buffer = PicReadData(Address); + *Address = PicReadData(Port); break; } @@ -104,19 +106,19 @@ case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): { - *Buffer = PitReadData(Address - PIT_DATA_PORT(0)); + *Address = PitReadData(Port - PIT_DATA_PORT(0)); break; } case PS2_CONTROL_PORT: { - *Buffer = KeyboardReadStatus(); + *Address = KeyboardReadStatus(); break; } case PS2_DATA_PORT: { - *Buffer = KeyboardReadData(); + *Address = KeyboardReadData(); break; } @@ -136,25 +138,25 @@ case VGA_STAT_MONO: case VGA_STAT_COLOR: { - *Buffer = VgaReadPort(Address); + *Address = VgaReadPort(Port); break; } default: { - DPRINT1("Read from unknown port: 0x%X\n", Address); - } - } -} - -static VOID WINAPI EmulatorWriteIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) -{ - BYTE Byte = *Buffer; - - UNREFERENCED_PARAMETER(Context); + DPRINT1("Read from unknown port: 0x%X\n", Port); + } + } +} + +static VOID WINAPI EmulatorWriteIo(PFAST486_STATE State, ULONG Port, PVOID Buffer, ULONG Size) +{ + BYTE Byte = *(LPBYTE)Buffer; + + UNREFERENCED_PARAMETER(State); UNREFERENCED_PARAMETER(Size); - switch (Address) + switch (Port) { case PIT_COMMAND_PORT: { @@ -166,21 +168,21 @@ case PIT_DATA_PORT(1): case PIT_DATA_PORT(2): { - PitWriteData(Address - PIT_DATA_PORT(0), Byte); + PitWriteData(Port - PIT_DATA_PORT(0), Byte); break; } case PIC_MASTER_CMD: case PIC_SLAVE_CMD: { - PicWriteCommand(Address, Byte); + PicWriteCommand(Port, Byte); break; } case PIC_MASTER_DATA: case PIC_SLAVE_DATA: { - PicWriteData(Address, Byte); + PicWriteData(Port, Byte); break; } @@ -212,18 +214,18 @@ case VGA_STAT_MONO: case VGA_STAT_COLOR: { - VgaWritePort(Address, Byte); + VgaWritePort(Port, Byte); break; } default: { - DPRINT1("Write to unknown port: 0x%X\n", Address); - } - } -} - -static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, WORD Code) + DPRINT1("Write to unknown port: 0x%X\n", Port); + } + } +} + +static VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, USHORT BopCode) { WORD StackSegment, StackPointer, CodeSegment, InstructionPointer; BYTE IntNum; @@ -236,7 +238,7 @@ /* Get the stack */ Stack = (LPWORD)((ULONG_PTR)BaseAddress + TO_LINEAR(StackSegment, StackPointer)); - if (Code == EMULATOR_INT_BOP) + if (BopCode == EMULATOR_INT_BOP) { /* Get the interrupt number */ IntNum = LOBYTE(Stack[STACK_INT_NUM]); @@ -329,7 +331,7 @@ } } -static BYTE WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) +static UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); @@ -346,12 +348,12 @@ if (BaseAddress == NULL) return FALSE; /* Set the callbacks */ - EmulatorContext.MemReadCallback = (FAST486_MEM_READ_PROC)EmulatorReadMemory; - EmulatorContext.MemWriteCallback = (FAST486_MEM_WRITE_PROC)EmulatorWriteMemory; - EmulatorContext.IoReadCallback = (FAST486_IO_READ_PROC)EmulatorReadIo; - EmulatorContext.IoWriteCallback = (FAST486_IO_WRITE_PROC)EmulatorWriteIo; - EmulatorContext.BopCallback = EmulatorBiosOperation; - EmulatorContext.IntAckCallback = EmulatorIntAcknowledge; + EmulatorContext.MemReadCallback = EmulatorReadMemory; + EmulatorContext.MemWriteCallback = EmulatorWriteMemory; + EmulatorContext.IoReadCallback = EmulatorReadIo; + EmulatorContext.IoWriteCallback = EmulatorWriteIo; + EmulatorContext.BopCallback = EmulatorBiosOperation; + EmulatorContext.IntAckCallback = EmulatorIntAcknowledge; /* Reset the CPU */ Fast486Reset(&EmulatorContext);

1 0

[ekohl] 60768: [INF] Add the remaining privilege definitons.
by ekohl＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: ekohl Date: Sun Oct 27 12:13:42 2013 New Revision: 60768 URL: http://svn.reactos.org/svn/reactos?rev=60768&view=rev Log: [INF] Add the remaining privilege definitons. Modified: trunk/reactos/media/inf/defltws.inf Modified: trunk/reactos/media/inf/defltws.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/defltws.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/defltws.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/defltws.inf [iso-8859-1] Sun Oct 27 12:13:42 2013 @@ -7,3 +7,30 @@ [Privilege Rights] SeAssignPrimaryTokenPrivilege = S-1-5-19, S-1-5-20 SeAuditPrivilege = S-1-5-19, S-1-5-20 +SeBackupPrivilege = S-1-5-32-544 +SeChangeNotifyPrivilege = S-1-1-0, S-1-5-32-544, S-1-5-32-545 +SeCreatePagefilePrivilege = S-1-5-32-544 +SeCreateGlobalPrivilege = S-1-5-4, S-1-5-6, S-1-5-32-544 +SeCreatePermanentPrivilege = +SeCreateTokenPrivilege = +SeDebugPrivilege = S-1-5-32-544 +SeEnableDelegationPrivilege = +SeImpersonatePrivilege = S-1-5-6, S-1-5-32-544 +SeIncreaseBasePriorityPrivilege = S-1-5-32-544 +SeIncreaseQuotaPrivilege = S-1-5-19, S-1-5-20, S-1-5-32-544 +SeLoadDriverPrivilege = S-1-5-32-544 +SeLockMemoryPrivilege = +SeMachineAccountPrivilege = +SeManageVolumePrivilege = S-1-5-32-544 +SeProfileSingleProcessPrivilege = S-1-5-32-544 +SeRemoteShutdownPrivilege = S-1-5-32-544 +SeRestorePrivilege = S-1-5-32-544 +SeSecurityPrivilege = S-1-5-32-544 +SeShutdownPrivilege = S-1-5-32-544, S-1-5-32-545 +SeSyncAgentPrivilege = +SeSystemEnvironmentPrivilege = S-1-5-32-544 +SeSystemProfilePrivilege = S-1-5-32-544 +SeSystemTimePrivilege = S-1-5-32-544 +SeTakeOwnershipPrivilege = S-1-5-32-544 +SeTcbPrivilege = +SeUndockPrivilege = S-1-5-32-544, S-1-5-32-545

1 0

[hbelusca] 60767: [FAST486] - Remove an unneeded inclusion to the CRT header: limits.h (and use instead NDK definitions for max/min long values). - Remove unneeded comments... [NTVDM] Remove an unn...
by hbelusca＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: hbelusca Date: Sun Oct 27 11:42:44 2013 New Revision: 60767 URL: http://svn.reactos.org/svn/reactos?rev=60767&view=rev Log: [FAST486] - Remove an unneeded inclusion to the CRT header: limits.h (and use instead NDK definitions for max/min long values). - Remove unneeded comments... [NTVDM] Remove an unneeded add_dependencies(...) command. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/common.c branches/ntvdm/lib/fast486/common.h branches/ntvdm/lib/fast486/extraops.c branches/ntvdm/lib/fast486/extraops.h branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/lib/fast486/opcodes.h branches/ntvdm/lib/fast486/opgroups.c branches/ntvdm/lib/fast486/opgroups.h branches/ntvdm/subsystems/ntvdm/CMakeLists.txt Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -22,7 +22,13 @@ #ifndef _FAST486_H_ #define _FAST486_H_ +#pragma once + /* DEFINES ********************************************************************/ + +#ifndef FASTCALL +#define FASTCALL __fastcall +#endif #define FAST486_NUM_GEN_REGS 8 #define FAST486_NUM_SEG_REGS 6 Modified: branches/ntvdm/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.c [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,8 +21,6 @@ /* INCLUDES *******************************************************************/ -// #define WIN32_NO_STATUS -// #define _INC_WINDOWS #include <windef.h> // #define NDEBUG Modified: branches/ntvdm/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/fast486/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/common.h [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -22,11 +22,9 @@ #ifndef _COMMON_H_ #define _COMMON_H_ +#pragma once + /* DEFINES ********************************************************************/ - -#ifndef FASTCALL -#define FASTCALL __fastcall -#endif #define SIGN_FLAG_BYTE 0x80 #define SIGN_FLAG_WORD 0x8000 Modified: branches/ntvdm/lib/fast486/extraops.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.c [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,8 +21,6 @@ /* INCLUDES *******************************************************************/ -// #define WIN32_NO_STATUS -// #define _INC_WINDOWS #include <windef.h> // #define NDEBUG Modified: branches/ntvdm/lib/fast486/extraops.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/extraops.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/extraops.h [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -22,7 +22,10 @@ #ifndef _EXTRAOPS_H_ #define _EXTRAOPS_H_ +#pragma once + /* DEFINES ********************************************************************/ + FAST486_OPCODE_HANDLER(Fast486ExtOpcodeClts); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreControlReg); FAST486_OPCODE_HANDLER(Fast486ExtOpcodeStoreDebugReg); Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,8 +21,6 @@ /* INCLUDES *******************************************************************/ -// #define WIN32_NO_STATUS -// #define _INC_WINDOWS #include <windef.h> // #define NDEBUG Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,10 +21,7 @@ /* INCLUDES *******************************************************************/ -// #define WIN32_NO_STATUS -// #define _INC_WINDOWS #include <windef.h> -#include <limits.h> // #define NDEBUG #include <debug.h> @@ -3694,11 +3691,7 @@ } /* Check for carry/overflow */ - if ((Product < LONG_MIN) || (Product > LONG_MAX)) - { - State->Flags.Cf = State->Flags.Of = TRUE; - } - else State->Flags.Cf = State->Flags.Of = FALSE; + State->Flags.Cf = State->Flags.Of = ((Product < MINLONG) || (Product > MAXLONG)); /* Write-back the result */ return Fast486WriteModrmDwordOperands(State, Modified: branches/ntvdm/lib/fast486/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.h [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -22,11 +22,9 @@ #ifndef _OPCODES_H_ #define _OPCODES_H_ +#pragma once + /* DEFINES ********************************************************************/ - -#ifndef FASTCALL -#define FASTCALL __fastcall -#endif #define FAST486_NUM_OPCODE_HANDLERS 256 #define FAST486_OPCODE_WRITE_REG (1 << 1) Modified: branches/ntvdm/lib/fast486/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.c [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,8 +21,6 @@ /* INCLUDES *******************************************************************/ -// #define WIN32_NO_STATUS -// #define _INC_WINDOWS #include <windef.h> // #define NDEBUG Modified: branches/ntvdm/lib/fast486/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opgroups.h [iso-8859-1] Sun Oct 27 11:42:44 2013 @@ -21,6 +21,8 @@ #ifndef _OPGROUPS_H_ #define _OPGROUPS_H_ + +#pragma once /* DEFINES ********************************************************************/ 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] Sun Oct 27 11:42:44 2013 @@ -20,5 +20,4 @@ set_module_type(ntvdm win32cui UNICODE) target_link_libraries(ntvdm fast486) add_importlibs(ntvdm msvcrt user32 gdi32 kernel32 ntdll) -add_dependencies(ntvdm fast486) add_cd_file(TARGET ntvdm DESTINATION reactos/system32 FOR all)

1 0

[ekohl] 60766: [LSASRV] Remove unused code.
by ekohl＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: ekohl Date: Sun Oct 27 11:08:48 2013 New Revision: 60766 URL: http://svn.reactos.org/svn/reactos?rev=60766&view=rev Log: [LSASRV] Remove unused code. Modified: trunk/reactos/dll/win32/lsasrv/lookup.c Modified: trunk/reactos/dll/win32/lsasrv/lookup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lookup.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lookup.c [iso-8859-1] Sun Oct 27 11:08:48 2013 @@ -6,9 +6,15 @@ * * PROGRAMMERS: Eric Kohl */ + +/* INCLUDES ****************************************************************/ + #include "lsasrv.h" WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + + +/* GLOBALS *****************************************************************/ typedef wchar_t *PSAMPR_SERVER_NAME; typedef void *SAMPR_HANDLE; @@ -80,123 +86,8 @@ LIST_ENTRY WellKnownSidListHead; -#if 0 -typedef struct _AccountSid -{ - WELL_KNOWN_SID_TYPE type; - LPCWSTR account; - LPCWSTR domain; - SID_NAME_USE name_use; -} AccountSid; - -static const WCHAR Account_Operators[] = { 'A','c','c','o','u','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR Administrator[] = {'A','d','m','i','n','i','s','t','r','a','t','o','r',0 }; -static const WCHAR Administrators[] = { 'A','d','m','i','n','i','s','t','r','a','t','o','r','s',0 }; -static const WCHAR ANONYMOUS_LOGON[] = { 'A','N','O','N','Y','M','O','U','S',' ','L','O','G','O','N',0 }; -static const WCHAR Authenticated_Users[] = { 'A','u','t','h','e','n','t','i','c','a','t','e','d',' ','U','s','e','r','s',0 }; -static const WCHAR Backup_Operators[] = { 'B','a','c','k','u','p',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR BATCH[] = { 'B','A','T','C','H',0 }; -static const WCHAR Blank[] = { 0 }; -static const WCHAR BUILTIN[] = { 'B','U','I','L','T','I','N',0 }; -static const WCHAR Cert_Publishers[] = { 'C','e','r','t',' ','P','u','b','l','i','s','h','e','r','s',0 }; -static const WCHAR CREATOR_GROUP[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',0 }; -static const WCHAR CREATOR_GROUP_SERVER[] = { 'C','R','E','A','T','O','R',' ','G','R','O','U','P',' ','S','E','R','V','E','R',0 }; -static const WCHAR CREATOR_OWNER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',0 }; -static const WCHAR CREATOR_OWNER_SERVER[] = { 'C','R','E','A','T','O','R',' ','O','W','N','E','R',' ','S','E','R','V','E','R',0 }; -static const WCHAR DIALUP[] = { 'D','I','A','L','U','P',0 }; -static const WCHAR Digest_Authentication[] = { 'D','i','g','e','s','t',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR DOMAIN[] = {'D','O','M','A','I','N',0}; -static const WCHAR Domain_Admins[] = { 'D','o','m','a','i','n',' ','A','d','m','i','n','s',0 }; -static const WCHAR Domain_Computers[] = { 'D','o','m','a','i','n',' ','C','o','m','p','u','t','e','r','s',0 }; -static const WCHAR Domain_Controllers[] = { 'D','o','m','a','i','n',' ','C','o','n','t','r','o','l','l','e','r','s',0 }; -static const WCHAR Domain_Guests[] = { 'D','o','m','a','i','n',' ','G','u','e','s','t','s',0 }; -static const WCHAR Domain_Users[] = { 'D','o','m','a','i','n',' ','U','s','e','r','s',0 }; -static const WCHAR Enterprise_Admins[] = { 'E','n','t','e','r','p','r','i','s','e',' ','A','d','m','i','n','s',0 }; -static const WCHAR ENTERPRISE_DOMAIN_CONTROLLERS[] = { 'E','N','T','E','R','P','R','I','S','E',' ','D','O','M','A','I','N',' ','C','O','N','T','R','O','L','L','E','R','S',0 }; -static const WCHAR Everyone[] = { 'E','v','e','r','y','o','n','e',0 }; -static const WCHAR Group_Policy_Creator_Owners[] = { 'G','r','o','u','p',' ','P','o','l','i','c','y',' ','C','r','e','a','t','o','r',' ','O','w','n','e','r','s',0 }; -static const WCHAR Guest[] = { 'G','u','e','s','t',0 }; -static const WCHAR Guests[] = { 'G','u','e','s','t','s',0 }; -static const WCHAR INTERACTIVE[] = { 'I','N','T','E','R','A','C','T','I','V','E',0 }; -static const WCHAR LOCAL[] = { 'L','O','C','A','L',0 }; -static const WCHAR LOCAL_SERVICE[] = { 'L','O','C','A','L',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR NETWORK[] = { 'N','E','T','W','O','R','K',0 }; -static const WCHAR Network_Configuration_Operators[] = { 'N','e','t','w','o','r','k',' ','C','o','n','f','i','g','u','r','a','t','i','o','n',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR NETWORK_SERVICE[] = { 'N','E','T','W','O','R','K',' ','S','E','R','V','I','C','E',0 }; -static const WCHAR NT_AUTHORITY[] = { 'N','T',' ','A','U','T','H','O','R','I','T','Y',0 }; -static const WCHAR NT_Pseudo_Domain[] = { 'N','T',' ','P','s','e','u','d','o',' ','D','o','m','a','i','n',0 }; -static const WCHAR NTML_Authentication[] = { 'N','T','M','L',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR NULL_SID[] = { 'N','U','L','L',' ','S','I','D',0 }; -static const WCHAR Other_Organization[] = { 'O','t','h','e','r',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Performance_Log_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','L','o','g',' ','U','s','e','r','s',0 }; -static const WCHAR Performance_Monitor_Users[] = { 'P','e','r','f','o','r','m','a','n','c','e',' ','M','o','n','i','t','o','r',' ','U','s','e','r','s',0 }; -static const WCHAR Power_Users[] = { 'P','o','w','e','r',' ','U','s','e','r','s',0 }; -static const WCHAR Pre_Windows_2000_Compatible_Access[] = { 'P','r','e','-','W','i','n','d','o','w','s',' ','2','0','0','0',' ','C','o','m','p','a','t','i','b','l','e',' ','A','c','c','e','s','s',0 }; -static const WCHAR Print_Operators[] = { 'P','r','i','n','t',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR PROXY[] = { 'P','R','O','X','Y',0 }; -static const WCHAR RAS_and_IAS_Servers[] = { 'R','A','S',' ','a','n','d',' ','I','A','S',' ','S','e','r','v','e','r','s',0 }; -static const WCHAR Remote_Desktop_Users[] = { 'R','e','m','o','t','e',' ','D','e','s','k','t','o','p',' ','U','s','e','r','s',0 }; -static const WCHAR REMOTE_INTERACTIVE_LOGON[] = { 'R','E','M','O','T','E',' ','I','N','T','E','R','A','C','T','I','V','E',' ','L','O','G','O','N',0 }; -static const WCHAR Replicators[] = { 'R','e','p','l','i','c','a','t','o','r','s',0 }; -static const WCHAR RESTRICTED[] = { 'R','E','S','T','R','I','C','T','E','D',0 }; -static const WCHAR SChannel_Authentication[] = { 'S','C','h','a','n','n','e','l',' ','A','u','t','h','e','n','t','i','c','a','t','i','o','n',0 }; -static const WCHAR Schema_Admins[] = { 'S','c','h','e','m','a',' ','A','d','m','i','n','s',0 }; -static const WCHAR SELF[] = { 'S','E','L','F',0 }; -static const WCHAR Server_Operators[] = { 'S','e','r','v','e','r',' ','O','p','e','r','a','t','o','r','s',0 }; -static const WCHAR SERVICE[] = { 'S','E','R','V','I','C','E',0 }; -static const WCHAR SYSTEM[] = { 'S','Y','S','T','E','M',0 }; -static const WCHAR TERMINAL_SERVER_USER[] = { 'T','E','R','M','I','N','A','L',' ','S','E','R','V','E','R',' ','U','S','E','R',0 }; -static const WCHAR This_Organization[] = { 'T','h','i','s',' ','O','r','g','a','n','i','z','a','t','i','o','n',0 }; -static const WCHAR Users[] = { 'U','s','e','r','s',0 }; - -static const AccountSid ACCOUNT_SIDS[] = { -// { WinNullSid, NULL_SID, Blank, SidTypeWellKnownGroup }, -// { WinWorldSid, Everyone, Blank, SidTypeWellKnownGroup }, -// { WinLocalSid, LOCAL, Blank, SidTypeWellKnownGroup }, -// { WinCreatorOwnerSid, CREATOR_OWNER, Blank, SidTypeWellKnownGroup }, -// { WinCreatorGroupSid, CREATOR_GROUP, Blank, SidTypeWellKnownGroup }, -// { WinCreatorOwnerServerSid, CREATOR_OWNER_SERVER, Blank, SidTypeWellKnownGroup }, -// { WinCreatorGroupServerSid, CREATOR_GROUP_SERVER, Blank, SidTypeWellKnownGroup }, -// { WinNtAuthoritySid, NT_Pseudo_Domain, NT_Pseudo_Domain, SidTypeDomain }, -// { WinDialupSid, DIALUP, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinNetworkSid, NETWORK, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinBatchSid, BATCH, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinInteractiveSid, INTERACTIVE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinServiceSid, SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinAnonymousSid, ANONYMOUS_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinProxySid, PROXY, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinEnterpriseControllersSid, ENTERPRISE_DOMAIN_CONTROLLERS, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinSelfSid, SELF, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinAuthenticatedUserSid, Authenticated_Users, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinRestrictedCodeSid, RESTRICTED, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinTerminalServerSid, TERMINAL_SERVER_USER, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinRemoteLogonIdSid, REMOTE_INTERACTIVE_LOGON, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinLocalSystemSid, SYSTEM, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinLocalServiceSid, LOCAL_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinNetworkServiceSid, NETWORK_SERVICE, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinBuiltinDomainSid, BUILTIN, BUILTIN, SidTypeDomain }, -// { WinBuiltinAdministratorsSid, Administrators, BUILTIN, SidTypeAlias }, -// { WinBuiltinUsersSid, Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinGuestsSid, Guests, BUILTIN, SidTypeAlias }, -// { WinBuiltinPowerUsersSid, Power_Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinAccountOperatorsSid, Account_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinSystemOperatorsSid, Server_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinPrintOperatorsSid, Print_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinBackupOperatorsSid, Backup_Operators, BUILTIN, SidTypeAlias }, -// { WinBuiltinReplicatorSid, Replicators, BUILTIN, SidTypeAlias }, -// { WinBuiltinPreWindows2000CompatibleAccessSid, Pre_Windows_2000_Compatible_Access, BUILTIN, SidTypeAlias }, -// { WinBuiltinRemoteDesktopUsersSid, Remote_Desktop_Users, BUILTIN, SidTypeAlias }, -// { WinBuiltinNetworkConfigurationOperatorsSid, Network_Configuration_Operators, BUILTIN, SidTypeAlias }, - { WinNTLMAuthenticationSid, NTML_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinDigestAuthenticationSid, Digest_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinSChannelAuthenticationSid, SChannel_Authentication, NT_AUTHORITY, SidTypeWellKnownGroup }, -// { WinThisOrganizationSid, This_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinOtherOrganizationSid, Other_Organization, NT_AUTHORITY, SidTypeWellKnownGroup }, - { WinBuiltinPerfMonitoringUsersSid, Performance_Monitor_Users, BUILTIN, SidTypeAlias }, - { WinBuiltinPerfLoggingUsersSid, Performance_Log_Users, BUILTIN, SidTypeAlias }, -}; -#endif - + +/* FUNCTIONS ***************************************************************/ BOOLEAN LsapCreateSid(PSID_IDENTIFIER_AUTHORITY IdentifierAuthority,

1 0

[aandrejevic] 60765: [FAST486] Physical memory read/write callbacks don't need to return a value.
by aandrejevic＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: aandrejevic Date: Sun Oct 27 01:38:24 2013 New Revision: 60765 URL: http://svn.reactos.org/svn/reactos?rev=60765&view=rev Log: [FAST486] Physical memory read/write callbacks don't need to return a value. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sun Oct 27 01:38:24 2013 @@ -153,7 +153,7 @@ } FAST486_INT_STATUS, *PFAST486_INT_STATUS; typedef -BOOLEAN +VOID (NTAPI *FAST486_MEM_READ_PROC) ( PFAST486_STATE State, @@ -163,7 +163,7 @@ ); typedef -BOOLEAN +VOID (NTAPI *FAST486_MEM_WRITE_PROC) ( PFAST486_STATE State,

1 0

[aandrejevic] 60764: [NTVDM] Push scancodes on to the BIOS keyboard queue even if they're not ASCII.
by aandrejevic＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: aandrejevic Date: Sun Oct 27 01:33:15 2013 New Revision: 60764 URL: http://svn.reactos.org/svn/reactos?rev=60764&view=rev Log: [NTVDM] Push scancodes on to the BIOS keyboard queue even if they're not ASCII. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sun Oct 27 01:33:15 2013 @@ -1115,11 +1115,15 @@ BiosKeyboardMap[VirtualKey] |= (1 << 7); /* Find out which character this is */ - if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) > 0) + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) { - /* Push it onto the BIOS keyboard queue */ - BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + /* Not ASCII */ + Character = 0; } + + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + } else {

1 0

[jimtabor] 60763: - Patch by Andrew Eikum: Don't try to paint during WM_SETFOCUS if the edit control is not visible.
by jimtabor＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: jimtabor Date: Sun Oct 27 01:23:46 2013 New Revision: 60763 URL: http://svn.reactos.org/svn/reactos?rev=60763&view=rev Log: - Patch by Andrew Eikum: Don't try to paint during WM_SETFOCUS if the edit control is not visible. Modified: trunk/reactos/win32ss/user/user32/controls/edit.c Modified: trunk/reactos/win32ss/user/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/contro… ============================================================================== --- trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/controls/edit.c [iso-8859-1] Sun Oct 27 01:23:46 2013 @@ -3840,7 +3840,7 @@ EDIT_InvalidateText(es, es->selection_start, es->selection_end); /* single line edit updates itself */ - if (!(es->style & ES_MULTILINE)) + if (IsWindowVisible(es->hwndSelf) && !(es->style & ES_MULTILINE)) { HDC hdc = GetDC(es->hwndSelf); EDIT_WM_Paint(es, hdc);

1 0

[jimtabor] 60762: - Update wine test to 1.7.5, this is for msg AW WA testing.
by jimtabor＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: jimtabor Date: Sun Oct 27 01:05:53 2013 New Revision: 60762 URL: http://svn.reactos.org/svn/reactos?rev=60762&view=rev Log: - Update wine test to 1.7.5, this is for msg AW WA testing. Modified: trunk/rostests/winetests/user32/dialog.c trunk/rostests/winetests/user32/edit.c trunk/rostests/winetests/user32/msg.c trunk/rostests/winetests/user32/text.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/user32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/dialog.c… Modified: trunk/rostests/winetests/user32/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?r… Modified: trunk/rostests/winetests/user32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?re… Modified: trunk/rostests/winetests/user32/text.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/text.c?r…

1 0

[aandrejevic] 60761: [FAST486] Separate external interrupts from interrupt signals (which are interrupts whose number is not known until they can be serviced, just like hardware interrupts on a rea...
by aandrejevic＠svn.reactos.org 27 Oct '13

27 Oct '13

Author: aandrejevic Date: Sun Oct 27 00:37:01 2013 New Revision: 60761 URL: http://svn.reactos.org/svn/reactos?rev=60761&view=rev Log: [FAST486] Separate external interrupts from interrupt signals (which are interrupts whose number is not known until they can be serviced, just like hardware interrupts on a real CPU). [NTVDM] Improve the PIC emulation code (IRQ priorities, etc...). Instead of checking for interrupts in the main loop, move the PS/2 input parsing to a different thread. Improve BIOS keyboard IRQ handling. Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/ps2.h Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -145,6 +145,13 @@ FAST486_EXCEPTION_MC = 0x12 } FAST486_EXCEPTIONS, *PFAST486_EXCEPTIONS; +typedef enum _FAST486_INT_STATUS +{ + FAST486_INT_NONE = 0, + FAST486_INT_EXECUTE = 1, + FAST486_INT_SIGNAL = 2 +} FAST486_INT_STATUS, *PFAST486_INT_STATUS; + typedef BOOLEAN (NTAPI *FAST486_MEM_READ_PROC) @@ -198,6 +205,13 @@ ( PFAST486_STATE State, USHORT BopCode +); + +typedef +UCHAR +(NTAPI *FAST486_INT_ACK_PROC) +( + PFAST486_STATE State ); typedef union _FAST486_REG @@ -352,6 +366,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback; FAST486_IDLE_PROC IdleCallback; FAST486_BOP_PROC BopCallback; + FAST486_INT_ACK_PROC IntAckCallback; FAST486_REG GeneralRegs[FAST486_NUM_GEN_REGS]; FAST486_SEG_REG SegmentRegs[FAST486_NUM_SEG_REGS]; FAST486_REG InstPtr, SavedInstPtr; @@ -362,7 +377,7 @@ ULONG ExceptionCount; ULONG PrefixFlags; FAST486_SEG_REGS SegmentOverride; - BOOLEAN HardwareInt; + FAST486_INT_STATUS IntStatus; UCHAR PendingIntNum; }; @@ -398,6 +413,10 @@ VOID NTAPI +Fast486InterruptSignal(PFAST486_STATE State); + +VOID +NTAPI Fast486ExecuteAt(PFAST486_STATE State, USHORT Segment, ULONG Offset); VOID Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -61,10 +61,22 @@ { State->SavedInstPtr = State->InstPtr; - /* Check if interrupts are enabled and there is an interrupt pending */ - if (State->Flags.If && State->HardwareInt) + /* + * Check if there is an interrupt to execute, or a hardware interrupt signal + * while interrupts are enabled. + */ + if ((State->IntStatus == FAST486_INT_EXECUTE) + || (State->Flags.If + && (State->IntAckCallback != NULL) + && (State->IntStatus == FAST486_INT_SIGNAL))) { FAST486_IDT_ENTRY IdtEntry; + + if (State->IntStatus == FAST486_INT_SIGNAL) + { + /* Acknowledge the interrupt to get the number */ + State->PendingIntNum = State->IntAckCallback(State); + } /* Get the interrupt vector */ if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) @@ -76,8 +88,8 @@ IdtEntry.Type); } - /* Clear the interrupt pending flag */ - State->HardwareInt = FALSE; + /* Clear the interrupt status */ + State->IntStatus = FAST486_INT_NONE; } } @@ -243,6 +255,7 @@ FAST486_IO_WRITE_PROC IoWriteCallback = State->IoWriteCallback; FAST486_IDLE_PROC IdleCallback = State->IdleCallback; FAST486_BOP_PROC BopCallback = State->BopCallback; + FAST486_INT_ACK_PROC IntAckCallback = State->IntAckCallback; /* Clear the entire structure */ RtlZeroMemory(State, sizeof(*State)); @@ -278,15 +291,24 @@ State->IoWriteCallback = IoWriteCallback; State->IdleCallback = IdleCallback; State->BopCallback = BopCallback; + State->IntAckCallback = IntAckCallback; } VOID NTAPI Fast486Interrupt(PFAST486_STATE State, UCHAR Number) { - /* Set the hardware interrupt flag */ - State->HardwareInt = TRUE; + /* Set the interrupt status and the number */ + State->IntStatus = FAST486_INT_EXECUTE; State->PendingIntNum = Number; +} + +VOID +NTAPI +Fast486InterruptSignal(PFAST486_STATE State) +{ + /* Set the interrupt status */ + State->IntStatus = FAST486_INT_SIGNAL; } VOID Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -876,7 +876,7 @@ } /* Halt */ - while (!State->HardwareInt) State->IdleCallback(State); + while (State->IntStatus != FAST486_INT_SIGNAL) State->IdleCallback(State); /* Return success */ return TRUE; 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] Sun Oct 27 00:37:01 2013 @@ -1092,39 +1092,40 @@ BYTE ScanCode, VirtualKey; WORD Character; - /* Check if there is a scancode available */ - if (!(KeyboardReadStatus() & 1)) break; - - /* Get the scan code and virtual key code */ - ScanCode = KeyboardReadData(); - VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); - - /* Check if this is a key press or release */ - if (!(ScanCode & (1 << 7))) + /* Loop while there is a scancode available */ + while (KeyboardReadStatus() & 1) { - /* Key press */ - if (VirtualKey == VK_NUMLOCK - || VirtualKey == VK_CAPITAL - || VirtualKey == VK_SCROLL) + /* Get the scan code and virtual key code */ + ScanCode = KeyboardReadData(); + VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); + + /* Check if this is a key press or release */ + if (!(ScanCode & (1 << 7))) { - /* For toggle keys, toggle the lowest bit in the keyboard map */ - BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); + /* Key press */ + if (VirtualKey == VK_NUMLOCK + || VirtualKey == VK_CAPITAL + || VirtualKey == VK_SCROLL) + { + /* For toggle keys, toggle the lowest bit in the keyboard map */ + BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); + } + + /* Set the highest bit */ + BiosKeyboardMap[VirtualKey] |= (1 << 7); + + /* Find out which character this is */ + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) > 0) + { + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + } } - - /* Set the highest bit */ - BiosKeyboardMap[VirtualKey] |= (1 << 7); - - /* Find out which character this is */ - if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) > 0) + else { - /* Push it onto the BIOS keyboard queue */ - BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + /* Key release, unset the highest bit */ + BiosKeyboardMap[VirtualKey] &= ~(1 << 7); } - } - else - { - /* Key release, unset the highest bit */ - BiosKeyboardMap[VirtualKey] &= ~(1 << 7); } break; 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] Sun Oct 27 00:37:01 2013 @@ -329,6 +329,14 @@ } } +static BYTE WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) +{ + UNREFERENCED_PARAMETER(State); + + /* Get the interrupt number from the PIC */ + return PicGetInterrupt(); +} + /* PUBLIC FUNCTIONS ***********************************************************/ BOOLEAN EmulatorInitialize() @@ -342,7 +350,8 @@ EmulatorContext.MemWriteCallback = (FAST486_MEM_WRITE_PROC)EmulatorWriteMemory; EmulatorContext.IoReadCallback = (FAST486_IO_READ_PROC)EmulatorReadIo; EmulatorContext.IoWriteCallback = (FAST486_IO_WRITE_PROC)EmulatorWriteIo; - EmulatorContext.BopCallback = (FAST486_BOP_PROC)EmulatorBiosOperation; + EmulatorContext.BopCallback = EmulatorBiosOperation; + EmulatorContext.IntAckCallback = EmulatorIntAcknowledge; /* Reset the CPU */ Fast486Reset(&EmulatorContext); @@ -371,10 +380,10 @@ Fast486Interrupt(&EmulatorContext, Number); } -VOID EmulatorExternalInterrupt(BYTE Number) +VOID EmulatorInterruptSignal(VOID) { /* Call the Fast486 API */ - Fast486Interrupt(&EmulatorContext, Number); + Fast486InterruptSignal(&EmulatorContext); } ULONG EmulatorGetRegister(ULONG Register) Modified: branches/ntvdm/subsystems/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.h [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -88,7 +88,7 @@ VOID EmulatorSetStack(WORD Segment, DWORD Offset); VOID EmulatorExecute(WORD Segment, WORD Offset); VOID EmulatorInterrupt(BYTE Number); -VOID EmulatorExternalInterrupt(BYTE Number); +VOID EmulatorInterruptSignal(VOID); ULONG EmulatorGetRegister(ULONG Register); ULONG EmulatorGetProgramCounter(VOID); VOID EmulatorSetRegister(ULONG Register, ULONG Value); 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] Sun Oct 27 00:37:01 2013 @@ -79,12 +79,12 @@ INT i; CHAR CommandLine[DOS_CMDLINE_LENGTH]; DWORD CurrentTickCount; - DWORD LastTickCount = GetTickCount(); DWORD Cycles = 0; DWORD LastCyclePrintout = GetTickCount(); DWORD LastVerticalRefresh = GetTickCount(); LARGE_INTEGER Frequency, LastTimerTick, Counter; LONGLONG TimerTicks; + HANDLE InputThread = NULL; /* Set the handler routine */ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); @@ -141,6 +141,9 @@ DisplayMessage(L"Could not start program: %S", CommandLine); return -1; } + + /* Start the input thread */ + InputThread = CreateThread(NULL, 0, &InputThreadProc, NULL, 0, NULL); /* Set the last timer tick to the current time */ QueryPerformanceCounter(&LastTimerTick); @@ -162,13 +165,6 @@ for (i = 0; i < TimerTicks; i++) PitDecrementCount(); LastTimerTick = Counter; - /* Check for console input events every millisecond */ - if (CurrentTickCount != LastTickCount) - { - CheckForInputEvents(); - LastTickCount = CurrentTickCount; - } - /* Check for vertical retrace */ if ((CurrentTickCount - LastVerticalRefresh) >= 16) { @@ -198,6 +194,7 @@ VgaRefreshDisplay(); Cleanup: + if (InputThread != NULL) CloseHandle(InputThread); BiosCleanup(); EmulatorCleanup(); Modified: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.c [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -35,8 +35,8 @@ } else { - /* The IRR is always 0, as the emulated CPU receives the interrupt instantly */ - return 0; + /* Read the interrupt request register */ + return Pic->IntRequestRegister; } } @@ -167,9 +167,9 @@ /* 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; - EmulatorExternalInterrupt(MasterPic.IntOffset + Number); + /* Set the appropriate bit in the IRR and interrupt the CPU */ + MasterPic.IntRequestRegister |= 1 << Number; + EmulatorInterruptSignal(); } else if (Number >= 8 && Number < 16) { @@ -187,7 +187,7 @@ /* Check if any of the higher-priorirty interrupts are busy */ if (MasterPic.InServiceRegister != 0) return; - for (i = 0; i <= Number ; i++) + for (i = 0; i <= Number; i++) { if (SlavePic.InServiceRegister & (1 << Number)) return; } @@ -196,12 +196,57 @@ if (SlavePic.MaskRegister & (1 << Number)) return; /* Set the IRQ 2 bit in the master ISR */ - if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= 1 << 2; - - /* Set the appropriate bit in the ISR and interrupt the CPU */ - if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= 1 << Number; - EmulatorExternalInterrupt(SlavePic.IntOffset + Number); - } + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= (1 << 2); + + /* Set the appropriate bit in the IRR and interrupt the CPU */ + SlavePic.IntRequestRegister |= 1 << Number; + EmulatorInterruptSignal(); + } +} + +BYTE PicGetInterrupt(VOID) +{ + INT i, j; + + /* Search interrupts by priority */ + for (i = 0; i < 8; i++) + { + /* Check if this line is cascaded to the slave PIC */ + if ((i == 2) + && MasterPic.CascadeRegister & (1 << 2) + && SlavePic.Slave + && (SlavePic.CascadeRegister == 2)) + { + /* Search the slave PIC interrupts by priority */ + for (j = 0; j < 8; j++) if ((j != 1) && SlavePic.IntRequestRegister & (1 << j)) + { + /* Clear the IRR flag */ + SlavePic.IntRequestRegister &= ~(1 << j); + + /* Set the ISR flag, unless AEOI is enabled */ + if (!SlavePic.AutoEoi) SlavePic.InServiceRegister |= (1 << j); + + /* Return the interrupt number */ + return SlavePic.IntOffset + j; + } + } + + if (MasterPic.IntRequestRegister & (1 << i)) + { + /* Clear the IRR flag */ + MasterPic.IntRequestRegister &= ~(1 << i); + + /* Set the ISR flag, unless AEOI is enabled */ + if (!MasterPic.AutoEoi) MasterPic.InServiceRegister |= (1 << i); + + /* Return the interrupt number */ + return MasterPic.IntOffset + i; + } + } + + /* Spurious interrupt */ + if (MasterPic.InServiceRegister & (1 << 2)) return SlavePic.IntOffset + 7; + else return MasterPic.IntOffset + 7; } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/pic.h [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -34,6 +34,7 @@ { BOOLEAN Initialization; BYTE MaskRegister; + BYTE IntRequestRegister; BYTE InServiceRegister; BYTE IntOffset; BYTE ConfigRegister; @@ -51,6 +52,7 @@ BYTE PicReadData(BYTE Port); VOID PicWriteData(BYTE Port, BYTE Value); VOID PicInterruptRequest(BYTE Number); +BYTE PicGetInterrupt(VOID); #endif // _PIC_H_ Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -265,49 +265,64 @@ // TODO: Implement PS/2 device commands } -VOID CheckForInputEvents() -{ - PINPUT_RECORD Buffer; +DWORD WINAPI InputThreadProc(LPVOID Parameter) +{ + INT i; HANDLE ConsoleInput = GetStdHandle(STD_INPUT_HANDLE); - DWORD i, j, Count, TotalEvents; - BYTE ScanCode; - BOOLEAN Interrupt = FALSE; - - /* 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 = (BYTE)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); - } - - Interrupt = TRUE; - } - - if (Interrupt) PicInterruptRequest(1); - -Cleanup: - HeapFree(GetProcessHeap(), 0, Buffer); + INPUT_RECORD InputRecord; + DWORD Count; + + while (VdmRunning) + { + /* Wait for an input record */ + if (!ReadConsoleInput(ConsoleInput, &InputRecord, 1, &Count)) + { + DPRINT1("Error reading console input\n"); + return GetLastError(); + + } + + ASSERT(Count != 0); + + /* Check the event type */ + switch (InputRecord.EventType) + { + case KEY_EVENT: + { + BYTE ScanCode = (BYTE)InputRecord.Event.KeyEvent.wVirtualScanCode; + + /* If this is a key release, set the highest bit in the scan code */ + if (!InputRecord.Event.KeyEvent.bKeyDown) ScanCode |= 0x80; + + /* Push the scan code onto the keyboard queue */ + for (i = 0; i < InputRecord.Event.KeyEvent.wRepeatCount; i++) + { + KeyboardQueuePush(ScanCode); + } + + /* Keyboard IRQ */ + PicInterruptRequest(1); + + break; + } + + case MOUSE_EVENT: + { + // TODO: NOT IMPLEMENTED + UNIMPLEMENTED; + + break; + } + + default: + { + /* Ignored */ + break; + } + } + } + + return 0; } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.h [iso-8859-1] Sun Oct 27 00:37:01 2013 @@ -28,7 +28,7 @@ VOID KeyboardWriteCommand(BYTE Command); BYTE KeyboardReadData(); VOID KeyboardWriteData(BYTE Data); -VOID CheckForInputEvents(); +DWORD WINAPI InputThreadProc(LPVOID Parameter); #endif // _PS2_H_

1 0

[hbelusca] 60760: Add the definition for WriteConsoleInputVDM too.
by hbelusca＠svn.reactos.org 26 Oct '13

26 Oct '13

Author: hbelusca Date: Sat Oct 26 21:30:44 2013 New Revision: 60760 URL: http://svn.reactos.org/svn/reactos?rev=60760&view=rev Log: Add the definition for WriteConsoleInputVDM too. Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sat Oct 26 21:30:44 2013 @@ -695,6 +695,7 @@ #define SetConsoleTitle SetConsoleTitleW #define WriteConsole WriteConsoleW #define WriteConsoleInput WriteConsoleInputW +#define WriteConsoleInputVDM WriteConsoleInputVDMW #define WriteConsoleOutput WriteConsoleOutputW #define FillConsoleOutputCharacter FillConsoleOutputCharacterW #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW @@ -715,6 +716,7 @@ #define SetConsoleTitle SetConsoleTitleA #define WriteConsole WriteConsoleA #define WriteConsoleInput WriteConsoleInputA +#define WriteConsoleInputVDM WriteConsoleInputVDMA #define WriteConsoleOutput WriteConsoleOutputA #define FillConsoleOutputCharacter FillConsoleOutputCharacterA #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterA

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