Ros-diffs July 2013

ros-diffs@reactos.org

13 participants
199 discussions

[fireball] 59494: [DDK] - Fix ExAllocateFromZone. I understand it's deprecated, but it having a broken implementation which can't work at all because the one who coded this function failed to under...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 19:57:12 2013 New Revision: 59494 URL: http://svn.reactos.org/svn/reactos?rev=59494&view=rev Log: [DDK] - Fix ExAllocateFromZone. I understand it's deprecated, but it having a broken implementation which can't work at all because the one who coded this function failed to understand basic algorithms of linked lists is nonsense. Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/xdk/exfuncs.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=59… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Tue Jul 16 19:57:12 2013 @@ -3350,9 +3350,10 @@ ExAllocateFromZone( IN PZONE_HEADER Zone) { + PVOID Result = (PVOID)Zone->FreeList.Next; if (Zone->FreeList.Next) Zone->FreeList.Next = Zone->FreeList.Next->Next; - return (PVOID) Zone->FreeList.Next; + return Result; } static __inline PVOID Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Jul 16 19:57:12 2013 @@ -276,9 +276,10 @@ ExAllocateFromZone( IN PZONE_HEADER Zone) { + PVOID Result = (PVOID)Zone->FreeList.Next; if (Zone->FreeList.Next) Zone->FreeList.Next = Zone->FreeList.Next->Next; - return (PVOID) Zone->FreeList.Next; + return Result; } static __inline PVOID

1 0

[fireball] 59493: [NTOS/EX] - ExInitializeZone: Don't add to an uninitialized TotalSegmentSize value, set it instead.
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 19:21:55 2013 New Revision: 59493 URL: http://svn.reactos.org/svn/reactos?rev=59493&view=rev Log: [NTOS/EX] - ExInitializeZone: Don't add to an uninitialized TotalSegmentSize value, set it instead. Modified: trunk/reactos/ntoskrnl/ex/zone.c Modified: trunk/reactos/ntoskrnl/ex/zone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/zone.c?rev=594… ============================================================================== --- trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/zone.c [iso-8859-1] Tue Jul 16 19:21:55 2013 @@ -147,8 +147,8 @@ Entry += Zone->BlockSize; } - /* Update Segment Size */ - Zone->TotalSegmentSize += i; + /* Set Segment Size */ + Zone->TotalSegmentSize = i; /* Return success */ return STATUS_SUCCESS;

1 0

[fireball] 59492: Dedicated to Timo.
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 17:44:19 2013 New Revision: 59492 URL: http://svn.reactos.org/svn/reactos?rev=59492&view=rev Log: Dedicated to Timo. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Jul 16 17:44:19 2013 @@ -112,7 +112,7 @@ and eax, NOT CR0_PG mov cr0, eax - /* Jump to the next instruction */ + /* Jump to the next instruction to clear the prefetch queue */ jmp $+2 /* Enable Page Size Extension in CR4 */

1 0

[fireball] 59491: [NTOS] - Implement enabling Large Pages support if it is detected. The Page Size Extension (PSE) bit in CR4 is enabled when paging is disabled. To achieve that, a temporary virtua...
by fireball＠svn.reactos.org 16 Jul '13

16 Jul '13

Author: fireball Date: Tue Jul 16 13:49:03 2013 New Revision: 59491 URL: http://svn.reactos.org/svn/reactos?rev=59491&view=rev Log: [NTOS] - Implement enabling Large Pages support if it is detected. The Page Size Extension (PSE) bit in CR4 is enabled when paging is disabled. To achieve that, a temporary virtual and physical identity mapping is created, which is discarded after PSE is enabled. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/patpge.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -163,6 +163,18 @@ KV86_FRAME V86Frame; } KV8086_STACK_FRAME, *PKV8086_STACK_FRAME; +// +// Large Pages Support +// +typedef struct _LARGE_IDENTITY_MAP +{ + PHARDWARE_PTE TopLevelDirectory; + ULONG Cr3; + ULONG_PTR StartAddress; + ULONG PagesCount; + PVOID PagesList[30]; +} LARGE_IDENTITY_MAP, *PLARGE_IDENTITY_MAP; + /* Diable interrupts and return whether they were enabled before */ FORCEINLINE BOOLEAN @@ -372,6 +384,33 @@ NTAPI Ki386EnableGlobalPage( IN volatile ULONG_PTR Context +); + +ULONG_PTR +NTAPI +Ki386EnableTargetLargePage( + IN volatile ULONG_PTR Context +); + +BOOLEAN +NTAPI +Ki386CreateIdentityMap( + IN PLARGE_IDENTITY_MAP IdentityMap, + IN PVOID StartPtr, + IN ULONG Length +); + +VOID +NTAPI +Ki386FreeIdentityMap( + IN PLARGE_IDENTITY_MAP IdentityMap +); + +VOID +NTAPI +Ki386EnableCurrentLargePage( + IN ULONG_PTR StartAddress, + IN ULONG Cr3 ); VOID Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -81,6 +81,61 @@ pop esp ret +PUBLIC _Ki386EnableCurrentLargePage@8 +_Ki386EnableCurrentLargePage@8: + /* Save StartAddress in eax */ + mov eax, [esp + 4] + + /* Save new CR3 value in ecx */ + mov ecx, [esp + 8] + + /* Save flags value */ + pushfd + + /* Disable interrupts */ + cli + + /* Compute linear address */ + sub eax, offset _Ki386EnableCurrentLargePage@8 + add eax, offset _Ki386LargePageIdentityLabel + + /* Save old CR3 in edx and replace with a new one */ + mov edx, cr3 + mov cr3, ecx + + /* Jump to the next instruction but in linear mapping */ + jmp eax + +_Ki386LargePageIdentityLabel: + /* Disable paging */ + mov eax, cr0 + and eax, NOT CR0_PG + mov cr0, eax + + /* Jump to the next instruction */ + jmp $+2 + + /* Enable Page Size Extension in CR4 */ + mov ecx, cr4 + or ecx, CR4_PSE + mov cr4, ecx + + /* Done, now re-enable paging */ + or eax, CR0_PG + mov cr0, eax + + /* Jump to virtual address */ + mov eax, offset VirtualSpace + jmp eax + +VirtualSpace: + /* Restore CR3 contents */ + mov cr3, edx + + /* Restore flags */ + popfd + + ret 8 /* FIXFIX: Move to C code ****/ PUBLIC _Ki386SetupAndExitToV86Mode@4 Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -46,12 +46,17 @@ ULONG Dummy; KI_SAMPLE_MAP Samples[4]; PKI_SAMPLE_MAP CurrentSample = Samples; + LARGE_IDENTITY_MAP IdentityMap; /* Check for large page support */ if (KeFeatureBits & KF_LARGE_PAGE) { - /* FIXME: Support this */ - DPRINT("Large Page support detected but not yet taken advantage of\n"); + /* Do an IPI to enable it on all CPUs */ + if (Ki386CreateIdentityMap(&IdentityMap, Ki386EnableCurrentLargePage, 2)) + KeIpiGenericCall(Ki386EnableTargetLargePage, (ULONG_PTR)&IdentityMap); + + /* Free the pages allocated for identity map */ + Ki386FreeIdentityMap(&IdentityMap); } /* Check for global page support */ Modified: trunk/reactos/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/patpge.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/patpge.c [iso-8859-1] Tue Jul 16 13:49:03 2013 @@ -12,6 +12,9 @@ #define NDEBUG #include <debug.h> +#define PDE_BITS 10 +#define PTE_BITS 10 + /* FUNCTIONS *****************************************************************/ ULONG_PTR @@ -59,3 +62,194 @@ /* FIXME: Support this */ DPRINT("PAT support detected but not yet taken advantage of\n"); } + +ULONG_PTR +NTAPI +INIT_FUNCTION +Ki386EnableTargetLargePage(IN ULONG_PTR Context) +{ + PLARGE_IDENTITY_MAP IdentityMap = (PLARGE_IDENTITY_MAP)Context; + + /* Call helper function with the start address and temporary page table pointer */ + Ki386EnableCurrentLargePage(IdentityMap->StartAddress, IdentityMap->Cr3); + + return 0; +} + +PVOID +NTAPI +Ki386AllocateContiguousMemory(PLARGE_IDENTITY_MAP IdentityMap, + ULONG PagesCount, + BOOLEAN InLower4Gb) +{ + PHYSICAL_ADDRESS AddressMask; + PVOID Result; + ULONG SizeInBytes = PagesCount * PAGE_SIZE; + + /* Initialize acceptable address mask to any possible address */ + AddressMask.LowPart = 0xFFFFFFFF; + AddressMask.HighPart = 0xFFFFFFFF; + + /* Mark out higher 4Gb if caller asked so */ + if (InLower4Gb) AddressMask.HighPart = 0; + + /* Try to allocate the memory */ + Result = MmAllocateContiguousMemory(SizeInBytes, AddressMask); + if (!Result) return NULL; + + /* Zero it out */ + RtlZeroMemory(Result, SizeInBytes); + + /* Track allocated pages in the IdentityMap structure */ + IdentityMap->PagesList[IdentityMap->PagesCount] = Result; + IdentityMap->PagesCount++; + + return Result; +} + +PHYSICAL_ADDRESS +NTAPI +Ki386BuildIdentityBuffer(PLARGE_IDENTITY_MAP IdentityMap, + PVOID StartPtr, + ULONG Length) +{ + // TODO: Check whether all pages are below 4GB boundary + return MmGetPhysicalAddress(StartPtr); +} + +BOOLEAN +NTAPI +Ki386IdentityMapMakeValid(PLARGE_IDENTITY_MAP IdentityMap, + PHARDWARE_PTE Pde, + PHARDWARE_PTE *PageTable) +{ + ULONG NewPage; + + if (Pde->Valid == 0) + { + /* Invalid, so allocate a new page for it */ + NewPage = (ULONG)Ki386AllocateContiguousMemory(IdentityMap, 1, FALSE); + if (!NewPage) return FALSE; + + /* Set PFN to its virtual address and mark it as valid */ + Pde->PageFrameNumber = NewPage >> PAGE_SHIFT; + Pde->Valid = 1; + + /* Pass page table address to the caller */ + if (PageTable) *PageTable = (PHARDWARE_PTE)NewPage; + } + else + { + /* Valid entry, just pass the page table address to the caller */ + if (PageTable) + *PageTable = (PHARDWARE_PTE)(Pde->PageFrameNumber << PAGE_SHIFT); + } + + return TRUE; +} + +BOOLEAN +NTAPI +Ki386MapAddress(PLARGE_IDENTITY_MAP IdentityMap, + ULONG_PTR VirtualPtr, + PHYSICAL_ADDRESS PhysicalPtr) +{ + PHARDWARE_PTE Pde, Pte; + PHARDWARE_PTE PageTable; + + /* Allocate page directory on demand */ + if (!IdentityMap->TopLevelDirectory) + { + IdentityMap->TopLevelDirectory = Ki386AllocateContiguousMemory(IdentityMap, 1, 1); + if (!IdentityMap->TopLevelDirectory) return FALSE; + } + + /* Get PDE of VirtualPtr and make it writable and valid */ + Pde = &IdentityMap->TopLevelDirectory[(VirtualPtr >> 22) & ((1 << PDE_BITS) - 1)]; + if (!Ki386IdentityMapMakeValid(IdentityMap, Pde, &PageTable)) return FALSE; + Pde->Write = 1; + + /* Get PTE of VirtualPtr, make it valid, and map PhysicalPtr there */ + Pte = &PageTable[(VirtualPtr >> 12) & ((1 << PTE_BITS) - 1)]; + Pte->Valid = 1; + Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; + + return TRUE; +} + +VOID +NTAPI +Ki386ConvertPte(PHARDWARE_PTE Pte) +{ + PVOID VirtualPtr; + PHYSICAL_ADDRESS PhysicalPtr; + + /* Get virtual and physical addresses */ + VirtualPtr = (PVOID)(Pte->PageFrameNumber << PAGE_SHIFT); + PhysicalPtr = MmGetPhysicalAddress(VirtualPtr); + + /* Map its physical address in the page table provided by the caller */ + Pte->PageFrameNumber = PhysicalPtr.QuadPart >> PAGE_SHIFT; +} + +BOOLEAN +NTAPI +Ki386CreateIdentityMap(PLARGE_IDENTITY_MAP IdentityMap, PVOID StartPtr, ULONG PagesCount) +{ + ULONG_PTR Ptr; + ULONG PteIndex; + PHYSICAL_ADDRESS IdentityPtr; + + /* Zero out the IdentityMap contents */ + RtlZeroMemory(IdentityMap, sizeof(LARGE_IDENTITY_MAP)); + + /* Get the pointer to the physical address and save it in the struct */ + IdentityPtr = Ki386BuildIdentityBuffer(IdentityMap, StartPtr, PagesCount); + IdentityMap->StartAddress = IdentityPtr.LowPart; + if (IdentityMap->StartAddress == 0) + { + DPRINT1("Failed to get buffer for large pages identity mapping\n"); + return FALSE; + } + DPRINT("IdentityMap->StartAddress %p\n", IdentityMap->StartAddress); + + /* Map all pages */ + for (Ptr = (ULONG_PTR)StartPtr; + Ptr < (ULONG_PTR)StartPtr + PagesCount * PAGE_SIZE; + Ptr += PAGE_SIZE, IdentityPtr.QuadPart += PAGE_SIZE) + { + /* Map virtual address */ + if (!Ki386MapAddress(IdentityMap, Ptr, IdentityPtr)) return FALSE; + + /* Map physical address */ + if (!Ki386MapAddress(IdentityMap, IdentityPtr.LowPart, IdentityPtr)) return FALSE; + } + + /* Convert all PTEs in the page directory from virtual to physical, + because Ki386IdentityMapMakeValid mapped only virtual addresses */ + for (PteIndex = 0; PteIndex < (PAGE_SIZE / sizeof(HARDWARE_PTE)); PteIndex++) + { + if (IdentityMap->TopLevelDirectory[PteIndex].Valid != 0) + Ki386ConvertPte(&IdentityMap->TopLevelDirectory[PteIndex]); + } + + /* Save the page directory address (allocated by Ki386MapAddress) */ + IdentityMap->Cr3 = MmGetPhysicalAddress(IdentityMap->TopLevelDirectory).LowPart; + + DPRINT("IdentityMap->Cr3 0x%x\n", IdentityMap->Cr3); + + return TRUE; +} + +VOID +NTAPI +Ki386FreeIdentityMap(PLARGE_IDENTITY_MAP IdentityMap) +{ + ULONG Page; + + DPRINT("Freeing %d pages allocated for identity mapping\n", IdentityMap->PagesCount); + + /* Free all allocated pages, if any */ + for (Page = 0; Page < IdentityMap->PagesCount; Page++) + MmFreeContiguousMemory(IdentityMap->PagesList[Page]); +}

1 0

[aandrejevic] 59490: [SOFTX86] Fix carry/overflow condition for the SUB instruction.
by aandrejevic＠svn.reactos.org 15 Jul '13

15 Jul '13

Author: aandrejevic Date: Mon Jul 15 02:34:45 2013 New Revision: 59490 URL: http://svn.reactos.org/svn/reactos?rev=59490&view=rev Log: [SOFTX86] Fix carry/overflow condition for the SUB instruction. Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c Modified: branches/ntvdm/lib/3rdparty/softx86/softx86/add.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/softx86/soft… ============================================================================== --- branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] (original) +++ branches/ntvdm/lib/3rdparty/softx86/softx86/add.c [iso-8859-1] Mon Jul 15 02:34:45 2013 @@ -342,13 +342,16 @@ /* peform the addition */ ret = src - val; -/* if carry/overflow */ - if (ret > src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if (val > src) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80) != (val & 0x80)) && ((src & 0x80) != (ret & 0x80))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80) ctx->state->reg_flags.val |= SX86_CPUFLAG_SIGN; @@ -391,7 +394,10 @@ else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; /* if overflow */ - if ((ret & 0x8000) != (src & 0x8000)) ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + if (((src & 0x8000) != (val & 0x8000)) && ((src & 0x8000) != (ret & 0x8000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ @@ -430,13 +436,17 @@ /* peform the addition */ ret = src - val; -/* if carry/overflow */ - if (ret > src) - ctx->state->reg_flags.val |= - (SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); - else - ctx->state->reg_flags.val &= - ~(SX86_CPUFLAG_CARRY | SX86_CPUFLAG_OVERFLOW); +/* if carry */ + if (val > src) ctx->state->reg_flags.val |= SX86_CPUFLAG_CARRY; + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_CARRY; + +/* if overflow */ + if (((src & 0x80000000) != (val & 0x80000000)) + && ((src & 0x80000000) != (ret & 0x80000000))) + { + ctx->state->reg_flags.val |= SX86_CPUFLAG_OVERFLOW; + } + else ctx->state->reg_flags.val &= ~SX86_CPUFLAG_OVERFLOW; /* if result treated as signed value is negative */ if (ret & 0x80000000) ctx->state->reg_flags.val |= SX86_CPUFLAG_SIGN;

1 0

[aandrejevic] 59489: [NTVDM] Implement the Bios Data Area (BDA). Fix keyboard character translation bug.
by aandrejevic＠svn.reactos.org 15 Jul '13

15 Jul '13

Author: aandrejevic Date: Mon Jul 15 01:37:38 2013 New Revision: 59489 URL: http://svn.reactos.org/svn/reactos?rev=59489&view=rev Log: [NTVDM] Implement the Bios Data Area (BDA). Fix keyboard character translation bug. 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] Mon Jul 15 01:37:38 2013 @@ -16,23 +16,18 @@ /* PRIVATE VARIABLES **********************************************************/ +static PBIOS_DATA_AREA Bda; static BYTE BiosKeyboardMap[256]; -static WORD BiosKbdBuffer[BIOS_KBD_BUFFER_SIZE]; -static UINT BiosKbdBufferStart = 0, BiosKbdBufferEnd = 0; -static BOOLEAN BiosKbdBufferEmpty = TRUE; -static DWORD BiosTickCount = 0; -static BOOLEAN BiosPassedMidnight = FALSE; static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; -static BYTE CurrentVideoMode = BIOS_DEFAULT_VIDEO_MODE; -static BYTE CurrentVideoPage = 0; -static COORD BiosCursorPositions[BIOS_MAX_PAGES]; static HANDLE BiosGraphicsOutput = NULL; static LPVOID ConsoleFramebuffer = NULL; static HANDLE ConsoleMutex = NULL; +static BYTE CurrentVideoMode, CurrentVideoPage; static BOOLEAN VideoNeedsUpdate = TRUE; static SMALL_RECT UpdateRectangle = { 0, 0, 0, 0 }; static CONSOLE_SCREEN_BUFFER_INFO BiosSavedBufferInfo; + static VIDEO_MODE VideoModes[] = { /* Width | Height | Text | Bpp | Gray | Pages | Segment */ @@ -103,17 +98,25 @@ static BOOLEAN BiosKbdBufferPush(WORD Data) { + /* Get the location of the element after the head */ + WORD NextElement = Bda->KeybdBufferHead + 2; + + /* Wrap it around if it's at or beyond the end */ + if (NextElement >= Bda->KeybdBufferEnd) NextElement = Bda->KeybdBufferStart; + /* If it's full, fail */ - if (!BiosKbdBufferEmpty && (BiosKbdBufferStart == BiosKbdBufferEnd)) - { - return FALSE; - } - - /* Otherwise, add the value to the queue */ - BiosKbdBuffer[BiosKbdBufferEnd] = Data; - BiosKbdBufferEnd++; - BiosKbdBufferEnd %= BIOS_KBD_BUFFER_SIZE; - BiosKbdBufferEmpty = FALSE; + if (NextElement == Bda->KeybdBufferTail) return FALSE; + + /* Put the value in the queue */ + *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferTail)) = Data; + Bda->KeybdBufferTail += sizeof(WORD); + + /* Check if we are at, or have passed, the end of the buffer */ + if (Bda->KeybdBufferTail >= Bda->KeybdBufferEnd) + { + /* Return it to the beginning */ + Bda->KeybdBufferTail = Bda->KeybdBufferStart; + } /* Return success */ return TRUE; @@ -122,23 +125,30 @@ static BOOLEAN BiosKbdBufferTop(LPWORD Data) { /* If it's empty, fail */ - if (BiosKbdBufferEmpty) return FALSE; + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return FALSE; /* Otherwise, get the value and return success */ - *Data = BiosKbdBuffer[BiosKbdBufferStart]; + *Data = *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferHead)); + return TRUE; } static BOOLEAN BiosKbdBufferPop() { /* If it's empty, fail */ - if (BiosKbdBufferEmpty) return FALSE; - - /* Otherwise, remove the value and return success */ - BiosKbdBufferStart++; - BiosKbdBufferStart %= BIOS_KBD_BUFFER_SIZE; - if (BiosKbdBufferStart == BiosKbdBufferEnd) BiosKbdBufferEmpty = TRUE; - + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return FALSE; + + /* Remove the value from the queue */ + Bda->KeybdBufferHead += sizeof(WORD); + + /* Check if we are at, or have passed, the end of the buffer */ + if (Bda->KeybdBufferHead >= Bda->KeybdBufferEnd) + { + /* Return it to the beginning */ + Bda->KeybdBufferHead = Bda->KeybdBufferStart; + } + + /* Return success */ return TRUE; } @@ -271,8 +281,16 @@ SetConsoleActiveScreenBuffer(BiosGraphicsOutput); } - /* Set the video mode */ + /* Change the mode number */ CurrentVideoMode = ModeNumber; + CurrentVideoPage = 0; + + /* Update the BDA */ + Bda->VideoMode = CurrentVideoMode; + Bda->VideoPage = CurrentVideoPage; + Bda->VideoPageSize = BiosGetVideoPageSize(); + Bda->VideoPageOffset = 0; + Bda->ScreenColumns = VideoModes[ModeNumber].Width; return TRUE; } @@ -280,6 +298,7 @@ BOOLEAN BiosSetVideoPage(BYTE PageNumber) { ULONG PageStart; + COORD Coordinates; CONSOLE_SCREEN_BUFFER_INFO BufferInfo; /* Make sure this is a valid page number */ @@ -291,17 +310,25 @@ /* Save the cursor */ if (!GetConsoleScreenBufferInfo(BiosConsoleOutput, &BufferInfo)) return FALSE; - BiosCursorPositions[CurrentVideoPage] = BufferInfo.dwCursorPosition; + Bda->CursorPosition[CurrentVideoPage] = MAKEWORD(BufferInfo.dwCursorPosition.X, + BufferInfo.dwCursorPosition.Y); /* Set the page */ CurrentVideoPage = PageNumber; + /* Update the BDA */ + Bda->VideoPage = CurrentVideoPage; + Bda->VideoPageSize = BiosGetVideoPageSize(); + Bda->VideoPageOffset = CurrentVideoPage * Bda->VideoPageSize; + /* Update the console */ - PageStart = BiosGetVideoMemoryStart() + CurrentVideoPage * BiosGetVideoPageSize(); + PageStart = BiosGetVideoMemoryStart() + Bda->VideoPage * BiosGetVideoPageSize(); BiosUpdateConsole(PageStart, PageStart + BiosGetVideoPageSize()); /* Set the cursor */ - SetConsoleCursorPosition(BiosConsoleOutput, BiosCursorPositions[PageNumber]); + Coordinates.X = LOBYTE(Bda->CursorPosition[Bda->VideoPage]); + Coordinates.Y = HIBYTE(Bda->CursorPosition[Bda->VideoPage]); + SetConsoleCursorPosition(BiosConsoleOutput, Coordinates); return TRUE; } @@ -332,6 +359,12 @@ WORD Offset = 0; LPWORD IntVecTable = (LPWORD)((ULONG_PTR)BaseAddress); LPBYTE BiosCode = (LPBYTE)((ULONG_PTR)BaseAddress + TO_LINEAR(BIOS_SEGMENT, 0)); + + /* Initialize the BDA */ + Bda = (PBIOS_DATA_AREA)((ULONG_PTR)BaseAddress + TO_LINEAR(BDA_SEGMENT, 0)); + Bda->EquipmentList = BIOS_EQUIPMENT_LIST; + Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); + Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); /* Generate ISR stubs and fill the IVT */ for (i = 0; i < 256; i++) @@ -388,8 +421,8 @@ } /* Store the cursor position */ - ZeroMemory(&BiosCursorPositions, sizeof(BiosCursorPositions)); - BiosCursorPositions[0] = BiosSavedBufferInfo.dwCursorPosition; + Bda->CursorPosition[0] = MAKEWORD(BiosSavedBufferInfo.dwCursorPosition.X, + BiosSavedBufferInfo.dwCursorPosition.Y); /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); @@ -582,7 +615,7 @@ WORD CharacterData; /* Check if there is a key available */ - if (BiosKbdBufferEmpty) return 0xFFFF; + if (Bda->KeybdBufferHead == Bda->KeybdBufferTail) return 0xFFFF; /* Get the key from the queue, but don't remove it */ BiosKbdBufferTop(&CharacterData); @@ -597,7 +630,7 @@ DWORD Count; /* Check if there is a key available */ - if (!BiosKbdBufferEmpty) + if (Bda->KeybdBufferHead != Bda->KeybdBufferTail) { /* Get the key from the queue, and remove it */ BiosKbdBufferTop(&CharacterData); @@ -673,15 +706,14 @@ /* Make sure the selected video page exists */ if (HIBYTE(Ebx) >= VideoModes[CurrentVideoMode].Pages) break; - Position.X = LOBYTE(Edx); - Position.Y = HIBYTE(Edx); - - BiosCursorPositions[HIBYTE(Ebx)] = Position; + Bda->CursorPosition[HIBYTE(Ebx)] = LOWORD(Edx); /* Check if this is the current video page */ if (HIBYTE(Ebx) == CurrentVideoPage) { /* Yes, change the actual cursor */ + Position.X = LOBYTE(Edx); + Position.Y = HIBYTE(Edx); SetConsoleCursorPosition(BiosConsoleOutput, Position); } @@ -705,9 +737,8 @@ /* Return the result */ EmulatorSetRegister(EMULATOR_REG_AX, 0); EmulatorSetRegister(EMULATOR_REG_CX, (StartLine << 8) | 0x1F); - EmulatorSetRegister(EMULATOR_REG_DX, - (LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].Y) << 8) - | LOBYTE(BiosCursorPositions[HIBYTE(Ebx)].X)); + EmulatorSetRegister(EMULATOR_REG_DX, Bda->CursorPosition[HIBYTE(Ebx)]); + break; } @@ -877,10 +908,9 @@ case 0x0F: { EmulatorSetRegister(EMULATOR_REG_AX, - (VideoModes[CurrentVideoMode].Width << 8) - | CurrentVideoMode); + MAKEWORD(Bda->VideoMode, Bda->ScreenColumns)); EmulatorSetRegister(EMULATOR_REG_BX, - (CurrentVideoPage << 8) | LOBYTE(Ebx)); + MAKEWORD(LOBYTE(Ebx), Bda->VideoPage)); break; } @@ -946,15 +976,15 @@ { /* Set AL to 1 if midnight had passed, 0 otherwise */ Eax &= 0xFFFFFF00; - if (BiosPassedMidnight) Eax |= 1; + if (Bda->MidnightPassed) Eax |= 1; /* Return the tick count in CX:DX */ EmulatorSetRegister(EMULATOR_REG_AX, Eax); - EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(BiosTickCount)); - EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(BiosTickCount)); + EmulatorSetRegister(EMULATOR_REG_CX, HIWORD(Bda->TickCounter)); + EmulatorSetRegister(EMULATOR_REG_DX, LOWORD(Bda->TickCounter)); /* Reset the midnight flag */ - BiosPassedMidnight = FALSE; + Bda->MidnightPassed = FALSE; break; } @@ -962,10 +992,10 @@ case 0x01: { /* Set the tick count to CX:DX */ - BiosTickCount = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); + Bda->TickCounter = MAKELONG(LOWORD(Edx), LOWORD(Ecx)); /* Reset the midnight flag */ - BiosPassedMidnight = FALSE; + Bda->MidnightPassed = FALSE; break; } @@ -981,13 +1011,13 @@ VOID BiosSystemTimerInterrupt() { /* Increase the system tick count */ - BiosTickCount++; + Bda->TickCounter++; } VOID BiosEquipmentService() { /* Return the equipment list */ - EmulatorSetRegister(EMULATOR_REG_AX, BIOS_EQUIPMENT_LIST); + EmulatorSetRegister(EMULATOR_REG_AX, Bda->EquipmentList); } VOID BiosHandleIrq(BYTE IrqNumber) @@ -1014,7 +1044,7 @@ /* Get the scan code and virtual key code */ ScanCode = KeyboardReadData(); - VirtualKey = MapVirtualKey(ScanCode, MAPVK_VSC_TO_VK); + VirtualKey = MapVirtualKey(ScanCode & 0x7F, MAPVK_VSC_TO_VK); /* Check if this is a key press or release */ if (!(ScanCode & (1 << 7))) @@ -1032,10 +1062,11 @@ BiosKeyboardMap[VirtualKey] |= (1 << 7); /* Find out which character this is */ - ToAscii(ScanCode, VirtualKey, BiosKeyboardMap, &Character, 0); - - /* Push it onto the BIOS keyboard queue */ - BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) > 0) + { + /* Push it onto the BIOS keyboard queue */ + BiosKbdBufferPush((ScanCode << 8) | (Character & 0xFF)); + } } else { 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] Mon Jul 15 01:37:38 2013 @@ -18,6 +18,7 @@ #define CONSOLE_VIDEO_MEM_END 0xBFFFF #define ROM_AREA_START 0xC0000 #define ROM_AREA_END 0xFFFFF +#define BDA_SEGMENT 0x40 #define BIOS_PIC_MASTER_INT 0x08 #define BIOS_PIC_SLAVE_INT 0x70 #define BIOS_SEGMENT 0xF000 @@ -27,8 +28,8 @@ #define BIOS_TIME_INTERRUPT 0x1A #define BIOS_SYS_TIMER_INTERRUPT 0x1C #define CONSOLE_FONT_HEIGHT 8 -#define BIOS_KBD_BUFFER_SIZE 256 -#define BIOS_EQUIPMENT_LIST 0x3C // HACK: Disable FPU for now +#define BIOS_KBD_BUFFER_SIZE 16 +#define BIOS_EQUIPMENT_LIST 0x2C // HACK: Disable FPU for now #define BIOS_DEFAULT_VIDEO_MODE 0x03 #define BIOS_MAX_PAGES 8 #define BIOS_MAX_VIDEO_MODE 0x13 @@ -43,6 +44,56 @@ BYTE Pages; WORD Segment; } VIDEO_MODE; + +#pragma pack(push, 1) + +typedef struct +{ + WORD SerialPorts[4]; + WORD ParallelPorts[3]; + WORD EbdaSegment; + WORD EquipmentList; + BYTE Reserved0; + WORD MemorySize; + WORD Reserved1; + WORD KeyboardFlags; + BYTE AlternateKeypad; + WORD KeybdBufferHead; + WORD KeybdBufferTail; + WORD KeybdBuffer[BIOS_KBD_BUFFER_SIZE]; + BYTE DriveRecalibrate; + BYTE DriveMotorStatus; + BYTE MotorShutdownCounter; + BYTE LastDisketteOperation; + BYTE Reserved2[7]; + BYTE VideoMode; + WORD ScreenColumns; + WORD VideoPageSize; + WORD VideoPageOffset; + WORD CursorPosition[BIOS_MAX_PAGES]; + BYTE CursorEndLine; + BYTE CursorStartLine; + BYTE VideoPage; + WORD CrtBasePort; + BYTE CrtModeControl; + BYTE CrtColorPaletteMask; + DWORD Uptime; + BYTE Reserved3; + DWORD TickCounter; + BYTE MidnightPassed; + BYTE BreakFlag; + WORD SoftReset; + BYTE LastDiskOperation; + BYTE NumDisks; + BYTE DriveControlByte; + BYTE DiskPortOffset; + BYTE LptTimeOut[4]; + BYTE ComTimeOut[4]; + WORD KeybdBufferStart; + WORD KeybdBufferEnd; +} BIOS_DATA_AREA, *PBIOS_DATA_AREA; + +#pragma pack(pop) /* FUNCTIONS ******************************************************************/

1 0

[tfaber] 59488: [CMAKE] - Add configure support for VS 2013 - Add a missing /nologo to assembler invocations - Properly complain about old MSVC versions during configure instead of failing the build
by tfaber＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: tfaber Date: Sun Jul 14 21:00:42 2013 New Revision: 59488 URL: http://svn.reactos.org/svn/reactos?rev=59488&view=rev Log: [CMAKE] - Add configure support for VS 2013 - Add a missing /nologo to assembler invocations - Properly complain about old MSVC versions during configure instead of failing the build Modified: trunk/reactos/CMakeLists.txt trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/configure.cmd Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=59488&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -92,7 +92,7 @@ endif() # Default to Debug for the build type - set(CMAKE_BUILD_TYPE "Debug" CACHE STRING + set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE) # Do some cleanup @@ -182,36 +182,19 @@ # We're using widl now for both MSVC and GCC builds include(cmake/widl-support.cmake) - if(MSVC AND USE_WDK_HEADERS) - include_directories( - include - $ENV{SDK_INC_PATH} - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/reactos - $ENV{CRT_INC_PATH} - $ENV{DDK_INC_PATH} - include/ndk - include/reactos - include/reactos/libs) - else() - include_directories( - include - include/psdk - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/reactos - include/crt - include/ddk - include/ndk - include/reactos - include/reactos/libs) - endif() - + include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) if(ARCH STREQUAL "arm") include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) @@ -232,7 +215,7 @@ add_subdirectory(include/asm) include(cmake/baseaddress.cmake) - + # For MSVC builds, this puts all debug symbols file in the same directory. set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb") Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=59488&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -216,8 +216,8 @@ if(_module_type STREQUAL "STATIC_LIBRARY") message(FATAL_ERROR "Cannot add delay imports to a static library") endif() - foreach(LIB ${ARGN}) - target_link_libraries(${_module} lib${LIB}_delayed) + foreach(_lib ${ARGN}) + target_link_libraries(${_module} lib${_lib}_delayed) endforeach() target_link_libraries(${_module} delayimp) endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=59488… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -127,15 +127,15 @@ #define those for having real libraries set(CMAKE_IMPLIB_CREATE_STATIC_LIBRARY "LINK /LIB /NOLOGO <LINK_FLAGS> /OUT:<TARGET> <OBJECTS>") -set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /Cp /Fo<OBJECT> /c /Ta <SOURCE>") +set(CMAKE_STUB_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> /nologo /Cp /Fo<OBJECT> /c /Ta <SOURCE>") function(add_delay_importlibs _module) get_target_property(_module_type ${_module} TYPE) if(_module_type STREQUAL "STATIC_LIBRARY") message(FATAL_ERROR "Cannot add delay imports to a static library") endif() - foreach(LIB ${ARGN}) - add_target_link_flags(${_module} "/DELAYLOAD:${LIB}.dll") - target_link_libraries(${_module} lib${LIB}) + foreach(_lib ${ARGN}) + add_target_link_flags(${_module} "/DELAYLOAD:${_lib}.dll") + target_link_libraries(${_module} lib${_lib}) endforeach() target_link_libraries(${_module} delayimp) endfunction() Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59488&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Sun Jul 14 21:00:42 2013 @@ -41,27 +41,14 @@ set CMAKE_GENERATOR="Ninja" ) -) else if defined DDK_TARGET_OS ( - echo Detected DDK/WDK for %DDK_TARGET_OS%-%_BUILDARCH%% - set BUILD_ENVIRONMENT=WDK - if "%_BUILDARCH%" == "x86" ( - set ARCH=i386 - ) else if "%_BUILDARCH%" == "AMD64" ( - set ARCH=amd64 - ) - set USE_VSCMD=1 - set USE_WDK_HEADERS=0 - ) else if defined VCINSTALLDIR ( :: VS command prompt does not put this in environment vars cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "ARM" > NUL && set ARCH=arm - cl 2>&1 | find "14.00." > NUL && set BUILD_ENVIRONMENT=VS8 - cl 2>&1 | find "15.00." > NUL && set BUILD_ENVIRONMENT=VS9 cl 2>&1 | find "16.00." > NUL && set BUILD_ENVIRONMENT=VS10 cl 2>&1 | find "17.00." > NUL && set BUILD_ENVIRONMENT=VS11 - ::cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 + cl 2>&1 | find "18.00." > NUL && set BUILD_ENVIRONMENT=VS12 if not defined BUILD_ENVIRONMENT ( echo Error: Visual Studio version too old or version detection failed. exit /b @@ -69,19 +56,7 @@ echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH! if /I "%1" == "VSSolution" ( - if "!BUILD_ENVIRONMENT!" == "VS8" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 8 2005 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 8 2005" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS9" ( - if "!ARCH!" == "amd64" ( - set CMAKE_GENERATOR="Visual Studio 9 2008 Win64" - ) else ( - set CMAKE_GENERATOR="Visual Studio 9 2008" - ) - ) else if "!BUILD_ENVIRONMENT!" == "VS10" ( + if "!BUILD_ENVIRONMENT!" == "VS10" ( if "!ARCH!" == "amd64" ( set CMAKE_GENERATOR="Visual Studio 10 Win64" ) else ( @@ -95,22 +70,19 @@ ) else ( set CMAKE_GENERATOR="Visual Studio 11" ) + ) else if "!BUILD_ENVIRONMENT!" == "VS12" ( + if "!ARCH!" == "amd64" ( + set CMAKE_GENERATOR="Visual Studio 12 Win64" + ) else if "!ARCH!" == "arm" ( + set CMAKE_GENERATOR="Visual Studio 12 ARM" + ) else ( + set CMAKE_GENERATOR="Visual Studio 12" + ) ) ) else ( set USE_VSCMD=1 echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter. ) - -) else if defined sdkdir ( - echo Detected Windows SDK %TARGET_PLATFORM%-%TARGET_CPU% - if "%TARGET_CPU%" == "x86" ( - set ARCH=i386 - ) else if "%TARGET_CPU%" == "x64" ( - set ARCH=amd64 - ) - - set BUILD_ENVIRONMENT=SDK - set USE_VSCMD=1 ) else ( echo Error: Unable to detect build environment. Configure script failure. @@ -179,8 +151,6 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" -) else if "%BUILD_ENVIRONMENT%" == "WDK" ( - cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" ) else ( cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%" )

1 0

[ekohl] 59487: [SAMSRV] Add security descriptors for the account and builtin domains.
by ekohl＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: ekohl Date: Sun Jul 14 18:41:29 2013 New Revision: 59487 URL: http://svn.reactos.org/svn/reactos?rev=59487&view=rev Log: [SAMSRV] Add security descriptors for the account and builtin domains. Modified: trunk/reactos/dll/win32/samsrv/samsrv.h trunk/reactos/dll/win32/samsrv/security.c trunk/reactos/dll/win32/samsrv/setup.c Modified: trunk/reactos/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.h?… ============================================================================== --- trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/samsrv.h [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -306,6 +306,14 @@ SampCreateServerSD(OUT PSECURITY_DESCRIPTOR *ServerSd, OUT PULONG Size); +NTSTATUS +SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size); + +NTSTATUS +SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size); + /* setup.c */ Modified: trunk/reactos/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/security.… ============================================================================== --- trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/security.c [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -283,4 +283,580 @@ return Status; } + +NTSTATUS +SampCreateBuiltinDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + SAM_SERVER_ALL_ACCESS, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_INITIALIZE | + SAM_SERVER_SHUTDOWN, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *ServerSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + + +NTSTATUS +SampCreateAccountDomainSD(OUT PSECURITY_DESCRIPTOR *ServerSd, + OUT PULONG Size) +{ + PSECURITY_DESCRIPTOR AbsSD = NULL; + PSECURITY_DESCRIPTOR RelSD = NULL; + PSID EveryoneSid = NULL; + PSID AnonymousSid = NULL; + PSID AdministratorsSid = NULL; + PSID UsersSid = NULL; + PSID GuestsSid = NULL; + PACL Dacl = NULL; + PACL Sacl = NULL; + ULONG DaclSize; + ULONG SaclSize; + ULONG RelSDSize = 0; + NTSTATUS Status = STATUS_SUCCESS; + + + /* Create the Everyone SID */ + Status = RtlAllocateAndInitializeSid(&WorldAuthority, + 1, + SECURITY_WORLD_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Anonymous SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 1, + SECURITY_ANONYMOUS_LOGON_RID, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + &AnonymousSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Administrators SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_ADMINS, + 0, + 0, + 0, + 0, + 0, + 0, + &AdministratorsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Users SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, + 0, + 0, + 0, + 0, + 0, + 0, + &UsersSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* Create the Guests SID */ + Status = RtlAllocateAndInitializeSid(&NtAuthority, + 2, + SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_GUESTS, + 0, + 0, + 0, + 0, + 0, + 0, + &GuestsSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + + /* Allocate a buffer for the absolute SD */ + AbsSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(SECURITY_DESCRIPTOR)); + if (AbsSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Create the absolute SD */ + Status = RtlCreateSecurityDescriptor(AbsSD, + SECURITY_DESCRIPTOR_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the DACL */ + DaclSize = sizeof(ACL) + + 4 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AdministratorsSid) + + RtlLengthSid(UsersSid) + + RtlLengthSid(GuestsSid); + + Dacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Dacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Dacl, + DaclSize, + ACL_REVISION); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + EveryoneSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE, + UsersSid); + ASSERT(NT_SUCCESS(Status)); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_ALL_ACCESS & ~DOMAIN_CREATE_GROUP, + AdministratorsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAccessAllowedAce(Dacl, + ACL_REVISION, + DOMAIN_READ | DOMAIN_EXECUTE | DOMAIN_CREATE_USER | DOMAIN_CREATE_ALIAS, + GuestsSid); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(AbsSD, + TRUE, + Dacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* allocate and create the SACL */ + SaclSize = sizeof(ACL) + + 2 * sizeof(ACE) + + RtlLengthSid(EveryoneSid) + + RtlLengthSid(AnonymousSid); + + Sacl = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + DaclSize); + if (Sacl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + Status = RtlCreateAcl(Sacl, + SaclSize, + ACL_REVISION); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + ACCESS_SYSTEM_SECURITY | WRITE_DAC | DELETE | + SAM_SERVER_CREATE_DOMAIN | SAM_SERVER_INITIALIZE | + SAM_SERVER_SHUTDOWN, + EveryoneSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + Status = RtlAddAuditAccessAce(Sacl, + ACL_REVISION, + STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL, + AnonymousSid, + TRUE, + TRUE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the SACL */ + Status = RtlSetSaclSecurityDescriptor(AbsSD, + TRUE, + Sacl, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the owner SID */ + Status = RtlSetOwnerSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the group SID */ + Status = RtlSetGroupSecurityDescriptor(AbsSD, + AdministratorsSid, + FALSE); + ASSERT(Status == STATUS_SUCCESS); + if (!NT_SUCCESS(Status)) + goto done; + + /* Get the reqired buffer size for the self-relative SD */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + NULL, + &RelSDSize); + if (Status != STATUS_BUFFER_TOO_SMALL) + goto done; + + /* Allocate a buffer for the self-relative SD */ + RelSD = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + RelSDSize); + if (RelSD == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + /* Convert the absolute SD to self-relative format */ + Status = RtlAbsoluteToSelfRelativeSD(AbsSD, + RelSD, + &RelSDSize); + if (Status == STATUS_BUFFER_TOO_SMALL) + { + ASSERT(Status == STATUS_SUCCESS); + goto done; + } + + *ServerSd = RelSD; + *Size = RelSDSize; + +done: + if (!NT_SUCCESS(Status)) + { + if (RelSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, RelSD); + } + + if (EveryoneSid != NULL) + RtlFreeSid(EveryoneSid); + + if (AnonymousSid != NULL) + RtlFreeSid(AnonymousSid); + + if (AdministratorsSid != NULL) + RtlFreeSid(AdministratorsSid); + + if (Dacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Dacl); + + if (Sacl != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sacl); + + if (AbsSD != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AbsSD); + + return Status; +} + /* EOF */ Modified: trunk/reactos/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/setup.c?r… ============================================================================== --- trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/samsrv/setup.c [iso-8859-1] Sun Jul 14 18:41:29 2013 @@ -552,6 +552,7 @@ IN LPCWSTR lpKeyName, IN LPCWSTR lpDomainName, IN PSID lpDomainSid, + IN BOOLEAN bBuiltinDomain, OUT HANDLE *lpDomainKey) { SAM_DOMAIN_FIXED_DATA FixedData; @@ -562,6 +563,8 @@ HANDLE hGroupsKey = NULL; HANDLE hUsersKey = NULL; HANDLE hNamesKey = NULL; + PSECURITY_DESCRIPTOR Sd = NULL; + ULONG SdSize = 0; NTSTATUS Status; if (lpDomainKey != NULL) @@ -690,12 +693,35 @@ if (!NT_SUCCESS(Status)) goto done; + /* Create the server SD */ + if (bBuiltinDomain == TRUE) + Status = SampCreateBuiltinDomainSD(&Sd, + &SdSize); + else + Status = SampCreateAccountDomainSD(&Sd, + &SdSize); + + if (!NT_SUCCESS(Status)) + goto done; + + /* Set SecDesc attribute*/ + Status = SampRegSetValue(hServerKey, + L"SecDesc", + REG_BINARY, + Sd, + SdSize); + if (!NT_SUCCESS(Status)) + goto done; + SampRegCloseKey(hNamesKey); if (lpDomainKey != NULL) *lpDomainKey = hDomainKey; done: + if (Sd != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, Sd); + if (hAliasesKey != NULL) SampRegCloseKey(hAliasesKey); @@ -867,6 +893,7 @@ L"Builtin", szName, pBuiltinSid, + TRUE, &hBuiltinDomainKey); if (!NT_SUCCESS(Status)) { @@ -936,6 +963,7 @@ L"Account", L"", AccountDomainInfo->DomainSid, + FALSE, &hAccountDomainKey); if (!NT_SUCCESS(Status)) {

1 0

[hbelusca] 59486: [KERNEL32] Fix some broken logic: we can duplicate console handles only if both the source and the target processes are in fact the current process.
by hbelusca＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: hbelusca Date: Sun Jul 14 16:57:26 2013 New Revision: 59486 URL: http://svn.reactos.org/svn/reactos?rev=59486&view=rev Log: [KERNEL32] Fix some broken logic: we can duplicate console handles only if both the source and the target processes are in fact the current process. Modified: trunk/reactos/dll/win32/kernel32/client/handle.c Modified: trunk/reactos/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/handle.c [iso-8859-1] Sun Jul 14 16:57:26 2013 @@ -170,7 +170,11 @@ ((hSourceHandle != NtCurrentProcess()) && (hSourceHandle != NtCurrentThread()))) { - if ((hSourceProcessHandle != NtCurrentProcess()) && + /* + * We can duplicate console handles only if both the source + * and the target processes are in fact the current process. + */ + if ((hSourceProcessHandle != NtCurrentProcess()) || (hTargetProcessHandle != NtCurrentProcess())) { BaseSetLastNTError(STATUS_INVALID_PARAMETER);

1 0

[hbelusca] 59485: [KERNEL32] Fix parameters usage when calling NtDuplicateObject.
by hbelusca＠svn.reactos.org 14 Jul '13

14 Jul '13

Author: hbelusca Date: Sun Jul 14 14:52:39 2013 New Revision: 59485 URL: http://svn.reactos.org/svn/reactos?rev=59485&view=rev Log: [KERNEL32] Fix parameters usage when calling NtDuplicateObject. Modified: trunk/reactos/dll/win32/kernel32/client/proc.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Sun Jul 14 14:52:39 2013 @@ -52,6 +52,7 @@ /* FUNCTIONS ****************************************************************/ +// NOTE: Code duplicated from BasepDuplicateAndWriteHandle VOID WINAPI StuffStdHandle(IN HANDLE ProcessHandle, @@ -67,9 +68,8 @@ StandardHandle, ProcessHandle, &DuplicatedHandle, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES, - 0, - 0); + 0, 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (NT_SUCCESS(Status)) { /* Write it */ @@ -715,6 +715,7 @@ /* * Duplicates a standard handle and writes it where requested. */ +// NOTE: Code duplicated from StuffStdHandle VOID WINAPI BasepDuplicateAndWriteHandle(IN HANDLE ProcessHandle, @@ -736,9 +737,8 @@ StandardHandle, ProcessHandle, &DuplicatedHandle, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES, - 0, - 0); + 0, 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES); if (NT_SUCCESS(Status)) { /* Write it */

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2013