Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 61591: [NTOSKRNL] Implement CmpLinkKeyToHive and create missing HKLM\Security\SAM -> HKLM\SAM\SAM and HKU\S-1-5-18 -> HKU\.Default links.
by tkreuzer＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: tkreuzer Date: Sat Jan 11 23:13:48 2014 New Revision: 61591 URL: http://svn.reactos.org/svn/reactos?rev=61591&view=rev Log: [NTOSKRNL] Implement CmpLinkKeyToHive and create missing HKLM\Security\SAM -> HKLM\SAM\SAM and HKU\S-1-5-18 -> HKU\.Default links. Modified: trunk/reactos/ntoskrnl/config/cmsysini.c Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sat Jan 11 23:13:48 2014 @@ -35,6 +35,71 @@ extern BOOLEAN CmFirstTime; /* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +CmpLinkKeyToHive( + _In_z_ PWSTR LinkKeyName, + _In_z_ PWSTR TargetKeyName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING LinkKeyName_U; + HANDLE TargetKeyHandle; + ULONG Disposition; + NTSTATUS Status; + PAGED_CODE(); + + /* Initialize the object attributes */ + RtlInitUnicodeString(&LinkKeyName_U, LinkKeyName); + InitializeObjectAttributes(&ObjectAttributes, + &LinkKeyName_U, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, + NULL, + NULL); + + /* Create the link key */ + Status = ZwCreateKey(&TargetKeyHandle, + KEY_CREATE_LINK, + &ObjectAttributes, + 0, + NULL, + REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK, + &Disposition); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CM: CmpLinkKeyToHive: couldn't create %S Status = 0x%lx\n", + LinkKeyName, Status); + return FALSE; + } + + /* Check if the new key was actually created */ + if (Disposition != REG_CREATED_NEW_KEY) + { + DPRINT1("CM: CmpLinkKeyToHive: %S already exists!\n", LinkKeyName); + ZwClose(TargetKeyHandle); + return FALSE; + } + + /* Set the target key name as link target */ + Status = ZwSetValueKey(TargetKeyHandle, + &CmSymbolicLinkValueName, + 0, + REG_LINK, + TargetKeyName, + wcslen(TargetKeyName) * sizeof(WCHAR)); + + /* Close the link key handle */ + ObCloseHandle(TargetKeyHandle, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("CM: CmpLinkKeyToHive: couldn't create symbolic link for %S\n", + TargetKeyName); + return FALSE; + } + + return TRUE; +} VOID NTAPI @@ -1389,9 +1454,13 @@ /* Get rid of the SD */ ExFreePoolWithTag(SecurityDescriptor, TAG_CM); - /* FIXME: Link SECURITY to SAM */ - - /* FIXME: Link S-1-5-18 to .Default */ + /* Link SECURITY to SAM */ + CmpLinkKeyToHive(L"\\Registry\\Machine\\Security\\SAM", + L"\\Registry\\Machine\\SAM\\SAM"); + + /* Link S-1-5-18 to .Default */ + CmpLinkKeyToHive(L"\\Registry\\User\\S-1-5-18", + L"\\Registry\\User\\.Default"); } BOOLEAN

1 0

[hbelusca] 61590: [NTVDM] - Do not export (for the PIC/PIT/Speaker) the port functions but use instead the common port interface. - In bios.c : IOWriteB(PIC_MASTER_DATA, PIC_ICW4_8086 /* | PIC_ICW4...
by hbelusca＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: hbelusca Date: Sat Jan 11 21:45:01 2014 New Revision: 61590 URL: http://svn.reactos.org/svn/reactos?rev=61590&view=rev Log: [NTVDM] - Do not export (for the PIC/PIT/Speaker) the port functions but use instead the common port interface. - In bios.c : IOWriteB(PIC_MASTER_DATA, PIC_ICW4_8086 /* | PIC_ICW4_AEOI */); (line 377) : in NXVM they add PIC_ICW4_AEOI; [TheFlash], can you have a look at this and see whether it is required for the master PIC only, otherwise remove this comment. Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/hardware/pic.h branches/ntvdm/subsystems/ntvdm/hardware/ps2.h branches/ntvdm/subsystems/ntvdm/hardware/speaker.c branches/ntvdm/subsystems/ntvdm/hardware/speaker.h branches/ntvdm/subsystems/ntvdm/hardware/timer.c branches/ntvdm/subsystems/ntvdm/hardware/timer.h Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -361,29 +361,30 @@ * The POST (Power On-Self Test) */ - /* Initialize the PIC */ + /* Initialize the master and the slave PICs */ IOWriteB(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); IOWriteB(PIC_SLAVE_CMD , PIC_ICW1 | PIC_ICW1_ICW4); /* Set the interrupt offsets */ IOWriteB(PIC_MASTER_DATA, BIOS_PIC_MASTER_INT); - IOWriteB(PIC_SLAVE_DATA , BIOS_PIC_SLAVE_INT); + IOWriteB(PIC_SLAVE_DATA , BIOS_PIC_SLAVE_INT ); /* Tell the master PIC there is a slave at IRQ 2 */ IOWriteB(PIC_MASTER_DATA, 1 << 2); IOWriteB(PIC_SLAVE_DATA , 2); - /* Make sure the PIC is in 8086 mode */ - IOWriteB(PIC_MASTER_DATA, PIC_ICW4_8086); + /* Make sure both PICs are in 8086 mode */ + IOWriteB(PIC_MASTER_DATA, PIC_ICW4_8086 /* | PIC_ICW4_AEOI */); IOWriteB(PIC_SLAVE_DATA , PIC_ICW4_8086); /* Clear the masks for both PICs */ IOWriteB(PIC_MASTER_DATA, 0x00); IOWriteB(PIC_SLAVE_DATA , 0x00); - PitWriteCommand(0x34); - PitWriteData(0, 0x00); - PitWriteData(0, 0x00); + /* Initialize the PIT */ + IOWriteB(PIT_COMMAND_PORT, 0x34); + IOWriteB(PIT_DATA_PORT(0), 0x00); + IOWriteB(PIT_DATA_PORT(0), 0x00); return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/hardware/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/pic.h [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -16,20 +16,23 @@ /* DEFINES ********************************************************************/ -#define PIC_MASTER_CMD 0x20 +#define PIC_MASTER_CMD 0x20 #define PIC_MASTER_DATA 0x21 -#define PIC_SLAVE_CMD 0xA0 -#define PIC_SLAVE_DATA 0xA1 -#define PIC_ICW1 0x10 -#define PIC_ICW1_ICW4 (1 << 0) +#define PIC_SLAVE_CMD 0xA0 +#define PIC_SLAVE_DATA 0xA1 + +#define PIC_ICW1 0x10 +#define PIC_ICW1_ICW4 (1 << 0) #define PIC_ICW1_SINGLE (1 << 1) -#define PIC_ICW4_8086 (1 << 0) -#define PIC_ICW4_AEOI (1 << 1) -#define PIC_OCW2_NUM_MASK 0x07 -#define PIC_OCW2_EOI (1 << 5) -#define PIC_OCW2_SL (1 << 6) -#define PIC_OCW3 (1 << 3) -#define PIC_OCW3_READ_ISR 0x0B +#define PIC_ICW4_8086 (1 << 0) +#define PIC_ICW4_AEOI (1 << 1) + +#define PIC_OCW2_NUM_MASK 0x07 +#define PIC_OCW2_EOI (1 << 5) +#define PIC_OCW2_SL (1 << 6) + +#define PIC_OCW3 (1 << 3) +#define PIC_OCW3_READ_ISR 0x0B typedef struct _PIC { @@ -50,6 +53,7 @@ VOID PicInterruptRequest(BYTE Number); BYTE PicGetInterrupt(VOID); + VOID PicInitialize(VOID); #endif // _PIC_H_ Modified: branches/ntvdm/subsystems/ntvdm/hardware/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/ps2.h [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -25,6 +25,7 @@ /* FUNCTIONS ******************************************************************/ VOID GenerateKeyboardInterrupts(VOID); + BOOLEAN PS2Initialize(HANDLE ConsoleInput); VOID PS2Cleanup(VOID); Modified: branches/ntvdm/subsystems/ntvdm/hardware/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/speaker.c [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -28,14 +28,14 @@ static BYTE Port61hState = 0x00; HANDLE hBeep = NULL; -/* PUBLIC FUNCTIONS ***********************************************************/ +/* PRIVATE FUNCTIONS **********************************************************/ -BYTE SpeakerReadStatus(VOID) +static BYTE SpeakerReadStatus(VOID) { return Port61hState; } -VOID SpeakerWriteCommand(BYTE Value) +static VOID SpeakerWriteCommand(BYTE Value) { BOOLEAN IsConnectedToPITChannel2; UCHAR SpeakerData; @@ -121,15 +121,17 @@ } } -BYTE WINAPI SpeakerReadPort(ULONG Port) +static BYTE WINAPI SpeakerReadPort(ULONG Port) { return SpeakerReadStatus(); } -VOID WINAPI SpeakerWritePort(ULONG Port, BYTE Data) +static VOID WINAPI SpeakerWritePort(ULONG Port, BYTE Data) { SpeakerWriteCommand(Data); } + +/* PUBLIC FUNCTIONS ***********************************************************/ VOID SpeakerInitialize(VOID) { Modified: branches/ntvdm/subsystems/ntvdm/hardware/speaker.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/speaker.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/speaker.h [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -21,8 +21,6 @@ VOID SpeakerInitialize(VOID); VOID SpeakerCleanup(VOID); -BYTE SpeakerReadStatus(VOID); -VOID SpeakerWriteCommand(BYTE Value); #endif // _SPEAKER_H_ Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -20,9 +20,9 @@ static PIT_CHANNEL PitChannels[PIT_CHANNELS]; PPIT_CHANNEL PitChannel2 = &PitChannels[2]; -/* PUBLIC FUNCTIONS ***********************************************************/ - -VOID PitWriteCommand(BYTE Value) +/* PRIVATE FUNCTIONS **********************************************************/ + +static VOID PitWriteCommand(BYTE Value) { BYTE Channel = Value >> 6; BYTE Mode = (Value >> 1) & 0x07; @@ -69,7 +69,7 @@ } } -BYTE PitReadData(BYTE Channel) +static BYTE PitReadData(BYTE Channel) { WORD CurrentValue = PitChannels[Channel].CurrentValue; BYTE AccessMode = PitChannels[Channel].AccessMode; @@ -119,7 +119,7 @@ return 0; } -VOID PitWriteData(BYTE Channel, BYTE Value) +static VOID PitWriteData(BYTE Channel, BYTE Value) { BYTE AccessMode = PitChannels[Channel].AccessMode; @@ -183,6 +183,8 @@ } } } + +/* PUBLIC FUNCTIONS ***********************************************************/ VOID PitDecrementCount(DWORD Count) { Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] Sat Jan 11 21:45:01 2014 @@ -47,11 +47,9 @@ /* FUNCTIONS ******************************************************************/ -VOID PitWriteCommand(BYTE Value); -VOID PitWriteData(BYTE Channel, BYTE Value); - VOID PitDecrementCount(DWORD Count); DWORD PitGetResolution(VOID); + VOID PitInitialize(VOID); #endif // _TIMER_H_

1 0

[akhaldi] 61589: [GLU32] * Fix whatever Z is attempting to do.
by akhaldi＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: akhaldi Date: Sat Jan 11 21:26:12 2014 New Revision: 61589 URL: http://svn.reactos.org/svn/reactos?rev=61589&view=rev Log: [GLU32] * Fix whatever Z is attempting to do. Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt Modified: trunk/reactos/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/glu32/CMakeList… ============================================================================== --- trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/glu32/CMakeLists.txt [iso-8859-1] Sat Jan 11 21:26:12 2014 @@ -18,7 +18,6 @@ spec2def(glu32.dll glu32.spec ADD_IMPORTLIB) list(APPEND SOURCE - glu32.rc src/libutil/error.c src/libutil/glue.c src/libutil/mipmap.c @@ -110,7 +109,7 @@ src/libnurbs/nurbtess/searchTree.cc ${CMAKE_CURRENT_BINARY_DIR}/glu32.def) -add_library(glu32 SHARED ${SOURCE}) +add_library(glu32 SHARED ${SOURCE} glu32.rc) set_module_type(glu32 win32dll) if(NOT MSVC)

1 0

[hbelusca] 61588: [DDK:NT_VDD] Declare some VDM memory services. [NTVDM] - Almost all of the XXXInitialize functions just return TRUE always, so VOIDify them instead (since they always succeed). - ...
by hbelusca＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: hbelusca Date: Sat Jan 11 20:59:27 2014 New Revision: 61588 URL: http://svn.reactos.org/svn/reactos?rev=61588&view=rev Log: [DDK:NT_VDD] Declare some VDM memory services. [NTVDM] - Almost all of the XXXInitialize functions just return TRUE always, so VOIDify them instead (since they always succeed). - Move almost all of the hardware initialization inside EmulatorInitialize. - Move pure console initialization/mode-saving/cleanup code into ConsoleInit/Cleanup functions in ntvdm.c instead of in bios.c. Modified: branches/ntvdm/include/ddk/nt_vdd.h branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/emulator.h branches/ntvdm/subsystems/ntvdm/hardware/cmos.c branches/ntvdm/subsystems/ntvdm/hardware/cmos.h branches/ntvdm/subsystems/ntvdm/hardware/pic.c branches/ntvdm/subsystems/ntvdm/hardware/pic.h branches/ntvdm/subsystems/ntvdm/hardware/timer.c branches/ntvdm/subsystems/ntvdm/hardware/timer.h branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/include/ddk/nt_vdd.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/nt_vdd.h?rev=… ============================================================================== --- branches/ntvdm/include/ddk/nt_vdd.h [iso-8859-1] (original) +++ branches/ntvdm/include/ddk/nt_vdd.h [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -35,6 +35,7 @@ VOID WINAPI VDDTerminateVDM(VOID); + /* * I/O Port services @@ -86,6 +87,69 @@ PVDD_IO_PORTRANGE pPortRange ); + +/* + * Memory services + */ + +typedef enum +{ + VDM_V86, + VDM_PM +} VDM_MODE; + +#ifndef MSW_PE +#define MSW_PE 0x0001 +#endif + +#define getMODE() ((getMSW() & MSW_PE) ? VDM_PM : VDM_V86) + +PBYTE +WINAPI +Sim32pGetVDMPointer +( + IN ULONG Address, + IN BOOLEAN ProtectedMode +); + +PBYTE +WINAPI +MGetVdmPointer +( + IN ULONG Address, + IN ULONG Size, + IN BOOLEAN ProtectedMode +); + +PVOID +WINAPI +VdmMapFlat +( + IN USHORT Segment, + IN ULONG Offset, + IN VDM_MODE Mode +); + +BOOL +WINAPI +VdmFlushCache +( + IN USHORT Segment, + IN ULONG Offset, + IN ULONG Size, + IN VDM_MODE Mode +); + +BOOL +WINAPI +VdmUnmapFlat +( + IN USHORT Segment, + IN ULONG Offset, + IN PVOID Buffer, + IN VDM_MODE Mode +); + #ifdef __cplusplus } #endif Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.c [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -25,11 +25,6 @@ PBIOS_DATA_AREA Bda; static BYTE BiosKeyboardMap[256]; -static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; -static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; -static DWORD BiosSavedConInMode, BiosSavedConOutMode; -static CONSOLE_CURSOR_INFO BiosSavedCursorInfo; -static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; /* PRIVATE FUNCTIONS **********************************************************/ @@ -314,7 +309,7 @@ return CharacterData; } -BOOLEAN BiosInitialize(VOID) +BOOLEAN BiosInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput) { /* Initialize the BDA */ Bda = (PBIOS_DATA_AREA)SEG_OFF_TO_PTR(BDA_SEGMENT, 0); @@ -353,64 +348,18 @@ ((PDWORD)BaseAddress)[0x48] = (DWORD)NULL; ((PDWORD)BaseAddress)[0x49] = (DWORD)NULL; - /* Get the input handle to the real console, and check for success */ - BiosConsoleInput = CreateFileW(L"CONIN$", - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (BiosConsoleInput == INVALID_HANDLE_VALUE) - { - return FALSE; - } - - /* Get the output handle to the real console, and check for success */ - BiosConsoleOutput = CreateFileW(L"CONOUT$", - GENERIC_READ | GENERIC_WRITE, - FILE_SHARE_READ | FILE_SHARE_WRITE, - NULL, - OPEN_EXISTING, - 0, - NULL); - if (BiosConsoleOutput == INVALID_HANDLE_VALUE) - { - CloseHandle(BiosConsoleInput); - return FALSE; - } - - /* Save the original input and output console modes */ - if (!GetConsoleMode(BiosConsoleInput , &BiosSavedConInMode ) || - !GetConsoleMode(BiosConsoleOutput, &BiosSavedConOutMode)) - { - CloseHandle(BiosConsoleOutput); - CloseHandle(BiosConsoleInput); - return FALSE; - } - - /* Save the original cursor and console screen buffer information */ - if (!GetConsoleCursorInfo(BiosConsoleOutput, &BiosSavedCursorInfo) || - !GetConsoleScreenBufferInfo(BiosConsoleOutput, &BiosSavedBufferInfo)) - { - CloseHandle(BiosConsoleOutput); - CloseHandle(BiosConsoleInput); - return FALSE; - } - /* Initialize the Video BIOS */ - if (!VidBiosInitialize(BiosConsoleOutput)) - { - CloseHandle(BiosConsoleOutput); - CloseHandle(BiosConsoleInput); - return FALSE; - } + if (!VidBiosInitialize(ConsoleOutput)) return FALSE; /* Set the console input mode */ - SetConsoleMode(BiosConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); + SetConsoleMode(ConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); /* Initialize PS2 */ - PS2Initialize(BiosConsoleInput); + PS2Initialize(ConsoleInput); + + /* + * The POST (Power On-Self Test) + */ /* Initialize the PIC */ IOWriteB(PIC_MASTER_CMD, PIC_ICW1 | PIC_ICW1_ICW4); @@ -441,39 +390,8 @@ VOID BiosCleanup(VOID) { - SMALL_RECT ConRect; - CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; - PS2Cleanup(); VidBiosCleanup(); - - /* Restore the old screen buffer */ - SetConsoleActiveScreenBuffer(BiosConsoleOutput); - - /* Restore the original console size */ - GetConsoleScreenBufferInfo(BiosConsoleOutput, &ConsoleInfo); - ConRect.Left = 0; // BiosSavedBufferInfo.srWindow.Left; - // ConRect.Top = ConsoleInfo.dwCursorPosition.Y / (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1); - // ConRect.Top *= (BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top + 1); - ConRect.Top = ConsoleInfo.dwCursorPosition.Y; - ConRect.Right = ConRect.Left + BiosSavedBufferInfo.srWindow.Right - BiosSavedBufferInfo.srWindow.Left; - ConRect.Bottom = ConRect.Top + BiosSavedBufferInfo.srWindow.Bottom - BiosSavedBufferInfo.srWindow.Top ; - /* See the following trick explanation in vga.c:VgaEnterTextMode() */ - SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); - SetConsoleWindowInfo(BiosConsoleOutput, TRUE, &ConRect); - // SetConsoleWindowInfo(BiosConsoleOutput, TRUE, &BiosSavedBufferInfo.srWindow); - SetConsoleScreenBufferSize(BiosConsoleOutput, BiosSavedBufferInfo.dwSize); - - /* Restore the original cursor shape */ - SetConsoleCursorInfo(BiosConsoleOutput, &BiosSavedCursorInfo); - - /* Restore the original input and output console modes */ - SetConsoleMode(BiosConsoleOutput, BiosSavedConOutMode); - SetConsoleMode(BiosConsoleInput , BiosSavedConInMode ); - - /* Close the console handles */ - if (BiosConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleOutput); - if (BiosConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(BiosConsoleInput); } VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack) Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -137,7 +137,7 @@ WORD BiosPeekCharacter(VOID); WORD BiosGetCharacter(VOID); -BOOLEAN BiosInitialize(VOID); +BOOLEAN BiosInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput); VOID BiosCleanup(VOID); VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); 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] Sat Jan 11 20:59:27 2014 @@ -11,20 +11,24 @@ #define NDEBUG #include "emulator.h" + #include "bios/bios.h" +#include "hardware/cmos.h" +#include "hardware/pic.h" +#include "hardware/speaker.h" +#include "hardware/timer.h" +#include "hardware/vga.h" + #include "bop.h" #include "vddsup.h" #include "io.h" #include "registers.h" -#include "hardware/vga.h" -#include "hardware/pic.h" - -// HACK -typedef INT VDM_MODE; /* PRIVATE VARIABLES **********************************************************/ FAST486_STATE EmulatorContext; +LPVOID BaseAddress = NULL; +BOOLEAN VdmRunning = TRUE; static BOOLEAN A20Line = FALSE; @@ -115,7 +119,14 @@ { /* Allocate memory for the 16-bit address space */ BaseAddress = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_ADDRESS); - if (BaseAddress == NULL) return FALSE; + if (BaseAddress == NULL) + { + wprintf(L"FATAL: Failed to allocate VDM memory.\n"); + return FALSE; + } + + /* Initialize I/O ports */ + /* Initialize RAM */ /* Initialize the CPU */ Fast486Initialize(&EmulatorContext, @@ -131,17 +142,30 @@ /* Enable interrupts */ setIF(1); + /* Initialize the PIC, the PIT, the CMOS and the PC Speaker */ + PicInitialize(); + PitInitialize(); + CmosInitialize(); + SpeakerInitialize(); + + /* Register the DebugBreak BOP */ + RegisterBop(BOP_DEBUGGER, EmulatorDebugBreak); + /* Initialize VDD support */ VDDSupInitialize(); - /* Register the DebugBreak BOP */ - RegisterBop(BOP_DEBUGGER, EmulatorDebugBreak); - return TRUE; } VOID EmulatorCleanup(VOID) { + SpeakerCleanup(); + CmosCleanup(); + // PitCleanup(); + // PicCleanup(); + + // Fast486Cleanup(); + /* Free the memory allocated for the 16-bit address space */ if (BaseAddress != NULL) HeapFree(GetProcessHeap(), 0, BaseAddress); } @@ -227,7 +251,7 @@ return SEG_OFF_TO_PTR(Segment, Offset); } -BOOL +BOOL WINAPI VdmFlushCache(IN USHORT Segment, IN ULONG Offset, 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] Sat Jan 11 20:59:27 2014 @@ -40,6 +40,25 @@ #define STACK_CS 3 #define STACK_FLAGS 4 + +/* Basic Memory Management */ +#define TO_LINEAR(seg, off) (((seg) << 4) + (off)) +#define MAX_SEGMENT 0xFFFF +#define MAX_OFFSET 0xFFFF +#define MAX_ADDRESS 0x1000000 // 16 MB of RAM + +#define FAR_POINTER(x) \ + (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) + +#define SEG_OFF_TO_PTR(seg, off) \ + (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off))) + + +/* BCD-Binary conversion */ +#define BINARY_TO_BCD(x) ((((x) / 1000) << 12) + (((x) / 100) << 8) + (((x) / 10) << 4) + ((x) % 10)) +#define BCD_TO_BINARY(x) (((x) >> 12) * 1000 + ((x) >> 8) * 100 + ((x) >> 4) * 10 + ((x) & 0x0F)) + + enum { EMULATOR_EXCEPTION_DIVISION_BY_ZERO, @@ -60,6 +79,8 @@ }; extern FAST486_STATE EmulatorContext; +extern LPVOID BaseAddress; +extern BOOLEAN VdmRunning; /* FUNCTIONS ******************************************************************/ Modified: branches/ntvdm/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -384,7 +384,7 @@ } } -BOOLEAN CmosInitialize(VOID) +VOID CmosInitialize(VOID) { DWORD CmosSize = sizeof(CmosMemory); @@ -433,8 +433,6 @@ /* Register the I/O Ports */ RegisterIoPort(CMOS_ADDRESS_PORT, NULL , CmosWritePort); RegisterIoPort(CMOS_DATA_PORT , CmosReadPort, CmosWritePort); - - return TRUE; } VOID CmosCleanup(VOID) Modified: branches/ntvdm/subsystems/ntvdm/hardware/cmos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/cmos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/cmos.h [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -129,7 +129,7 @@ VOID RtcPeriodicTick(VOID); VOID RtcTimeUpdate(VOID); -BOOLEAN CmosInitialize(VOID); +VOID CmosInitialize(VOID); VOID CmosCleanup(VOID); #endif // _CMOS_H_ Modified: branches/ntvdm/subsystems/ntvdm/hardware/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/pic.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/pic.c [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -293,15 +293,13 @@ else return MasterPic.IntOffset + 7; } -BOOLEAN PicInitialize(VOID) +VOID PicInitialize(VOID) { /* Register the I/O Ports */ RegisterIoPort(PIC_MASTER_CMD , PicReadPort, PicWritePort); RegisterIoPort(PIC_SLAVE_CMD , PicReadPort, PicWritePort); RegisterIoPort(PIC_MASTER_DATA, PicReadPort, PicWritePort); RegisterIoPort(PIC_SLAVE_DATA , PicReadPort, PicWritePort); - - return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/hardware/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/pic.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/pic.h [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -50,7 +50,7 @@ VOID PicInterruptRequest(BYTE Number); BYTE PicGetInterrupt(VOID); -BOOLEAN PicInitialize(VOID); +VOID PicInitialize(VOID); #endif // _PIC_H_ Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.c [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -350,15 +350,13 @@ return PIT_BASE_FREQUENCY / MinReloadValue; } -BOOLEAN PitInitialize(VOID) +VOID PitInitialize(VOID) { /* Register the I/O Ports */ RegisterIoPort(PIT_COMMAND_PORT, NULL , PitWritePort); RegisterIoPort(PIT_DATA_PORT(0), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(1), PitReadPort, PitWritePort); RegisterIoPort(PIT_DATA_PORT(2), PitReadPort, PitWritePort); - - return TRUE; } /* EOF */ Modified: branches/ntvdm/subsystems/ntvdm/hardware/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/hardware/timer.h [iso-8859-1] Sat Jan 11 20:59:27 2014 @@ -52,7 +52,7 @@ VOID PitDecrementCount(DWORD Count); DWORD PitGetResolution(VOID); -BOOLEAN PitInitialize(VOID); +VOID PitInitialize(VOID); #endif // _TIMER_H_ 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] Sat Jan 11 20:59:27 2014 @@ -15,9 +15,7 @@ #include "bios/bios.h" #include "hardware/cmos.h" -#include "hardware/pic.h" #include "hardware/ps2.h" -#include "hardware/speaker.h" #include "hardware/timer.h" #include "hardware/vga.h" #include "dos/dos.h" @@ -30,8 +28,11 @@ /* PUBLIC VARIABLES ***********************************************************/ -BOOLEAN VdmRunning = TRUE; -LPVOID BaseAddress = NULL; +static HANDLE ConsoleInput = INVALID_HANDLE_VALUE; +static HANDLE ConsoleOutput = INVALID_HANDLE_VALUE; +static DWORD OrgConsoleInputMode, OrgConsoleOutputMode; +static CONSOLE_CURSOR_INFO OrgConsoleCursorInfo; +static CONSOLE_SCREEN_BUFFER_INFO OrgConsoleBufferInfo; /* PUBLIC FUNCTIONS ***********************************************************/ @@ -65,6 +66,97 @@ } } return TRUE; +} + +BOOL ConsoleInit(VOID) +{ + /* Set the handler routine */ + SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); + + /* Get the input handle to the real console, and check for success */ + ConsoleInput = CreateFileW(L"CONIN$", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (ConsoleInput == INVALID_HANDLE_VALUE) + { + wprintf(L"FATAL: Cannot retrieve a handle to the console input\n"); + return FALSE; + } + + /* Get the output handle to the real console, and check for success */ + ConsoleOutput = CreateFileW(L"CONOUT$", + GENERIC_READ | GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_EXISTING, + 0, + NULL); + if (ConsoleOutput == INVALID_HANDLE_VALUE) + { + CloseHandle(ConsoleInput); + wprintf(L"FATAL: Cannot retrieve a handle to the console output\n"); + return FALSE; + } + + /* Save the original input and output console modes */ + if (!GetConsoleMode(ConsoleInput , &OrgConsoleInputMode ) || + !GetConsoleMode(ConsoleOutput, &OrgConsoleOutputMode)) + { + CloseHandle(ConsoleOutput); + CloseHandle(ConsoleInput); + wprintf(L"FATAL: Cannot save console in/out modes\n"); + return FALSE; + } + + /* Save the original cursor and console screen buffer information */ + if (!GetConsoleCursorInfo(ConsoleOutput, &OrgConsoleCursorInfo) || + !GetConsoleScreenBufferInfo(ConsoleOutput, &OrgConsoleBufferInfo)) + { + CloseHandle(ConsoleOutput); + CloseHandle(ConsoleInput); + wprintf(L"FATAL: Cannot save console cursor/screen-buffer info\n"); + return FALSE; + } + + return TRUE; +} + +VOID ConsoleCleanup(VOID) +{ + SMALL_RECT ConRect; + CONSOLE_SCREEN_BUFFER_INFO ConsoleInfo; + + /* Restore the old screen buffer */ + SetConsoleActiveScreenBuffer(ConsoleOutput); + + /* Restore the original console size */ + GetConsoleScreenBufferInfo(ConsoleOutput, &ConsoleInfo); + ConRect.Left = 0; // OrgConsoleBufferInfo.srWindow.Left; + // ConRect.Top = ConsoleInfo.dwCursorPosition.Y / (OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top + 1); + // ConRect.Top *= (OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top + 1); + ConRect.Top = ConsoleInfo.dwCursorPosition.Y; + ConRect.Right = ConRect.Left + OrgConsoleBufferInfo.srWindow.Right - OrgConsoleBufferInfo.srWindow.Left; + ConRect.Bottom = ConRect.Top + OrgConsoleBufferInfo.srWindow.Bottom - OrgConsoleBufferInfo.srWindow.Top ; + /* See the following trick explanation in vga.c:VgaEnterTextMode() */ + SetConsoleScreenBufferSize(ConsoleOutput, OrgConsoleBufferInfo.dwSize); + SetConsoleWindowInfo(ConsoleOutput, TRUE, &ConRect); + // SetConsoleWindowInfo(ConsoleOutput, TRUE, &OrgConsoleBufferInfo.srWindow); + SetConsoleScreenBufferSize(ConsoleOutput, OrgConsoleBufferInfo.dwSize); + + /* Restore the original cursor shape */ + SetConsoleCursorInfo(ConsoleOutput, &OrgConsoleCursorInfo); + + /* Restore the original input and output console modes */ + SetConsoleMode(ConsoleOutput, OrgConsoleOutputMode); + SetConsoleMode(ConsoleInput , OrgConsoleInputMode ); + + /* Close the console handles */ + if (ConsoleOutput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleOutput); + if (ConsoleInput != INVALID_HANDLE_VALUE) CloseHandle(ConsoleInput); } INT wmain(INT argc, WCHAR *argv[]) @@ -81,9 +173,6 @@ DWORD Cycles = 0; INT KeyboardIntCounter = 0; - /* Set the handler routine */ - SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); - #ifndef TESTING UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); @@ -105,10 +194,17 @@ DPRINT1("\n\n\nNTVDM - Starting '%s'...\n\n\n", CommandLine); + /* Initialize the console */ + if (!ConsoleInit()) + { + wprintf(L"FATAL: A problem occurred when trying to initialize the console\n"); + goto Cleanup; + } + /* Initialize the emulator */ if (!EmulatorInitialize()) { - wprintf(L"FATAL: Failed to initialize the CPU emulator\n"); + wprintf(L"FATAL: Failed to initialize the emulator\n"); goto Cleanup; } @@ -119,38 +215,8 @@ goto Cleanup; } - /* Initialize the PIC */ - if (!PicInitialize()) - { - wprintf(L"FATAL: Failed to initialize the PIC.\n"); - goto Cleanup; - } - - /* Initialize the PIT */ - if (!PitInitialize()) - { - wprintf(L"FATAL: Failed to initialize the PIT.\n"); - goto Cleanup; - } - - /* Initialize the CMOS */ - if (!CmosInitialize()) - { - wprintf(L"FATAL: Failed to initialize the VDM CMOS.\n"); - goto Cleanup; - } - - /* Initialize the PC Speaker */ - SpeakerInitialize(); - - - - - - - /* Initialize the system BIOS */ - if (!BiosInitialize()) + if (!BiosInitialize(ConsoleInput, ConsoleOutput)) { wprintf(L"FATAL: Failed to initialize the VDM BIOS.\n"); goto Cleanup; @@ -264,10 +330,9 @@ VgaRefreshDisplay(); Cleanup: - SpeakerCleanup(); BiosCleanup(); - CmosCleanup(); EmulatorCleanup(); + ConsoleCleanup(); DPRINT1("\n\n\nNTVDM - Exiting...\n\n\n"); 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] Sat Jan 11 20:59:27 2014 @@ -30,31 +30,12 @@ /* DEFINES ********************************************************************/ -/* Basic Memory Management */ -#define TO_LINEAR(seg, off) (((seg) << 4) + (off)) -#define MAX_SEGMENT 0xFFFF -#define MAX_OFFSET 0xFFFF -#define MAX_ADDRESS 0x1000000 // 16 MB of RAM - -#define FAR_POINTER(x) \ - (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) - -#define SEG_OFF_TO_PTR(seg, off) \ - (PVOID)((ULONG_PTR)BaseAddress + TO_LINEAR((seg), (off))) - -/* BCD-Binary conversion */ -#define BINARY_TO_BCD(x) ((((x) / 1000) << 12) + (((x) / 100) << 8) + (((x) / 10) << 4) + ((x) % 10)) -#define BCD_TO_BINARY(x) (((x) >> 12) * 1000 + ((x) >> 8) * 100 + ((x) >> 4) * 10 + ((x) & 0x0F)) - /* Processor speed */ #define STEPS_PER_CYCLE 256 #define KBD_INT_CYCLES 16 /* FUNCTIONS ******************************************************************/ -extern LPVOID BaseAddress; -extern BOOLEAN VdmRunning; - VOID DisplayMessage(LPCWSTR Format, ...); #endif // _NTVDM_H_

1 0

[ekohl] 61587: [MSGINA] - WlxDisplaySASNotice: Do not try an auto admin logon here. Check for auto admin logon instead and let WlxLoggedOutSAS do the logon stuff. [WINLOGON] - Avoid posting two SAS...
by ekohl＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: ekohl Date: Sat Jan 11 20:47:41 2014 New Revision: 61587 URL: http://svn.reactos.org/svn/reactos?rev=61587&view=rev Log: [MSGINA] - WlxDisplaySASNotice: Do not try an auto admin logon here. Check for auto admin logon instead and let WlxLoggedOutSAS do the logon stuff. [WINLOGON] - Avoid posting two SAS notification messages when winlogon is started up. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/dll/win32/msgina/msgina.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Jan 11 20:47:41 2014 @@ -845,7 +845,10 @@ Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; case WLX_SAS_ACTION_NONE: /* 0x02 */ - Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + if (Session->LogonState == STATE_LOGGED_OFF) + { + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); + } break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) @@ -919,7 +922,7 @@ case WLX_SAS_TYPE_TIMEOUT: /* 0x00 */ { Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); - break; + return; } default: { Modified: trunk/reactos/dll/win32/msgina/msgina.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.c?… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.c [iso-8859-1] Sat Jan 11 20:47:41 2014 @@ -572,6 +572,47 @@ return FALSE; } + +static +BOOL +CheckAutoAdminLogon( + IN PGINA_CONTEXT pgContext) +{ + HKEY WinLogonKey = NULL; + LPWSTR AutoLogon = NULL; + BOOL result = FALSE; + LONG rc; + + if (pgContext->AutoLogonState == AUTOLOGON_DISABLED) + return FALSE; + + rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\WinLogon", + 0, + KEY_QUERY_VALUE, + &WinLogonKey); + if (rc != ERROR_SUCCESS) + goto cleanup; + + rc = ReadRegSzKey(WinLogonKey, + L"AutoAdminLogon", + &AutoLogon); + + if (rc != ERROR_SUCCESS) + goto cleanup; + + if (wcscmp(AutoLogon, L"1") == 0) + result = TRUE; + +cleanup: + if (WinLogonKey != NULL) + RegCloseKey(WinLogonKey); + HeapFree(GetProcessHeap(), 0, AutoLogon); + + return result; +} + + static BOOL DoAutoLogon( IN PGINA_CONTEXT pgContext) @@ -685,7 +726,7 @@ return; } - if (DoAutoLogon(pgContext)) + if (CheckAutoAdminLogon(pgContext)) { /* Don't display the window, we want to do an automatic logon */ pgContext->AutoLogonState = AUTOLOGON_ONCE;

1 0

[hbelusca] 61586: [NTVDM]: Break the BIOS into the BIOS and the video BIOS.
by hbelusca＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: hbelusca Date: Sat Jan 11 17:05:25 2014 New Revision: 61586 URL: http://svn.reactos.org/svn/reactos?rev=61586&view=rev Log: [NTVDM]: Break the BIOS into the BIOS and the video BIOS. Added: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c - copied, changed from r61583, branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/vidbios.h - copied, changed from r61583, branches/ntvdm/subsystems/ntvdm/bios/bios.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/bios/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h branches/ntvdm/subsystems/ntvdm/dos/dos.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Modified: branches/ntvdm/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Copied: branches/ntvdm/subsystems/ntvdm/bios/vidbios.c (from r61583, branches/ntvdm/subsystems/ntvdm/bios/bios.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… Copied: branches/ntvdm/subsystems/ntvdm/bios/vidbios.h (from r61583, branches/ntvdm/subsystems/ntvdm/bios/bios.h) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/vid… Modified: branches/ntvdm/subsystems/ntvdm/dos/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.…

1 0

[ekohl] 61585: [WINLOGON] - Implement a global dialog tracking list. - Close the SAS notice dialog before the logon dialog is created and create a new SAS notice dialog when the user cancels the lo...
by ekohl＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: ekohl Date: Sat Jan 11 16:20:31 2014 New Revision: 61585 URL: http://svn.reactos.org/svn/reactos?rev=61585&view=rev Log: [WINLOGON] - Implement a global dialog tracking list. - Close the SAS notice dialog before the logon dialog is created and create a new SAS notice dialog when the user cancels the logon dialog. This prevents the creation of multiple SAS notice dialogs below the logon dialog. Modified: trunk/reactos/base/system/winlogon/sas.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/sas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c… ============================================================================== --- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sat Jan 11 16:20:31 2014 @@ -845,6 +845,7 @@ Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; case WLX_SAS_ACTION_NONE: /* 0x02 */ + Session->Gina.Functions.WlxDisplaySASNotice(Session->Gina.Context); break; case WLX_SAS_ACTION_LOCK_WKSTA: /* 0x03 */ if (Session->Gina.Functions.WlxIsLockOk(Session->Gina.Context)) @@ -923,6 +924,13 @@ default: { PSID LogonSid = NULL; /* FIXME */ + HWND hwnd; + + hwnd = GetTopDialogWindow(); + if (hwnd != NULL) + { + SendMessage(hwnd, WM_USER, 0, 0); + } Session->Options = 0; Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.c [iso-8859-1] Sat Jan 11 16:20:31 2014 @@ -334,6 +334,9 @@ ZeroMemory(WLSession, sizeof(WLSESSION)); WLSession->DialogTimeout = 120; /* 2 minutes */ + /* Initialize the dialog tracking list */ + InitDialogListHead(); + if (!CreateWindowStationAndDesktops(WLSession)) { ERR("WL: Could not create window station and desktops\n"); Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… ============================================================================== --- trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Sat Jan 11 16:20:31 2014 @@ -189,17 +189,17 @@ */ typedef enum _LOGON_STATE { - STATE_INIT, // not user yet + STATE_INIT, // not used yet STATE_LOGGED_OFF, - STATE_LOGGED_OFF_SAS, // not user yet + STATE_LOGGED_OFF_SAS, // not used yet STATE_LOGGED_ON, - STATE_LOGGED_ON_SAS, // not user yet - STATE_SCREENSAVER, // not user yet + STATE_LOGGED_ON_SAS, // not used yet + STATE_SCREENSAVER, // not used yet STATE_LOCKED, - STATE_LOCKED_SAS, // not user yet - STATE_LOGGING_OFF, // not user yet - STATE_SHUTTING_DOWN, // not user yet - STATE_SHUT_DOWN // not user yet + STATE_LOCKED_SAS, // not used yet + STATE_LOGGING_OFF, // not used yet + STATE_SHUTTING_DOWN, // not used yet + STATE_SHUT_DOWN // not used yet } LOGON_STATE, *PLOGON_STATE; #define LockWorkstation(Session) @@ -291,6 +291,12 @@ RemoveStatusMessage(IN PWLSESSION Session); /* wlx.c */ +VOID +InitDialogListHead(VOID); + +HWND +GetTopDialogWindow(VOID); + BOOL GinaInit(IN OUT PWLSESSION Session); Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sat Jan 11 16:20:31 2014 @@ -26,12 +26,106 @@ #define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \ GENERIC_EXECUTE | GENERIC_ALL) +typedef struct _DIALOG_LIST_ENTRY +{ + LIST_ENTRY Entry; + HWND hWnd; + DLGPROC DlgProc; + LPARAM lParam; +} DIALOG_LIST_ENTRY, *PDIALOG_LIST_ENTRY; + /* GLOBALS ******************************************************************/ -static DLGPROC PreviousWindowProc; -static UINT_PTR IdTimer; +//static UINT_PTR IdTimer; +static LIST_ENTRY DialogListHead; /* FUNCTIONS ****************************************************************/ + +VOID +InitDialogListHead(VOID) +{ + InitializeListHead(&DialogListHead); +} + + +static +PDIALOG_LIST_ENTRY +AddDialogListEntry(VOID) +{ + PDIALOG_LIST_ENTRY ListEntry; + + ListEntry = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DIALOG_LIST_ENTRY)); + if (ListEntry == NULL) + return NULL; + + TRACE("Add entry %p\n", ListEntry); + + InsertHeadList(&DialogListHead, + &ListEntry->Entry); + + return ListEntry; +} + + +static +VOID +RemoveDialogListEntry(PDIALOG_LIST_ENTRY ListEntry) +{ + TRACE("Remove entry %p\n", ListEntry); + + RemoveEntryList(&ListEntry->Entry); + RtlFreeHeap(RtlGetProcessHeap(), 0, ListEntry); +} + + +static +PDIALOG_LIST_ENTRY +GetDialogListEntry(HWND hwndDlg) +{ + PDIALOG_LIST_ENTRY Current; + PLIST_ENTRY ListEntry; + + ListEntry = DialogListHead.Flink; + while (ListEntry != &DialogListHead) + { + Current = CONTAINING_RECORD(ListEntry, + DIALOG_LIST_ENTRY, + Entry); + if (Current->hWnd == hwndDlg) + { + TRACE("Found entry: %p\n", Current); + return Current; + } + + ListEntry = ListEntry->Flink; + } + + TRACE("Found no entry!\n"); + return NULL; +} + + +HWND +GetTopDialogWindow(VOID) +{ + PDIALOG_LIST_ENTRY Current; + PLIST_ENTRY ListEntry; + + ListEntry = DialogListHead.Flink; + if (ListEntry != &DialogListHead) + { + Current = CONTAINING_RECORD(ListEntry, + DIALOG_LIST_ENTRY, + Entry); + + TRACE("Found entry: %p window %p\n", Current, Current->hWnd); + return Current->hWnd; + } + + TRACE("Found no window\n"); + return NULL; +} + static INT_PTR @@ -42,6 +136,36 @@ IN WPARAM wParam, IN LPARAM lParam) { + PDIALOG_LIST_ENTRY ListEntry; + INT_PTR ret; + + if (uMsg == WM_INITDIALOG) + { + ListEntry = (PDIALOG_LIST_ENTRY)lParam; + + TRACE("Set dialog handle: %p\n", hwndDlg); + ListEntry->hWnd = hwndDlg; + lParam = ListEntry->lParam; +// SetTopTimeout(hWnd); + } + else + { + ListEntry = GetDialogListEntry(hwndDlg); + if (ListEntry == NULL) + return FALSE; + } + + if (uMsg == WM_USER) + { + EndDialog(hwndDlg, 0); + return 0; + } + + ret = ListEntry->DlgProc(hwndDlg, uMsg, wParam, lParam); + + return ret; + +/* if (uMsg == WM_TIMER && (UINT_PTR)wParam == IdTimer) { EndDialog(hwndDlg, -1); @@ -64,6 +188,7 @@ { return PreviousWindowProc(hwndDlg, uMsg, wParam, lParam); } +*/ } /* @@ -186,10 +311,7 @@ TRACE("WlxDialogBox()\n"); - if (PreviousWindowProc != NULL) - return -1; - PreviousWindowProc = dlgprc; - return (int)DialogBoxW((HINSTANCE) hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)WlxDialogBoxParam(hWlx, hInst, lpszTemplate, hwndOwner, dlgprc, 0); } /* @@ -205,14 +327,25 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + PDIALOG_LIST_ENTRY ListEntry; + int ret; + UNREFERENCED_PARAMETER(hWlx); TRACE("WlxDialogBoxParam()\n"); - if (PreviousWindowProc != NULL) + ListEntry = AddDialogListEntry(); + if (ListEntry == NULL) return -1; - PreviousWindowProc = dlgprc; - return (int)DialogBoxParamW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + + ListEntry->DlgProc = dlgprc; + ListEntry->lParam = dwInitParam; + + ret = (int)DialogBoxParamW(hInst, lpszTemplate, hwndOwner, DefaultWlxWindowProc, (LPARAM)ListEntry); + + RemoveDialogListEntry(ListEntry); + + return ret; } /* @@ -231,10 +364,7 @@ TRACE("WlxDialogBoxIndirect()\n"); - if (PreviousWindowProc != NULL) - return -1; - PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirectW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc); + return (int)WlxDialogBoxIndirectParam(hWlx, hInst, hDialogTemplate, hwndOwner, dlgprc, 0); } /* @@ -250,14 +380,25 @@ DLGPROC dlgprc, LPARAM dwInitParam) { + PDIALOG_LIST_ENTRY ListEntry; + int ret; + UNREFERENCED_PARAMETER(hWlx); TRACE("WlxDialogBoxIndirectParam()\n"); - if (PreviousWindowProc != NULL) + ListEntry = AddDialogListEntry(); + if (ListEntry == NULL) return -1; - PreviousWindowProc = dlgprc; - return (int)DialogBoxIndirectParamW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, dwInitParam); + + ListEntry->DlgProc = dlgprc; + ListEntry->lParam = dwInitParam; + + ret = (int)DialogBoxIndirectParamW(hInst, hDialogTemplate, hwndOwner, DefaultWlxWindowProc, (LPARAM)ListEntry); + + RemoveDialogListEntry(ListEntry); + + return ret; } /* @@ -789,7 +930,6 @@ Session->Gina.Version = GinaDllVersion; Session->Gina.UseCtrlAltDelete = FALSE; Session->SuppressStatus = FALSE; - PreviousWindowProc = NULL; TRACE("Calling WlxInitialize(\"%S\")\n", Session->InteractiveWindowStationName); return Session->Gina.Functions.WlxInitialize(

1 0

[tkreuzer] 61584: [NTOSKRNL] Halfplement NtCloseObjectAuditAlarm (the internal function SepAdtCloseObjectAuditAlarm is not implemented yet, but the function now returns a proper status code)
by tkreuzer＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: tkreuzer Date: Sat Jan 11 15:31:16 2014 New Revision: 61584 URL: http://svn.reactos.org/svn/reactos?rev=61584&view=rev Log: [NTOSKRNL] Halfplement NtCloseObjectAuditAlarm (the internal function SepAdtCloseObjectAuditAlarm is not implemented yet, but the function now returns a proper status code) Modified: trunk/reactos/include/ndk/psfuncs.h trunk/reactos/ntoskrnl/se/audit.c Modified: trunk/reactos/include/ndk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/psfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/psfuncs.h [iso-8859-1] Sat Jan 11 15:31:16 2014 @@ -149,6 +149,13 @@ // // Process Impersonation Functions // +NTKERNELAPI +BOOLEAN +NTAPI +PsIsThreadImpersonating( + _In_ PETHREAD Thread +); + NTKERNELAPI VOID NTAPI Modified: trunk/reactos/ntoskrnl/se/audit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/audit.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/audit.c [iso-8859-1] Sat Jan 11 15:31:16 2014 @@ -336,6 +336,16 @@ UNIMPLEMENTED; } +VOID +NTAPI +SepAdtCloseObjectAuditAlarm( + PUNICODE_STRING SubsystemName, + PVOID HandleId, + PSID Sid) +{ + UNIMPLEMENTED; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS @@ -357,13 +367,90 @@ } -NTSTATUS NTAPI -NtCloseObjectAuditAlarm(IN PUNICODE_STRING SubsystemName, - IN PVOID HandleId, - IN BOOLEAN GenerateOnClose) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; +NTSTATUS +NTAPI +NtCloseObjectAuditAlarm( + PUNICODE_STRING SubsystemName, + PVOID HandleId, + BOOLEAN GenerateOnClose) +{ + UNICODE_STRING CapturedSubsystemName; + KPROCESSOR_MODE PreviousMode; + BOOLEAN UseImpersonationToken; + PETHREAD CurrentThread; + BOOLEAN CopyOnOpen, EffectiveOnly; + SECURITY_IMPERSONATION_LEVEL ImpersonationLevel; + NTSTATUS Status; + PTOKEN Token; + PAGED_CODE(); + + /* Get the previous mode (only user mode is supported!) */ + PreviousMode = ExGetPreviousMode(); + ASSERT(PreviousMode != KernelMode); + + /* Do we even need to do anything? */ + if (!GenerateOnClose) + { + /* Nothing to do, return success */ + return STATUS_SUCCESS; + } + + /* Validate privilege */ + if (!SeSinglePrivilegeCheck(SeAuditPrivilege, PreviousMode)) + { + DPRINT1("Caller does not have SeAuditPrivilege\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Probe and capture the subsystem name */ + Status = ProbeAndCaptureUnicodeString(&CapturedSubsystemName, + PreviousMode, + SubsystemName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to capture subsystem name!\n"); + return Status; + } + + /* Get the current thread and check if it's impersonating */ + CurrentThread = PsGetCurrentThread(); + if (PsIsThreadImpersonating(CurrentThread)) + { + /* Get the impersonation token */ + Token = PsReferenceImpersonationToken(CurrentThread, + &CopyOnOpen, + &EffectiveOnly, + &ImpersonationLevel); + UseImpersonationToken = TRUE; + } + else + { + /* Get the primary token */ + Token = PsReferencePrimaryToken(PsGetCurrentProcess()); + UseImpersonationToken = FALSE; + } + + /* Call the internal function */ + SepAdtCloseObjectAuditAlarm(&CapturedSubsystemName, + HandleId, + Token->UserAndGroups->Sid); + + /* Release the captured subsystem name */ + ReleaseCapturedUnicodeString(&CapturedSubsystemName, PreviousMode); + + /* Check what token we used */ + if (UseImpersonationToken) + { + /* Release impersonation token */ + PsDereferenceImpersonationToken(Token); + } + else + { + /* Release primary token */ + PsDereferencePrimaryToken(Token); + } + + return STATUS_SUCCESS; }

1 0

[hbelusca] 61583: [NTVDM]: Start to organize the code...
by hbelusca＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: hbelusca Date: Sat Jan 11 15:27:18 2014 New Revision: 61583 URL: http://svn.reactos.org/svn/reactos?rev=61583&view=rev Log: [NTVDM]: Start to organize the code... Added: branches/ntvdm/subsystems/ntvdm/bios/ (with props) branches/ntvdm/subsystems/ntvdm/bios/bios.c - copied, changed from r61580, branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios/bios.h - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos/ (with props) branches/ntvdm/subsystems/ntvdm/dos/dos.c - copied, changed from r61579, branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos/dos.h - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/hardware/ (with props) branches/ntvdm/subsystems/ntvdm/hardware/cmos.c - copied, changed from r61579, branches/ntvdm/subsystems/ntvdm/cmos.c branches/ntvdm/subsystems/ntvdm/hardware/cmos.h - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/cmos.h branches/ntvdm/subsystems/ntvdm/hardware/pic.c - copied unchanged from r61580, branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/hardware/pic.h - copied unchanged from r61580, branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/hardware/ps2.c - copied unchanged from r61580, branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/hardware/ps2.h - copied unchanged from r61580, branches/ntvdm/subsystems/ntvdm/ps2.h branches/ntvdm/subsystems/ntvdm/hardware/speaker.c - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/speaker.c branches/ntvdm/subsystems/ntvdm/hardware/speaker.h - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/speaker.h branches/ntvdm/subsystems/ntvdm/hardware/timer.c - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/timer.c branches/ntvdm/subsystems/ntvdm/hardware/timer.h - copied unchanged from r61579, branches/ntvdm/subsystems/ntvdm/timer.h branches/ntvdm/subsystems/ntvdm/hardware/vga.c - copied, changed from r61580, branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/hardware/vga.h - copied unchanged from r61580, branches/ntvdm/subsystems/ntvdm/vga.h Removed: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/cmos.c branches/ntvdm/subsystems/ntvdm/cmos.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/pic.c branches/ntvdm/subsystems/ntvdm/pic.h branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/ps2.h branches/ntvdm/subsystems/ntvdm/speaker.c branches/ntvdm/subsystems/ntvdm/speaker.h branches/ntvdm/subsystems/ntvdm/timer.c branches/ntvdm/subsystems/ntvdm/timer.h branches/ntvdm/subsystems/ntvdm/vga.c branches/ntvdm/subsystems/ntvdm/vga.h Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/int32.c branches/ntvdm/subsystems/ntvdm/ntvdm.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/CMakeLis… Removed: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… Removed: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… Copied: branches/ntvdm/subsystems/ntvdm/bios/bios.c (from r61580, branches/ntvdm/subsystems/ntvdm/bios.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios/bio… Removed: branches/ntvdm/subsystems/ntvdm/cmos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.c?r… Removed: branches/ntvdm/subsystems/ntvdm/cmos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/cmos.h?r… Removed: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… Removed: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… Copied: branches/ntvdm/subsystems/ntvdm/dos/dos.c (from r61579, branches/ntvdm/subsystems/ntvdm/dos.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos/dos.… Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… Copied: branches/ntvdm/subsystems/ntvdm/hardware/cmos.c (from r61579, branches/ntvdm/subsystems/ntvdm/cmos.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… Copied: branches/ntvdm/subsystems/ntvdm/hardware/vga.c (from r61580, branches/ntvdm/subsystems/ntvdm/vga.c) URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/hardware… Modified: branches/ntvdm/subsystems/ntvdm/int32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/int32.c?… Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… Removed: branches/ntvdm/subsystems/ntvdm/pic.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.c?re… Removed: branches/ntvdm/subsystems/ntvdm/pic.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/pic.h?re… Removed: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… Removed: branches/ntvdm/subsystems/ntvdm/ps2.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.h?re… Removed: branches/ntvdm/subsystems/ntvdm/speaker.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/speaker.… Removed: branches/ntvdm/subsystems/ntvdm/speaker.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/speaker.… Removed: branches/ntvdm/subsystems/ntvdm/timer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.c?… Removed: branches/ntvdm/subsystems/ntvdm/timer.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/timer.h?… Removed: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… Removed: branches/ntvdm/subsystems/ntvdm/vga.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.h?re…

1 0

[tkreuzer] 61582: [NTOSKRNL] Small optimization of SepPrivilegeCheck
by tkreuzer＠svn.reactos.org 11 Jan '14

11 Jan '14

Author: tkreuzer Date: Sat Jan 11 15:23:53 2014 New Revision: 61582 URL: http://svn.reactos.org/svn/reactos?rev=61582&view=rev Log: [NTOSKRNL] Small optimization of SepPrivilegeCheck Modified: trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=615… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Jan 11 15:23:53 2014 @@ -90,7 +90,7 @@ Required = (PrivilegeControl & PRIVILEGE_SET_ALL_NECESSARY) ? PrivilegeCount : 1; /* Loop all requested privileges until we found the required ones */ - for (i = 0; i < PrivilegeCount && Required > 0; i++) + for (i = 0; i < PrivilegeCount; i++) { /* Loop the privileges of the token */ for (j = 0; j < Token->PrivilegeCount; j++) @@ -107,6 +107,13 @@ { Privileges[i].Attributes |= SE_PRIVILEGE_USED_FOR_ACCESS; Required--; + + /* Check if we have found all privileges */ + if (Required == 0) + { + /* We're done! */ + return TRUE; + } } /* Leave the inner loop */ @@ -115,8 +122,9 @@ } } - /* Return whether we found all required privileges */ - return (Required == 0); + /* When we reached this point, we did not find all privileges */ + NT_ASSERT(Required > 0); + return FALSE; } NTSTATUS

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