Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[aandrejevic] 60771: [NTVDM] Implement the BIOS keyboard shift flags.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Oct 27 14:57:12 2013 New Revision: 60771 URL: http://svn.reactos.org/svn/reactos?rev=60771&view=rev Log: [NTVDM] Implement the BIOS keyboard shift flags. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.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] Sun Oct 27 14:57:12 2013 @@ -1150,7 +1150,8 @@ /* Key press */ if (VirtualKey == VK_NUMLOCK || VirtualKey == VK_CAPITAL - || VirtualKey == VK_SCROLL) + || VirtualKey == VK_SCROLL + || VirtualKey == VK_INSERT) { /* For toggle keys, toggle the lowest bit in the keyboard map */ BiosKeyboardMap[VirtualKey] ^= ~(1 << 0); @@ -1178,6 +1179,27 @@ } } + /* Clear the keyboard flags */ + Bda->KeybdShiftFlags = 0; + + /* Set the appropriate flags based on the state */ + if (BiosKeyboardMap[VK_RSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RSHIFT; + if (BiosKeyboardMap[VK_LSHIFT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LSHIFT; + if (BiosKeyboardMap[VK_CONTROL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CTRL; + if (BiosKeyboardMap[VK_MENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_ALT; + if (BiosKeyboardMap[VK_SCROLL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL_ON; + if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK_ON; + if (BiosKeyboardMap[VK_CAPITAL] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK_ON; + if (BiosKeyboardMap[VK_INSERT] & (1 << 0)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT_ON; + if (BiosKeyboardMap[VK_RMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_RALT; + if (BiosKeyboardMap[VK_LMENU] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_LALT; + if (BiosKeyboardMap[VK_SNAPSHOT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SYSRQ; + if (BiosKeyboardMap[VK_PAUSE] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_PAUSE; + if (BiosKeyboardMap[VK_SCROLL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_SCROLL; + if (BiosKeyboardMap[VK_NUMLOCK] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_NUMLOCK; + if (BiosKeyboardMap[VK_CAPITAL] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_CAPSLOCK; + if (BiosKeyboardMap[VK_INSERT] & (1 << 7)) Bda->KeybdShiftFlags |= BDA_KBDFLAG_INSERT; + break; } } Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sun Oct 27 14:57:12 2013 @@ -38,6 +38,23 @@ #define DEFAULT_ATTRIBUTE 0x07 #define GRAPHICS_VIDEO_SEG 0xA000 #define TEXT_VIDEO_SEG 0xB800 + +#define BDA_KBDFLAG_RSHIFT (1 << 0) +#define BDA_KBDFLAG_LSHIFT (1 << 1) +#define BDA_KBDFLAG_CTRL (1 << 2) +#define BDA_KBDFLAG_ALT (1 << 3) +#define BDA_KBDFLAG_SCROLL_ON (1 << 4) +#define BDA_KBDFLAG_NUMLOCK_ON (1 << 5) +#define BDA_KBDFLAG_CAPSLOCK_ON (1 << 6) +#define BDA_KBDFLAG_INSERT_ON (1 << 7) +#define BDA_KBDFLAG_RALT (1 << 8) +#define BDA_KBDFLAG_LALT (1 << 9) +#define BDA_KBDFLAG_SYSRQ (1 << 10) +#define BDA_KBDFLAG_PAUSE (1 << 11) +#define BDA_KBDFLAG_SCROLL (1 << 12) +#define BDA_KBDFLAG_NUMLOCK (1 << 13) +#define BDA_KBDFLAG_CAPSLOCK (1 << 14) +#define BDA_KBDFLAG_INSERT (1 << 15) enum {

10 years, 10 months

[hbelusca] 60770: [NTVDM] Implement all the missing INT 16h functions but 03h. Also, for simplification purposes (should be fixed later on) act exactly the same for INT 00h and 10h, and for INT 01h...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 27 14:17:34 2013 New Revision: 60770 URL: http://svn.reactos.org/svn/reactos?rev=60770&view=rev Log: [NTVDM] Implement all the missing INT 16h functions but 03h. Also, for simplification purposes (should be fixed later on) act exactly the same for INT 00h and 10h, and for INT 01h and 11h. Finally, one has to implement setting the BIOS KeybdShiftFlags flag. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/ps2.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 14:17:34 2013 @@ -16,6 +16,8 @@ #include "pic.h" #include "ps2.h" #include "timer.h" + +#include "registers.h" /* PRIVATE VARIABLES **********************************************************/ @@ -982,15 +984,20 @@ switch (HIBYTE(Eax)) { + /* Wait for keystroke and read */ case 0x00: + /* Wait for extended keystroke and read */ + case 0x10: // FIXME: Temporarily do the same as INT 16h, 00h { /* Read the character (and wait if necessary) */ EmulatorSetRegister(EMULATOR_REG_AX, BiosGetCharacter()); - - break; - } - + break; + } + + /* Get keystroke status */ case 0x01: + /* Get extended keystroke status */ + case 0x11: // FIXME: Temporarily do the same as INT 16h, 01h { WORD Data = BiosPeekCharacter(); @@ -1008,7 +1015,45 @@ break; } - + + /* Get shift status */ + case 0x02: + { + /* Return the lower byte of the keyboard shift status word */ + setAL(LOBYTE(Bda->KeybdShiftFlags)); + break; + } + + /* Reserved */ + case 0x04: + { + DPRINT1("BIOS Function INT 16h, AH = 0x04 is RESERVED\n"); + break; + } + + /* Push keystroke */ + case 0x05: + { + /* Return 0 if success, 1 if failure */ + setAL(BiosKbdBufferPush(getCX()) == FALSE); + break; + } + + /* Get extended shift status */ + case 0x12: + { + /* + * Be careful! The returned word is similar to Bda->KeybdShiftFlags + * but the high byte is organized differently: + * the bytes 2 and 3 of the high byte are not the same... + */ + WORD KeybdShiftFlags = (Bda->KeybdShiftFlags & 0xF3FF); + + /* Return the extended keyboard shift status word */ + setAX(KeybdShiftFlags); + break; + } + default: { DPRINT1("BIOS Function INT 16h, AH = 0x%02X NOT IMPLEMENTED\n", @@ -1115,6 +1160,7 @@ BiosKeyboardMap[VirtualKey] |= (1 << 7); /* Find out which character this is */ + Character = 0; if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) { /* Not ASCII */ Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Sun Oct 27 14:17:34 2013 @@ -21,11 +21,13 @@ #define BIOS_PIC_MASTER_INT 0x08 #define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 + #define BIOS_VIDEO_INTERRUPT 0x10 #define BIOS_EQUIPMENT_INTERRUPT 0x11 #define BIOS_KBD_INTERRUPT 0x16 #define BIOS_TIME_INTERRUPT 0x1A #define BIOS_SYS_TIMER_INTERRUPT 0x1C + #define CONSOLE_FONT_HEIGHT 8 #define BIOS_KBD_BUFFER_SIZE 16 #define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now @@ -51,12 +53,12 @@ { WORD SerialPorts[4]; WORD ParallelPorts[3]; - WORD EbdaSegment; + WORD EbdaSegment; // Sometimes, ParallelPort WORD EquipmentList; - BYTE Reserved0; + BYTE Reserved0; // Errors in PCjr infrared keyboard link WORD MemorySize; - WORD Reserved1; - WORD KeyboardFlags; + WORD Reserved1; // Scratch pad for manufacturing error tests + WORD KeybdShiftFlags; BYTE AlternateKeypad; WORD KeybdBufferHead; WORD KeybdBufferTail; 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] Sun Oct 27 14:17:34 2013 @@ -11,12 +11,13 @@ /* INCLUDES *******************************************************************/ +#include <stdio.h> +#include <stdarg.h> +#include <conio.h> + #include <windows.h> -#include <stdio.h> -#include <conio.h> -#include <stdarg.h> + #include <debug.h> -#include <limits.h> /* DEFINES ********************************************************************/ 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 14:17:34 2013 @@ -300,6 +300,8 @@ KeyboardQueuePush(ScanCode); } + /* TODO: Update the keyboard shift status flags */ + /* Keyboard IRQ */ PicInterruptRequest(1);

10 years, 10 months

[hbelusca] 60769: [NTVDM]: Fix the callback prototypes.

by hbelusca＠svn.reactos.org

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);

10 years, 10 months

[ekohl] 60768: [INF] Add the remaining privilege definitons.

by ekohl＠svn.reactos.org

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

10 years, 10 months

[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

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)

10 years, 10 months

[ekohl] 60766: [LSASRV] Remove unused code.

by ekohl＠svn.reactos.org

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,

10 years, 10 months

[aandrejevic] 60765: [FAST486] Physical memory read/write callbacks don't need to return a value.

by aandrejevic＠svn.reactos.org

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,

10 years, 10 months

[aandrejevic] 60764: [NTVDM] Push scancodes on to the BIOS keyboard queue even if they're not ASCII.

by aandrejevic＠svn.reactos.org

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 {

10 years, 10 months

[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

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);

10 years, 10 months

[jimtabor] 60762: - Update wine test to 1.7.5, this is for msg AW WA testing.

by jimtabor＠svn.reactos.org

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…

10 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2013